[AQTS-1145] Prioritisation content updates

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

app/models/work_history.rb

@@ -132,8 +132,6 @@ def requires_contact_information?
       )
   end
 
-  private
-
   def country_code_england?
     CountryCode.england?(country_code)
   end

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 += "<br /><br />"
-    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
 %>
 

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.
+    <br /><br />
+    A recognised teacher is someone who meets all of the following criteria:
+    <ul class='govuk-list govuk-list--bullet govuk-hint'>
+      <li>worked in the role after becoming qualified as a teacher</li>
+      <li>worked in a school that delivers mandatory education</li>
+      <li>worked unsupervised with children aged between 5 and 16 years</li>
+      <li>were solely responsible for planning, preparing, and delivering lessons to at least 4 students at a time</li>
+      <li>were solely responsible for assessing and reporting on the progress of those students</li>
+    </ul>
+  ".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 %>

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.
     <br /><br />
     We will only consider the following settings and roles worked in England within the last 12 months:
     <ul class='govuk-list govuk-list--bullet govuk-hint'>

app/views/shared/eligible_region_content_components/_proof_of_recognition.html.erb

@@ -145,3 +145,7 @@
     <%= raw GovukMarkdown.render(region.country.other_information) %>
   <% end %>
 <% end %>
+
+<p class="govuk-body">
+  Your <%= region_certificate_name(region) %> must be dated within 6 months of you applying for QTS.
+</p>

app/views/teacher_interface/other_england_work_histories/add_another.html.erb

@@ -8,7 +8,7 @@
 
   <%
     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 may be removed ' if @application_form.subject_limited? }if you have valid educational work experience in England within the last 12 months that we can confirm with your references.
       <br /><br />
       We will consider the following settings and roles worked in England within the last 12 months:
       <ul class='govuk-list govuk-list--bullet govuk-hint'>

app/views/teacher_interface/other_england_work_histories/edit_contact.html.erb

@@ -13,7 +13,7 @@
   <p class="govuk-body">The person you choose must:</p>
 
   <ul class="govuk-list govuk-list--bullet">
-    <li>be a senior member of staff at this institution (either a headteacher/principal, an assistant/deputy head, or an institution business manager)</li>
+    <li>be a senior member of staff at this institution (either a headteacher/principal, an assistant/deputy head, a head of department, or an institution business manager)</li>
     <li>be able to provide a reference in English</li>
     <li>only comment on teaching work that you did <strong>after</strong> becoming a qualified teacher</li>
   </ul>
@@ -23,7 +23,7 @@
   <%= govuk_warning_text(text: "You cannot act as your own reference.") %>
 
   <%= govuk_details(summary_text: "Choosing someone to verify this role") do %>
-    <p>A senior member of staff means either a headteacher/principal, an assistant/deputy head or an institution business manager.</p>
+    <p>A senior member of staff means either a headteacher/principal, an assistant/deputy head, a head of department, or an institution business manager.</p>
 
     <p>Make sure you have an up-to-date email address for the person you choose, because the reference they provide will be important to your application.</p>
 

app/views/teacher_interface/other_england_work_histories/edit_meets_criteria.html.erb

@@ -8,7 +8,7 @@
 
   <%
     hint = "
-      Your application may be prioritised if you have already told us about work history as a teacher or supply teacher in England within the last 12 months.
+      Your application may be prioritised #{ 'and subject restrictions may be removed ' if @application_form.subject_limited? }if you have already told us about work history as a teacher or supply teacher in England within the last 12 months.
       <br /><br />
       We will also consider the following settings and roles worked in England within the last 12 months:
       <ul class='govuk-list govuk-list--bullet govuk-hint'>

app/views/teacher_interface/other_england_work_histories/new.html.erb

@@ -1,4 +1,4 @@
-<% content_for :page_title, title_with_error_prefix(t("application_form.other_england_work_history.school.heading.#{@work_history.locale_key}"), error: @form.errors.any?) %>
+<% content_for :page_title, title_with_error_prefix(t("application_form.other_england_work_history.school.#{@work_history.initial_other_england_educational_role_by_user? ? 'first' : 'others'}.heading"), error: @form.errors.any?) %>
 <% content_for :back_link_url, back_history_path(default: teacher_interface_application_form_other_england_work_histories_path) %>
 
 <%= render "school_form", form: @form %>

app/views/teacher_interface/uploads/new.html.erb

@@ -148,7 +148,7 @@
             <li><%= requirement %></li>
           <% end %>
         </ul>
-        <p class="govuk-body">This written confirmation must be dated within 6 months of you applying for QTS.</p>
+        <%= govuk_warning_text(text: "This written confirmation must be dated within 6 months of you applying for QTS.") %>
 
         <% if @application_form.region.status_check_written? %>
           <% if @application_form.region.status_information.present? %>

app/views/teacher_interface/work_histories/_school_form.html.erb

@@ -21,6 +21,12 @@
         <li>solely responsible for assessing and reporting on the progress of those students</li>
       </ul>
 
+      <% if form.work_history.application_form.includes_prioritisation_features %>
+        <p class="govuk-body">
+          Only include your roles as a teacher that meet the above requirements here. We’ll ask about other educational work experience gained in England later, for example, as a cover supervisor, teaching assistant, lecturer or tutor.
+        </p>
+      <% end %>
+
       <%= govuk_warning_text(text: "Any teaching work experience gained before you were qualified as a teacher will not be considered.") %>
 
       <% unless form.work_history.application_form.reduced_evidence_accepted %>

app/views/teacher_interface/work_histories/edit_contact.html.erb

@@ -13,7 +13,7 @@
   <p class="govuk-body">The person you choose must:</p>
 
   <ul class="govuk-list govuk-list--bullet">
-    <li>be a senior member of staff at this school (either a headteacher/principal, an assistant/deputy head, or a school business manager)</li>
+    <li>be a senior member of staff at this school (either a headteacher/principal, an assistant/deputy head, or a school business manager)<%= ", we will also accept a head of department for schools in England" if @form.work_history.country_code_england? %></li>
     <li>be able to provide a reference in English</li>
     <li>only comment on teaching work that you did <strong>after</strong> becoming a qualified teacher</li>
   </ul>
@@ -24,7 +24,7 @@
 
   <%= govuk_details(summary_text: "Choosing someone to verify this role") do %>
 
-    <p>A senior member of staff means either a headteacher/principal, an assistant/deputy head or a school business manager.</p>
+    <p>A senior member of staff means either a headteacher/principal, an assistant/deputy head or a school business manager. <%= "We will also accept a head of department for schools in England." if @form.work_history.country_code_england? %></p>
 
     <p>Make sure you have an up-to-date email address for the person you choose, because the reference they provide will be important to your application.</p>
 

config/locales/helpers.en.yml

@@ -30,8 +30,6 @@ en:
         location: This means you have all the qualifications needed to teach in a state school.<br /><br />You’ll need to show that you completed your teaching training at level 6 or equivalent in the country that you select.
       eligibility_interface_region_form:
         region_id: This means you have all the qualifications needed to teach in a state school.<br /><br />You’ll need to show that you completed your teaching training at level 6 or equivalent in the country that you select.
-      eligibility_interface_work_experience_form:
-        work_experience: Your teaching work experience can be gained in any country but must be from after you qualified as a teacher.
       teacher:
         email: We’ll use this to send you an email with a link to continue with your QTS application. Do not use a work or university email that you might lose access to.
       teacher_interface_add_another_qualification_form:
@@ -75,6 +73,7 @@ en:
         hours_per_week: This means all the hours you spent working per week for this role (not just the hours you spent teaching students). In roles where you worked under 30 hours per week we may need to ask for more information when we assess your application.
         start_date: For example, 3 2020, If you cannot remember the exact month or year, enter an estimate.
         end_date: For example, 3 2020, If you cannot remember the exact month or year, enter an estimate.
+        job: This is the job title for your role as a teacher that meets the requirements above. This does not include cover supervisor, teaching assistant, lecturer or tutor roles.
       teacher_interface_other_england_work_history_school_form:
         postcode: This helps assessors to verify the institution you worked in.
         school_website: If this institution does not have a webpage, the assessor may need to ask you for further information to verify it.

config/locales/teacher_interface.en.yml

@@ -211,12 +211,12 @@ en:
       heading: What subjects are you qualified to teach?
       hint: Enter up to 3 subjects. The assessor will compare what you enter to the subjects that appear on the curriculum in England.
     work_history:
-      current_or_most_recent_role: Your current or most recent role
-      previous_role: Previous role
+      current_or_most_recent_role: Your current or most recent role as a teacher
+      previous_role: Previous role as a teacher
       school:
         heading:
-          current_or_most_recent_role: Add your current or most recent role
-          previous_role: Add another role
+          current_or_most_recent_role: Add your current or most recent role as a teacher
+          previous_role: Add another role as a teacher
       contact:
         heading: Who should we contact to verify this role?
     other_england_work_history:

spec/helpers/work_history_helper_spec.rb

@@ -8,7 +8,7 @@
 
     let(:work_history) { build(:work_history) }
 
-    it { is_expected.to eq("Your current or most recent role") }
+    it { is_expected.to eq("Your current or most recent role as a teacher") }
 
     context "with a school name" do
       before { work_history.school_name = "Name" }