Merge pull request #1976 from TimaQT/features/timaqt/EMBCESSMOD-5036

EMBCESSMOD-5035, EMBCESSMOD-5036 - Pets/Family Validation
bcgov · Mar 28, 2024 · 04382dd · 04382dd
2 parents f0ede4d + 6206384
commit 04382dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
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,4 +11,5 @@ 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,9 +152,10 @@ export class PetForm {
           customValidator
             .conditionalValidation(
               () => this.addPetIndicator.value,
-              Validators.required
+              Validators.required, 
             )
-            .bind(customValidator)
+            .bind(customValidator),
+            customValidator.whitespaceValidator()
         ]
       ]
     });

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.isPrimaryRegistrant === true
+        (member) => member.details.isPrimaryRegistrant === true
       )
     ) {
       return [...this.householdMembers, primaryMember];