diff --git a/app/mailers/teacher_mailer.rb b/app/mailers/teacher_mailer.rb index 09a93c9e82..24ff4d3980 100644 --- a/app/mailers/teacher_mailer.rb +++ b/app/mailers/teacher_mailer.rb @@ -19,6 +19,9 @@ def application_awarded end def application_declined + @view_object = + TeacherInterface::ApplicationFormViewObject.new(application_form:) + view_mail( GOVUK_NOTIFY_TEMPLATE_ID, to: teacher.email, diff --git a/app/views/assessor_interface/assessment_recommendation_decline/edit.html.erb b/app/views/assessor_interface/assessment_recommendation_decline/edit.html.erb index 6726e56540..4c06ccc685 100644 --- a/app/views/assessor_interface/assessment_recommendation_decline/edit.html.erb +++ b/app/views/assessor_interface/assessment_recommendation_decline/edit.html.erb @@ -32,21 +32,21 @@ <% @assessment.sections.not_preliminary.each do |section| %> <% if (selected_failure_reasons = section.selected_failure_reasons).present? %>
Your note to the applicant:
- <% else %> -Your note (the applicant won’t see this):
- <% end %> + <% if (assessor_feedback = failure_reason.assessor_feedback).present? %> + <% if FailureReasons.decline?(failure_reason: failure_reason.key) %> +Your note to the applicant:
+ <% else %> +Your note (the applicant won’t see this):
+ <% end %> - <%= govuk_inset_text do %> - <%= simple_format failure_reason.assessor_feedback %> + <%= govuk_inset_text { simple_format assessor_feedback } %> <% end %>Thank you for applying for qualified teacher status (QTS) and for your patience while we reviewed your application.
-<% if (declined_reasons = view_object.declined_reasons).present? %> - <% declined_reasons.each do |title, reasons| %> - <% if title.present? %> -While your QTS application was declined this time, you can make a new application in future, if you’re able to address the decline reasons we’ve set out.
- -If you reapply for QTS, you will not be able to review the details of your previous application.
+<%= govuk_button_link_to "Apply again", new_teacher_interface_application_form_path %>
+You’ll be able to make a new application for QTS once you've addressed the decline reasons we've given. If you reapply for QTS, you’ll not be able to review the details of your previous application.
-<%= govuk_button_link_to "Apply again", %i[new teacher_interface application_form] %>
-You may want to explore other routes to teaching in England. QTS is not a requirement to teach in independent (private) schools, academies, free schools and in the further education (FE) sector in England.
- -You can find out more about working in these sectors from:
- -For further information on other routes to gaining QTS visit <%= govuk_link_to "Get Into Teaching", "https://getintoteaching.education.gov.uk/non-uk-teachers/teach-in-england-if-you-trained-overseas" %>.
-You can also learn more about <%= govuk_link_to "training to teach in England", "https://getintoteaching.education.gov.uk/non-uk-teachers/train-to-teach-in-england-as-an-international-student" %>.
+You may want to <%= govuk_link_to "explore other routes to getting QTS", "https://www.gov.uk/government/publications/apply-for-qualified-teacher-status-qts-if-you-teach-outside-the-uk/routes-to-qualified-teacher-status-qts-for-teachers-and-those-with-teaching-experience-outside-the-uk" %>.
<% end %> -Applicants who have been declined for QTS are entitled to a review of the decline decision by a Casework Manager.
-If you would like to request a decision review, you will need to provide:
+If you would like to request a decision review, you’ll need to provide:
Your request for review must be received within 28 days of receipt of the decision to decline QTS.
-Email your request for review, including the information required as above, to <%= govuk_link_to t("service.email.enquiries"), "mailto:#{t("service.email.enquiries")}" %>.
-If you are not satisfied with the outcome of the decision review, you can request a final formal appeal to a senior Teacher Qualification Manager.
diff --git a/app/views/teacher_mailer/application_declined.text.erb b/app/views/teacher_mailer/application_declined.text.erb index 0554fb0fee..e2ebd3f64d 100644 --- a/app/views/teacher_mailer/application_declined.text.erb +++ b/app/views/teacher_mailer/application_declined.text.erb @@ -1,25 +1,43 @@ Dear <%= application_form_full_name(@application_form) %> -# Your QTS application has been declined - <%= render "shared/teacher_mailer/reference_number" %> -Thank you for applying for qualified teacher status (QTS) and for your patience while we reviewed your application. +Thank you for applying for QTS in England. Unfortunately, your application has been declined. + +# Reason for decline -Unfortunately, we’re unable to award QTS status. +<% @view_object.declined_reasons.each do |title, reasons| %> +<% if title.present? %> +## <%= title %> -<%- if @further_information_requested -%> +<% end %> +<% reasons.each do |reason| %> +- <%= reason.gsub("\n\n", "\n").gsub("\n", "\n ") %> +<% end %> + +<% end %> +<% unless @view_object.declined_cannot_reapply? %> # What you can do next -You can sign in to find out why your application was declined: -<%- else -%> -# Why your QTS application was declined +You’ll be able to make a new application for QTS once you've addressed the decline reasons we've given. If you reapply for QTS, you’ll not be able to review the details of your previous application. + +[Apply again](<%= new_teacher_interface_application_form_url %>) + +You may want to [explore other routes to getting QTS](https://www.gov.uk/government/publications/apply-for-qualified-teacher-status-qts-if-you-teach-outside-the-uk/routes-to-qualified-teacher-status-qts-for-teachers-and-those-with-teaching-experience-outside-the-uk). + +<% end %> +# Decision review + +Applicants who have been declined for QTS are entitled to a review of the decline decision by a Casework Manager. +If you would like to request a decision review, you’ll need to provide: + +- formal evidence and reasoning as to how you meet the required assessment criteria +- additional information not included in your original application that would support your decision review -You can sign in to find out why your application was declined: -<%- end -%> +Your request for review must be received within 28 days of receipt of the decision to decline QTS. Email your request for review, including the information required as above, to <%= t("service.email.enquiries") %>. -<%= new_teacher_session_url %> +If you are not satisfied with the outcome of the decision review, you can request a final formal appeal to a senior Teacher Qualification Manager. -<%= render "shared/teacher_mailer/help_us_to_improve_this_service" %> +[Sign in](<%= new_teacher_session_url %>) to review the outcome of your application <%= render "shared/teacher_mailer/footer" %> diff --git a/config/locales/mailer.en.yml b/config/locales/mailer.en.yml index f1e6cd35bd..41ce1cc8cf 100644 --- a/config/locales/mailer.en.yml +++ b/config/locales/mailer.en.yml @@ -9,7 +9,7 @@ en: application_awarded: subject: Your QTS application was successful application_declined: - subject: Your QTS application has been declined + subject: Your QTS application was unsuccessful application_not_submitted: subject: 0: Your draft QTS application will be deleted in 2 weeks diff --git a/spec/mailers/teacher_mailer_spec.rb b/spec/mailers/teacher_mailer_spec.rb index d2ca15405a..aa19157b5e 100644 --- a/spec/mailers/teacher_mailer_spec.rb +++ b/spec/mailers/teacher_mailer_spec.rb @@ -58,7 +58,7 @@ describe "#subject" do subject(:subject) { mail.subject } - it { is_expected.to eq("Your QTS application has been declined") } + it { is_expected.to eq("Your QTS application was unsuccessful") } end describe "#to" do @@ -72,30 +72,10 @@ it { is_expected.to include("Dear First Last") } it { is_expected.to include("abc") } - it do - is_expected.to include( - "You can sign in to find out why your application was declined:", - ) - end + it { is_expected.to include("Reason for decline") } end it_behaves_like "an observable mailer", "application_declined" - - context "further information requested" do - let(:assessment) do - create(:assessment, :with_further_information_request) - end - - describe "#body" do - subject(:body) { mail.body.encoded } - - it do - is_expected.to include( - "You can sign in to find out why your application was declined:", - ) - end - end - end end describe "#application_not_submitted" do diff --git a/spec/views/teacher_interface/application_forms_show_spec.rb b/spec/views/teacher_interface/application_forms_show_spec.rb index 5ec9128358..ac4b5144e2 100644 --- a/spec/views/teacher_interface/application_forms_show_spec.rb +++ b/spec/views/teacher_interface/application_forms_show_spec.rb @@ -44,8 +44,8 @@ end it { is_expected.to match(/Your QTS application has been declined/) } - it { is_expected.to match(/Why your application was declined/) } - it { is_expected.to match(/you can make a new application in future/) } + it { is_expected.to match(/Reason for decline/) } + it { is_expected.to match(/You’ll be able to make a new application/) } end context "and a further information request" do @@ -62,7 +62,7 @@ end it { is_expected.to match(/Your QTS application has been declined/) } - it { is_expected.to match(/you can make a new application in future/) } + it { is_expected.to match(/You’ll be able to make a new application/) } it "does not show the assessor notes to the applicant" do expect(subject).not_to match(/A note/)