diff --git a/Client/src/app/components/vbs-page/vbs-page.component.html b/Client/src/app/components/vbs-page/vbs-page.component.html index 24895aa..d47b890 100644 --- a/Client/src/app/components/vbs-page/vbs-page.component.html +++ b/Client/src/app/components/vbs-page/vbs-page.component.html @@ -53,7 +53,7 @@
Grade - + Please enter student grade diff --git a/Client/src/app/components/vbs-page/vbs-page.component.ts b/Client/src/app/components/vbs-page/vbs-page.component.ts index 34812b0..39c7d38 100644 --- a/Client/src/app/components/vbs-page/vbs-page.component.ts +++ b/Client/src/app/components/vbs-page/vbs-page.component.ts @@ -74,7 +74,6 @@ this.form = this.formBuilder.group({ studentComplete(): boolean { var firstName = this.form.get('firstName'); var lastName = this.form.get('lastName'); - var grade = this.form.get('grade'); var dob = this.form.get('dob'); var hasAllergies = this.form.get('hasAllergies'); var hasDietaryRestrictions = this.form.get('hasDietaryRestrictions'); @@ -85,7 +84,6 @@ this.form = this.formBuilder.group({ var hasFirst = firstName && firstName.value && firstName.value.length > 1; var hasLast = lastName && lastName.value && lastName.value.length > 1; - var hasGrade = grade && grade.value && grade.value > 0; var hasDob = dob && dob.value != null; var hasAllergiesComplete = hasAllergies && hasAllergies.value != null; var hasDietaryRestrictionsComplete = hasDietaryRestrictions && hasDietaryRestrictions.value != null; @@ -97,7 +95,7 @@ this.form = this.formBuilder.group({ var validAllergies = hasAllergiesComplete && ((hasAllergies.value === 'true' && allergiesComplete) || (hasAllergies.value === 'false')); var validDietaryRestrictions = hasDietaryRestrictionsComplete && ((hasDietaryRestrictions.value === 'true' && dietaryRestrictionsComplete) || (hasDietaryRestrictions.value === 'false')); - return hasFirst && hasLast && hasGrade && hasDob && validAllergies && validDietaryRestrictions && hasRidesBus && hasAttendedInPast; + return hasFirst && hasLast && hasDob && validAllergies && validDietaryRestrictions && hasRidesBus && hasAttendedInPast; } parentComplete(): boolean {