Merge pull request bcgov#2067 from TimaQT/features/timaqt/EMBCESSMOD-…

…5172

EMBCESSMOD-5172: Needs Assessment display issues

responders/src/API/EMBC.Responders.API/Controllers/RegistrationsController.Files.cs

@@ -367,7 +367,7 @@ public enum IdentifiedNeed
         ShelterAllowance,
 
         [Description("Transportation")]
-        Tranportation,
+        Transportation,
 
         [Description("Food")]
         Food,

responders/src/UI/embc-responder/src/app/core/api/models/identified-need.ts

@@ -3,7 +3,7 @@
 export enum IdentifiedNeed {
   ShelterReferral = 'ShelterReferral',
   ShelterAllowance = 'ShelterAllowance',
-  Tranportation = 'Tranportation',
+  Transportation = 'Transportation',
   Food = 'Food',
   Incidentals = 'Incidentals',
   Clothing = 'Clothing'

responders/src/UI/embc-responder/src/app/core/services/global-constants.ts

@@ -714,3 +714,6 @@ export const incidentalsNeedDialog: DialogContent = {
   title: 'Incidentals',
   text: 'Incidentals could include miscellaneous items such as personal hygiene products such as toothpaste, laundry soap and/or pet food.'
 };
+
+export const noAssistanceRequired =
+  'Household currently does not require assistance.';

responders/src/UI/embc-responder/src/app/feature-components/search/essfile-dashboard/ess-file-details/ess-file-details.component.html

@@ -183,7 +183,7 @@
       <div class="row">
         <div class="col-12">
           <div class="row" *ngIf="getIdentifiedNeeds().length === 0">
-            <div class="col-12 bold">Household currently does not require assistance.</div>
+            <div class="col-12 bold">{{noAssistanceRequiredMessage}}</div>
           </div>
           <div class="row" *ngFor="let item of getIdentifiedNeeds()">
             <div class="col-12 bold">{{ item }}</div>

responders/src/UI/embc-responder/src/app/feature-components/search/essfile-dashboard/ess-file-details/ess-file-details.component.ts

@@ -13,6 +13,7 @@ import { EvacuationFileHouseholdMember } from 'src/app/core/api/models';
 })
 export class EssFileDetailsComponent implements OnInit {
 
+  noAssistanceRequiredMessage = globalConst.noAssistanceRequired; 
   memberListDisplay: EvacuationFileHouseholdMember[];
 
   memberColumns: string[] = ['firstName', 'lastName', 'dateOfBirth'];

responders/src/UI/embc-responder/src/app/feature-components/search/essfile-dashboard/ess-file-overview/ess-file-overview.component.html

@@ -120,7 +120,7 @@
         <div class="col-md-9 table-parent">
           <table class="table-details">
           <tr *ngIf="getIdentifiedNeeds().length === 0">
-            <td><b>Household currently does not require assistance.</b></td>
+            <td><b>{{noAssistanceRequiredMessage}}</b></td>
           </tr>
             <tr *ngFor="let item of getIdentifiedNeeds()">
               <th>{{ item }}</th>

responders/src/UI/embc-responder/src/app/feature-components/search/essfile-dashboard/ess-file-overview/ess-file-overview.component.ts

@@ -12,6 +12,7 @@ import * as globalConst from '../../../../core/services/global-constants';
 export class EssFileOverviewComponent implements OnInit {
   essFile: EvacuationFileModel;
   animalCount = 0;
+  noAssistanceRequiredMessage = globalConst.noAssistanceRequired;
 
   constructor(
     private router: Router,

responders/src/UI/embc-responder/src/app/feature-components/wizard/ess-file-components/ess-file-review/ess-file-review.component.html

@@ -208,7 +208,7 @@
                 <div class="col-12 bold">{{ item }}</div>
               </div>
               <div class="row" *ngIf="stepEssFileService?.needsIdentified.length == 0">
-                <div class="col-12 bold">Household currently does not require assistance.</div>
+                <div class="col-12 bold">{{noAssistanceRequiredMessage}}</div>
               </div>
             </div>
           </div>

responders/src/UI/embc-responder/src/app/feature-components/wizard/ess-file-components/ess-file-review/ess-file-review.component.ts

@@ -37,6 +37,7 @@ export class EssFileReviewComponent implements OnInit, OnDestroy {
 
   petColumns: string[] = ['type', 'quantity'];
   tabMetaData: TabModel;
+  noAssistanceRequiredMessage = globalConst.noAssistanceRequired; 
 
   constructor(
     public stepEssFileService: StepEssFileService,

responders/src/UI/embc-responder/src/app/feature-components/wizard/step-ess-file/step-ess-file.service.ts

@@ -310,14 +310,14 @@ export class StepEssFileService {
     }
 
     public get requiresTransportation(): boolean {
-        return this.needs.has(IdentifiedNeed.Tranportation);
+        return this.needs.has(IdentifiedNeed.Transportation);
     }
 
     public set requiresTransportation(checked: boolean) {
-        if (checked && !this.needs.has(IdentifiedNeed.Tranportation)) {
-            this.needs.add(IdentifiedNeed.Tranportation);
-        } else if (!checked && this.needs.has(IdentifiedNeed.Tranportation)) {
-            this.needs.delete(IdentifiedNeed.Tranportation);
+        if (checked && !this.needs.has(IdentifiedNeed.Transportation)) {
+            this.needs.add(IdentifiedNeed.Transportation);
+        } else if (!checked && this.needs.has(IdentifiedNeed.Transportation)) {
+            this.needs.delete(IdentifiedNeed.Transportation);
         }
     }
     public get requiresShelterReferral(): boolean {

responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/select-support/select-support.component.html

@@ -74,11 +74,19 @@
           <div
             class="row"
             *ngFor="
-              let item of evacueeSessionService?.currentNeedsAssessment?.needs
+              let item of getIdentifiedNeeds()
             "
           >
             <div class="col-4">{{ item }}</div>
           </div>
+          <div
+          class="row"
+          *ngIf="
+          getIdentifiedNeeds().length == 0
+          "
+        >
+          <div class="col-8">{{noAssistanceRequiredMessage}}</div>
+        </div>
         </mat-card>
       </div>
     </div>

responders/src/UI/embc-responder/src/app/feature-components/wizard/support-components/select-support/select-support.component.ts

@@ -10,6 +10,7 @@ import { Code, SupportCategory, SupportSubCategory } from 'src/app/core/api/mode
 import { EvacueeSessionService } from 'src/app/core/services/evacuee-session.service';
 import { LoadEvacueeListService } from 'src/app/core/services/load-evacuee-list.service';
 import { StepSupportsService } from '../../step-supports/step-supports.service';
+import * as globalConst from '../../../../core/services/global-constants';
 
 @Component({
   selector: 'app-select-support',
@@ -19,6 +20,7 @@ import { StepSupportsService } from '../../step-supports/step-supports.service';
 export class SelectSupportComponent implements OnInit {
   supportList: Code[] = [];
   supportTypeForm: UntypedFormGroup;
+  noAssistanceRequiredMessage = globalConst.noAssistanceRequired
 
   constructor(
     public stepSupportsService: StepSupportsService,
@@ -29,6 +31,7 @@ export class SelectSupportComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
+
     this.supportList = this.loadEvacueeListService
       .getSupportTypeList()
       .filter((element) => element.description !== '' && element.value !== SupportSubCategory.Lodging_Billeting && element.value !== SupportCategory.Lodging);
@@ -37,6 +40,15 @@ export class SelectSupportComponent implements OnInit {
     this.createVerificationForm();
   }
 
+  public getIdentifiedNeeds(): string[] {
+    return Array.from(this.evacueeSessionService?.currentNeedsAssessment?.needs ?? []).map(
+      (need) =>
+        this.loadEvacueeListService
+          ?.getIdentifiedNeeds()
+          ?.find((value) => value.value === need)?.description
+    );
+  }
+
   createVerificationForm(): void {
     this.supportTypeForm = this.formBuilder.group({
       type: ['', [Validators.required]]

responders/src/UI/embc-responder/src/app/feature-components/wizard/wizard.service.ts

@@ -309,7 +309,7 @@ export class WizardService {
       form.requiresFood.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.Food) &&
       form.requiresClothing.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.Clothing) &&
       form.requiresIncidentals.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.Incidentals) &&
-      form.requiresTransportation.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.Tranportation) &&
+      form.requiresTransportation.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.Transportation) &&
       form.requiresShelterAllowance.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.ShelterAllowance) &&
       form.requiresShelterReferral.value === initialValue.needsAssessment.needs.indexOf(IdentifiedNeed.ShelterReferral)
     );

responders/src/UI/embc-responder/src/app/shared/components/dialog-components/view-assessment-dialog/view-assessment-dialog.component.html

@@ -181,9 +181,18 @@
 
 <div
   class="row row-padding"
-  *ngFor="let item of profileData.needsAssessment.needs"
+  *ngFor="let item of getIdentifiedNeeds()"
 >
   <div class="col-12 bold">
     {{ item }}
   </div>
 </div>
+
+<div
+  class="row row-padding"
+  *ngIf="getIdentifiedNeeds().length == 0"
+>
+  <div class="col-12 bold">
+    {{noAssistanceRequiredMessage}}
+  </div>
+</div>

responders/src/UI/embc-responder/src/app/shared/components/dialog-components/view-assessment-dialog/view-assessment-dialog.component.ts

@@ -3,6 +3,7 @@ import { DialogContent } from 'src/app/core/models/dialog-content.model';
 import { EvacuationFileModel } from 'src/app/core/models/evacuation-file.model';
 import { EvacueeSessionService } from 'src/app/core/services/evacuee-session.service';
 import * as globalConst from '../../../../core/services/global-constants';
+import { LoadEvacueeListService } from 'src/app/core/services/load-evacuee-list.service';
 
 @Component({
   selector: 'app-view-assessment-dialog',
@@ -16,10 +17,12 @@ export class ViewAssessmentDialogComponent implements OnInit {
 
   memberColumns: string[] = ['firstName', 'lastName', 'dateOfBirth'];
   petColumns: string[] = ['type', 'quantity'];
+  noAssistanceRequiredMessage = globalConst.noAssistanceRequired; 
+  constructor(public evacueeSessionService: EvacueeSessionService,
+    private loadEvacueeListService: LoadEvacueeListService) {}
 
-  constructor(public evacueeSessionService: EvacueeSessionService) {}
-
-  ngOnInit(): void {}
+  ngOnInit(): void {
+  }
 
   cancel() {
     this.outputEvent.emit('close');
@@ -36,4 +39,13 @@ export class ViewAssessmentDialogComponent implements OnInit {
       (ins) => ins.value === incomingValue
     )?.name;
   }
+
+  public getIdentifiedNeeds(): string[] {
+    return Array.from(this.evacueeSessionService?.currentNeedsAssessment?.needs ?? []).map(
+      (need) =>
+        this.loadEvacueeListService
+          ?.getIdentifiedNeeds()
+          ?.find((value) => value.value === need)?.description
+    );
+  }
 }