Merge pull request #1994 from bcgov/release/R3.0.0

r3.0.0->r3.1.0
bcgov · Apr 5, 2024 · cda2313 · cda2313
2 parents d359764 + 492c485
commit cda2313
Show file tree

Hide file tree

Showing 10 changed files with 72 additions and 48 deletions.
diff --git a/.github/workflows/build-template.yml b/.github/workflows/build-template.yml
@@ -59,7 +59,9 @@ jobs:
           images: ${{ inputs.REGISTRY }}/${{ inputs.IMAGE_NAME }}
           tags: |
             type=ref,event=branch
-            type=schedule,pattern={{date 'YYYYMMDD-hhmmss' tz='America/Vancouver'}}
+            type=ref,event=pr
+            type=ref,event=tag
+            type=raw,value={{date 'YYYYMMDD-hhmmss' tz='America/Vancouver'}}
 
       # Build and push Docker image with Buildx (don't push on PR)
       # https://github.com/docker/build-push-action

diff --git a/ess/src/API/EMBC.ESS.Utilities.Dynamics/DynamicSchemasVersionInformationProvider.cs b/ess/src/API/EMBC.ESS.Utilities.Dynamics/DynamicSchemasVersionInformationProvider.cs
@@ -26,11 +26,12 @@ public async Task<IEnumerable<VersionInformation>> Get()
             }
             catch (Exception)
             {
+                version = "unknown";
             }
 
             return new[]
             {
-                new VersionInformation { Name = "Dynamics:ERAEntitySolution", Version = version == null ? null : Version.Parse(version) }
+                new VersionInformation { Name = "Dynamics:ERAEntitySolution", Version = version }
             };
         }
     }

diff --git a/registrants/src/UI/embc-registrant/src/app/core/api/models/person-details.ts b/registrants/src/UI/embc-registrant/src/app/core/api/models/person-details.ts
@@ -11,5 +11,4 @@ export interface PersonDetails {
   initials?: null | string;
   lastName: string;
   preferredName?: null | string;
-  isPrimaryRegistrant?: boolean
 }
diff --git a/registrants/src/UI/embc-registrant/src/app/core/model/needs.model.ts b/registrants/src/UI/embc-registrant/src/app/core/model/needs.model.ts
@@ -152,10 +152,9 @@ export class PetForm {
           customValidator
             .conditionalValidation(
               () => this.addPetIndicator.value,
-              Validators.required, 
+              Validators.required
             )
-            .bind(customValidator),
-            customValidator.whitespaceValidator()
+            .bind(customValidator)
         ]
       ]
     });

diff --git a/registrants/src/UI/embc-registrant/src/app/core/services/customValidation.service.ts b/registrants/src/UI/embc-registrant/src/app/core/services/customValidation.service.ts
@@ -165,6 +165,7 @@ export class CustomValidationService {
     };
   }
 
+
   /**
    * Checks an array of controls by name, to see if they all have different values (unless empty)
    *

diff --git a/registrants/src/UI/embc-registrant/src/app/feature-components/edit/edit.service.ts b/registrants/src/UI/embc-registrant/src/app/feature-components/edit/edit.service.ts
@@ -17,7 +17,7 @@ export class EditService {
     private formCreationService: FormCreationService,
     private needsAssessmentMapping: NeedsAssessmentMappingService,
     private evacuationFileDataService: EvacuationFileDataService
-  ) {}
+  ) { }
 
   /**
    * Updates the form with latest values
@@ -68,13 +68,13 @@ export class EditService {
         this.needsAssessmentDataService.insurance = form.get('insurance').value;
         break;
       case 'pets':
-          this.needsAssessmentDataService.pets = form.get('pets').value;
-          break;
+        this.needsAssessmentDataService.pets = form.get('pets').value;
+        break;
       case 'family-information':
-          this.needsAssessmentDataService.setHouseHoldMembers(
-            form.get('householdMembers').value
-          );
-          break;
+        this.needsAssessmentDataService.setHouseHoldMembers(
+          form.get('householdMembers').value
+        );
+        break;
       case 'identify-needs':
         this.needsAssessmentDataService.setNeedsDetails(form);
         break;
@@ -183,9 +183,9 @@ export class EditService {
           form.reset();
         }
         break;
-      case 'family-information-pets':
+      case 'family-information':
         if (
-          this.needsAssessmentDataService.householdMembers.length !== 0 ) {
+          this.needsAssessmentDataService.householdMembers.length !== 0) {
           if (path === 'verified-registration') {
             form
               .get('householdMembers')
@@ -209,7 +209,7 @@ export class EditService {
         break;
       case 'pets':
         if (
-          this.needsAssessmentDataService.pets.length !== 0 
+          this.needsAssessmentDataService.pets?.length !== 0
         ) {
           form.get('pets').patchValue(this.needsAssessmentDataService.pets);
         } else {
@@ -219,14 +219,14 @@ export class EditService {
       case 'identify-needs':
         if (
           this.needsAssessmentDataService.canEvacueeProvideClothing !==
-            undefined &&
+          undefined &&
           this.needsAssessmentDataService.canEvacueeProvideFood !== undefined &&
           this.needsAssessmentDataService.canEvacueeProvideIncidentals !==
-            undefined &&
+          undefined &&
           this.needsAssessmentDataService.canEvacueeProvideLodging !==
-            undefined &&
+          undefined &&
           this.needsAssessmentDataService.canEvacueeProvideTransportation !==
-            undefined
+          undefined
         ) {
           form
             .get('canEvacueeProvideClothing')

diff --git a/...I/embc-registrant/src/app/feature-components/needs-assessment/needs-assessment.service.ts b/...I/embc-registrant/src/app/feature-components/needs-assessment/needs-assessment.service.ts
@@ -237,7 +237,7 @@ export class NeedsAssessmentService {
       return [...this.householdMembers, primaryMember];
     } else if (
       !this.householdMembers.find(
-        (member) => member.details.isPrimaryRegistrant === true
+        (member) => member.isPrimaryRegistrant === true
       )
     ) {
       return [...this.householdMembers, primaryMember];

diff --git a/...components/dialog-components/view-assessment-dialog/view-assessment-dialog.component.html b/...components/dialog-components/view-assessment-dialog/view-assessment-dialog.component.html
@@ -43,20 +43,17 @@
 <div class="row row-padding">
   <div class="col-md-5">Evacuated From</div>
   <div class="col-md-7">
-    <p
-      class="bold"
-      [innerHTML]="profileData?.evacuatedFromAddress | maskEvacuatedaddress"
-    ></p>
+    <p class="bold" [innerHTML]="profileData?.evacuatedFromAddress | maskEvacuatedaddress"></p>
   </div>
 </div>
 
 <div class="row row-padding">
   <div class="col-md-5">Facility/ Registration Location</div>
   <div class="col-md-7 bold">
     {{
-      profileData?.registrationLocation
-        ? profileData?.registrationLocation
-        : 'n/a'
+    profileData?.registrationLocation
+    ? profileData?.registrationLocation
+    : 'n/a'
     }}
   </div>
 </div>
@@ -83,23 +80,16 @@
 
 <div class="row row-padding">
   <div class="col-12">
-    <mat-table
-      class="table-outline"
-      [dataSource]="profileData?.needsAssessment?.householdMembers"
-    >
+    <mat-table class="table-outline" [dataSource]="profileData?.needsAssessment?.householdMembers">
       <ng-container matColumnDef="firstName">
-        <mat-header-cell class="header-cell" *matHeaderCellDef
-          >First Name</mat-header-cell
-        >
+        <mat-header-cell class="header-cell" *matHeaderCellDef>First Name</mat-header-cell>
         <mat-cell *matCellDef="let element">
           {{ element.firstName }}
         </mat-cell>
       </ng-container>
 
       <ng-container matColumnDef="lastName">
-        <mat-header-cell class="header-cell" *matHeaderCellDef
-          >Last Name</mat-header-cell
-        >
+        <mat-header-cell class="header-cell" *matHeaderCellDef>Last Name</mat-header-cell>
         <mat-cell *matCellDef="let element">
           {{ element.lastName }}
         </mat-cell>
@@ -114,14 +104,46 @@
         </mat-cell>
       </ng-container>
 
-      <mat-header-row
-        class="table-header"
-        *matHeaderRowDef="memberColumns"
-      ></mat-header-row>
-      <mat-row
-        class="bold"
-        *matRowDef="let row; columns: memberColumns"
-      ></mat-row>
+      <mat-header-row class="table-header" *matHeaderRowDef="memberColumns"></mat-header-row>
+      <mat-row class="bold" *matRowDef="let row; columns: memberColumns"></mat-row>
+    </mat-table>
+  </div>
+</div>
+
+<hr class="dotted-hr hr-padding" />
+<div class="row row-padding">
+  <div class="col-md-12">
+    <p class="subsection-heading">Pets</p>
+  </div>
+</div>
+
+<div class="row row-padding">
+  <div class="col-5">Pets?</div>
+  <div class="col-7 bold">
+    {{ profileData?.needsAssessment?.pets?.length !== 0 ? 'Yes' : 'No' }}
+  </div>
+</div>
+<div class="row" *ngIf="profileData?.needsAssessment?.pets?.length > 0">
+  <div class="col-md-8">
+    <mat-table class="table-outline" [dataSource]="profileData?.needsAssessment?.pets">
+      <ng-container matColumnDef="type">
+        <mat-header-cell class="header-cell" *matHeaderCellDef>Pet Type</mat-header-cell>
+        <mat-cell *matCellDef="let element">
+          {{ element.type }}
+        </mat-cell>
+      </ng-container>
+
+      <ng-container matColumnDef="quantity">
+        <mat-header-cell class="header-cell" *matHeaderCellDef>
+          Number
+        </mat-header-cell>
+        <mat-cell *matCellDef="let element">
+          {{ element.quantity }}
+        </mat-cell>
+      </ng-container>
+
+      <mat-header-row class="table-header" *matHeaderRowDef="petColumns"></mat-header-row>
+      <mat-row class="bold" *matRowDef="let row; columns: petColumns"></mat-row>
     </mat-table>
   </div>
 </div>

diff --git a/shared/src/EMBC.Utilities.Hosting/HostVersionInformationProvider.cs b/shared/src/EMBC.Utilities.Hosting/HostVersionInformationProvider.cs
@@ -15,7 +15,7 @@ public async Task<IEnumerable<VersionInformation>> Get()
             var version = Environment.GetEnvironmentVariable("VERSION");
             return new[]
             {
-                new VersionInformation { Name = name ?? null!, Version = version == null ? null : Version.Parse(version) }
+                new VersionInformation { Name = name ?? null!, Version = version }
             };
         }
     }

diff --git a/shared/src/EMBC.Utilities/Configuration/Interfaces.cs b/shared/src/EMBC.Utilities/Configuration/Interfaces.cs
@@ -48,6 +48,6 @@ public interface IVersionInformationProvider
     public class VersionInformation
     {
         public string Name { get; set; } = null!;
-        public Version? Version { get; set; }
+        public string? Version { get; set; }
     }
 }