cleanup

bcgov · Mar 5, 2024 · 11386fe · 11386fe
1 parent 8a9220d
commit 11386fe
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 27 deletions.
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
@@ -130,6 +130,12 @@ <h5>Government Parcel Contact</h5>
         </div>
         <div>{{ owner.phoneNumber }}</div>
         <div>{{ owner.email }}</div>
+        <div>
+          <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{
+            owner.corporateSummary.fileName
+          }}</a>
+          <app-no-data *ngIf="!owner.corporateSummary"></app-no-data>
+        </div>
       </ng-container>
     </div>
   </ng-container>

diff --git a/...res/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html b/...res/notice-of-intent/applicant-info/notice-of-intent-details/parcel/parcel.component.html
@@ -117,7 +117,7 @@ <h5>Government Parcel Contact</h5>
     </ng-container>
     <div
       class="full-width owner-information"
-      [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
+      *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
     >
       <div class="subheading2">Land Owner(s)</div>
       <div class="subheading2">Organization</div>
@@ -132,6 +132,12 @@ <h5>Government Parcel Contact</h5>
         </div>
         <div>{{ owner.phoneNumber }}</div>
         <div>{{ owner.email }}</div>
+        <div>
+          <a *ngIf="owner.corporateSummary" (click)="openFile(owner.corporateSummary)">{{
+            owner.corporateSummary.fileName
+          }}</a>
+          <app-no-data *ngIf="!owner.corporateSummary"></app-no-data>
+        </div>
       </ng-container>
     </div>
   </ng-container>

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
@@ -103,38 +103,38 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
       </div>
 
       <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5>
+        <h5>Government Parcel Contact</h5>
         <ng-container *ngIf="parcel.owners[0]">
           <div class="subheading2 grid-1">First Name</div>
           <div class="grid-double">
             {{ parcel.owners[0].firstName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Last Name
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].lastName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Ministry or Department
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].organizationName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div>
+          <div class="subheading2 grid-1">Phone</div>
           <div class="grid-double">
             {{ parcel.owners[0].phoneNumber ?? '' | mask : '(000) 000-0000' }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div>
+          <div class="subheading2 grid-1">Email</div>
           <div class="grid-double">
             {{ parcel.owners[0].email }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Crown Type
           </div>
           <div class="grid-double">
@@ -148,7 +148,6 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
 
       <div
         class="full-width owner-information"
-        [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }"
         *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
       >
         <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div>

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
@@ -103,38 +103,38 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
       </div>
 
       <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5>
+        <h5>Government Parcel Contact</h5>
         <ng-container *ngIf="parcel.owners[0]">
           <div class="subheading2 grid-1">First Name</div>
           <div class="grid-double">
             {{ parcel.owners[0].firstName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].firstName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Last Name
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].lastName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].lastName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Ministry or Department
           </div>
           <div class="grid-double">
             {{ parcel.owners[0].organizationName }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].organizationName"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Phone</div>
+          <div class="subheading2 grid-1">Phone</div>
           <div class="grid-double">
             {{ parcel.owners[0].phoneNumber ?? '' | mask : '(000) 000-0000' }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].phoneNumber"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Email</div>
+          <div class="subheading2 grid-1">Email</div>
           <div class="grid-double">
             {{ parcel.owners[0].email }}
             <app-no-data [showRequired]="showErrors" *ngIf="!parcel.owners[0].email"></app-no-data>
           </div>
-          <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+          <div class="subheading2 grid-1">
             Crown Type
           </div>
           <div class="grid-double">
@@ -148,7 +148,6 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
 
       <div
         class="full-width owner-information"
-        [ngClass]="{ 'crown-owner-information': parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN }"
         *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN"
       >
         <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Land Owner(s)</div>

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
@@ -59,28 +59,28 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
       </div>
     </ng-container>
     <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-      <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5>
+      <h5>Government Parcel Contact</h5>
       <ng-container *ngIf="parcel.owners[0]">
         <div class="subheading2 grid-1">First Name</div>
         <div class="grid-double">
           {{ parcel.owners[0].firstName }}
           <app-no-data *ngIf="!parcel.owners[0].firstName"></app-no-data>
         </div>
-        <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2 grid-1">
           Last Name
         </div>
         <div class="grid-double">
           {{ parcel.owners[0].lastName }}
           <app-no-data *ngIf="!parcel.owners[0].lastName"></app-no-data>
         </div>
-        <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2 grid-1">
           Ministry or Department
         </div>
         <div class="grid-double">
           {{ parcel.owners[0].organizationName }}
           <app-no-data *ngIf="!parcel.owners[0].organizationName"></app-no-data>
         </div>
-        <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2 grid-1">
           Crown Type
         </div>
         <div class="grid-double">
@@ -93,10 +93,7 @@ <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government
     </ng-container>
     <div class="full-width owner-information" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">
       <div class="subheading2">Land Owner(s)</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode !== PARCEL_OWNERSHIP_TYPES.CROWN">Organization</div>
-      <div class="subheading2" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-        Ministry or Department
-      </div>
+      <div class="subheading2">Organization</div>
       <ng-container *ngFor="let owner of parcel.owners">
         <div>{{ owner.displayName }}</div>
         <div>

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
@@ -59,28 +59,28 @@ <h4>Parcel #{{ parcelInd + 1 }}</h4>
       </div>
     </ng-container>
     <ng-container *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
-      <h5 *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">Government Parcel Contact</h5>
+      <h5>Government Parcel Contact</h5>
       <ng-container *ngIf="parcel.owners[0]">
         <div class="subheading2 grid-1">First Name</div>
         <div class="grid-double">
           {{ parcel.owners[0].firstName }}
           <app-no-data *ngIf="!parcel.owners[0].firstName"></app-no-data>
         </div>
-        <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2 grid-1">
           Last Name
         </div>
         <div class="grid-double">
           {{ parcel.owners[0].lastName }}
           <app-no-data *ngIf="!parcel.owners[0].lastName"></app-no-data>
         </div>
-        <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2 grid-1">
           Ministry or Department
         </div>
         <div class="grid-double">
           {{ parcel.owners[0].organizationName }}
           <app-no-data *ngIf="!parcel.owners[0].organizationName"></app-no-data>
         </div>
-        <div class="subheading2 grid-1" *ngIf="parcel.ownershipTypeCode === PARCEL_OWNERSHIP_TYPES.CROWN">
+        <div class="subheading2 grid-1">
           Crown Type
         </div>
         <div class="grid-double">