Deployment PR - 1300

alcs-frontend/src/app/features/application/applicant-info/application-details/application-details.component.spec.ts

@@ -56,6 +56,12 @@ describe('ApplicationDetailsComponent', () => {
       status: {} as ApplicationStatus,
       type: '',
       uuid: '',
+      naruWillBeOverFiveHundredM2: null,
+      naruWillRetainResidence: null,
+      naruWillHaveAdditionalResidence: null,
+      naruWillHaveTemporaryForeignWorkerHousing: null,
+      naruClustered: null,
+      naruSetback: null,
       naruExistingStructures: null,
       naruFillOrigin: null,
       naruFillType: null,

alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.html

@@ -1,105 +1,100 @@
 <div *ngIf="_applicationSubmission" class="review-table">
-  <div class="subheading2 grid-1">Selected Subtype:</div>
+  <div class="subheading2 grid-1">
+    Is your proposal for a principal residence with a total floor area greater than 500 m<sup>2</sup>
+  </div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruWillBeOverFiveHundredM2 ? 'Yes' : 'No' }}
+  </div>
+
+  <div class="subheading2 grid-1">Is your proposal to retain an existing residence while building a new residence?</div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruWillRetainResidence ? 'Yes' : 'No' }}
+  </div>
+
+  <div class="subheading2 grid-1">Is your proposal for an additional residence?</div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruWillHaveAdditionalResidence ? 'Yes' : 'No' }}
+  </div>
+
+  <div class="subheading2 grid-1">Is your proposal for temporary foreign worker housing?</div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruWillHaveTemporaryForeignWorkerHousing ? 'Yes' : 'No' }}
+  </div>
+
+  <div class="subheading2 grid-1">
+    Do you need to import any fill to construct or conduct the proposed non-adhering residential use?
+  </div>
   <div class="grid-double">
-    {{ _applicationSubmission.naruSubtype?.label }}
+    {{ _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' }}
   </div>
+
   <div class="subheading2 grid-1">What is the purpose of the proposal?</div>
   <div class="grid-double">
     {{ _applicationSubmission.purpose }}
   </div>
-  <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'ARFU'">
-    <div class="subheading2 grid-1">
-      What is the total floor area (m<sup>2</sup>) of the proposed additional residence?
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span>
-    </div>
-    <div class="subheading2 grid-1">
-      Describe the necessity for an additional residence for farm use and how it will support agriculture in the short
-      or long term.
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruResidenceNecessity }}
-    </div>
-    <div class="subheading2 grid-1">Describe the rationale for the proposed location of the additional residence.</div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruLocationRationale }}
-    </div>
-    <div class="subheading2 grid-1">
-      Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the additional
-      residence.
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruInfrastructure }}
-    </div>
-  </ng-container>
-  <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'PRIN'">
-    <div class="subheading2 grid-1">
-      What is the total floor area (m<sup>2</sup>) of the proposed principal residence?
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span>
-    </div>
-    <div class="subheading2 grid-1">
-      Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the
-      short or long term.
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruResidenceNecessity }}
-    </div>
-    <div class="subheading2 grid-1">Describe the rationale for the proposed location of the principal residence.</div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruLocationRationale }}
-    </div>
-    <div class="subheading2 grid-1">
-      Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the principal
-      residence.
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruInfrastructure }}
-    </div>
-  </ng-container>
 
-  <ng-container *ngIf="_applicationSubmission.naruSubtype?.code === 'TOUR'">
-    <div class="subheading2 grid-1">What is the total floor area (m<sup>2</sup>) of the proposed accommodation?</div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruFloorArea }} <span *ngIf="_applicationSubmission.naruFloorArea">m<sup>2</sup></span>
-    </div>
-    <div class="subheading2 grid-1">How many "sleeping units" in total are proposed?</div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruSleepingUnits }}
-    </div>
-    <div class="subheading2 grid-1">
-      Describe how the proposal for tourism accommodation will support agriculture in the short or long term.
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruResidenceNecessity }}
-    </div>
-    <div class="subheading2 grid-1">Describe the rationale for the proposed location of the tourism accommodation.</div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruLocationRationale }}
-    </div>
-    <div class="subheading2 grid-1">
-      Provide the total area (m<sup>2</sup>) and a description of infrastructure necessary to support the tourism
-      accommodation.
-    </div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruInfrastructure }}
-    </div>
-    <div class="subheading2 grid-1">Describe any agri-tourism that is currently taking place on the property.</div>
-    <div class="grid-double">
-      {{ _applicationSubmission.naruAgriTourism }}
-    </div>
-  </ng-container>
+  <div class="subheading2 grid-1">
+    Describe the necessity for an additional residence for farm use and how it will support agriculture in the short or
+    long term.
+  </div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruResidenceNecessity }}
+  </div>
+
+  <div class="subheading2 grid-1">
+    Describe how the proposal for a principal residence more than 500 m<sup>2</sup> will support agriculture in the
+    short or long term.
+  </div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruResidenceNecessity }}
+  </div>
 
   <div class="subheading2 grid-1">
-    Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently
-    located on the property.
+    Will the proposed residence(s) be clustered with existing residential structures? Please explain.
   </div>
   <div class="grid-double">
-    {{ _applicationSubmission.naruExistingStructures }}
+    {{ _applicationSubmission.naruClustered }}
   </div>
 
+  <div class="subheading2 grid-1">
+    Will the proposed residence(s) be located within a 60 m setback from the front lot line? Please explain.
+  </div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruSetback }}
+  </div>
+
+  <div class="subheading2 grid-1">
+    Where on the parcel will the proposal be situated and is there an agricultural rationale for the proposed location?
+  </div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruLocationRationale }}
+  </div>
+
+  <div class="subheading2 grid-1">
+    Describe any infrastructure required to support the proposed residence(s) and the approximate area (m<sup>2</sup>)
+    required for that infrastructure
+  </div>
+  <div class="grid-double">
+    {{ _applicationSubmission.naruInfrastructure }}
+  </div>
+
+  <ng-container *ngIf="_applicationSubmission.naruExistingResidences">
+    <div class="full-width existing-residences">
+      <div class="grid-1 subheading2">Existing Residence</div>
+      <div class="grid-2 subheading2">Total Floor Area</div>
+      <div class="grid-3 subheading2">Description</div>
+      <ng-container *ngFor="let existingResidence of _applicationSubmission.naruExistingResidences; let i = index">
+        <div class="grid-1">
+          {{ i + 1 }}
+        </div>
+        <div class="grid-2">
+          {{ existingResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
+        </div>
+        <div class="grid-3">{{ existingResidence.description }}</div>
+      </ng-container>
+    </div>
+  </ng-container>
+
   <div class="subheading2 grid-1">Proposal Map / Site Plan</div>
   <div class="grid-double">
     <div *ngFor="let file of proposalMap">
@@ -109,12 +104,15 @@
     </div>
   </div>
 
-  <div class="subheading2 grid-1">
-    Do you need to import any fill to construct or conduct the proposed non-adhering residential use?
-  </div>
+  <div class="subheading2 grid-1">Detailed Building Plan(s)</div>
   <div class="grid-double">
-    {{ _applicationSubmission.naruWillImportFill ? 'Yes' : 'No' }}
+    <div *ngFor="let file of buildingPlans">
+      <a (click)="openFile(file)">
+        {{ file.fileName }}
+      </a>
+    </div>
   </div>
+
   <ng-container *ngIf="_applicationSubmission.naruWillImportFill">
     <div class="subheading2 grid-1">Describe the type and amount of fill proposed to be placed.</div>
     <div class="grid-double">

alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.scss

@@ -4,3 +4,28 @@
   grid-column-gap: 36px;
   grid-row-gap: 12px;
 }
+
+.existing-residences {
+  display: grid;
+  grid-template-columns: 1fr 1fr 1fr;
+  word-wrap: break-word;
+  white-space: pre-line;
+  grid-column-gap: 36px;
+  grid-row-gap: 12px;
+
+  .full-width {
+    grid-column: 1/3;
+  }
+
+  .grid-1 {
+    grid-column: 1/2;
+  }
+
+  .grid-2 {
+    grid-column: 2/3;
+  }
+
+  .grid-3 {
+    grid-column: 3/5;
+  }
+}

alcs-frontend/src/app/features/application/applicant-info/application-details/naru-details/naru-details.component.ts

@@ -21,10 +21,12 @@ export class NaruDetailsComponent {
   @Input() set files(documents: ApplicationDocumentDto[] | undefined) {
     if (documents) {
       this.proposalMap = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.PROPOSAL_MAP);
+      this.buildingPlans = documents.filter((document) => document.type?.code === DOCUMENT_TYPE.BUILDING_PLAN);
     }
   }
 
   proposalMap: ApplicationDocumentDto[] = [];
+  buildingPlans: ApplicationDocumentDto[] = [];
 
   constructor(private applicationDocumentService: ApplicationDocumentService) {}
 

alcs-frontend/src/app/features/application/decision/decision-v2/decision-component/naru/naru.component.html

@@ -1,9 +1,4 @@
 <ng-content></ng-content>
-<div>
-  <div class="subheading2">Residential Use Type</div>
-  {{ component.naruSubtype?.label }}
-  <app-no-data *ngIf="component.naruSubtype === null || component.naruSubtype === undefined"></app-no-data>
-</div>
 
 <div>
   <div class="subheading2">Expiry Date</div>

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/decision-component.component.ts

@@ -65,7 +65,6 @@ export class DecisionComponentComponent implements OnInit {
   averageDepthToRemove = new FormControl<number | null>(null, [Validators.required, Validators.min(MIN_SOIL_FIELDS)]);
 
   // naru
-  naruSubtypeCode = new FormControl<string | null>(null, [Validators.required]);
   naruEndDate = new FormControl<Date | null>(null);
 
   //subd
@@ -266,13 +265,11 @@ export class DecisionComponentComponent implements OnInit {
   }
 
   private patchNaruFields() {
-    this.form.addControl('naruSubtypeCode', this.naruSubtypeCode);
     this.form.addControl('naruEndDate', this.naruEndDate);
     this.form.addControl('expiryDate', this.expiryDate);
 
     this.naruEndDate.setValue(this.data.endDate ? new Date(this.data.endDate) : null);
     this.expiryDate.setValue(this.data.expiryDate ? new Date(this.data.expiryDate) : null);
-    this.naruSubtypeCode.setValue(this.data.naruSubtypeCode ?? null);
   }
 
   private patchSubdFields() {
@@ -350,16 +347,18 @@ export class DecisionComponentComponent implements OnInit {
     return {
       endDate: this.naruEndDate.value ? formatDateForApi(this.naruEndDate.value) : null,
       expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null,
-      naruSubtypeCode: this.naruSubtypeCode.value ?? null,
     };
   }
 
   private getSubdDataChange(): SubdDecisionComponentDto {
-    const update = this.subdApprovedLots.value?.map((e) => ({ 
-      ...e,
-      size: e.size ? e.size : null,
-      alrArea: e.alrArea ? e.alrArea : null
-    }) as ProposedDecisionLotDto);
+    const update = this.subdApprovedLots.value?.map(
+      (e) =>
+        ({
+          ...e,
+          size: e.size ? e.size : null,
+          alrArea: e.alrArea ? e.alrArea : null,
+        }) as ProposedDecisionLotDto,
+    );
     return {
       lots: update ?? undefined,
       expiryDate: this.expiryDate.value ? formatDateForApi(this.expiryDate.value) : null,

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-component/naru-input/naru-input.component.html

@@ -13,19 +13,6 @@
       />
     </mat-form-field>
 
-    <div>
-      <ng-select
-        appearance="outline"
-        [items]="codes.naruSubtypes"
-        formControlName="naruSubtypeCode"
-        appendTo="body"
-        bindLabel="label"
-        bindValue="code"
-        placeholder="Residential Use Type*"
-        [clearable]="false"
-      ></ng-select>
-    </div>
-
     <mat-form-field appearance="outline" class="date-picker">
       <mat-label>Expiry Date</mat-label>
       <input

alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-components/decision-components.component.ts

@@ -261,7 +261,6 @@ export class DecisionComponentsComponent implements OnInit, OnDestroy, AfterView
   private patchNaruFields(component: ApplicationDecisionComponentDto) {
     component.endDate = this.application.proposalEndDate;
     component.expiryDate = this.application.proposalExpiryDate;
-    component.naruSubtypeCode = this.application.submittedApplication?.naruSubtype?.code;
   }
 
   private patchInclExclFields(component: ApplicationDecisionComponentDto) {

alcs-frontend/src/app/features/application/lfng-info/return-application-dialog/return-application-dialog.component.scss

@@ -35,6 +35,7 @@
 }
 
 .comment-input {
+  font-size: 16px;
   resize: none;
   margin-top: 4px;
   border: 1px solid rgba(0, 0, 0, 0.42);

alcs-frontend/src/app/features/application/proposal/naru/naru.component.html

@@ -5,8 +5,3 @@
     (save)="updateApplicationValue('proposalEndDate', $event)"
   ></app-inline-datepicker>
 </div>
-
-<div>
-  <div class="subheading2">Residential Use Type</div>
-  {{ naruSubtype }}
-</div>

alcs-frontend/src/app/features/application/proposal/naru/naru.component.ts

@@ -1,7 +1,6 @@
 import { Component, OnDestroy, OnInit } from '@angular/core';
 import { Subject, takeUntil } from 'rxjs';
 import { ApplicationDetailService } from '../../../../services/application/application-detail.service';
-import { ApplicationSubmissionService } from '../../../../services/application/application-submission/application-submission.service';
 import { ApplicationDto, UpdateApplicationDto } from '../../../../services/application/application.dto';
 import { ApplicationDecisionV2Service } from '../../../../services/application/decision/application-decision-v2/application-decision-v2.service';
 import { ToastService } from '../../../../services/toast/toast.service';
@@ -19,21 +18,16 @@ interface InlineSelect {
 export class NaruProposalComponent implements OnDestroy, OnInit {
   $destroy = new Subject<void>();
   application: ApplicationDto | undefined;
-  naruSubtype: string = '';
 
   constructor(
     private applicationDetailService: ApplicationDetailService,
     private toastService: ToastService,
-    private applicationSubmissionService: ApplicationSubmissionService,
   ) {}
 
   ngOnInit(): void {
     this.applicationDetailService.$application.pipe(takeUntil(this.$destroy)).subscribe((application) => {
       if (application) {
         this.application = application;
-        this.applicationSubmissionService
-          .fetchSubmission(application.fileNumber)
-          .then((e) => (this.naruSubtype = e.naruSubtype?.label ?? ''));
       }
     });
   }