diff --git a/portal-frontend/src/app/features/public/notification/public-notification.component.ts b/portal-frontend/src/app/features/public/notification/public-notification.component.ts
index 7d51fc676e..4caf4b0c82 100644
--- a/portal-frontend/src/app/features/public/notification/public-notification.component.ts
+++ b/portal-frontend/src/app/features/public/notification/public-notification.component.ts
@@ -2,6 +2,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { Subject, takeUntil } from 'rxjs';
import { ApplicationPortalDecisionDto } from '../../../services/application-decision/application-decision.dto';
+import { NOTIFICATION_STATUS } from '../../../services/notification-submission/notification-submission.dto';
import { PublicNotificationSubmissionDto } from '../../../services/public/public-notification.dto';
import { PublicDocumentDto, PublicParcelDto } from '../../../services/public/public.dto';
import { PublicService } from '../../../services/public/public.service';
@@ -18,6 +19,7 @@ export class PublicNotificationComponent implements OnInit, OnDestroy {
documents: PublicDocumentDto[] = [];
parcels: PublicParcelDto[] = [];
decisions: ApplicationPortalDecisionDto[] = [];
+ selectedIndex = 1;
constructor(private publicService: PublicService, private route: ActivatedRoute) {}
@@ -35,6 +37,10 @@ export class PublicNotificationComponent implements OnInit, OnDestroy {
if (res) {
const { submission, documents, parcels } = res;
+ if (submission.status.code !== NOTIFICATION_STATUS.ALC_RESPONSE) {
+ this.selectedIndex = 0;
+ }
+
this.submission = submission;
this.documents = documents;
this.parcels = parcels;
diff --git a/portal-frontend/src/app/services/application-decision/application-decision.dto.ts b/portal-frontend/src/app/services/application-decision/application-decision.dto.ts
index a444a87146..aa71b0d4e9 100644
--- a/portal-frontend/src/app/services/application-decision/application-decision.dto.ts
+++ b/portal-frontend/src/app/services/application-decision/application-decision.dto.ts
@@ -10,6 +10,7 @@ export interface ApplicationPortalDecisionDto {
uuid: string;
date: number;
outcome: BaseCodeDto;
+ decisionDescription: string;
resolutionNumber: number;
resolutionYear: number;
documents: ApplicationDocumentDto[];
diff --git a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts
index 4684fbaa36..e0a7b2f745 100644
--- a/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts
+++ b/portal-frontend/src/app/services/notice-of-intent-decision/notice-of-intent-decision.dto.ts
@@ -10,6 +10,7 @@ export interface NoticeOfIntentPortalDecisionDto {
uuid: string;
date: number;
outcome: BaseCodeDto;
+ decisionDescription: string;
resolutionNumber: number;
resolutionYear: number;
documents: ApplicationDocumentDto[];
diff --git a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts
index aa608c0699..125285f4e5 100644
--- a/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts
+++ b/portal-frontend/src/app/services/public/public-notice-of-intent.dto.ts
@@ -1,6 +1,8 @@
-import { ApplicationStatusDto } from '../application-submission/application-submission.dto';
import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto';
-import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto';
+import {
+ NoticeOfIntentSubmissionStatusDto,
+ ProposedStructure,
+} from '../notice-of-intent-submission/notice-of-intent-submission.dto';
import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto';
export interface GetPublicNoticeOfIntentResponseDto {
@@ -19,7 +21,7 @@ export interface PublicNoticeOfIntentSubmissionDto {
localGovernmentUuid: string;
hasOtherParcelsInCommunity?: boolean | null;
lastStatusUpdate: number;
- status: ApplicationStatusDto;
+ status: NoticeOfIntentSubmissionStatusDto;
owners: PublicOwnerDto[];
type: string;
typeCode: string;
diff --git a/portal-frontend/src/app/services/public/public-notification.dto.ts b/portal-frontend/src/app/services/public/public-notification.dto.ts
index 0e94f58f6e..7d862c5db6 100644
--- a/portal-frontend/src/app/services/public/public-notification.dto.ts
+++ b/portal-frontend/src/app/services/public/public-notification.dto.ts
@@ -1,6 +1,4 @@
-import { ApplicationStatusDto } from '../application-submission/application-submission.dto';
-import { NoticeOfIntentPortalDecisionDto } from '../notice-of-intent-decision/notice-of-intent-decision.dto';
-import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto';
+import { NotificationSubmissionStatusDto } from '../notification-submission/notification-submission.dto';
import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto';
export interface GetPublicNotificationResponseDto {
@@ -20,7 +18,7 @@ export interface PublicNotificationSubmissionDto {
localGovernmentUuid: string;
type: string;
typeCode: string;
- status: ApplicationStatusDto;
+ status: NotificationSubmissionStatusDto;
lastStatusUpdate: number;
transferees: PublicOwnerDto[];
submittersFileNumber: string | null;
diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts
index a1c2da2d29..cadee846db 100644
--- a/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts
+++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v1/application-decision/application-decision.dto.ts
@@ -167,15 +167,9 @@ export class DecisionDocumentDto {
@AutoMap()
uuid: string;
- @AutoMap()
fileName: string;
-
- @AutoMap()
+ fileSize: number;
mimeType: string;
-
- @AutoMap()
uploadedBy: string;
-
- @AutoMap()
uploadedAt: number;
}
diff --git a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts
index 9b1e490a29..0b70ac4a3a 100644
--- a/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts
+++ b/services/apps/alcs/src/alcs/application-decision/application-decision-v2/application-decision/application-decision.dto.ts
@@ -234,6 +234,9 @@ export class DecisionDocumentDto {
@AutoMap()
fileName: string;
+ @AutoMap()
+ fileSize: number;
+
@AutoMap()
mimeType: string;
diff --git a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts
index f407b48333..e4aa06464d 100644
--- a/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts
+++ b/services/apps/alcs/src/alcs/notice-of-intent-decision/notice-of-intent-decision.dto.ts
@@ -154,15 +154,9 @@ export class NoticeOfIntentDecisionDocumentDto {
@AutoMap()
uuid: string;
- @AutoMap()
fileName: string;
-
- @AutoMap()
+ fileSize: number;
mimeType: string;
-
- @AutoMap()
uploadedBy: string;
-
- @AutoMap()
uploadedAt: number;
}
diff --git a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts
index 362a4c5ff5..a2954bb542 100644
--- a/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts
+++ b/services/apps/alcs/src/common/automapper/application-decision-v1.automapper.profile.ts
@@ -187,6 +187,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile {
(a) => a.fileName,
mapFrom((ad) => ad.document.fileName),
),
+ forMember(
+ (a) => a.fileSize,
+ mapFrom((ad) => ad.document.fileSize),
+ ),
forMember(
(a) => a.uploadedBy,
mapFrom((ad) => ad.document.uploadedBy?.name),
diff --git a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts
index 59fa998bb2..1be51e2f8c 100644
--- a/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts
+++ b/services/apps/alcs/src/common/automapper/application-decision-v2.automapper.profile.ts
@@ -217,6 +217,10 @@ export class ApplicationDecisionProfile extends AutomapperProfile {
(a) => a.fileName,
mapFrom((ad) => ad.document.fileName),
),
+ forMember(
+ (a) => a.fileSize,
+ mapFrom((ad) => ad.document.fileSize),
+ ),
forMember(
(a) => a.uploadedBy,
mapFrom((ad) => ad.document.uploadedBy?.name),
diff --git a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts
index 2e6dce5f1e..0313b8b661 100644
--- a/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts
+++ b/services/apps/alcs/src/common/automapper/notice-of-intent-decision.automapper.profile.ts
@@ -196,6 +196,10 @@ export class NoticeOfIntentDecisionProfile extends AutomapperProfile {
(a) => a.fileName,
mapFrom((ad) => ad.document.fileName),
),
+ forMember(
+ (a) => a.fileSize,
+ mapFrom((ad) => ad.document.fileSize),
+ ),
forMember(
(a) => a.uploadedBy,
mapFrom((ad) => ad.document.uploadedBy?.name),
diff --git a/services/apps/alcs/src/portal/public/application/application-decision.dto.ts b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts
index 9ed5be978d..d27156aa23 100644
--- a/services/apps/alcs/src/portal/public/application/application-decision.dto.ts
+++ b/services/apps/alcs/src/portal/public/application/application-decision.dto.ts
@@ -14,6 +14,9 @@ export class ApplicationPortalDecisionDto {
@AutoMap(() => ApplicationDecisionOutcomeCodeDto)
outcome: ApplicationDecisionOutcomeCodeDto;
+ @AutoMap(() => String)
+ decisionDescription: string;
+
@AutoMap(() => String)
resolutionNumber: number;
diff --git a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts
index 9684bb7a4e..4be5dfd02e 100644
--- a/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts
+++ b/services/apps/alcs/src/portal/public/notice-of-intent/notice-of-intent-decision.dto.ts
@@ -16,6 +16,9 @@ export class NoticeOfIntentPortalDecisionDto {
@AutoMap(() => NoticeOfIntentDecisionOutcomeCodeDto)
outcome: NoticeOfIntentDecisionOutcomeCodeDto;
+ @AutoMap(() => String)
+ decisionDescription: string;
+
@AutoMap(() => String)
resolutionNumber: number;