Add index hashtag to NARU residences on portal and ALCS

bcgov · Oct 21, 2024 · ca04eb4 · ca04eb4
1 parent b366041
commit ca04eb4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 27 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
@@ -113,9 +113,7 @@
         </div>
       </ng-container>
       <ng-container *ngFor="let existingResidence of _applicationSubmission.naruExistingResidences; let i = index">
-        <div class="grid-1">
-          {{ i + 1 }}
-        </div>
+        <div class="grid-1">#{{ i + 1 }}</div>
         <div class="grid-2">
           {{ existingResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
         </div>
@@ -130,9 +128,7 @@
       <div class="grid-2 subheading2">Total Floor Area</div>
       <div class="grid-3 subheading2">Description</div>
       <ng-container *ngFor="let proposedResidence of _applicationSubmission.naruProposedResidences; let i = index">
-        <div class="grid-1">
-          {{ i + 1 }}
-        </div>
+        <div class="grid-1">#{{ i + 1 }}</div>
         <div class="grid-2">
           {{ proposedResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
         </div>

diff --git a/...rc/app/features/applications/application-details/naru-details/naru-details.component.html b/...rc/app/features/applications/application-details/naru-details/naru-details.component.html
@@ -151,9 +151,7 @@
         </div>
       </ng-container>
       <ng-container *ngFor="let existingResidence of _applicationSubmission.naruExistingResidences; let i = index">
-        <div>
-          {{ i + 1 }}
-        </div>
+        <div>#{{ i + 1 }}</div>
         <div>
           {{ existingResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
         </div>
@@ -168,8 +166,13 @@
         </div>
       </ng-container>
       <app-naru-residence-mobile-card
-        *ngFor="let existingResidence of _applicationSubmission.naruExistingResidences; let last = last"
-        [residence]="existingResidence"
+        *ngFor="let existingResidence of _applicationSubmission.naruExistingResidences; let last = last; let i = index"
+        [residence]="{
+          id: i + 1,
+          floorArea: existingResidence.floorArea,
+          description: existingResidence.description,
+          isExpanded: false,
+        }"
         [isLast]="last"
         [isReviewStep]="true"
       >
@@ -187,9 +190,7 @@
       </div>
     </ng-container>
     <ng-container *ngFor="let proposedResidence of _applicationSubmission.naruProposedResidences; let i = index">
-      <div>
-        {{ i + 1 }}
-      </div>
+      <div>#{{ i + 1 }}</div>
       <div>
         {{ proposedResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
       </div>
@@ -204,8 +205,13 @@
       </div>
     </ng-container>
     <app-naru-residence-mobile-card
-      *ngFor="let proposedResidence of _applicationSubmission.naruProposedResidences; let last = last"
-      [residence]="proposedResidence"
+      *ngFor="let proposedResidence of _applicationSubmission.naruProposedResidences; let last = last; let i = index"
+      [residence]="{
+        id: i + 1,
+        floorArea: proposedResidence.floorArea,
+        description: proposedResidence.description,
+        isExpanded: false,
+      }"
       [isLast]="last"
       [isReviewStep]="true"
     >

diff --git a/...features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html b/...features/applications/edit-submission/proposal/naru-proposal/naru-proposal.component.html
@@ -455,7 +455,7 @@ <h2>Proposal</h2>
         <table mat-table [dataSource]="existingResidencesSource">
           <ng-container class="sample" matColumnDef="index">
             <th mat-header-cell *matHeaderCellDef>Existing Residence</th>
-            <td mat-cell *matCellDef="let i = index">{{ i + 1 }}</td>
+            <td mat-cell *matCellDef="let i = index">#{{ i + 1 }}</td>
           </ng-container>
 
           <ng-container matColumnDef="floorArea">
@@ -527,7 +527,7 @@ <h2>Proposal</h2>
         <table mat-table [dataSource]="proposedResidencesSource">
           <ng-container class="sample" matColumnDef="index">
             <th mat-header-cell *matHeaderCellDef>Proposed Residence</th>
-            <td mat-cell *matCellDef="let i = index">{{ i + 1 }}</td>
+            <td mat-cell *matCellDef="let i = index">#{{ i + 1 }}</td>
           </ng-container>
 
           <ng-container matColumnDef="floorArea">

diff --git a/...d/src/app/features/public/application/submission/naru-details/naru-details.component.html b/...d/src/app/features/public/application/submission/naru-details/naru-details.component.html
@@ -137,9 +137,7 @@
         </div>
       </ng-container>
       <ng-container *ngFor="let existingResidence of applicationSubmission.naruExistingResidences; let i = index">
-        <div>
-          {{ i + 1 }}
-        </div>
+        <div>#{{ i + 1 }}</div>
         <div>
           {{ existingResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
         </div>
@@ -174,15 +172,15 @@
       <div class="subheading2">Total Floor Area</div>
       <div class="subheading2">Description</div>
       <ng-container *ngFor="let proposedResidence of applicationSubmission.naruProposedResidences; let i = index">
-        <div>{{ i + 1 }}</div>
+        <div>#{{ i + 1 }}</div>
         <div>
           {{ proposedResidence.floorArea }} <span matTextSuffix>m<sup>2</sup></span>
         </div>
         <div>{{ proposedResidence.description }}</div>
       </ng-container>
     </div>
     <ng-container *ngIf="isMobile">
-      <div class="subheading2 grid-1 residence-mobile-header">Total Floor Area of Proposed Residence(s)</div>
+      <div class="subheading2 grid-1">Total Floor Area of Proposed Residence(s)</div>
       <ng-container *ngIf="applicationSubmission.naruProposedResidences?.length === 0">
         <div>
           <app-no-data></app-no-data>

diff --git a/...d/src/app/features/public/application/submission/naru-details/naru-details.component.scss b/...d/src/app/features/public/application/submission/naru-details/naru-details.component.scss
@@ -37,7 +37,3 @@
     grid-column: 1/3;
   }
 }
-
-.residence-mobile-header {
-  padding-top: rem(15);
-}