diff --git a/app/controllers/eligibility_interface/work_experience_in_england_controller.rb b/app/controllers/eligibility_interface/work_experience_in_england_controller.rb index b995d9837e..13347f7bee 100644 --- a/app/controllers/eligibility_interface/work_experience_in_england_controller.rb +++ b/app/controllers/eligibility_interface/work_experience_in_england_controller.rb @@ -7,6 +7,7 @@ class WorkExperienceInEnglandController < BaseController def new @form = WorkExperienceInEnglandForm.new( + eligibility_check: eligibility_check, eligible: eligibility_check.eligible_work_experience_in_england, ) end diff --git a/app/models/work_history.rb b/app/models/work_history.rb index 9491e3ba8b..4b97956042 100644 --- a/app/models/work_history.rb +++ b/app/models/work_history.rb @@ -132,8 +132,6 @@ def requires_contact_information? ) end - private - def country_code_england? CountryCode.england?(country_code) end diff --git a/app/views/eligibility_interface/teach_children/new.html.erb b/app/views/eligibility_interface/teach_children/new.html.erb index 864ced9489..05b14eb805 100644 --- a/app/views/eligibility_interface/teach_children/new.html.erb +++ b/app/views/eligibility_interface/teach_children/new.html.erb @@ -10,7 +10,7 @@ if @form.eligibility_check.qualified_for_subject_required? && @eligibility_check.eligible_work_experience_in_england? hint += "

" - hint += "You told us you have valid work experience in England. If we cannot confirm this, you will need to prove you are qualified to teach children aged anywhere between 11 and 16 years." + hint += "You told us you have valid work experience in England. If we cannot confirm this, you will need to give evidence that you have a subject specialism in mathematics, science or languages and are qualified to teach children who are aged anywhere between 11 and 16 years." end %> diff --git a/app/views/eligibility_interface/work_experience/new.html.erb b/app/views/eligibility_interface/work_experience/new.html.erb index 8e0c1a6585..437045e2d8 100644 --- a/app/views/eligibility_interface/work_experience/new.html.erb +++ b/app/views/eligibility_interface/work_experience/new.html.erb @@ -1,3 +1,18 @@ +<% + hint = " + Your teaching work experience can be gained in any country but must be from after you qualified as a teacher. +

+ A recognised teacher is someone who meets all of the following criteria: + + ".html_safe +%> + <% content_for :page_title, title_with_error_prefix(t("helpers.legend.eligibility_interface_work_experience_form.work_experience"), error: @form.errors.any?) %> <% content_for :back_link_url, eligibility_interface_degree_path %> @@ -9,7 +24,7 @@ EligibilityCheck.work_experiences.keys, :itself, legend: { size: "l", tag: "h1" }, - hint: { text: t("helpers.hint.eligibility_interface_work_experience_form.work_experience").html_safe } + hint: { text: hint.html_safe } ) %> <% unless @region.reduced_evidence_accepted %> diff --git a/app/views/eligibility_interface/work_experience_in_england/new.html.erb b/app/views/eligibility_interface/work_experience_in_england/new.html.erb index 169862d82b..d1ac72c33e 100644 --- a/app/views/eligibility_interface/work_experience_in_england/new.html.erb +++ b/app/views/eligibility_interface/work_experience_in_england/new.html.erb @@ -1,7 +1,7 @@ <% legend = "Have you worked in a valid educational setting in England within the last 12 months?" hint = " - Your application will be prioritised if you have valid educational work experience in England within the last 12 months that we can confirm with your references. + Your application will be prioritised #{ 'and subject restrictions will be removed ' if @form.eligibility_check.qualified_for_subject_required? }if you have valid educational work experience in England within the last 12 months that we can confirm with your references.

We will only consider the following settings and roles worked in England within the last 12 months: