Merge pull request #1975 from TimaQT/features/timaqt/EMBCESSMOD-5056

EMBCESSMOD-5056: bug fixes

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

@@ -8,7 +8,7 @@
   </div>
 
 
-<app-household-members  (ValidHouseholdMemebersIndicator)="ValidHouseholdMemebersIndicator($event)"></app-household-members>
+<app-household-members (ValidSelectedHouseholdMembers)="ValidSelectedHouseholdMembers($event)"  (ValidHouseholdMemebersIndicator)="ValidHouseholdMemebersIndicator($event)"></app-household-members>
 <app-animals (ValidPetsIndicator)="ValidPetsIndicator($event)"></app-animals>
 
 

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

@@ -18,7 +18,8 @@ export class HouseholdMembersPetsComponent implements OnInit {
 
 
   petsValid = false;
-  householdMembersValid = true;
+  householdMembersValid = false;
+  householdMembersQuantityValid = true;
   tabMetaData: TabModel;
 
   constructor(
@@ -52,15 +53,15 @@ export class HouseholdMembersPetsComponent implements OnInit {
   }
   ValidPetsIndicator(data): void { this.petsValid = data }
   ValidHouseholdMemebersIndicator(data): void { this.householdMembersValid = data }
+  ValidSelectedHouseholdMembers(data): void { this.householdMembersQuantityValid = data }
 
   private updateTabStatus() {
-    if (this.petsValid && this.householdMembersValid) {
+    if (this.petsValid && this.householdMembersValid && this.householdMembersQuantityValid) {
       this.stepEssFileService.setTabStatus('household-members-pets', 'complete');
-    } else if (!this.petsValid || !this.householdMembersValid) {
-      this.stepEssFileService.setTabStatus('household-members-pets', 'incomplete');
-    }
-    else {
+    } else if (!this.petsValid && !this.householdMembersValid) {
       this.stepEssFileService.setTabStatus('household-members-pets', 'not-started');
+    } else if (!this.petsValid || !this.householdMembersValid || !this.householdMembersQuantityValid) {
+      this.stepEssFileService.setTabStatus('household-members-pets', 'incomplete');
     }
   }
 }

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

@@ -45,7 +45,8 @@ export class HouseholdMembersComponent implements OnInit, OnDestroy {
   tabUpdateSubscription: Subscription;
   memberTipText: string;
   tabMetaData: TabModel;
-  @Output() ValidHouseholdMemebersIndicator : any = new EventEmitter();
+  @Output() ValidHouseholdMemebersIndicator: any = new EventEmitter();
+  @Output() ValidSelectedHouseholdMembers: any = new EventEmitter();
 
   constructor(
     public stepEssFileService: StepEssFileService,
@@ -56,7 +57,7 @@ export class HouseholdMembersComponent implements OnInit, OnDestroy {
     private householdService: HouseholdMembersService,
     private wizardService: WizardService,
     private appBaseService: AppBaseService
-  ) {}
+  ) { }
 
   ngOnInit(): void {
     this.memberTipText = this.appBaseService?.wizardProperties?.memberTipText;
@@ -82,6 +83,12 @@ export class HouseholdMembersComponent implements OnInit, OnDestroy {
       }
     }
 
+    if ((this.householdForm.get('hasHouseholdMembers').value === 'No' && (this.householdForm.get('houseHoldMember').valid)) || (this.householdForm.get('hasHouseholdMembers').value === 'Yes' && this.memberSource.value.length > 1)) {
+      this.ValidHouseholdMemebersIndicator.emit(true);
+    }
+    else
+      this.ValidHouseholdMemebersIndicator.emit(false);
+
     // Displaying household member form in case 'haveHouseholdMembers' has been set to true
     if (
       this.stepEssFileService.haveHouseHoldMembers === 'Yes' &&
@@ -107,12 +114,19 @@ export class HouseholdMembersComponent implements OnInit, OnDestroy {
     // Updates the status of the form according to changes
     this.householdForm
       .get('addMemberFormIndicator')
-      .valueChanges.subscribe(() => {this.updateOnVisibility();
-        this.ValidHouseholdMemebersIndicator.emit(this.householdForm.valid);
-      }    
-    );
+      .valueChanges.subscribe(() => {
+        this.updateOnVisibility();
+      }
+      );
+
 
+    this.householdForm.valueChanges.subscribe(() => {
+      if ((this.householdForm.get('hasHouseholdMembers').value === 'No' && (this.householdForm.get('houseHoldMember').valid)) || (this.householdForm.get('hasHouseholdMembers').value === 'Yes' && this.memberSource.value.length > 1)) {
+        this.ValidHouseholdMemebersIndicator.emit(true);
+      } else
+        this.ValidHouseholdMemebersIndicator.emit(false);
 
+    })
 
     this.tabMetaData = this.stepEssFileService.getNavLinks('household-members');
   }
@@ -253,6 +267,7 @@ export class HouseholdMembersComponent implements OnInit, OnDestroy {
   isAllSelected() {
     const numSelected = this.selection.selected.length;
     const numRows = this.members.length;
+    this.ValidSelectedHouseholdMembers.emit(numSelected > 0);
     return numSelected === numRows;
   }