From f124cafc65e20b3704bec6ad952c027caca6c3dd Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Thu, 10 Jul 2025 23:53:44 +0100 Subject: [PATCH 1/5] Update email content --- .../_any_questions_contact.text.erb | 2 +- .../further_information_requested.text.erb | 39 +++++++++++++++---- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/app/views/shared/teacher_mailer/_any_questions_contact.text.erb b/app/views/shared/teacher_mailer/_any_questions_contact.text.erb index aef4a3fc54..0cd58d994e 100644 --- a/app/views/shared/teacher_mailer/_any_questions_contact.text.erb +++ b/app/views/shared/teacher_mailer/_any_questions_contact.text.erb @@ -1 +1 @@ -Contact [<%= t("service.email.enquiries") %>](mailto:<%= t("service.email.enquiries") %>) with queries. We aim to respond within 5 working days. Please note we will not be able to give you progress updates on your application. +Contact [<%= t("service.email.enquiries") %>](mailto:<%= t("service.email.enquiries") %>) if you have a question. We aim to respond within 5 working days. Please note we will not be able to give you progress updates on your application. diff --git a/app/views/teacher_mailer/further_information_requested.text.erb b/app/views/teacher_mailer/further_information_requested.text.erb index d25bb9311f..fce48c1693 100644 --- a/app/views/teacher_mailer/further_information_requested.text.erb +++ b/app/views/teacher_mailer/further_information_requested.text.erb @@ -2,21 +2,46 @@ Dear <%= application_form_full_name(@application_form) %>, The assessor reviewing your QTS application needs more information. -The assessor needs this information by <%= @further_information_request.expires_at.to_date.to_fs %> for your application to proceed. - # What you need to do -<% if FeatureFlags::FeatureFlag.active?(:gov_one_applicant_login) %> -You will need to sign in to your application to see what information is needed and add it. +You need to sign in to your application to submit the information. + +**You must submit this information by <%= @further_information_request.expires_at.to_date.to_fs %> or your application will be declined.** + +<% if FeatureFlags::FeatureFlag.active?(:gov_one_applicant_login) %> # Signing in to your application -You’ll now need a GOV.UK One Login to sign in. If you don't have one you can create one, but you must use the same email as your QTS sign in to access your application. -[Create your GOV.UK One Login or sign in](<%= new_teacher_session_url %>) +You will need a DfE Sign-in login to sign in. If you don’t have one you can create one. You must use the same email as your QTS sign-in to access your application. + +[Create your DfE Sign-in login or sign in](<%= new_teacher_session_url %>) <% else %> [Sign in to your application](<%= new_teacher_session_url %>) <% end %> -Your application is on hold until this information is received. Once you respond with all the information requested, the assessor will be able to continue reviewing your application. +Your application is on hold until this information is received. Once you submit all the information requested, the assessor will be able to continue reviewing your application. + +# The information we need + +## About you + +**There’s a problem with your passport. For example, it is incorrect, illegible, or incomplete.** + +^ We cannot accept the passport you provided because we cannot see all the details clearly. You need to upload another copy of your passport. + +## Your qualifications + +**There is a problem with your university degree transcript (or translation).** + +^ We cannot see all the details clearly on the transcript you provided for your Bachelor of Science obtained at Anhui University. + +^ You need to upload a clearer version of your Bachelor of Science transcript + +## Your English language proficiency + +**The country/territory qualifications we issued is not exempt from English language requirements.** + +^ Your course was taught entirely or mostly in English; this needs to cover both years studied for both degrees Bachelor’s and Master’s. + <%= render "shared/teacher_mailer/any_questions_contact" %> From 66408d114e7e7ab01ce346fcb8d898abd56bb8c6 Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Fri, 11 Jul 2025 13:20:48 +0100 Subject: [PATCH 2/5] Update spec --- spec/mailers/teacher_mailer_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/mailers/teacher_mailer_spec.rb b/spec/mailers/teacher_mailer_spec.rb index 955763e2af..7effd69c18 100644 --- a/spec/mailers/teacher_mailer_spec.rb +++ b/spec/mailers/teacher_mailer_spec.rb @@ -511,7 +511,7 @@ FeatureFlags::FeatureFlag.deactivate(:gov_one_applicant_login) end - it { is_expected.to include("Create your GOV.UK One Login or sign in") } + it { is_expected.to include("You will need a DfE Sign-in login to sign in") } it { is_expected.not_to include("Sign in to your application") } end end From 73c0c2da4bf20a12b7b0cfdff3c271395531a30c Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Fri, 11 Jul 2025 14:41:10 +0100 Subject: [PATCH 3/5] fix linting --- spec/mailers/teacher_mailer_spec.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/spec/mailers/teacher_mailer_spec.rb b/spec/mailers/teacher_mailer_spec.rb index 7effd69c18..c001ee3755 100644 --- a/spec/mailers/teacher_mailer_spec.rb +++ b/spec/mailers/teacher_mailer_spec.rb @@ -511,7 +511,9 @@ FeatureFlags::FeatureFlag.deactivate(:gov_one_applicant_login) end - it { is_expected.to include("You will need a DfE Sign-in login to sign in") } + it do + is_expected.to include("You will need a DfE Sign-in login to sign in") + end it { is_expected.not_to include("Sign in to your application") } end end From f2c52af9cef6465100a2183821bfbe17f4ad90ce Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Fri, 11 Jul 2025 16:20:17 +0100 Subject: [PATCH 4/5] linting fix --- spec/mailers/teacher_mailer_spec.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/spec/mailers/teacher_mailer_spec.rb b/spec/mailers/teacher_mailer_spec.rb index c001ee3755..4687fa4e77 100644 --- a/spec/mailers/teacher_mailer_spec.rb +++ b/spec/mailers/teacher_mailer_spec.rb @@ -512,8 +512,11 @@ end it do - is_expected.to include("You will need a DfE Sign-in login to sign in") + expect(subject).to include( + "You will need a DfE Sign-in login to sign in", + ) end + it { is_expected.not_to include("Sign in to your application") } end end From d6d5f8e65b12e9f5ba67d080deb0311c6970a017 Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Sun, 13 Jul 2025 15:27:13 +0100 Subject: [PATCH 5/5] Amend design --- .../further_information_requested.text.erb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/views/teacher_mailer/further_information_requested.text.erb b/app/views/teacher_mailer/further_information_requested.text.erb index fce48c1693..da576cfd52 100644 --- a/app/views/teacher_mailer/further_information_requested.text.erb +++ b/app/views/teacher_mailer/further_information_requested.text.erb @@ -6,7 +6,7 @@ The assessor reviewing your QTS application needs more information. You need to sign in to your application to submit the information. -**You must submit this information by <%= @further_information_request.expires_at.to_date.to_fs %> or your application will be declined.** +You must submit this information by <%= @further_information_request.expires_at.strftime('%d %B %Y') %> or your application will be declined. <% if FeatureFlags::FeatureFlag.active?(:gov_one_applicant_login) %> # Signing in to your application @@ -24,24 +24,22 @@ Your application is on hold until this information is received. Once you submit ## About you -**There’s a problem with your passport. For example, it is incorrect, illegible, or incomplete.** - +There’s a problem with your passport. For example, it is incorrect, illegible, or incomplete. ^ We cannot accept the passport you provided because we cannot see all the details clearly. You need to upload another copy of your passport. ## Your qualifications -**There is a problem with your university degree transcript (or translation).** - +There is a problem with your university degree transcript (or translation). ^ We cannot see all the details clearly on the transcript you provided for your Bachelor of Science obtained at Anhui University. ^ You need to upload a clearer version of your Bachelor of Science transcript ## Your English language proficiency -**The country/territory qualifications we issued is not exempt from English language requirements.** - +The country/territory qualifications we issued is not exempt from English language requirements. ^ Your course was taught entirely or mostly in English; this needs to cover both years studied for both degrees Bachelor’s and Master’s. +# If you have a question <%= render "shared/teacher_mailer/any_questions_contact" %>