Merge pull request #825 from bcgov/feature/ALCS-928-3

LFNG As applicant bug fixes
bcgov · Jul 27, 2023 · 2a8df3f · 2a8df3f
2 parents 79ce256 + ba01273
commit 2a8df3f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/portal-frontend/src/app/features/application-details/application-details.component.html b/portal-frontend/src/app/features/application-details/application-details.component.html
@@ -48,7 +48,10 @@ <h3>3. Primary Contact</h3>
     </div>
     <div class="grid-double">
       {{ primaryContact?.organizationName }}
-      <app-no-data *ngIf="!primaryContact?.organizationName"></app-no-data>
+      <app-no-data
+        [showRequired]="showErrors && primaryContact?.type?.code === APPLICATION_OWNER.GOVERNMENT"
+        *ngIf="!primaryContact?.organizationName"
+      ></app-no-data>
     </div>
     <div class="subheading2 grid-1">Phone</div>
     <div class="grid-double">

diff --git a/...-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html b/...-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.html
@@ -160,7 +160,7 @@ <h6>Authorization Letters (if applicable)</h6>
       (uploadFiles)="attachFile($event, DOCUMENT_TYPE.AUTHORIZATION_LETTER)"
       (deleteFile)="onDeleteFile($event)"
       (openFile)="openFile($event)"
-      [showErrors]="showErrors || selectedLocalGovernment"
+      [showErrors]="showErrors"
       [isRequired]="needsAuthorizationLetter"
     ></app-file-drag-drop>
   </div>

diff --git a/...al-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts b/...al-frontend/src/app/features/edit-submission/primary-contact/primary-contact.component.ts
@@ -143,9 +143,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni
   }
 
   private calculateLetterRequired() {
-    const isSelfApplicant =
-      this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL ||
-      this.owners[0].type.code === APPLICATION_OWNER.GOVERNMENT;
+    const isSelfApplicant = this.owners[0].type.code === APPLICATION_OWNER.INDIVIDUAL || this.selectedLocalGovernment;
 
     this.needsAuthorizationLetter =
       this.selectedThirdPartyAgent ||
@@ -226,8 +224,6 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni
           phoneNumber: selectedOwner.phoneNumber,
           email: selectedOwner.email,
         });
-
-        this.calculateLetterRequired();
       } else if (selectedOwner) {
         this.onSelectOwner(selectedOwner.uuid);
       } else {
@@ -246,6 +242,7 @@ export class PrimaryContactComponent extends FilesStepComponent implements OnIni
         this.form.markAllAsTouched();
       }
       this.isDirty = false;
+      this.calculateLetterRequired();
     }
   }
 

diff --git a/...alcs/src/portal/application-submission-review/application-submission-review.controller.ts b/...alcs/src/portal/application-submission-review/application-submission-review.controller.ts
@@ -205,8 +205,8 @@ export class ApplicationSubmissionReviewController {
     }
 
     if (
-      primaryContact &&
-      primaryContact.type.code === APPLICATION_OWNER.GOVERNMENT
+      userLocalGovernment.uuid === applicationSubmission.localGovernmentUuid &&
+      primaryContact
     ) {
       //Copy contact details over to government form
       await this.applicationSubmissionReviewService.update(