diff --git a/app/sidekiq/education_form/templates/1995.erb b/app/sidekiq/education_form/templates/1995.erb index 3080a18d4cb..78f99e3717a 100644 --- a/app/sidekiq/education_form/templates/1995.erb +++ b/app/sidekiq/education_form/templates/1995.erb @@ -126,7 +126,7 @@ Date Entered Date Separated Service Component Date Entered Date Separated Service Component <% @applicant&.toursOfDuty&.each do |tour| -%> <%= to_date(tour.dateRange&.from) %> <%= to_date(tour.dateRange&.to) %> <%= tour.serviceBranch %> -<% end %> +<% end -%> <% end -%> <% unless Settings.vsp_environment.eql?('production') -%> @@ -184,8 +184,12 @@ Signature/Title/Branch of Armed Forces Education Service Officer Date <% if @applicant.isActiveDuty -%> As an active-duty service member, you have consulted with an Education Service Officer (ESO) regarding your education program. +<% else -%> +<% if @applicant.minorHighSchoolQuestions -%> + You are the parent, guardian, or custodian of the applicant <% else -%> Certification and Signature of Applicant +<% end -%> Signature of Applicant Date <% end -%> <% end -%> diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.json b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.json index 2102ff28357..fa8e95826e0 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.json +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.json @@ -44,7 +44,7 @@ "guardianEmail":"test84@test.com" }, "applicantServed": "Yes", - "isActiveDuty": true, + "isActiveDuty": false, "toursOfDuty": [{ "dateRange": { "from": "2010-06-26", diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl index ffc3802a020..80f95ad9845 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated.spl @@ -61,7 +61,7 @@ Education or Career Goal: Served in the armed forces?: Yes -Are You Now On Active Duty?: YES +Are You Now On Active Duty?: NO Do you have any new periods of service to record since you last applied for education benefits? YES @@ -90,8 +90,8 @@ Address of Parent, Guardian or Custodian: Email address: test84@test.com -As an active-duty service member, you have consulted with an Education Service -Officer (ESO) regarding your education program. + You are the parent, guardian, or custodian of the applicant +Signature of Applicant Date Electronically Received by VA: 2017-01-17 Confirmation #: V-EBC-1 diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.json b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.json index c3fcb550e54..d7a705c734b 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.json +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.json @@ -48,7 +48,7 @@ "guardianEmail":"test84@test.com" }, "applicantServed": "Yes", - "isActiveDuty": true, + "isActiveDuty": false, "toursOfDuty": [{ "dateRange": { "from": "2010-06-26", diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl index 2e0fd2d8a57..179ad95507a 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_graduated_sponsor.spl @@ -70,7 +70,7 @@ Education or Career Goal: Served in the armed forces?: Yes -Are You Now On Active Duty?: YES +Are You Now On Active Duty?: NO Do you have any new periods of service to record since you last applied for education benefits? YES @@ -99,8 +99,8 @@ Address of Parent, Guardian or Custodian: Email address: test84@test.com -As an active-duty service member, you have consulted with an Education Service -Officer (ESO) regarding your education program. + You are the parent, guardian, or custodian of the applicant +Signature of Applicant Date Electronically Received by VA: 2017-01-17 Confirmation #: V-EBC-1 diff --git a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl index 488ab1cd212..3282cb24760 100644 --- a/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl +++ b/spec/fixtures/education_benefits_claims/1995/ch30_guardian_not_graduated.spl @@ -88,7 +88,7 @@ Address of Parent, Guardian or Custodian: Email address: test84@test.com - Certification and Signature of Applicant + You are the parent, guardian, or custodian of the applicant Signature of Applicant Date Electronically Received by VA: 2017-01-17