Merge pull request #192 from SoftStackFactory/190-wizard-html-bug2

192 deleted a whole question and update variables

Author: khoadnguyen

src/pages/wizard/wizard.html

@@ -145,7 +145,6 @@ <h1 class="h1">Questionnaire <ion-badge>1/3</ion-badge></h1>
                   Are you an active member or a veteran?
                 </ion-item-divider>
                 <ion-item class="q-wrapper">
-                  <a class="select" >Select</a>
                   <ion-select 
                     placeholder="Select &#x25BC;"
                     formControlName="vetOrActive"
@@ -197,7 +196,7 @@ <h1 class="h1">Questionnaire <ion-badge>1/3</ion-badge></h1>
                   </ion-select>
                 </ion-item>
                 <ion-item  no-lines *ngIf="!firstForm.controls.disability.valid && (firstForm.controls.disability.touched || submitIntent)" >
-                    <p class="invalid-text">Enter an option</p>
+                  <p class="invalid-text">Enter an option</p>
                 </ion-item>
               </ion-item-group>
             </ion-card>
@@ -249,7 +248,7 @@ <h1 class="h1">Questionnaire <ion-badge>2/3</ion-badge></h1>
                   <ion-select 
                     placeholder="Select&#x25BC;"
                     formControlName="employment"
-                    [selectOptions] = 'UnemployedOptions'>
+                    [selectOptions] = 'unemployedOptions'>
                     <ion-option value="Employed">Employed</ion-option>
                     <ion-option value="Unemployed">Unemployed</ion-option>
                   </ion-select>
@@ -281,27 +280,6 @@ <h1 class="h1">Questionnaire <ion-badge>2/3</ion-badge></h1>
               </ion-item-group>
             </ion-card>    
 
-            <ion-card  [class.invalid]="!secondForm.controls.marital.valid && (secondForm.controls.marital.touched)" class="card-wrapper">
-              <ion-item-group>
-                <ion-item-divider class='q-group' color="light">
-                    Are you married?
-                </ion-item-divider>
-                <ion-item class="q-wrapper">
-                  <ion-select 
-                  placeholder="Select&#x25BC;"
-                  formControlName="marital"
-                  [selectOptions] = 'marriageOptions'>
-                  <ion-option value="married">Yes</ion-option>
-                  <ion-option value="notMarried">No</ion-option>
-                </ion-select>
-                </ion-item>
-                <ion-item *ngIf="!secondForm.controls.marital.valid && (secondForm.controls.marital.touched)" >
-                    <p class="invalid-text">Enter an option</p>
-                </ion-item>
-              </ion-item-group>
-            </ion-card>     
-
-
             <ion-card  [class.invalid]="!secondForm.controls.marital.valid && (secondForm.controls.marital.touched)" class="card-wrapper">
               <ion-item-group>
                 <ion-item-divider class='q-group' color="light">
@@ -324,7 +302,7 @@ <h1 class="h1">Questionnaire <ion-badge>2/3</ion-badge></h1>
                 </ion-item>
               </ion-item-group>
             </ion-card>     
-      <!-- <button ion-button type="submit" [disabled]="" (click)="onSubmit()" >submit</button> -->
+    
           </form>
         </div> 
       </ion-slide> 
@@ -406,7 +384,7 @@ <h1 class="h1">Questionnaire <ion-badge>3/3</ion-badge> </h1>
                 </ion-select>
                 </ion-item>
                 <ion-item *ngIf="!thirdForm.controls.enlistedPay.valid && (thirdForm.controls.enlistedPay.touched)" >
-                    <p class="invalid-text">Enter an option</p>
+                  <p class="invalid-text">Enter an option</p>
                 </ion-item>
               </ion-item-group>
             </ion-card>     

src/pages/wizard/wizard.ts

@@ -231,7 +231,7 @@ export class WizardPage {
   branchOption = this.customizeSelectOptions("Military Branch", "Select a branch");
   vetOrActiveOptions = this.customizeSelectOptions("Military Status", "Select one");
   disabilityOptions = this.customizeSelectOptions("Disability Status", "Select one");
-  UnemployedOptions = this.customizeSelectOptions("Employement Status", "Select one");
+  unemployedOptions = this.customizeSelectOptions("Employement Status", "Select one");
   maritalOptions = this.customizeSelectOptions("Marital Status","Select one");
   insigniaOptions = this.customizeSelectOptions("Officer Rank Insignia", "Select one")
   enlistedPayOptions = this.customizeSelectOptions("Enlisted Pay Rank", "Select one")