+ At least 50% of your timetabled teaching hours must be spent teaching students of all ages in the following courses: +
+ + <%= govuk_list @form.courses, type: :bullet %> + + <%= f.govuk_collection_radio_buttons :hours_teaching_eligible_subjects, @form.radio_options, :id, :name, legend: { hidden: true } %> + + <%= f.govuk_submit %> + <% end %> +- FE teaching courses goes here -
- -<%= form_with model: @form, url: claim_path(current_journey_routing_name), method: :patch, builder: GOVUKDesignSystemFormBuilder::FormBuilder, html: { novalidate: false } do |f| %> - <%= f.govuk_submit %> -<% end %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 00beeacd15..0822104116 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -924,7 +924,7 @@ en: tlevel_building: T Level in building services engineering for construction tlevel_onsiteconstruction: T Level in onsite construction tlevel_design_surveying: T Level in design, surveying and planning for construction - level2_3_apprenticeship: Level 2 or level 3 apprenticeships in the %{link} + level2_3_apprenticeship: Level 2 or level 3 apprenticeships in the %{link} none: I do not teach any of these courses chemistry_courses: <<: *courses @@ -938,14 +938,14 @@ en: <<: *courses question: Which computing courses do you teach? options: - esfa_digitalpractitioners: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area - esfa_digitalusers: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area + esfa_digitalpractitioners: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area + esfa_digitalusers: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area digitalskills_quals: Digital functional skills qualifications and essential digital skills qualifications tlevel_digitalsupport: T Level in digital support services tlevel_digitalbusiness: T Level in digital business services tlevel_digitalproduction: T Level in digital production, design and development ib_certificate_compsci: International baccalaureate certificate in computer science - level2_3_apprenticeship: Level 2 or level 3 apprenticeships in the %{link} + level2_3_apprenticeship: Level 2 or level 3 apprenticeships in the %{link} none: I do not teach any of these courses early_years_courses: <<: *courses @@ -954,26 +954,26 @@ en: eylevel2: Early years practitioner (level 2) apprenticeship eylevel3: Early years educator (level 3) apprenticeship eytlevel: T Level in education and early years (early years educator) - coursetoeyq: A course that leads to an %{link} which enables providers to count the recipient in staff:child ratios + coursetoeyq: A course that leads to an %{link} which enables providers to count the recipient in staff:child ratios none: I do not teach any of these courses engineering_manufacturing_courses: <<: *courses question: Which engineering and manufacturing courses do you teach? options: - esfa_engineering: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area - esfa_manufacturing: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area - esfa_transportation: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area + esfa_engineering: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area + esfa_manufacturing: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area + esfa_transportation: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area tlevel_design: T Level in design and development for engineering and manufacturing tlevel_maintenance: T Level in maintenance, installation and repair for engineering and manufacturing tlevel_engineering: T Level in engineering, manufacturing, processing and control - level2_3_apprenticeship: Level 2 or level 3 apprenticeships in the %{link} + level2_3_apprenticeship: Level 2 or level 3 apprenticeships in the %{link} none: I do not teach any of these courses maths_courses: <<: *courses question: Which maths courses do you teach? options: - esfa: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area - gcse_maths: Maths GCSE, functional skills qualifications and %{link} approved for teaching to 16 to 19-year-olds who meet the condition of funding + esfa: ESFA-funded qualifications at level 3 and below in the %{link} sector subject area + gcse_maths: Maths GCSE, functional skills qualifications and %{link} approved for teaching to 16 to 19-year-olds who meet the condition of funding none: I do not teach any of these courses physics_courses: <<: *courses @@ -1013,6 +1013,10 @@ en: inclusion: Select yes if at least half your timetabled teaching hours are spent teaching 16-19-year-olds, including those up to 25 with an Education, Health and Care Plan eligible: heading: You’re eligible for a financial incentive payment + hours_teaching_eligible_subjects: + question: Do you spend at least half of your timetabled teaching hours teaching these eligible courses? + errors: + inclusion: Select yes if spend at least half of your timetabled teaching hours teaching these eligible courses check_your_answers: part_one: primary_heading: Check your answers diff --git a/spec/features/further_education_payments/happy_js_path_spec.rb b/spec/features/further_education_payments/happy_js_path_spec.rb index 0d22d9fca7..f05448de08 100644 --- a/spec/features/further_education_payments/happy_js_path_spec.rb +++ b/spec/features/further_education_payments/happy_js_path_spec.rb @@ -47,7 +47,9 @@ check "T Level in building services engineering for construction" click_button "Continue" - expect(page).to have_content("FE teaching courses goes here") + expect(page).to have_content("Do you spend at least half of your timetabled teaching hours teaching these eligible courses?") + expect(page).to have_content("T Level in building services engineering for construction") + choose("Yes") click_button "Continue" expect(page).to have_content("Are at least half of your timetabled teaching hours spent teaching 16 to 19-year-olds, including those up to age 25 with an Education, Health and Care Plan (EHCP)?") diff --git a/spec/features/further_education_payments/happy_path_spec.rb b/spec/features/further_education_payments/happy_path_spec.rb index 0eb243b898..b2eea1cee1 100644 --- a/spec/features/further_education_payments/happy_path_spec.rb +++ b/spec/features/further_education_payments/happy_path_spec.rb @@ -73,7 +73,15 @@ check "A or AS level physics" click_button "Continue" - expect(page).to have_content("FE teaching courses goes here") + expect(page).to have_content("Do you spend at least half of your timetabled teaching hours teaching these eligible courses?") + expect(page).to have_content("T Level in building services engineering for construction") + expect(page).to have_content("GCSE chemistry") + expect(page).to have_content("T Level in digital support services") + expect(page).to have_content("T Level in education and early years (early years educator)") + expect(page).to have_content("T Level in design and development for engineering and manufacturing") + expect(page).to have_content("ESFA-funded qualifications at level 3 and below in the") + expect(page).to have_content("A or AS level physics") + choose("Yes") click_button "Continue" expect(page).to have_content("Are at least half of your timetabled teaching hours spent teaching 16 to 19-year-olds, including those up to age 25 with an Education, Health and Care Plan (EHCP)?") diff --git a/spec/features/further_education_payments/ineligible_paths_spec.rb b/spec/features/further_education_payments/ineligible_paths_spec.rb index bccaff0c29..b29399e652 100644 --- a/spec/features/further_education_payments/ineligible_paths_spec.rb +++ b/spec/features/further_education_payments/ineligible_paths_spec.rb @@ -227,7 +227,6 @@ expect(page).to have_content("What type of contract do you have with #{college.name}?") choose "Permanent contract" click_button "Continue" - expect(page).to have_content("On average, how many hours per week are you timetabled to teach at #{college.name} during the current term?") choose "More than 12 hours per week" click_button "Continue" @@ -244,7 +243,8 @@ check "T Level in onsite construction" click_button "Continue" - expect(page).to have_content("FE teaching courses goes here") + expect(page).to have_content("Do you spend at least half of your timetabled teaching hours teaching these eligible courses?") + choose "Yes" click_button "Continue" expect(page).to have_content("Are at least half of your timetabled teaching hours spent teaching 16 to 19-year-olds, including those up to age 25 with an Education, Health and Care Plan (EHCP)?") @@ -308,7 +308,8 @@ check "T Level in onsite construction" click_button "Continue" - expect(page).to have_content("FE teaching courses goes here") + expect(page).to have_content("Do you spend at least half of your timetabled teaching hours teaching these eligible courses?") + choose "Yes" click_button "Continue" expect(page).to have_content("Are at least half of your timetabled teaching hours spent teaching 16 to 19-year-olds, including those up to age 25 with an Education, Health and Care Plan (EHCP)?") @@ -372,7 +373,8 @@ check "T Level in onsite construction" click_button "Continue" - expect(page).to have_content("FE teaching courses goes here") + expect(page).to have_content("Do you spend at least half of your timetabled teaching hours teaching these eligible courses?") + choose "Yes" click_button "Continue" expect(page).to have_content("Are at least half of your timetabled teaching hours spent teaching 16 to 19-year-olds, including those up to age 25 with an Education, Health and Care Plan (EHCP)?") @@ -535,7 +537,8 @@ check "T Level in onsite construction" click_button "Continue" - expect(page).to have_content("FE teaching courses goes here") + expect(page).to have_content("Do you spend at least half of your timetabled teaching hours teaching these eligible courses?") + choose "Yes" click_button "Continue" expect(page).to have_content("Are at least half of your timetabled teaching hours spent teaching 16 to 19-year-olds, including those up to age 25 with an Education, Health and Care Plan (EHCP)?") diff --git a/spec/forms/form_spec.rb b/spec/forms/form_spec.rb index c54c9df484..2526568359 100644 --- a/spec/forms/form_spec.rb +++ b/spec/forms/form_spec.rb @@ -163,6 +163,31 @@ def initialize(journey_session) end end + describe "#t" do + let(:form) { TestSlugForm.new(journey:, journey_session:, params:) } + let(:args) { {} } + let(:key) { "some_key" } + + before do + allow(I18n).to receive(:t) + form.t(key, args) + end + + context "no args" do + it do + expect(I18n).to have_received(:t).with("some_key", {scope: "test_i18n_ns.forms.test_slug"}) + end + end + + context "override i18n_form_namespace" do + let(:args) { {i18n_form_namespace: "overriden_ns"} } + + it do + expect(I18n).to have_received(:t).with("some_key", {scope: "test_i18n_ns.forms.overriden_ns"}) + end + end + end + describe "#permitted_params" do let(:claim_params) { {first_name: "test-value"} } diff --git a/spec/forms/journeys/further_education_payments/hours_teaching_eligible_subjects_form_spec.rb b/spec/forms/journeys/further_education_payments/hours_teaching_eligible_subjects_form_spec.rb new file mode 100644 index 0000000000..d6cd31b1e3 --- /dev/null +++ b/spec/forms/journeys/further_education_payments/hours_teaching_eligible_subjects_form_spec.rb @@ -0,0 +1,58 @@ +require "rails_helper" + +RSpec.describe Journeys::FurtherEducationPayments::HoursTeachingEligibleSubjectsForm, type: :model do + let(:journey) { Journeys::FurtherEducationPayments } + let(:journey_session) { create(:further_education_payments_session) } + + let(:params) do + ActionController::Parameters.new( + claim: { + hours_teaching_eligible_subjects: + } + ) + end + + subject do + described_class.new( + journey_session:, + journey:, + params: + ) + end + + describe "validations" do + let(:hours_teaching_eligible_subjects) { nil } + + it do + is_expected.not_to( + allow_value(nil) + .for(:hours_teaching_eligible_subjects) + .with_message("Select yes if spend at least half of your timetabled teaching hours teaching these eligible courses") + ) + end + end + + describe "#save" do + context "Yes" do + let(:hours_teaching_eligible_subjects) { true } + + it "updates the journey session" do + expect { expect(subject.save).to be(true) }.to( + change { journey_session.reload.answers.hours_teaching_eligible_subjects } + .to(true) + ) + end + end + + context "No" do + let(:hours_teaching_eligible_subjects) { false } + + it "updates the journey session" do + expect { expect(subject.save).to be(true) }.to( + change { journey_session.reload.answers.hours_teaching_eligible_subjects } + .to(false) + ) + end + end + end +end