Merge remote-tracking branch 'origin/main' into bugfix/alcs-typo

bcgov · Jun 21, 2023 · f2317fe · f2317fe
2 parents eeec60f + 26a9c77
commit f2317fe
Show file tree

Hide file tree

Showing 7 changed files with 237 additions and 125 deletions.
diff --git a/...s/application/applicant-info/application-details/naru-details/naru-details.component.html b/...s/application/applicant-info/application-details/naru-details/naru-details.component.html
@@ -7,30 +7,58 @@
   <div class="grid-double">
     {{ _applicationSubmission.naruPurpose }}
   </div>
-  <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 }}
-  </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 *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 }}
+    </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 }}
+    </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>
   <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.
@@ -71,11 +99,11 @@
     </div>
     <div class="subheading2 grid-1">Duration</div>
     <div class="grid-double">
-      {{ _applicationSubmission.soilProjectDurationUnit }}
+      {{ _applicationSubmission.naruProjectDurationUnit }}
     </div>
     <div class="subheading2 grid-1">Length</div>
     <div class="grid-double">
-      {{ _applicationSubmission.soilProjectDurationAmount }}
+      {{ _applicationSubmission.naruProjectDurationAmount }}
     </div>
   </ng-container>
 </div>
diff --git a/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.html b/alcs-frontend/src/app/shared/time-tracker/time-tracker.component.html
@@ -23,7 +23,7 @@
     <mat-icon class="icon">pause</mat-icon>
     {{ pausedDays }}
   </div>
-  <div *ngIf="dueDate">
+  <div *ngIf="dueDate && !paused">
     <span *ngIf="!isOverdue">Due: {{ dueDate | momentFormat }}</span>
     <span class="red-text" *ngIf="isOverdue">Overdue</span>
   </div>

diff --git a/...al-frontend/src/app/features/application-details/naru-details/naru-details.component.html b/...al-frontend/src/app/features/application-details/naru-details/naru-details.component.html
@@ -19,43 +19,85 @@
     <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruPurpose"></app-no-data>
   </div>
 
-  <div class="subheading2 grid-1">
-    What is the total floor area (m<sup>2</sup>) of the proposed additional residence?
-    <app-updated-banner *ngIf="updatedFields.includes('naruFloorArea')"></app-updated-banner>
-  </div>
-  <div *ngIf="_applicationSubmission.naruFloorArea" class="grid-double">
-    {{ _applicationSubmission.naruFloorArea }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data>
-  </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?
+      <app-updated-banner *ngIf="updatedFields.includes('naruFloorArea')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruFloorArea" class="grid-double">
+      {{ _applicationSubmission.naruFloorArea }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data>
+    </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.
-    <app-updated-banner *ngIf="updatedFields.includes('naruResidenceNecessity')"></app-updated-banner>
-  </div>
-  <div *ngIf="_applicationSubmission.naruResidenceNecessity" class="grid-double">
-    {{ _applicationSubmission.naruResidenceNecessity }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data>
-  </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.
+      <app-updated-banner *ngIf="updatedFields.includes('naruResidenceNecessity')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruResidenceNecessity" class="grid-double">
+      {{ _applicationSubmission.naruResidenceNecessity }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data>
+    </div>
 
-  <div class="subheading2 grid-1">
-    Describe the rationale for the proposed location of the additional residence.
-    <app-updated-banner *ngIf="updatedFields.includes('naruLocationRationale')"></app-updated-banner>
-  </div>
-  <div *ngIf="_applicationSubmission.naruLocationRationale" class="grid-double">
-    {{ _applicationSubmission.naruLocationRationale }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data>
-  </div>
+    <div class="subheading2 grid-1">
+      Describe the rationale for the proposed location of the additional residence.
+      <app-updated-banner *ngIf="updatedFields.includes('naruLocationRationale')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruLocationRationale" class="grid-double">
+      {{ _applicationSubmission.naruLocationRationale }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data>
+    </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.
-    <app-updated-banner *ngIf="updatedFields.includes('naruInfrastructure')"></app-updated-banner>
-  </div>
-  <div *ngIf="_applicationSubmission.naruInfrastructure" class="grid-double">
-    {{ _applicationSubmission.naruInfrastructure }}
-    <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data>
-  </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.
+      <app-updated-banner *ngIf="updatedFields.includes('naruInfrastructure')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruInfrastructure" class="grid-double">
+      {{ _applicationSubmission.naruInfrastructure }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data>
+    </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?
+      <app-updated-banner *ngIf="updatedFields.includes('naruFloorArea')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruFloorArea" class="grid-double">
+      {{ _applicationSubmission.naruFloorArea }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFloorArea"></app-no-data>
+    </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.
+      <app-updated-banner *ngIf="updatedFields.includes('naruResidenceNecessity')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruResidenceNecessity" class="grid-double">
+      {{ _applicationSubmission.naruResidenceNecessity }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruResidenceNecessity"></app-no-data>
+    </div>
+
+    <div class="subheading2 grid-1">
+      Describe the rationale for the proposed location of the principal residence.
+      <app-updated-banner *ngIf="updatedFields.includes('naruLocationRationale')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruLocationRationale" class="grid-double">
+      {{ _applicationSubmission.naruLocationRationale }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruLocationRationale"></app-no-data>
+    </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.
+      <app-updated-banner *ngIf="updatedFields.includes('naruInfrastructure')"></app-updated-banner>
+    </div>
+    <div *ngIf="_applicationSubmission.naruInfrastructure" class="grid-double">
+      {{ _applicationSubmission.naruInfrastructure }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruInfrastructure"></app-no-data>
+    </div>
+  </ng-container>
 
   <div class="subheading2 grid-1">
     Describe the total floor area (m<sup>2</sup>), type, number, and occupancy of all residential structures currently
@@ -86,6 +128,24 @@
   </div>
 
   <ng-container *ngIf="_applicationSubmission.naruWillImportFill">
+    <div class="subheading2 grid-1">
+      Describe the type and amount of fill proposed to be placed.
+      <app-updated-banner *ngIf="updatedFields.includes('naruFillType')"></app-updated-banner>
+    </div>
+    <div class="grid-double">
+      {{ _applicationSubmission.naruFillType }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillType"></app-no-data>
+    </div>
+
+    <div class="subheading2 grid-1">
+      Briefly describe the origin and quality of fill.
+      <app-updated-banner *ngIf="updatedFields.includes('naruFillOrigin')"></app-updated-banner>
+    </div>
+    <div class="grid-double">
+      {{ _applicationSubmission.naruFillOrigin }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruFillOrigin"></app-no-data>
+    </div>
+
     <div class="subheading1 full-width">
       Fill to be Placed <app-updated-banner *ngIf="updatedFields.includes('naruToPlaceVolume')"></app-updated-banner>
     </div>
@@ -129,18 +189,18 @@
       <span class="subheading1">Project Duration</span>
     </div>
     <div class="subheading2 grid-1">
-      Duration <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationUnit')"></app-updated-banner>
+      Duration <app-updated-banner *ngIf="updatedFields.includes('naruProjectDurationUnit')"></app-updated-banner>
     </div>
     <div class="grid-double">
-      {{ _applicationSubmission.soilProjectDurationUnit }}
-      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationUnit"></app-no-data>
+      {{ _applicationSubmission.naruProjectDurationUnit }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDurationUnit"></app-no-data>
     </div>
     <div class="subheading2 grid-1">
-      Length <app-updated-banner *ngIf="updatedFields.includes('soilProjectDurationAmount')"></app-updated-banner>
+      Length <app-updated-banner *ngIf="updatedFields.includes('naruProjectDurationAmount')"></app-updated-banner>
     </div>
     <div class="grid-double">
-      {{ _applicationSubmission.soilProjectDurationAmount }}
-      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.soilProjectDurationAmount"></app-no-data>
+      {{ _applicationSubmission.naruProjectDurationAmount }}
+      <app-no-data [showRequired]="showErrors" *ngIf="!_applicationSubmission.naruProjectDurationAmount"></app-no-data>
     </div>
   </ng-container>