EMBCESSMOD-96: Wording - Immediate/Extended family term is vague (bcg…

…ov#860) * Remove vague immediate/extended family wording in registration * Add gender select to self-registration
JonTaylorBCGov2 · Jan 22, 2020 · 32a70c9 · 32a70c9
1 parent b25477e
commit 32a70c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/...tApp/src/app/self-registration/self-registration-one/self-registration-one.component.html b/...tApp/src/app/self-registration/self-registration-one/self-registration-one.component.html
@@ -115,7 +115,7 @@ <h2 class="blue-header h3">Evacuee Family Information
       </app-font-awesome-icon>
     </h2>
     <section>
-      <p class="required">Are you registering immediate family members who live in the same household with you whom you know are safe?</p>
+      <p class="required">Are you registering family members who live in the same household with you whom you know are safe?</p>
       <div class="form-group">
         <div class="form-check">
           <input type="radio" [class.is-invalid]="invalid('registeringFamilyMembers')" class="form-check-input" value="yes" formControlName="registeringFamilyMembers" id="registeringFamilyMembersYes">
@@ -161,14 +161,6 @@ <h2 class="blue-header h3">Evacuee Family Information
                 </div>
               </div>
               <div class="row mb-2">
-                <div class="col-6">
-                  <label class="required" for="relationshipToEvacuee-{{i}}">Relationship to evacuee</label>
-                  <select [class.is-invalid]="invalid('relationshipToEvacuee', entry)" class="form-control" formControlName="relationshipToEvacuee" id="relationshipToEvacuee-{{i}}">
-                    <option [ngValue]="null">Please select--</option>
-                    <option [ngValue]="item" *ngFor="let item of relationshipTypes$ | async">{{item.description}}</option>
-                  </select>
-                  <span *ngIf="submitted" class="invalid-feedback">Please state your relationship to this family member.</span>
-                </div>
                 <div class="col">
                   <label for="gender-{{i}}">Gender</label>
                   <select class="form-control" formControlName="gender" id="gender-{{i}}">

diff --git a/...ientApp/src/app/volunteer/components/registration-maker/registration-maker.component.html b/...ientApp/src/app/volunteer/components/registration-maker/registration-maker.component.html
@@ -146,7 +146,7 @@ <h2 class="blue-header font-weight-bold">Evacuee Details</h2>
       <div class="mt-4">
         <h2 class="blue-header font-weight-bold">Evacuee Family Information</h2>
         <p class="required">
-          Is the evacuee registering any immediate family members who live in the same household with them?
+          Is the evacuee registering any family members who live in the same household with them?
         </p>
         <div class="form-group mb-0" tabindex="0">
           <div class="form-check">
@@ -189,16 +189,6 @@ <h2 class="blue-header font-weight-bold">Evacuee Family Information</h2>
                 </div>
               </div>
               <div class="row mt-2">
-                <div class="col-6">
-                  <label class="required" for="relationshipToEvacuee-{{i}}">Relationship to evacuee</label>
-                  <select [compareWith]="compareById" [class.is-invalid]="invalid('relationshipToEvacuee', entry)" class="form-control" formControlName="relationshipToEvacuee" id="relationshipToEvacuee-{{i}}">
-                    <option [ngValue]="null">Please select--</option>
-                    <option *ngFor="let item of relationshipTypes$ | async" [ngValue]="item">
-                      {{item.description}}
-                    </option>
-                  </select>
-                  <span *ngIf="submitted" class="invalid-feedback">Please state your relationship to this family member.</span>
-                </div>
                 <div class="col">
                   <label for="gender-{{i}}">Gender</label>
                   <select class="form-control" formControlName="gender" id="gender-{{i}}">