PRIME-2706 Mismatch Missing Business License flag in Admin (#2506)

* initial commit * fix unit test * fix PR issue --------- Co-authored-by: Alan Leung <alan.leung57@gmail.com>
bcgov · Jul 11, 2024 · eab5e82 · eab5e82
1 parent 815b66f
commit eab5e82
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 6 deletions.
diff --git a/...on/shared/components/site-registration-container/site-registration-container.component.ts b/...on/shared/components/site-registration-container/site-registration-container.component.ts
@@ -226,7 +226,8 @@ export class SiteRegistrationContainerComponent extends AbstractSiteAdminPage im
  status,
  businessLicence,
  flagged,
- isNew
+ isNew,
+ missingBusinessLicence
  } = site;
 
  return {
@@ -244,7 +245,8 @@ export class SiteRegistrationContainerComponent extends AbstractSiteAdminPage im
  status,
  businessLicence,
  flagged,
- isNew
+ isNew,
+ missingBusinessLicence
  };
  }
 }
diff --git a/...dication/shared/components/site-registration-table/site-registration-table.component.html b/...dication/shared/components/site-registration-table/site-registration-table.component.html
@@ -132,8 +132,7 @@
  *matHeaderCellDef
  scope="col"> Missing Business Licence </th>
  <td mat-cell
- *matCellDef="let row;"> {{ ((row.careSettingCode === CareSettingEnum.COMMUNITY_PHARMACIST)
- ? row.missingBusinessLicence : null) | yesNo | default: 'N/A' }} </td>
+ *matCellDef="let row;"> {{ displayMissingBusinessLicence(row) }} </td>
  </ng-container>
 
  <ng-container matColumnDef="actions">

diff --git a/...judication/shared/components/site-registration-table/site-registration-table.component.ts b/...judication/shared/components/site-registration-table/site-registration-table.component.ts
@@ -108,6 +108,22 @@ export class SiteRegistrationTableComponent implements OnInit, AfterViewInit {
  }
  }
 
+ public displayMissingBusinessLicence(row: SiteRegistrationListViewModel): string {
+ if (row.careSettingCode === CareSettingEnum.COMMUNITY_PHARMACIST) {
+ if (row.missingBusinessLicence === undefined) {
+ row.missingBusinessLicence = row.businessLicence === null ||
+ row.businessLicence.businessLicenceDocument === null
+ }
+ if (row.missingBusinessLicence) {
+ return "Yes"
+ } else {
+ return "No"
+ }
+ } else {
+ return "N/A";
+ }
+ }
+
  public remoteUsers(siteRegistration: SiteRegistrationListViewModel): number | 'Yes' | 'No' | 'N/A' {
  const count = siteRegistration.remoteUserCount;
 

diff --git a/prime-angular-frontend/src/app/modules/site-registration/shared/models/site.model.ts b/prime-angular-frontend/src/app/modules/site-registration/shared/models/site.model.ts
@@ -51,6 +51,7 @@ export class Site {
  activeBeforeRegistration: boolean;
  isNew: boolean;
  deviceProviderId: string;
+ missingBusinessLicence: boolean;
 
  public static getExpiryDate(site: Site | SiteListViewModel): string | null {
  if (!site) {
@@ -67,7 +68,7 @@ export class Site {
  }
 }
 
-export interface SiteListViewModel extends Pick<Site, 'id' | 'physicalAddress' | 'doingBusinessAs' | 'submittedDate' | 'careSettingCode' | 'siteVendors' | 'completed' | 'pec' | 'mnemonic' | 'status' | 'businessLicence' | 'flagged' | 'approvedDate' | 'isNew'> {
+export interface SiteListViewModel extends Pick<Site, 'id' | 'physicalAddress' | 'doingBusinessAs' | 'submittedDate' | 'careSettingCode' | 'siteVendors' | 'completed' | 'pec' | 'mnemonic' | 'status' | 'businessLicence' | 'flagged' | 'approvedDate' | 'isNew' | 'missingBusinessLicence'> {
  adjudicatorIdir: string;
  remoteUserCount: number;
  flagged: boolean;

diff --git a/prime-angular-frontend/src/test/mocks/mock-community-site.service.ts b/prime-angular-frontend/src/test/mocks/mock-community-site.service.ts
@@ -84,7 +84,8 @@ export class MockCommunitySiteService {
  activeBeforeRegistration: false,
  isNew: false,
  individualDeviceProviders: [],
- deviceProviderId: null
+ deviceProviderId: null,
+ missingBusinessLicence: false
  });
  }