Merge pull request #1708 from bcgov/feature/ALCS-1925

No Data -> Not Applicable for Owner/Transferee Organization Fields
bcgov · May 27, 2024 · 4ead5bb · 4ead5bb
2 parents 7a8e965 + c49e852
commit 4ead5bb
Show file tree

Hide file tree

Showing 32 changed files with 45 additions and 54 deletions.
diff --git a/...eatures/application/applicant-info/application-details/application-details.component.scss b/...eatures/application/applicant-info/application-details/application-details.component.scss
@@ -32,9 +32,7 @@
   }
 
   .no-data-text {
-    text-align: center;
     color: colors.$grey;
-    padding-top: 12px;
 
     .error {
       justify-content: center;

diff --git a/.../app/features/application/applicant-info/application-details/parcel/parcel.component.html b/.../app/features/application/applicant-info/application-details/parcel/parcel.component.html
@@ -118,7 +118,10 @@ <h5>Government Parcel Contact</h5>
         </div>
         <div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-organization'">
           {{ owner.organizationName }}
-          <app-no-data *ngIf="!owner.organizationName"></app-no-data>
+          <div class="no-data" *ngIf="!owner.organizationName">
+            <div *ngIf="owner.type.code === 'INDV'" class="no-data-text">Not Applicable</div>
+            <div *ngIf="owner.type.code !== 'INDV'" class="no-data-text">No Data</div>
+          </div>
         </div>
         <div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-phone-number'">
           {{ owner.phoneNumber }}
@@ -130,7 +133,10 @@ <h5>Government Parcel Contact</h5>
           <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">
             {{ owner.corporateSummary.fileName }}
           </a>
-          <app-no-data *ngIf="!owner.corporateSummary"></app-no-data>
+          <div class="no-data" *ngIf="!owner.corporateSummary">
+            <div *ngIf="owner.type.code === 'INDV'" class="no-data-text">Not Applicable</div>
+            <div *ngIf="owner.type.code !== 'INDV'" class="no-data-text">No Data</div>
+          </div>
         </div>
       </ng-container>
       <app-no-data *ngIf="parcel.owners.length === 0"></app-no-data>

diff --git a/...ures/notification/applicant-info/notification-details/notification-details.component.html b/...ures/notification/applicant-info/notification-details/notification-details.component.html
@@ -15,7 +15,7 @@ <h3>Transferee(s)</h3>
         <div>{{ transferee.displayName }}</div>
         <div>
           {{ transferee.organizationName }}
-          <app-no-data *ngIf="!transferee.organizationName"></app-no-data>
+          <div *ngIf="!transferee.organizationName" class="no-data-text">Not Applicable</div>
         </div>
         <div>
           <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask: '(000) 000-0000' }}</span>

diff --git a/...ures/notification/applicant-info/notification-details/notification-details.component.scss b/...ures/notification/applicant-info/notification-details/notification-details.component.scss
@@ -26,13 +26,7 @@
   }
 
   .no-data-text {
-    text-align: center;
     color: colors.$grey;
-    padding-top: 12px;
-
-    .error {
-      justify-content: center;
-    }
   }
 
   .table-wrapper {

diff --git a/...tend/src/app/features/applications/application-details/application-details.component.scss b/...tend/src/app/features/applications/application-details/application-details.component.scss
@@ -38,7 +38,7 @@
 
   .no-data-text {
     text-align: center;
-    color: colors.$grey;
+    color: colors.$grey-dark;
     padding-top: rem(12);
 
     .error {

diff --git a/...l-frontend/src/app/features/applications/application-details/parcel/parcel.component.html b/...l-frontend/src/app/features/applications/application-details/parcel/parcel.component.html
@@ -156,7 +156,7 @@ <h5>Government Parcel Contact</h5>
           </div>
           <div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-organization'">
             <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }}
-            <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data>
+            <div *ngIf="!owner.organizationName" class="no-data-text">Not Applicable</div>
           </div>
           <div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-phone-number'">
             {{ owner.phoneNumber ?? '' | mask: '(000) 000-0000' }}
@@ -166,8 +166,8 @@ <h5>Government Parcel Contact</h5>
           </div>
           <div [attr.data-testid]="'parcel-' + (parcelInd + 1) + '-owner-corporate-summary'">
             <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary)">{{
-              owner.corporateSummary.fileName
-            }}</a>
+                owner.corporateSummary.fileName
+              }}</a>
             <div class="no-data" *ngIf="!owner.corporateSummary">
               <div class="no-data-text">Not Applicable</div>
             </div>

diff --git a/...atures/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss b/...atures/notice-of-intents/notice-of-intent-details/notice-of-intent-details.component.scss
@@ -36,16 +36,6 @@
     font-weight: 600;
   }
 
-  .no-data-text {
-    text-align: center;
-    color: colors.$grey;
-    padding-top: rem(12);
-
-    .error {
-      justify-content: center;
-    }
-  }
-
   .custom-mat-expansion-panel-header {
     height: fit-content;
   }

diff --git a/.../src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html b/.../src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.html
@@ -150,15 +150,21 @@ <h5>Government Parcel Contact</h5>
           <div>{{ owner.displayName }}</div>
           <div>
             <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }}
-            <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data>
+            <div class="no-data" *ngIf="!owner.organizationName">
+              <div *ngIf="owner.type.code === 'INDV'" class="no-data-text">Not Applicable</div>
+              <div *ngIf="owner.type.code !== 'INDV'" class="no-data-text">No Data</div>
+            </div>
           </div>
           <div>{{ owner.phoneNumber ?? '' | mask : '(000) 000-0000' }}</div>
           <div>{{ owner.email }}</div>
           <div>
             <a *ngIf="owner.corporateSummary" (click)="onOpenFile(owner.corporateSummary)">{{
-              owner.corporateSummary.fileName
-            }}</a>
-            <app-no-data [showRequired]="false" *ngIf="!owner.corporateSummary"></app-no-data>
+                owner.corporateSummary.fileName
+              }}</a>
+            <div class="no-data" *ngIf="!owner.corporateSummary">
+              <div *ngIf="owner.type.code === 'INDV'" class="no-data-text">Not Applicable</div>
+              <div *ngIf="owner.type.code !== 'INDV'" class="no-data-text">No Data</div>
+            </div>
           </div>
         </ng-container>
         <div class="full-width">

diff --git a/.../src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss b/.../src/app/features/notice-of-intents/notice-of-intent-details/parcel/parcel.component.scss
@@ -1,4 +1,5 @@
 @use '../../../../../styles/functions' as *;
+@use '../../../../../styles/colors';
 
 .parcel-header {
   display: flex;
@@ -41,3 +42,7 @@
 .crown-land {
   text-transform: capitalize;
 }
+
+.no-data-text {
+  color: colors.$grey-dark;
+}
diff --git a/...end/src/app/features/notifications/edit-submission/transferees/transferees.component.html b/...end/src/app/features/notifications/edit-submission/transferees/transferees.component.html
@@ -40,14 +40,14 @@ <h4>All Transferees</h4>
           <span *ngIf="element.organizationName">
             {{ element.organizationName }}
           </span>
-          <span class="no-data" *ngIf="!element.organizationName"> No Data </span>
+          <span class="no-data-text" *ngIf="!element.organizationName"> Not Applicable </span>
         </td>
       </ng-container>
 
       <ng-container matColumnDef="phone">
         <th mat-header-cell *matHeaderCellDef>Phone</th>
         <td mat-cell *matCellDef="let element">
-          {{ element.phoneNumber | mask : '(000) 000-0000' }}
+          {{ element.phoneNumber | mask: '(000) 000-0000' }}
         </td>
       </ng-container>
 

diff --git a/...end/src/app/features/notifications/edit-submission/transferees/transferees.component.scss b/...end/src/app/features/notifications/edit-submission/transferees/transferees.component.scss
@@ -7,6 +7,10 @@
   padding: rem(8);
 }
 
+.no-data-text {
+  color: colors.$grey-dark;
+}
+
 .actions-cell {
   button:not(:last-child) {
     margin-right: rem(12) !important;

diff --git a/...d/src/app/features/notifications/notification-details/notification-details.component.html b/...d/src/app/features/notifications/notification-details/notification-details.component.html
@@ -20,7 +20,7 @@ <h3>2. Identify Transferee(s)</h3>
         <div>{{ transferee.displayName }}</div>
         <div>
           {{ transferee.organizationName }}
-          <app-no-data *ngIf="!transferee.organizationName" [showRequired]="false"></app-no-data>
+          <div *ngIf="!transferee.organizationName" class="no-data-text">Not Applicable</div>
         </div>
         <div>
           <span *ngIf="transferee.phoneNumber">{{ transferee.phoneNumber | mask : '(000) 000-0000' }}</span>

diff --git a/...d/src/app/features/notifications/notification-details/notification-details.component.scss b/...d/src/app/features/notifications/notification-details/notification-details.component.scss
@@ -31,13 +31,7 @@
   }
 
   .no-data-text {
-    text-align: center;
-    color: colors.$grey;
-    padding-top: rem(12);
-
-    .error {
-      justify-content: center;
-    }
+    color: colors.$grey-dark;
   }
 
   .custom-mat-expansion-panel-header {

diff --git a/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html b/portal-frontend/src/app/features/public/application/submission/parcel/parcel.component.html
@@ -91,7 +91,7 @@ <h5>Government Parcel Contact</h5>
         <div>{{ owner.displayName }}</div>
         <div>
           <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }}
-          <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data>
+          <div *ngIf="!owner.organizationName" class="no-data-text">Not Applicable</div>
         </div>
       </ng-container>
       <div class="full-width">

diff --git a/...frontend/src/app/features/public/application/submission/submission-details.component.scss b/...frontend/src/app/features/public/application/submission/submission-details.component.scss
@@ -28,8 +28,7 @@
 
   .no-data-text {
     text-align: center;
-    color: colors.$grey;
-    padding-top: rem(12);
+    color: colors.$grey-dark;
 
     .error {
       justify-content: center;

diff --git a/...frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html b/...frontend/src/app/features/public/notice-of-intent/submission/parcel/parcel.component.html
@@ -91,7 +91,7 @@ <h5>Government Parcel Contact</h5>
         <div>{{ owner.displayName }}</div>
         <div>
           <span *ngIf="owner.organizationName"></span>{{ owner.organizationName }}
-          <app-no-data [showRequired]="false" *ngIf="!owner.organizationName"></app-no-data>
+          <div *ngIf="!owner.organizationName" class="no-data-text">Not Applicable</div>
         </div>
       </ng-container>
       <div class="full-width">

diff --git a/...end/src/app/features/public/notice-of-intent/submission/submission-details.component.scss b/...end/src/app/features/public/notice-of-intent/submission/submission-details.component.scss
@@ -28,8 +28,7 @@
 
   .no-data-text {
     text-align: center;
-    color: colors.$grey;
-    padding-top: rem(12);
+    color: colors.$grey-dark;
 
     .error {
       justify-content: center;

diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.html
@@ -14,7 +14,9 @@
       </ng-container>
 
       <td mat-cell *matCellDef="let element">
-        <app-no-data [showRequired]="false" *ngIf="!element.organizationName"></app-no-data>
+        <div class="no-data" *ngIf="!element.organizationName">
+          <div class="no-data-text">Not Applicable</div>
+        </div>
         <span>{{ element.organizationName }}</span>
       </td>
     </ng-container>
@@ -39,8 +41,8 @@
       <td mat-cell *matCellDef="let element">
         <div *ngIf="element.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
           <a *ngIf="element.corporateSummary" (click)="onOpenFile(element.corporateSummary)">{{
-            element.corporateSummary.fileName
-          }}</a>
+              element.corporateSummary.fileName
+            }}</a>
           <div class="no-data" *ngIf="!element.corporateSummary">
             <div class="no-data-text">Not Applicable</div>
           </div>

diff --git a/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss b/portal-frontend/src/app/shared/owner-dialogs/parcel-owners/parcel-owners.component.scss
@@ -7,12 +7,6 @@
   }
 }
 
-.no-data-text {
-  text-align: center;
-  color: colors.$grey-dark;
-  padding-top: rem(12);
-}
-
 .no-data-text {
   color: colors.$grey-dark;
   text-align: left;

diff --git a/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pfrs-submission-template.docx
diff --git a/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx b/services/templates/pdf/noi-submissions/noi-pofo-submission-template.docx
diff --git a/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx b/services/templates/pdf/noi-submissions/noi-roso-submission-template.docx
diff --git a/services/templates/pdf/submissions/cove-submission-template.docx b/services/templates/pdf/submissions/cove-submission-template.docx
diff --git a/services/templates/pdf/submissions/excl-submission-template.docx b/services/templates/pdf/submissions/excl-submission-template.docx
diff --git a/services/templates/pdf/submissions/incl-submission-template.docx b/services/templates/pdf/submissions/incl-submission-template.docx
diff --git a/services/templates/pdf/submissions/naru-submission-template.docx b/services/templates/pdf/submissions/naru-submission-template.docx
diff --git a/services/templates/pdf/submissions/nfu-submission-template.docx b/services/templates/pdf/submissions/nfu-submission-template.docx
diff --git a/services/templates/pdf/submissions/pfrs-submission-template.docx b/services/templates/pdf/submissions/pfrs-submission-template.docx
diff --git a/services/templates/pdf/submissions/pofo-submission-template.docx b/services/templates/pdf/submissions/pofo-submission-template.docx
diff --git a/services/templates/pdf/submissions/roso-submission-template.docx b/services/templates/pdf/submissions/roso-submission-template.docx
diff --git a/services/templates/pdf/submissions/subd-submission-template.docx b/services/templates/pdf/submissions/subd-submission-template.docx
diff --git a/services/templates/pdf/submissions/tur-submission-template.docx b/services/templates/pdf/submissions/tur-submission-template.docx