From 1578637f2cf440cc3d8634c09f17031ce9ea779d Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:27:47 -0700
Subject: [PATCH 01/45] Move structure type options to module constant for use
 by other modules

---
 .../additional-information.component.html     |  2 +-
 .../additional-information.component.ts       | 81 ++++++++++---------
 2 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html
index 507d047da..610d6063a 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.html
@@ -95,7 +95,7 @@ <h2>Additional Proposal Information</h2>
                   [formControlName]="element.id + '-type'"
                   (valueChange)="onChangeStructureType(element.id, $event)"
                 >
-                  <mat-option *ngFor="let type of STRUCTURE_TYPE_OPTIONS" [value]="type.value">
+                  <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
                     {{ type.label }}
                   </mat-option>
                 </mat-select>
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
index eba7275be..03b015104 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
@@ -33,9 +33,14 @@ export enum STRUCTURE_TYPES {
   OTHER_STRUCTURE = 'Other Structure',
 }
 
-export type FormProposedStructure = { type: STRUCTURE_TYPES | null; area: string | null; id: string, typeLabel?: string | null };
+export type FormProposedStructure = {
+  type: STRUCTURE_TYPES | null;
+  area: string | null;
+  id: string;
+  typeLabel?: string | null;
+};
 
-export type TypeOption = { label: string, value: string };
+export type TypeOption = { label: string; value: string };
 
 export const RESIDENTIAL_STRUCTURE_TYPES = [
   STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
@@ -51,6 +56,29 @@ export const NOI_STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
   [STRUCTURE_TYPES.OTHER_STRUCTURE]: STRUCTURE_TYPES.OTHER_STRUCTURE,
 };
 
+export const STRUCTURE_TYPE_OPTIONS = [
+  {
+    label: STRUCTURE_TYPES.FARM_STRUCTURE,
+    value: STRUCTURE_TYPES.FARM_STRUCTURE,
+  },
+  {
+    label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE],
+    value: STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
+  },
+  {
+    label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE],
+    value: STRUCTURE_TYPES.ADDITIONAL_RESIDENCE,
+  },
+  {
+    label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ACCESSORY_STRUCTURE],
+    value: STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+  },
+  {
+    label: STRUCTURE_TYPES.OTHER_STRUCTURE,
+    value: STRUCTURE_TYPES.OTHER_STRUCTURE,
+  },
+];
+
 @Component({
   selector: 'app-additional-information',
   templateUrl: './additional-information.component.html',
@@ -60,31 +88,10 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
   currentStep = EditNoiSteps.ExtraInfo;
   isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
 
-  STRUCTURE_TYPE_OPTIONS: TypeOption[] = [
-    {
-      label: STRUCTURE_TYPES.FARM_STRUCTURE,
-      value: STRUCTURE_TYPES.FARM_STRUCTURE,
-    },
-    {
-      label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE],
-      value: STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
-    },
-    {
-      label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE],
-      value: STRUCTURE_TYPES.ADDITIONAL_RESIDENCE,
-    },
-    {
-      label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ACCESSORY_STRUCTURE],
-      value: STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
-    },
-    {
-      label: STRUCTURE_TYPES.OTHER_STRUCTURE,
-      value: STRUCTURE_TYPES.OTHER_STRUCTURE,
-    },
-  ];
+  structureTypeOptions = STRUCTURE_TYPE_OPTIONS;
 
   DOCUMENT = DOCUMENT_TYPE;
-  
+
   private submissionUuid = '';
   typeCode: string = '';
 
@@ -168,7 +175,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
           ...structure,
           id: v4(),
           area: structure.area ? structure.area.toString(10) : null,
-          typeLabel: this.STRUCTURE_TYPE_OPTIONS.find((x) => x.value === structure.type)?.label,
+          typeLabel: this.structureTypeOptions.find((x) => x.value === structure.type)?.label,
         }));
 
         const newForm = new FormGroup({});
@@ -406,9 +413,9 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
         structureData: {
           area: structureToEdit?.area,
           type: structureToEdit?.type,
-          options: this.STRUCTURE_TYPE_OPTIONS,
-        }
-      }
+          options: this.structureTypeOptions,
+        },
+      },
     });
     dialog.afterClosed().subscribe(async (result) => {
       if (!result) return;
@@ -464,9 +471,9 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
         width: '70%',
         data: {
           structureData: {
-            options: this.STRUCTURE_TYPE_OPTIONS,
-          }
-        }
+            options: this.structureTypeOptions,
+          },
+        },
       });
       dialog.beforeClosed().subscribe(async (result) => {
         if (!result) return;
@@ -485,11 +492,11 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
     const typeValue = type ? type.value : '';
     const typeLabel = type ? type.label : '';
     const newStructure = {
-                          type: typeValue,
-                          area: area ? area : '',
-                          id: v4(),
-                          typeLabel: typeLabel,
-                        };
+      type: typeValue,
+      area: area ? area : '',
+      id: v4(),
+      typeLabel: typeLabel,
+    };
     this.proposedStructures.push(newStructure);
     this.structuresSource = new MatTableDataSource(this.proposedStructures);
 

From 0a7812f3d584b20f5f50f5b21f9fb5611960dc9c Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 11:36:39 -0700
Subject: [PATCH 02/45] Rename NOI structure label map to make general for all
 soil

---
 .../additional-information.component.ts                   | 4 ++--
 .../additional-information.component.ts                   | 8 ++++----
 .../additional-information.component.ts                   | 4 ++--
 .../additional-information.component.ts                   | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts
index fba6a14e3..d82ee4630 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts
@@ -9,7 +9,7 @@ import {
 } from '../../../../../services/notice-of-intent/notice-of-intent.dto';
 import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
 
-const NOI_STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
+const STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
   [STRUCTURE_TYPES.FARM_STRUCTURE]: STRUCTURE_TYPES.FARM_STRUCTURE,
   [STRUCTURE_TYPES.PRINCIPAL_RESIDENCE]: 'Principal Residence',
   [STRUCTURE_TYPES.ADDITIONAL_RESIDENCE]: 'Additional Residence',
@@ -96,6 +96,6 @@ export class AdditionalInformationComponent {
       return null;
     }
 
-    return NOI_STRUCTURE_TYPE_LABEL_MAP[value];
+    return STRUCTURE_TYPE_LABEL_MAP[value];
   }
 }
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
index 03b015104..2ba17f151 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
@@ -48,7 +48,7 @@ export const RESIDENTIAL_STRUCTURE_TYPES = [
   STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
 ];
 
-export const NOI_STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
+export const STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
   [STRUCTURE_TYPES.FARM_STRUCTURE]: STRUCTURE_TYPES.FARM_STRUCTURE,
   [STRUCTURE_TYPES.PRINCIPAL_RESIDENCE]: 'Principal Residence',
   [STRUCTURE_TYPES.ADDITIONAL_RESIDENCE]: 'Additional Residence',
@@ -62,15 +62,15 @@ export const STRUCTURE_TYPE_OPTIONS = [
     value: STRUCTURE_TYPES.FARM_STRUCTURE,
   },
   {
-    label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE],
+    label: STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE],
     value: STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
   },
   {
-    label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE],
+    label: STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE],
     value: STRUCTURE_TYPES.ADDITIONAL_RESIDENCE,
   },
   {
-    label: NOI_STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ACCESSORY_STRUCTURE],
+    label: STRUCTURE_TYPE_LABEL_MAP[STRUCTURE_TYPES.ACCESSORY_STRUCTURE],
     value: STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
   },
   {
diff --git a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts
index 3ab468c8a..a02a6f980 100644
--- a/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/notice-of-intent-details/additional-information/additional-information.component.ts
@@ -7,7 +7,7 @@ import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
 import {
   RESIDENTIAL_STRUCTURE_TYPES,
   STRUCTURE_TYPES,
-  NOI_STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPE_LABEL_MAP,
 } from '../../edit-submission/additional-information/additional-information.component';
 import { openFileInline } from '../../../../shared/utils/file';
 import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints';
@@ -116,6 +116,6 @@ export class AdditionalInformationComponent {
       return null;
     }
 
-    return NOI_STRUCTURE_TYPE_LABEL_MAP[value];
+    return STRUCTURE_TYPE_LABEL_MAP[value];
   }
 }
diff --git a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts
index 05b32d901..0a94f052d 100644
--- a/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts
+++ b/portal-frontend/src/app/features/public/notice-of-intent/submission/additional-information/additional-information.component.ts
@@ -7,7 +7,7 @@ import { openFileInline } from '../../../../../shared/utils/file';
 import {
   RESIDENTIAL_STRUCTURE_TYPES,
   STRUCTURE_TYPES,
-  NOI_STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPE_LABEL_MAP,
 } from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints';
 
@@ -97,6 +97,6 @@ export class AdditionalInformationComponent implements OnInit {
       return null;
     }
 
-    return NOI_STRUCTURE_TYPE_LABEL_MAP[value];
+    return STRUCTURE_TYPE_LABEL_MAP[value];
   }
 }

From cf945f2d5a4b01e5ea644ee4abf9c9e383a860f8 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:33:56 -0700
Subject: [PATCH 03/45] Add new structures question to DB

---
 .../application-submission.entity.ts               |  4 ++++
 ...07161963-add_app_soil_new_structure_question.ts | 14 ++++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1729107161963-add_app_soil_new_structure_question.ts

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts
index e887c6f4f..9e18ff570 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts
@@ -367,6 +367,10 @@ export class ApplicationSubmission extends Base {
   subdProposedLots: ProposedLot[];
 
   //Soil & Fill
+  @AutoMap(() => Boolean)
+  @Column({ type: 'boolean', nullable: true })
+  soilIsNewStructure: boolean | null;
+
   @AutoMap(() => Boolean)
   @Column({ type: 'boolean', nullable: true })
   soilIsFollowUp: boolean | null;
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1729107161963-add_app_soil_new_structure_question.ts b/services/apps/alcs/src/providers/typeorm/migrations/1729107161963-add_app_soil_new_structure_question.ts
new file mode 100644
index 000000000..326927e87
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1729107161963-add_app_soil_new_structure_question.ts
@@ -0,0 +1,14 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddAppSoilNewStructureQuestion1729107161963 implements MigrationInterface {
+    name = 'AddAppSoilNewStructureQuestion1729107161963'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_is_new_structure" boolean`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_is_new_structure"`);
+    }
+
+}

From 4ecbaa0a6dd817a688177c2917fe6de1fec4d137 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:39:28 -0700
Subject: [PATCH 04/45] Git add new structure question to all services and
 DTO's

---
 .../src/app/services/application/application.dto.ts        | 1 +
 .../application-submission/application-submission.dto.ts   | 1 +
 .../src/app/services/public/public-application.dto.ts      | 1 +
 .../application-submission-validator.service.ts            | 1 +
 .../application-submission/application-submission.dto.ts   | 7 +++++++
 .../application-submission.service.ts                      | 4 ++++
 .../portal/public/application/public-application.dto.ts    | 3 +++
 7 files changed, 18 insertions(+)

diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts
index 9fe3f94b7..47007b877 100644
--- a/alcs-frontend/src/app/services/application/application.dto.ts
+++ b/alcs-frontend/src/app/services/application/application.dto.ts
@@ -171,6 +171,7 @@ export interface ApplicationSubmissionDto {
   subdProposedLots: ProposedLot[];
 
   //Soil Fields
+  soilIsNewStructure: boolean | null;
   soilIsFollowUp: boolean | null;
   soilFollowUpIDs: string | null;
   soilTypeRemoved: string | null;
diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
index ad02ffb28..9fda0e0ff 100644
--- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
+++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
@@ -113,6 +113,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD
   subdProposedLots: ProposedLot[];
 
   //Soil Fields
+  soilIsNewStructure: boolean | null;
   soilIsFollowUp: boolean | null;
   soilFollowUpIDs: string | null;
   soilTypeRemoved: string | null;
diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts
index 111381bac..fba76b98d 100644
--- a/portal-frontend/src/app/services/public/public-application.dto.ts
+++ b/portal-frontend/src/app/services/public/public-application.dto.ts
@@ -78,6 +78,7 @@ export interface PublicApplicationSubmissionDto {
   subdProposedLots: ProposedLot[];
 
   //Soil Fields
+  soilIsNewStructure: boolean | null;
   soilIsFollowUp: boolean | null;
   soilFollowUpIDs: string | null;
   soilTypeRemoved: string | null;
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
index 8d4357884..cc6820f71 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
@@ -621,6 +621,7 @@ export class ApplicationSubmissionValidatorService {
     applicantDocuments: ApplicationDocument[],
   ) {
     if (
+      applicationSubmission.soilIsNewStructure === null ||
       applicationSubmission.soilIsFollowUp === null ||
       applicationSubmission.soilReduceNegativeImpacts === null
     ) {
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
index 9023fb215..50b6aa116 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
@@ -164,6 +164,9 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto {
   subdProposedLots?: ProposedLot[];
 
   //Soil Fields
+  @AutoMap(() => Boolean)
+  soilIsNewStructure: boolean | null;
+
   @AutoMap(() => Boolean)
   soilIsFollowUp: boolean | null;
 
@@ -545,6 +548,10 @@ export class ApplicationSubmissionUpdateDto {
   subdProposedLots?: ProposedLot[];
 
   //Soil Fields
+  @IsBoolean()
+  @IsOptional()
+  soilIsNewStructure?: boolean | null;
+
   @IsBoolean()
   @IsOptional()
   soilIsFollowUp?: boolean | null;
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
index 8b64f9195..946698d80 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
@@ -813,6 +813,10 @@ export class ApplicationSubmissionService {
     applicationSubmission: ApplicationSubmission,
     updateDto: ApplicationSubmissionUpdateDto,
   ) {
+    applicationSubmission.soilIsNewStructure = filterUndefined(
+      updateDto.soilIsNewStructure,
+      applicationSubmission.soilIsNewStructure,
+    );
     applicationSubmission.soilIsFollowUp = filterUndefined(
       updateDto.soilIsFollowUp,
       applicationSubmission.soilIsFollowUp,
diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts
index d295a3180..fb25711f4 100644
--- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts
+++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts
@@ -145,6 +145,9 @@ export class PublicApplicationSubmissionDto {
   subdProposedLots?: ProposedLot[];
 
   //Soil Fields
+  @AutoMap(() => Boolean)
+  soilIsNewStructure: boolean | null;
+
   @AutoMap(() => Boolean)
   soilIsFollowUp: boolean | null;
 

From 6c50f45ecc6975e9c30a6cbf0126e2d426f8be42 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:45:39 -0700
Subject: [PATCH 05/45] Add new structure question to UI

---
 .../pfrs-proposal.component.html              | 30 +++++++++++++++++++
 .../pfrs-proposal/pfrs-proposal.component.ts  |  2 ++
 2 files changed, 32 insertions(+)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index a7d5aea6f..b6961bbf0 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -25,6 +25,36 @@ <h2>Proposal</h2>
 </app-warning-banner>
 <form [formGroup]="form">
   <div class="form-row">
+    <div class="full-row">
+      <mat-label for="is-new-structure">
+        Are you removing soil and placing fill in order to build a structure?
+      </mat-label>
+      <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div>
+      <div>
+        <mat-button-toggle-group class="input" id="is-new-structure" [formControl]="isNewStructure">
+          <mat-button-toggle
+            class="toggle-button"
+            [ngClass]="{
+              'error-outline': isNewStructure.invalid && (isNewStructure.dirty || isNewStructure.touched),
+            }"
+            [value]="true"
+            >Yes
+          </mat-button-toggle>
+          <mat-button-toggle
+            class="toggle-button"
+            [ngClass]="{
+              'error-outline': isNewStructure.invalid && (isNewStructure.dirty || isNewStructure.touched),
+            }"
+            [value]="false"
+            >No
+          </mat-button-toggle>
+        </mat-button-toggle-group>
+      </div>
+      <mat-hint class="subtext"
+        >Note: The form will be updated with additional required questions if you are building a structure
+      </mat-hint>
+    </div>
+
     <div class="full-row">
       <mat-label for="noi-follow-up">
         Has the ALC previously received an application or Notice of Intent for this proposal?
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 90860ec51..165a70c02 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -43,6 +43,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   showReclamationPlanVirus = false;
   showNoticeOfWorkVirus = false;
 
+  isNewStructure = new FormControl<boolean | null>(null, [Validators.required]);
   isFollowUp = new FormControl<string | null>(null, [Validators.required]);
   followUpIDs = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]);
   purpose = new FormControl<string | null>(null, [Validators.required]);
@@ -56,6 +57,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   hasSubmittedNotice = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]);
 
   form = new FormGroup({
+    isNewStructure: this.isNewStructure,
     isFollowUp: this.isFollowUp,
     followUpIDs: this.followUpIDs,
     purpose: this.purpose,

From 8e26b881fa4762f9fc7523e1b0fb0d3a7910c118 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 12:51:48 -0700
Subject: [PATCH 06/45] Show/hide old questions based on answer to new
 structure question

---
 .../pfrs-proposal.component.html              | 409 +++++++++---------
 1 file changed, 210 insertions(+), 199 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index b6961bbf0..36d2a6484 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -23,6 +23,7 @@ <h2>Proposal</h2>
     </li>
   </ul>
 </app-warning-banner>
+
 <form [formGroup]="form">
   <div class="form-row">
     <div class="full-row">
@@ -86,6 +87,7 @@ <h2>Proposal</h2>
         </mat-button-toggle-group>
       </div>
     </div>
+
     <div class="full-row">
       <label for="followUpIDs">Application or NOI ID</label>
       <div class="subtext">If you have multiple IDs, please separate with a comma.</div>
@@ -98,6 +100,7 @@ <h2>Proposal</h2>
         <div *ngIf="followUpIDs.errors?.['required']">This field is required</div>
       </div>
     </div>
+
     <div class="full-row">
       <label for="purpose">What is the purpose of the proposal?</label>
       <div class="subtext">
@@ -210,6 +213,7 @@ <h2>Proposal</h2>
         (dataChange)="markDirty()"
       ></app-soil-table>
     </div>
+
     <div class="full-row">
       <mat-label
         >Of the proposed totals provided above, please input the dimensions of soil that has already been removed or
@@ -285,63 +289,66 @@ <h2>Proposal</h2>
       <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div>
     </div>
 
-    <div class="full-row">
-      <label for="alternativeMeasures"
-        >What alternative measures have you considered or attempted before proposing to place fill?</label
-      >
-      <div class="subtext">
-        Applicants should provide evidence demonstrating that normal farm practices have been attempted prior to the
-        submission of this application to place fill.
-      </div>
-      <mat-form-field appearance="outline">
-        <textarea
-          formControlName="alternativeMeasures"
-          #soilAlternativeMeasuresText
-          maxlength="4000"
-          id="alternativeMeasures"
-          matInput
-          placeholder="Type comment"
-        ></textarea>
-      </mat-form-field>
-      <div
-        *ngIf="alternativeMeasures.invalid && (alternativeMeasures.dirty || alternativeMeasures.touched)"
-        class="field-error"
-      >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="alternativeMeasures.errors?.['required']">This field is required</div>
+    <ng-container *ngIf="isNewStructure.value === false">
+      <div class="full-row">
+        <label for="alternativeMeasures"
+          >What alternative measures have you considered or attempted before proposing to place fill?</label
+        >
+        <div class="subtext">
+          Applicants should provide evidence demonstrating that normal farm practices have been attempted prior to the
+          submission of this application to place fill.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="alternativeMeasures"
+            #soilAlternativeMeasuresText
+            maxlength="4000"
+            id="alternativeMeasures"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="alternativeMeasures.invalid && (alternativeMeasures.dirty || alternativeMeasures.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="alternativeMeasures.errors?.['required']">This field is required</div>
+        </div>
+        <mat-hint class="subtext">Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.</mat-hint>
+        <div class="subtext">Characters left: {{ 4000 - soilAlternativeMeasuresText.textLength }}</div>
       </div>
-      <mat-hint class="subtext">Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.</mat-hint>
-      <div class="subtext">Characters left: {{ 4000 - soilAlternativeMeasuresText.textLength }}</div>
-    </div>
 
-    <div class="full-row">
-      <label for="agricultural-support">
-        What steps will be taken to reduce impacts to surrounding agricultural land?
-        <div class="subtext">Describe impact reducing measures.</div>
-      </label>
-      <mat-form-field appearance="outline">
-        <textarea
-          [formControl]="reduceNegativeImpacts"
-          #reduceNegativeImpactsText
-          maxlength="4000"
-          id="agricultural-support"
-          matInput
-          placeholder="Type comment"
-        ></textarea>
-      </mat-form-field>
-      <div
-        *ngIf="reduceNegativeImpacts.invalid && (reduceNegativeImpacts.dirty || reduceNegativeImpacts.touched)"
-        class="field-error"
-      >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="reduceNegativeImpacts.errors?.['required']">This field is required</div>
+      <div class="full-row">
+        <label for="agricultural-support">
+          What steps will be taken to reduce impacts to surrounding agricultural land?
+          <div class="subtext">Describe impact reducing measures.</div>
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            [formControl]="reduceNegativeImpacts"
+            #reduceNegativeImpactsText
+            maxlength="4000"
+            id="agricultural-support"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="reduceNegativeImpacts.invalid && (reduceNegativeImpacts.dirty || reduceNegativeImpacts.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="reduceNegativeImpacts.errors?.['required']">This field is required</div>
+        </div>
+        <mat-hint class="subtext">
+          Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
+          temporary or permanent drainage, etc.
+        </mat-hint>
+        <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div>
       </div>
-      <mat-hint class="subtext">
-        Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
-        temporary or permanent drainage, etc.
-      </mat-hint>
-      <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div>
-    </div>
+    </ng-container>
+
     <div class="full-row">
       <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label>
       <div class="subtext">A visual representation of your proposal.</div>
@@ -356,159 +363,163 @@ <h2>Proposal</h2>
         [showVirusError]="showProposalMapVirus"
       ></app-file-drag-drop>
     </div>
-    <div class="full-row">
-      <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label>
-      <div class="subtext">Include North-South and East-West cross sections</div>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Removal of Soil & Placement of Fill</a
-        >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="cross-section"
-        [uploadedFiles]="crossSections"
-        (uploadFiles)="attachCrossSection($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [allowMultiple]="true"
-        [showVirusError]="showCrossSectionVirus"
-      ></app-file-drag-drop>
-    </div>
-    <div class="full-row">
-      <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label>
-      <div class="subtext">
-        The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's
-        agricultural capability assessment.
-      </div>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Removal of Soil & Placement of Fill</a
-        >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="reclamation-plan"
-        [uploadedFiles]="reclamationPlan"
-        (uploadFiles)="attachReclamationPlan($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [allowMultiple]="true"
-        [showVirusError]="showReclamationPlanVirus"
-      ></app-file-drag-drop>
-    </div>
 
-    <div class="full-row">
-      <mat-label for="isExtractionOrMining">Is your proposal for aggregate extraction or placer mining?</mat-label>
-      <div>
-        <mat-button-toggle-group
-          class="input"
-          (change)="onChangeMiningExtraction($event.value)"
-          id="isExtractionOrMining"
-          formControlName="isExtractionOrMining"
-        >
-          <mat-button-toggle
-            class="toggle-button"
-            [ngClass]="{
-              'error-outline':
-                isExtractionOrMining.invalid && (isExtractionOrMining.dirty || isExtractionOrMining.touched)
-            }"
-            value="true"
-            >Yes
-          </mat-button-toggle>
-          <mat-button-toggle
-            class="toggle-button"
-            [ngClass]="{
-              'error-outline':
-                isExtractionOrMining.invalid && (isExtractionOrMining.dirty || isExtractionOrMining.touched)
-            }"
-            value="false"
-            >No
-          </mat-button-toggle>
-        </mat-button-toggle-group>
+    <ng-container *ngIf="isNewStructure.value === false">
+      <div class="full-row">
+        <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label>
+        <div class="subtext">Include North-South and East-West cross sections</div>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Removal of Soil & Placement of Fill</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="cross-section"
+          [uploadedFiles]="crossSections"
+          (uploadFiles)="attachCrossSection($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [allowMultiple]="true"
+          [showVirusError]="showCrossSectionVirus"
+        ></app-file-drag-drop>
       </div>
-      <div
-        *ngIf="isExtractionOrMining.invalid && (isExtractionOrMining.dirty || isExtractionOrMining.touched)"
-        class="field-error"
-      >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="isExtractionOrMining.errors?.['required']">This field is required</div>
+
+      <div class="full-row">
+        <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label>
+        <div class="subtext">
+          The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's
+          agricultural capability assessment.
+        </div>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Removal of Soil & Placement of Fill</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="reclamation-plan"
+          [uploadedFiles]="reclamationPlan"
+          (uploadFiles)="attachReclamationPlan($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [allowMultiple]="true"
+          [showVirusError]="showReclamationPlanVirus"
+        ></app-file-drag-drop>
       </div>
-    </div>
 
-    <div class="full-row">
-      <mat-label for="hasSubmittedNotice">
-        Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
-      </mat-label>
-      <div class="subtext">If yes, please attach the Notice of Work in the section below.</div>
-      <div>
-        <mat-button-toggle-group
-          class="input"
-          (change)="onChangeNoticeOfWork($event.value)"
-          id="hasSubmittedNotice"
-          formControlName="hasSubmittedNotice"
+      <div class="full-row">
+        <mat-label for="isExtractionOrMining">Is your proposal for aggregate extraction or placer mining?</mat-label>
+        <div>
+          <mat-button-toggle-group
+            class="input"
+            (change)="onChangeMiningExtraction($event.value)"
+            id="isExtractionOrMining"
+            formControlName="isExtractionOrMining"
+          >
+            <mat-button-toggle
+              class="toggle-button"
+              [ngClass]="{
+                'error-outline':
+                  isExtractionOrMining.invalid && (isExtractionOrMining.dirty || isExtractionOrMining.touched),
+              }"
+              value="true"
+              >Yes
+            </mat-button-toggle>
+            <mat-button-toggle
+              class="toggle-button"
+              [ngClass]="{
+                'error-outline':
+                  isExtractionOrMining.invalid && (isExtractionOrMining.dirty || isExtractionOrMining.touched),
+              }"
+              value="false"
+              >No
+            </mat-button-toggle>
+          </mat-button-toggle-group>
+        </div>
+        <div
+          *ngIf="isExtractionOrMining.invalid && (isExtractionOrMining.dirty || isExtractionOrMining.touched)"
+          class="field-error"
         >
-          <mat-button-toggle
-            class="toggle-button"
-            [ngClass]="{
-              'error-outline': hasSubmittedNotice.invalid && (hasSubmittedNotice.dirty || hasSubmittedNotice.touched)
-            }"
-            value="true"
-            >Yes
-          </mat-button-toggle>
-          <mat-button-toggle
-            class="toggle-button"
-            [ngClass]="{
-              'error-outline': hasSubmittedNotice.invalid && (hasSubmittedNotice.dirty || hasSubmittedNotice.touched)
-            }"
-            value="false"
-            >No
-          </mat-button-toggle>
-        </mat-button-toggle-group>
-      </div>
-      <div
-        *ngIf="hasSubmittedNotice.invalid && (hasSubmittedNotice.dirty || hasSubmittedNotice.touched)"
-        class="field-error"
-      >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="hasSubmittedNotice.errors?.['required']">This field is required</div>
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="isExtractionOrMining.errors?.['required']">This field is required</div>
+        </div>
       </div>
-    </div>
 
-    <div class="full-row">
-      <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Removal of Soil & Placement of Fill</a
+      <div class="full-row">
+        <mat-label for="hasSubmittedNotice">
+          Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
+        </mat-label>
+        <div class="subtext">If yes, please attach the Notice of Work in the section below.</div>
+        <div>
+          <mat-button-toggle-group
+            class="input"
+            (change)="onChangeNoticeOfWork($event.value)"
+            id="hasSubmittedNotice"
+            formControlName="hasSubmittedNotice"
+          >
+            <mat-button-toggle
+              class="toggle-button"
+              [ngClass]="{
+                'error-outline': hasSubmittedNotice.invalid && (hasSubmittedNotice.dirty || hasSubmittedNotice.touched),
+              }"
+              value="true"
+              >Yes
+            </mat-button-toggle>
+            <mat-button-toggle
+              class="toggle-button"
+              [ngClass]="{
+                'error-outline': hasSubmittedNotice.invalid && (hasSubmittedNotice.dirty || hasSubmittedNotice.touched),
+              }"
+              value="false"
+              >No
+            </mat-button-toggle>
+          </mat-button-toggle-group>
+        </div>
+        <div
+          *ngIf="hasSubmittedNotice.invalid && (hasSubmittedNotice.dirty || hasSubmittedNotice.touched)"
+          class="field-error"
         >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="noticeOfWork"
-        [uploadedFiles]="noticeOfWork"
-        (uploadFiles)="attachNoticeOfWork($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [disabled]="!requiresNoticeOfWork"
-        [allowMultiple]="true"
-        [showVirusError]="showNoticeOfWorkVirus"
-      ></app-file-drag-drop>
-    </div>
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="hasSubmittedNotice.errors?.['required']">This field is required</div>
+        </div>
+      </div>
+
+      <div class="full-row">
+        <mat-label class="subheading2" for="noticeOfWork">Notice of Work</mat-label>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Removal of Soil & Placement of Fill</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="noticeOfWork"
+          [uploadedFiles]="noticeOfWork"
+          (uploadFiles)="attachNoticeOfWork($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [disabled]="!requiresNoticeOfWork"
+          [allowMultiple]="true"
+          [showVirusError]="showNoticeOfWorkVirus"
+        ></app-file-drag-drop>
+      </div>
+    </ng-container>
   </div>
 </form>
 <div class="button-container">

From 981e73c4e37362bec32f539b18000ea37af1dba8 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:17:16 -0700
Subject: [PATCH 07/45] Add all new questions to DB

---
 .../application-submission.entity.ts          | 30 +++++++++++++++++++
 ...-add_new_app_soil_conditional_questions.ts | 26 ++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 services/apps/alcs/src/providers/typeorm/migrations/1729108829555-add_new_app_soil_conditional_questions.ts

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts
index 9e18ff570..fa03e56b8 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.entity.ts
@@ -17,6 +17,7 @@ import { ColumnNumericTransformer } from '../../utils/column-numeric-transform';
 import { ApplicationOwner } from './application-owner/application-owner.entity';
 import { ApplicationParcel } from './application-parcel/application-parcel.entity';
 import { NaruSubtype } from './naru-subtype/naru-subtype.entity';
+import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.entity';
 
 export class ProposedLot {
   type: 'Lot' | 'Road Dedication' | null;
@@ -571,6 +572,35 @@ export class ApplicationSubmission extends Base {
   @Column({ type: 'boolean', nullable: true })
   soilHasSubmittedNotice: boolean | null;
 
+  @AutoMap(() => String)
+  @Column({ type: 'text', nullable: true })
+  soilStructureFarmUseReason: string | null;
+
+  @AutoMap(() => String)
+  @Column({ type: 'text', nullable: true })
+  soilStructureResidentialUseReason: string | null;
+
+  @AutoMap(() => String)
+  @Column({ type: 'text', nullable: true })
+  soilAgriParcelActivity: string | null;
+
+  @AutoMap(() => String)
+  @Column({ type: 'text', nullable: true })
+  soilStructureResidentialAccessoryUseReason: string | null;
+
+  @AutoMap(() => String)
+  @Column({ type: 'text', nullable: true })
+  soilStructureOtherUseReason: string | null;
+
+  @AutoMap(() => ProposedStructure)
+  @Column({
+    comment: 'JSONB Column containing the proposed structures',
+    type: 'jsonb',
+    array: false,
+    default: () => `'[]'`,
+  })
+  soilProposedStructures: ProposedStructure[];
+
   @AutoMap(() => Boolean)
   @Column({ type: 'boolean', nullable: true })
   naruWillBeOverFiveHundredM2: boolean | null;
diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1729108829555-add_new_app_soil_conditional_questions.ts b/services/apps/alcs/src/providers/typeorm/migrations/1729108829555-add_new_app_soil_conditional_questions.ts
new file mode 100644
index 000000000..6f64eebfd
--- /dev/null
+++ b/services/apps/alcs/src/providers/typeorm/migrations/1729108829555-add_new_app_soil_conditional_questions.ts
@@ -0,0 +1,26 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class AddNewAppSoilConditionalQuestions1729108829555 implements MigrationInterface {
+    name = 'AddNewAppSoilConditionalQuestions1729108829555'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_structure_farm_use_reason" text`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_structure_residential_use_reason" text`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_agri_parcel_activity" text`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_structure_residential_accessory_use_reason" text`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_structure_other_use_reason" text`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" ADD "soil_proposed_structures" jsonb NOT NULL DEFAULT '[]'`);
+        await queryRunner.query(`COMMENT ON COLUMN "alcs"."application_submission"."soil_proposed_structures" IS 'JSONB Column containing the proposed structures'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`COMMENT ON COLUMN "alcs"."application_submission"."soil_proposed_structures" IS 'JSONB Column containing the proposed structures'`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_proposed_structures"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_structure_other_use_reason"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_structure_residential_accessory_use_reason"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_agri_parcel_activity"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_structure_residential_use_reason"`);
+        await queryRunner.query(`ALTER TABLE "alcs"."application_submission" DROP COLUMN "soil_structure_farm_use_reason"`);
+    }
+
+}

From 52888edd2289c9889ba87bb06415e90ce511bf8e Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:44:42 -0700
Subject: [PATCH 08/45] Add new conditional structure questions to all services
 and DTO's

---
 .../services/application/application.dto.ts   |  5 +++
 .../application-submission.dto.ts             | 10 ++++++
 .../services/public/public-application.dto.ts |  5 +++
 .../application-submission.dto.ts             | 35 +++++++++++++++++++
 .../application-submission.service.ts         | 26 ++++++++++++++
 .../application/public-application.dto.ts     | 15 ++++++++
 6 files changed, 96 insertions(+)

diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts
index 47007b877..77a1662cf 100644
--- a/alcs-frontend/src/app/services/application/application.dto.ts
+++ b/alcs-frontend/src/app/services/application/application.dto.ts
@@ -198,6 +198,11 @@ export interface ApplicationSubmissionDto {
   soilAlternativeMeasures: string | null;
   soilIsExtractionOrMining: boolean | null;
   soilHasSubmittedNotice: boolean | null;
+  soilStructureFarmUseReason: string | null;
+  soilStructureResidentialUseReason: string | null;
+  soilAgriParcelActivity: string | null;
+  soilStructureResidentialAccessoryUseReason: string | null;
+  soilStructureOtherUseReason: string | null;
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;
diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
index 9fda0e0ff..e956e48b9 100644
--- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
+++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
@@ -140,6 +140,11 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD
   soilAlternativeMeasures: string | null;
   soilIsExtractionOrMining: boolean;
   soilHasSubmittedNotice: boolean;
+  soilStructureFarmUseReason: string | null;
+  soilStructureResidentialUseReason: string | null;
+  soilAgriParcelActivity: string | null;
+  soilStructureResidentialAccessoryUseReason: string | null;
+  soilStructureOtherUseReason: string | null;
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;
@@ -260,6 +265,11 @@ export interface ApplicationSubmissionUpdateDto {
   soilAlternativeMeasures?: string | null;
   soilIsExtractionOrMining?: boolean | null;
   soilHasSubmittedNotice?: boolean | null;
+  soilStructureFarmUseReason?: string | null;
+  soilStructureResidentialUseReason?: string | null;
+  soilAgriParcelActivity?: string | null;
+  soilStructureResidentialAccessoryUseReason?: string | null;
+  soilStructureOtherUseReason?: string | null;
 
   //NARU Fields
   naruWillBeOverFiveHundredM2?: boolean | null;
diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts
index fba76b98d..967b49111 100644
--- a/portal-frontend/src/app/services/public/public-application.dto.ts
+++ b/portal-frontend/src/app/services/public/public-application.dto.ts
@@ -105,6 +105,11 @@ export interface PublicApplicationSubmissionDto {
   soilAlternativeMeasures?: string | null;
   soilIsExtractionOrMining?: boolean;
   soilHasSubmittedNotice?: boolean;
+  soilStructureFarmUseReason?: string | null;
+  soilStructureResidentialUseReason?: string | null;
+  soilAgriParcelActivity?: string | null;
+  soilStructureResidentialAccessoryUseReason?: string | null;
+  soilStructureOtherUseReason?: string | null;
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
index 50b6aa116..1b4b09a39 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
@@ -245,6 +245,21 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto {
   @AutoMap(() => Boolean)
   soilHasSubmittedNotice?: boolean;
 
+  @AutoMap(() => String)
+  soilStructureFarmUseReason?: string | null;
+
+  @AutoMap(() => String)
+  soilStructureResidentialUseReason?: string | null;
+
+  @AutoMap(() => String)
+  soilAgriParcelActivity?: string | null;
+
+  @AutoMap(() => String)
+  soilStructureResidentialAccessoryUseReason?: string | null;
+
+  @AutoMap(() => String)
+  soilStructureOtherUseReason?: string | null;
+
   @AutoMap(() => Boolean)
   naruWillBeOverFiveHundredM2: boolean | null;
 
@@ -661,6 +676,26 @@ export class ApplicationSubmissionUpdateDto {
   @IsOptional()
   soilHasSubmittedNotice?: boolean;
 
+  @IsString()
+  @IsOptional()
+  soilStructureFarmUseReason?: string | null;
+
+  @IsString()
+  @IsOptional()
+  soilStructureResidentialUseReason?: string | null;
+
+  @IsString()
+  @IsOptional()
+  soilAgriParcelActivity?: string | null;
+
+  @IsString()
+  @IsOptional()
+  soilStructureResidentialAccessoryUseReason?: string | null;
+
+  @IsString()
+  @IsOptional()
+  soilStructureOtherUseReason?: string | null;
+
   //NARU Fields
   @IsBoolean()
   @IsOptional()
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
index 946698d80..2cb64f663 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
@@ -924,6 +924,32 @@ export class ApplicationSubmissionService {
       applicationSubmission.soilHasSubmittedNotice,
     );
 
+    applicationSubmission.soilStructureFarmUseReason = filterUndefined(
+      updateDto.soilStructureFarmUseReason,
+      applicationSubmission.soilStructureFarmUseReason,
+    );
+
+    applicationSubmission.soilStructureResidentialUseReason = filterUndefined(
+      updateDto.soilStructureResidentialUseReason,
+      applicationSubmission.soilStructureResidentialUseReason,
+    );
+
+    applicationSubmission.soilAgriParcelActivity = filterUndefined(
+      updateDto.soilAgriParcelActivity,
+      applicationSubmission.soilAgriParcelActivity,
+    );
+
+    applicationSubmission.soilStructureResidentialAccessoryUseReason =
+      filterUndefined(
+        updateDto.soilStructureResidentialAccessoryUseReason,
+        applicationSubmission.soilStructureResidentialAccessoryUseReason,
+      );
+
+    applicationSubmission.soilStructureOtherUseReason = filterUndefined(
+      updateDto.soilStructureOtherUseReason,
+      applicationSubmission.soilStructureOtherUseReason,
+    );
+
     if (
       updateDto.soilHasSubmittedNotice === false ||
       updateDto.soilIsExtractionOrMining === false
diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts
index fb25711f4..2e10da26f 100644
--- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts
+++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts
@@ -226,6 +226,21 @@ export class PublicApplicationSubmissionDto {
   @AutoMap(() => Boolean)
   soilHasSubmittedNotice?: boolean;
 
+  @AutoMap(() => String)
+  soilStructureFarmUseReason?: string | null;
+
+  @AutoMap(() => String)
+  soilStructureResidentialUseReason?: string | null;
+
+  @AutoMap(() => String)
+  soilAgriParcelActivity?: string | null;
+
+  @AutoMap(() => String)
+  soilStructureResidentialAccessoryUseReason?: string | null;
+
+  @AutoMap(() => String)
+  soilStructureOtherUseReason?: string | null;
+
   //NARU Fields
   @AutoMap(() => Boolean)
   naruWillBeOverFiveHundredM2: boolean | null;

From c5600ab4a5eb0d43d8ea4e1da3d00e538d695bc5 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 13:54:39 -0700
Subject: [PATCH 09/45] Add missed DTO field

---
 .../application-submission/application-submission.dto.ts         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
index e956e48b9..6005d9cbb 100644
--- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
+++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
@@ -239,6 +239,7 @@ export interface ApplicationSubmissionUpdateDto {
   subdProposedLots?: ProposedLot[];
 
   //Soil Fields
+  soilIsNewStructure?: boolean | null;
   soilIsFollowUp?: boolean | null;
   soilFollowUpIDs?: string | null;
   soilTypeRemoved?: string | null;

From 7c12b6730607c654c8ee35b0f5287780ae687dc2 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:13:37 -0700
Subject: [PATCH 10/45] Add structures to all DTO's and services

---
 .../src/app/services/application/application.dto.ts       | 1 +
 .../application-submission/application-submission.dto.ts  | 3 +++
 .../src/app/services/public/public-application.dto.ts     | 2 ++
 .../application-submission/application-submission.dto.ts  | 8 ++++++++
 .../application-submission.service.ts                     | 5 +++++
 .../portal/public/application/public-application.dto.ts   | 4 ++++
 6 files changed, 23 insertions(+)

diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts
index 77a1662cf..b26abcdc6 100644
--- a/alcs-frontend/src/app/services/application/application.dto.ts
+++ b/alcs-frontend/src/app/services/application/application.dto.ts
@@ -203,6 +203,7 @@ export interface ApplicationSubmissionDto {
   soilAgriParcelActivity: string | null;
   soilStructureResidentialAccessoryUseReason: string | null;
   soilStructureOtherUseReason: string | null;
+  soilProposedStructures: string | null;
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;
diff --git a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
index 6005d9cbb..fc3cd2e53 100644
--- a/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
+++ b/portal-frontend/src/app/services/application-submission/application-submission.dto.ts
@@ -1,5 +1,6 @@
 import { BaseCodeDto } from '../../shared/dto/base.dto';
 import { ApplicationOwnerDetailedDto } from '../application-owner/application-owner.dto';
+import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto';
 
 export enum SUBMISSION_STATUS {
   IN_PROGRESS = 'PROG',
@@ -145,6 +146,7 @@ export interface ApplicationSubmissionDetailedDto extends ApplicationSubmissionD
   soilAgriParcelActivity: string | null;
   soilStructureResidentialAccessoryUseReason: string | null;
   soilStructureOtherUseReason: string | null;
+  soilProposedStructures: ProposedStructure[];
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;
@@ -271,6 +273,7 @@ export interface ApplicationSubmissionUpdateDto {
   soilAgriParcelActivity?: string | null;
   soilStructureResidentialAccessoryUseReason?: string | null;
   soilStructureOtherUseReason?: string | null;
+  soilProposedStructures?: ProposedStructure[];
 
   //NARU Fields
   naruWillBeOverFiveHundredM2?: boolean | null;
diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts
index 967b49111..744878fb9 100644
--- a/portal-frontend/src/app/services/public/public-application.dto.ts
+++ b/portal-frontend/src/app/services/public/public-application.dto.ts
@@ -4,6 +4,7 @@ import {
   NaruSubtypeDto,
   ProposedLot,
 } from '../application-submission/application-submission.dto';
+import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.dto';
 import { PublicDocumentDto, PublicOwnerDto, PublicParcelDto } from './public.dto';
 
 export interface ExistingResidence {
@@ -110,6 +111,7 @@ export interface PublicApplicationSubmissionDto {
   soilAgriParcelActivity?: string | null;
   soilStructureResidentialAccessoryUseReason?: string | null;
   soilStructureOtherUseReason?: string | null;
+  soilProposedStructures?: ProposedStructure[];
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
index 1b4b09a39..33d131c02 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.dto.ts
@@ -20,6 +20,7 @@ import {
   ProposedLot,
   ProposedResidence,
 } from './application-submission.entity';
+import { ProposedStructure } from '../notice-of-intent-submission/notice-of-intent-submission.entity';
 
 export const MAX_DESCRIPTION_FIELD_LENGTH = 4000;
 export const MAX_LANDUSE_FIELD_LENGTH = 500;
@@ -260,6 +261,9 @@ export class ApplicationSubmissionDetailedDto extends ApplicationSubmissionDto {
   @AutoMap(() => String)
   soilStructureOtherUseReason?: string | null;
 
+  @AutoMap(() => [ProposedStructure])
+  soilProposedStructures: ProposedStructure[];
+
   @AutoMap(() => Boolean)
   naruWillBeOverFiveHundredM2: boolean | null;
 
@@ -696,6 +700,10 @@ export class ApplicationSubmissionUpdateDto {
   @IsOptional()
   soilStructureOtherUseReason?: string | null;
 
+  @IsArray()
+  @IsOptional()
+  soilProposedStructures?: ProposedStructure[];
+
   //NARU Fields
   @IsBoolean()
   @IsOptional()
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
index 2cb64f663..c08061172 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
@@ -950,6 +950,11 @@ export class ApplicationSubmissionService {
       applicationSubmission.soilStructureOtherUseReason,
     );
 
+    applicationSubmission.soilProposedStructures = filterUndefined(
+      updateDto.soilProposedStructures,
+      applicationSubmission.soilProposedStructures,
+    );
+
     if (
       updateDto.soilHasSubmittedNotice === false ||
       updateDto.soilIsExtractionOrMining === false
diff --git a/services/apps/alcs/src/portal/public/application/public-application.dto.ts b/services/apps/alcs/src/portal/public/application/public-application.dto.ts
index 2e10da26f..b76817ba3 100644
--- a/services/apps/alcs/src/portal/public/application/public-application.dto.ts
+++ b/services/apps/alcs/src/portal/public/application/public-application.dto.ts
@@ -7,6 +7,7 @@ import {
   ProposedResidence,
 } from '../../application-submission/application-submission.entity';
 import { PublicOwnerDto } from '../public.dto';
+import { ProposedStructure } from '../../notice-of-intent-submission/notice-of-intent-submission.entity';
 
 export class PublicApplicationSubmissionDto {
   @AutoMap()
@@ -241,6 +242,9 @@ export class PublicApplicationSubmissionDto {
   @AutoMap(() => String)
   soilStructureOtherUseReason?: string | null;
 
+  @AutoMap(() => [ProposedStructure])
+  soilProposedStructures: ProposedStructure[];
+
   //NARU Fields
   @AutoMap(() => Boolean)
   naruWillBeOverFiveHundredM2: boolean | null;

From d46bfab079721462bc58852f78323f99977c7c5d Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:18:21 -0700
Subject: [PATCH 11/45] Expose structure form type for use by other modules

---
 .../structure-mobile-card/structure-mobile-card.component.ts  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/portal-frontend/src/app/shared/mobile/structure-mobile-card/structure-mobile-card.component.ts b/portal-frontend/src/app/shared/mobile/structure-mobile-card/structure-mobile-card.component.ts
index 43765d936..a0c616a73 100644
--- a/portal-frontend/src/app/shared/mobile/structure-mobile-card/structure-mobile-card.component.ts
+++ b/portal-frontend/src/app/shared/mobile/structure-mobile-card/structure-mobile-card.component.ts
@@ -1,7 +1,7 @@
 import { Component, EventEmitter, Input, Output, type OnInit } from '@angular/core';
 import {
   FormProposedStructure,
-  NOI_STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPE_LABEL_MAP,
   STRUCTURE_TYPES,
 } from '../../../features/notice-of-intents/edit-submission/additional-information/additional-information.component';
 import { ProposedStructure } from '../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
@@ -39,7 +39,7 @@ export class StructureMobileCardComponent implements OnInit {
       return null;
     }
 
-    return NOI_STRUCTURE_TYPE_LABEL_MAP[value];
+    return STRUCTURE_TYPE_LABEL_MAP[value];
   }
 
   isResidential(type: STRUCTURE_TYPES | null): boolean {

From 736d832b127cc67eee17e2e321e1d48d1cf1bebc Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:21:02 -0700
Subject: [PATCH 12/45] Add structures table and conditional questions to UI

---
 .../pfrs-proposal.component.html              | 291 ++++++++++++++++++
 .../pfrs-proposal/pfrs-proposal.component.ts  | 192 +++++++++++-
 2 files changed, 482 insertions(+), 1 deletion(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index 36d2a6484..7fbf77592 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -289,6 +289,297 @@ <h2>Proposal</h2>
       <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div>
     </div>
 
+    <ng-container *ngIf="isNewStructure.value === true">
+      <form [formGroup]="structuresForm">
+        <mat-label>Provide the total floor area (m<sup>2</sup>) of the proposed structure(s)</mat-label>
+        <div class="scrollable">
+          <table mat-table [dataSource]="structuresSource">
+            <ng-container matColumnDef="index">
+              <th mat-header-cell *matHeaderCellDef>#</th>
+              <td mat-cell *matCellDef="let i = index">{{ i + 1 }}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="type">
+              <th mat-header-cell *matHeaderCellDef>Type</th>
+              <td mat-cell *matCellDef="let element">
+                <mat-form-field appearance="outline">
+                  <mat-select
+                    [value]="element.type"
+                    placeholder="Please select"
+                    [formControlName]="element.id + '-type'"
+                    (valueChange)="onChangeStructureType(element.id, $event)"
+                  >
+                    <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
+                      {{ type.label }}
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+                <div
+                  *ngIf="
+                    structuresForm.controls[element.id + '-type']!.invalid &&
+                    (structuresForm.controls[element.id + '-type']!.dirty ||
+                      structuresForm.controls[element.id + '-type']!.touched)
+                  "
+                  class="field-error"
+                >
+                  <mat-icon>warning</mat-icon>
+                  <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
+                    This field is required
+                  </div>
+                </div>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="area">
+              <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
+              <td mat-cell *matCellDef="let element">
+                <mat-form-field appearance="outline">
+                  <input
+                    type="text"
+                    matInput
+                    thousandSeparator=","
+                    mask="separator.5"
+                    separatorLimit="9999999999"
+                    min="0.01"
+                    placeholder="Type area"
+                    [formControlName]="element.id + '-area'"
+                  />
+                  <span matTextSuffix>m<sup>2</sup></span>
+                </mat-form-field>
+                <div
+                  *ngIf="
+                    structuresForm.controls[element.id + '-area']!.invalid &&
+                    (structuresForm.controls[element.id + '-area']!.dirty ||
+                      structuresForm.controls[element.id + '-area']!.touched)
+                  "
+                  class="field-error"
+                >
+                  <mat-icon>warning</mat-icon>
+                  <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
+                    This field is required
+                  </div>
+                </div>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="action">
+              <th mat-header-cell *matHeaderCellDef>Action</th>
+              <td mat-cell *matCellDef="let element">
+                <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
+                  Remove
+                </button>
+              </td>
+            </ng-container>
+
+            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+
+            <tr class="mat-row no-data" *matNoDataRow>
+              <td class="text-center" colspan="7">
+                No Proposed Structures Entered. Use the button below to add your first structure.
+              </td>
+            </tr>
+          </table>
+        </div>
+      </form>
+
+      <div class="full-row">
+        <button
+          mat-stroked-button
+          color="primary"
+          (click)="onStructureAdd()"
+          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+          type="button"
+        >
+          + Add Structure
+        </button>
+        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+          At least one structure is required
+        </app-validation-error>
+      </div>
+
+      <div class="full-row">
+        <app-warning-banner>
+          Selected proposed structure type(s) will determine the proposal questions below
+        </app-warning-banner>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.FARM_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureFarmUseReason">Describe how the structure is necessary for farm use</label>
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#farmstructures" target="_blank"
+            >Farm Structures in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureFarmUseReason"
+            #soilStructureFarmUseReasonText
+            maxlength="4000"
+            id="soilStructureFarmUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureFarmUseReason.invalid &&
+            (soilStructureFarmUseReason.dirty || soilStructureFarmUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureFarmUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureFarmUseReasonText.textLength }}</div>
+      </div>
+
+      <div class="full-row">
+        <label for="soilAgriParcelActivity"
+          >Describe the current or proposed agricultural activity on the parcel(s)</label
+        >
+        <div class="subtext">Include the area, yields, crop types, and farm equipment size and attachments</div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilAgriParcelActivity"
+            #soilAgriParcelActivityText
+            maxlength="4000"
+            id="soilAgriParcelActivity"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="soilAgriParcelActivity.invalid && (soilAgriParcelActivity.dirty || soilAgriParcelActivity.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilAgriParcelActivity.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilAgriParcelActivityText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container
+      *ngIf="
+        structureTypeCounts[structureTypes.PRINCIPAL_RESIDENCE] > 0 ||
+        structureTypeCounts[structureTypes.ADDITIONAL_RESIDENCE] > 0 ||
+        structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0
+      "
+    >
+      <div class="full-row">
+        <label for="soilStructureResidentialUseReason"
+          >Describe why <ng-container *ngIf="typeCode === 'POFO'">placing fill</ng-container>
+          <ng-container *ngIf="typeCode === 'ROSO'">removing soil</ng-container>
+          <ng-container *ngIf="typeCode === 'PFRS'">placing fill/removing soil</ng-container> is required for the
+          residential structure(s)</label
+        >
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+            >Housing in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureResidentialUseReason"
+            #soilStructureResidentialUseReasonText
+            maxlength="4000"
+            id="soilStructureResidentialUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureResidentialUseReason.invalid &&
+            (soilStructureResidentialUseReason.dirty || soilStructureResidentialUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureResidentialUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureResidentialUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureResidentialAccessoryUseReason"
+          >Describe the intended use of the residential accessory structure(s) and why
+          <ng-container *ngIf="typeCode === 'POFO'">placing fill</ng-container>
+          <ng-container *ngIf="typeCode === 'ROSO'">removing soil</ng-container>
+          <ng-container *ngIf="typeCode === 'PFRS'">placing fill/removing soil</ng-container> is required</label
+        >
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+            >Housing in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureResidentialAccessoryUseReason"
+            #structureResidentialAccessoryUseReasonText
+            maxlength="4000"
+            id="soilStructureResidentialAccessoryUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureResidentialAccessoryUseReason.invalid &&
+            (soilStructureResidentialAccessoryUseReason.dirty || soilStructureResidentialAccessoryUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureResidentialAccessoryUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - structureResidentialAccessoryUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.OTHER_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureOtherUseReason">
+          Describe the intended use of the 'Other' structure(s) and why
+          <ng-container *ngIf="typeCode === 'POFO'">placing fill</ng-container>
+          <ng-container *ngIf="typeCode === 'ROSO'">removing soil</ng-container>
+          <ng-container *ngIf="typeCode === 'PFRS'">placing fill/removing soil</ng-container> is required
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureOtherUseReason"
+            #soilStructureOtherUseReasonText
+            maxlength="4000"
+            id="soilStructureOtherUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureOtherUseReason.invalid &&
+            (soilStructureOtherUseReason.dirty || soilStructureOtherUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureOtherUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureOtherUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
     <ng-container *ngIf="isNewStructure.value === false">
       <div class="full-row">
         <label for="alternativeMeasures"
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 165a70c02..ff656c899 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -16,6 +16,16 @@ import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'
 import { EditApplicationSteps } from '../../edit-submission.component';
 import { FilesStepComponent } from '../../files-step.partial';
 import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component';
+import { MatTableDataSource } from '@angular/material/table';
+import { ConfirmationDialogService } from 'src/app/shared/confirmation-dialog/confirmation-dialog.service';
+import { v4 } from 'uuid';
+import {
+  STRUCTURE_TYPES,
+  STRUCTURE_TYPE_OPTIONS,
+  FormProposedStructure,
+} from 'src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component';
+import { TurDetailsComponent } from '../../../application-details/tur-details/tur-details.component';
+import { ProposedStructure } from 'src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto';
 
 @Component({
   selector: 'app-pfrs-proposal',
@@ -32,6 +42,14 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
 
   DOCUMENT = DOCUMENT_TYPE;
 
+  structureTypes = STRUCTURE_TYPES;
+  structureTypeOptions = STRUCTURE_TYPE_OPTIONS;
+  structureTypeCounts: Record<STRUCTURE_TYPES, number> = Object.fromEntries(
+    Object.entries(STRUCTURE_TYPES).map(([_, type]) => [type, 0]),
+  ) as { [key in STRUCTURE_TYPES]: number };
+
+  typeCode: string = '';
+
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
@@ -56,6 +74,13 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   isExtractionOrMining = new FormControl<string | null>(null, [Validators.required]);
   hasSubmittedNotice = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]);
 
+  // Conditional structure questions
+  soilStructureFarmUseReason = new FormControl<string | null>(null);
+  soilStructureResidentialUseReason = new FormControl<string | null>(null);
+  soilAgriParcelActivity = new FormControl<string | null>(null);
+  soilStructureResidentialAccessoryUseReason = new FormControl<string | null>(null);
+  soilStructureOtherUseReason = new FormControl<string | null>(null);
+
   form = new FormGroup({
     isNewStructure: this.isNewStructure,
     isFollowUp: this.isFollowUp,
@@ -69,8 +94,18 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     alternativeMeasures: this.alternativeMeasures,
     isExtractionOrMining: this.isExtractionOrMining,
     hasSubmittedNotice: this.hasSubmittedNotice,
+    soilStructureFarmUseReason: this.soilStructureFarmUseReason,
+    soilStructureResidentialUseReason: this.soilStructureResidentialUseReason,
+    soilAgriParcelActivity: this.soilAgriParcelActivity,
+    soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason,
+    soilStructureOtherUseReason: this.soilStructureOtherUseReason,
   });
 
+  proposedStructures: FormProposedStructure[] = [];
+  structuresSource = new MatTableDataSource(this.proposedStructures);
+  displayedColumns = ['index', 'type', 'area', 'action'];
+  structuresForm = new FormGroup({} as any);
+
   private submissionUuid = '';
   isMobile = false;
   removalTableData: SoilTableData = {};
@@ -83,7 +118,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     private applicationService: ApplicationSubmissionService,
     applicationDocumentService: ApplicationDocumentService,
     dialog: MatDialog,
-    toastService: ToastService
+    toastService: ToastService,
+    private confirmationDialogService: ConfirmationDialogService,
   ) {
     super(applicationDocumentService, dialog, toastService);
   }
@@ -95,6 +131,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
       if (applicationSubmission) {
         this.fileId = applicationSubmission.fileNumber;
         this.submissionUuid = applicationSubmission.uuid;
+        this.typeCode = applicationSubmission.typeCode;
 
         this.alreadyRemovedTableData = {
           volume: applicationSubmission.soilAlreadyRemovedVolume ?? 0,
@@ -137,6 +174,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
         }
 
         this.form.patchValue({
+          isNewStructure: applicationSubmission.soilIsNewStructure,
           isFollowUp: formatBooleanToString(applicationSubmission.soilIsFollowUp),
           followUpIDs: applicationSubmission.soilFollowUpIDs,
           purpose: applicationSubmission.purpose,
@@ -148,7 +186,18 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
           fillProjectDuration: applicationSubmission.fillProjectDuration,
           isExtractionOrMining: formatBooleanToString(applicationSubmission.soilIsExtractionOrMining),
           hasSubmittedNotice: formatBooleanToString(applicationSubmission.soilHasSubmittedNotice),
+          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
+          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
+          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
+          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
+          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
         });
+
+        this.structuresForm = new FormGroup({});
+        for (const structure of applicationSubmission.soilProposedStructures) {
+          this.addStructure(structure.type, structure.area);
+        }
+
         if (this.showErrors) {
           this.form.markAllAsTouched();
         }
@@ -189,6 +238,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
 
   protected async save() {
     if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
+      const isNewStructure = this.isNewStructure.getRawValue();
       const isFollowUp = this.isFollowUp.getRawValue();
       const followUpIDs = this.followUpIDs.getRawValue();
       const purpose = this.purpose.getRawValue();
@@ -197,12 +247,22 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
       const soilFillTypeToPlace = this.fillTypeToPlace.getRawValue();
       const soilAlternativeMeasures = this.alternativeMeasures.getRawValue();
 
+      const updatedStructures: ProposedStructure[] = this.proposedStructures.map((lot) => {
+        const lotType = this.structuresForm.controls[`${lot.id}-type`].value;
+        const lotArea = this.structuresForm.controls[`${lot.id}-area`].value;
+        return {
+          type: lotType,
+          area: lotArea ? parseFloat(lotArea) : null,
+        };
+      });
+
       const updateDto: ApplicationSubmissionUpdateDto = {
         purpose,
         soilTypeRemoved,
         soilFillTypeToPlace,
         soilReduceNegativeImpacts,
         soilAlternativeMeasures,
+        soilIsNewStructure: isNewStructure,
         soilIsFollowUp: parseStringToBoolean(isFollowUp),
         soilFollowUpIDs: followUpIDs,
         soilToRemoveVolume: this.removalTableData?.volume ?? null,
@@ -224,7 +284,13 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
         soilProjectDuration: this.soilProjectDuration.value,
         fillProjectDuration: this.fillProjectDuration.value,
         soilHasSubmittedNotice: parseStringToBoolean(this.hasSubmittedNotice.getRawValue()),
+        soilStructureFarmUseReason: this.soilStructureFarmUseReason.value,
+        soilStructureResidentialUseReason: this.soilStructureResidentialUseReason.value,
+        soilAgriParcelActivity: this.soilAgriParcelActivity.value,
+        soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason.value,
+        soilStructureOtherUseReason: this.soilStructureOtherUseReason.value,
         soilIsExtractionOrMining: parseStringToBoolean(this.isExtractionOrMining.getRawValue()),
+        soilProposedStructures: updatedStructures,
       };
 
       const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto);
@@ -254,6 +320,130 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     this.requiresNoticeOfWork = selectedValue === 'true';
   }
 
+  onChangeStructureType(id: string, newType: STRUCTURE_TYPES) {
+    const structure = this.proposedStructures.find((structure) => structure.id === id);
+
+    if (!structure) {
+      console.error('Failed to find structure');
+      return;
+    }
+
+    if (this.hasInput(structure.type)) {
+      this.confirmationDialogService
+        .openDialog({
+          title: 'Change Structure Type',
+          body: 'Changing the structure type will remove inputs relevant to the current structure. Do you want to continue?',
+          confirmAction: 'Confirm',
+          cancelAction: 'Cancel',
+        })
+        .subscribe((isConfirmed) => {
+          if (isConfirmed) {
+            this.setStructureTypeInput(structure, newType);
+          } else {
+            this.structuresForm.get(structure.id + '-type')?.setValue(structure.type);
+          }
+        });
+    } else {
+      return this.setStructureTypeInput(structure, newType);
+    }
+  }
+
+  private hasInput(type: STRUCTURE_TYPES | null) {
+    switch (type) {
+      case STRUCTURE_TYPES.FARM_STRUCTURE:
+        return !!(this.soilAgriParcelActivity.value || this.soilStructureFarmUseReason.value);
+
+      case STRUCTURE_TYPES.ACCESSORY_STRUCTURE:
+        return !!(
+          this.soilStructureResidentialUseReason.value || this.soilStructureResidentialAccessoryUseReason.value
+        );
+
+      case STRUCTURE_TYPES.OTHER_STRUCTURE:
+        return !!this.soilStructureOtherUseReason.value;
+
+      case STRUCTURE_TYPES.PRINCIPAL_RESIDENCE:
+      case STRUCTURE_TYPES.ADDITIONAL_RESIDENCE:
+        return !!this.soilStructureResidentialUseReason.value;
+
+      case null:
+        return false;
+
+      default:
+        return true;
+    }
+  }
+
+  private setStructureTypeInput(structure: FormProposedStructure, newType: STRUCTURE_TYPES) {
+    if (structure.type !== null && this.structureTypeCounts[structure.type] > 0) {
+      this.structureTypeCounts[structure.type]--;
+    }
+
+    this.structureTypeCounts[newType]++;
+
+    structure.type = newType;
+
+    this.form.markAsDirty();
+  }
+
+  onStructureAdd() {
+    this.addStructure();
+    this.structuresForm.markAsDirty();
+  }
+
+  addStructure(type: STRUCTURE_TYPES | null = null, area: number | null = null) {
+    const areaStr = area ? area.toString(10) : null;
+    const newStructure = { type, area: areaStr, id: v4() };
+    this.proposedStructures.push(newStructure);
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    this.structuresForm.addControl(
+      `${newStructure.id}-type`,
+      new FormControl<string | null>(type, [Validators.required]),
+    );
+    this.structuresForm.addControl(
+      `${newStructure.id}-area`,
+      new FormControl<string | null>(areaStr, [Validators.required]),
+    );
+
+    if (type) {
+      this.structureTypeCounts[type]++;
+    }
+  }
+
+  onStructureRemove(id: string) {
+    this.confirmationDialogService
+      .openDialog({
+        title:
+          'Warning: Deleting the structure type can remove some content already saved to this page. Do you want to continue?',
+        body: 'Changing the structure type will remove inputs relevant to the current structure. Do you want to continue?',
+        confirmAction: 'Confirm',
+        cancelAction: 'Cancel',
+      })
+      .subscribe(async (result) => {
+        if (result) {
+          this.deleteStructure(id);
+        }
+      });
+  }
+
+  private deleteStructure(id: string) {
+    const structureToDelete = this.proposedStructures.find((structure) => structure.id === id);
+
+    if (!structureToDelete) {
+      console.error('Failed to find deleted structure');
+      return;
+    }
+
+    this.proposedStructures = this.proposedStructures.filter((structure) => structure.id !== structureToDelete.id);
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    this.structuresForm.removeControl(`${id}-type`);
+    this.structuresForm.removeControl(`${id}-area`);
+    this.structuresForm.markAsDirty();
+
+    if (structureToDelete.type !== null && this.structureTypeCounts[structureToDelete.type] > 0) {
+      this.structureTypeCounts[structureToDelete.type]--;
+    }
+  }
+
   markDirty() {
     this.areComponentsDirty = true;
   }

From fd655b810c43c7f5392fcbae4bfa3522971211be Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 17:30:31 -0700
Subject: [PATCH 13/45] Remove unused imports

---
 .../proposal/pfrs-proposal/pfrs-proposal.component.ts           | 2 --
 1 file changed, 2 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index ff656c899..b7b099dd3 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -1,7 +1,6 @@
 import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
-import { Router } from '@angular/router';
 import { takeUntil } from 'rxjs';
 import { ApplicationDocumentDto } from '../../../../../services/application-document/application-document.dto';
 import { ApplicationDocumentService } from '../../../../../services/application-document/application-document.service';
@@ -24,7 +23,6 @@ import {
   STRUCTURE_TYPE_OPTIONS,
   FormProposedStructure,
 } from 'src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component';
-import { TurDetailsComponent } from '../../../application-details/tur-details/tur-details.component';
 import { ProposedStructure } from 'src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto';
 
 @Component({

From 1b1334ae30c63a39e210b35d42e59e4f02ad944b Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 16 Oct 2024 18:30:13 -0700
Subject: [PATCH 14/45] Add is new structure confirmation dialog

---
 .../pfrs-proposal.component.html              |  7 +-
 .../pfrs-proposal/pfrs-proposal.component.ts  | 72 +++++++++++++++++--
 2 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index 7fbf77592..203d1b610 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -32,7 +32,12 @@ <h2>Proposal</h2>
       </mat-label>
       <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div>
       <div>
-        <mat-button-toggle-group class="input" id="is-new-structure" [formControl]="isNewStructure">
+        <mat-button-toggle-group
+          class="input"
+          (change)="onChangeIsNewStructure($event.value)"
+          id="is-new-structure"
+          [formControl]="isNewStructure"
+        >
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index b7b099dd3..6c462701e 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -16,14 +16,14 @@ import { EditApplicationSteps } from '../../edit-submission.component';
 import { FilesStepComponent } from '../../files-step.partial';
 import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component';
 import { MatTableDataSource } from '@angular/material/table';
-import { ConfirmationDialogService } from 'src/app/shared/confirmation-dialog/confirmation-dialog.service';
+import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service';
 import { v4 } from 'uuid';
 import {
   STRUCTURE_TYPES,
   STRUCTURE_TYPE_OPTIONS,
   FormProposedStructure,
 } from 'src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component';
-import { ProposedStructure } from 'src/app/services/notice-of-intent-submission/notice-of-intent-submission.dto';
+import { ProposedStructure } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
 
 @Component({
   selector: 'app-pfrs-proposal',
@@ -99,10 +99,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     soilStructureOtherUseReason: this.soilStructureOtherUseReason,
   });
 
+  structuresForm = new FormGroup({} as any);
   proposedStructures: FormProposedStructure[] = [];
   structuresSource = new MatTableDataSource(this.proposedStructures);
   displayedColumns = ['index', 'type', 'area', 'action'];
-  structuresForm = new FormGroup({} as any);
 
   private submissionUuid = '';
   isMobile = false;
@@ -195,6 +195,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
         for (const structure of applicationSubmission.soilProposedStructures) {
           this.addStructure(structure.type, structure.area);
         }
+        this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
         if (this.showErrors) {
           this.form.markAllAsTouched();
@@ -296,6 +297,69 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeIsNewStructure(answeredYes: boolean | null) {
+    const hasValuesThatWillBeCleared: boolean = !!(
+      (answeredYes &&
+        (this.crossSections.length > 0 ||
+          this.reclamationPlan.length > 0 ||
+          this.noticeOfWork.length > 0 ||
+          this.reduceNegativeImpacts.value ||
+          this.alternativeMeasures.value ||
+          this.isExtractionOrMining.value ||
+          this.hasSubmittedNotice.value)) ||
+      (!answeredYes &&
+        (this.proposedStructures.length > 0 ||
+          this.soilStructureFarmUseReason.value ||
+          this.soilStructureResidentialUseReason.value ||
+          this.soilAgriParcelActivity.value ||
+          this.soilStructureResidentialAccessoryUseReason.value ||
+          this.soilStructureOtherUseReason.value))
+    );
+
+    if (hasValuesThatWillBeCleared) {
+      this.confirmationDialogService
+        .openDialog({
+          title: 'Are you removing soil in order to build a structure?',
+          body: 'Warning: Changing your answer will remove all the saved progress on this step. Do you want to continue?',
+          confirmAction: 'Confirm',
+          cancelAction: 'Cancel',
+        })
+        .subscribe((isConfirmed) => {
+          if (isConfirmed) {
+            if (answeredYes) {
+              // Clear docs
+              this.crossSections = [];
+              this.reclamationPlan = [];
+              this.noticeOfWork = [];
+
+              // Clear questions
+              this.reduceNegativeImpacts.reset();
+              this.alternativeMeasures.reset();
+              this.isExtractionOrMining.reset();
+              this.hasSubmittedNotice.reset();
+            } else {
+              // Clear structures
+              this.structuresForm = new FormGroup({});
+              this.proposedStructures = [];
+              this.structuresSource = new MatTableDataSource(this.proposedStructures);
+              for (const type of Object.keys(this.structureTypeCounts) as Array<STRUCTURE_TYPES>) {
+                this.structureTypeCounts[type] = 0;
+              }
+
+              // Clear conditional questions
+              this.soilStructureFarmUseReason.reset();
+              this.soilStructureResidentialUseReason.reset();
+              this.soilAgriParcelActivity.reset();
+              this.soilStructureResidentialAccessoryUseReason.reset();
+              this.soilStructureOtherUseReason.reset();
+            }
+          } else {
+            this.isNewStructure.setValue(!answeredYes);
+          }
+        });
+    }
+  }
+
   onChangeIsFollowUp(selectedValue: string) {
     if (selectedValue === 'true') {
       this.followUpIDs.enable();
@@ -385,6 +449,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
 
   onStructureAdd() {
     this.addStructure();
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
     this.structuresForm.markAsDirty();
   }
 
@@ -392,7 +457,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     const areaStr = area ? area.toString(10) : null;
     const newStructure = { type, area: areaStr, id: v4() };
     this.proposedStructures.push(newStructure);
-    this.structuresSource = new MatTableDataSource(this.proposedStructures);
     this.structuresForm.addControl(
       `${newStructure.id}-type`,
       new FormControl<string | null>(type, [Validators.required]),

From d8f3c7f2e279e10823429e4b5e835576de11948b Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 22 Oct 2024 14:08:39 -0700
Subject: [PATCH 15/45] Remove conditional app type text

Not needed, since there are separate components for each type
---
 .../pfrs-proposal.component.html              | 20 ++++++-------------
 .../pfrs-proposal/pfrs-proposal.component.ts  |  3 ---
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index 203d1b610..647207438 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -76,7 +76,7 @@ <h2>Proposal</h2>
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
-              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched)
+              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched),
             }"
             value="true"
             >Yes
@@ -84,7 +84,7 @@ <h2>Proposal</h2>
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
-              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched)
+              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched),
             }"
             value="false"
             >No
@@ -478,10 +478,7 @@ <h2>Proposal</h2>
     >
       <div class="full-row">
         <label for="soilStructureResidentialUseReason"
-          >Describe why <ng-container *ngIf="typeCode === 'POFO'">placing fill</ng-container>
-          <ng-container *ngIf="typeCode === 'ROSO'">removing soil</ng-container>
-          <ng-container *ngIf="typeCode === 'PFRS'">placing fill/removing soil</ng-container> is required for the
-          residential structure(s)</label
+          >Describe why placing fill/removing soil is required for the residential structure(s)</label
         >
         <div class="info-banner subtext">
           Please refer to
@@ -517,10 +514,8 @@ <h2>Proposal</h2>
     <ng-container *ngIf="structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureResidentialAccessoryUseReason"
-          >Describe the intended use of the residential accessory structure(s) and why
-          <ng-container *ngIf="typeCode === 'POFO'">placing fill</ng-container>
-          <ng-container *ngIf="typeCode === 'ROSO'">removing soil</ng-container>
-          <ng-container *ngIf="typeCode === 'PFRS'">placing fill/removing soil</ng-container> is required</label
+          >Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+          required</label
         >
         <div class="info-banner subtext">
           Please refer to
@@ -556,10 +551,7 @@ <h2>Proposal</h2>
     <ng-container *ngIf="structureTypeCounts[structureTypes.OTHER_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureOtherUseReason">
-          Describe the intended use of the 'Other' structure(s) and why
-          <ng-container *ngIf="typeCode === 'POFO'">placing fill</ng-container>
-          <ng-container *ngIf="typeCode === 'ROSO'">removing soil</ng-container>
-          <ng-container *ngIf="typeCode === 'PFRS'">placing fill/removing soil</ng-container> is required
+          Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
         </label>
         <mat-form-field appearance="outline">
           <textarea
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 6c462701e..76d561199 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -46,8 +46,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     Object.entries(STRUCTURE_TYPES).map(([_, type]) => [type, 0]),
   ) as { [key in STRUCTURE_TYPES]: number };
 
-  typeCode: string = '';
-
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
@@ -129,7 +127,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
       if (applicationSubmission) {
         this.fileId = applicationSubmission.fileNumber;
         this.submissionUuid = applicationSubmission.uuid;
-        this.typeCode = applicationSubmission.typeCode;
 
         this.alreadyRemovedTableData = {
           volume: applicationSubmission.soilAlreadyRemovedVolume ?? 0,

From 4e085f06780426a54552ddb1ef381a808518dae2 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 23 Oct 2024 11:02:08 -0700
Subject: [PATCH 16/45] Fix NOI structure dialog return type issue

NOI structure dialog was returning an incorrectly formed ProposedStructure, but this was being masked by the fact that the confirm handler was accepting type 'any'.
---
 .../add-structure-dialog.component.ts         |  2 +-
 .../additional-information.component.ts       | 55 ++++++++-----------
 2 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts
index 6b42955cf..f2af446cb 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts
@@ -60,7 +60,7 @@ export class AddStructureDialogComponent {
     this.isLoading = true;
     const dto: ProposedStructure = {
       area: Number(this.area.value!),
-      type: this.structureTypeOptions.find((v: any) => v.value === this.type.value!),
+      type: this.structureTypeOptions.find((v: any) => v.value === this.type.value!).value,
     };
     this.isLoading = false;
     this.dialogRef.close({
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
index 2ba17f151..98a6b4573 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component.ts
@@ -37,7 +37,6 @@ export type FormProposedStructure = {
   type: STRUCTURE_TYPES | null;
   area: string | null;
   id: string;
-  typeLabel?: string | null;
 };
 
 export type TypeOption = { label: string; value: string };
@@ -171,19 +170,11 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
           soilStructureResidentialAccessoryUseReason: noiSubmission.soilStructureResidentialAccessoryUseReason,
           soilStructureOtherUseReason: noiSubmission.soilStructureOtherUseReason,
         });
-        this.proposedStructures = noiSubmission.soilProposedStructures.map((structure) => ({
-          ...structure,
-          id: v4(),
-          area: structure.area ? structure.area.toString(10) : null,
-          typeLabel: this.structureTypeOptions.find((x) => x.value === structure.type)?.label,
-        }));
-
-        const newForm = new FormGroup({});
-        for (const lot of this.proposedStructures) {
-          newForm.addControl(`${lot.id}-type`, new FormControl(lot.type, [Validators.required]));
-          newForm.addControl(`${lot.id}-area`, new FormControl(lot.area, [Validators.required]));
+
+        this.structuresForm = new FormGroup({});
+        for (const lot of noiSubmission.soilProposedStructures) {
+          this.addControl(lot.type, lot.area);
         }
-        this.structuresForm = newForm;
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
         this.prepareStructureSpecificTextInputs();
 
@@ -422,8 +413,7 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
       const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
       if (structureToEdit) {
         structureToEdit.area = result.dto.area.toString();
-        structureToEdit.type = result.dto.type.value;
-        structureToEdit.typeLabel = result.dto.type.label;
+        structureToEdit.type = result.dto.type;
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
         const areaControl = this.structuresForm.controls[`${structureToEdit?.id}-area`];
         const typeControl = this.structuresForm.controls[`${structureToEdit?.id}-type`];
@@ -475,12 +465,16 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
           },
         },
       });
-      dialog.beforeClosed().subscribe(async (result) => {
-        if (!result) return;
-        this.addControl(result.dto.type, result.dto.area);
-      });
+      dialog
+        .beforeClosed()
+        .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+          if (!result) return;
+          this.addControl(result.dto.type, result.dto.area);
+          this.structuresSource = new MatTableDataSource(this.proposedStructures);
+        });
     } else {
       this.addControl(null, null);
+      this.structuresSource = new MatTableDataSource(this.proposedStructures);
     }
   }
 
@@ -488,20 +482,19 @@ export class AdditionalInformationComponent extends FilesStepComponent implement
     return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
   }
 
-  private addControl(type: any | null, area: string | null) {
-    const typeValue = type ? type.value : '';
-    const typeLabel = type ? type.label : '';
-    const newStructure = {
-      type: typeValue,
-      area: area ? area : '',
-      id: v4(),
-      typeLabel: typeLabel,
-    };
+  private addControl(type: STRUCTURE_TYPES | null, area: number | null) {
+    const areaStr = area ? area.toString(10) : null;
+    const newStructure: FormProposedStructure = { type, area: areaStr, id: v4() };
     this.proposedStructures.push(newStructure);
-    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    this.structuresForm.addControl(
+      `${newStructure.id}-type`,
+      new FormControl<string | null>(type, [Validators.required]),
+    );
+    this.structuresForm.addControl(
+      `${newStructure.id}-area`,
+      new FormControl<string | null>(areaStr, [Validators.required]),
+    );
 
-    this.structuresForm.addControl(`${newStructure.id}-type`, new FormControl(typeValue, [Validators.required]));
-    this.structuresForm.addControl(`${newStructure.id}-area`, new FormControl(area, [Validators.required]));
     this.structuresForm.markAsDirty();
   }
 

From 3796ebfdf33a3dc98e1af2ab8b678b56a3a15536 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:44:23 -0700
Subject: [PATCH 17/45] Add wanting when changing structure type on mobile

---
 .../add-structure-dialog.component.html       | 151 +++++++++---------
 .../add-structure-dialog.component.scss       |   2 +-
 .../add-structure-dialog.component.ts         |   7 +
 3 files changed, 84 insertions(+), 76 deletions(-)

diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.html b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.html
index 791639ba2..dfd895941 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.html
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.html
@@ -1,82 +1,83 @@
 <div>
-<div mat-dialog-title>
-  <h2 *ngIf="!data.isEdit">
-    Add Proposed Structure
-  </h2>
-  <h2 *ngIf="data.isEdit">
-    Edit Proposed Structure
-  </h2>
-</div>
-<form [formGroup]="form">
-  <div mat-dialog-content>
-    <div class="form-container">
-      <div class="form-field">
-        <div class="label">
-          <label for="type">Type</label>
-        </div>
-        <mat-form-field appearance="outline">
-          <mat-select
-            placeholder="Please select"
-            name="type"
-            id="type"
-            formControlName="type"
-            [compareWith]="compareSelected"
+  <div mat-dialog-title>
+    <h2 *ngIf="!data.isEdit">Add Proposed Structure</h2>
+    <h2 *ngIf="data.isEdit">Edit Proposed Structure</h2>
+  </div>
+  <form [formGroup]="form">
+    <div mat-dialog-content>
+      <div class="form-container">
+        <div class="form-field">
+          <div class="label">
+            <label for="type">Type</label>
+          </div>
+          <mat-form-field appearance="outline">
+            <mat-select
+              placeholder="Please select"
+              name="type"
+              id="type"
+              formControlName="type"
+              [compareWith]="compareSelected"
+            >
+              <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
+                {{ type.label }}
+              </mat-option>
+            </mat-select>
+          </mat-form-field>
+          <app-warning-banner *ngIf="showTypeChangeWarning"
+            ><strong>Warning</strong>: Changing the structure type will remove some inputs from your saved progress. Do
+            you want to continue?</app-warning-banner
           >
-            <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
-              {{ type.label }}
-            </mat-option>
-          </mat-select>
-        </mat-form-field>
-        <div
-          *ngIf="
-            form.controls['type']!.invalid &&
-            (form.controls['type']!.dirty || form.controls['type']!.touched)
-          "
-          class="field-error"
-        >
-          <mat-icon class="warning-icon">warning</mat-icon>
-          <div *ngIf="form.controls['type']!.errors?.['required']">This field is required</div>
-        </div>
-      </div>
-      <div class="form-field">
-        <div class="label">
-          <label for="area">Total Floor Area</label>
+          <div
+            *ngIf="form.controls['type']!.invalid && (form.controls['type']!.dirty || form.controls['type']!.touched)"
+            class="field-error"
+          >
+            <mat-icon class="warning-icon">warning</mat-icon>
+            <div *ngIf="form.controls['type']!.errors?.['required']">This field is required</div>
+          </div>
         </div>
-        <mat-form-field appearance="outline">
-          <input
-            min="0.01"
-            mask="separator.5"
-            separatorLimit="9999999999"
-            thousandSeparator=","
-            matInput
-            id="area"
-            formControlName="area"
-            name="area"
-          />
-          <span matTextSuffix>m<sup>2</sup></span>
-        </mat-form-field>
-        <div
-          *ngIf="
-            form.controls['area']!.invalid &&
-            (form.controls['area']!.dirty || form.controls['area']!.touched)
-          "
-          class="field-error"
-        >
-          <mat-icon class="warning-icon">warning</mat-icon>
-          <div *ngIf="form.controls['area']!.errors?.['required']">This field is required</div>
-          <div *ngIf="form.controls['area']!.errors?.['pattern']">
-            This field must be a non-zero number with no more than 2 decimal places.
+        <div class="form-field">
+          <div class="label">
+            <label for="area">Total Floor Area</label>
+          </div>
+          <mat-form-field appearance="outline">
+            <input
+              min="0.01"
+              mask="separator.5"
+              separatorLimit="9999999999"
+              thousandSeparator=","
+              matInput
+              id="area"
+              formControlName="area"
+              name="area"
+            />
+            <span matTextSuffix>m<sup>2</sup></span>
+          </mat-form-field>
+          <div
+            *ngIf="form.controls['area']!.invalid && (form.controls['area']!.dirty || form.controls['area']!.touched)"
+            class="field-error"
+          >
+            <mat-icon class="warning-icon">warning</mat-icon>
+            <div *ngIf="form.controls['area']!.errors?.['required']">This field is required</div>
+            <div *ngIf="form.controls['area']!.errors?.['pattern']">
+              This field must be a non-zero number with no more than 2 decimal places.
+            </div>
           </div>
         </div>
       </div>
     </div>
-  </div>
-  <mat-dialog-actions align="end">
-  <div class="button-container">
-    <button *ngIf="this.data.structureData" mat-flat-button color="primary" (click)="onSubmit()" [disabled]="isLoading">
-      {{ !data.isEdit ? "ADD" : "SAVE" }}
-    </button>
-    <button mat-stroked-button color="primary" [mat-dialog-close]="false" (click)="onCancel()">CANCEL</button>
-  </div>
-  </mat-dialog-actions>
-</form>
+    <mat-dialog-actions align="end">
+      <div class="button-container">
+        <button
+          *ngIf="this.data.structureData"
+          mat-flat-button
+          color="primary"
+          (click)="onSubmit()"
+          [disabled]="isLoading"
+        >
+          {{ !data.isEdit ? 'ADD' : 'SAVE' }}
+        </button>
+        <button mat-stroked-button color="primary" [mat-dialog-close]="false" (click)="onCancel()">CANCEL</button>
+      </div>
+    </mat-dialog-actions>
+  </form>
+</div>
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.scss b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.scss
index f3a932574..bd9def83f 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.scss
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.scss
@@ -42,7 +42,7 @@ h2 {
 
 :host::ng-deep {
   .warning-banner {
-    padding: rem(0.5) !important;
+    font-size: rem(13);
   }
 }
 
diff --git a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts
index f2af446cb..ead16e053 100644
--- a/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts
+++ b/portal-frontend/src/app/features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component.ts
@@ -2,6 +2,7 @@ import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { ProposedStructure } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
+import { pairwise } from 'rxjs';
 
 @Component({
   selector: 'add-structure-dialog',
@@ -24,6 +25,8 @@ export class AddStructureDialogComponent {
 
   structureTypeOptions: any = [];
 
+  showTypeChangeWarning: boolean = false;
+
   constructor(
     @Inject(MAT_DIALOG_DATA) public data: {
       structureId?: string;
@@ -32,6 +35,10 @@ export class AddStructureDialogComponent {
     },
     private dialogRef: MatDialogRef<AddStructureDialogComponent>,
   ) {
+    this.type.valueChanges.pipe(pairwise()).subscribe(([oldType, newType]) => {
+      this.showTypeChangeWarning = !!data.isEdit && oldType !== newType;
+    });
+
     if (data?.structureData?.options) {
       this.structureTypeOptions = data.structureData.options;
     }

From 76f0b32a287bbf76a42d4c3e69897d4235111f83 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 23 Oct 2024 13:47:40 -0700
Subject: [PATCH 18/45] Implement mobile UI for soil apps

---
 .../pfrs-proposal.component.html              | 252 ++++++++++--------
 .../pfrs-proposal.component.scss              |  25 ++
 .../pfrs-proposal/pfrs-proposal.component.ts  |  71 ++++-
 3 files changed, 233 insertions(+), 115 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index 647207438..e009e4c59 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -293,123 +293,155 @@ <h2>Proposal</h2>
       <mat-hint class="subtext">Example: Aggregate, Extraction, Placer Mining, Peat Extraction, Soil etc.</mat-hint>
       <div class="subtext">Characters left: {{ 4000 - soilTypeRemovedText.textLength }}</div>
     </div>
+  </div>
 
-    <ng-container *ngIf="isNewStructure.value === true">
-      <form [formGroup]="structuresForm">
-        <mat-label>Provide the total floor area (m<sup>2</sup>) of the proposed structure(s)</mat-label>
-        <div class="scrollable">
-          <table mat-table [dataSource]="structuresSource">
-            <ng-container matColumnDef="index">
-              <th mat-header-cell *matHeaderCellDef>#</th>
-              <td mat-cell *matCellDef="let i = index">{{ i + 1 }}</td>
-            </ng-container>
-
-            <ng-container matColumnDef="type">
-              <th mat-header-cell *matHeaderCellDef>Type</th>
-              <td mat-cell *matCellDef="let element">
-                <mat-form-field appearance="outline">
-                  <mat-select
-                    [value]="element.type"
-                    placeholder="Please select"
-                    [formControlName]="element.id + '-type'"
-                    (valueChange)="onChangeStructureType(element.id, $event)"
-                  >
-                    <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
-                      {{ type.label }}
-                    </mat-option>
-                  </mat-select>
-                </mat-form-field>
-                <div
-                  *ngIf="
-                    structuresForm.controls[element.id + '-type']!.invalid &&
-                    (structuresForm.controls[element.id + '-type']!.dirty ||
-                      structuresForm.controls[element.id + '-type']!.touched)
-                  "
-                  class="field-error"
+  <ng-container *ngIf="isNewStructure.value === true">
+    <form [formGroup]="structuresForm">
+      <mat-label>Provide the total floor area (m<sup>2</sup>) for each of the proposed structure(s)</mat-label>
+      <div class="scrollable">
+        <div *ngIf="isMobile">
+          <app-structure-mobile-card
+            *ngFor="let structure of proposedStructures; let last = last; index as i"
+            [structure]="structure"
+            [isLast]="last"
+            [index]="i"
+            [isReviewStep]="false"
+            (removeClicked)="onStructureRemove(structure.id)"
+            (editClicked)="onStructureEdit(structure.id)"
+          >
+          </app-structure-mobile-card>
+        </div>
+        <table mat-table [dataSource]="structuresSource" multiTemplateDataRows *ngIf="!isMobile">
+          <ng-container matColumnDef="index">
+            <th mat-header-cell *matHeaderCellDef>#</th>
+            <td mat-cell *matCellDef="let i = dataIndex">{{ i + 1 }}</td>
+          </ng-container>
+
+          <ng-container matColumnDef="type">
+            <th mat-header-cell *matHeaderCellDef>Type</th>
+            <td mat-cell *matCellDef="let element">
+              <mat-form-field appearance="outline">
+                <mat-select
+                  [value]="element.type"
+                  placeholder="Please select"
+                  [formControlName]="element.id + '-type'"
+                  (valueChange)="onChangeStructureType(element.id, $event)"
                 >
-                  <mat-icon>warning</mat-icon>
-                  <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
-                    This field is required
-                  </div>
+                  <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
+                    {{ type.label }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+              <div
+                *ngIf="
+                  structuresForm.controls[element.id + '-type']!.invalid &&
+                  (structuresForm.controls[element.id + '-type']!.dirty ||
+                    structuresForm.controls[element.id + '-type']!.touched)
+                "
+                class="field-error"
+              >
+                <mat-icon>warning</mat-icon>
+                <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
+                  This field is required
                 </div>
-              </td>
-            </ng-container>
-
-            <ng-container matColumnDef="area">
-              <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
-              <td mat-cell *matCellDef="let element">
-                <mat-form-field appearance="outline">
-                  <input
-                    type="text"
-                    matInput
-                    thousandSeparator=","
-                    mask="separator.5"
-                    separatorLimit="9999999999"
-                    min="0.01"
-                    placeholder="Type area"
-                    [formControlName]="element.id + '-area'"
-                  />
-                  <span matTextSuffix>m<sup>2</sup></span>
-                </mat-form-field>
-                <div
-                  *ngIf="
-                    structuresForm.controls[element.id + '-area']!.invalid &&
-                    (structuresForm.controls[element.id + '-area']!.dirty ||
-                      structuresForm.controls[element.id + '-area']!.touched)
-                  "
-                  class="field-error"
-                >
-                  <mat-icon>warning</mat-icon>
-                  <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
-                    This field is required
-                  </div>
+              </div>
+            </td>
+          </ng-container>
+
+          <ng-container matColumnDef="area">
+            <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
+            <td mat-cell *matCellDef="let element">
+              <mat-form-field appearance="outline">
+                <input
+                  type="text"
+                  matInput
+                  thousandSeparator=","
+                  mask="separator.5"
+                  separatorLimit="9999999999"
+                  min="0.01"
+                  placeholder="Type area"
+                  [formControlName]="element.id + '-area'"
+                />
+                <span matTextSuffix>m<sup>2</sup></span>
+              </mat-form-field>
+              <div
+                *ngIf="
+                  structuresForm.controls[element.id + '-area']!.invalid &&
+                  (structuresForm.controls[element.id + '-area']!.dirty ||
+                    structuresForm.controls[element.id + '-area']!.touched)
+                "
+                class="field-error"
+              >
+                <mat-icon>warning</mat-icon>
+                <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
+                  This field is required
                 </div>
-              </td>
-            </ng-container>
-
-            <ng-container matColumnDef="action">
-              <th mat-header-cell *matHeaderCellDef>Action</th>
-              <td mat-cell *matCellDef="let element">
-                <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
-                  Remove
-                </button>
-              </td>
-            </ng-container>
-
-            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
-
-            <tr class="mat-row no-data" *matNoDataRow>
-              <td class="text-center" colspan="7">
-                No Proposed Structures Entered. Use the button below to add your first structure.
-              </td>
-            </tr>
-          </table>
-        </div>
-      </form>
-
-      <div class="full-row">
-        <button
-          mat-stroked-button
-          color="primary"
-          (click)="onStructureAdd()"
-          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
-          type="button"
-        >
-          + Add Structure
-        </button>
-        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
-          At least one structure is required
-        </app-validation-error>
+              </div>
+            </td>
+          </ng-container>
+
+          <ng-container matColumnDef="action">
+            <th mat-header-cell *matHeaderCellDef>Action</th>
+            <td mat-cell *matCellDef="let element">
+              <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
+                Remove
+              </button>
+            </td>
+          </ng-container>
+
+          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+
+          <ng-container matColumnDef="msgWarning">
+            <td colspan="7" mat-cell *matCellDef>
+              <div class="residential-warning">
+                <div class="residential-warning-text">
+                  The proposed residential structure and its total floor area must be allowed under the ALC Act and/or
+                  ALR Use Regulation. If not, you may require a 'Non-Adhering Residential Use' application instead. For
+                  more info, please see
+                  <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+                    >Housing in the ALR</a
+                  >
+                  on the ALC website.
+                </div>
+              </div>
+            </td>
+          </ng-container>
+
+          <tr mat-row class="row-group" *matRowDef="let row; columns: ['msgWarning']; when: isWarning"></tr>
+
+          <tr class="mat-row no-data" *matNoDataRow>
+            <td class="text-center" colspan="7">
+              No Proposed Structures Entered. Use the button below to add your first structure.
+            </td>
+          </tr>
+        </table>
       </div>
+    </form>
 
-      <div class="full-row">
-        <app-warning-banner>
-          Selected proposed structure type(s) will determine the proposal questions below
-        </app-warning-banner>
-      </div>
-    </ng-container>
+    <div class="full-row">
+      <button
+        mat-stroked-button
+        color="primary"
+        (click)="onStructureAdd()"
+        [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+        type="button"
+      >
+        + Add Structure
+      </button>
+      <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+        At least one structure is required
+      </app-validation-error>
+    </div>
 
+    <div class="full-row">
+      <app-warning-banner>
+        Selected proposed structure type(s) will determine the proposal questions below
+      </app-warning-banner>
+    </div>
+  </ng-container>
+
+  <div class="form-row">
     <ng-container *ngIf="structureTypeCounts[structureTypes.FARM_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureFarmUseReason">Describe how the structure is necessary for farm use</label>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss
index a4d0e0cc5..f6303c573 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.scss
@@ -1,4 +1,5 @@
 @use '../../../../../../styles/functions' as *;
+@use '../../../../../../styles/colors';
 
 section {
   margin-top: rem(36);
@@ -7,3 +8,27 @@ section {
 .steps-list {
   margin: rem(16) 0;
 }
+
+.mat-mdc-form-field {
+  width: 100%;
+}
+
+.info-banner {
+  background-color: rgba(colors.$secondary-color-light, 0.5);
+  padding: rem(4);
+  margin-bottom: 0 !important;
+}
+
+.residential-warning {
+  width: 74%;
+  background-color: rgba(colors.$secondary-color-light, 0.5);
+  margin-bottom: rem(20);
+  margin-left: 6.5%;
+}
+
+.residential-warning-text {
+  font-weight: 400;
+  font-size: rem(12);
+  margin: rem(10) 0 rem(20) rem(5);
+  line-height: rem(24);
+}
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 76d561199..b8439e2d5 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -24,6 +24,7 @@ import {
   FormProposedStructure,
 } from 'src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component';
 import { ProposedStructure } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
+import { AddStructureDialogComponent } from '../../../../notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component';
 
 @Component({
   selector: 'app-pfrs-proposal',
@@ -190,7 +191,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
 
         this.structuresForm = new FormGroup({});
         for (const structure of applicationSubmission.soilProposedStructures) {
-          this.addStructure(structure.type, structure.area);
+          this.addControl(structure.type, structure.area);
         }
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
@@ -445,12 +446,32 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   }
 
   onStructureAdd() {
-    this.addStructure();
-    this.structuresSource = new MatTableDataSource(this.proposedStructures);
-    this.structuresForm.markAsDirty();
+    if (this.isMobile) {
+      const dialog = this.dialog.open(AddStructureDialogComponent, {
+        width: '70%',
+        data: {
+          structureData: {
+            options: this.structureTypeOptions,
+          },
+        },
+      });
+      dialog
+        .beforeClosed()
+        .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+          if (!result) return;
+          this.addControl(result.dto.type, result.dto.area);
+          this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
+          this.structureTypeCounts[result.dto.type!]++;
+          console.log(this.structureTypeCounts);
+        });
+    } else {
+      this.addControl();
+      this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    }
   }
 
-  addStructure(type: STRUCTURE_TYPES | null = null, area: number | null = null) {
+  addControl(type: STRUCTURE_TYPES | null = null, area: number | null = null) {
     const areaStr = area ? area.toString(10) : null;
     const newStructure = { type, area: areaStr, id: v4() };
     this.proposedStructures.push(newStructure);
@@ -468,6 +489,10 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  isWarning(index: number, item: ProposedStructure): boolean {
+    return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
+  }
+
   onStructureRemove(id: string) {
     this.confirmationDialogService
       .openDialog({
@@ -503,6 +528,42 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onStructureEdit(id: string) {
+    const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
+    const dialog = this.dialog.open(AddStructureDialogComponent, {
+      width: '70%',
+      data: {
+        isEdit: true,
+        structureId: structureToEdit?.id,
+        structureData: {
+          area: structureToEdit?.area,
+          type: structureToEdit?.type,
+          options: this.structureTypeOptions,
+        },
+      },
+    });
+    dialog
+      .afterClosed()
+      .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+        if (!result) return;
+        const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
+
+        if (structureToEdit) {
+          if (structureToEdit.type !== result.dto.type) {
+            this.setStructureTypeInput(structureToEdit, result.dto.type!);
+          }
+
+          structureToEdit.area = result.dto.area ? result.dto.area.toString(10) : null;
+          structureToEdit.type = result.dto.type;
+          const areaControl = this.structuresForm.controls[`${structureToEdit?.id}-area`];
+          const typeControl = this.structuresForm.controls[`${structureToEdit?.id}-type`];
+          areaControl.setValue(structureToEdit.area?.toString());
+          typeControl.setValue(structureToEdit.type);
+          this.structuresForm.markAsDirty();
+        }
+      });
+  }
+
   markDirty() {
     this.areComponentsDirty = true;
   }

From bd4aec48dee0ec1468f63bc9c0f8f9c52b6fe5bc Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:55:53 -0700
Subject: [PATCH 19/45] Update POFO/ROSO with changes from PFRS

---
 .../pfrs-proposal/pfrs-proposal.component.ts  |   3 +-
 .../pofo-proposal.component.html              | 571 ++++++++++++++----
 .../pofo-proposal/pofo-proposal.component.ts  | 317 +++++++++-
 .../roso-proposal.component.html              | 516 +++++++++++++---
 .../roso-proposal/roso-proposal.component.ts  | 312 +++++++++-
 5 files changed, 1529 insertions(+), 190 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index b8439e2d5..6bfdbb39b 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -190,7 +190,9 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
         });
 
         this.structuresForm = new FormGroup({});
+        this.proposedStructures = [];
         for (const structure of applicationSubmission.soilProposedStructures) {
+          console.log(structure);
           this.addControl(structure.type, structure.area);
         }
         this.structuresSource = new MatTableDataSource(this.proposedStructures);
@@ -463,7 +465,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
           this.structuresSource = new MatTableDataSource(this.proposedStructures);
 
           this.structureTypeCounts[result.dto.type!]++;
-          console.log(this.structureTypeCounts);
         });
     } else {
       this.addControl();
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
index 26620cf4e..69afe447f 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
@@ -25,6 +25,41 @@ <h2>Proposal</h2>
 </app-warning-banner>
 <form [formGroup]="form">
   <div class="form-row">
+    <div class="full-row">
+      <mat-label for="is-new-structure">
+        Are you removing soil and placing fill in order to build a structure?
+      </mat-label>
+      <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div>
+      <div>
+        <mat-button-toggle-group
+          class="input"
+          (change)="onChangeIsNewStructure($event.value)"
+          id="is-new-structure"
+          [formControl]="isNewStructure"
+        >
+          <mat-button-toggle
+            class="toggle-button"
+            [ngClass]="{
+              'error-outline': isNewStructure.invalid && (isNewStructure.dirty || isNewStructure.touched),
+            }"
+            [value]="true"
+            >Yes
+          </mat-button-toggle>
+          <mat-button-toggle
+            class="toggle-button"
+            [ngClass]="{
+              'error-outline': isNewStructure.invalid && (isNewStructure.dirty || isNewStructure.touched),
+            }"
+            [value]="false"
+            >No
+          </mat-button-toggle>
+        </mat-button-toggle-group>
+      </div>
+      <mat-hint class="subtext"
+        >Note: The form will be updated with additional required questions if you are building a structure
+      </mat-hint>
+    </div>
+
     <div class="full-row">
       <mat-label for="noi-follow-up">
         Has the ALC previously received an application or Notice of Intent for this proposal?
@@ -40,7 +75,7 @@ <h2>Proposal</h2>
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
-              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched)
+              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched),
             }"
             value="true"
             >Yes
@@ -48,7 +83,7 @@ <h2>Proposal</h2>
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
-              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched)
+              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched),
             }"
             value="false"
             >No
@@ -168,65 +203,385 @@ <h2>Proposal</h2>
       <mat-hint class="subtext">Example: Aggregate, topsoil, structural fill, sand, gravel, etc</mat-hint>
       <div class="subtext">Characters left: {{ 4000 - fillTypeToPlaceText.textLength }}</div>
     </div>
-    <div class="full-row">
-      <label for="alternativeMeasures">
-        What alternative measures have you considered or attempted before proposing to place fill?
-        <div class="subtext">
-          Applicants should provide evidence demonstrating that normal farm practices have been attempted prior to the
-          submission of this application to place fill.
+  </div>
+
+  <ng-container *ngIf="isNewStructure.value === true">
+    <form [formGroup]="structuresForm">
+      <mat-label>Provide the total floor area (m<sup>2</sup>) for each of the proposed structure(s)</mat-label>
+      <div class="scrollable">
+        <div *ngIf="isMobile">
+          <app-structure-mobile-card
+            *ngFor="let structure of proposedStructures; let last = last; index as i"
+            [structure]="structure"
+            [isLast]="last"
+            [index]="i"
+            [isReviewStep]="false"
+            (removeClicked)="onStructureRemove(structure.id)"
+            (editClicked)="onStructureEdit(structure.id)"
+          >
+          </app-structure-mobile-card>
         </div>
-      </label>
-      <mat-form-field appearance="outline">
-        <textarea
-          [formControl]="alternativeMeasures"
-          #alternativeMeasuresText
-          maxlength="4000"
-          id="alternativeMeasures"
-          matInput
-          placeholder="Type comment"
-        ></textarea>
-      </mat-form-field>
-      <div
-        *ngIf="alternativeMeasures.invalid && (alternativeMeasures.dirty || alternativeMeasures.touched)"
-        class="field-error"
-      >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="alternativeMeasures.errors?.['required']">This field is required</div>
+        <table mat-table [dataSource]="structuresSource" multiTemplateDataRows *ngIf="!isMobile">
+          <ng-container matColumnDef="index">
+            <th mat-header-cell *matHeaderCellDef>#</th>
+            <td mat-cell *matCellDef="let i = dataIndex">{{ i + 1 }}</td>
+          </ng-container>
+
+          <ng-container matColumnDef="type">
+            <th mat-header-cell *matHeaderCellDef>Type</th>
+            <td mat-cell *matCellDef="let element">
+              <mat-form-field appearance="outline">
+                <mat-select
+                  [value]="element.type"
+                  placeholder="Please select"
+                  [formControlName]="element.id + '-type'"
+                  (valueChange)="onChangeStructureType(element.id, $event)"
+                >
+                  <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
+                    {{ type.label }}
+                  </mat-option>
+                </mat-select>
+              </mat-form-field>
+              <div
+                *ngIf="
+                  structuresForm.controls[element.id + '-type']!.invalid &&
+                  (structuresForm.controls[element.id + '-type']!.dirty ||
+                    structuresForm.controls[element.id + '-type']!.touched)
+                "
+                class="field-error"
+              >
+                <mat-icon>warning</mat-icon>
+                <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
+                  This field is required
+                </div>
+              </div>
+            </td>
+          </ng-container>
+
+          <ng-container matColumnDef="area">
+            <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
+            <td mat-cell *matCellDef="let element">
+              <mat-form-field appearance="outline">
+                <input
+                  type="text"
+                  matInput
+                  thousandSeparator=","
+                  mask="separator.5"
+                  separatorLimit="9999999999"
+                  min="0.01"
+                  placeholder="Type area"
+                  [formControlName]="element.id + '-area'"
+                />
+                <span matTextSuffix>m<sup>2</sup></span>
+              </mat-form-field>
+              <div
+                *ngIf="
+                  structuresForm.controls[element.id + '-area']!.invalid &&
+                  (structuresForm.controls[element.id + '-area']!.dirty ||
+                    structuresForm.controls[element.id + '-area']!.touched)
+                "
+                class="field-error"
+              >
+                <mat-icon>warning</mat-icon>
+                <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
+                  This field is required
+                </div>
+              </div>
+            </td>
+          </ng-container>
+
+          <ng-container matColumnDef="action">
+            <th mat-header-cell *matHeaderCellDef>Action</th>
+            <td mat-cell *matCellDef="let element">
+              <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
+                Remove
+              </button>
+            </td>
+          </ng-container>
+
+          <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+          <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+
+          <ng-container matColumnDef="msgWarning">
+            <td colspan="7" mat-cell *matCellDef>
+              <div class="residential-warning">
+                <div class="residential-warning-text">
+                  The proposed residential structure and its total floor area must be allowed under the ALC Act and/or
+                  ALR Use Regulation. If not, you may require a 'Non-Adhering Residential Use' application instead. For
+                  more info, please see
+                  <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+                    >Housing in the ALR</a
+                  >
+                  on the ALC website.
+                </div>
+              </div>
+            </td>
+          </ng-container>
+
+          <tr mat-row class="row-group" *matRowDef="let row; columns: ['msgWarning']; when: isWarning"></tr>
+
+          <tr class="mat-row no-data" *matNoDataRow>
+            <td class="text-center" colspan="7">
+              No Proposed Structures Entered. Use the button below to add your first structure.
+            </td>
+          </tr>
+        </table>
       </div>
-      <mat-hint class="subtext">
-        Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
-        temporary or permanent drainage, etc.
-      </mat-hint>
-      <div class="subtext">Characters left: {{ 4000 - alternativeMeasuresText.textLength }}</div>
-    </div>
+    </form>
+
     <div class="full-row">
-      <label for="agricultural-support">
-        What steps will be taken to reduce impacts to surrounding agricultural land?
-        <div class="subtext">Describe impact reducing measures.</div>
-      </label>
-      <mat-form-field appearance="outline">
-        <textarea
-          [formControl]="reduceNegativeImpacts"
-          #reduceNegativeImpactsText
-          maxlength="4000"
-          id="agricultural-support"
-          matInput
-          placeholder="Type comment"
-        ></textarea>
-      </mat-form-field>
-      <div
-        *ngIf="reduceNegativeImpacts.invalid && (reduceNegativeImpacts.dirty || reduceNegativeImpacts.touched)"
-        class="field-error"
+      <button
+        mat-stroked-button
+        color="primary"
+        (click)="onStructureAdd()"
+        [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+        type="button"
       >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="reduceNegativeImpacts.errors?.['required']">This field is required</div>
-      </div>
-      <mat-hint class="subtext">
-        Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
-        temporary or permanent drainage, etc.
-      </mat-hint>
-      <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div>
+        + Add Structure
+      </button>
+      <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+        At least one structure is required
+      </app-validation-error>
     </div>
+
+    <div class="full-row">
+      <app-warning-banner>
+        Selected proposed structure type(s) will determine the proposal questions below
+      </app-warning-banner>
+    </div>
+  </ng-container>
+
+  <div class="form-row">
+    <ng-container *ngIf="structureTypeCounts[structureTypes.FARM_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureFarmUseReason">Describe how the structure is necessary for farm use</label>
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#farmstructures" target="_blank"
+            >Farm Structures in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureFarmUseReason"
+            #soilStructureFarmUseReasonText
+            maxlength="4000"
+            id="soilStructureFarmUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureFarmUseReason.invalid &&
+            (soilStructureFarmUseReason.dirty || soilStructureFarmUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureFarmUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureFarmUseReasonText.textLength }}</div>
+      </div>
+
+      <div class="full-row">
+        <label for="soilAgriParcelActivity"
+          >Describe the current or proposed agricultural activity on the parcel(s)</label
+        >
+        <div class="subtext">Include the area, yields, crop types, and farm equipment size and attachments</div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilAgriParcelActivity"
+            #soilAgriParcelActivityText
+            maxlength="4000"
+            id="soilAgriParcelActivity"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="soilAgriParcelActivity.invalid && (soilAgriParcelActivity.dirty || soilAgriParcelActivity.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilAgriParcelActivity.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilAgriParcelActivityText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container
+      *ngIf="
+        structureTypeCounts[structureTypes.PRINCIPAL_RESIDENCE] > 0 ||
+        structureTypeCounts[structureTypes.ADDITIONAL_RESIDENCE] > 0 ||
+        structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0
+      "
+    >
+      <div class="full-row">
+        <label for="soilStructureResidentialUseReason"
+          >Describe why placing fill/removing soil is required for the residential structure(s)</label
+        >
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+            >Housing in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureResidentialUseReason"
+            #soilStructureResidentialUseReasonText
+            maxlength="4000"
+            id="soilStructureResidentialUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureResidentialUseReason.invalid &&
+            (soilStructureResidentialUseReason.dirty || soilStructureResidentialUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureResidentialUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureResidentialUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureResidentialAccessoryUseReason"
+          >Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+          required</label
+        >
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+            >Housing in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureResidentialAccessoryUseReason"
+            #structureResidentialAccessoryUseReasonText
+            maxlength="4000"
+            id="soilStructureResidentialAccessoryUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureResidentialAccessoryUseReason.invalid &&
+            (soilStructureResidentialAccessoryUseReason.dirty || soilStructureResidentialAccessoryUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureResidentialAccessoryUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - structureResidentialAccessoryUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.OTHER_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureOtherUseReason">
+          Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureOtherUseReason"
+            #soilStructureOtherUseReasonText
+            maxlength="4000"
+            id="soilStructureOtherUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureOtherUseReason.invalid &&
+            (soilStructureOtherUseReason.dirty || soilStructureOtherUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureOtherUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureOtherUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isNewStructure.value === false">
+      <div class="full-row">
+        <label for="alternativeMeasures">
+          What alternative measures have you considered or attempted before proposing to place fill?
+          <div class="subtext">
+            Applicants should provide evidence demonstrating that normal farm practices have been attempted prior to the
+            submission of this application to place fill.
+          </div>
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            [formControl]="alternativeMeasures"
+            #alternativeMeasuresText
+            maxlength="4000"
+            id="alternativeMeasures"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="alternativeMeasures.invalid && (alternativeMeasures.dirty || alternativeMeasures.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="alternativeMeasures.errors?.['required']">This field is required</div>
+        </div>
+        <mat-hint class="subtext">
+          Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
+          temporary or permanent drainage, etc.
+        </mat-hint>
+        <div class="subtext">Characters left: {{ 4000 - alternativeMeasuresText.textLength }}</div>
+      </div>
+
+      <div class="full-row">
+        <label for="agricultural-support">
+          What steps will be taken to reduce impacts to surrounding agricultural land?
+          <div class="subtext">Describe impact reducing measures.</div>
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            [formControl]="reduceNegativeImpacts"
+            #reduceNegativeImpactsText
+            maxlength="4000"
+            id="agricultural-support"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="reduceNegativeImpacts.invalid && (reduceNegativeImpacts.dirty || reduceNegativeImpacts.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="reduceNegativeImpacts.errors?.['required']">This field is required</div>
+        </div>
+        <mat-hint class="subtext">
+          Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
+          temporary or permanent drainage, etc.
+        </mat-hint>
+        <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div>
+      </div>
+    </ng-container>
+
     <div class="full-row">
       <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label>
       <div class="subtext">A visual representation of your proposal.</div>
@@ -241,57 +596,61 @@ <h2>Proposal</h2>
         [showVirusError]="showProposalMapVirus"
       ></app-file-drag-drop>
     </div>
-    <div class="full-row">
-      <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label>
-      <div class="subtext">Include North-South and East-West cross sections</div>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Placement of Fill</a
-        >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="cross-section"
-        [uploadedFiles]="crossSections"
-        (uploadFiles)="attachCrossSection($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [allowMultiple]="true"
-        [showVirusError]="showCrossSectionVirus"
-      ></app-file-drag-drop>
-    </div>
-    <div class="full-row">
-      <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label>
-      <div class="subtext">
-        The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's
-        agricultural capability assessment.
+
+    <ng-container *ngIf="isNewStructure.value === false">
+      <div class="full-row">
+        <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label>
+        <div class="subtext">Include North-South and East-West cross sections</div>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Placement of Fill</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="cross-section"
+          [uploadedFiles]="crossSections"
+          (uploadFiles)="attachCrossSection($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [allowMultiple]="true"
+          [showVirusError]="showCrossSectionVirus"
+        ></app-file-drag-drop>
       </div>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Placement of Fill</a
-        >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="reclamation-plan"
-        [uploadedFiles]="reclamationPlan"
-        (uploadFiles)="attachReclamationPlan($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [allowMultiple]="true"
-        [showVirusError]="showReclamationPlanVirus"
-      ></app-file-drag-drop>
-    </div>
+
+      <div class="full-row">
+        <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label>
+        <div class="subtext">
+          The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's
+          agricultural capability assessment.
+        </div>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Placement of Fill</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="reclamation-plan"
+          [uploadedFiles]="reclamationPlan"
+          (uploadFiles)="attachReclamationPlan($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [allowMultiple]="true"
+          [showVirusError]="showReclamationPlanVirus"
+        ></app-file-drag-drop>
+      </div>
+    </ng-container>
   </div>
 </form>
 <div class="button-container">
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index ff2b8cff2..c4249b147 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -15,6 +15,17 @@ import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'
 import { EditApplicationSteps } from '../../edit-submission.component';
 import { FilesStepComponent } from '../../files-step.partial';
 import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component';
+import {
+  FormProposedStructure,
+  STRUCTURE_TYPE_OPTIONS,
+  STRUCTURE_TYPES,
+} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
+import { MatTableDataSource } from '@angular/material/table';
+import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service';
+import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints';
+import { AddStructureDialogComponent } from '../../../../../features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component';
+import { ProposedStructure } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
+import { v4 } from 'uuid';
 
 @Component({
   selector: 'app-pofo-proposal',
@@ -23,8 +34,20 @@ import { SoilTableData } from '../../../../../shared/soil-table/soil-table.compo
 })
 export class PofoProposalComponent extends FilesStepComponent implements OnInit, OnDestroy {
   currentStep = EditApplicationSteps.Proposal;
+
+  @HostListener('window:resize', ['$event'])
+  onWindowResize() {
+    this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+  }
+
   DOCUMENT = DOCUMENT_TYPE;
 
+  structureTypes = STRUCTURE_TYPES;
+  structureTypeOptions = STRUCTURE_TYPE_OPTIONS;
+  structureTypeCounts: Record<STRUCTURE_TYPES, number> = Object.fromEntries(
+    Object.entries(STRUCTURE_TYPES).map(([_, type]) => [type, 0]),
+  ) as { [key in STRUCTURE_TYPES]: number };
+
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
@@ -33,6 +56,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
   showCrossSectionVirus = false;
   showReclamationPlanVirus = false;
 
+  isNewStructure = new FormControl<boolean | null>(null, [Validators.required]);
   isFollowUp = new FormControl<string | null>(null, [Validators.required]);
   followUpIDs = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]);
   purpose = new FormControl<string | null>(null, [Validators.required]);
@@ -41,7 +65,14 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
   alternativeMeasures = new FormControl<string | null>(null, [Validators.required]);
   projectDuration = new FormControl<string | null>(null, [Validators.required]);
 
+  soilStructureFarmUseReason = new FormControl<string | null>(null);
+  soilStructureResidentialUseReason = new FormControl<string | null>(null);
+  soilAgriParcelActivity = new FormControl<string | null>(null);
+  soilStructureResidentialAccessoryUseReason = new FormControl<string | null>(null);
+  soilStructureOtherUseReason = new FormControl<string | null>(null);
+
   form = new FormGroup({
+    isNewStructure: this.isNewStructure,
     isFollowUp: this.isFollowUp,
     followUpIDs: this.followUpIDs,
     purpose: this.purpose,
@@ -49,9 +80,20 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     alternativeMeasures: this.alternativeMeasures,
     reduceNegativeImpacts: this.reduceNegativeImpacts,
     projectDuration: this.projectDuration,
+    soilStructureFarmUseReason: this.soilStructureFarmUseReason,
+    soilStructureResidentialUseReason: this.soilStructureResidentialUseReason,
+    soilAgriParcelActivity: this.soilAgriParcelActivity,
+    soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason,
+    soilStructureOtherUseReason: this.soilStructureOtherUseReason,
   });
 
+  structuresForm = new FormGroup({} as any);
+  proposedStructures: FormProposedStructure[] = [];
+  structuresSource = new MatTableDataSource(this.proposedStructures);
+  displayedColumns = ['index', 'type', 'area', 'action'];
+
   private submissionUuid = '';
+  isMobile = false;
   private areComponentsDirty = false;
   fillTableData: SoilTableData = {};
   alreadyFilledTableData: SoilTableData = {};
@@ -61,12 +103,15 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     private applicationService: ApplicationSubmissionService,
     applicationDocumentService: ApplicationDocumentService,
     dialog: MatDialog,
-    toastService: ToastService
+    toastService: ToastService,
+    private confirmationDialogService: ConfirmationDialogService,
   ) {
     super(applicationDocumentService, dialog, toastService);
   }
 
   ngOnInit(): void {
+    this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
     this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((applicationSubmission) => {
       if (applicationSubmission) {
         this.fileId = applicationSubmission.fileNumber;
@@ -91,6 +136,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
         }
 
         this.form.patchValue({
+          isNewStructure: applicationSubmission.soilIsNewStructure,
           isFollowUp: formatBooleanToString(applicationSubmission.soilIsFollowUp),
           followUpIDs: applicationSubmission.soilFollowUpIDs,
           purpose: applicationSubmission.purpose,
@@ -98,7 +144,20 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
           alternativeMeasures: applicationSubmission.soilAlternativeMeasures,
           reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts,
           projectDuration: applicationSubmission.soilProjectDuration,
+          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
+          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
+          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
+          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
+          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
         });
+
+        this.proposedStructures = [];
+        this.structuresForm = new FormGroup({});
+        for (const structure of applicationSubmission.soilProposedStructures) {
+          this.addControl(structure.type, structure.area);
+        }
+        this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
         if (this.showErrors) {
           this.form.markAllAsTouched();
         }
@@ -133,6 +192,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
 
   protected async save() {
     if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
+      const isNewStructure = this.isNewStructure.getRawValue();
       const isFollowUp = this.isFollowUp.getRawValue();
       const soilFollowUpIDs = this.followUpIDs.getRawValue();
       const purpose = this.purpose.getRawValue();
@@ -140,11 +200,21 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
       const soilAlternativeMeasures = this.alternativeMeasures.getRawValue();
       const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue();
 
+      const updatedStructures: ProposedStructure[] = this.proposedStructures.map((lot) => {
+        const lotType = this.structuresForm.controls[`${lot.id}-type`].value;
+        const lotArea = this.structuresForm.controls[`${lot.id}-area`].value;
+        return {
+          type: lotType,
+          area: lotArea ? parseFloat(lotArea) : null,
+        };
+      });
+
       const updateDto: ApplicationSubmissionUpdateDto = {
         purpose,
         soilFillTypeToPlace,
         soilAlternativeMeasures,
         soilReduceNegativeImpacts,
+        soilIsNewStructure: isNewStructure,
         soilIsFollowUp: parseStringToBoolean(isFollowUp),
         soilFollowUpIDs,
         soilToPlaceVolume: this.fillTableData?.volume ?? null,
@@ -156,6 +226,9 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
         soilAlreadyPlacedMaximumDepth: this.alreadyFilledTableData?.maximumDepth ?? null,
         soilAlreadyPlacedAverageDepth: this.alreadyFilledTableData?.averageDepth ?? null,
         soilProjectDuration: this.projectDuration.value,
+        soilStructureFarmUseReason: this.soilStructureFarmUseReason.value,
+        soilStructureResidentialUseReason: this.soilStructureResidentialUseReason.value,
+        soilProposedStructures: updatedStructures,
       };
 
       const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto);
@@ -163,6 +236,63 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeIsNewStructure(answeredYes: boolean | null) {
+    const hasValuesThatWillBeCleared: boolean = !!(
+      (answeredYes &&
+        (this.crossSections.length > 0 ||
+          this.reclamationPlan.length > 0 ||
+          this.reduceNegativeImpacts.value ||
+          this.alternativeMeasures.value)) ||
+      (!answeredYes &&
+        (this.proposedStructures.length > 0 ||
+          this.soilStructureFarmUseReason.value ||
+          this.soilStructureResidentialUseReason.value ||
+          this.soilAgriParcelActivity.value ||
+          this.soilStructureResidentialAccessoryUseReason.value ||
+          this.soilStructureOtherUseReason.value))
+    );
+
+    if (hasValuesThatWillBeCleared) {
+      this.confirmationDialogService
+        .openDialog({
+          title: 'Are you removing soil in order to build a structure?',
+          body: 'Warning: Changing your answer will remove all the saved progress on this step. Do you want to continue?',
+          confirmAction: 'Confirm',
+          cancelAction: 'Cancel',
+        })
+        .subscribe((isConfirmed) => {
+          if (isConfirmed) {
+            if (answeredYes) {
+              // Clear docs
+              this.crossSections = [];
+              this.reclamationPlan = [];
+
+              // Clear questions
+              this.reduceNegativeImpacts.reset();
+              this.alternativeMeasures.reset();
+            } else {
+              // Clear structures
+              this.structuresForm = new FormGroup({});
+              this.proposedStructures = [];
+              this.structuresSource = new MatTableDataSource(this.proposedStructures);
+              for (const type of Object.keys(this.structureTypeCounts) as Array<STRUCTURE_TYPES>) {
+                this.structureTypeCounts[type] = 0;
+              }
+
+              // Clear conditional questions
+              this.soilStructureFarmUseReason.reset();
+              this.soilStructureResidentialUseReason.reset();
+              this.soilAgriParcelActivity.reset();
+              this.soilStructureResidentialAccessoryUseReason.reset();
+              this.soilStructureOtherUseReason.reset();
+            }
+          } else {
+            this.isNewStructure.setValue(!answeredYes);
+          }
+        });
+    }
+  }
+
   onChangeFollowUp(selectedValue: string) {
     if (selectedValue === 'true') {
       this.followUpIDs.enable();
@@ -172,6 +302,189 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeStructureType(id: string, newType: STRUCTURE_TYPES) {
+    const structure = this.proposedStructures.find((structure) => structure.id === id);
+
+    if (!structure) {
+      console.error('Failed to find structure');
+      return;
+    }
+
+    if (this.hasInput(structure.type)) {
+      this.confirmationDialogService
+        .openDialog({
+          title: 'Change Structure Type',
+          body: 'Changing the structure type will remove inputs relevant to the current structure. Do you want to continue?',
+          confirmAction: 'Confirm',
+          cancelAction: 'Cancel',
+        })
+        .subscribe((isConfirmed) => {
+          if (isConfirmed) {
+            this.setStructureTypeInput(structure, newType);
+          } else {
+            this.structuresForm.get(structure.id + '-type')?.setValue(structure.type);
+          }
+        });
+    } else {
+      return this.setStructureTypeInput(structure, newType);
+    }
+  }
+
+  private hasInput(type: STRUCTURE_TYPES | null) {
+    switch (type) {
+      case STRUCTURE_TYPES.FARM_STRUCTURE:
+        return !!(this.soilAgriParcelActivity.value || this.soilStructureFarmUseReason.value);
+
+      case STRUCTURE_TYPES.ACCESSORY_STRUCTURE:
+        return !!(
+          this.soilStructureResidentialUseReason.value || this.soilStructureResidentialAccessoryUseReason.value
+        );
+
+      case STRUCTURE_TYPES.OTHER_STRUCTURE:
+        return !!this.soilStructureOtherUseReason.value;
+
+      case STRUCTURE_TYPES.PRINCIPAL_RESIDENCE:
+      case STRUCTURE_TYPES.ADDITIONAL_RESIDENCE:
+        return !!this.soilStructureResidentialUseReason.value;
+
+      case null:
+        return false;
+
+      default:
+        return true;
+    }
+  }
+
+  private setStructureTypeInput(structure: FormProposedStructure, newType: STRUCTURE_TYPES) {
+    if (structure.type !== null && this.structureTypeCounts[structure.type] > 0) {
+      this.structureTypeCounts[structure.type]--;
+    }
+
+    this.structureTypeCounts[newType]++;
+
+    structure.type = newType;
+
+    this.form.markAsDirty();
+  }
+
+  onStructureAdd() {
+    if (this.isMobile) {
+      const dialog = this.dialog.open(AddStructureDialogComponent, {
+        width: '70%',
+        data: {
+          structureData: {
+            options: this.structureTypeOptions,
+          },
+        },
+      });
+      dialog
+        .beforeClosed()
+        .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+          if (!result) return;
+          this.addControl(result.dto.type, result.dto.area);
+          this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
+          this.structureTypeCounts[result.dto.type!]++;
+        });
+    } else {
+      this.addControl();
+      this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    }
+  }
+
+  addControl(type: STRUCTURE_TYPES | null = null, area: number | null = null) {
+    const areaStr = area ? area.toString(10) : null;
+    const newStructure = { type, area: areaStr, id: v4() };
+    this.proposedStructures.push(newStructure);
+    this.structuresForm.addControl(
+      `${newStructure.id}-type`,
+      new FormControl<string | null>(type, [Validators.required]),
+    );
+    this.structuresForm.addControl(
+      `${newStructure.id}-area`,
+      new FormControl<string | null>(areaStr, [Validators.required]),
+    );
+
+    if (type) {
+      this.structureTypeCounts[type]++;
+    }
+  }
+
+  isWarning(index: number, item: ProposedStructure): boolean {
+    return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
+  }
+
+  onStructureRemove(id: string) {
+    this.confirmationDialogService
+      .openDialog({
+        title:
+          'Warning: Deleting the structure type can remove some content already saved to this page. Do you want to continue?',
+        body: 'Changing the structure type will remove inputs relevant to the current structure. Do you want to continue?',
+        confirmAction: 'Confirm',
+        cancelAction: 'Cancel',
+      })
+      .subscribe(async (result) => {
+        if (result) {
+          this.deleteStructure(id);
+        }
+      });
+  }
+
+  private deleteStructure(id: string) {
+    const structureToDelete = this.proposedStructures.find((structure) => structure.id === id);
+
+    if (!structureToDelete) {
+      console.error('Failed to find deleted structure');
+      return;
+    }
+
+    this.proposedStructures = this.proposedStructures.filter((structure) => structure.id !== structureToDelete.id);
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    this.structuresForm.removeControl(`${id}-type`);
+    this.structuresForm.removeControl(`${id}-area`);
+    this.structuresForm.markAsDirty();
+
+    if (structureToDelete.type !== null && this.structureTypeCounts[structureToDelete.type] > 0) {
+      this.structureTypeCounts[structureToDelete.type]--;
+    }
+  }
+
+  onStructureEdit(id: string) {
+    const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
+    const dialog = this.dialog.open(AddStructureDialogComponent, {
+      width: '70%',
+      data: {
+        isEdit: true,
+        structureId: structureToEdit?.id,
+        structureData: {
+          area: structureToEdit?.area,
+          type: structureToEdit?.type,
+          options: this.structureTypeOptions,
+        },
+      },
+    });
+    dialog
+      .afterClosed()
+      .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+        if (!result) return;
+        const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
+
+        if (structureToEdit) {
+          if (structureToEdit.type !== result.dto.type) {
+            this.setStructureTypeInput(structureToEdit, result.dto.type!);
+          }
+
+          structureToEdit.area = result.dto.area ? result.dto.area.toString(10) : null;
+          structureToEdit.type = result.dto.type;
+          const areaControl = this.structuresForm.controls[`${structureToEdit?.id}-area`];
+          const typeControl = this.structuresForm.controls[`${structureToEdit?.id}-type`];
+          areaControl.setValue(structureToEdit.area?.toString());
+          typeControl.setValue(structureToEdit.type);
+          this.structuresForm.markAsDirty();
+        }
+      });
+  }
+
   markDirty() {
     this.areComponentsDirty = true;
   }
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
index 061c1edf1..da4574dbd 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
@@ -25,6 +25,41 @@ <h2>Proposal</h2>
 </app-warning-banner>
 <form [formGroup]="form">
   <div class="form-row">
+    <div class="full-row">
+      <mat-label for="is-new-structure">
+        Are you removing soil and placing fill in order to build a structure?
+      </mat-label>
+      <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div>
+      <div>
+        <mat-button-toggle-group
+          class="input"
+          (change)="onChangeIsNewStructure($event.value)"
+          id="is-new-structure"
+          [formControl]="isNewStructure"
+        >
+          <mat-button-toggle
+            class="toggle-button"
+            [ngClass]="{
+              'error-outline': isNewStructure.invalid && (isNewStructure.dirty || isNewStructure.touched),
+            }"
+            [value]="true"
+            >Yes
+          </mat-button-toggle>
+          <mat-button-toggle
+            class="toggle-button"
+            [ngClass]="{
+              'error-outline': isNewStructure.invalid && (isNewStructure.dirty || isNewStructure.touched),
+            }"
+            [value]="false"
+            >No
+          </mat-button-toggle>
+        </mat-button-toggle-group>
+      </div>
+      <mat-hint class="subtext"
+        >Note: The form will be updated with additional required questions if you are building a structure
+      </mat-hint>
+    </div>
+
     <div class="full-row">
       <mat-label for="noi-follow-up">
         Has the ALC previously received an application or Notice of Intent for this proposal?
@@ -40,7 +75,7 @@ <h2>Proposal</h2>
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
-              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched)
+              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched),
             }"
             value="true"
             >Yes
@@ -48,7 +83,7 @@ <h2>Proposal</h2>
           <mat-button-toggle
             class="toggle-button"
             [ngClass]="{
-              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched)
+              'error-outline': isFollowUp.invalid && (isFollowUp.dirty || isFollowUp.touched),
             }"
             value="false"
             >No
@@ -56,6 +91,7 @@ <h2>Proposal</h2>
         </mat-button-toggle-group>
       </div>
     </div>
+
     <div class="full-row">
       <label for="followUpIds">Application or NOI ID</label>
       <div class="subtext">If you have multiple IDs, please separate with a comma.</div>
@@ -68,6 +104,7 @@ <h2>Proposal</h2>
         <div *ngIf="followUpIds.errors?.['required']">This field is required</div>
       </div>
     </div>
+
     <div class="full-row">
       <label for="purpose">What is the purpose of the proposal?</label>
       <div class="subtext">
@@ -134,6 +171,7 @@ <h2>Proposal</h2>
         (dataChange)="markDirty()"
       ></app-soil-table>
     </div>
+
     <div class="full-row">
       <mat-label
         >Of the proposed totals provided above, please input the dimensions of soil that has already been
@@ -146,6 +184,7 @@ <h2>Proposal</h2>
         (dataChange)="markDirty()"
       ></app-soil-table>
     </div>
+
     <div class="full-row">
       <label for="soilTypeRemoved">Describe the type of soil proposed to be removed.</label>
       <div class="subtext">List all proposed soil types to be removed.</div>
@@ -167,34 +206,349 @@ <h2>Proposal</h2>
       <div class="subtext">Characters left: {{ 4000 - suitabilityText.textLength }}</div>
     </div>
 
-    <div class="full-row">
-      <label for="agricultural-support">
-        What steps will be taken to reduce impacts to surrounding agricultural land?
-        <div class="subtext">Describe impact reducing measures.</div>
-      </label>
-      <mat-form-field appearance="outline">
-        <textarea
-          [formControl]="reduceNegativeImpacts"
-          #reduceNegativeImpactsText
-          maxlength="4000"
-          id="agricultural-support"
-          matInput
-          placeholder="Type comment"
-        ></textarea>
-      </mat-form-field>
-      <div
-        *ngIf="reduceNegativeImpacts.invalid && (reduceNegativeImpacts.dirty || reduceNegativeImpacts.touched)"
-        class="field-error"
-      >
-        <mat-icon>warning</mat-icon>
-        <div *ngIf="reduceNegativeImpacts.errors?.['required']">This field is required</div>
+    <ng-container *ngIf="isNewStructure.value === true">
+      <form [formGroup]="structuresForm">
+        <mat-label>Provide the total floor area (m<sup>2</sup>) for each of the proposed structure(s)</mat-label>
+        <div class="scrollable">
+          <div *ngIf="isMobile">
+            <app-structure-mobile-card
+              *ngFor="let structure of proposedStructures; let last = last; index as i"
+              [structure]="structure"
+              [isLast]="last"
+              [index]="i"
+              [isReviewStep]="false"
+              (removeClicked)="onStructureRemove(structure.id)"
+              (editClicked)="onStructureEdit(structure.id)"
+            >
+            </app-structure-mobile-card>
+          </div>
+          <table mat-table [dataSource]="structuresSource" multiTemplateDataRows *ngIf="!isMobile">
+            <ng-container matColumnDef="index">
+              <th mat-header-cell *matHeaderCellDef>#</th>
+              <td mat-cell *matCellDef="let i = dataIndex">{{ i + 1 }}</td>
+            </ng-container>
+
+            <ng-container matColumnDef="type">
+              <th mat-header-cell *matHeaderCellDef>Type</th>
+              <td mat-cell *matCellDef="let element">
+                <mat-form-field appearance="outline">
+                  <mat-select
+                    [value]="element.type"
+                    placeholder="Please select"
+                    [formControlName]="element.id + '-type'"
+                    (valueChange)="onChangeStructureType(element.id, $event)"
+                  >
+                    <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
+                      {{ type.label }}
+                    </mat-option>
+                  </mat-select>
+                </mat-form-field>
+                <div
+                  *ngIf="
+                    structuresForm.controls[element.id + '-type']!.invalid &&
+                    (structuresForm.controls[element.id + '-type']!.dirty ||
+                      structuresForm.controls[element.id + '-type']!.touched)
+                  "
+                  class="field-error"
+                >
+                  <mat-icon>warning</mat-icon>
+                  <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
+                    This field is required
+                  </div>
+                </div>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="area">
+              <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
+              <td mat-cell *matCellDef="let element">
+                <mat-form-field appearance="outline">
+                  <input
+                    type="text"
+                    matInput
+                    thousandSeparator=","
+                    mask="separator.5"
+                    separatorLimit="9999999999"
+                    min="0.01"
+                    placeholder="Type area"
+                    [formControlName]="element.id + '-area'"
+                  />
+                  <span matTextSuffix>m<sup>2</sup></span>
+                </mat-form-field>
+                <div
+                  *ngIf="
+                    structuresForm.controls[element.id + '-area']!.invalid &&
+                    (structuresForm.controls[element.id + '-area']!.dirty ||
+                      structuresForm.controls[element.id + '-area']!.touched)
+                  "
+                  class="field-error"
+                >
+                  <mat-icon>warning</mat-icon>
+                  <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
+                    This field is required
+                  </div>
+                </div>
+              </td>
+            </ng-container>
+
+            <ng-container matColumnDef="action">
+              <th mat-header-cell *matHeaderCellDef>Action</th>
+              <td mat-cell *matCellDef="let element">
+                <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
+                  Remove
+                </button>
+              </td>
+            </ng-container>
+
+            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+            <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+
+            <ng-container matColumnDef="msgWarning">
+              <td colspan="7" mat-cell *matCellDef>
+                <div class="residential-warning">
+                  <div class="residential-warning-text">
+                    The proposed residential structure and its total floor area must be allowed under the ALC Act and/or
+                    ALR Use Regulation. If not, you may require a 'Non-Adhering Residential Use' application instead.
+                    For more info, please see
+                    <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+                      >Housing in the ALR</a
+                    >
+                    on the ALC website.
+                  </div>
+                </div>
+              </td>
+            </ng-container>
+
+            <tr mat-row class="row-group" *matRowDef="let row; columns: ['msgWarning']; when: isWarning"></tr>
+
+            <tr class="mat-row no-data" *matNoDataRow>
+              <td class="text-center" colspan="7">
+                No Proposed Structures Entered. Use the button below to add your first structure.
+              </td>
+            </tr>
+          </table>
+        </div>
+      </form>
+
+      <div class="full-row">
+        <button
+          mat-stroked-button
+          color="primary"
+          (click)="onStructureAdd()"
+          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+          type="button"
+        >
+          + Add Structure
+        </button>
+        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+          At least one structure is required
+        </app-validation-error>
       </div>
-      <mat-hint class="subtext">
-        Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
-        temporary or permanent drainage, etc.
-      </mat-hint>
-      <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div>
-    </div>
+
+      <div class="full-row">
+        <app-warning-banner>
+          Selected proposed structure type(s) will determine the proposal questions below
+        </app-warning-banner>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.FARM_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureFarmUseReason">Describe how the structure is necessary for farm use</label>
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#farmstructures" target="_blank"
+            >Farm Structures in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureFarmUseReason"
+            #soilStructureFarmUseReasonText
+            maxlength="4000"
+            id="soilStructureFarmUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureFarmUseReason.invalid &&
+            (soilStructureFarmUseReason.dirty || soilStructureFarmUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureFarmUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureFarmUseReasonText.textLength }}</div>
+      </div>
+
+      <div class="full-row">
+        <label for="soilAgriParcelActivity"
+          >Describe the current or proposed agricultural activity on the parcel(s)</label
+        >
+        <div class="subtext">Include the area, yields, crop types, and farm equipment size and attachments</div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilAgriParcelActivity"
+            #soilAgriParcelActivityText
+            maxlength="4000"
+            id="soilAgriParcelActivity"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="soilAgriParcelActivity.invalid && (soilAgriParcelActivity.dirty || soilAgriParcelActivity.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilAgriParcelActivity.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilAgriParcelActivityText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container
+      *ngIf="
+        structureTypeCounts[structureTypes.PRINCIPAL_RESIDENCE] > 0 ||
+        structureTypeCounts[structureTypes.ADDITIONAL_RESIDENCE] > 0 ||
+        structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0
+      "
+    >
+      <div class="full-row">
+        <label for="soilStructureResidentialUseReason"
+          >Describe why placing fill/removing soil is required for the residential structure(s)</label
+        >
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+            >Housing in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureResidentialUseReason"
+            #soilStructureResidentialUseReasonText
+            maxlength="4000"
+            id="soilStructureResidentialUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureResidentialUseReason.invalid &&
+            (soilStructureResidentialUseReason.dirty || soilStructureResidentialUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureResidentialUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureResidentialUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureResidentialAccessoryUseReason"
+          >Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+          required</label
+        >
+        <div class="info-banner subtext">
+          Please refer to
+          <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+            >Housing in the ALR</a
+          >
+          on the ALC website for more detail.
+        </div>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureResidentialAccessoryUseReason"
+            #structureResidentialAccessoryUseReasonText
+            maxlength="4000"
+            id="soilStructureResidentialAccessoryUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureResidentialAccessoryUseReason.invalid &&
+            (soilStructureResidentialAccessoryUseReason.dirty || soilStructureResidentialAccessoryUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureResidentialAccessoryUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - structureResidentialAccessoryUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="structureTypeCounts[structureTypes.OTHER_STRUCTURE] > 0">
+      <div class="full-row">
+        <label for="soilStructureOtherUseReason">
+          Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            formControlName="soilStructureOtherUseReason"
+            #soilStructureOtherUseReasonText
+            maxlength="4000"
+            id="soilStructureOtherUseReason"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="
+            soilStructureOtherUseReason.invalid &&
+            (soilStructureOtherUseReason.dirty || soilStructureOtherUseReason.touched)
+          "
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="soilStructureOtherUseReason.errors?.['required']">This field is required</div>
+        </div>
+        <div class="subtext">Characters left: {{ 4000 - soilStructureOtherUseReasonText.textLength }}</div>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isNewStructure.value === false">
+      <div class="full-row">
+        <label for="agricultural-support">
+          What steps will be taken to reduce impacts to surrounding agricultural land?
+          <div class="subtext">Describe impact reducing measures.</div>
+        </label>
+        <mat-form-field appearance="outline">
+          <textarea
+            [formControl]="reduceNegativeImpacts"
+            #reduceNegativeImpactsText
+            maxlength="4000"
+            id="agricultural-support"
+            matInput
+            placeholder="Type comment"
+          ></textarea>
+        </mat-form-field>
+        <div
+          *ngIf="reduceNegativeImpacts.invalid && (reduceNegativeImpacts.dirty || reduceNegativeImpacts.touched)"
+          class="field-error"
+        >
+          <mat-icon>warning</mat-icon>
+          <div *ngIf="reduceNegativeImpacts.errors?.['required']">This field is required</div>
+        </div>
+        <mat-hint class="subtext">
+          Example: Project phasing, providing landscape screening, fencing, buffering, erosion and sediment control,
+          temporary or permanent drainage, etc.
+        </mat-hint>
+        <div class="subtext">Characters left: {{ 4000 - reduceNegativeImpactsText.textLength }}</div>
+      </div>
+    </ng-container>
 
     <div class="full-row">
       <mat-label class="subheading2" for="proposal-map">Proposal Map / Site Plan</mat-label>
@@ -210,57 +564,61 @@ <h2>Proposal</h2>
         [showVirusError]="showProposalMapVirus"
       ></app-file-drag-drop>
     </div>
-    <div class="full-row">
-      <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label>
-      <div class="subtext">Include North-South and East-West cross sections</div>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Removal of Soil</a
-        >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="cross-section"
-        [uploadedFiles]="crossSections"
-        (uploadFiles)="attachCrossSection($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [allowMultiple]="true"
-        [showVirusError]="showCrossSectionVirus"
-      ></app-file-drag-drop>
-    </div>
-    <div class="full-row">
-      <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label>
-      <div class="subtext">
-        The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's
-        agricultural capability assessment.
+
+    <ng-container *ngIf="isNewStructure.value === false">
+      <div class="full-row">
+        <mat-label class="subheading2" for="cross-section">Cross Sections</mat-label>
+        <div class="subtext">Include North-South and East-West cross sections</div>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Removal of Soil</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="cross-section"
+          [uploadedFiles]="crossSections"
+          (uploadFiles)="attachCrossSection($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [allowMultiple]="true"
+          [showVirusError]="showCrossSectionVirus"
+        ></app-file-drag-drop>
       </div>
-      <app-info-banner>
-        Please refer to
-        <a
-          href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
-          target="_blank"
-          >Removal of Soil</a
-        >
-        on the ALC website for more information
-      </app-info-banner>
-      <app-file-drag-drop
-        id="reclamation-plan"
-        [uploadedFiles]="reclamationPlan"
-        (uploadFiles)="attachReclamationPlan($event)"
-        (deleteFile)="onDeleteFile($event)"
-        (openFile)="openFile($event)"
-        [showErrors]="showErrors"
-        [isRequired]="true"
-        [allowMultiple]="true"
-        [showVirusError]="showReclamationPlanVirus"
-      ></app-file-drag-drop>
-    </div>
+
+      <div class="full-row">
+        <mat-label class="subheading2" for="reclamation-plan">Reclamation Plan</mat-label>
+        <div class="subtext">
+          The Reclamation Plan should be completed by a qualified Professional Agrologist and contain the area's
+          agricultural capability assessment.
+        </div>
+        <app-info-banner>
+          Please refer to
+          <a
+            href="https://www.alc.gov.bc.ca/application-and-notice-process/applications/required-documents/#pfrs"
+            target="_blank"
+            >Removal of Soil</a
+          >
+          on the ALC website for more information
+        </app-info-banner>
+        <app-file-drag-drop
+          id="reclamation-plan"
+          [uploadedFiles]="reclamationPlan"
+          (uploadFiles)="attachReclamationPlan($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [isRequired]="true"
+          [allowMultiple]="true"
+          [showVirusError]="showReclamationPlanVirus"
+        ></app-file-drag-drop>
+      </div>
+    </ng-container>
   </div>
 </form>
 <div class="button-container">
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index b7eb501e6..36ccbd817 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { MatDialog } from '@angular/material/dialog';
 import { Router } from '@angular/router';
@@ -15,6 +15,17 @@ import { parseStringToBoolean } from '../../../../../shared/utils/string-helper'
 import { EditApplicationSteps } from '../../edit-submission.component';
 import { FilesStepComponent } from '../../files-step.partial';
 import { SoilTableData } from '../../../../../shared/soil-table/soil-table.component';
+import {
+  FormProposedStructure,
+  STRUCTURE_TYPE_OPTIONS,
+  STRUCTURE_TYPES,
+} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
+import { MatTableDataSource } from '@angular/material/table';
+import { ConfirmationDialogService } from '../../../../../shared/confirmation-dialog/confirmation-dialog.service';
+import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints';
+import { AddStructureDialogComponent } from '../../../../../features/notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component';
+import { ProposedStructure } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
+import { v4 } from 'uuid';
 
 @Component({
   selector: 'app-roso-proposal',
@@ -24,8 +35,19 @@ import { SoilTableData } from '../../../../../shared/soil-table/soil-table.compo
 export class RosoProposalComponent extends FilesStepComponent implements OnInit, OnDestroy {
   currentStep = EditApplicationSteps.Proposal;
 
+  @HostListener('window:resize', ['$event'])
+  onWindowResize() {
+    this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+  }
+
   DOCUMENT = DOCUMENT_TYPE;
 
+  structureTypes = STRUCTURE_TYPES;
+  structureTypeOptions = STRUCTURE_TYPE_OPTIONS;
+  structureTypeCounts: Record<STRUCTURE_TYPES, number> = Object.fromEntries(
+    Object.entries(STRUCTURE_TYPES).map(([_, type]) => [type, 0]),
+  ) as { [key in STRUCTURE_TYPES]: number };
+
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
@@ -34,6 +56,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
   showCrossSectionVirus = false;
   showReclamationPlanVirus = false;
 
+  isNewStructure = new FormControl<boolean | null>(null, [Validators.required]);
   isFollowUp = new FormControl<string | null>(null, [Validators.required]);
   followUpIds = new FormControl<string | null>({ value: null, disabled: true }, [Validators.required]);
   purpose = new FormControl<string | null>(null, [Validators.required]);
@@ -42,16 +65,34 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
   projectDuration = new FormControl<string | null>(null, [Validators.required]);
   areComponentsDirty = false;
 
+  soilStructureFarmUseReason = new FormControl<string | null>(null);
+  soilStructureResidentialUseReason = new FormControl<string | null>(null);
+  soilAgriParcelActivity = new FormControl<string | null>(null);
+  soilStructureResidentialAccessoryUseReason = new FormControl<string | null>(null);
+  soilStructureOtherUseReason = new FormControl<string | null>(null);
+
   form = new FormGroup({
+    isNewStructure: this.isNewStructure,
     isFollowUp: this.isFollowUp,
     followUpIds: this.followUpIds,
     purpose: this.purpose,
     soilTypeRemoved: this.soilTypeRemoved,
     reduceNegativeImpacts: this.reduceNegativeImpacts,
     projectDuration: this.projectDuration,
+    soilStructureFarmUseReason: this.soilStructureFarmUseReason,
+    soilStructureResidentialUseReason: this.soilStructureResidentialUseReason,
+    soilAgriParcelActivity: this.soilAgriParcelActivity,
+    soilStructureResidentialAccessoryUseReason: this.soilStructureResidentialAccessoryUseReason,
+    soilStructureOtherUseReason: this.soilStructureOtherUseReason,
   });
 
+  structuresForm = new FormGroup({} as any);
+  proposedStructures: FormProposedStructure[] = [];
+  structuresSource = new MatTableDataSource(this.proposedStructures);
+  displayedColumns = ['index', 'type', 'area', 'action'];
+
   private submissionUuid = '';
+  isMobile = false;
   removalTableData: SoilTableData = {};
   alreadyRemovedTableData: SoilTableData = {};
 
@@ -60,12 +101,15 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     private applicationService: ApplicationSubmissionService,
     applicationDocumentService: ApplicationDocumentService,
     dialog: MatDialog,
-    toastService: ToastService
+    toastService: ToastService,
+    private confirmationDialogService: ConfirmationDialogService,
   ) {
     super(applicationDocumentService, dialog, toastService);
   }
 
   ngOnInit(): void {
+    this.isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
     this.$applicationSubmission.pipe(takeUntil(this.$destroy)).subscribe((applicationSubmission) => {
       if (applicationSubmission) {
         this.fileId = applicationSubmission.fileNumber;
@@ -90,13 +134,27 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
         }
 
         this.form.patchValue({
+          isNewStructure: applicationSubmission.soilIsNewStructure,
           isFollowUp: formatBooleanToString(applicationSubmission.soilIsFollowUp),
           followUpIds: applicationSubmission.soilFollowUpIDs,
           purpose: applicationSubmission.purpose,
           soilTypeRemoved: applicationSubmission.soilTypeRemoved,
           reduceNegativeImpacts: applicationSubmission.soilReduceNegativeImpacts,
           projectDuration: applicationSubmission.soilProjectDuration,
+          soilStructureFarmUseReason: applicationSubmission.soilStructureFarmUseReason,
+          soilStructureResidentialUseReason: applicationSubmission.soilStructureResidentialUseReason,
+          soilAgriParcelActivity: applicationSubmission.soilAgriParcelActivity,
+          soilStructureResidentialAccessoryUseReason: applicationSubmission.soilStructureResidentialAccessoryUseReason,
+          soilStructureOtherUseReason: applicationSubmission.soilStructureOtherUseReason,
         });
+
+        this.proposedStructures = [];
+        this.structuresForm = new FormGroup({});
+        for (const structure of applicationSubmission.soilProposedStructures) {
+          this.addControl(structure.type, structure.area);
+        }
+        this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
         if (this.showErrors) {
           this.form.markAllAsTouched();
         }
@@ -131,16 +189,27 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
 
   protected async save() {
     if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
+      const isNewStructure = this.isNewStructure.getRawValue();
       const isNOIFollowUp = this.isFollowUp.getRawValue();
       const soilFollowUpIDs = this.followUpIds.getRawValue();
       const purpose = this.purpose.getRawValue();
       const soilTypeRemoved = this.soilTypeRemoved.getRawValue();
       const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue();
 
+      const updatedStructures: ProposedStructure[] = this.proposedStructures.map((lot) => {
+        const lotType = this.structuresForm.controls[`${lot.id}-type`].value;
+        const lotArea = this.structuresForm.controls[`${lot.id}-area`].value;
+        return {
+          type: lotType,
+          area: lotArea ? parseFloat(lotArea) : null,
+        };
+      });
+
       const updateDto: ApplicationSubmissionUpdateDto = {
         purpose,
         soilTypeRemoved,
         soilReduceNegativeImpacts,
+        soilIsNewStructure: isNewStructure,
         soilIsFollowUp: parseStringToBoolean(isNOIFollowUp),
         soilFollowUpIDs,
         soilToRemoveVolume: this.removalTableData?.volume ?? null,
@@ -152,6 +221,9 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
         soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null,
         soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null,
         soilProjectDuration: this.projectDuration.value,
+        soilStructureFarmUseReason: this.soilStructureFarmUseReason.value,
+        soilStructureResidentialUseReason: this.soilStructureResidentialUseReason.value,
+        soilProposedStructures: updatedStructures,
       };
 
       const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto);
@@ -159,6 +231,59 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeIsNewStructure(answeredYes: boolean | null) {
+    const hasValuesThatWillBeCleared: boolean = !!(
+      (answeredYes &&
+        (this.crossSections.length > 0 || this.reclamationPlan.length > 0 || this.reduceNegativeImpacts.value)) ||
+      (!answeredYes &&
+        (this.proposedStructures.length > 0 ||
+          this.soilStructureFarmUseReason.value ||
+          this.soilStructureResidentialUseReason.value ||
+          this.soilAgriParcelActivity.value ||
+          this.soilStructureResidentialAccessoryUseReason.value ||
+          this.soilStructureOtherUseReason.value))
+    );
+
+    if (hasValuesThatWillBeCleared) {
+      this.confirmationDialogService
+        .openDialog({
+          title: 'Are you removing soil in order to build a structure?',
+          body: 'Warning: Changing your answer will remove all the saved progress on this step. Do you want to continue?',
+          confirmAction: 'Confirm',
+          cancelAction: 'Cancel',
+        })
+        .subscribe((isConfirmed) => {
+          if (isConfirmed) {
+            if (answeredYes) {
+              // Clear docs
+              this.crossSections = [];
+              this.reclamationPlan = [];
+
+              // Clear questions
+              this.reduceNegativeImpacts.reset();
+            } else {
+              // Clear structures
+              this.structuresForm = new FormGroup({});
+              this.proposedStructures = [];
+              this.structuresSource = new MatTableDataSource(this.proposedStructures);
+              for (const type of Object.keys(this.structureTypeCounts) as Array<STRUCTURE_TYPES>) {
+                this.structureTypeCounts[type] = 0;
+              }
+
+              // Clear conditional questions
+              this.soilStructureFarmUseReason.reset();
+              this.soilStructureResidentialUseReason.reset();
+              this.soilAgriParcelActivity.reset();
+              this.soilStructureResidentialAccessoryUseReason.reset();
+              this.soilStructureOtherUseReason.reset();
+            }
+          } else {
+            this.isNewStructure.setValue(!answeredYes);
+          }
+        });
+    }
+  }
+
   onChangeIsFollowUp(selectedValue: string) {
     if (selectedValue === 'true') {
       this.followUpIds.enable();
@@ -168,6 +293,189 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onStructureAdd() {
+    if (this.isMobile) {
+      const dialog = this.dialog.open(AddStructureDialogComponent, {
+        width: '70%',
+        data: {
+          structureData: {
+            options: this.structureTypeOptions,
+          },
+        },
+      });
+      dialog
+        .beforeClosed()
+        .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+          if (!result) return;
+          this.addControl(result.dto.type, result.dto.area);
+          this.structuresSource = new MatTableDataSource(this.proposedStructures);
+
+          this.structureTypeCounts[result.dto.type!]++;
+        });
+    } else {
+      this.addControl();
+      this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    }
+  }
+
+  addControl(type: STRUCTURE_TYPES | null = null, area: number | null = null) {
+    const areaStr = area ? area.toString(10) : null;
+    const newStructure = { type, area: areaStr, id: v4() };
+    this.proposedStructures.push(newStructure);
+    this.structuresForm.addControl(
+      `${newStructure.id}-type`,
+      new FormControl<string | null>(type, [Validators.required]),
+    );
+    this.structuresForm.addControl(
+      `${newStructure.id}-area`,
+      new FormControl<string | null>(areaStr, [Validators.required]),
+    );
+
+    if (type) {
+      this.structureTypeCounts[type]++;
+    }
+  }
+
+  isWarning(index: number, item: ProposedStructure): boolean {
+    return item.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE || item.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE;
+  }
+
+  onStructureRemove(id: string) {
+    this.confirmationDialogService
+      .openDialog({
+        title:
+          'Warning: Deleting the structure type can remove some content already saved to this page. Do you want to continue?',
+        body: 'Changing the structure type will remove inputs relevant to the current structure. Do you want to continue?',
+        confirmAction: 'Confirm',
+        cancelAction: 'Cancel',
+      })
+      .subscribe(async (result) => {
+        if (result) {
+          this.deleteStructure(id);
+        }
+      });
+  }
+
+  private deleteStructure(id: string) {
+    const structureToDelete = this.proposedStructures.find((structure) => structure.id === id);
+
+    if (!structureToDelete) {
+      console.error('Failed to find deleted structure');
+      return;
+    }
+
+    this.proposedStructures = this.proposedStructures.filter((structure) => structure.id !== structureToDelete.id);
+    this.structuresSource = new MatTableDataSource(this.proposedStructures);
+    this.structuresForm.removeControl(`${id}-type`);
+    this.structuresForm.removeControl(`${id}-area`);
+    this.structuresForm.markAsDirty();
+
+    if (structureToDelete.type !== null && this.structureTypeCounts[structureToDelete.type] > 0) {
+      this.structureTypeCounts[structureToDelete.type]--;
+    }
+  }
+
+  onStructureEdit(id: string) {
+    const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
+    const dialog = this.dialog.open(AddStructureDialogComponent, {
+      width: '70%',
+      data: {
+        isEdit: true,
+        structureId: structureToEdit?.id,
+        structureData: {
+          area: structureToEdit?.area,
+          type: structureToEdit?.type,
+          options: this.structureTypeOptions,
+        },
+      },
+    });
+    dialog
+      .afterClosed()
+      .subscribe(async (result: { isEditing: boolean; structureId: string; dto: ProposedStructure }) => {
+        if (!result) return;
+        const structureToEdit = this.proposedStructures.find((structure) => structure.id === id);
+
+        if (structureToEdit) {
+          if (structureToEdit.type !== result.dto.type) {
+            this.setStructureTypeInput(structureToEdit, result.dto.type!);
+          }
+
+          structureToEdit.area = result.dto.area ? result.dto.area.toString(10) : null;
+          structureToEdit.type = result.dto.type;
+          const areaControl = this.structuresForm.controls[`${structureToEdit?.id}-area`];
+          const typeControl = this.structuresForm.controls[`${structureToEdit?.id}-type`];
+          areaControl.setValue(structureToEdit.area?.toString());
+          typeControl.setValue(structureToEdit.type);
+          this.structuresForm.markAsDirty();
+        }
+      });
+  }
+
+  onChangeStructureType(id: string, newType: STRUCTURE_TYPES) {
+    const structure = this.proposedStructures.find((structure) => structure.id === id);
+
+    if (!structure) {
+      console.error('Failed to find structure');
+      return;
+    }
+
+    if (this.hasInput(structure.type)) {
+      this.confirmationDialogService
+        .openDialog({
+          title: 'Change Structure Type',
+          body: 'Changing the structure type will remove inputs relevant to the current structure. Do you want to continue?',
+          confirmAction: 'Confirm',
+          cancelAction: 'Cancel',
+        })
+        .subscribe((isConfirmed) => {
+          if (isConfirmed) {
+            this.setStructureTypeInput(structure, newType);
+          } else {
+            this.structuresForm.get(structure.id + '-type')?.setValue(structure.type);
+          }
+        });
+    } else {
+      return this.setStructureTypeInput(structure, newType);
+    }
+  }
+
+  private hasInput(type: STRUCTURE_TYPES | null) {
+    switch (type) {
+      case STRUCTURE_TYPES.FARM_STRUCTURE:
+        return !!(this.soilAgriParcelActivity.value || this.soilStructureFarmUseReason.value);
+
+      case STRUCTURE_TYPES.ACCESSORY_STRUCTURE:
+        return !!(
+          this.soilStructureResidentialUseReason.value || this.soilStructureResidentialAccessoryUseReason.value
+        );
+
+      case STRUCTURE_TYPES.OTHER_STRUCTURE:
+        return !!this.soilStructureOtherUseReason.value;
+
+      case STRUCTURE_TYPES.PRINCIPAL_RESIDENCE:
+      case STRUCTURE_TYPES.ADDITIONAL_RESIDENCE:
+        return !!this.soilStructureResidentialUseReason.value;
+
+      case null:
+        return false;
+
+      default:
+        return true;
+    }
+  }
+
+  private setStructureTypeInput(structure: FormProposedStructure, newType: STRUCTURE_TYPES) {
+    if (structure.type !== null && this.structureTypeCounts[structure.type] > 0) {
+      this.structureTypeCounts[structure.type]--;
+    }
+
+    this.structureTypeCounts[newType]++;
+
+    structure.type = newType;
+
+    this.form.markAsDirty();
+  }
+
   markDirty() {
     this.areComponentsDirty = true;
   }

From a2dfd3e9495bc91e082219852e3057c729c17e75 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:38:43 -0700
Subject: [PATCH 20/45] Add building plans

---
 .../pfrs-proposal.component.html              | 21 +++++++++++++++++++
 .../pfrs-proposal/pfrs-proposal.component.ts  | 12 ++++++++++-
 .../pofo-proposal.component.html              | 19 +++++++++++++++++
 .../pofo-proposal/pofo-proposal.component.ts  | 12 ++++++++++-
 .../roso-proposal.component.html              | 19 +++++++++++++++++
 .../roso-proposal/roso-proposal.component.ts  | 12 ++++++++++-
 6 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index e009e4c59..6d3192b52 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -737,7 +737,28 @@ <h2>Proposal</h2>
           [showVirusError]="showReclamationPlanVirus"
         ></app-file-drag-drop>
       </div>
+    </ng-container>
 
+    <ng-container *ngIf="isNewStructure.value === true">
+      <div class="full-row">
+        <mat-label class="subheading2" for="detailed-building-plans">Detailed Building Plan(s)</mat-label>
+        <div class="subtext">
+          Building plans must be the most up to date, current version and should include (1) the total floor area of all
+          levels and intended use; and (2) interior and exterior views
+        </div>
+        <app-file-drag-drop
+          id="detailed-building-plans"
+          [uploadedFiles]="buildingPlans"
+          (uploadFiles)="attachBuildingPlan($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [showVirusError]="showBuildingPlanVirus"
+        ></app-file-drag-drop>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isNewStructure.value === false">
       <div class="full-row">
         <mat-label for="isExtractionOrMining">Is your proposal for aggregate extraction or placer mining?</mat-label>
         <div>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 6bfdbb39b..47fb37b1d 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -50,12 +50,14 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
   noticeOfWork: ApplicationDocumentDto[] = [];
   areComponentsDirty = false;
 
   showProposalMapVirus = false;
   showCrossSectionVirus = false;
   showReclamationPlanVirus = false;
+  showBuildingPlanVirus = false;
   showNoticeOfWorkVirus = false;
 
   isNewStructure = new FormControl<boolean | null>(null, [Validators.required]);
@@ -207,6 +209,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
       this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
       this.reclamationPlan = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
       this.noticeOfWork = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK);
     });
   }
@@ -230,6 +233,11 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     this.showReclamationPlanVirus = !res;
   }
 
+  async attachBuildingPlan(file: FileHandle) {
+    const res = await this.attachFile(file, DOCUMENT_TYPE.BUILDING_PLAN);
+    this.showBuildingPlanVirus = !res;
+  }
+
   async attachNoticeOfWork(file: FileHandle) {
     const res = await this.attachFile(file, DOCUMENT_TYPE.NOTICE_OF_WORK);
     this.showNoticeOfWorkVirus = !res;
@@ -313,7 +321,8 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
           this.soilStructureResidentialUseReason.value ||
           this.soilAgriParcelActivity.value ||
           this.soilStructureResidentialAccessoryUseReason.value ||
-          this.soilStructureOtherUseReason.value))
+          this.soilStructureOtherUseReason.value ||
+          this.buildingPlans.length > 0))
     );
 
     if (hasValuesThatWillBeCleared) {
@@ -330,6 +339,7 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
               // Clear docs
               this.crossSections = [];
               this.reclamationPlan = [];
+              this.buildingPlans = [];
               this.noticeOfWork = [];
 
               // Clear questions
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
index 69afe447f..0d89bff88 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
@@ -651,6 +651,25 @@ <h2>Proposal</h2>
         ></app-file-drag-drop>
       </div>
     </ng-container>
+
+    <ng-container *ngIf="isNewStructure.value === true">
+      <div class="full-row">
+        <mat-label class="subheading2" for="detailed-building-plans">Detailed Building Plan(s)</mat-label>
+        <div class="subtext">
+          Building plans must be the most up to date, current version and should include (1) the total floor area of all
+          levels and intended use; and (2) interior and exterior views
+        </div>
+        <app-file-drag-drop
+          id="detailed-building-plans"
+          [uploadedFiles]="buildingPlans"
+          (uploadFiles)="attachBuildingPlan($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [showVirusError]="showBuildingPlanVirus"
+        ></app-file-drag-drop>
+      </div>
+    </ng-container>
   </div>
 </form>
 <div class="button-container">
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index c4249b147..9f7b22349 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -51,10 +51,12 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   showProposalMapVirus = false;
   showCrossSectionVirus = false;
   showReclamationPlanVirus = false;
+  showBuildingPlanVirus = false;
 
   isNewStructure = new FormControl<boolean | null>(null, [Validators.required]);
   isFollowUp = new FormControl<string | null>(null, [Validators.required]);
@@ -168,6 +170,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
       this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
       this.reclamationPlan = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
     });
   }
 
@@ -190,6 +193,11 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     this.showReclamationPlanVirus = !res;
   }
 
+  async attachBuildingPlan(file: FileHandle) {
+    const res = await this.attachFile(file, DOCUMENT_TYPE.BUILDING_PLAN);
+    this.showBuildingPlanVirus = !res;
+  }
+
   protected async save() {
     if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
       const isNewStructure = this.isNewStructure.getRawValue();
@@ -249,7 +257,8 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
           this.soilStructureResidentialUseReason.value ||
           this.soilAgriParcelActivity.value ||
           this.soilStructureResidentialAccessoryUseReason.value ||
-          this.soilStructureOtherUseReason.value))
+          this.soilStructureOtherUseReason.value ||
+          this.buildingPlans.length > 0))
     );
 
     if (hasValuesThatWillBeCleared) {
@@ -266,6 +275,7 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
               // Clear docs
               this.crossSections = [];
               this.reclamationPlan = [];
+              this.buildingPlans = [];
 
               // Clear questions
               this.reduceNegativeImpacts.reset();
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
index da4574dbd..92c359c4a 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
@@ -619,6 +619,25 @@ <h2>Proposal</h2>
         ></app-file-drag-drop>
       </div>
     </ng-container>
+
+    <ng-container *ngIf="isNewStructure.value === true">
+      <div class="full-row">
+        <mat-label class="subheading2" for="detailed-building-plans">Detailed Building Plan(s)</mat-label>
+        <div class="subtext">
+          Building plans must be the most up to date, current version and should include (1) the total floor area of all
+          levels and intended use; and (2) interior and exterior views
+        </div>
+        <app-file-drag-drop
+          id="detailed-building-plans"
+          [uploadedFiles]="buildingPlans"
+          (uploadFiles)="attachBuildingPlan($event)"
+          (deleteFile)="onDeleteFile($event)"
+          (openFile)="openFile($event)"
+          [showErrors]="showErrors"
+          [showVirusError]="showBuildingPlanVirus"
+        ></app-file-drag-drop>
+      </div>
+    </ng-container>
   </div>
 </form>
 <div class="button-container">
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index 36ccbd817..0d5500bc9 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -51,10 +51,12 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
   proposalMap: ApplicationDocumentDto[] = [];
   crossSections: ApplicationDocumentDto[] = [];
   reclamationPlan: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   showProposalMapVirus = false;
   showCrossSectionVirus = false;
   showReclamationPlanVirus = false;
+  showBuildingPlanVirus = false;
 
   isNewStructure = new FormControl<boolean | null>(null, [Validators.required]);
   isFollowUp = new FormControl<string | null>(null, [Validators.required]);
@@ -165,6 +167,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
       this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
       this.reclamationPlan = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
     });
   }
 
@@ -187,6 +190,11 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     this.showReclamationPlanVirus = !res;
   }
 
+  async attachBuildingPlan(file: FileHandle) {
+    const res = await this.attachFile(file, DOCUMENT_TYPE.BUILDING_PLAN);
+    this.showBuildingPlanVirus = !res;
+  }
+
   protected async save() {
     if (this.fileId && (this.form.dirty || this.areComponentsDirty)) {
       const isNewStructure = this.isNewStructure.getRawValue();
@@ -241,7 +249,8 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
           this.soilStructureResidentialUseReason.value ||
           this.soilAgriParcelActivity.value ||
           this.soilStructureResidentialAccessoryUseReason.value ||
-          this.soilStructureOtherUseReason.value))
+          this.soilStructureOtherUseReason.value ||
+          this.buildingPlans.length > 0))
     );
 
     if (hasValuesThatWillBeCleared) {
@@ -258,6 +267,7 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
               // Clear docs
               this.crossSections = [];
               this.reclamationPlan = [];
+              this.buildingPlans = [];
 
               // Clear questions
               this.reduceNegativeImpacts.reset();

From 3b1763c8e76e4647062a5cf7fc496b409cedae87 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:40:43 -0700
Subject: [PATCH 21/45] Fix clearing file uploads

---
 .../pfrs-proposal/pfrs-proposal.component.ts     | 16 ++++++++++++----
 .../pofo-proposal/pofo-proposal.component.ts     | 12 +++++++++---
 .../roso-proposal/roso-proposal.component.ts     | 12 +++++++++---
 3 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 47fb37b1d..342efcf4e 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -337,10 +337,18 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
           if (isConfirmed) {
             if (answeredYes) {
               // Clear docs
-              this.crossSections = [];
-              this.reclamationPlan = [];
-              this.buildingPlans = [];
-              this.noticeOfWork = [];
+              for (const crossSection of this.crossSections) {
+                this.onDeleteFile(crossSection);
+              }
+              for (const reclamationPlan_ of this.reclamationPlan) {
+                this.onDeleteFile(reclamationPlan_);
+              }
+              for (const buildingPlan of this.buildingPlans) {
+                this.onDeleteFile(buildingPlan);
+              }
+              for (const noticeOfWork_ of this.noticeOfWork) {
+                this.onDeleteFile(noticeOfWork_);
+              }
 
               // Clear questions
               this.reduceNegativeImpacts.reset();
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index 9f7b22349..59cb5a6e1 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -273,9 +273,15 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
           if (isConfirmed) {
             if (answeredYes) {
               // Clear docs
-              this.crossSections = [];
-              this.reclamationPlan = [];
-              this.buildingPlans = [];
+              for (const crossSection of this.crossSections) {
+                this.onDeleteFile(crossSection);
+              }
+              for (const reclamationPlan_ of this.reclamationPlan) {
+                this.onDeleteFile(reclamationPlan_);
+              }
+              for (const buildingPlan of this.buildingPlans) {
+                this.onDeleteFile(buildingPlan);
+              }
 
               // Clear questions
               this.reduceNegativeImpacts.reset();
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index 0d5500bc9..e82699a6c 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -265,9 +265,15 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
           if (isConfirmed) {
             if (answeredYes) {
               // Clear docs
-              this.crossSections = [];
-              this.reclamationPlan = [];
-              this.buildingPlans = [];
+              for (const crossSection of this.crossSections) {
+                this.onDeleteFile(crossSection);
+              }
+              for (const reclamationPlan_ of this.reclamationPlan) {
+                this.onDeleteFile(reclamationPlan_);
+              }
+              for (const buildingPlan of this.buildingPlans) {
+                this.onDeleteFile(buildingPlan);
+              }
 
               // Clear questions
               this.reduceNegativeImpacts.reset();

From 9bdfad6b84c13fae860a6b4ba51b45ed822dabc2 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:49:08 -0700
Subject: [PATCH 22/45] Update POFO/ROSO styles

---
 .../pofo-proposal.component.scss              | 24 ++++++++++++++++++
 .../roso-proposal.component.scss              | 25 +++++++++++++++++++
 2 files changed, 49 insertions(+)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
index a4d0e0cc5..7d96b08e8 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
@@ -7,3 +7,27 @@ section {
 .steps-list {
   margin: rem(16) 0;
 }
+
+.mat-mdc-form-field {
+  width: 100%;
+}
+
+.info-banner {
+  background-color: rgba(colors.$secondary-color-light, 0.5);
+  padding: rem(4);
+  margin-bottom: 0 !important;
+}
+
+.residential-warning {
+  width: 74%;
+  background-color: rgba(colors.$secondary-color-light, 0.5);
+  margin-bottom: rem(20);
+  margin-left: 6.5%;
+}
+
+.residential-warning-text {
+  font-weight: 400;
+  font-size: rem(12);
+  margin: rem(10) 0 rem(20) rem(5);
+  line-height: rem(24);
+}
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss
index a4d0e0cc5..f6303c573 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.scss
@@ -1,4 +1,5 @@
 @use '../../../../../../styles/functions' as *;
+@use '../../../../../../styles/colors';
 
 section {
   margin-top: rem(36);
@@ -7,3 +8,27 @@ section {
 .steps-list {
   margin: rem(16) 0;
 }
+
+.mat-mdc-form-field {
+  width: 100%;
+}
+
+.info-banner {
+  background-color: rgba(colors.$secondary-color-light, 0.5);
+  padding: rem(4);
+  margin-bottom: 0 !important;
+}
+
+.residential-warning {
+  width: 74%;
+  background-color: rgba(colors.$secondary-color-light, 0.5);
+  margin-bottom: rem(20);
+  margin-left: 6.5%;
+}
+
+.residential-warning-text {
+  font-weight: 400;
+  font-size: rem(12);
+  margin: rem(10) 0 rem(20) rem(5);
+  line-height: rem(24);
+}

From 26365c02e08714ea8709ecafef67e0d5dc28d2d3 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 24 Oct 2024 10:49:23 -0700
Subject: [PATCH 23/45] Fix structure add button layout

---
 .../pfrs-proposal.component.html              | 28 ++++++++++---------
 .../pofo-proposal.component.html              | 28 ++++++++++---------
 .../pofo-proposal.component.scss              |  1 +
 .../roso-proposal.component.html              | 28 ++++++++++---------
 4 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index 6d3192b52..5d46097a3 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -419,19 +419,21 @@ <h2>Proposal</h2>
       </div>
     </form>
 
-    <div class="full-row">
-      <button
-        mat-stroked-button
-        color="primary"
-        (click)="onStructureAdd()"
-        [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
-        type="button"
-      >
-        + Add Structure
-      </button>
-      <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
-        At least one structure is required
-      </app-validation-error>
+    <div class="form-row">
+      <div class="full-row">
+        <button
+          mat-stroked-button
+          color="primary"
+          (click)="onStructureAdd()"
+          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+          type="button"
+        >
+          + Add Structure
+        </button>
+        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+          At least one structure is required
+        </app-validation-error>
+      </div>
     </div>
 
     <div class="full-row">
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
index 0d89bff88..5cd2d4dbc 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
@@ -329,19 +329,21 @@ <h2>Proposal</h2>
       </div>
     </form>
 
-    <div class="full-row">
-      <button
-        mat-stroked-button
-        color="primary"
-        (click)="onStructureAdd()"
-        [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
-        type="button"
-      >
-        + Add Structure
-      </button>
-      <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
-        At least one structure is required
-      </app-validation-error>
+    <div class="form-row">
+      <div class="full-row">
+        <button
+          mat-stroked-button
+          color="primary"
+          (click)="onStructureAdd()"
+          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+          type="button"
+        >
+          + Add Structure
+        </button>
+        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+          At least one structure is required
+        </app-validation-error>
+      </div>
     </div>
 
     <div class="full-row">
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
index 7d96b08e8..f6303c573 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.scss
@@ -1,4 +1,5 @@
 @use '../../../../../../styles/functions' as *;
+@use '../../../../../../styles/colors';
 
 section {
   margin-top: rem(36);
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
index 92c359c4a..5618e3274 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
@@ -330,19 +330,21 @@ <h2>Proposal</h2>
         </div>
       </form>
 
-      <div class="full-row">
-        <button
-          mat-stroked-button
-          color="primary"
-          (click)="onStructureAdd()"
-          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
-          type="button"
-        >
-          + Add Structure
-        </button>
-        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
-          At least one structure is required
-        </app-validation-error>
+      <div class="form-row">
+        <div class="full-row">
+          <button
+            mat-stroked-button
+            color="primary"
+            (click)="onStructureAdd()"
+            [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+            type="button"
+          >
+            + Add Structure
+          </button>
+          <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+            At least one structure is required
+          </app-validation-error>
+        </div>
       </div>
 
       <div class="full-row">

From 4b49360447dc8a2c58c2673dfea7a41477d600b7 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 24 Oct 2024 12:27:54 -0700
Subject: [PATCH 24/45] Fix POFO/ROSO wording

---
 .../pofo-proposal/pofo-proposal.component.html        | 11 ++++-------
 .../roso-proposal/roso-proposal.component.html        | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
index 5cd2d4dbc..070ca9351 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
@@ -26,9 +26,7 @@ <h2>Proposal</h2>
 <form [formGroup]="form">
   <div class="form-row">
     <div class="full-row">
-      <mat-label for="is-new-structure">
-        Are you removing soil and placing fill in order to build a structure?
-      </mat-label>
+      <mat-label for="is-new-structure"> Are you placing fill in order to build a structure? </mat-label>
       <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div>
       <div>
         <mat-button-toggle-group
@@ -422,7 +420,7 @@ <h2>Proposal</h2>
     >
       <div class="full-row">
         <label for="soilStructureResidentialUseReason"
-          >Describe why placing fill/removing soil is required for the residential structure(s)</label
+          >Describe why placing fill is required for the residential structure(s)</label
         >
         <div class="info-banner subtext">
           Please refer to
@@ -458,8 +456,7 @@ <h2>Proposal</h2>
     <ng-container *ngIf="structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureResidentialAccessoryUseReason"
-          >Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
-          required</label
+          >Describe the intended use of the residential accessory structure(s) and why placing fill is required</label
         >
         <div class="info-banner subtext">
           Please refer to
@@ -495,7 +492,7 @@ <h2>Proposal</h2>
     <ng-container *ngIf="structureTypeCounts[structureTypes.OTHER_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureOtherUseReason">
-          Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+          Describe the intended use of the 'Other' structure(s) and why placing fill is required
         </label>
         <mat-form-field appearance="outline">
           <textarea
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
index 5618e3274..6349f3d79 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
@@ -26,9 +26,7 @@ <h2>Proposal</h2>
 <form [formGroup]="form">
   <div class="form-row">
     <div class="full-row">
-      <mat-label for="is-new-structure">
-        Are you removing soil and placing fill in order to build a structure?
-      </mat-label>
+      <mat-label for="is-new-structure"> Are you removing soil in order to build a structure? </mat-label>
       <div class="subtext">This can include farm buildings, residences, or accessory buildings.</div>
       <div>
         <mat-button-toggle-group
@@ -422,7 +420,7 @@ <h2>Proposal</h2>
     >
       <div class="full-row">
         <label for="soilStructureResidentialUseReason"
-          >Describe why placing fill/removing soil is required for the residential structure(s)</label
+          >Describe why removing soil is required for the residential structure(s)</label
         >
         <div class="info-banner subtext">
           Please refer to
@@ -458,8 +456,7 @@ <h2>Proposal</h2>
     <ng-container *ngIf="structureTypeCounts[structureTypes.ACCESSORY_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureResidentialAccessoryUseReason"
-          >Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
-          required</label
+          >Describe the intended use of the residential accessory structure(s) and why removing soil is required</label
         >
         <div class="info-banner subtext">
           Please refer to
@@ -495,7 +492,7 @@ <h2>Proposal</h2>
     <ng-container *ngIf="structureTypeCounts[structureTypes.OTHER_STRUCTURE] > 0">
       <div class="full-row">
         <label for="soilStructureOtherUseReason">
-          Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+          Describe the intended use of the 'Other' structure(s) and why removing soil is required
         </label>
         <mat-form-field appearance="outline">
           <textarea

From 0a9dc55ab01937edecccdd4f92196a76dbeb24ab Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:31:21 -0700
Subject: [PATCH 25/45] Add updates to portal view

---
 .../pfrs-details/pfrs-details.component.html  | 228 +++++++++++++-----
 .../pfrs-details/pfrs-details.component.scss  |  38 +++
 .../pfrs-details/pfrs-details.component.ts    |  42 ++++
 .../pofo-details/pofo-details.component.html  | 168 +++++++++++--
 .../pofo-details/pofo-details.component.scss  |  38 +++
 .../pofo-details/pofo-details.component.ts    |  42 ++++
 .../roso-details/roso-details.component.html  | 154 ++++++++++--
 .../roso-details/roso-details.component.scss  |  38 +++
 .../roso-details/roso-details.component.ts    |  42 ++++
 9 files changed, 690 insertions(+), 100 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
index cb7f40503..6cbbab13f 100644
--- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="_applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="_applicationSubmission.soilIsNewStructure !== null">
+      {{ _applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -193,19 +201,115 @@
     <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilTypeRemoved"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">
-    What alternative measures have you considered or attempted before proposing to place fill?
-  </div>
-  <div class="grid-double">
-    {{ _applicationSubmission.soilAlternativeMeasures }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAlternativeMeasures"></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table" *ngIf="!isMobile">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of _applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data [showRequired]="showErrors" *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data [showRequired]="showErrors" *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <ng-container *ngIf="isMobile">
+      <app-structure-mobile-card
+        *ngFor="let structure of _applicationSubmission.soilProposedStructures; let last = last; index as i"
+        [structure]="structure"
+        [isLast]="last"
+        [index]="i"
+        [isReviewStep]="true"
+      >
+      </app-structure-mobile-card>
+    </ng-container>
+    <div *ngIf="_applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data [showRequired]="showErrors"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    {{ _applicationSubmission.soilReduceNegativeImpacts }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
-  </div>
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureFarmUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureResidentialUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureResidentialAccessoryUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureOtherUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">
+      What alternative measures have you considered or attempted before proposing to place fill?
+    </div>
+    <div class="grid-double">
+      {{ _applicationSubmission.soilAlternativeMeasures }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAlternativeMeasures"></app-no-data>
+    </div>
+
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      {{ _applicationSubmission.soilReduceNegativeImpacts }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -215,53 +319,67 @@
     <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
-  </div>
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
-  <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
-  <div class="grid-double">
-    <span *ngIf="_applicationSubmission.soilIsExtractionOrMining !== null">
-      {{ _applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }}
-    </span>
-    <app-no-data
-      [showRequired]="showErrors"
-      *ngIf="_applicationSubmission.soilIsExtractionOrMining === null"
-    ></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
-  <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1">
-    Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
-  </div>
-  <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="grid-double">
-    <span *ngIf="_applicationSubmission.soilHasSubmittedNotice !== null">
-      {{ _applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }}
-    </span>
-    <app-no-data
-      [showRequired]="showErrors"
-      *ngIf="_applicationSubmission.soilHasSubmittedNotice === null"
-    ></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
+    <div class="grid-double">
+      <span *ngIf="_applicationSubmission.soilIsExtractionOrMining !== null">
+        {{ _applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }}
+      </span>
+      <app-no-data
+        [showRequired]="showErrors"
+        *ngIf="_applicationSubmission.soilIsExtractionOrMining === null"
+      ></app-no-data>
+    </div>
 
-  <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div>
-  <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents">
-    <a *ngFor="let file of noticeOfWork" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="noticeOfWork.length === 0"></app-no-data>
-  </div>
+    <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1">
+      Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
+    </div>
+    <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="grid-double">
+      <span *ngIf="_applicationSubmission.soilHasSubmittedNotice !== null">
+        {{ _applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }}
+      </span>
+      <app-no-data
+        [showRequired]="showErrors"
+        *ngIf="_applicationSubmission.soilHasSubmittedNotice === null"
+      ></app-no-data>
+    </div>
+
+    <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div>
+    <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents">
+      <a *ngFor="let file of noticeOfWork" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="noticeOfWork.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
   <div *ngIf="showEdit" class="edit-button">
     <button mat-flat-button (click)="onEditSection(5)" color="accent">Edit Section</button>
diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss
index 36aafed7e..5a971346c 100644
--- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss
+++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.scss
@@ -21,3 +21,41 @@
     height: rem(16);
   }
 }
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 1fr 1fr 2fr;
+  }
+}
+
+.mobile-structure-card {
+  width: 100%;
+  box-shadow: none;
+  border: none;
+  border-radius: 0;
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+.mobile-structure-card-border {
+  border-top: rem(1) solid #aaaaaa;
+}
+
+.mobile-structure-title {
+  display: block;
+  margin: 0;
+}
+
+.mobile-structure-label {
+  margin: rem(5) 0 rem(5) 0;
+}
diff --git a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts
index df615202e..1c24317cc 100644
--- a/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts
+++ b/portal-frontend/src/app/features/applications/application-details/pfrs-details/pfrs-details.component.ts
@@ -5,6 +5,11 @@ import { ApplicationDocumentService } from '../../../../services/application-doc
 import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto';
 import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
 import { openFileInline } from '../../../../shared/utils/file';
+import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-pfrs-details[applicationSubmission]',
@@ -16,11 +21,38 @@ export class PfrsDetailsComponent {
   @Input() showEdit = true;
   @Input() draftMode = false;
 
+  isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
   _applicationSubmission: ApplicationSubmissionDetailedDto | undefined;
 
   @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDetailedDto | undefined) {
     if (applicationSubmission) {
       this._applicationSubmission = applicationSubmission;
+
+      this.isSoilStructureFarmUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
+      );
     }
   }
 
@@ -28,12 +60,14 @@ export class PfrsDetailsComponent {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
     this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
     this.noticeOfWork = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK);
   }
 
   crossSections: ApplicationDocumentDto[] = [];
   proposalMap: ApplicationDocumentDto[] = [];
   reclamationPlans: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
   noticeOfWork: ApplicationDocumentDto[] = [];
 
   constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {}
@@ -54,4 +88,12 @@ export class PfrsDetailsComponent {
       openFileInline(res.url, file.fileName);
     }
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
index 4218d9604..351ece46a 100644
--- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="_applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="_applicationSubmission.soilIsNewStructure !== null">
+      {{ _applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -117,19 +125,115 @@
     <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilFillTypeToPlace"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">
-    What alternative measures have you considered or attempted before proposing to place fill?
-  </div>
-  <div class="grid-double">
-    {{ _applicationSubmission.soilAlternativeMeasures }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAlternativeMeasures"></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table" *ngIf="!isMobile">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of _applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data [showRequired]="showErrors" *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data [showRequired]="showErrors" *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <ng-container *ngIf="isMobile">
+      <app-structure-mobile-card
+        *ngFor="let structure of _applicationSubmission.soilProposedStructures; let last = last; index as i"
+        [structure]="structure"
+        [isLast]="last"
+        [index]="i"
+        [isReviewStep]="true"
+      >
+      </app-structure-mobile-card>
+    </ng-container>
+    <div *ngIf="_applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data [showRequired]="showErrors"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    {{ _applicationSubmission.soilReduceNegativeImpacts }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
-  </div>
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureFarmUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureResidentialUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureResidentialAccessoryUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureOtherUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">
+      What alternative measures have you considered or attempted before proposing to place fill?
+    </div>
+    <div class="grid-double">
+      {{ _applicationSubmission.soilAlternativeMeasures }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAlternativeMeasures"></app-no-data>
+    </div>
+
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      {{ _applicationSubmission.soilReduceNegativeImpacts }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -139,21 +243,33 @@
     <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
-  </div>
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
   <div *ngIf="showEdit" class="edit-button">
     <button mat-flat-button (click)="onEditSection(5)" color="accent">Edit Section</button>
diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss
index 63cfeaa16..5d7b57d09 100644
--- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss
+++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.scss
@@ -16,3 +16,41 @@
     grid-column-gap: rem(16);
   }
 }
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 1fr 1fr 2fr;
+  }
+}
+
+.mobile-structure-card {
+  width: 100%;
+  box-shadow: none;
+  border: none;
+  border-radius: 0;
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+.mobile-structure-card-border {
+  border-top: rem(1) solid #aaaaaa;
+}
+
+.mobile-structure-title {
+  display: block;
+  margin: 0;
+}
+
+.mobile-structure-label {
+  margin: rem(5) 0 rem(5) 0;
+}
diff --git a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts
index 7e6efd543..0eb619040 100644
--- a/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts
+++ b/portal-frontend/src/app/features/applications/application-details/pofo-details/pofo-details.component.ts
@@ -5,6 +5,11 @@ import { ApplicationDocumentService } from '../../../../services/application-doc
 import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto';
 import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
 import { openFileInline } from '../../../../shared/utils/file';
+import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-pofo-details[applicationSubmission]',
@@ -16,11 +21,38 @@ export class PofoDetailsComponent {
   @Input() showEdit = true;
   @Input() draftMode = false;
 
+  isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
   _applicationSubmission: ApplicationSubmissionDetailedDto | undefined;
 
   @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDetailedDto | undefined) {
     if (applicationSubmission) {
       this._applicationSubmission = applicationSubmission;
+
+      this.isSoilStructureFarmUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
+      );
     }
   }
 
@@ -28,11 +60,13 @@ export class PofoDetailsComponent {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
     this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: ApplicationDocumentDto[] = [];
   proposalMap: ApplicationDocumentDto[] = [];
   reclamationPlans: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {}
 
@@ -52,4 +86,12 @@ export class PofoDetailsComponent {
       openFileInline(res.url, file.fileName);
     }
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html
index 083051454..791754469 100644
--- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="_applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="_applicationSubmission.soilIsNewStructure !== null">
+      {{ _applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data [showRequired]="showErrors" *ngIf="_applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -117,11 +125,107 @@
     <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilTypeRemoved"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    {{ _applicationSubmission.soilReduceNegativeImpacts }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table" *ngIf="!isMobile">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of _applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data [showRequired]="showErrors" *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data [showRequired]="showErrors" *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <ng-container *ngIf="isMobile">
+      <app-structure-mobile-card
+        *ngFor="let structure of _applicationSubmission.soilProposedStructures; let last = last; index as i"
+        [structure]="structure"
+        [isLast]="last"
+        [index]="i"
+        [isReviewStep]="true"
+      >
+      </app-structure-mobile-card>
+    </ng-container>
+    <div *ngIf="_applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data [showRequired]="showErrors"></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureFarmUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureResidentialUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureResidentialAccessoryUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data
+          [showRequired]="showErrors"
+          *ngIf="!_applicationSubmission.soilStructureOtherUseReason"
+        ></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      {{ _applicationSubmission.soilReduceNegativeImpacts }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -131,21 +235,33 @@
     <app-no-data [showRequired]="showErrors" *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="crossSections.length === 0"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
-  </div>
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="reclamationPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data [showRequired]="showErrors" *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
   <div *ngIf="showEdit" class="edit-button">
     <button mat-flat-button (click)="onEditSection(5)" color="accent">Edit Section</button>
diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss
index 63cfeaa16..5d7b57d09 100644
--- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss
+++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.scss
@@ -16,3 +16,41 @@
     grid-column-gap: rem(16);
   }
 }
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 1fr 1fr 2fr;
+  }
+}
+
+.mobile-structure-card {
+  width: 100%;
+  box-shadow: none;
+  border: none;
+  border-radius: 0;
+  word-wrap: break-word;
+  white-space: normal;
+}
+
+.mobile-structure-card-border {
+  border-top: rem(1) solid #aaaaaa;
+}
+
+.mobile-structure-title {
+  display: block;
+  margin: 0;
+}
+
+.mobile-structure-label {
+  margin: rem(5) 0 rem(5) 0;
+}
diff --git a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts
index 03ca23a8d..f5507731b 100644
--- a/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts
+++ b/portal-frontend/src/app/features/applications/application-details/roso-details/roso-details.component.ts
@@ -5,6 +5,11 @@ import { ApplicationDocumentService } from '../../../../services/application-doc
 import { ApplicationSubmissionDetailedDto } from '../../../../services/application-submission/application-submission.dto';
 import { DOCUMENT_TYPE } from '../../../../shared/dto/document.dto';
 import { openFileInline } from '../../../../shared/utils/file';
+import { MOBILE_BREAKPOINT } from '../../../../shared/utils/breakpoints';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-roso-details[applicationSubmission]',
@@ -16,11 +21,38 @@ export class RosoDetailsComponent {
   @Input() showEdit = true;
   @Input() draftMode = false;
 
+  isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
   _applicationSubmission: ApplicationSubmissionDetailedDto | undefined;
 
   @Input() set applicationSubmission(applicationSubmission: ApplicationSubmissionDetailedDto | undefined) {
     if (applicationSubmission) {
       this._applicationSubmission = applicationSubmission;
+
+      this.isSoilStructureFarmUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
+      );
     }
   }
 
@@ -28,11 +60,13 @@ export class RosoDetailsComponent {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
     this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: ApplicationDocumentDto[] = [];
   proposalMap: ApplicationDocumentDto[] = [];
   reclamationPlans: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {}
 
@@ -52,4 +86,12 @@ export class RosoDetailsComponent {
       openFileInline(res.url, file.fileName);
     }
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }

From 1a1cb9d6e471084eae5e92e86bf41b2b799256a9 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:32:22 -0700
Subject: [PATCH 26/45] Fix missing saved submission fields

---
 .../pofo-proposal/pofo-proposal.component.ts         | 12 ++++++++++--
 .../roso-proposal/roso-proposal.component.ts         | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index 59cb5a6e1..652d76daa 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -207,6 +207,11 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
       const soilFillTypeToPlace = this.fillTypeToPlace.getRawValue();
       const soilAlternativeMeasures = this.alternativeMeasures.getRawValue();
       const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue();
+      const soilStructureFarmUseReason = this.soilStructureFarmUseReason.getRawValue();
+      const soilStructureResidentialUseReason = this.soilStructureResidentialUseReason.getRawValue();
+      const soilAgriParcelActivity = this.soilAgriParcelActivity.getRawValue();
+      const soilStructureResidentialAccessoryUseReason = this.soilStructureResidentialAccessoryUseReason.getRawValue();
+      const soilStructureOtherUseReason = this.soilStructureOtherUseReason.getRawValue();
 
       const updatedStructures: ProposedStructure[] = this.proposedStructures.map((lot) => {
         const lotType = this.structuresForm.controls[`${lot.id}-type`].value;
@@ -234,9 +239,12 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
         soilAlreadyPlacedMaximumDepth: this.alreadyFilledTableData?.maximumDepth ?? null,
         soilAlreadyPlacedAverageDepth: this.alreadyFilledTableData?.averageDepth ?? null,
         soilProjectDuration: this.projectDuration.value,
-        soilStructureFarmUseReason: this.soilStructureFarmUseReason.value,
-        soilStructureResidentialUseReason: this.soilStructureResidentialUseReason.value,
         soilProposedStructures: updatedStructures,
+        soilStructureFarmUseReason,
+        soilStructureResidentialUseReason,
+        soilAgriParcelActivity,
+        soilStructureResidentialAccessoryUseReason,
+        soilStructureOtherUseReason,
       };
 
       const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto);
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index e82699a6c..7e0a48a50 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -203,6 +203,11 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
       const purpose = this.purpose.getRawValue();
       const soilTypeRemoved = this.soilTypeRemoved.getRawValue();
       const soilReduceNegativeImpacts = this.reduceNegativeImpacts.getRawValue();
+      const soilStructureFarmUseReason = this.soilStructureFarmUseReason.getRawValue();
+      const soilStructureResidentialUseReason = this.soilStructureResidentialUseReason.getRawValue();
+      const soilAgriParcelActivity = this.soilAgriParcelActivity.getRawValue();
+      const soilStructureResidentialAccessoryUseReason = this.soilStructureResidentialAccessoryUseReason.getRawValue();
+      const soilStructureOtherUseReason = this.soilStructureOtherUseReason.getRawValue();
 
       const updatedStructures: ProposedStructure[] = this.proposedStructures.map((lot) => {
         const lotType = this.structuresForm.controls[`${lot.id}-type`].value;
@@ -229,9 +234,12 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
         soilAlreadyRemovedMaximumDepth: this.alreadyRemovedTableData?.maximumDepth ?? null,
         soilAlreadyRemovedAverageDepth: this.alreadyRemovedTableData?.averageDepth ?? null,
         soilProjectDuration: this.projectDuration.value,
-        soilStructureFarmUseReason: this.soilStructureFarmUseReason.value,
-        soilStructureResidentialUseReason: this.soilStructureResidentialUseReason.value,
         soilProposedStructures: updatedStructures,
+        soilStructureFarmUseReason,
+        soilStructureResidentialUseReason,
+        soilAgriParcelActivity,
+        soilStructureResidentialAccessoryUseReason,
+        soilStructureOtherUseReason,
       };
 
       const updatedApp = await this.applicationService.updatePending(this.submissionUuid, updateDto);

From ce2c4dda4362c8eae58f33396110878f6d7bc163 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Fri, 25 Oct 2024 11:33:13 -0700
Subject: [PATCH 27/45] Fix submission validation

---
 ...pplication-submission-validator.service.ts | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
index cc6820f71..77f57c755 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
@@ -534,10 +534,7 @@ export class ApplicationSubmissionValidatorService {
     applicantDocuments: ApplicationDocument[],
     errors: Error[],
   ) {
-    if (
-      applicationSubmission.soilTypeRemoved === null ||
-      applicationSubmission.soilReduceNegativeImpacts === null
-    ) {
+    if (applicationSubmission.soilTypeRemoved === null) {
       errors.push(
         new ServiceValidationException(
           `${applicationSubmission.typeCode} Proposal incomplete`,
@@ -574,11 +571,7 @@ export class ApplicationSubmissionValidatorService {
     applicantDocuments: ApplicationDocument[],
     errors: Error[],
   ) {
-    if (
-      applicationSubmission.soilFillTypeToPlace === null ||
-      applicationSubmission.soilAlternativeMeasures === null ||
-      applicationSubmission.soilReduceNegativeImpacts === null
-    ) {
+    if (applicationSubmission.soilFillTypeToPlace === null) {
       errors.push(
         new ServiceValidationException(
           `${applicationSubmission.typeCode} Proposal incomplete`,
@@ -622,8 +615,7 @@ export class ApplicationSubmissionValidatorService {
   ) {
     if (
       applicationSubmission.soilIsNewStructure === null ||
-      applicationSubmission.soilIsFollowUp === null ||
-      applicationSubmission.soilReduceNegativeImpacts === null
+      applicationSubmission.soilIsFollowUp === null
     ) {
       errors.push(
         new ServiceValidationException(
@@ -653,28 +645,6 @@ export class ApplicationSubmissionValidatorService {
         ),
       );
     }
-
-    const crossSections = applicantDocuments.filter(
-      (document) => document.typeCode === DOCUMENT_TYPE.CROSS_SECTIONS,
-    );
-    if (crossSections.length === 0) {
-      errors.push(
-        new ServiceValidationException(
-          `${applicationSubmission.typeCode} proposal missing Cross Section Diagrams`,
-        ),
-      );
-    }
-
-    const reclamationPlans = applicantDocuments.filter(
-      (document) => document.typeCode === DOCUMENT_TYPE.RECLAMATION_PLAN,
-    );
-    if (reclamationPlans.length === 0) {
-      errors.push(
-        new ServiceValidationException(
-          `${applicationSubmission.typeCode} proposal missing Reclamation Plans`,
-        ),
-      );
-    }
   }
 
   private async validatePfrsProposal(

From 5147bef3a038ecd6b3afda8b1504650f65f56473 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Fri, 25 Oct 2024 13:21:36 -0700
Subject: [PATCH 28/45] Fix structures type in DTO

---
 alcs-frontend/src/app/services/application/application.dto.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/alcs-frontend/src/app/services/application/application.dto.ts b/alcs-frontend/src/app/services/application/application.dto.ts
index b26abcdc6..e6e5f4ebd 100644
--- a/alcs-frontend/src/app/services/application/application.dto.ts
+++ b/alcs-frontend/src/app/services/application/application.dto.ts
@@ -1,6 +1,7 @@
 import { BaseCodeDto } from '../../shared/dto/base.dto';
 import { SYSTEM_SOURCE_TYPES } from '../../shared/dto/system-source.types.dto';
 import { CardDto } from '../card/card.dto';
+import { ProposedStructure } from '../notice-of-intent/notice-of-intent.dto';
 import { UserDto } from '../user/user.dto';
 import { ApplicationRegionDto, ApplicationTypeDto } from './application-code.dto';
 import { ApplicationLocalGovernmentDto } from './application-local-government/application-local-government.dto';
@@ -203,7 +204,7 @@ export interface ApplicationSubmissionDto {
   soilAgriParcelActivity: string | null;
   soilStructureResidentialAccessoryUseReason: string | null;
   soilStructureOtherUseReason: string | null;
-  soilProposedStructures: string | null;
+  soilProposedStructures: ProposedStructure[];
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;

From 05ca07a0af8a7793c5cac1de1ba5ec0a62cf75bb Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Fri, 25 Oct 2024 14:04:36 -0700
Subject: [PATCH 29/45] Add app soil updates to app info

---
 .../pfrs-details/pfrs-details.component.html  | 183 ++++++++++++++----
 .../pfrs-details/pfrs-details.component.scss  |   8 +
 .../pfrs-details/pfrs-details.component.ts    |  37 ++++
 .../pofo-details/pofo-details.component.html  | 133 ++++++++++---
 .../pofo-details/pofo-details.component.scss  |   7 +
 .../pofo-details/pofo-details.component.ts    |  37 ++++
 .../roso-details/roso-details.component.html  | 119 ++++++++++--
 .../roso-details/roso-details.component.scss  |   7 +
 .../roso-details/roso-details.component.ts    |  37 ++++
 .../additional-information.component.ts       |   2 +-
 10 files changed, 488 insertions(+), 82 deletions(-)

diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
index e26a33bfd..4032d6289 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="_applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="_applicationSubmission.soilIsNewStructure !== null">
+      {{ _applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data *ngIf="_applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -120,13 +128,6 @@
     </div>
   </div>
 
-  <div class="subheading2 grid-1">
-    What alternative measures have you considered or attempted before proposing to place fill?
-  </div>
-  <div class="grid-double">
-    <span>{{ _applicationSubmission.soilAlternativeMeasures }}</span>
-  </div>
-
   <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div>
   <div class="grid-double">
     <span>{{ _applicationSubmission.soilFillTypeToPlace }}</span>
@@ -136,10 +137,92 @@
   <div class="grid-double">
     <span>{{ _applicationSubmission.soilTypeRemoved }}</span>
   </div>
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
-  </div>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of _applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <div *ngIf="_applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureFarmUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureResidentialUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data *ngIf="!_applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureOtherUseReason"></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">
+      What alternative measures have you considered or attempted before proposing to place fill?
+    </div>
+    <div class="grid-double">
+      <span>{{ _applicationSubmission.soilAlternativeMeasures }}</span>
+    </div>
+
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -147,41 +230,57 @@
       {{ file.fileName }}
     </a>
   </div>
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <div>
-      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <div>
+        <a *ngFor="let file of crossSections" (click)="openFile(file)">
+          {{ file.fileName }}
+        </a>
+      </div>
+    </div>
+
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
         {{ file.fileName }}
       </a>
     </div>
-  </div>
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-  </div>
+  </ng-container>
 
-  <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
-  <div class="grid-double">
-    <span *ngIf="_applicationSubmission.soilIsExtractionOrMining !== null">
-      {{ _applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }}
-    </span>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
-  <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1">
-    Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
-  </div>
-  <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="grid-double">
-    <span *ngIf="_applicationSubmission.soilHasSubmittedNotice !== null">
-      {{ _applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }}
-    </span>
-  </div>
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
+    <div class="grid-double">
+      <span *ngIf="_applicationSubmission.soilIsExtractionOrMining !== null">
+        {{ _applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }}
+      </span>
+    </div>
 
-  <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div>
-  <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents">
-    <a *ngFor="let file of noticeOfWork" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-  </div>
+    <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1">
+      Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
+    </div>
+    <div *ngIf="_applicationSubmission.soilIsExtractionOrMining" class="grid-double">
+      <span *ngIf="_applicationSubmission.soilHasSubmittedNotice !== null">
+        {{ _applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }}
+      </span>
+    </div>
+
+    <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="subheading2 grid-1">Notice of Work</div>
+    <div *ngIf="_applicationSubmission.soilHasSubmittedNotice" class="grid-double multiple-documents">
+      <a *ngFor="let file of noticeOfWork" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+    </div>
+  </ng-container>
 </div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss
index f4efa4f47..63d243deb 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.scss
@@ -9,3 +9,11 @@
     height: 16px;
   }
 }
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: 36px;
+  grid-row-gap: 12px;
+}
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.ts
index 88e9a6284..f116acaa1 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.ts
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.ts
@@ -4,6 +4,8 @@ import { ApplicationDocumentDto } from '../../../../../services/application/appl
 import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service';
 import { ApplicationSubmissionDto } from '../../../../../services/application/application.dto';
 import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
+import { STRUCTURE_TYPES } from '../../../../../services/notice-of-intent/notice-of-intent.dto';
+import { STRUCTURE_TYPE_LABEL_MAP } from '../../../../notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-pfrs-details[applicationSubmission]',
@@ -11,10 +13,35 @@ import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
   styleUrls: ['./pfrs-details.component.scss'],
 })
 export class PfrsDetailsComponent {
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
   _applicationSubmission: ApplicationSubmissionDto | undefined;
   @Input() set applicationSubmission(application: ApplicationSubmissionDto | undefined) {
     if (application) {
       this._applicationSubmission = application;
+
+      this.isSoilStructureFarmUseReasonVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = application.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER,
+      );
     }
   }
 
@@ -23,6 +50,7 @@ export class PfrsDetailsComponent {
       this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
       this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
       this.noticeOfWork = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK);
     }
   }
@@ -30,6 +58,7 @@ export class PfrsDetailsComponent {
   crossSections: ApplicationDocumentDto[] = [];
   proposalMap: ApplicationDocumentDto[] = [];
   reclamationPlans: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
   noticeOfWork: ApplicationDocumentDto[] = [];
 
   constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {}
@@ -37,4 +66,12 @@ export class PfrsDetailsComponent {
   async openFile(file: ApplicationDocumentDto) {
     await this.applicationDocumentService.download(file.uuid, file.fileName);
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
index 0d22a0273..5d940e343 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="_applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="_applicationSubmission.soilIsNewStructure !== null">
+      {{ _applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data *ngIf="_applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -70,21 +78,96 @@
     <span *ngIf="_applicationSubmission.soilAlreadyPlacedAverageDepth">m</span>
   </div>
 
-  <div class="subheading2 grid-1">
-    What alternative measures have you considered or attempted before proposing to place fill?
-  </div>
-  <div class="grid-double">
-    <span>{{ _applicationSubmission.soilAlternativeMeasures }}</span>
-  </div>
-
   <div class="subheading2 grid-1">Describe the type, origin and quality of fill proposed to be placed.</div>
   <div class="grid-double">
     <span>{{ _applicationSubmission.soilFillTypeToPlace }}</span>
   </div>
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
-  </div>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of _applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <div *ngIf="_applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureFarmUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureResidentialUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+      <div class="grid-double">
+        <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
+      </div>
+
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data *ngIf="!_applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureOtherUseReason"></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">
+      What alternative measures have you considered or attempted before proposing to place fill?
+    </div>
+    <div class="grid-double">
+      <span>{{ _applicationSubmission.soilAlternativeMeasures }}</span>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -92,16 +175,20 @@
       {{ file.fileName }}
     </a>
   </div>
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-  </div>
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-  </div>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+    </div>
+
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+    </div>
+  </ng-container>
 </div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss
index e69de29bb..8c01a936d 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.scss
@@ -0,0 +1,7 @@
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: 36px;
+  grid-row-gap: 12px;
+}
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.ts
index 2b4f326bb..0fb6cd6ff 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.ts
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.ts
@@ -4,6 +4,8 @@ import { ApplicationDocumentDto } from '../../../../../services/application/appl
 import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service';
 import { ApplicationSubmissionDto } from '../../../../../services/application/application.dto';
 import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
+import { STRUCTURE_TYPES } from '../../../../../services/notice-of-intent/notice-of-intent.dto';
+import { STRUCTURE_TYPE_LABEL_MAP } from '../../../../notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-pofo-details[applicationSubmission]',
@@ -11,10 +13,35 @@ import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
   styleUrls: ['./pofo-details.component.scss'],
 })
 export class PofoDetailsComponent {
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
   _applicationSubmission: ApplicationSubmissionDto | undefined;
   @Input() set applicationSubmission(application: ApplicationSubmissionDto | undefined) {
     if (application) {
       this._applicationSubmission = application;
+
+      this.isSoilStructureFarmUseReasonVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = application.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER,
+      );
     }
   }
 
@@ -23,16 +50,26 @@ export class PofoDetailsComponent {
       this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
       this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
     }
   }
 
   crossSections: ApplicationDocumentDto[] = [];
   proposalMap: ApplicationDocumentDto[] = [];
   reclamationPlans: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {}
 
   async openFile(file: ApplicationDocumentDto) {
     await this.applicationDocumentService.download(file.uuid, file.fileName);
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
index 8ec3a2ec4..55c1ae789 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="_applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="_applicationSubmission.soilIsNewStructure !== null">
+      {{ _applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data *ngIf="_applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -76,10 +84,85 @@
   <div class="grid-double">
     <span>{{ _applicationSubmission.soilTypeRemoved }}</span>
   </div>
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
-  </div>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of _applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <div *ngIf="_applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureFarmUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureResidentialUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data *ngIf="!_applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ _applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data *ngIf="!_applicationSubmission.soilStructureOtherUseReason"></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -87,16 +170,20 @@
       {{ file.fileName }}
     </a>
   </div>
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-  </div>
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-  </div>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+    </div>
+
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+    </div>
+  </ng-container>
 </div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss
index e69de29bb..8c01a936d 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.scss
@@ -0,0 +1,7 @@
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: 36px;
+  grid-row-gap: 12px;
+}
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.ts
index bd32944e3..355f60035 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.ts
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.ts
@@ -4,6 +4,8 @@ import { ApplicationDocumentDto } from '../../../../../services/application/appl
 import { ApplicationDocumentService } from '../../../../../services/application/application-document/application-document.service';
 import { ApplicationSubmissionDto } from '../../../../../services/application/application.dto';
 import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
+import { STRUCTURE_TYPES } from '../../../../../services/notice-of-intent/notice-of-intent.dto';
+import { STRUCTURE_TYPE_LABEL_MAP } from '../../../../notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-roso-details[applicationSubmission]',
@@ -11,10 +13,35 @@ import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
   styleUrls: ['./roso-details.component.scss'],
 })
 export class RosoDetailsComponent {
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
   _applicationSubmission: ApplicationSubmissionDto | undefined;
   @Input() set applicationSubmission(application: ApplicationSubmissionDto | undefined) {
     if (application) {
       this._applicationSubmission = application;
+
+      this.isSoilStructureFarmUseReasonVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = application.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = application.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER,
+      );
     }
   }
 
@@ -23,16 +50,26 @@ export class RosoDetailsComponent {
       this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
       this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
     }
   }
 
   crossSections: ApplicationDocumentDto[] = [];
   proposalMap: ApplicationDocumentDto[] = [];
   reclamationPlans: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   constructor(private router: Router, private applicationDocumentService: ApplicationDocumentService) {}
 
   async openFile(file: ApplicationDocumentDto) {
     await this.applicationDocumentService.download(file.uuid, file.fileName);
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts
index d82ee4630..e0687da11 100644
--- a/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts
+++ b/alcs-frontend/src/app/features/notice-of-intent/applicant-info/notice-of-intent-details/additional-information/additional-information.component.ts
@@ -9,7 +9,7 @@ import {
 } from '../../../../../services/notice-of-intent/notice-of-intent.dto';
 import { DOCUMENT_TYPE } from '../../../../../shared/document/document.dto';
 
-const STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
+export const STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
   [STRUCTURE_TYPES.FARM_STRUCTURE]: STRUCTURE_TYPES.FARM_STRUCTURE,
   [STRUCTURE_TYPES.PRINCIPAL_RESIDENCE]: 'Principal Residence',
   [STRUCTURE_TYPES.ADDITIONAL_RESIDENCE]: 'Additional Residence',

From 0f9778e4f99f363cc3fb3f4e0f155063b74d9dc8 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:16:28 -0700
Subject: [PATCH 30/45] Update public view with soil changes

---
 .../pfrs-details/pfrs-details.component.html  | 190 ++++++++++++++----
 .../pfrs-details/pfrs-details.component.scss  |  18 +-
 .../pfrs-details/pfrs-details.component.ts    |  55 ++++-
 .../pofo-details/pofo-details.component.html  | 128 ++++++++++--
 .../pofo-details/pofo-details.component.scss  |  45 +++--
 .../pofo-details/pofo-details.component.ts    |  52 ++++-
 .../roso-details/roso-details.component.html  | 128 ++++++++++--
 .../roso-details/roso-details.component.scss  |  45 +++--
 .../roso-details/roso-details.component.ts    |  52 ++++-
 .../services/public/public-application.dto.ts |   2 +-
 10 files changed, 614 insertions(+), 101 deletions(-)

diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html
index e502c8a3a..e3871f481 100644
--- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="applicationSubmission.soilIsNewStructure !== null">
+      {{ applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data *ngIf="applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -157,19 +165,103 @@
     <app-no-data *ngIf="!applicationSubmission.soilTypeRemoved"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">
-    What alternative measures have you considered or attempted before proposing to place fill?
-  </div>
-  <div class="grid-double">
-    {{ applicationSubmission.soilAlternativeMeasures }}
-    <app-no-data *ngIf="!applicationSubmission.soilAlternativeMeasures"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">
+      What alternative measures have you considered or attempted before proposing to place fill?
+    </div>
+    <div class="grid-double">
+      {{ applicationSubmission.soilAlternativeMeasures }}
+      <app-no-data *ngIf="!applicationSubmission.soilAlternativeMeasures"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    {{ applicationSubmission.soilReduceNegativeImpacts }}
-    <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
-  </div>
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      {{ applicationSubmission.soilReduceNegativeImpacts }}
+      <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table" *ngIf="!isMobile">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <ng-container *ngIf="isMobile">
+      <app-structure-mobile-card
+        *ngFor="let structure of applicationSubmission.soilProposedStructures; let last = last; index as i"
+        [structure]="structure"
+        [isLast]="last"
+        [index]="i"
+        [isReviewStep]="true"
+      >
+      </app-structure-mobile-card>
+    </ng-container>
+    <div *ngIf="applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureFarmUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureResidentialUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data *ngIf="!applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureOtherUseReason"></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -179,37 +271,51 @@
     <app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">Reclamation Plan</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+    <div class="subheading2 grid-1">Reclamation Plan</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of reclamationPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="reclamationPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
-  <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
-  <div class="grid-double">
-    <span *ngIf="applicationSubmission.soilIsExtractionOrMining !== null">
-      {{ applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }}
-    </span>
-    <app-no-data *ngIf="applicationSubmission.soilIsExtractionOrMining === null"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 
-  <div *ngIf="applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1">
-    Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
-  </div>
-  <div *ngIf="applicationSubmission.soilIsExtractionOrMining" class="grid-double">
-    <span *ngIf="applicationSubmission.soilHasSubmittedNotice !== null">
-      {{ applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }}
-    </span>
-    <app-no-data *ngIf="applicationSubmission.soilHasSubmittedNotice === null"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Is your proposal for aggregate extraction or placer mining?</div>
+    <div class="grid-double">
+      <span *ngIf="applicationSubmission.soilIsExtractionOrMining !== null">
+        {{ applicationSubmission.soilIsExtractionOrMining ? 'Yes' : 'No' }}
+      </span>
+      <app-no-data *ngIf="applicationSubmission.soilIsExtractionOrMining === null"></app-no-data>
+    </div>
+
+    <div *ngIf="applicationSubmission.soilIsExtractionOrMining" class="subheading2 grid-1">
+      Have you submitted a Notice of Work to the Ministry of Energy, Mines and Low Carbon Innovation (EMLI)?
+    </div>
+    <div *ngIf="applicationSubmission.soilIsExtractionOrMining" class="grid-double">
+      <span *ngIf="applicationSubmission.soilHasSubmittedNotice !== null">
+        {{ applicationSubmission.soilHasSubmittedNotice ? 'Yes' : 'No' }}
+      </span>
+      <app-no-data *ngIf="applicationSubmission.soilHasSubmittedNotice === null"></app-no-data>
+    </div>
+  </ng-container>
 </div>
diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss
index 2b1178a6b..10bff4fd8 100644
--- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss
+++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.scss
@@ -20,4 +20,20 @@
     grid-column: 1/4;
     height: rem(16);
   }
-}
\ No newline at end of file
+}
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 1fr 1fr 2fr;
+  }
+}
diff --git a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts
index 4abf71a84..a3d2aa239 100644
--- a/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts
+++ b/portal-frontend/src/app/features/public/application/submission/pfrs-details/pfrs-details.component.ts
@@ -5,6 +5,12 @@ import { PublicDocumentDto } from '../../../../../services/public/public.dto';
 import { PublicService } from '../../../../../services/public/public.service';
 import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto';
 import { openFileInline } from '../../../../../shared/utils/file';
+import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
+import { ApplicationSubmissionDetailedDto } from 'src/app/services/application-submission/application-submission.dto';
 
 @Component({
   selector: 'app-pfrs-details[applicationSubmission]',
@@ -12,15 +18,54 @@ import { openFileInline } from '../../../../../shared/utils/file';
   styleUrls: ['./pfrs-details.component.scss'],
 })
 export class PfrsDetailsComponent {
-  @Input() applicationSubmission!: PublicApplicationSubmissionDto;
+  isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
+  _applicationSubmission: PublicApplicationSubmissionDto | undefined;
+  @Input() set applicationSubmission(applicationSubmission: PublicApplicationSubmissionDto | undefined) {
+    if (applicationSubmission) {
+      this._applicationSubmission = applicationSubmission;
+
+      this.isSoilStructureFarmUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
+      );
+    }
+  }
+  get applicationSubmission(): PublicApplicationSubmissionDto {
+    return this._applicationSubmission!;
+  }
 
   @Input() set applicationDocuments(documents: PublicDocumentDto[]) {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
+    this.reclamationPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN);
+    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: PublicDocumentDto[] = [];
   proposalMap: PublicDocumentDto[] = [];
+  reclamationPlans: PublicDocumentDto[] = [];
+  buildingPlans: PublicDocumentDto[] = [];
 
   constructor(private router: Router, private publicService: PublicService) {}
 
@@ -30,4 +75,12 @@ export class PfrsDetailsComponent {
       openFileInline(res.url, file.fileName);
     }
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
index 0700f6210..e75f1c82b 100644
--- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="applicationSubmission.soilIsNewStructure !== null">
+      {{ applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data *ngIf="applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -107,11 +115,95 @@
     <app-no-data *ngIf="!applicationSubmission.soilAlternativeMeasures"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    {{ applicationSubmission.soilReduceNegativeImpacts }}
-    <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      {{ applicationSubmission.soilReduceNegativeImpacts }}
+      <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table" *ngIf="!isMobile">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <ng-container *ngIf="isMobile">
+      <app-structure-mobile-card
+        *ngFor="let structure of applicationSubmission.soilProposedStructures; let last = last; index as i"
+        [structure]="structure"
+        [isLast]="last"
+        [index]="i"
+        [isReviewStep]="true"
+      >
+      </app-structure-mobile-card>
+    </ng-container>
+    <div *ngIf="applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureFarmUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureResidentialUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data *ngIf="!applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureOtherUseReason"></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -121,11 +213,23 @@
     <app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 </div>
diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss
index 9999107ed..ee0b95cdd 100644
--- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss
+++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.scss
@@ -1,24 +1,39 @@
 @use '../../../../../../styles/functions' as *;
 
 .soil-table {
-    display: grid;
-    overflow-x: auto;
-    grid-column-gap: rem(36);
-    grid-row-gap: rem(12);
-    grid-template-columns: max-content max-content;
-  
-    @media screen and (min-width: $tabletBreakpoint) {
-      grid-template-columns: 0.55fr 1fr;
-    }
-  
-    @media screen and (min-width: $midBreakpoint) {
-      grid-template-columns: 0.95fr 3fr;
-      grid-column-gap: rem(16);
-    }
+  display: grid;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+  grid-template-columns: max-content max-content;
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 0.95fr 3fr;
+    grid-column-gap: rem(16);
+  }
 
   .spacer-row {
     grid-column: 1/4;
     height: rem(16);
   }
 }
-  
\ No newline at end of file
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 1fr 1fr 2fr;
+  }
+}
diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts
index 3aa24798a..7821e9c89 100644
--- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts
+++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.ts
@@ -5,6 +5,11 @@ import { PublicDocumentDto } from '../../../../../services/public/public.dto';
 import { PublicService } from '../../../../../services/public/public.service';
 import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto';
 import { openFileInline } from '../../../../../shared/utils/file';
+import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-pofo-details[applicationSubmission]',
@@ -12,15 +17,52 @@ import { openFileInline } from '../../../../../shared/utils/file';
   styleUrls: ['./pofo-details.component.scss'],
 })
 export class PofoDetailsComponent {
-  @Input() applicationSubmission!: PublicApplicationSubmissionDto;
+  isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
+  _applicationSubmission: PublicApplicationSubmissionDto | undefined;
+  @Input() set applicationSubmission(applicationSubmission: PublicApplicationSubmissionDto | undefined) {
+    if (applicationSubmission) {
+      this._applicationSubmission = applicationSubmission;
+
+      this.isSoilStructureFarmUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
+      );
+    }
+  }
+  get applicationSubmission(): PublicApplicationSubmissionDto {
+    return this._applicationSubmission!;
+  }
 
   @Input() set applicationDocuments(documents: PublicDocumentDto[]) {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
+    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: PublicDocumentDto[] = [];
   proposalMap: PublicDocumentDto[] = [];
+  buildingPlans: PublicDocumentDto[] = [];
 
   constructor(private router: Router, private publicService: PublicService) {}
 
@@ -30,4 +72,12 @@ export class PofoDetailsComponent {
       openFileInline(res.url, file.fileName);
     }
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
index cd243734e..c2cedcbfb 100644
--- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.html
@@ -1,4 +1,12 @@
 <div *ngIf="applicationSubmission" class="review-table">
+  <div class="subheading2 grid-1">Are you removing soil and placing fill in order to build a structure?</div>
+  <div class="grid-double">
+    <span *ngIf="applicationSubmission.soilIsNewStructure !== null">
+      {{ applicationSubmission.soilIsNewStructure ? 'Yes' : 'No' }}
+    </span>
+    <app-no-data *ngIf="applicationSubmission.soilIsNewStructure === null"></app-no-data>
+  </div>
+
   <div class="subheading2 grid-1">
     Has the ALC previously received an application or Notice of Intent for this proposal?
   </div>
@@ -99,11 +107,95 @@
     <app-no-data *ngIf="!applicationSubmission.soilTypeRemoved"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-  <div class="grid-double">
-    {{ applicationSubmission.soilReduceNegativeImpacts }}
-    <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      {{ applicationSubmission.soilReduceNegativeImpacts }}
+      <app-no-data *ngIf="!applicationSubmission.soilReduceNegativeImpacts"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="full-width subheading2">The total floor area (m<sup>2</sup>) for each of the proposed structure(s)</div>
+    <div class="full-width structure-table" *ngIf="!isMobile">
+      <div class="grid-1 subheading2">#</div>
+      <div class="grid-2 subheading2">Type</div>
+      <div class="grid-3 subheading2">Area</div>
+      <ng-container *ngFor="let structure of applicationSubmission.soilProposedStructures; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ mapStructureTypeValueToLabel(structure.type) }}
+          <app-no-data *ngIf="!structure.type"></app-no-data>
+        </div>
+        <div class="grid-3">
+          {{ structure.area }} <span *ngIf="structure.area">m<sup>2</sup></span>
+          <app-no-data *ngIf="!structure.area"></app-no-data>
+        </div>
+      </ng-container>
+    </div>
+    <ng-container *ngIf="isMobile">
+      <app-structure-mobile-card
+        *ngFor="let structure of applicationSubmission.soilProposedStructures; let last = last; index as i"
+        [structure]="structure"
+        [isLast]="last"
+        [index]="i"
+        [isReviewStep]="true"
+      >
+      </app-structure-mobile-card>
+    </ng-container>
+    <div *ngIf="applicationSubmission.soilProposedStructures.length === 0" class="full-width">
+      <app-no-data></app-no-data>
+    </div>
+
+    <ng-container *ngIf="isSoilStructureFarmUseReasonVisible">
+      <div class="subheading2 grid-1">Describe how the structure is necessary for farm use</div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureFarmUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureFarmUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe why placing fill/removing soil is required for the residential structure(s)
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureResidentialUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureResidentialUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilAgriParcelActivityVisible">
+      <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilAgriParcelActivity }}
+        <app-no-data *ngIf="!applicationSubmission.soilAgriParcelActivity"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilStructureResidentialAccessoryUseReasonVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the residential accessory structure(s) and why placing fill/removing soil is
+        required
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureResidentialAccessoryUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureResidentialAccessoryUseReason"></app-no-data>
+      </div>
+    </ng-container>
+
+    <ng-container *ngIf="isSoilOtherStructureVisible">
+      <div class="subheading2 grid-1">
+        Describe the intended use of the 'Other' structure(s) and why placing fill/removing soil is required
+      </div>
+      <div class="grid-double">
+        {{ applicationSubmission.soilStructureOtherUseReason }}
+        <app-no-data *ngIf="!applicationSubmission.soilStructureOtherUseReason"></app-no-data>
+      </div>
+    </ng-container>
+  </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
@@ -113,11 +205,23 @@
     <app-no-data *ngIf="proposalMap.length === 0"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">Cross Sections</div>
-  <div class="grid-double multiple-documents">
-    <a *ngFor="let file of crossSections" (click)="openFile(file)">
-      {{ file.fileName }}
-    </a>
-    <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
-  </div>
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
+
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
+    <div class="subheading2 grid-1">Cross Sections</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of crossSections" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="crossSections.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 </div>
diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss
index 9999107ed..ee0b95cdd 100644
--- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss
+++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.scss
@@ -1,24 +1,39 @@
 @use '../../../../../../styles/functions' as *;
 
 .soil-table {
-    display: grid;
-    overflow-x: auto;
-    grid-column-gap: rem(36);
-    grid-row-gap: rem(12);
-    grid-template-columns: max-content max-content;
-  
-    @media screen and (min-width: $tabletBreakpoint) {
-      grid-template-columns: 0.55fr 1fr;
-    }
-  
-    @media screen and (min-width: $midBreakpoint) {
-      grid-template-columns: 0.95fr 3fr;
-      grid-column-gap: rem(16);
-    }
+  display: grid;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+  grid-template-columns: max-content max-content;
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 0.95fr 3fr;
+    grid-column-gap: rem(16);
+  }
 
   .spacer-row {
     grid-column: 1/4;
     height: rem(16);
   }
 }
-  
\ No newline at end of file
+
+.structure-table {
+  display: grid;
+  grid-template-columns: max-content max-content max-content;
+  overflow-x: auto;
+  grid-column-gap: rem(36);
+  grid-row-gap: rem(12);
+
+  @media screen and (min-width: $tabletBreakpoint) {
+    grid-template-columns: 0.55fr 1fr 1fr;
+  }
+
+  @media screen and (min-width: $midBreakpoint) {
+    grid-template-columns: 1fr 1fr 2fr;
+  }
+}
diff --git a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts
index 51f664616..9f2a7b14c 100644
--- a/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts
+++ b/portal-frontend/src/app/features/public/application/submission/roso-details/roso-details.component.ts
@@ -5,6 +5,11 @@ import { PublicDocumentDto } from '../../../../../services/public/public.dto';
 import { PublicService } from '../../../../../services/public/public.service';
 import { DOCUMENT_TYPE } from '../../../../../shared/dto/document.dto';
 import { openFileInline } from '../../../../../shared/utils/file';
+import { MOBILE_BREAKPOINT } from '../../../../../shared/utils/breakpoints';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 
 @Component({
   selector: 'app-roso-details[applicationSubmission]',
@@ -12,15 +17,52 @@ import { openFileInline } from '../../../../../shared/utils/file';
   styleUrls: ['./roso-details.component.scss'],
 })
 export class RosoDetailsComponent {
-  @Input() applicationSubmission!: PublicApplicationSubmissionDto;
+  isMobile = window.innerWidth <= MOBILE_BREAKPOINT;
+
+  isSoilStructureFarmUseReasonVisible = false;
+  isSoilStructureResidentialUseReasonVisible = false;
+  isSoilAgriParcelActivityVisible = false;
+  isSoilStructureResidentialAccessoryUseReasonVisible = false;
+  isSoilOtherStructureVisible = false;
+
+  _applicationSubmission: PublicApplicationSubmissionDto | undefined;
+  @Input() set applicationSubmission(applicationSubmission: PublicApplicationSubmissionDto | undefined) {
+    if (applicationSubmission) {
+      this._applicationSubmission = applicationSubmission;
+
+      this.isSoilStructureFarmUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) =>
+          structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+          structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilAgriParcelActivityVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
+      );
+      this.isSoilStructureResidentialAccessoryUseReasonVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+      );
+      this.isSoilOtherStructureVisible = applicationSubmission.soilProposedStructures.some(
+        (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
+      );
+    }
+  }
+  get applicationSubmission(): PublicApplicationSubmissionDto {
+    return this._applicationSubmission!;
+  }
 
   @Input() set applicationDocuments(documents: PublicDocumentDto[]) {
     this.crossSections = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS);
     this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
+    this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
   }
 
   crossSections: PublicDocumentDto[] = [];
   proposalMap: PublicDocumentDto[] = [];
+  buildingPlans: PublicDocumentDto[] = [];
 
   constructor(private router: Router, private publicService: PublicService) {}
 
@@ -30,4 +72,12 @@ export class RosoDetailsComponent {
       openFileInline(res.url, file.fileName);
     }
   }
+
+  mapStructureTypeValueToLabel(value: STRUCTURE_TYPES | null): string | null {
+    if (value === null) {
+      return null;
+    }
+
+    return STRUCTURE_TYPE_LABEL_MAP[value];
+  }
 }
diff --git a/portal-frontend/src/app/services/public/public-application.dto.ts b/portal-frontend/src/app/services/public/public-application.dto.ts
index 744878fb9..08a1fd6ae 100644
--- a/portal-frontend/src/app/services/public/public-application.dto.ts
+++ b/portal-frontend/src/app/services/public/public-application.dto.ts
@@ -111,7 +111,7 @@ export interface PublicApplicationSubmissionDto {
   soilAgriParcelActivity?: string | null;
   soilStructureResidentialAccessoryUseReason?: string | null;
   soilStructureOtherUseReason?: string | null;
-  soilProposedStructures?: ProposedStructure[];
+  soilProposedStructures: ProposedStructure[];
 
   //NARU Fields
   naruWillBeOverFiveHundredM2: boolean | null;

From 37b2710e0f57732f87cc7119a0c0ead139089c96 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:49:26 -0700
Subject: [PATCH 31/45] Fix app info building plans

---
 .../pfrs-details/pfrs-details.component.html           |  2 +-
 .../pofo-details/pofo-details.component.html           | 10 ++++++++++
 .../roso-details/roso-details.component.html           | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
index 4032d6289..374bb6135 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pfrs-details/pfrs-details.component.html
@@ -249,7 +249,7 @@
     </div>
   </ng-container>
 
-  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === false">
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
     <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
     <div class="grid-double multiple-documents">
       <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
index 5d940e343..387462983 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
@@ -191,4 +191,14 @@
       </a>
     </div>
   </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 </div>
diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
index 55c1ae789..20d9f7f45 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/roso-details/roso-details.component.html
@@ -186,4 +186,14 @@
       </a>
     </div>
   </ng-container>
+
+  <ng-container *ngIf="_applicationSubmission.soilIsNewStructure === true">
+    <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
+    <div class="grid-double multiple-documents">
+      <a *ngFor="let file of buildingPlans" (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+      <app-no-data *ngIf="buildingPlans.length === 0"></app-no-data>
+    </div>
+  </ng-container>
 </div>

From 01831648589d72a4ba74614643fb7d9296c06b57 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:50:13 -0700
Subject: [PATCH 32/45] Fix building plans being deleting for wrong action

Building plans should be deleted when answering 'No' instead of 'Yes'
---
 .../proposal/pfrs-proposal/pfrs-proposal.component.ts     | 8 +++++---
 .../proposal/pofo-proposal/pofo-proposal.component.ts     | 8 +++++---
 .../proposal/roso-proposal/roso-proposal.component.ts     | 8 +++++---
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 342efcf4e..8de6bc61c 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -343,9 +343,6 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
               for (const reclamationPlan_ of this.reclamationPlan) {
                 this.onDeleteFile(reclamationPlan_);
               }
-              for (const buildingPlan of this.buildingPlans) {
-                this.onDeleteFile(buildingPlan);
-              }
               for (const noticeOfWork_ of this.noticeOfWork) {
                 this.onDeleteFile(noticeOfWork_);
               }
@@ -356,6 +353,11 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
               this.isExtractionOrMining.reset();
               this.hasSubmittedNotice.reset();
             } else {
+              // Clear docs
+              for (const buildingPlan of this.buildingPlans) {
+                this.onDeleteFile(buildingPlan);
+              }
+
               // Clear structures
               this.structuresForm = new FormGroup({});
               this.proposedStructures = [];
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index 652d76daa..198abc94b 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -287,14 +287,16 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
               for (const reclamationPlan_ of this.reclamationPlan) {
                 this.onDeleteFile(reclamationPlan_);
               }
-              for (const buildingPlan of this.buildingPlans) {
-                this.onDeleteFile(buildingPlan);
-              }
 
               // Clear questions
               this.reduceNegativeImpacts.reset();
               this.alternativeMeasures.reset();
             } else {
+              // Clear docs
+              for (const buildingPlan of this.buildingPlans) {
+                this.onDeleteFile(buildingPlan);
+              }
+
               // Clear structures
               this.structuresForm = new FormGroup({});
               this.proposedStructures = [];
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index 7e0a48a50..e1c80426c 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -279,13 +279,15 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
               for (const reclamationPlan_ of this.reclamationPlan) {
                 this.onDeleteFile(reclamationPlan_);
               }
-              for (const buildingPlan of this.buildingPlans) {
-                this.onDeleteFile(buildingPlan);
-              }
 
               // Clear questions
               this.reduceNegativeImpacts.reset();
             } else {
+              // Clear docs
+              for (const buildingPlan of this.buildingPlans) {
+                this.onDeleteFile(buildingPlan);
+              }
+
               // Clear structures
               this.structuresForm = new FormGroup({});
               this.proposedStructures = [];

From c21544e29be2813cfdb6592f434798b753416efa Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:14:31 -0700
Subject: [PATCH 33/45] Fix PFRS validation

---
 .../application-submission-validator.service.ts           | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
index 77f57c755..bc0604404 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.ts
@@ -652,14 +652,6 @@ export class ApplicationSubmissionValidatorService {
     applicationDocuments: ApplicationDocument[],
     errors: Error[],
   ) {
-    if (applicationSubmission.soilIsExtractionOrMining === null) {
-      errors.push(
-        new ServiceValidationException(
-          `${applicationSubmission.typeCode} proposal missing extraction/mining answer`,
-        ),
-      );
-    }
-
     if (applicationSubmission.soilIsExtractionOrMining) {
       if (applicationSubmission.soilHasSubmittedNotice === null) {
         errors.push(

From e960e98e14902fb04b39277907a9c892acd22790 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 14:19:48 -0700
Subject: [PATCH 34/45] Fix POFO reduce impact visibility

---
 .../pofo-details/pofo-details.component.html           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
index 387462983..563e0dbb4 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/pofo-details/pofo-details.component.html
@@ -126,11 +126,6 @@
     </ng-container>
 
     <ng-container *ngIf="isSoilAgriParcelActivityVisible">
-      <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
-      <div class="grid-double">
-        <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
-      </div>
-
       <div class="subheading2 grid-1">Describe the current or proposed agricultural activity on the parcel(s)</div>
       <div class="grid-double">
         {{ _applicationSubmission.soilAgriParcelActivity }}
@@ -167,6 +162,11 @@
     <div class="grid-double">
       <span>{{ _applicationSubmission.soilAlternativeMeasures }}</span>
     </div>
+
+    <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
+    <div class="grid-double">
+      <span>{{ _applicationSubmission.soilReduceNegativeImpacts }}</span>
+    </div>
   </ng-container>
 
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>

From 7dc12b708c5c6b2908ffa0128974793a85023780 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:42:44 -0700
Subject: [PATCH 35/45] Fix ROSO sctructure table layout

---
 .../roso-proposal.component.html              | 252 +++++++++---------
 1 file changed, 126 insertions(+), 126 deletions(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
index 6349f3d79..3a736c5eb 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
@@ -205,144 +205,144 @@ <h2>Proposal</h2>
     </div>
 
     <ng-container *ngIf="isNewStructure.value === true">
-      <form [formGroup]="structuresForm">
-        <mat-label>Provide the total floor area (m<sup>2</sup>) for each of the proposed structure(s)</mat-label>
-        <div class="scrollable">
-          <div *ngIf="isMobile">
-            <app-structure-mobile-card
-              *ngFor="let structure of proposedStructures; let last = last; index as i"
-              [structure]="structure"
-              [isLast]="last"
-              [index]="i"
-              [isReviewStep]="false"
-              (removeClicked)="onStructureRemove(structure.id)"
-              (editClicked)="onStructureEdit(structure.id)"
-            >
-            </app-structure-mobile-card>
-          </div>
-          <table mat-table [dataSource]="structuresSource" multiTemplateDataRows *ngIf="!isMobile">
-            <ng-container matColumnDef="index">
-              <th mat-header-cell *matHeaderCellDef>#</th>
-              <td mat-cell *matCellDef="let i = dataIndex">{{ i + 1 }}</td>
-            </ng-container>
+      <div class="full-row">
+        <form [formGroup]="structuresForm">
+          <mat-label>Provide the total floor area (m<sup>2</sup>) for each of the proposed structure(s)</mat-label>
+          <div class="scrollable">
+            <div *ngIf="isMobile">
+              <app-structure-mobile-card
+                *ngFor="let structure of proposedStructures; let last = last; index as i"
+                [structure]="structure"
+                [isLast]="last"
+                [index]="i"
+                [isReviewStep]="false"
+                (removeClicked)="onStructureRemove(structure.id)"
+                (editClicked)="onStructureEdit(structure.id)"
+              >
+              </app-structure-mobile-card>
+            </div>
+            <table mat-table [dataSource]="structuresSource" multiTemplateDataRows *ngIf="!isMobile">
+              <ng-container matColumnDef="index">
+                <th mat-header-cell *matHeaderCellDef>#</th>
+                <td mat-cell *matCellDef="let i = dataIndex">{{ i + 1 }}</td>
+              </ng-container>
 
-            <ng-container matColumnDef="type">
-              <th mat-header-cell *matHeaderCellDef>Type</th>
-              <td mat-cell *matCellDef="let element">
-                <mat-form-field appearance="outline">
-                  <mat-select
-                    [value]="element.type"
-                    placeholder="Please select"
-                    [formControlName]="element.id + '-type'"
-                    (valueChange)="onChangeStructureType(element.id, $event)"
+              <ng-container matColumnDef="type">
+                <th mat-header-cell *matHeaderCellDef>Type</th>
+                <td mat-cell *matCellDef="let element">
+                  <mat-form-field appearance="outline">
+                    <mat-select
+                      [value]="element.type"
+                      placeholder="Please select"
+                      [formControlName]="element.id + '-type'"
+                      (valueChange)="onChangeStructureType(element.id, $event)"
+                    >
+                      <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
+                        {{ type.label }}
+                      </mat-option>
+                    </mat-select>
+                  </mat-form-field>
+                  <div
+                    *ngIf="
+                      structuresForm.controls[element.id + '-type']!.invalid &&
+                      (structuresForm.controls[element.id + '-type']!.dirty ||
+                        structuresForm.controls[element.id + '-type']!.touched)
+                    "
+                    class="field-error"
                   >
-                    <mat-option *ngFor="let type of structureTypeOptions" [value]="type.value">
-                      {{ type.label }}
-                    </mat-option>
-                  </mat-select>
-                </mat-form-field>
-                <div
-                  *ngIf="
-                    structuresForm.controls[element.id + '-type']!.invalid &&
-                    (structuresForm.controls[element.id + '-type']!.dirty ||
-                      structuresForm.controls[element.id + '-type']!.touched)
-                  "
-                  class="field-error"
-                >
-                  <mat-icon>warning</mat-icon>
-                  <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
-                    This field is required
+                    <mat-icon>warning</mat-icon>
+                    <div *ngIf="structuresForm.controls[element.id + '-type']!.errors?.['required']">
+                      This field is required
+                    </div>
                   </div>
-                </div>
-              </td>
-            </ng-container>
+                </td>
+              </ng-container>
 
-            <ng-container matColumnDef="area">
-              <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
-              <td mat-cell *matCellDef="let element">
-                <mat-form-field appearance="outline">
-                  <input
-                    type="text"
-                    matInput
-                    thousandSeparator=","
-                    mask="separator.5"
-                    separatorLimit="9999999999"
-                    min="0.01"
-                    placeholder="Type area"
-                    [formControlName]="element.id + '-area'"
-                  />
-                  <span matTextSuffix>m<sup>2</sup></span>
-                </mat-form-field>
-                <div
-                  *ngIf="
-                    structuresForm.controls[element.id + '-area']!.invalid &&
-                    (structuresForm.controls[element.id + '-area']!.dirty ||
-                      structuresForm.controls[element.id + '-area']!.touched)
-                  "
-                  class="field-error"
-                >
-                  <mat-icon>warning</mat-icon>
-                  <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
-                    This field is required
+              <ng-container matColumnDef="area">
+                <th mat-header-cell *matHeaderCellDef>Total Floor Area</th>
+                <td mat-cell *matCellDef="let element">
+                  <mat-form-field appearance="outline">
+                    <input
+                      type="text"
+                      matInput
+                      thousandSeparator=","
+                      mask="separator.5"
+                      separatorLimit="9999999999"
+                      min="0.01"
+                      placeholder="Type area"
+                      [formControlName]="element.id + '-area'"
+                    />
+                    <span matTextSuffix>m<sup>2</sup></span>
+                  </mat-form-field>
+                  <div
+                    *ngIf="
+                      structuresForm.controls[element.id + '-area']!.invalid &&
+                      (structuresForm.controls[element.id + '-area']!.dirty ||
+                        structuresForm.controls[element.id + '-area']!.touched)
+                    "
+                    class="field-error"
+                  >
+                    <mat-icon>warning</mat-icon>
+                    <div *ngIf="structuresForm.controls[element.id + '-area']!.errors?.['required']">
+                      This field is required
+                    </div>
                   </div>
-                </div>
-              </td>
-            </ng-container>
+                </td>
+              </ng-container>
 
-            <ng-container matColumnDef="action">
-              <th mat-header-cell *matHeaderCellDef>Action</th>
-              <td mat-cell *matCellDef="let element">
-                <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
-                  Remove
-                </button>
-              </td>
-            </ng-container>
+              <ng-container matColumnDef="action">
+                <th mat-header-cell *matHeaderCellDef>Action</th>
+                <td mat-cell *matCellDef="let element">
+                  <button mat-stroked-button color="accent" (click)="onStructureRemove(element.id)" type="button">
+                    Remove
+                  </button>
+                </td>
+              </ng-container>
 
-            <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-            <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
+              <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
+              <tr mat-row *matRowDef="let row; columns: displayedColumns"></tr>
 
-            <ng-container matColumnDef="msgWarning">
-              <td colspan="7" mat-cell *matCellDef>
-                <div class="residential-warning">
-                  <div class="residential-warning-text">
-                    The proposed residential structure and its total floor area must be allowed under the ALC Act and/or
-                    ALR Use Regulation. If not, you may require a 'Non-Adhering Residential Use' application instead.
-                    For more info, please see
-                    <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
-                      >Housing in the ALR</a
-                    >
-                    on the ALC website.
+              <ng-container matColumnDef="msgWarning">
+                <td colspan="7" mat-cell *matCellDef>
+                  <div class="residential-warning">
+                    <div class="residential-warning-text">
+                      The proposed residential structure and its total floor area must be allowed under the ALC Act
+                      and/or ALR Use Regulation. If not, you may require a 'Non-Adhering Residential Use' application
+                      instead. For more info, please see
+                      <a href="https://www.alc.gov.bc.ca/resources/alc-policies-and-bulletins/#housing" target="_blank"
+                        >Housing in the ALR</a
+                      >
+                      on the ALC website.
+                    </div>
                   </div>
-                </div>
-              </td>
-            </ng-container>
+                </td>
+              </ng-container>
 
-            <tr mat-row class="row-group" *matRowDef="let row; columns: ['msgWarning']; when: isWarning"></tr>
+              <tr mat-row class="row-group" *matRowDef="let row; columns: ['msgWarning']; when: isWarning"></tr>
 
-            <tr class="mat-row no-data" *matNoDataRow>
-              <td class="text-center" colspan="7">
-                No Proposed Structures Entered. Use the button below to add your first structure.
-              </td>
-            </tr>
-          </table>
-        </div>
-      </form>
+              <tr class="mat-row no-data" *matNoDataRow>
+                <td class="text-center" colspan="7">
+                  No Proposed Structures Entered. Use the button below to add your first structure.
+                </td>
+              </tr>
+            </table>
+          </div>
+        </form>
+      </div>
 
-      <div class="form-row">
-        <div class="full-row">
-          <button
-            mat-stroked-button
-            color="primary"
-            (click)="onStructureAdd()"
-            [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
-            type="button"
-          >
-            + Add Structure
-          </button>
-          <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
-            At least one structure is required
-          </app-validation-error>
-        </div>
+      <div class="full-row">
+        <button
+          mat-stroked-button
+          color="primary"
+          (click)="onStructureAdd()"
+          [ngClass]="{ 'mat-error': proposedStructures.length < 1 && showErrors }"
+          type="button"
+        >
+          + Add Structure
+        </button>
+        <app-validation-error *ngIf="proposedStructures.length < 1 && showErrors">
+          At least one structure is required
+        </app-validation-error>
       </div>
 
       <div class="full-row">

From d1003ddf50336cb222810fe97a63f7409d958851 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Tue, 29 Oct 2024 15:43:09 -0700
Subject: [PATCH 36/45] Display POFO reduce impact field

---
 .../submission/pofo-details/pofo-details.component.html         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
index e75f1c82b..aa679b05b 100644
--- a/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
+++ b/portal-frontend/src/app/features/public/application/submission/pofo-details/pofo-details.component.html
@@ -115,7 +115,7 @@
     <app-no-data *ngIf="!applicationSubmission.soilAlternativeMeasures"></app-no-data>
   </div>
 
-  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === true">
+  <ng-container *ngIf="applicationSubmission.soilIsNewStructure === false">
     <div class="subheading2 grid-1">What steps will be taken to reduce impacts to surrounding agricultural land?</div>
     <div class="grid-double">
       {{ applicationSubmission.soilReduceNegativeImpacts }}

From 70f10df068781274006629049feb3e7b01de6afe Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 09:40:40 -0700
Subject: [PATCH 37/45] Pipe new structures data to PDF templates

---
 .../generate-submission-document.service.ts   | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
index c454d95f2..c44a70f23 100644
--- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
+++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
@@ -495,6 +495,25 @@ export class GenerateSubmissionDocumentService {
     submission: ApplicationSubmission,
     documents: ApplicationDocument[],
   ) {
+    const hasFarmStructure = submission.soilProposedStructures.some(
+      (structure) => structure.type === 'Farm Structure',
+    );
+
+    const hasResidentialStructure = submission.soilProposedStructures.some(
+      (structure) =>
+        structure.type === 'Residential - Principal Residence' ||
+        structure.type === 'Residential - Additional Residence' ||
+        structure.type === 'Residential - Accessory Structure',
+    );
+
+    const hasAccessoryStructure = submission.soilProposedStructures.some(
+      (structure) => structure.type === 'Residential - Accessory Structure',
+    );
+
+    const hasOtherStructure = submission.soilProposedStructures.some(
+      (structure) => structure.type === 'Other Structure',
+    );
+
     const crossSections = documents.filter(
       (document) => document.type?.code === DOCUMENT_TYPE.CROSS_SECTIONS,
     );
@@ -503,6 +522,10 @@ export class GenerateSubmissionDocumentService {
       (document) => document.type?.code === DOCUMENT_TYPE.RECLAMATION_PLAN,
     );
 
+    const buildingPlans = documents.filter(
+      (document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN,
+    );
+
     const noticesOfWork = documents.filter(
       (document) => document.type?.code === DOCUMENT_TYPE.NOTICE_OF_WORK,
     );
@@ -510,6 +533,9 @@ export class GenerateSubmissionDocumentService {
     pdfData = {
       ...pdfData,
       fillProjectDuration: submission.fillProjectDuration,
+      soilIsNewStructure: formatBooleanToYesNoString(
+        submission.soilIsNewStructure,
+      ),
       soilIsFollowUp: formatBooleanToYesNoString(submission.soilIsFollowUp),
       soilFollowUpIDs: submission.soilFollowUpIDs,
       soilProjectDuration: submission.soilProjectDuration,
@@ -535,8 +561,40 @@ export class GenerateSubmissionDocumentService {
       soilFillTypeToPlace: submission.soilFillTypeToPlace,
       soilAlternativeMeasures: submission.soilAlternativeMeasures,
 
+      soilProposedStructures: submission.soilProposedStructures.map(
+        (structure, index) => ({
+          area: structure.area ?? NO_DATA,
+          type:
+            {
+              'Fram Structure': 'Fram Structure',
+              'Residential - Principal Residence': 'Principal Residence',
+              'Residential - Additional Residence': 'Additional Residence',
+              'Residential - Accessory Structure':
+                'Residential Accessory Structure',
+              'Other Structure': 'Other Structure',
+            }[structure.type ?? ''] ??
+            structure.type ??
+            NO_DATA,
+          index: index + 1,
+        }),
+      ),
+
+      hasFarmStructure,
+      hasResidentialStructure,
+      hasAccessoryStructure,
+      hasOtherStructure,
+
+      soilStructureFarmUseReason: submission.soilStructureFarmUseReason,
+      soilStructureResidentialUseReason:
+        submission.soilStructureResidentialUseReason,
+      soilAgriParcelActivity: submission.soilAgriParcelActivity,
+      soilStructureResidentialAccessoryUseReason:
+        submission.soilStructureResidentialAccessoryUseReason,
+      soilStructureOtherUseReason: submission.soilStructureOtherUseReason,
+
       crossSections: crossSections.map((d) => d.document),
       reclamationPlans: reclamationPlans.map((d) => d.document),
+      buildingPlans: buildingPlans[0]?.document.fileName,
       noticesOfWork: noticesOfWork.map((d) => d.document),
       soilIsExtractionOrMining: formatBooleanToYesNoString(
         submission.soilIsExtractionOrMining,

From 9a006d427882238cbd3dc79f4e7b630febd9fe01 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:20:09 -0700
Subject: [PATCH 38/45] Add structure changes to PDF's

---
 .../submissions/pfrs-submission-template.docx | Bin 49079 -> 56714 bytes
 .../submissions/pofo-submission-template.docx | Bin 48179 -> 53279 bytes
 .../submissions/roso-submission-template.docx | Bin 48046 -> 52882 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/services/templates/pdf/submissions/pfrs-submission-template.docx b/services/templates/pdf/submissions/pfrs-submission-template.docx
index 50bbe9f116fbeb4f5a6c2561f819490be90534da..8a2d414d9574de4ae7856d3e933f3ed09699f3fe 100644
GIT binary patch
delta 26499
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

delta 18805
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

diff --git a/services/templates/pdf/submissions/pofo-submission-template.docx b/services/templates/pdf/submissions/pofo-submission-template.docx
index 38e8206b3a23645cff9cf15b9534ae6575810445..955d5d819fb987b9731e08f61a49c07a1246fa73 100644
GIT binary patch
delta 19011
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
F>MvxRc)9=p

delta 13832
zcmZ8|18gQh*KWBrwl?2#YumPMY;A1))?4eXZQHhO+wN9dw|Bqq=HCD2o=h^CNlr4!
zJaeAsoSezYg=~0+sD1keY+4f`js<{${oDoz`wj*M_RGQ9jM2=&)XmP^-j%__&h}FO
z!nu$u`LpNy8*=cMtNLVPG?Yl(oO**^2Z8d@oxA$e;Nb9kFTkBe9s;3IKRY~pRdOxo
zjo^*?4e$f*&RU8Jkm9P1sT_Lf9QQ!z%aafj<M+DI;z_;vW`#8foa<n9WXOi|I~-ad
zY4`s1_d@eT@=<QonKQlJnBe7Rn&{*5Qt{^N(a_H;RnF9b`KdsUge>3oF3#g-`ln~M
z90LQ3!|}}4r4NyZRpwC3OB?nK<Nn4*?>!^YzN;6wI7xj2AevurV)RLlv;9{?gG%Pp
z6_eG%qAv-fYQS9xkke&h^Q$=-91lSldp+b;4b_%3><~4uB)@PtKM^6loGS28BT%Y5
zTT0{#pl+sMMFl626ucpwkS(LKA?=l~a9;vXMCB)Dzdd}mIW;!(aBXs3+{2ha9KJg^
z6_i1Ocqd7ws+MfBN%Gny9x<x>1J1>2T??W+bwpJ#u~?P{c-zq+jwe6<1k~$N1PRb=
zGon;*zW=G6Ntm(1{%ql!ygTYRBQ@9Tv`-rBm$@Q)6jh0FN}LKb8$!Nso*$iBQyKl}
zhG@<CJ#j*W=4hl|QNU5*Z%qFu?l5I_YJlwMjRN8pjIAte3I8|1_$^~1aWec{jo@av
zB?mk<fs}wO5d2R#*w8(SEnPCpqRMbcOZAqTf}>HB&Nz)yo^zmEUmzs6BPTOHL~*19
zS#F~o4FBv3r<wVJ504F{efS)-@5<CxT1FKuQqn2s1c^?#ccw$)FXvx+MX%h^*kd|6
zj+u=U>|Fv%q9p;9_0INa67G5?-IJTawbz>&dfVbo!1L{3fOug!TwyaTBKT_xH6eek
z>KA^8LR~S{LWq#|#U+2;g8lv(IX~rLD4+D^Vi&+VCfB|+`5?2dqA+RVOkMAjT$5^$
zGV}B9S`NbwMrcDzzy4kK*Z1QGh1*zPiZ+EaQhF2xf+JkdfvHY^64TUvY|io0s5ByT
zd`*UJ;Fqg%w|iakyvE`HAfjf0t9uJomToDKZp@0siQECJq@Qi{t_FZ$aXG1#<*S!9
zSBbvCnM#!hB(%8HoWt6BBYxktmyiL=hU5IC3o9;+H%1Ard+HFRSJ)cyh&PldCJwy}
z#1Fk4urRUt&9Db_97d&G5S<|6NiRGv<ch=xezF<Gjq*UnAYtf?kC`PA?ct-pN`1{o
zQGo!{5bH{QS`-V?rt?Z(POYhuLl=i>Gc7G?IXx+2+L+R~b_Tkibc42VA9j+|>IEH(
z@;^JAG2yO2ulU}XmiSj(O8CU3O3?5;=zIy7U~HJ<rIT?$?+foXeLmep(j^`U$Tx3b
z!}Kep^jON5UMo!*_Tj^i_^)d^*9G1j9FigO!WQQ&_{3f5G0E#pwbF?;?~|ar?q6<S
ztW%1++%#>nm?K%W1j(8LXqF8{;LG_R3_4TP92WMjCl}fxcM|9WY;Ipqu^;E5)RD7o
zwNg0=NB8*&y%X4FiiPnF()BV}+`KwK9akWs2iwd83{8YrX)+2%Y{$a|G>f9FyDyFW
z!SA#ig$DBg2U%mmmIO!iZ{g^{q#qFc*z@6nJ$dXIYU*<0tspwZkIjs^1>L(-#={D=
zhhZejU-S{5<FEs8oG3YAG@sX#`iIPrCmVJ=C6e=Wmy0$j%Sm0BM<yR$2|r(eGk$#7
zr*P7=(%;c<wt<u5jr7Dc=#n7S?1Zn&a3t}ycYRB%K8+|{%|aQ^W|EtdD#Y13fNqSt
z+7H$3v(}_C1*QabIHU0519N~@asVXwtf5?B9VI!s=z|Fw-8gbRq8$EZO1zP{lNc^F
zW68X*{vw5LvjRyU3c3lm;<Y}|#9r<Ix~?Mwqk}plRQRfef&TnZ_7mrILd=(>3deY>
z-`Xl|;POV+3Qf;|`RoFJg{NsO!{?82LJt+zyDzF|06zSyKAuOREf&qo?Ob$mAnweG
zu*6732r)Fjbbqf)xbL&Mld3^+e(F-&8r>16u_v{lGx}#5U^jqCfZhS<oGwUND6P=h
zZ&ZllV}|v9zHIkrDyQ0BrQs8#I~oB}!JufmJ3HfS@!)uHD2r;};B?9cVRd{4B)YR(
z-z;?6Q-v1t#sCems;MvNezkyGJp;puBVtAXt`mkA8I%{4wws0qMzLbIFhPl*=PM3F
zHS<1Ov@1CaMly<U&Z<DN0;zUH$Fc_96imdlG}SPz?zEDmB=d&vr2G_SLPf>Z%%ldl
zEpjQE{ZnWv>Jdjlyl!}5IMnk_YOi`(98xe@?%EM|p0LHYLDJ`%<M3rdb(QSl7xCkY
z7h87M4F*b7Y)VG8`ad*VT_qtohYVS5-aU2lCdw6f<NJ%)%SwSqh(r9dKX8;tP(p|{
zit~lTMR%+a9C22^QnNt<Nx&wOtm=oHN38|X+wq1(@LU>h<owY`8Qk9b+UwqfDBNmJ
zebr%22!pS}08DY{_RSikQR#wYwoUeZj6WA#Q~D+&ThGRvfIu~L9OULV%J0gdT60G{
z_4{6I1mQkoTRy;eBq2haaY~kRIUQurnZ<bK%$b4fQHb&cavPm2idsn*JRO2ia|p>D
zTnMOQ`ZAV_c7lBFP;z|tcxnZ#s<Hj?EEFSi>WF|kD`L*z@v?k&^+XMcM8!bew}p%r
zkS&&ACwHs~kJVi>{+$xRMnZrVXLXNc3SPqRE29Zz(iLFQ+}MHXW!qkeD9k}{MgGd2
zi_cBTcQ?a}9Q9nX9|`0{oR357dF&Oz7@tVJ8%_xP7^Yji$3@2E{?XMZTG_o&hvfe2
zA-SWws^cv3@=0%miS$%D<1Z1G%#1|v{crm66i*B#x+@GE23$J6i|~)eE3fk_7J^dj
zsF?^W_UFKty^PDMKQ?TS3rBj0M^*6jzWp5O1slzk$l&>lsA7NLDZ_-tZsyVmUIUe;
zQ+*Ii3yd^70h$=R9n09$Gk$Tm^H_<JzUz?#sp<UUyt!nmdd#K`Z1OYc#a?SbDBu-?
zCz7ggRu0bFob<rr%=^Q(p!b*J9@NAIaR#(IkswgaPbTYZEsWaA?DJy^<)=*b=O1?#
zgyQbK9cX2B-Ue%}XTZ4>s5Bug?PhJ-yfTpDIGR#fe1wI9WVsEDm2@eTLRLzhM&lQ=
ztGsiqXC~y7i`rKbkF=_4LaM?9URS-m$nYZSLLd9zgB0k;(x0EdwrZbbPYp4UI5ObM
zO1FWC-TbNO^aU<?FeVIE=}}AMzHwZ~^h$oAS8sULy;AjT74}lru?Fl1XmcX7YAJ>%
zUQ3@rBTi$IU(-m?6EmG`Qr2>xF}OpHxz&$+P2;#n+7fUyclf<eQnX~vgz>4=z94ud
zx+NyIY8`S=L^i<c{YvlokTNj))&3?E0sz!cwA;KPfjUVnQPO<MZVCT+O{oSa@N96M
zAX)Ay;c=Z+@hHps>O(actS%W)zS#fKh|6re6o;|I(dHK;E4PxO@ue3mhoGgig5b=J
z%^!Kq5d!FIlmtmM$I*}$Re#k>W~8UH;aE}@zm7Cn$sKDIZck461e_{;6)^OYx&!GN
zxqnAZky4ziM!XhkLECk`>@Aci20lveF&^%qICuka&Eot((K;Sw9OSsr#)M>pFs2fe
zxFhl>fw=A3Sewf;z3y`C=>-v?3pG2aCFvGrl%v$INoFc?*GFglj1KQZGusNI-k;d7
z7qr)5_5f(wh_Z3t1*B#%y8eIc1FUw2oQuZYgvriTEGhh*^{B{}Zz`j-XUay79xbWN
zD15WvUZ=J-AJv}3=)G7@nugQM^5#x<V0KrTkmi?;tr5xS(~a5v&2tqfD2>G~&#s32
zxtdx3?dzUCsN1wg6D}ROwx~T@$wBA_>zFPqjCyCvnIAzWr?9V%XE3i48W^_0@NF?<
zGN!l#@_tAZG#k6E)bVgq<1pBQ&Y9l5=9jhIQNMz0rH0fhsuO<=a+OkDZQxBI6)7^^
zUpB{*D%h`ww`O4Mioy46l2%fSr)<6xQ^upqjJH$8ypVMM0a}A;^2xcTV4I(@7)Nxd
zZ=s(AFAjhaEjul*#Gl?J1WsszADui*M+f$_5GK(U+z?nVZBSy#_x><vbir-lvNp|N
z4HU!?ffH7r8|t&W*96bw{}ohA80-pmY$PyLUVU3!hYdT$CBL8Op3*~i?850=`5QzO
z(K0{Ivg3~^VmVf<%xTyu$)2t)PnLkBOSBDqQg<zhtj6FkPzF6c0Ml*yY=3f&g%+ok
zy6@%$ts$k}hC&ZP$X!OoA0Ca%swljL%AAjN#fKM>jKzsrJdh^c5Ih9q>59L1uy5<`
zBB#o6)b1{*cYi*tcil%X{sLM!9NnPcmsDtWOAM1P(uY4Rzak|(=p;H2m%CY?sY2GD
zkz5J<!B0)f&$}3{176r-Ap3Dn9?&CA&UbGLy<xnRNTW-kh+i+r*sW#$c2z^)kh%F*
zXSPv~$X>m8z_d=>t2E3al5B77=(sbfIb?t_y}*)UUO3tu^StW3Q|o{;`LU5#A3&&D
zchRZFRj!{memV6iFMG+w5jwp~N^3xv?Hx6N6-vOb*5)fT0GzLNKP;BoVa)8}31p(S
z;TI}DKz8DcUBUPz)i;_Dpu-8%8@%XNmEP(>Mq;v6>#><v0C!OQ{06a)ER1gq$Owv6
zaG9BQ`nT$*hzUCv`E@y05qiBJQ%#GSs#i07l(2VzY&@kVuX@nEPtH2-@ATWBhFfaj
z1D`s*XuWqASjfUshDh`aHd3mI4*7jI^RE8@nTFC`4$9k*fQr1(q*rr2X4|E`F_@Ft
z=6bU>n%IX`M}=;#_ggT*-vBGCSyZuzAUOcO8$$V$rRo3!$O<Q7Jm?}?kxWxGA<XPN
zfmD|-_4pJpZ-EVW7DIb}wP}i{O~%3|Hg(u_6EAHBj6xM<2~Ge&*vCXo0;o_;V1@C^
zTitmB_-R+jcFXM?+i}zEzacXho`%|626^8*=Ht=~##L*zFPqp*g${J!KtiquF~;tj
z)r(S^2IC|U=(1y^{Wc-YP<{R9L}Da7SC&D?gLrzUfS&tXw1zr*%STjx2+ast=7Z+>
zuX`QPu6~mo#jb5GiQB5E?n2&hLY^HOzUksfS7r@3&N;8fuUzl&YXGmL|21737cIgY
zBD<X`SLM)R1s%0YoNYBgX*stT=Zb8k-u-Ge9tyMK?$7nsCfWw2|IzmGeez#TP^v;b
z_1b790^~61%~24>V!K;WR5tZrLV44&^rAJOR|jd{w@p&ob~yQHMbqd>LgKBwQb=mF
zVc1*YUQiyg^@!^T!D^!2mh$=wBBwF3QCes|;R@@a*TX{H<Sk8DAe|yH^t@o5PoRQA
zhfdc*m?g=fCA?vTBMV!72TNyxzKq@0yjv9m<rI;xwFDK;X**<_;MD0S8~uP0hbanB
zJD|Quy7SAK<<d#ZKj7OSIA$0jX3GX^7r2v>&GMeEev|@%T~G}N0C_C9S?hwfZ;mLF
zD?8G7&Y#6hozq;|x&<s3+?*OdnaT0ghe|X5J53O@6qm`7E97?X=rBB#Pyef#$3VgE
zLKf<(1gsj|`iu%BTzS296u0i%$4vlGl{w|*U4x6bXWg4ppku-o&Y)t_V951r|H>_%
z5iB%1-<*prO3H=F-G{gUTc8RFQ_p(iueo-``Uq@<&eDQV$Yqe?6SIlxu{aNM4*u`Z
zBJ1LH6LgE@3|eaIP?|bQZX?H&6;0zF!milwOT9sPiQmsoGnRMBgKHqh$)A{kCWTH+
z2~s1yvxr1yUy0uwar=moNt+3mi2VNEs0(=v3P>PH2>a8lwFi;>u8qx$Hu%e&5D-ic
zO3O#8q9iF_UpUvtaWO>W)HyagI@Ky;nRRj<2n<?z?eUz*AZj};VU&q)zbsMs^;V{y
zE{2j+0MG(paT53-USc9Askzqzzra3qwuHCsbdcmyE+63+V0N;;%@NW$<Io=ui3)ot
z^16qVS6}NZv{dWcb~?Hensw}6C*C?+Y+ldW-wDH`@?i^{unL-YWmvV@=UJB>mzV#`
z0_rmVVrt=bW7A&sKgraa(U!&l(&Ey&sng@iRVuTaL(2ojh=Q%nM60}j6mggc_7Bv9
zEfA#Oq=f?n&~*sct}@R?k+2f7@7*6pQU=#S9`PZuY)6ZnOaP>6#=)qiamw(+>8TLz
zf&h~C=mqXJv^Y5|<?}Nw|G2`s6N|N+^QxG2c;RxAEE9fL6|6L54I3(;XUOSM&|6cO
z79%UCDZTL;l!3%gz8pqiJ_*oPP@n3o_Z$2URNHZoetL0bcgm`Ia7q@mYR=3i#+iWp
zMzOOnnVJs0lp3Oub+TTIQXE`alO0|Zov<WUo|zL>m6Kh@lXytaZ5n37)*VbdHiIQf
z+%`g(8!GnI2XV-6Z8`Z+TXR+=*1nuC<y;M=+dpLYGaGA=^2Odj*DVa@STeqd5e5B*
zy`j0TmkG&}U21eir6i<W@G^UDaLLDA6l7b9*}2MB9z~R)CYhjE*D`i=nU5I0zwCvN
zla5DL$VSp9{cd=(;lIZ%@h8T|kUHm(_{v6SssmcY8sh_~&cPre?H*S*du?Vle{(b<
z%9l9!7}EKvzS|iC9o$qVHh|g7S2eL$1Z8>iMw@7OXv5_!&y~!a6Q^n_!e<l(s-515
z0BYXyQ?4e4dvCUK+%%)Hcrn0jQV#jTh|``8UVNA>xN1ECk+`o9nsKS79bo$`8xd?Z
zVf`nPCu;*#I&DBA3hux7Dhb_SB?i!%rwg;|uC(zX%gY5mO_7hzipy4Ku<jJ7PkBJi
z>X(`&ZM2f#!xE;g|B)?;y!lJ5BAE!0XG=!s3-sMck)+9pMDr@fqJvzRo#aqn$Vj73
z{wXbV5}+tioV;vokLMH)t1d3V$1w)y2nX32=CD8>9hP78qqo#0Zl^$N%2KS+zjV~3
zN1#7bB3m8Uuq^D5j+9cG95c0-qVI_3DMF6;C+0~@sGfeUkk}ie^C(NlqhrS=cXS_J
zUtLWX%DShWXI|}Qm&a>Xt;UC;vPG*@sXuA?R(t!#G(6A}zu3NcT{CwM4H}@sp_F#8
zlRGtCQA;2&oQ<zS+;P;1aNlgGc___Wkw4do50L;gM;6fe{78pi3}@N&uhnG*H<eCF
z+$&h_LhWpS_>EA{9%1<I6ORENd$**J>+N&=i^m$7MNIq>uaN;;tmUK*J$J5x>xt^?
z$?&TIddTvuO?r)-y<)t3zDYfboS|9j%f3q(%abI+h4kLVSQvw5)ME0N?w2L}ic>lW
zi#!$>viS7AyNz8xG{rZ{LPo|*CGJR8G5<HE&u~9vw=I4*{sC&PzvQJ2Nn{=k%@p)A
zsY;}SR50vC8s2}i?KVVQ%qm=9;x04C$bH8U8{yJ&SW3_ddV`I`@o2AL_ooOJdgB;#
zIGi;=6#aG36a2F0J3Uv=?KHn;D{5}xyA%&lMNlRI5rqU7E<%Yz-o7+TXhP|LstW<P
z)(lhYXU_!ih3u<~(886W7WQY)Pjyys#Yx6e{FpfxKpXn@cjtz~<RJ-7DeQ@F+hz`M
zvWg#Svn!Fmf5^I}_Jx&fZC3S#m2YGOea|Hu-W^!B6mt`N#eB`25P~T`d$@LCxF{|I
zk`8W(@m4KO;rA`&i=?dnWKbrJO}rv2ibUMf`-5dAGaj?b+xFI>D3=w7;}5~?UCN(G
zSGM07h>P>byRj$_8%D(qZZRg_$?ohw<mxs^?psA5Sw%|69z+!3z&9ZsQEno+xDg%4
zu?rZQcT={o17E3MH~`G+BOgo4Ai4vst1bFBv+5NNXY~$AL|JXNu-cLlC&W{1l5kR!
z{fo6j1J{QPElp^J!ydoyS2*gdtMsI=s$}S?Lz!z~2xEo4G#33VDDp9s%C&=ZV0%+g
z^A9!8ayjqKe3fe~O|Yxkw+wOwPPI3Fo#xF)hMvaSMe2LcxiWuKH8bVx(+UA9xzw)J
z!S{p-ll#7MrcCQyMOU_&+Q`<26p~k!`rRJ+aTLVbs$W~?@6tZu<6`1xVI<%qde9V`
zPBi(U%SlyXu8@GCsj27MoI7c3y4VLW7KQUph8jr`>-B<><X-UYAFg&iDcYk}{WMv(
zhZ(iL@0*RRH^l*Sx_2@=?EwJ0u{XbE=X!fO5+82ag23Y75l<J>0=*kcaYbeG%cT`&
zK&^U_*-QBqTvHbGTm{B1#<XDEe6Cy610LT)Qk%aQhUe0YElitAUVW=q$0vPjRiIo6
zuy@TRQ!ys~5oEXaop6)kR0!Q=hsjl5(r4EFaCnfiYkqqJO`1*IpY#{-Cr*&$>1#E*
zrHmP_bc8`Yl4bz2x>0H}R4QKLIs>x9JpCMaqFPq0P1I(BPdGNDt1JfQXhO)@1Cyk;
zCD9o5;6V#TL>}#^n7$%~6QN}RB&3^cTveEs)rtE?q3(WZJEc{pE{n72odwX}9xk*V
zI(`&}ZDcnd<_n{pLTDKXfQGbJ$n=LN*h!cbJ<{l{7uE#j)UytOwpnW5ww?TIQYt=3
zmRLisY0#*gjx|C$b*%6V*VwbaBGtO|39Os+30zS_6Vz8Kj6}}m<T&KrOPBUei|KuT
zgJ?O2b{4`aYn$NP>8gg$@|!+`CftKfD>gWr)94G(<e)j%*M)$|J`c3hkmnRWKlJMF
zN+RDQvwngS6xZz-Bhw#DF}8&3A3u;<VyeupOnEJwPz`=65d149*SM1U8v2@#K`1T6
zZE?m+Cx<QFFt<9O$jy@uxDDHiQMEi=VXUQSq?;$TH8vBLD3;OXtQkLJM7onZgWEI-
z7{aG$+#rF-B4L4R1HX+AkQTN>tqNiYXITi7<{4fpD9>PSc0HwBA_&d6gsj+O*9y5Y
z>5)uao}WQJr=Gf1pK_X%-$Lec=u}K<S#`5N2qyhf>cDI5oMO`olJcM{5=)=j)^dww
zigh}?9Afd<4>82L0XA;>;MEfJ+(iu>m+1`DKkHE8hPZ%ipF3`NUsF%ceL971%0=x(
zcyuPY)H{1heG{qjDE(-+6ubJ2818HfDh~%b2_-JX8-K1*4*#-EzuVVg<LVsw$Cd#Z
zP0w+p;eA_9+>uwC&Bi3{7v3`yG#yuOx^wj6YqA*f9_LI@g_tG&%C5(hSXV@5RKMiF
z+it_xY6t>jt#%E6BFW_xy^30A10s=ynr?Y{D?IBj!%)|PbW;bGJFU%Nl(OZ;U!u``
zJM=g4-1w0;YMBvw2e0}HNbIao{GxGDFdQ{?gTCH&-m>*kL}pqVi=HOqi2c$pj2*G*
z9n2yJ6%l%}w=QJ{D6jn!y3hR{P<isJ(>3(%)>VNv_;*aR>IhuOCwt`TXP!jMsykO%
zA>!KXgtpF-hw<8}fxb8}4gxPCI3C_DA-A$^FrO437^1??6(ot#&)DhdfTdyRo2u?^
zk<X7qKZN7RHlr8m3TTU|FfA53(O+!#$gy&R6z7N!1F)Va(SdraKklpfs$6p;Xz^1o
zlk|WXrDamsFr3#0;rx>6a!=F5VTxi?iFA?oW2d3|0bY;-Yd)fu3e*ou?84+fkU7}a
z_+&_*p^$QNwIeN=gbU7-qoTHTnM%tkCC;6u<$VH=XXoA3f_EdGDR>{@@Hhebi)W@O
zs%%QGY$PiTcNdk{;DpAd{e2}D28JsSU*JG6u&=L6y$kz;W;8#{z8-fcf3ZaBG5B<h
z<tlxn2KI#959J3K`nl%m@qCiGv0|7vh7;{qvm>Q?Q>x^D!&w_zYhphu)1ey|`HcT9
zi{c*l<Lvo3IH%8oL6G%jY@i|MTHv?m%e!bBcN_PWc6xyK{*RuiQ!B<-39k|LB4E8y
z@g|8+LVTuAgo5`dVXN<<7Ju6K87Fd?#v{ztp*Vql=3liXl(=Kw2|#Sj7~fu;>gS``
zg*sKrJ4asrDZ8|Sx29R5Qc6)~ai{;@W+nzM+<_~Z48VzYxJ;X}5s?x5UJMY&ZDBsw
zY0H8l1{p#v8o?B!=p9p`m(b|116&Z+sVqz+eD6BdSH-4bP&1ScG7lLxHm*=uKSK?E
z?Kv$qa$=EkmdW2R77@Wq5)lj^`F!~uOEr|Z<-;YDCdu{k{E_n&i8oHJUhE`B$P>PB
z)4+bpCct_t;vyimFWo*$eT+L5$rQ`#2fX&`2-@&m>!HJ*Q!Kc79EXXm2X^@sgjQ0g
zp0~$D7tz|O)Y3;(X0$JcZ((RZ+HJV<HQ9-O%2@pse^`#uh~*f6&-Lo;LJ%4h5-M>r
zS@v0RhbVFLbRX;tClxx>we+-k;p`t<zt}&thQ>ECvt75|wJNoeXtrIN^DU^(8D@Ki
zF*|g*qtBkQh>&Czu**z;1okd|qg>{(_Cpd=9y5sWW1M+07)r1*n_3%zeDOn`M`A67
z9LEy69%0iOi8)yOd+!eZLOW_sQc0aQn>-55n_Tw#vxO9hd8jhx2Xt=JbW(H<7@_ur
zMg9RxFr|{yLR0E&-M3eJ`d5anOM7*J3$sc|<&W@p#@tTIMrV-;Tws`FQ-49>JS=2y
z+hQ19Wjh+Q07#ePWTMjPJz8QyE`@T8n`XmAdnqyVG2I$&cAmLWIfdUOvq4)MO#279
zcJk=KSYvmH3QtABcSwuN3lng4zPRX^gU(%SM6dXAvGSG<Icx}&Gnr2^VJzvj8f59d
zm_&!36o*rL#EFm(3ScbxGtYO$ISFo8E3reL<pgMA++Xr^)&llZLe|1Y9`d@Z=%kg}
zM2^SajX%j-Ja7f{ZUoHWAmdZQ=ru2-8_$$i6=O>KOZIc(YWs&1P?G2@aDP}9Iu?h$
zXHKuON5|lC=7s)#6F7h3MSs;B<(mus=9HiZr>xIxg$TVoZv%YV|0h5K1+0;Nky0U~
z;i)Je7;8Y{jy^Cidc+>OqH1uF=n_U1eWs#S#|1C&QSfyakIS_(-DhHrCx&tExluzD
zi72pP2UENPG8eRmhbF>ev=x4EK;pvkOn|M7Ywf<D44=vUQpY^l{a71lX&~3?KkgKf
z$4?9u(;@bb9s$xsgR49WA@KMRhBhEy8%tl)a!rZh_HpgXI^87|3yB3*9S4T*r)kMC
ztHhK2No(-L>zha0d;TpVa-Rv1A#+Eut4#{%>b>5_W*pMMM*D7fDu%XPf`()FC+WPS
zwFckK{s}AiYD5#SxwBXK;&0v!j4_hq!gQu93>|KBZW+)uD%4CQD>I>{9$64yCP&I~
zf_p5{^oZqH?K=Z-oofPClNhG`Gud`|pjUeUZ3k-sOHcW=0q{NFCJqCU7`L@%EgBSf
z4U-)55QCvZ3hj4%TuGfMi+87WnSrP2LCBkY@>VtCYLGX(Jb3hg^b6YwE(Ar`1R)>`
zz=nxO918@tz2+vT8*VFWgUmqhF0C=yjU+Y|bJK-iQC~cGBXA!g=hq(gN(FBbx$S<r
z-m5nld6283{vR-eU?$&GAU9lfP`EyX^bk_ktRsE9?|2pLrOlhIMj}Zp#(y@VzLm<t
zbHdKY*#{2wU5lLiuKcOhX^BmUCOBjO)cepa=K}3yUW~Wy5%4I@B!oaZ>+z<xUd3xK
z6pET3?+QOj>Zc`pdPuG&-$?A+kJhsz9+n4oYm^9iqS%kiYy^fm<~vHI3JP_(FPbQT
zTEGu;R|_D!u!i9ipBi@X_2MC}b^T2>6j4SsM?trh<*LW_Q29tT#|=q=evB2#QC-2#
z6i}*>fF1{@c#awkSOlf;)#O}y=A(fX0kUZY*Rv;2_RPs|YCK4Sp9ysU4w#HJ28np(
zAcJQv$KUCG6QT^?uX7ZDWU@7jcek&F#A)6%+DYv43i34#SVFi&xtAsMLC0SGk$aum
zIe&Nkv_2JZWio)bcv@&%$nov&&kAJ1HITMR?`GuQj@@y4r=~GmBz9*0S^4E9IPxL)
z(2=!mTaHj_6;DM!xLwwbk^b^-1uo$_htg%tmY22_mn-17kqF|#tefFp$hHD=RdYp_
zfXMtzatd-e)5z#42a9Ych<UNQ*tq5|HX@-H-We(wSu<ypqLsjIX0YlRvIrvTAh7vn
zs#H`Pg|%1ekw<f{$%wR_mHc<`AkpxUvl}|Mm$(8Uz<>blOdw$6V=5+wZ|Tn!5BzFO
z1%K%`Zv&tabk@Qhk0bO51f!*g+K6!T{Uo*C?@-bFJ?4dlz^l2cfb$BCi`#o-%%)P0
z(8qw0V%W~m&F+hd*5imo`GNYnfAI&$rigEnRQVTO<v2e1lXy=ytDbbZ_`oYr<Zj0?
zo+yGM_XT0p$F~|XivDnXujN}XdtY-z{~PKiZ0Fm6_a5|y4};ch97>9)H{!UGsf@JP
zJpxZLx4dYt#ZVeWr?-qB8Up*6p!m|>Kq_;$E_6p_oIHcEJ*v56GcB$?EwCHkS5KZT
zBNH8m)gn!5<q&AAEb+WoU5)H;6yQI~ZfAA1_YS5&)9YJVOaj|+`0ngKi=TW0;!e3y
zcOaED(hl&Z(SxW+7@^BSa{2Zf-g&6vFf0Vs>Nf-Q4-`|P{?!T5p@Si>i5l{}xjR|4
zthUS#g#SnmNH8T?NGJ?2kev){!<Ile1hh*F_hT=}Mwl2lX1~FN8hQi$iVSgs+_V})
zK8T#jMdSP<;V(E&L~~deg4FoLMoMB6yECM8n;MKV*$Xfe*IA;yi?@Dq1HGthR~A+8
zrI(x_GWc!_?fvtSO&d%Re-J$pP9b?$jICAI_siWotVINe0dX$d+>wwNU=X;7gDYC<
zB!e@r8D#>bXk1PIL5G8}K|cgV6f9$O3gdSRNa_`{>DYzb_bwC;9~kj#6w3?3<lV*C
z$Dk37K_bUNOzXpMJq_&tPI6(4<ElJov`D~H!IOJN9oJMYnjTHA?`SU&gW)c{av-Ig
z(ugB@PC&KHzbk@f57Q#TY<5|(E*!e(%|L}k7oP`oU@JH_OZ)8XCmG+7)G||N4-g+S
z>Ss42Bh^k+!>EI5+jlC<S@g2-@>x!iuOiXzF~4%=j3baQmM>EGHTjk705y%fR~&|?
z254}?&?`|}UJ8gVTI*{Jyc9&}%{E`^3_|oOUhk3FIPOG3s*Qa)+OE5_eK{HIy{XGU
zR{jBeP5twfo<uR3z58=dInN53^Hkf1R%jJ`lKJeVt`sLS0o)0+6(j0htUknj6LBz0
zSt~q)_dJ)1MKT6M+Fx2fz^<@uayAG!W72DqoVAJ<rkQt}=OV*B-mM(Y()zLO{M1zV
znkUA9kN1Ih)kaeT^Hjp>uTE*vVRTx9d!G&@v#MYixV?`-2-#+_iI-=e`5CEs>EE#-
zdXl~$PY~(XvT{v2#;@7bTmD#ZOlabgfK?bS29KNPf8{LchlYV(q^@Af`PY`$V(#O>
z>!TK2yygQDZ^c{RK*9P850paj=VRo}l91uN8fh(`kF_d3@Kd!-B54Y=E1@ec)0V|2
z9mioK|J}brS4$x<dU(saVuI!bZm8?-PkzfPgP5m*kEns5*R`RePkS3mel+nXV~nBe
zZUaf9!NWNUNLd&Y3SlRr5u_pZ{~|f?8o6okzep}-`2Udni`vGCoHH&_))&<(;cFy~
z)S|HC4RWT7a4A%}?$1C)?^7uWi@8b1AK;gc;&HbH9Tv@WQ7*!lR5Y;X{q@K`M=2iO
zs_YhwRIXmrY|mo39EwzwWxTF!KMH7RbvSJBeJp;{7AMb=(JdmM1aUljK0(RUsK-I;
zvi9}|0rx{e5#EjPrT<EpnU=1XCGMWlD8^R4CpJbjSio=PRq>%9W!A&WbN_0|fZlRs
zE1nqFzP2?kl|_oJDDolwc^`r@mn@H`Kv{8UIs3xn)qcY+ae|8$5qYr6T616xoyA|+
zNh1wYCUggKItX>qT_>JY$Dmd@E20v1afWx1$ijI=ye?LL?z4(w<=M`i=Gra#e3%S;
zT^qNY)vUwV1dL30T?r(sbWwsLCR|l{w_Q^!rnIHFElKdz+fIWPP2(B0H%%*VK0;B1
zOH)5LcRoSwPiAIBugqdmwg{jA<$ITf9o%pHO?y6CHj6$aZ>$_VR5vhI5$|p~>)}ol
zlKG!42esK&>MjZ;`&^YswyO=_x;c*#<FJBImGw6E@Tde$(-w=@nDl%lMy=|Ga5?1v
zA(`-ax3Q1#MZ0t9uZ#4f=!8fU+h6W=Rb7LpYf%fZ3YqEqKw|-mNm*bhrkcJ&LP=E|
zUeB@7_ri3Twf!Wj-E7A*JyrL!Jc3^qS3FjGZRJOd8#inYIjaQ_F?sMdwncx9N4K7(
zwW?J~Iu$lI(GiC)*6dJ6e)JH8wB))Ka4yYA?`1Ii8axaC`5-kAzyEm}Z|@kt(U6w#
zsoEi-Ii&+{BNWdJ{)2{_!`&R`@7x`-dZbc?Q|$1$^_Z3LOC>?);g0~jRO)f;(FyOK
zAX)p7g~xN_*PT}1xd0TA*}qeF|AjFyI}!(H4FU|z>0iV~{Xea#mgdH0=FZIj=}aw5
zo^sA$LiNANI^$*9GzI@eLgxhyN~i0VC=d$?*DD7BBoe;X&pLiV!*=9Nf$fp>$-G%L
zRp`6A`R=B*6v(jB9Q$#>`ou<vp;2<Ue7)Td3{5^Y_66?B!Sg)DssZ0tB4=`{|2oMe
z!mNvoyz!;Il`(rp#VM$a*AY1;Q<ojBBchGP>(ywB%o)%I{=;@ei{4nUHInR>aoxar
zjpJAzVKj9oj5z{99$;vEb|Cz_duY@gMLN5%G79P?6MROgvBe^kb_HIpG9#+i5=r!1
z{AXR8w4ll&K>jU06evGmNnGZX>2dErkqM8ZCp%OZpx7i#P_bg?2fj;y|F@szXG||5
zC2~-j$CdGS%OxlQKo*?pAVuC<99Kl<n=Zw^%vb($OYumN-_jBun@tNH-LLS|KC^W$
z{iWewMXxH9x(XpQouL?0y|F5%iAQd3yS`RTsXU|C{4kdu$H3#O`&#qzkD5mM38qYc
zyU7}pk%sxZr*Pw0vUDtEn?~ln8}=*;0);<Tdj{3qF7~VS&s;)_U~*{dcNTj%4G{qe
zs_weTHfb6$suDxat7CP>6L`<dsjOgY?jmBM7Qe45UvXv8Md$6gu*uEb>iTGw-R8B(
zuA2LtqIvIFfxwfDSc;{BgpGGGQ{n>ttnrKOZ6}`E@<TpGoLAG~N|j8}r6cM0#_uY7
zDTs7|YWF0%on#QrA)*!?`$<IbZP87>q`EU2^gwXUMgph;t`T^_zFQ(i$%#MCTz3dG
z?^{tx3KcMg%zBVxEp5b5PbkK&K;6h>*XWkCI`Sjcd0<a@zHXZ7H;o})#IG<$4D@mz
zGf6*yLis8sdy!I-&bcsrfia&sL@$PoO93v!$!U%PGkoUZw1NOA4?e_Nbo>~J=pwl9
zrM2r`L(8(G;6dV)Rr&<_sZN_uMHrJK(W7V7=s+NOmXB2dxY1U;NR33N)5^s7`48#;
z)h8frVI)xc6lz0=OuGU66Hl5sEfg3S5D_F@Mh;9oDR>cvpx0@Kkg3*B+E|!d;ODIa
zuc#wjQ=sW+|N0nqmpe_?P11iXTD_n0A==o9T0kMr(O&W<Q&H}t688BH&EGE@K(iwk
z*h75xX+Eop=M+WTHwIWm$Mos^d`v;<s3X$}$~Xsy)-=^n2&`Iu<U&+$qd+V}P)0}I
z)d5O{vdJA$nn?+8xb<LEN~B{o=6exSDzhQ#;4#DDjg8QY=gg_VQ!K9sM-6$&%g%p3
z!@eZD>5oQJ<4d$Q{|HS`iwoMdmbE!rTaB#;Z+!$P?raRAS9I<$#BA4YWyL+C-X=fD
z3DJv7Ck7&zBq_$-+3!7I&KX}JXmxDm7XbtRaMc$aOg7xZCTKzpB=F^oIITGcqk2w?
z-g@#4K%!hBa}a%Mu}DI-az~QkKJ!h+!U^uHXdPU6x_-upphvQ;lesAs8Us%3n0RNe
zw0~`vdqqMJx+)@s7gpS8_*D|@*tN!$mXZ+08KWdFHms%fIFcTZAdfXPWw<awasjh!
zPI(N2jk>m4DeHshgOZcPg)PD4mP^YXAZayp7I*K0NtTpdkBk;AojPh-f;ZAznw=v7
zwCwQ}cu7h$E`3cHNwGuwD0wHdWdMu>Q*DI2w%J2PPre{9@;<-!`7-v6_kIUcxRDyl
zoj;w8Ug_8Y)v@Wy1ybFulHPNcEkMr5O1;=`@G&?9&yn377&z(F!7{Jz=BZ%bJWj{;
zd|h$=oZ>2SM3dq*58Y(k1lJLMq^dE3>@uoGjhwgWxIT>Ftrl7@tWx*JhM-K6tzP!-
z1rrS#Pw@+iB$ZL#7~zbYW*q&R@L*`_c{8|#5|ztK?j5w?JsMz%o3QbhKakZmv=1_I
z>OjttepOli<FI|NE^{vk>WAPn0_{kL#2i^HXlT;hdKNi+-j*jPM<f9d-f%`^#)My_
z>;<28bY{!U6GHbh$jaFh?PX^Z>xD_44voltWcawCPpuw54eg8>n_03l4&yQTxPgp~
zD8wgI`T90csE1-?w48=-6?nrd#H^;yt(OdAi*9Txr|v7d?5;;2zv<dp^_$Nsgy`+8
z*Zh?+zDIU$5qV2mjrYtug-d=zYW$Jke7ic`<fwqF6ID`a;P!;dYNm`gdrK=Q(H5ai
zQX^q`<@7g6QAq?D=MU;{A5FB?hvU?7bjtd?q}UlAXlkwvOLe!)Ou&IZ!q!wnlvZ_v
zCgB5@P)R=<cDImubocEf{U9CiU7Hs-=BJZAb(hydw>j9F=^Giel|NzGkA4q#W2sZP
zL+!Xf{{R6oW#P%RuC(X)ZLyInN(0Gi_K+4uye>H-ht6;!@22^N%Nj}=l>I;qo2K{{
zFkCKwR@i#dEyj!%dx$#;wjX{w-hWiMvRx?F>}v}Um@E6Rezhd^e9i2=3jRk1Hn3JR
z<3Jf}ZO}AW4pV^xClm&lP&>(QQQ~I`n=>GilD^%ZmnEShK{&DgZN@<xsoz@JIRMzn
zh=&{wTu)zG{#rhpDyGZF)GDFn7ipAKg3?h_IU9oQIy~?QBRgqJ?kr`Cn#Ce$ADf<0
zF-|R|<69f|e}vb=NNhCikD4uc3N^kQq)Oa;gb;;sG+0XjzQwIWbLjcpL+=WZYPLen
zP&^T=1lFBl%qgfuD9qE@&B00q<oTmD{!0BzE#Sz%I-g~08D}`D@=_H5TI64?<5X}P
zeDvDVr9xt#RJ`4AWwFtSPO9!g^RHKfKTcvKk-a5FjMw$^3HW2zCM!Zm=V-Wwb((-G
z>)20wFc6{x{8Ng0t>k!8vS;Q3eP^FB1y97$73N%VZk4|>b|1yxUG&V@blqI5^7z<b
z#%0N+Pr8-1rU1zTPg%QM&wrP`DR^j__$VzHF72_xEx$@(9Nf9mK=eoqHL(Tz^#j>N
zW?x|HEKb?0vK8ABk+#)<Zopw&XymCST3o+u?ew_-;^%*F1r9hk{_F=12DZ>ZH%1Q*
zgga6$uli0aLf|2d^kBP|G1y;6zd`c)WQzwYyg6$1%bh<v4TnLH2h?R6w!WrrFde}s
z`Xg(;S^H>aX=;va#sp0R?trfPj&S%rftaXQ)saYa9)~r*)+wol=7qvkxp_65tDvq(
z`bvZfttrpAy1Hr5hH8hWF`N*42zMYB7_5=Ub4PA0z{Ie#0F+Jwb#*_hT=CsHmDb)%
z01i<;q*+xN+<GN2Xj6jATz~r*BxAGTdV8QDN%(!Ur8c?<jOgSONQ1<;)@mVxO`{g~
zGoZ6{gXm3ql8}w3Hu9@6cbr?I@!qVM_JS~4z$Br<PjnD2A!PKI*KJ)$24p4xd-KSg
zgxQ3jlQFI+V(4uPnOci6Jm}@bj0C|d^-n@5L^w3Wp7C;gkE-8<x?|qIQ3<s0G~qJ>
zth6R4UKVf7pzuYM<3p4OV0-C5(v4mbPAlz{d~e<fA8@-79TIJ);a~se`I?&f`0%}>
z|DVJk9D*JU1MC|ZEEpJQWx^NX|M>$2GMrR^sQ3Y@nPedNZ$;pr{yg}nKhgfN^8Xkc
z1L$QE@W1mc(kUzm05gbtik#s87p(u|fXW8)nBs%L<^(nWo7{Lnd-B*IglSrc^%xN6
zG!?=Bushg)e_{QP=Ux)XYnmT|CmkeQjRBha=c14UdYR^h=&S;9%m_iy*MK}`0RMgF
npxhZO2%CCP>kK);|3%rq^Z!RX|Bul&fu3f_zHPVsXX}3f`H*{&

diff --git a/services/templates/pdf/submissions/roso-submission-template.docx b/services/templates/pdf/submissions/roso-submission-template.docx
index f385abe638445feee15961fb67364a5f31d0a4e0..1366284e740385c6f6d59da26cd4d462b12de6d9 100644
GIT binary patch
delta 22182
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
OL`V}8F1YV^%>M#yb=IT+

delta 17415
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
E003TeMgRZ+


From 9671bc4ef3cd56eb901e11d12965d66ffc21e586 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:20:25 -0700
Subject: [PATCH 39/45] Fix m2 -> m^2

---
 .../noi-pfrs-submission-template.docx         | Bin 53463 -> 50364 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx
index abfa5a9e6513b0672e3240de42721f2cb3d8ce94..b443513b2168e37345e75574dc1a3718a740bff3 100644
GIT binary patch
delta 19738
zcmXuKQ(!Jk6Qvv5wr$(CZQJ%6+jg>J+qP}n#*TJ$zJKP-#nYGFH><l=RadS50quzb
zZTN%$Fe;QQ4$=VueFT93Ap-#cc{;k7F`7A=y4#yOxG{Ly+uitYI~?<*zkUNfBZ!<8
zsb1_sBa)DV_f|`e>jPIcv8HWxFJk=-Gog+0*-q9?PMKoEc_%by_&v{*%%a3jZo=PA
z!joPbl-3d&Z9_mCb$rx~IXTh+d@a9Sigh9alG$R52@?*Wxm1F!&=Q6(UdM|K`@97&
zBxSNc7B>n;lpl^4O%n;eFOU0wrU?n>#vZK%;EUvp#l<c+hwc6zFY2ey&M7D^FX}VB
zET>p=$sDouO)5w{{$=aygq9q<6wQrQL=F`4%OQWHl2U!;+fKOq{%fVYbK%>%G#2#>
z7;rcPuPQI*6`TydS2Q2k3QJTyRs$Fy*(f3Tih>njhS_3@D|*-FqnB{dM6O<GOP6R%
zgELCzq=n{Zl(5r63o=SOYAmrjXA59Hcwva$oXF?OeaC*wIVhF~JZ<~Eg3@}OSsuD`
zK{rckP!vv^d@=p26^`4`uSO~J((48T+`8c;gg_H8%0>bBvMCogkA4U>-kz%pPTv>>
zG(5plY!b{9SQSF<H_2wx-ze0#82Wd$kz%Y`m&r04JYtLgGUV277;m+(c|192Pkh%w
zbQCD0uk+6sjn-*M*ef6ms|Kl8^$$4kOxpH!i$T#8PR3~MDwo3K%<HY0O_99=E(hbX
zEoz;O#h<h>0`t*@B!$Jz8|g$1Q=NHyu6BEJ8%)}D(o>3urlAXPFf>jEZl`L{nex|Z
zKn~6M-y!?`Yirzc<L<A}+ea=^_pdE~@(SvB;2D`K-h$24caGg^do9~P-Kz?cy##z|
z=y&Q{o+*9&55g7VnlSQQ^O%+Z-!!i7=kr+C3X+!R?aI0D>!=!}YpZB$x@bW_ztf@d
zfXMnmPv>0I+5Xsb7|Yt?gc*hI`0<1<*D-|(OIE?h`K(M;Ga!6rKeBih`i#fots_ES
zpE0|k$92L4pa%Rvdw2H<Xos&4vSZ69z!7!xbSQu<29YtoDRuX-yf_g+Y`Qs>Mp)Vt
z%gZXW9-kZVb$of$wp^}~jq&1yF`6Nbw_k%kO}Cm$x4FKVMHqK?B!(Sf{TkOhl=N;<
z+vjiKe_TIjx9`N01D4@T6L8vfA@GhC+U{8czL4aCzZ15YNsaA1NJj9D5&K;KW6C!_
zN6MQiHv$Y`i6RWJXnO^WSbiZUfQiKXduWqfXy%)3#iR^&rXnJy5N9Ala6H}ItP+^=
zRK6hnoi_CI;D}jHq@7Z%w(*gkK|7_&pD9-k;O#y;&&gq%5HKmc3T$2c*LXVLlNl!h
z*riF0S+qZzziXQ=&Ag#`(RAic;Sg{-;1F0zLZIeWk+@MOVsitOB#**^b8-$+xjx%I
zbDXG*8zBMe3k<%4R!^?(T?LK5gZ;n9rhXr-jwsuKS%sctH>^%sl(`0*(-Xd^ua(YK
ze>nnUo{M8X3*J9NNg0hTI}hG1kKi#S1z4??OM%yf0OvZa(YL&UUGOt*V|#I$5>i)p
z=l7p0twnee=TiVaZ-sP5Om<kwO+IKX>znOOJ9YY3`}?J$&uOQT{j6Ujd1Zvvr{FJ_
z0zrPsGw*2ue3|6;LxzX(%cen2S!6-ZDkpwuO9QT~2g-+g85az>dhdA)ef4AUcT4MZ
zu+58jK(BE|fVtwSczqtysQ~&YpfvU{^*Vxa2JQE8q5xpo2z34_&vIHIM{oCHTkw{a
zhkyF_@>M(8LJ<5>?a)w5T{}+f@#p*8O}YJ)JZ9?gimtEe_b8fOSo=3m)_P7OSXZ-T
z%A14o{#++~qYgrDc0+cWZmy-qJeoGP!T}2bq`quOh%)}p>+|w4fEJEkWZ)VZ+KM^K
z>2`g2C>sFW5EVxJsH3xCG8QS0P&kBWIpZSG{g&0q9DhD@SGRbx!cuvDL%A_ef3>Op
z$_1UC_HU#G%XD|g#`-<{5<o9IY~?+2)?SZqyGl|2JP^@*L)v_BKWv5e4|TLhehAq%
z$9pKi@3pwmWPI5=^XbFp6mm3omf~>2^7U}_%Lm|`iAi2F=iZvCuZTey6QQU0Geh$*
zpoZq?_{#2^%bdoCdkR6?f6&};pjqxPbU*0jo}BYy_|;S6)kYO9`*3vi=qcFmfwJ?!
zGNoWRu06))@c|A^Xp@?Me&3~yt#QxwW53xUlD(0TlSutj{}{r=pjG<yVt7<S9}aDM
z&Iv#ed!&qM{kdANpEj)Kso8odC&PQLhwEgfC9Us*X$_lkz$?Sip*8WgOh@xbcP9^y
zv=Eu`RaZ7d4U2v1kMW7aaEggWYdty|s#R_h{&TEjpODP?*)j@o;Wv@oJ}=4@PiVK+
zkFqGm9UWu9`Yc)V{2bt!0&aq~0t0`7We0ejLT9*L9B}_xSFjb#_q>SVf|U$H*{3>B
z!a~mHwFKAK7wQBBR0+>5s6TSbi!N8tK02zytBHOQ9;0$Jz%ZQIouqv=<JtZs?LUz?
z3YCzo2j@M9OW+IPK}vUW^X<KlA>HJ2GqKp4b;Ew7pe%5@zIU2Woa1pHWH={(%m9kI
z5h!k%pvjdu?RKxSr4wsKL_y0^iwCn#Xr7zBw?Y<;D>=f$DTxWgc~pX)CrkL7fGAe+
zww-u5dF|{_Anmd^<x&e_4^uL4((#Iv?JiVYUP)tM0b3zy!qg9X7RxeKSSwSJP0bHu
z-!5N=biFZz@rp&6j0JvH5qybZ6@c0-^XF(@vq}Q*iugKXnG!m9MS_CkBth<%_m*52
zVmqzV@^=9#lDmmD{%Rz6U5>}Dyvg($l_?rjgkPM4*^V&4N%NjAtW&sr<@N3Qd_jF1
zUkG%SFHkGI@K5k|J&67AU$$P|DIK~_It_-R54L`)+#N?*8eUI<JuZ(f55Vx=Q88v@
z0@qqvPv5%`L(qd*=id}%CT;~ms(!I!BIUMnJs7c<EF};rzM}hf3vFa+JydDuZ=Pi1
zk@?3k{D6=qEujxQm;S-F32AyOU*{Uy21CC>qH=huH=n;$`6D~8lW9Q;b`3@2KJGXL
zGofFlzt}&my;rL>;BR3lXn=`zq!c3f<j;ePW5F~~yLvzk=Z5qb5;*i*E#`8O-167>
z<NZx2{`YP~bGH+o)}TEWI(1H(N0Mz7H}v1Wvgja*=eJF+noA~6xb2SSA+j*js(fS4
z%tbVGYMap`X4*x#VU~}H65gucG5@ko{>hd3CdqoZ)F>mHRL$()cL2{h!rBmiJ^pI|
zd`PUGZOmz6@E!fZb`W<83$Psf3@~w(O~<Z+bsy{uE*zytqravrM(9?0{1n_XzKeQ-
zY#=D#aFKZ~`Dqm;!w25Zf0rJ5Nf~AC-B0{HHdt;ubc0rRGGpRxgbFqO3+DkpIXapi
zH0TZ<O+?>lvqHC=5Fky%2$RkIpF4U(J&h4mogsVRJx3Fg2XeZU>jvwiRiGx|cSM<8
zDR3r!M~h`C&{vsZosxai<J)x`uXhZ~j4bV@al)ayUn8Y}OFRW>)-52BmSdE@9-nqC
zcV!4>Am(T!TLazZY<Ai?<(eD`WGODQJzJnNF-E;@AC{0=1`xhk#Cx-JJueFxv#fmA
z#7N+o33dOs!^-DTBKVbQ{6FnJ>Mib{-3&%Uv~$EM!;SuZ|BFPkig={4j^|0N3zKm+
zxqt|?c3|nT=afnl#V<B^M+}CAJXLrPd4j33?H65Xc19KXOqai~lVpZF)5+cqT#p$<
z-%ew9uyybCfS3;Qu0bemFrr@DE?_K@^$?eA3!|>a;ZLWM%wuL;<MKRI_=U<-Z!MJB
z0WsF23Pz#(C67S_w;)Xpr%hswmkBZPvTGqaNGZ`2=|r>6RTL`0eX9K-yQOa~=~cLG
z2`QJUh1@5wpLtG@e{K4PQQ$zqy>CyqV?D5>8fpjSfUK-=*n*P1#;PNwHJ}lBOwc=#
zGl}EdsE@CrW@#jR*Y3aNj^hWz|5=X&PRH|eh8@ZXHU@|#V*2_wVV)A@%>MZ?W3h=L
zX6Iw3k_{@Jn&ISO+4bY>BoR0xpz6gfxY}mlF%5hC$9KD7mFaCa#={^$z}bvbZh(~$
z0u*!&0FK;+S;Kf7_s<?}svu>10NRh{vNp9aPFm6m-;q|`+9%0Yx6soQLwxqeS?~d^
zXhk*}($VW($|D1jTX_JNH3V_NUiH<3{dSx6MQ`_2ZvwDu?#xjrVn+Sha%BNu`tYRS
zQ+M(Zhha!;Mcv`1L$UiMk4DNFa0C~a?BazHfGZEN^qrGH%zM0|6K%%F1J%R6WGKEJ
zUY6;Y9acsxYa^R<5<{3-oA)-GhMMwChXTW+;!w!3KX4M|Z-!8Tvng#t=v(L;L<hfy
zsvI4dU$rAs-(N>iTIjF+5&g|^n`gJvA<b#7(EQ4*`0dZv1WszdZY6ru=|J2>cS>td
zK#<{Z&5E9`D{x{+w?md?3mX&W>nYAw#Dt)`8qx2>z5sP<dYrqI6deriEq|pc66yRx
zV6}_{ZunvV;wMWwG#G~nzGS5T{mtkhADwF!76p_0AQZ|ggRvoNW_P<Na9Ni^l31&)
zT3GL9ueCJYdMRH(+DNl5pC?uZJRJ8AK>6fVII$cQSC%V=aHEnmGO%d{w1n#}(e2qw
z(K&)`xP^X|7I!>GWGY;vwXGaTaa~UD3|d8NmP1RZ%gdo@#5}<{BC$+4UqjubkMYd@
zBKYnYp)&M53Do>Liua`IEI`LfWnRU+Br>SeEU-hAVPF6$1Ul*~Fm}muhj?BXz`)W)
ziEgr$zy2E>PL?Jwd@XpF=m2`cvm|qwqiW#2Lo5_^4Xl=qYZKwO7Q0bZT~^Lmz;N39
z0s2N-Htj0O9Us>9Oez0$U>i>K#8jFOq&2ihN&kWyEHxf4(ZX`tESi1gus#mNTk$5X
zB~7wT=CVi`rL;{J9yS$g3GM3$AX_>`g6`H@Z7{(2XBok^3O8HDt2C;mLjsyIfkYf$
z0cmITw_j6;WpXeKOJrclt~bKkKoY#nW}<=!bXmTiIGpLV;@E_Hl$UAoFPaGy2`pCI
zmUj<JAIGT(iRDK)MGCP9oHd6qgPX7CTUzdtYb3FiD!%s+Y7h5946Az};1033hdp2W
ze4~}!&ixvsJBzh#lGbxV6xYEmhSQp?Q8CL9Gm9M^p;d5erg+nTcKu4NN2!Un+c-+q
z*n6H14w{@F7;zU>spE_P4Gaw-*c*A3AGi`iKR>uMR8)+(G+oP?7DG{7^rBL&&JtcA
zrbWt0z}^b58i;3ICry6>keYZ4^Ar5Mwl=IRq>T6HE#{gXonV!1Ke$0E@!0`Zk5Cdi
zWmy~8dEC5@;fcKS0_rd~z(9H2s|?v@re}dP!N>8=V}(?rH|vyQ86TK=B##|plO;gs
z5O4+wR~U=X;a`B#c=6M$4E-gtGV`_cl1(Df6XP#q?J7g9(oMGqNVl?e2+9vLWxi~H
zT6J0TRM9UApuJXL7!^V|S7ctrYiB<?M^LSjA<V8M(gbTrDdQw^WkVR&O5!0A4~>nn
z$Sw^cjmt9A*(imF%TK!sX>0Bgi@i{RUWQ+GX6N$bX0nI{hVpwTtYg=4L2ZpB_c$~4
zFdrQ}%R!MKgJ1>&&Z<|WB5>ON5^LJ-2O#7Ix6Wj!9{T;9-D$ns-J4?`u={MrWS%qb
z?O=Yu7-`w+1c}Z@vZXbqc*h!iG;tJdiEMEoR!b-okb=b)RsV@MIy|(nJ+2Cq-(7Tu
zHjNR9e(CedA)$&Mhh-2BH-5V-eP_67?|sH{hOU7l4`ZMJl+hnQdIF#3d&h!Vt4S_}
z*1_*I%`qnJKu(@{$A-2GugZgWnP!);MMj1?5kkF9n5qp25!w#4(gCN3HoR2EDLi3S
z(nxeEXK#9DSOM*N?e)5v-r1Z<PIGF9@zLdTfr90%-0|mr?n_Lkka{pl8Ke=lax36F
zCaA`cMFG$Nv&l+UsAB*2yMGYMWndsT`Xd1J1VoOG{6clsyt{YnpJ?yLOkLt1xDwCS
z0m@vR=b+tsYMSSB<GAAr>kbuBwG-amt3}g%9k<51=RtS~Zbf<&#Fm#swa~JeCwyZA
zcOR+F8D0hQZ+>F9r7B}(=PJwgM^xjqDl5^Wsz?I>Han@kJ&+gopZ1`z6&XgyAFsXk
zoH`z28lvisD>G$SRLMG?R_V*MRu_d!SP8?qU{7@Bv7k^d1ys&X9kZd`7yg{7(re*M
zQ%#DpZx7(rBFqb+b+=J`6|C@5%pf0Sfiev4@GBk&ExYCWR8uy5trd5(%*-J9)ZSOH
zRT30{O=dPM?`uJ#m`a!w*M<Hw)EEOrsr0solsZ2FFjzK_jtW2g45{4M+FQ62VHpMY
zxDA4TA-o%+%tJ(Z>Pzcxd?h&Y`daQ%<}YtaH9@P=st`q6sT;f;eVixkDyyO!YL^&o
z3Qd#;K#v4yz8%_KnslLoZQiyCxo}Tvd`%s&onp*pP(3Wlj|0rmz+W-Fxp8PM2DIl=
z!6V}a%8hgXGkd6?OC8q!ooN3-E5KSHk9t*d?C$_d5Aw!PoQ4tf81;l!StkUgsY1C9
zNPy7&rI%ZYwkj5@#R4uAZr@CnhZp1>NOA8je7junH0Jh;m;4Eh5YT4meh|LXkrV*f
zTBt+8(I6-wh3B8W5*U2mX2YPyU*d$`W<!UHD7M01zUq7paC{#P{e>Q_Cd!$A@;6n4
zM)$D8**;Pl=J>Pj({#=8EtB)S0laV_o(pdI`}zCx3xO80dd`EKks5mW?SWYqeGs_}
zztry^%{s#nc_b$tBA3M~4Aaa@-VF;tdv31P8<QSmlfa;rW`Y^|6p}t)UuKfmM!tl$
z4c1o<L@a~<L77iWBBUnOC}7Hl{PK4gf?f`t**K~9L8VkZ&HgqzqqGI`IO9<|LoO!|
zsP#I(0Wy3$J`Ih-1$i{F%k2oZ$7AVenk+slm%(9e**vGSsA$CGIo8ZQ8TbM4rUa*4
zFHTNqDxim6BGRk^2DHS{r695vgyV_XKY*<u?)db9S?pAoK`XZ5q4nWYwh71Ef?aom
znth5Q;|lvr#A$)&XUrwr+0pyA2mW2tx7%@$_i2ZY2`UIOr4v9#nao+FJgJ${Znqsz
zMxHlU<E9{sm#<Tj8VzdPM#KR&Babe(Jul+ws?w#2=uBCZrDzdK0*Opw7PwtddRh(i
z4WW62d1OQ^Qa@%mp0l9hw6^C^E%J6hvRJYyp>26B?#+H2fmz)tW`NW(H-~TkY$nqv
zz+?&o^^59U(PtT%namEkoVLo>>a0plIV;Rk9!`Wwkae4%X}LK9zHb2T*)lV&{D|&-
za53^ZDzRo9mBS}w9C`@l&7s&gJ9>&~m4X-{6ZxHyHVDpqd7@;cW?l?D0F<bFYw6+<
zXJPA$M|=>?g!Dw<NQ&KfgqU=bF`g(E#VlntBWidHD&z|5G6`~Scqs);=aw-=JH1^J
z#>a%BRWc(L*sZOAWo*EFp2AjU(}baE_fXYjEYEAdxv)RFE8W?<qk!Rswp<%psX;(E
zBM<>D=q)GZ4t?Jez4=2_;Sg7J>g4$IFwNvJ?HRdd0ij6xc~$!KwbuSc<?$R4o&))9
z`Gmn!kuQC8O?D|!V%^SwRCzjZ%bqEfbhV2rv)|*eRjbn?8x)}PVm9rM=AR%o&G&fe
z3&_wP8;n@5HM>zf^F#m4R@B_MjxJN7`kAIJV(}NOY$Vw1iNt1eP}xQCTr*F2uHyWz
zz%p_8^`uMtSBdVy0hS{qSNuUWuyrJN$OQUJcpINCW7AFxPbiiKfyxDQKH_zz3QNyg
zIW~M{(Gc_bq#}U&N6;rVYDSz4?>c#QDX7qi%^eZnP`fC6y$oAOMY#DiTMi@<$hQ@W
zjW^oyQeG%8S#>^zGPLkOxJnbmDp@zlvi|5Z0R){NKHSg}5|Ii*msw`2C|^%HaemcS
z#V^0J3IvQ<At8H6VqB0->a6`8Qf+p#A;F40kU3I>@G3y=^>JPp5fmfX9dWBH_X;mq
zk|0<VtHDT}9h&(BY!o<h;3qp2fJWiu4sVB}uw6YTk7Lt4`@HUDaVnyzN`K-`lkRe?
zeF@r`i=5v^nm<};h{kI}ZtW6-h6!!X%yF~M3V{h}M;r&zRsmFz8pj~}FPExhW&{m^
zKFy!IF%H0g(ZikQn)k~eiv(U<I{NR#RrA0v=baAvZrCedfgof1b3B@m`e)ffhJf~r
zWKQIc+^;w{=JmY$R2$iN>TdqyL=pZ5hhmL=jCnv+-{`df^m!Im`<ZCc8c$(Pl`&uL
zD8leP{%_sb6ip-BaEZBUDX&=#K@u=JR#mO1Z3zI5(X^IHItFeXr<plxC$U}B%y7>-
zUH@!n)2&jVq)pG`{J*ptEfk+;q)Z<cn5boK{(P!)xzl8+!G5buii{S0`H-rtRX{_S
z^;UhE<D<Idss}SY)T^>y0hw7{rdOiw(S3#bNp5;2DA&h9T9G5)=j`)mXy>9}7S*Bw
zRu^FKbu$}Kj>D|q%XXN97Op_hVUz}b<!{GPmM&vg#37TenxGeWoO!j~yt+TdHf)2*
za*iE;NtmgO!6K@1=qvRj@J4C;I^iufayT7Dh4st@y&hvfsk`QfSyLi1+XhdfZ4IS?
z(uM$9z?kM2!^nN&&xCdqKa`%BtbiTeRR$0(e0zm}a7_Qhh3ouh$D)`lbL`E30huW&
zMx8EgOUZ4d^1?RWgHf%-T8UFUHq9Z9JWzc$Ma`{2jV!eQYIKGw@>;A<<+I%=m3oek
z8rEi$;Y|pXr|o!4MFQf0zyXvI$q;1k)Pj0l$-bRUX&E7@N|LwAn0KPc<@)E(QanJ(
zosV!L&SmsAe@{BXOK5po^;!n{GTE(Ta2et9Az=v3G#)-kqsvJbe(&7DCg<S}!Qh*(
zea)l!oUz3R^zvsUK61{9=uYwGL8PdC7>fNVdMWaBvudrA6*!niU4O%atOm34ww)+b
zzo8tTVP0L84CEE3Hcn4<o3&1_KN?U%b-nMtZ4-p4WylR>N>uQv6&sGL1yU5E0fB@v
zUNR8i>&$ya%0%>Fa*+kf7+%8bWLWV-lPZgE!W*wH5yop?kxp85CsMW5JN|u<;S!T{
zE9|ufeyUmbo+AcSEqOiS)M#$)BI4#Km7@?j)(JB4$Us2wH4nJ&d7lii>jDrn=Jg|d
zB9motLpv6qM!5;VCi|(*y}}*`&}x>}GSd9}X(<g3GVT^iiTN|^&hf{M_O&(G)?Cwe
zV@cf?=XXNZXYpe3zl^k<&3R$YKzIBis4fhz<c)y$03V0n0_8nUt0R80n1^OfP9CBj
zckATPN|ViNjnSVRuP5u^83?fDoe~^lGTXm1f2GBXr4=vDyO%`wxf#RLp~C6wQF>z@
zr_%|_D@mRn0(Ir*0$CA$28=4pYpE!_^$o><Z1{D5=q8|^YqUlMq%+G+aARF{DNRDK
zb)Y@Kpj2=5ZnvAf9MfUBMYSf+kFG$Z#BVhX9TTMPML$U0Ra~{Rq6CoLARlqNk@yI@
zt|V7ioer_<F~H`7k~d>9o$iPCSrXe|R*OqNb4>GF;xC{J59PjbXIosO=eH#ZbT_dr
zJv=Wxabx8EU@DJ4K-*PTMSV;l8RwLLhO1z3Pj>T5iFb?{N4$84h&1ONp=nkVBd+D@
z!w$DK=_pulck`?6(gO(Tq5BBg<oB}AyOVyC>YaW`qr4xF@8zCGmfFts9SR!G7aj}!
z!JKoEz1Vik7|zs@uy(k~Q&Eek$eO*nR5DBUA7-tp7t8c<sZdRVtVGz`a~rkAuE^vz
zq+=V6sS_{}{8#5&GCdyvzu%mY7tPebC+pya+wpsP)ur)9+XWDR?d#3%4LP*}i?Zal
zId|}+S!8k+w}7zbgSY2<Im#?Yo@Yf$g5E|LcB?wzR0{}kBit&V^=-?laOl8!D4BIb
z;!u4Fc>D6%ynVHLM2ID~(TX?sF`riB^>xBGl?JW5HQM<kYh_D^5vwu07f@dhOrmT|
zIpHTtqhs?D*96oCTbCQ_e<P{DTXCzzA`C%T5s8O!dK|n#2HtH_+zI@&*k&owy8C8;
zXnzFFwrI`g2hpq)%AO#dFtuojbJl~<x4EB(AN+kc=w6z8tI=jZA|78j4Oq?>_sxJp
ziwC)$_B)Kjyd#G3r!~lsQnk0S-u20su9wZSZ*^i2mjozzt~A+67A0!*c);m~EqHx$
z@9CbN**><r9PGHmnq{$Se;m!Hs-Du!h&i=X1X<K!;$eznc24-n<C4ah;CMt|GaO`c
z=$*BjETCV{V7kkv)g@51$W{B!+t`>~8QtGz*|7UsDvB<x4cQfx!z^!4(rjl>6x^_0
zpGQPE;Q=DSq-wmo=LaR!uBs@U_Ij?kR+MkNr`BD5W`xfBhHIpG$jFOqY1(S%@Qnj)
zt<X9g9W7q<lb3GoQFi{#3>kA#{8(klYMz+NrdngYh^V14@t2EmZwulnchY_V6#Aex
za9z-Usdh*%tHSMH`zh#{1Avczxqf651Gr*RjsYflrG8r7(XgVzJ`Z|G8WYpf@tiD^
z!bG?!AmuaH>S#+-Qsb_`VRN=P|741T-2uE&%W9o4V3ll9hnlR0MX>C<w}RKh+v;$*
ziMKBg@L5f6CY))N$QhL)Nms4TKdfK0ipv;!@8-M`Fzg4f>9V*LG<UlVX&|2j;ID5D
z;D97`W+H?I-~HDI8L>9@O5>&;Vy>CsxcJV>?~fc`I2n5T&3%N@{@W`ZNKzBeM>eTp
zx(=8QO(8az=#iS<SudO>H7n12TX?N_Qy!O&1@7%uEkXtZ!;r<1g6Nr)Z@NkpG4(*%
zlwWrWs->T+q_bqo$|I4Nt#LTCE<O^tbN~yjc^hVyz4?X^+bX%(`9CEY`*x1qwwsBh
z;p=Pn7v9WpW{+6@JbiP>YLZTM9xYo_3Mk@5`qpQ14D_pPaJ);owN|pW|D9Rz^%>~v
zKy~@$gJYr1q~Ui;GB>1LIKnwqaD2j<Kgih)i`G|`V=+l8cqbw3^7#%KKqrL`5X7M^
zIEEa3O|j*8<w+=d7a$DB?=}=D09@>if;!zb1;v&%wfnIXvGvvcPAb-?qol?tP9qQi
zU8WC@F`yiVh-mRR^i1zk^U-BXPw4@~iEFjcA#4TpZv;~{MroU9IN&4aS_Ok?h`TPV
zLl6wAZZx^YeD;B?>Lc1Y6rw``V5Nfle5i#6xaDconzI`C(?lVP2GWmyzDJw!s^RwA
zKtqH0`v@XJ+qqYpNT}RN|E7F2L*mVltZe@s#Ms`~ld5Mkof3+>!eUv)L$G1Dm_gkd
zSUUs_Z@)^Upd@W#AQV;ROXfL<y86R>F;|mLZPR5dKF17A@)K6Z$YR_ACg<`JIOFr`
zb{|-f-N4%ofZDm*Alje&d5}fs%YBmn@7Dw=zcSB~aEykd%4))y7oH39GvySG*|4`8
zD&@zNJow<?f(u;r@r=3q@i<+?zjY5CBDiVHq-S?WyJGZJKE#2!;z^{7%7rjT#@Iuj
za%`bm2Z6p;Yo0RVQNWhrQ1RyD>v6Pd&DkUV))x>W#h*~W<yS7Lcaeh^zT5}$|LRF+
z#di5%yY;uikftWxDivE8RS<}0O7%BP$Y4pWNQycaqm$wfPOYiYZJ57MN7L}ViVq%m
z-50B(J@;3HU|kd5&9x(?+>2e@jRU=Nhg}*FLRH}UN)`{%B7iA05PBOwgX-$6ewiks
zaLH01k>akaOe<SXGO+MFp733K>AyJ`MpmVbkMHSpN&0{I`gg%+?k2p%vZQ;U+)D8T
zW#1b^pIDI5ACVSaqj1023BzSDmY~(hP2Umc!ym49XIZJxrVX#L=n)9EKK)OEVn6_H
z<C^uI+qwjcQ~)f&te)}92p8G1)Z?o#sPaVR%J%b`W!V(S`sIsVD~F$?_UD)@XzPK{
z_*FY3Jy0Ggd)-x;RU`I`5(1o(=U?4({2WB{q(=zQyFU4#_c5VcJqk4_{E(hOH#SIe
zRCtSVj}qY8KVE7PFP`mc8SRu36ejZ$z4y9+WA8<sV?eS-9{rU-?)>=)toEQ6dqj%M
zZ(AaKPao$roQfn*RM5u3&gCwr2+WBssuY9b?sPGXx(&$vt))QXQ%5=96LmR&=J$F3
z*Q(y7mVNWEZNmjx%Hq;r`KDBlJ+=B(L{^*OAyW0Mh!MtG^b%;dgkj;7L88*lBbvwa
z`hJoD5&#AyhipicLP9O>QZDssnq^DFq7Q_DMo+FHW7a7Kv)!Xd@*x>evrsPuO5-8-
za_hWr>qY~sdS~7Ovhkd9$!Pt+{;<sTk6li5ExL0axtk=B7*fVRUd?s-Jo5f}`_#3C
z$8hu<N?_G^wV^i@&#BTBXq@V@swj~|FOwZc9)O?RMmotCdi)-gB1D2iB3Z@Af|ZHF
zL9m}K;{qa(*pGlV20El{dRp)&v=Rlpm`MKnM47Cp%UG{yW|@N4`^7Jf{Xzt$cKxK{
zACH-ppyZlK>5v(7S9^cJ>(-pOIqEX;0X$DlKVo&!(U=f=4u;|Yv9SPOW<Nwto_0#u
z4?t`yaVcDH6uM|cNm)AqJ*>r8lmy;7w8QI}8_a8ieISMK#=%1CIe}k^wh&#_A&x6O
z&S~Rkkhc5z@Xpz^VCV9TgU2G2VsQW57$r6geoB7jBr5&Yow5#_csh8c=(~J3$-|nx
zyG6>--8`R#0EECV=979qZC7PgrZl@41n}=w1J96gi-OgH;oA&NZblhnFJiNpO@6=k
zKPxAuehcACX)B@T{-;*B#~y^Y?$qeJ^8UUIG&HDn!{BXeeJ$NFV>{QD(Ib<Cl9NR8
znamizx}iwZciE33lr(&f&p4etA#OxlJgV3aGUp&$U`DQnWL_f)Zn&>K+1g4;0H8^)
zubs5PZm-#%#|inu+dxZ`9Y0W#eq2;*9s36P_zMgK^!t0GtLwPUf%ZciY?y5#RMbsp
z3SF494rF~zt{q{#5kj}fp{f0sj5`D2^ZuBadRwMuC7#h)<ztYAkp%I>|GY?)``X-6
zuwci7!m0Q6f$_0hc8Mgzf!CP87~r?%!hcC4_l!}C&28PM<O;I;X)ss!!MSxvA*Y~Q
zHKY6FNC4NY<jIm#!u821F!q5yIH{f_Uu=^7M>h2ss}vjol`>i>Kjr49Jy#=wTe|-M
z?+tZjFyvsJ)CbaMe^T;fO<Xkh2ND$1&#RAyLtGFUli6JGBQM(3cZ<bL8xVeq_J-=V
zl`RIIk>Sw+bwAmX$qxU3A8i>&Ad{RxOc*0KqO|5$_|9<RkIELve3kuKLN$@;sZ;|l
zZNbmNhqsyl6jLiB3Ql=q+qvF!*B}hZH60@h(k#RbEpEMckz~fBfVnjdvqnx%xWg1@
zS<2W`GGm@;f5V6!e|Vl~0Jy}`bDLd}>&usEEyWr0i+q|RDXzsPA0W?DeD%|QcH^ln
z@}w}v$Y1tW@4a@r<(QDMg>};uswEeo=a3rd57SE;$boLM!xSHvHYZqKg4<SZz2a-y
zbw^u%Gs+z|d7>eNAF@^vl3ieD-!&G2M$gehe}krB?n0o>;;*tw1>B1yJxOC7x<N@D
zq)t`p$XQY8DWK{gE5MSxKk~_&?;}e?-LRL#e5PLMsIQfyc@4Ux#@w4DuJuMGmMU*X
zHyGjirAlJokyc_6Ll3u&Q>B-2Cr<>fn!6s8hLye~JuPwIpWc&C1zdW#G0LMLtN>9?
zN{5e~K*(^jo1@HK0)&3$oWqaEIii&Bpz~E`jm&i7%3X|fWD4Ke|25z!j^-1fDHceN
ze9J)<s;q-s)t_}xMJ(gqKNZ2&T^}QR>Pn7NKMs@l_0PCNXAgv}Ln~^88G5>}D*G9e
z?IV57LsRVuk)f76K5>=7bQ@n8QS3mxh6H`Hz7TH0eNvd%14!0blK;x>TIIMCWWzVb
zMXGDe4k&jal9=K!Oy^tH+o00vYF2U@7yn8jUk`N|>Pa;~@5ia_Gy6U}>~6G}ICHRO
z>gqSRaVlV?3^XiK;hA$*xKr?>y)_7LTkbe+b(L;DZN~r^=<m#<IiCmhQS(MKcoIJ^
zi23Ob`p+Zp1EQ1o*+DGU*9cGY)<(2jZlKSRUlhyfyIzMT8zaFALM%Fo1s#Cs(m4?W
zwI8E^yw>_;fb<;x?WwkvSzt9m58bc<X@Kr8oO0ZJ;<6^)_-+F~ls(yT^G<6a7&FA>
z`y3*5V#D;iz?UsLAs>Z84BVknGT*o}LaX9D-to;W0pv$HVu?05%l8~^)Pn4aCuv7q
zx5M9dI(iwkz)PmuDfhcfzM_74$`tJ`RJkk`hh-LzMTb;mt94{B>6An_!W(!gZWO0D
zsBAyu9eor;H+P%DT{=bZaPG>`82LIn5aLg^dfbW~BZ?fatJBZ2gB<_)&ZDqby=b-C
zpa3Z~14RCfv)Qde8>n_U>RJcIA?*=Of=c&2f2o+w6CW;<Z&JGPPQO3E%@a}?(hid1
z_Ss#oIV61riX0S8Wn?Ri_n;~`9BAjeBX0|B&mGI`P7cB2UOW3vS~Pdn7WK@90wucB
z`RAi$mKc+KkY&dQJ;*k0D>6)FBDT<Bw$^wv129`#hD~U$oO#<>>q*ebBfCsqhN$na
zuxa!gw>8%5e5Wi!RxBzA&VjR}F>SPGl{TYIG6UYwwI4xWcE00kKH0^q_s|`o?MBx?
zmR)jCyD%Yg2uoRAfB9xMbt!23LJp~dY&zU4?;xJ}jrT^~x{0Wj6S(xe?(e%GN0sbn
z0Va%;w=4WqRh8W=Ar8g_y|p~))gi7n8_nG<ph3%e<y1pfBSXRyV<2|d`Nxh?u-Vtu
zUG*Dr<lIOMBd(lH@-j8YdS62A?wa;g&P1tF>ytk9_a15~0;X-JUC%e=-mT%4L7J0z
zy4LwJ2qBtIWlzEJ<4^3-&9KxV;qVcIfbjdyeExTWS(cYJ;`?u{PGfO;T8;++CvBf8
zBkU&3iG&{!B3?Ar2gFvYXUrz|X(l;G?7#7Kx>Gf!km~ljYk8CgDsIw#0D19)oWGuG
zYm#oTO0OW9n(H(gEt({1f%=J1Cyn}|&tLpg&xvV@(B)O>`+FydgSLce463m_0BA#~
zh0}6z?&xR(^XGgO_72m~AuRI@t3Z}ii9*4lGS?SdX>CYV_PIGzXD$|^60KW^oP8#2
zgTbwXR?Sfhg+kWg7Aaj!*gQDFa3WV>io`Li_N*2s5a%rxG<cb>f#9}m4nZ0rP^;8K
zX9>C>9<;lZjzFfIxv636!6}nAp-8fZ+M|0Cjm~Y*<TzjKAW_7&<02jk<Xo_U)D_#m
zPRKzwUnOrPJC3i-iuC^#iegy*H2>eA2nwVm3ksGZJd4%5BIpZ(u(y5i(gy+rbPNjw
zgaVY(IEx0DNuPDeVL}?e&%5Mh>f!~lGmVJKlRj=s(Ji+o6hdxV1oMw2i~W90V={zy
zfS4%7Lz4RU+tR(nu(MmBb%r0cr1k(0<=}UK94{{NVGJ7Z`;S8xR1tRsH5FQc<3NtB
zV?W@>O>@MT7!EVsYM!Md9yW@Th+Sd~$tD*i{4YG9SPPo|^$Y?QVl+UJIVemC8t!|5
zv7iJc)5;#xPwXp_t-|S@EjFD>O{)=<fk+{V<z$5=crlT@C+u2)Di^4UAY7P`oiHxC
zu(=9SM-D{0+Nb1{Z3+Fn$hxFKQAeJ1_Os-LP34}e@dp?)*@?FUGn&}ca21%P#K4ui
z*(eGC=l=(r-E#VGF-`~-AkQdCogIurQ36#XF)GyTxuh%-egZv#_Pb`0clkJ`&jts4
zGMwHvqdV-xjK$uj76+v}#*flz4vN!!rH~{muK0kbw5bxoj%F62jQ!-@04ScW`W*c~
zw`lWAW8Xc^(K0}Mrs+H06mxoy3i@APH;)*g7|Ud6-*zpX$v1dAj54eYb;ro)u@cxA
z5y_b4!Bm-b4IT7|qZ>a0L9RO6brXI3kG)Yy5c@+dGrmxAf=KA|7Q#B0cSI>_O3AU)
z3xROCI7F!wr}S~8S#HQQgr`NG*Yxms@>MrVr=9g*)0XnK9*jFhOR#F0IfuaoLe?_?
zxA>BVe)w@YC?-s=*&0cXP5vxK{SL5ad&C_3DJgf_w?qA|XtHmeO_2S$<Sea;YdS_r
zlo$;5pTJue$pDO0)KYZ@6V6vNUd%zikB1j$;3<PoY_>X2b$tb!U!0Tz+=I`bDMS9c
zoI3o?Vm{Wqq~ssbP6_o{&cV30=u{V8-V`Ex0yc3VhkGM-=r$Zr+nTyEJ&M$~t>NlD
zlWwF_?+<wIfa^}c=%ZERCyMwX;P_n~at~JIT--6GK@bDM0DOYC|369Z{wHZ<pp?g1
z)D%N;B!I_P>3=f5>i9o04kWT;MlJ+4+jQI)UyH!)#Fp+{feZ@zP1p_7zr6dQLb)Gk
zIh3hWaylkWkgg(Oc%%LMx$e;-l;0>OL8hEsyAXx#*8lVGlmRg-wxnssD=?8_Mzu?%
zvDG@V@eecV$PSc3D~pY#V+D%Vtw%0PE-gObu#xaxoN+ap#nh<ZQH&r`m^_}Kdyz!m
z1&Q~7zKnS>9UoU>0heV|w#O=D3{>dgkjtu=qF0&qrp6}70WxTy3d5Qw)@`(NlWD0#
zJ{yr#eye1ZN#&X+>J?m*I)$lIRR;+c@InAvwBO_gc95#|GllA)IPljJJ>2PoV}Jyp
zv<k)?<%4>rRS`*^Qc+ZaKGgyz`(3fdyFA?7XJ-R0+hq^CP0!4`HL@X7-92(gw@;M~
zO<|ABUZV}-thO}5S6dx|B@;5)5sW7QGayX1+QkRYQ?}JFvwh|V2j39$ak?3GV)rpV
zGH~ydji5~1mHF_NpGFSi;MDwBxS$6B<Gj%FqZ#M`&s1J}G*@QEAO~Hh_)o^3a@EnU
z0_fw1@<t)?><_)nn1NK+VOWYZyn4qcm~^O{RCf{8b5OkWjbs#M3OJHx-*~xe9Vs1=
zo?X9sD*o#<vbZ?Ec(<L@^_`y!mxDAZ&rL>|^VrWQDQH!7g@?}uH1Y<h4Nw4;*$}(O
zXjCV~4!1h$t{bh`?q-iXs%O1bk?S+w*=bQ<nIKaw8Ma0lQY;tF05r5~6{NjzhdXQt
z%LK*c+rQRP(aK)1I-ER=00o%+*u{DDCx5`*d_VowANcJgx<*V^@b3tZIEI|s<h4MO
zGZYOLlbeu3u)`O82Fyc=V*>it)zjqX;3I7wuUSo)ZKo`B#>9-bfKSbxd<To^+vDZo
z-=kM`NC7C}WzK8Cltw{xz^O4U_2z#<cK%PuNdIrj#md~+%-n_fe?u-M>4uKmL`Vbs
zl()QE0gerMCGxct>KPTf`(>@4Kxk4kHUl6}j>~<Y2-{rRz3Oe(kPV1;<IdxGot^xV
zd>hR69m&s31mea6WXh@2vwUAaZUAOjP}9Z|F3sfGVNw9=;qB3JM2>&9GJaqi+hrfo
zGgEV$6fz5$DM(Jzff#M^nul1bkWKGd=%3ytG;(FUG{-QFP;5|H`o<k&)HN=b3yET!
zd*MxB%1ARUT@NniqrF7xE{SFiDr}%&d<th=_Pe+)vAHS?D;6j)jaI2;;}U?~oeLJV
zbxK`$(ip&g$quX1Jy+~AusT>8OOKYmAxyDX800#`-Wm7+ME7UL)gfUZmVqC_^@C-A
zWWff?M9vqrE>S7<)bxtlhQOg!&h|S-Vm~Wi<DdJwRYT8qQ^O9s31klLwYxj!zWNod
zcw4Zvt`EF*dI(_}8#ZJ16;b$-5z}+xt}enx)DB>N8`F7Q?bFa&SKXKkxI5EuT;U|`
z)DiW#LX-`^Xz}8I&$N#$Snk2{P>7!E*-nS)<6~e6cn4X{@%#|01v_Yxss}H^eWpgf
zs`#k$`(&f@IL`Z4CM(eHs|cB?W5jjtKkR8G+2#N)Ledkr#!+kz`6Vur>-ItG5Z-83
z001-RjeOOzwrw<OY+ursD{Z~E`}nWX>ZG>;)68eA_ly&;x@O{EW74#-d2TJRN(`Yk
zFmo_H*oZmzQ(E3s7fjnXk@lc!okNg1D{v?Z>mc@kz+-;tqDdPcP6S!%uicsygH=Q+
z)eeXy$7iPK^lGb~T(%-~-D7))U8xtfzkvF#8-iPA$m%8haKH#=IQ25I3#njahE3n3
z9r;RHdY|SJ4%U1J7}N0B9(H^+_gT5790{X#*Q6zjTCtL;)N0R=sVG-&g5vZ6vh1-(
z>aMga#bxh-Kx@pr97`O1@gO75)_Vdvo1$LBzC&Ft8x80*2E$B@;D1X0{r%6Uq;v|x
zHyg=L8-Qn))=Q+MFjX<26e}3ZK4y~`L~sx1Q%AK$NtL8HRpA5FxqU|TkR;Ac&!-3y
zm}a$wFB}AZJ_FdZ;w42$bPAJ|`3MOcu>d_kFBymtSpzD;*;v5f=*=_*32!QEtkWnT
z1e#KMjX0`6?Xj9tL#g*QFpm*s`6o41No3g6QG7ae_7TVN;j`oL<<0RXDoMGlgKa8V
zGaDYVE<66Q-~d3({u-INx2iEst7ObEiiwfhjWj)+?n|*9&>j5b@f*gYR+_~9!G@#O
zUC`r^*<<=cs_?9Kd{`iSl?*D;pI*~n^u@_H^!K~;ipqhV#+M7ervny{H+135<ML^)
zGW-be^mD$Fj#x^*$3%ffg?H1zTx7IaakM(iBPBxffH43$jP?y<F{`f`wJzBrL6oXE
zjfCGONC@g~<JB|$RJ)oH>~2yl>0bVQ-B*>LM|W{-aZRXGA)KU=G%0@Gzc6@ZLjDm&
zow}z&h{QbG3m!x4YKaK#IBx_=L>&#g1bT2Zub6C=y<$63ZFrglD3Q3Ejxc4?&2rP;
zakT<(`f0#hWU-z}U!^hvCAqPhiw4ei@b{n@NM7`?u#I+Gtn?JwPfEf3fKb}Oh<Dve
zl)K-Wtgc*)W(p?Xd};VumhraaY6Y^FyK6*zP15ZaTa&dfo05{6@KC|aE<0^uR4_HA
zV?CUCVe>JVed=&L)(&+p+Pi`MUkL))p5POQ2~9vx;pn-96iBQOWdKR=Jvh)OTz<ch
z^&X*Z&yW;HL)`s|oaR&&*-N(5+&eveA;<nK_ND_fBqW%0Pk1tAF1}m7pt0J3`j0}u
zpP?UM^9#5=e!QFr@|0wCOUo<DZ=Lf~IK*U;%t1pZm)I(M%F0{v0NhFu-;wwmsw@N&
zT24TwglOb-mqG)UM3Ea$tk<hc=Ik^6K70g{AWSe5wg|}fn;fcdkk}tg#5zi?4p_?t
zMYK-`p3FRJyU!S5vRAxyg1@MYpp4RxNh{JBdq_<W-xJt+mnO!%KSnE2_#cx@PyO9_
z45FTk?r-N4@<$NE$U8M6^MpI9LVljyp*4V`1!y<BwMvHSET6kdf}Q^gnYik;;=xt1
zsBAjbkbg?qSbiGFRt~Vkb5IIMb0}C3%$7ikM9e#bO)Y@*iB@ZfiWD9-5~kUYy7SwY
z4?<Kr@C6GxR%W9<?sM7QV+gpaw#&@b@b>TNpwm1{SX>s(a81Pz9Rx#gbo{(ecoYHt
zJ_xMP@<N>dwX@|!t*KKIk`iME7kZ>8f$&J?{PvvSuJS(Mth#RpH|4PsW|*~S#4n{Y
z(H_)?=9}@h59`Hs(w9+EX~uxxIxI}<k@7A-$Ie`v_a%Mw(lIp^W`s##&}<Sg;2WU)
z1KM4HOY@taO2&73tQ<Ft+9E^aqEu1^%P~!RQB1DJpp6QA)f>JRXK`rQXFGdu4nA$a
z!ai+x*^fD5yHbco%{?d#>;I_cg4ScqmMb^rfi^y;Y$T+ojM>nx8=`8+WBX{Q1w0qr
z|NB1?xcRs47Yty+fJP>a00bl!0tAHk|H81Vo41|0>;IzgNS?IoHWx<Vy(;@}Q0ejv
zandP!o=y3*^HG$oU3>Sb+#C|LwpB`KxUAh<J)vC*5r6Oz=wg<vNs=F7P&;q}Zotne
zxoq)$3l;YKJY{n`WJ=^2v!d3Im%ztAr<b!`02vK!G9}q5H-ACTlFQR{ME~#Y`T3jq
zOZE~AN??y)!RUF4x_a%tV!3%w5jOSy6Z`Dw962M4N>st<F&pWqYHtAQvz<Imn-O)j
zL3souWI1XGb-2>I%cRM_sBw3RXPHSw*lZY*`Dt|B4ES4bsM{>e$*u!tdfCNGy49Xo
zKts>yOgu1^sq>(0U(H_hTqXu}DpCP{MSqhUDAyn`0`LJ_86(#i?{FrJbj~me-g(Pu
z!^qJ)`xporJB+i}N{i?Z<tV*Imf9ptgsmN0T2l!LtxBC8$*B87$!M>I%D(p3&p+mK
zaP5*{GCnF41tjW*FU<>;pYop)Mw{*%K=7BS+f7JhUFdkhMe>TZ`c%QFzi~je;Z;9v
zzNY!#ul!VI)AJPEw!$!&5Gw`Pw%kbl)YMh+$%zlMx##g{@n_jiZ}+4Ogs2X_0zI_Y
zlEwAhC^ezt?GH1W`8Tl`J-mm!lJgYN-pa4$U8fzp&Q$rWt@Pxt#!ZQ5&J4_L0R5-y
z%h{8HgHD4Oo6YE+-oEr;<z?m1{?)I~TLzDFuK^}WG~-n?z+1oG%D^UktNz!qv`lE2
z1Q2P*vMw!uQ#y@HAh>8|5QTr90=g;C_;~%|Kj=k_vi@;WUNAGpJ-dOKPR7=bFr!KL
zXJ3r9FP&}E?)O%PoUobr%$?x}Ai%?`uAw-6@+>R2K1DKr@0uK?x-T81Mxft3JDK(l
zz}=Xk>XHo*kD57Ow8Q+9ogjiI6SZ_@&)K|p+06svUQ|rzUUd8)DgUwjAI<;aDR?CY
z^Q@U4c^W14cID-TBeXm2EJm7r48_4Vjx1{xPpY<nCrMVwjX)|X>53N+d&aecHdyI(
z^CU98nSi&qH@_<=@$USF2pzEVO`3w=jss9^EwV+n@Mh<kO3&5guD4QK%y?u=hE30}
zhCG}UPQVc6!3HX3&B2b8TsA2RxPL=JFZnt4Cco~EWGp84tr34@?mA@qRZ#6KLzYI-
zo(ToTXsLpYknr>CDwNe(;434>=fz_)=Z<^g(FJ>$W%q^~EAmFs@`q=ZQnA9%UIDDi
zKtRJDtYAmM3iMg$f=wfG*5K9CLPrU#S<8Sn-VJqRn#9$^qgnV_7cw2wf`(xmVrg-}
zmXe6VmQeo((|>T@7X0~ZVHNcMbNuo;P^DJt<-5j=8*qEaa{AOZa^W$vX{s;+X7uG`
zT9+m9Rzj2ju3b;!jSlF-wSB|(%}?O-jw29>wWg<D=`rY>D7|2xzJ7$+EeeCFOUI<@
z(J?3lvh_X|z0r_MIR(3w&GfM_V62)eR4)-0=B2c*rEEDaj#E44w?hTetf2}C6XxUy
zgxsIJtYNc^oN2c{eGj+SIv%#+qy@Ln7lyDhpE@pQvVNbw&IVu<(fQ)YcO6+z6<DLh
zbJfGt`OhMJh?*x06aRAS)=N#Q)wYCT39N7;vWc~u@pp;7Q5$<>b^8aTAg4<lS|Aw`
zI5-wT_NAMbsmWm-NE)c~!H%(Mg8V+lG5lbc1z{FJ%^8Beypk-O5`%Y}0YhNRA4wA>
zXIeDnf@6!K-vjplx(`Yxh5p&aR1*|cTNE1Mo?P=;LMCbxGw{Rspd7H1di)WEp{R!q
zgQ<!jV!CcJ)@J-Ee0*2)94{u)3=gQKb^lhDcTaQU+IhDg!f^OP6V_IRLtFxYx_Q8I
z_BHEvDCPCaNo%v5)2lfeRNQg&EPUe|eqj?RdN<ZAI{{$q0teYPfI=!0%iYs6h<$6k
zfO%`Y{(Rytn4>WckaLfIY7QnFjVU!KrT>S;e{d)@6hdJAhQ@>A{$~DfsfiB<&j!(I
zPzu0s`~Nz*@^C1-HqO|RCCXL}Wy{W>A&gxK*%g_rg>0h`vdxgaWEo8MhK#{jvS;7R
zIyAPigiw(vSrdJa-uJ7w_mA(7?_AgYd!BQj`?>FPJ?C8Ky3YMO*V#Gdjd>XwzAj6{
zu;_G@qld^Qo|MfU6!XDT<Xr1q1Q)}}p7-LnYD3PI-mZQ}BVvuD;#JMxNT9A&D|Ftb
zvFX9+`IVe`%Zy4I!;?^G_gDsp1rKjlf^#B!xfNweRO0zX*kDyvKPp$CCfjOKXsaxT
zyd(2XMNr!6%Xw^gt|8*Ou@rGkKn}Ci`l(4BqwFz0Ul{YQXv?KJRzZ1OjLfzIx8E}y
z&--fn)kH6UTmq?YkqKoAmom-ZVdA{T(<nIAAWY(KNY!!E$zn_jdk>qIdXXyVp_9b~
zR08FVOgfiRZrQ*B`8rMW`7<_m4dL?&8EXXML(91V(w2gW7<n<&Dag8#U3BOoxVN5W
zP_f;<OF~uLZ)*LCu%{_xZUM*mSWG@gswFsoCKXIZO6!<rmInEQ7J{JBJV^@3q8Ckw
z=6mhVJ9<`Q_HUCg=a(12OwD(zk{zb}!5N6DsMh;0W4SU=Q&H-vuS6c}>L7Y%rxq?T
z8kiuc72&O{l$heDFiE)j{cJZH5f!pahj>dY7mWK3|6s^b)(>jj(x!L#jY5ugG=kVo
z02LC@g&*;L+D6YMX@rFV(qQ;hBL<M8iblL3Zahl}vssiHov7ARsu3^58r$|!v&-r~
ztL%J(A%*WA@`KoW<^kEG7Jaq@$WyArhQnBgel@5M-LT`;ro@bRX@0pY3?3O&J&cF^
zUjf<q{?XIF9TujC{~r-Qd^PlX_<HlnJ|l93wA*p;8E%d<Zk{alL{8#!=kU0zh|$l!
ztSX)dZ1<Y{{GKhx+Obq$K534@bJvWxm-q{S?#+K4>phSUbo=%yPBPV(cUak!LX}69
zzN7%W{h~pFKBi$_#jr-OmGHGzYHuRZmJ7D3S0^f&9%<5XhdONU^&>%;SJbwHs~)(p
zR!SQlYSbQ-N<JQT6uH{_GG$gr0R6ROqgzcmvzmwjX=E!|hRMofi4xf2G;c<#oA{xr
zFzl$;iHNizeKj&Ey7lyEtOk5Mc3l?AC`%~Vry9|3Njr7C;R+Mv02d+bVXB#wU0`S5
z0qDwbTZRLOP)q@3*UT`>qPt5J@DaGD3>QI7DBz`ZMJ^{$m7kdR0Q7QDt=-g92CKi?
zTrPi>fwt_VpUP>_XEF}P(O#9A7>-9lp#rx0O!U?`S}r6IsiuIpkT|?7+LKaX%u(HO
z7Y)&4kv|I$tzB@V_czl^sdTEk#R@ADyj|4wuGXbnE-f80?2l+OlC7f`4p2l&`?c2@
z-)5)>{C8c|v%+m1Gn1!ub-7Wsa2{G>xeWa;c&48+m$;Yu6DCv@>Vf!xed8}cn9djG
zN&W-k!10+t2LY`$0D?6IcSlSxe?TH>xK`SwU~IVdFX(m$!VWw90srbn9XlU-yopDz
z-v7b!;>LZ~U9s+KMSIcnVp!Q-8t;$y^0bhYqZA_{V><O$lG#!uqWk=994lPPURV_o
z@zmQHh2iM|owBGIaYWug+1VWPW?gr*dNUic>rDFoxwmpm2+YaekA(esMd!!n2C%9v
z&;5kF^fhO%sF)^4g>oOJnsCHc-i@LavZcYNSGObs6rhd$mhAo7;gJUHX=;pwHuuQM
zqN^#0^NwzHc^|rL;2|c>DDf?+1$i?5`@0++??Kww4Ykvi52von-4<8wqSZDy{X~cg
zc_1Z+O3Q%CA7Ia&hPt_~OIaiseQYlu44!@|hW$PscrcJq+~-7?+=h&36MT!`?u=Gx
zlDn+rMQY&Nt3KwQeJjotr%VG#1RkHvH?~uDHVhX7I11$OJM)T|)@`?I;9&`U>!?f7
z`<V0k9?>dkrPGl(Z;}0LE1BH*(ySHaip_^(eu|3>P?8r2HyJymy0@<-wPeSm?)lio
zQ;~#4Y{I52^p9=K)k=oD49_x7jBVH*q)GT$wx!6?Y4x)zeNlx(ZdPJ-4D0jX=)#pm
z`m;D{Wi7Q+{Byj6gqR1vg?In3*k!(cbR^n`$0x2X=zh$?a%ziyS{<iTZK4?RiQ<W5
zwxLgC@kkfPeRwan(7oxVc2TMo)T1e>*>LFWki5%lU9^aG<@%NWp~bivS7$d9^Qlq3
z>bXqH%IK`jtqEq7GAZx+mh<+leov#l4H8s1?W#j(SlY6YOa=7?i)9bxwJ$K-GjdCU
z+imKewV-Ac;$v~E;wM++zVI><F~2cd(siHc<LFrZdMH=*?I@>KDu1~P#+{=MYRlvI
zTAFigvhBK2aF}|jE%SMYPwUSY5oKqZWYJe}v_1;ry{mX_zY(q?<Q&r*lG0v4ccwz0
zimioYMSY!W(aiddVzsL7Wo{)qM~|&n(C5DLYZsy)Z)b+hETGg3avXh;%MYA#vLQLc
zf*7Bg$WmBEn5v#yYfbN{nuwjv*o_nP(-loi9o3GZ4k34Nq#|@Y?8WPkf~!8pYjGWv
z2?}jOqudXYg~f+2a)0^p7}P<8N;z~8uRM3<&Mj9Dc;)8fhv(tLn7YzzaI^I3O4N%&
z7)*RN1Iz>J*zst^4MYlksaAI7ZqfJ8e{CRL+e)daKQAR=D|lWCQ6lvX+aZjN{9n!#
zW-KKV<~5DYsUKuM3A130f?w`CQt6y@%X@G8*{4zCka*9s{jBVj_s=lt<xx#7idUCJ
za`;2}26Ga1OK~5hvtM!wduF+IKh$k!b8p4=uIvc2M@09uH5M~kl(t+{*HJpx$JQ9&
z!PRBZpxHew4DqIz5rrc?&zRJ=MLaZY0>RELFk)t3EM(1Jg2*-UP3Y(j>7`XkSW=2W
z*o;EAm`SXibR~4~I@Qyb3v?A`!LGB0%RDRO)A|1PR%5w}&INYCG1;8Hy*?urOI>1=
z!g_hO*1Mo`wli%kFE&5Y9hphq6X<9IZ6|+1sn9>C79z-~+`uEL=)&(rhAK555ehIp
zTUtXdpS2^Qg=-2^&-vE{Sd>q`XZwMZo91XT^V)Yyykco!bJ^F?hlF|*N>8Y8i-QSP
zqz67Omp&;ZO}_@qr&khu6pwKnRsW%0HWmB1`K<s>z~Hh0@noK6XQP^{QR}7)cd#j~
zVwP1E$7Y^S?wmHbzv<`6pub2^HVRsbBfx&1m%=Fl!-A@K(=AJhG{F{&nT1{WoOtR3
zxm-Rv{3g6wePfNxaw@bofwcO_7p5dlP*p@X-i(?cU$q{HfoY0mzOKH$NF3?!mLb|7
zzeYbVUb3#-71$paH!E@>j@S9oNuBZ9p2?)|f;Ww;$D=RsPaHR`AB@&=zx|}hRpQG;
zcMY?<eg4JgwmS)fqDV8LV75NG&fe_}8{@@WYf?>S0fzoy(Uk^P`dv*`XUCpA=J6<v
z#Y9N*YCMscLL+_im|;%qD@;oS$VU?Ys`p{1LK!wfUo12}+GIh{%CLhvL~JcKh0nO{
zyLInuPLb&raH{tsJ4!!}qPYCxE{FGoSGkP)oWbOqKJd6v0<!*W+S$O<yGsq*7plvW
z+h!x|XR9ErA^Q|%cQZMGt7$9}W?ciflIvGb?DFg~8E{N54I>)k7qH@(&Q9+|dOEm<
z@ep%vG%E`JO`&x|evsg9#69p`@EeOwgn3VIC*kRuSQXW!^f+Q95@0rd=6UrfK@t>y
z4+c7}FNonEw|k*E`wc+TvS_D%N${UkH860$ilZDrTnm8zB>sN20xxC?01e0w{x_lW
z+e8C~h77<!I;v;{@W5-J`wckJ?E|79CJcIQKnVOZ15Hgqp#bE84lf-0UD&eFGDKz2
zXb$==Q2_k!T+wg4k$m)Xq7q268of$X169_bA%g<o!<8Wln39{ozxdPbdL8=CAV2u$
a%mfTZ0E0sc=y!SEh%O!EqjhRIRQ(5;LC+@u

delta 22739
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%0AN7
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
Yn7R}Ao%s1z8|Z^2bkW`m8vH%=U*Fa7w*UYD


From a1ab7f17915c5cdcbfb39e32a4444d1e60f864a6 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:37:33 -0700
Subject: [PATCH 40/45] Fix API tests

---
 ...ation-submission-validator.service.spec.ts | 97 -------------------
 1 file changed, 97 deletions(-)

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts
index 69e8d168c..0c9d2b952 100644
--- a/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts
+++ b/services/apps/alcs/src/portal/application-submission/application-submission-validator.service.spec.ts
@@ -634,10 +634,6 @@ describe('ApplicationSubmissionValidatorService', () => {
 
       const res = await service.validateSubmission(application);
 
-      expect(
-        includesError(res.errors, new Error(`ROSO Proposal incomplete`)),
-      ).toBe(true);
-
       expect(
         includesError(res.errors, new Error(`ROSO Soil Table Incomplete`)),
       ).toBe(true);
@@ -659,37 +655,6 @@ describe('ApplicationSubmissionValidatorService', () => {
         ),
       ).toBe(true);
     });
-
-    it('should complain about missing files', async () => {
-      const application = new ApplicationSubmission({
-        owners: [],
-        soilIsFollowUp: true,
-        typeCode: 'ROSO',
-      });
-
-      const res = await service.validateSubmission(application);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`ROSO proposal missing Proposal Map / Site Plan`),
-        ),
-      ).toBe(true);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`ROSO proposal missing Cross Section Diagrams`),
-        ),
-      ).toBe(true);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`ROSO proposal missing Reclamation Plans`),
-        ),
-      ).toBe(true);
-    });
   });
 
   describe('POFO Applications', () => {
@@ -758,37 +723,6 @@ describe('ApplicationSubmissionValidatorService', () => {
         ),
       ).toBe(true);
     });
-
-    it('should complain about missing files', async () => {
-      const application = new ApplicationSubmission({
-        owners: [],
-        soilIsFollowUp: true,
-        typeCode: 'POFO',
-      });
-
-      const res = await service.validateSubmission(application);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`POFO proposal missing Proposal Map / Site Plan`),
-        ),
-      ).toBe(true);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`POFO proposal missing Cross Section Diagrams`),
-        ),
-      ).toBe(true);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`POFO proposal missing Reclamation Plans`),
-        ),
-      ).toBe(true);
-    });
   });
 
   describe('PFRS Applications', () => {
@@ -860,37 +794,6 @@ describe('ApplicationSubmissionValidatorService', () => {
       ).toBe(true);
     });
 
-    it('should complain about missing files', async () => {
-      const application = new ApplicationSubmission({
-        owners: [],
-        soilIsFollowUp: true,
-        typeCode: 'PFRS',
-      });
-
-      const res = await service.validateSubmission(application);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`PFRS proposal missing Proposal Map / Site Plan`),
-        ),
-      ).toBe(true);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`PFRS proposal missing Cross Section Diagrams`),
-        ),
-      ).toBe(true);
-
-      expect(
-        includesError(
-          res.errors,
-          new Error(`PFRS proposal missing Reclamation Plans`),
-        ),
-      ).toBe(true);
-    });
-
     it('should require a notice of work for both mining and notice true', async () => {
       const application = new ApplicationSubmission({
         owners: [],

From 45e949bd768e415d98758d923f8de76e754fb524 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:29:15 -0700
Subject: [PATCH 41/45] Fix ALCS tests

---
 .../application-details.component.spec.ts                  | 7 +++++++
 .../application-submission.service.spec.ts                 | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts
index 763c225eb..308b692cf 100644
--- a/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts
+++ b/alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts
@@ -101,6 +101,13 @@ describe('ApplicationDetailsComponent', () => {
       soilHasSubmittedNotice: null,
       soilIsExtractionOrMining: null,
       soilIsFollowUp: null,
+      soilIsNewStructure: null,
+      soilStructureFarmUseReason: null,
+      soilStructureResidentialUseReason: null,
+      soilAgriParcelActivity: null,
+      soilStructureResidentialAccessoryUseReason: null,
+      soilStructureOtherUseReason: null,
+      soilProposedStructures: [],
       soilFollowUpIDs: null,
       soilProjectDuration: null,
       soilReduceNegativeImpacts: null,
diff --git a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts
index e26b0d4ad..956825995 100644
--- a/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts
+++ b/alcs-frontend/src/app/services/application/application-submission/application-submission.service.spec.ts
@@ -91,6 +91,13 @@ describe('ApplicationSubmissionService', () => {
     soilAlternativeMeasures: null,
     soilHasSubmittedNotice: null,
     soilIsExtractionOrMining: null,
+    soilIsNewStructure: null,
+    soilStructureFarmUseReason: null,
+    soilStructureResidentialUseReason: null,
+    soilAgriParcelActivity: null,
+    soilStructureResidentialAccessoryUseReason: null,
+    soilStructureOtherUseReason: null,
+    soilProposedStructures: [],
     soilIsFollowUp: null,
     soilFollowUpIDs: null,
     soilProjectDuration: null,

From 258fbd9348eb2cf90a87cf8da52de3aa1a4eac7f Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:36:01 -0700
Subject: [PATCH 42/45] Fix portal tests

---
 .../proposal/pfrs-proposal/pfrs-proposal.component.ts           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 8de6bc61c..69c1dff14 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -22,7 +22,7 @@ import {
   STRUCTURE_TYPES,
   STRUCTURE_TYPE_OPTIONS,
   FormProposedStructure,
-} from 'src/app/features/notice-of-intents/edit-submission/additional-information/additional-information.component';
+} from '../../../../notice-of-intents/edit-submission/additional-information/additional-information.component';
 import { ProposedStructure } from '../../../../../services/notice-of-intent-submission/notice-of-intent-submission.dto';
 import { AddStructureDialogComponent } from '../../../../notice-of-intents/edit-submission/additional-information/add-structure-dialog/add-structure-dialog.component';
 

From 7c457a125a5f685dc099e6f5d18d7396d19936a6 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Wed, 30 Oct 2024 11:50:40 -0700
Subject: [PATCH 43/45] Fix mobile/desktop area mirroring issue

---
 .../pfrs-proposal/pfrs-proposal.component.html    |  1 +
 .../pfrs-proposal/pfrs-proposal.component.ts      | 15 +++++++++++++++
 .../pofo-proposal/pofo-proposal.component.html    |  1 +
 .../pofo-proposal/pofo-proposal.component.ts      | 15 +++++++++++++++
 .../roso-proposal/roso-proposal.component.html    |  1 +
 .../roso-proposal/roso-proposal.component.ts      | 15 +++++++++++++++
 6 files changed, 48 insertions(+)

diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
index 5d46097a3..15628501f 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.html
@@ -361,6 +361,7 @@ <h2>Proposal</h2>
                   min="0.01"
                   placeholder="Type area"
                   [formControlName]="element.id + '-area'"
+                  (change)="onChangeArea(element.id, $event)"
                 />
                 <span matTextSuffix>m<sup>2</sup></span>
               </mat-form-field>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
index 69c1dff14..074b8f06e 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pfrs-proposal/pfrs-proposal.component.ts
@@ -430,6 +430,21 @@ export class PfrsProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeArea(id: string, event: Event) {
+    const input = event.target as HTMLInputElement;
+    const structure = this.proposedStructures.find((structure) => structure.id === id);
+    if (!structure) {
+      console.error('Failed to find structure');
+      return;
+    }
+    this.setStructureAreaInput(structure, input.value);
+  }
+
+  private setStructureAreaInput(structure: FormProposedStructure, value: string) {
+    structure.area = value;
+    this.form.markAsDirty();
+  }
+
   private hasInput(type: STRUCTURE_TYPES | null) {
     switch (type) {
       case STRUCTURE_TYPES.FARM_STRUCTURE:
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
index 070ca9351..a89b6780c 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.html
@@ -269,6 +269,7 @@ <h2>Proposal</h2>
                   min="0.01"
                   placeholder="Type area"
                   [formControlName]="element.id + '-area'"
+                  (change)="onChangeArea(element.id, $event)"
                 />
                 <span matTextSuffix>m<sup>2</sup></span>
               </mat-form-field>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
index 198abc94b..63c4dd55e 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/pofo-proposal/pofo-proposal.component.ts
@@ -356,6 +356,21 @@ export class PofoProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeArea(id: string, event: Event) {
+    const input = event.target as HTMLInputElement;
+    const structure = this.proposedStructures.find((structure) => structure.id === id);
+    if (!structure) {
+      console.error('Failed to find structure');
+      return;
+    }
+    this.setStructureAreaInput(structure, input.value);
+  }
+
+  private setStructureAreaInput(structure: FormProposedStructure, value: string) {
+    structure.area = value;
+    this.form.markAsDirty();
+  }
+
   private hasInput(type: STRUCTURE_TYPES | null) {
     switch (type) {
       case STRUCTURE_TYPES.FARM_STRUCTURE:
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
index 3a736c5eb..4e485e0c9 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.html
@@ -271,6 +271,7 @@ <h2>Proposal</h2>
                       min="0.01"
                       placeholder="Type area"
                       [formControlName]="element.id + '-area'"
+                      (change)="onChangeArea(element.id, $event)"
                     />
                     <span matTextSuffix>m<sup>2</sup></span>
                   </mat-form-field>
diff --git a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
index e1c80426c..d27c0ec1b 100644
--- a/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
+++ b/portal-frontend/src/app/features/applications/edit-submission/proposal/roso-proposal/roso-proposal.component.ts
@@ -465,6 +465,21 @@ export class RosoProposalComponent extends FilesStepComponent implements OnInit,
     }
   }
 
+  onChangeArea(id: string, event: Event) {
+    const input = event.target as HTMLInputElement;
+    const structure = this.proposedStructures.find((structure) => structure.id === id);
+    if (!structure) {
+      console.error('Failed to find structure');
+      return;
+    }
+    this.setStructureAreaInput(structure, input.value);
+  }
+
+  private setStructureAreaInput(structure: FormProposedStructure, value: string) {
+    structure.area = value;
+    this.form.markAsDirty();
+  }
+
   private hasInput(type: STRUCTURE_TYPES | null) {
     switch (type) {
       case STRUCTURE_TYPES.FARM_STRUCTURE:

From 3829eb49504e98bce894ee4adbee346a4fc3dab9 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 31 Oct 2024 13:43:40 -0700
Subject: [PATCH 44/45] Move structure types to enum with label map

---
 ...-of-intent-submission-validator.service.ts | 11 +++++---
 .../notice-of-intent-submission.entity.ts     | 26 +++++++++++++++----
 ...otice-of-intent-submission.service.spec.ts | 17 ++++++------
 ...enerate-noi-submission-document.service.ts | 21 +++++++--------
 .../generate-submission-document.service.ts   | 25 ++++++++----------
 5 files changed, 57 insertions(+), 43 deletions(-)

diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts
index 18153d934..c07e66189 100644
--- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts
+++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.ts
@@ -8,7 +8,10 @@ import { DOCUMENT_TYPE } from '../../document/document-code.entity';
 import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity';
 import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity';
 import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service';
-import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity';
+import {
+  NoticeOfIntentSubmission,
+  STRUCTURE_TYPES,
+} from './notice-of-intent-submission.entity';
 
 export class ValidatedNoticeOfIntentSubmission extends NoticeOfIntentSubmission {
   applicant: string;
@@ -618,9 +621,9 @@ export class NoticeOfIntentSubmissionValidatorService {
       const hasResidentialStructure =
         noticeOfIntentSubmission.soilProposedStructures.some((structure) =>
           [
-            'Residential - Principal Residence',
-            'Residential - Additional Residence',
-            'Residential - Accessory Structure',
+            STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
+            STRUCTURE_TYPES.ADDITIONAL_RESIDENCE,
+            STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
           ].includes(structure.type!),
         );
       if (
diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts
index 8def865df..23aa9a296 100644
--- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts
+++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.entity.ts
@@ -17,12 +17,28 @@ import { ColumnNumericTransformer } from '../../utils/column-numeric-transform';
 import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-owner.entity';
 import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity';
 
+export enum STRUCTURE_TYPES {
+  FARM_STRUCTURE = 'Farm Structure',
+  PRINCIPAL_RESIDENCE = 'Residential - Principal Residence',
+  ADDITIONAL_RESIDENCE = 'Residential - Additional Residence',
+  ACCESSORY_STRUCTURE = 'Residential - Accessory Structure',
+  OTHER_STRUCTURE = 'Other Structure',
+}
+
+export const STRUCTURE_TYPE_LABEL_MAP: Record<STRUCTURE_TYPES, string> = {
+  [STRUCTURE_TYPES.FARM_STRUCTURE]: STRUCTURE_TYPES.FARM_STRUCTURE,
+  [STRUCTURE_TYPES.PRINCIPAL_RESIDENCE]: 'Principal Residence',
+  [STRUCTURE_TYPES.ADDITIONAL_RESIDENCE]: 'Additional Residence',
+  [STRUCTURE_TYPES.ACCESSORY_STRUCTURE]: 'Residential Accessory Structure',
+  [STRUCTURE_TYPES.OTHER_STRUCTURE]: STRUCTURE_TYPES.OTHER_STRUCTURE,
+};
+
 export const PORTAL_TO_ALCS_STRUCTURE_MAP = {
-  'Residential - Principal Residence': 'RPRI',
-  'Residential - Additional Residence': 'RADD',
-  'Residential - Accessory Structure': 'RACS',
-  'Farm Structure': 'FRST',
-  'Other Structure': 'OTHR',
+  [STRUCTURE_TYPES.PRINCIPAL_RESIDENCE]: 'RPRI',
+  [STRUCTURE_TYPES.ADDITIONAL_RESIDENCE]: 'RADD',
+  [STRUCTURE_TYPES.ACCESSORY_STRUCTURE]: 'RACS',
+  [STRUCTURE_TYPES.FARM_STRUCTURE]: 'FRST',
+  [STRUCTURE_TYPES.OTHER_STRUCTURE]: 'OTHR',
 };
 
 export class ProposedStructure {
diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts
index cb03beb16..3f004868a 100644
--- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts
+++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts
@@ -25,6 +25,7 @@ import { ValidatedNoticeOfIntentSubmission } from './notice-of-intent-submission
 import {
   NoticeOfIntentSubmission,
   PORTAL_TO_ALCS_STRUCTURE_MAP,
+  STRUCTURE_TYPES,
 } from './notice-of-intent-submission.entity';
 import { NoticeOfIntentSubmissionService } from './notice-of-intent-submission.service';
 
@@ -283,16 +284,16 @@ describe('NoticeOfIntentSubmissionService', () => {
       localGovernmentUuid,
       soilProposedStructures: [
         {
-          type: 'Residential - Accessory Structure',
+          type: STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
         },
         {
-          type: 'Residential - Additional Residence',
+          type: STRUCTURE_TYPES.ADDITIONAL_RESIDENCE,
         },
         {
-          type: 'Residential - Principal Residence',
+          type: STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
         },
         {
-          type: 'Farm Structure',
+          type: STRUCTURE_TYPES.FARM_STRUCTURE,
         },
       ],
       soilIsAreaWideFilling: true,
@@ -320,10 +321,10 @@ describe('NoticeOfIntentSubmissionService', () => {
       dateSubmittedToAlc: mockDate,
       typeCode,
       subtypes: [
-        PORTAL_TO_ALCS_STRUCTURE_MAP['Residential - Accessory Structure'],
-        PORTAL_TO_ALCS_STRUCTURE_MAP['Residential - Additional Residence'],
-        PORTAL_TO_ALCS_STRUCTURE_MAP['Residential - Principal Residence'],
-        PORTAL_TO_ALCS_STRUCTURE_MAP['Farm Structure'],
+        PORTAL_TO_ALCS_STRUCTURE_MAP[STRUCTURE_TYPES.ACCESSORY_STRUCTURE],
+        PORTAL_TO_ALCS_STRUCTURE_MAP[STRUCTURE_TYPES.ADDITIONAL_RESIDENCE],
+        PORTAL_TO_ALCS_STRUCTURE_MAP[STRUCTURE_TYPES.PRINCIPAL_RESIDENCE],
+        PORTAL_TO_ALCS_STRUCTURE_MAP[STRUCTURE_TYPES.FARM_STRUCTURE],
         'ARWF',
         'AEPM',
       ],
diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-noi-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-noi-submission-document.service.ts
index 958abb3d3..c9cbcd8cc 100644
--- a/services/apps/alcs/src/portal/pdf-generation/generate-noi-submission-document.service.ts
+++ b/services/apps/alcs/src/portal/pdf-generation/generate-noi-submission-document.service.ts
@@ -22,7 +22,11 @@ import { formatBooleanToYesNoString } from '../../utils/boolean-formatter';
 import { NoticeOfIntentOwnerService } from '../notice-of-intent-submission/notice-of-intent-owner/notice-of-intent-owner.service';
 import { NoticeOfIntentParcel } from '../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.entity';
 import { NoticeOfIntentParcelService } from '../notice-of-intent-submission/notice-of-intent-parcel/notice-of-intent-parcel.service';
-import { NoticeOfIntentSubmission } from '../notice-of-intent-submission/notice-of-intent-submission.entity';
+import {
+  NoticeOfIntentSubmission,
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../notice-of-intent-submission/notice-of-intent-submission.entity';
 import { NoticeOfIntentSubmissionService } from '../notice-of-intent-submission/notice-of-intent-submission.service';
 
 export enum NOI_SUBMISSION_TYPES {
@@ -325,9 +329,9 @@ export class GenerateNoiSubmissionDocumentService {
           (structure) =>
             structure.type &&
             [
-              'Residential - Accessory Structure',
-              'Residential - Additional Residence',
-              'Residential - Principal Residence',
+              STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
+              STRUCTURE_TYPES.ADDITIONAL_RESIDENCE,
+              STRUCTURE_TYPES.PRINCIPAL_RESIDENCE,
             ].includes(structure.type),
         ),
       isSoilStructureResidentialAccessoryUseReasonVisible:
@@ -382,14 +386,7 @@ export class GenerateNoiSubmissionDocumentService {
         (structure, index) => ({
           area: structure.area ?? NO_DATA,
           type:
-            {
-              'Fram Structure': 'Fram Structure',
-              'Residential - Principal Residence': 'Principal Residence',
-              'Residential - Additional Residence': 'Additional Residence',
-              'Residential - Accessory Structure':
-                'Residential Accessory Structure',
-              'Other Structure': 'Other Structure',
-            }[structure.type ?? ''] ??
+            STRUCTURE_TYPE_LABEL_MAP[structure.type ?? ''] ??
             structure.type ??
             NO_DATA,
           index: index + 1,
diff --git a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
index c44a70f23..da96c76e2 100644
--- a/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
+++ b/services/apps/alcs/src/portal/pdf-generation/generate-submission-document.service.ts
@@ -27,6 +27,10 @@ import { ApplicationParcelService } from '../application-submission/application-
 import { ApplicationSubmission } from '../application-submission/application-submission.entity';
 import { ApplicationSubmissionService } from '../application-submission/application-submission.service';
 import { CovenantTransfereeService } from '../application-submission/covenant-transferee/covenant-transferee.service';
+import {
+  STRUCTURE_TYPE_LABEL_MAP,
+  STRUCTURE_TYPES,
+} from '../notice-of-intent-submission/notice-of-intent-submission.entity';
 
 export enum APPLICATION_SUBMISSION_TYPES {
   NFUP = 'NFUP',
@@ -496,22 +500,22 @@ export class GenerateSubmissionDocumentService {
     documents: ApplicationDocument[],
   ) {
     const hasFarmStructure = submission.soilProposedStructures.some(
-      (structure) => structure.type === 'Farm Structure',
+      (structure) => structure.type === STRUCTURE_TYPES.FARM_STRUCTURE,
     );
 
     const hasResidentialStructure = submission.soilProposedStructures.some(
       (structure) =>
-        structure.type === 'Residential - Principal Residence' ||
-        structure.type === 'Residential - Additional Residence' ||
-        structure.type === 'Residential - Accessory Structure',
+        structure.type === STRUCTURE_TYPES.PRINCIPAL_RESIDENCE ||
+        structure.type === STRUCTURE_TYPES.ADDITIONAL_RESIDENCE ||
+        structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
     );
 
     const hasAccessoryStructure = submission.soilProposedStructures.some(
-      (structure) => structure.type === 'Residential - Accessory Structure',
+      (structure) => structure.type === STRUCTURE_TYPES.ACCESSORY_STRUCTURE,
     );
 
     const hasOtherStructure = submission.soilProposedStructures.some(
-      (structure) => structure.type === 'Other Structure',
+      (structure) => structure.type === STRUCTURE_TYPES.OTHER_STRUCTURE,
     );
 
     const crossSections = documents.filter(
@@ -565,14 +569,7 @@ export class GenerateSubmissionDocumentService {
         (structure, index) => ({
           area: structure.area ?? NO_DATA,
           type:
-            {
-              'Fram Structure': 'Fram Structure',
-              'Residential - Principal Residence': 'Principal Residence',
-              'Residential - Additional Residence': 'Additional Residence',
-              'Residential - Accessory Structure':
-                'Residential Accessory Structure',
-              'Other Structure': 'Other Structure',
-            }[structure.type ?? ''] ??
+            STRUCTURE_TYPE_LABEL_MAP[structure.type ?? ''] ??
             structure.type ??
             NO_DATA,
           index: index + 1,

From caadcad4c5017e2a7c7406a02a0e0862e4484604 Mon Sep 17 00:00:00 2001
From: Tristan Slater <1631008+trslater@users.noreply.github.com>
Date: Thu, 31 Oct 2024 13:57:21 -0700
Subject: [PATCH 45/45] Fix API tests

---
 ...-intent-submission-validator.service.spec.ts | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts
index 0e5032319..94edccd85 100644
--- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts
+++ b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission-validator.service.spec.ts
@@ -19,7 +19,10 @@ import { NoticeOfIntentOwner } from './notice-of-intent-owner/notice-of-intent-o
 import { NoticeOfIntentParcel } from './notice-of-intent-parcel/notice-of-intent-parcel.entity';
 import { NoticeOfIntentParcelService } from './notice-of-intent-parcel/notice-of-intent-parcel.service';
 import { NoticeOfIntentSubmissionValidatorService } from './notice-of-intent-submission-validator.service';
-import { NoticeOfIntentSubmission } from './notice-of-intent-submission.entity';
+import {
+  NoticeOfIntentSubmission,
+  STRUCTURE_TYPES,
+} from './notice-of-intent-submission.entity';
 
 function includesError(errors: Error[], target: Error) {
   return errors.some((error) => error.message === target.message);
@@ -528,9 +531,9 @@ describe('NoticeOfIntentSubmissionValidatorService', () => {
         owners: [],
         soilIsRemovingSoilForNewStructure: true,
         soilProposedStructures: [
-          { type: 'Residential - Accessory Structure', area: 5 },
-          { type: 'Farm Structure', area: 5 },
-          { type: 'Residential - Additional Residence', area: 5 },
+          { type: STRUCTURE_TYPES.ACCESSORY_STRUCTURE, area: 5 },
+          { type: STRUCTURE_TYPES.FARM_STRUCTURE, area: 5 },
+          { type: STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, area: 5 },
         ],
         soilStructureFarmUseReason: 'VALID',
         soilAgriParcelActivity: 'VALID',
@@ -676,9 +679,9 @@ describe('NoticeOfIntentSubmissionValidatorService', () => {
         owners: [],
         soilIsRemovingSoilForNewStructure: true,
         soilProposedStructures: [
-          { type: 'Residential - Accessory Structure', area: 5 },
-          { type: 'Farm Structure', area: 5 },
-          { type: 'Residential - Additional Residence', area: null },
+          { type: STRUCTURE_TYPES.ACCESSORY_STRUCTURE, area: 5 },
+          { type: STRUCTURE_TYPES.FARM_STRUCTURE, area: 5 },
+          { type: STRUCTURE_TYPES.ADDITIONAL_RESIDENCE, area: null },
         ],
         typeCode: 'ROSO',
       });