From 6080f62dfd284c0a56b87dd8d33cb23b1dcc191b Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Fri, 13 Oct 2023 16:00:34 +0100 Subject: [PATCH 1/4] Content changes made to preview page for further_information_requests --- ...further_information_request_view_object.rb | 2 +- .../preview.html.erb | 40 +++++++++++++++---- .../_further_information_requested.html.erb | 8 +--- config/locales/helpers.en.yml | 4 +- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/app/view_objects/teacher_interface/further_information_request_view_object.rb b/app/view_objects/teacher_interface/further_information_request_view_object.rb index 3345eaf68d..2708f1be76 100644 --- a/app/view_objects/teacher_interface/further_information_request_view_object.rb +++ b/app/view_objects/teacher_interface/further_information_request_view_object.rb @@ -88,7 +88,7 @@ def item_name(item) "teacher_interface.further_information_request.show.failure_reason.#{item.failure_reason_key}", ) when "work_history_contact" - "Add your work history contact’s details" + "Add work history details" when "document" "Upload your #{I18n.t("document.document_type.#{item.document.document_type}")} document" end diff --git a/app/views/assessor_interface/further_information_requests/preview.html.erb b/app/views/assessor_interface/further_information_requests/preview.html.erb index 9e8302c41c..e935397c39 100644 --- a/app/views/assessor_interface/further_information_requests/preview.html.erb +++ b/app/views/assessor_interface/further_information_requests/preview.html.erb @@ -2,7 +2,7 @@ <% content_for :back_link_url, edit_assessor_interface_application_form_assessment_path(@application_form, @assessment) %>

- Check the further information you’re asking the applicant for + Check the information you’re asking the applicant for

This screen shows your reasons for requesting further information, along with your notes to the applicant.

@@ -10,15 +10,39 @@

Your further information request reasons and notes

-<% @further_information_request.items.each do |item| %> -
-

<%= t(item.failure_reason_key, scope: %i[assessor_interface assessment_sections failure_reasons as_statement]) %>

-

Your note to the applicant:

+<% @further_information_request.items.group_by(&:failure_reason_key).each do |failure_reason_key, items| %> + <% if failure_reason_key == "school_details_cannot_be_verified" %> +
+

Reason for request

+ <% if items.size == 1 %> +

We were unable to verify the details for <%= items.first.work_history.school_name %>

+ <% elsif items.size > 1 %> +

We were unable to verify the details for:

+
    + <% items.each do |item| %> +
  • <%= item.work_history.school_name %>
    • + <% end %> +
+ <%end%> +

Note to applicant

- <%= govuk_inset_text do %> - <%= simple_format item.failure_reason_assessor_feedback %> + <%= govuk_inset_text do %> + <%= simple_format items.first.failure_reason_assessor_feedback %> + <% end %> +
+ <% else %> + <% items.each do |item| %> +
+

<%= t(item.failure_reason_key, scope: %i[assessor_interface assessment_sections failure_reasons as_statement]) %>

+ +

Note to applicant

+ + <%= govuk_inset_text do %> + <%= simple_format item.failure_reason_assessor_feedback %> + <% end %> +
<% end %> -
+ <% end %> <% end %>

Send the further information request email

diff --git a/app/views/teacher_interface/application_forms/show/_further_information_requested.html.erb b/app/views/teacher_interface/application_forms/show/_further_information_requested.html.erb index 0a309c147b..48d76076bb 100644 --- a/app/views/teacher_interface/application_forms/show/_further_information_requested.html.erb +++ b/app/views/teacher_interface/application_forms/show/_further_information_requested.html.erb @@ -1,11 +1,5 @@

We need some more information

-

The assessor needs you to provide some additional information so they can continue reviewing your application.

- -
- You may need to upload 1 or more documents. Make sure any files you upload clearly show the whole document or page, and that any text is easy to read. -
- -

You must add all of the requested information, so the assessor can continue reviewing your QTS application.

+

The assessor needs you to provide more information so they can continue reviewing your application.

<%= govuk_start_button(text: "Start now", href: teacher_interface_application_form_further_information_request_path(view_object.further_information_request)) %> diff --git a/config/locales/helpers.en.yml b/config/locales/helpers.en.yml index 36f91f592f..e49f16639f 100644 --- a/config/locales/helpers.en.yml +++ b/config/locales/helpers.en.yml @@ -8,7 +8,7 @@ en: assessor_interface_assessment_section_form: selected_failure_reasons: Select all options that are relevant to you. failure_reason_notes: - text: This FI reason gives the applicant a free text box. Use this space to give them clear instructions on what they need to provide. + text: This FI allows the applicant to send us a typed response. Use this space to give them clear instructions on what they need to provide. document: This FI reason asks the applicant to upload a file. Use this space to give them clear instructions on what they need to provide. decline: As this reason triggers a decline, you do not need to add a note, but you can use the space below to add anything you feel might be helpful, if you want to. assessor_interface_create_note_form: @@ -278,7 +278,7 @@ en: assessor_interface_assessment_section_form: selected_failure_reasons: What are the reasons for your recommendation? scotland_full_registration: Does the applicant have or are they eligible for full registration? - school_details_cannot_be_verified_work_history_checked: Choose the schools that need reference details to be amended + school_details_cannot_be_verified_work_history_checked: Select the school that we were unable to verify (there may be more than one) assessor_interface_filter_form: action_required_by: Action required by assessor_ids: Assessor name From 7bdcf5c54a456be9a43101782c1c1e002978e878 Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Mon, 16 Oct 2023 04:13:11 +0100 Subject: [PATCH 2/4] Fixed failing tests and made suggested changes Made changes following product review --- .../further_information_requests/preview.html.erb | 11 ++++------- config/locales/assessor_interface.en.yml | 2 +- .../requesting_further_information_spec.rb | 4 +--- .../teacher_interface/further_information_spec.rb | 6 ++---- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/app/views/assessor_interface/further_information_requests/preview.html.erb b/app/views/assessor_interface/further_information_requests/preview.html.erb index e935397c39..e060c2741a 100644 --- a/app/views/assessor_interface/further_information_requests/preview.html.erb +++ b/app/views/assessor_interface/further_information_requests/preview.html.erb @@ -15,15 +15,15 @@

Reason for request

<% if items.size == 1 %> -

We were unable to verify the details for <%= items.first.work_history.school_name %>

- <% elsif items.size > 1 %> +

We were unable to verify the details for <%= items.first.work_history.school_name %>.

+ <% else %>

We were unable to verify the details for:

    <% items.each do |item| %>
  • <%= item.work_history.school_name %>
    • <% end %>
- <%end%> + <% end %>

Note to applicant

<%= govuk_inset_text do %> @@ -33,7 +33,7 @@ <% else %> <% items.each do |item| %>
-

<%= t(item.failure_reason_key, scope: %i[assessor_interface assessment_sections failure_reasons as_statement]) %>

+

<%= t(item.failure_reason_key, scope: %i[assessor_interface assessment_sections failure_reasons as_statement]) %>

Note to applicant

@@ -45,9 +45,6 @@ <% end %> <% end %> -

Send the further information request email

-

On the next screen, you’ll see a preview of the email.

-
<%= govuk_button_link_to "Continue", new_assessor_interface_application_form_assessment_further_information_request_path(@application_form, @assessment) %> <%= govuk_button_link_to "Back to overview", assessor_interface_application_form_path(@application_form), secondary: true %> diff --git a/config/locales/assessor_interface.en.yml b/config/locales/assessor_interface.en.yml index 5635c46e7d..60924ebd50 100644 --- a/config/locales/assessor_interface.en.yml +++ b/config/locales/assessor_interface.en.yml @@ -198,7 +198,7 @@ en: registration_number: We could not find the applicant’s reference number, or the number was in the wrong format. The applicant will need to supply the number again. registration_number_alternative: We could not find the applicant’s reference number. The applicant will need to upload written proof of recognition as a teacher instead. satisfactory_evidence_work_history: The information provided on work history is not sufficient to award QTS. - school_details_cannot_be_verified: We could not verify the details of one of the schools that the applicant has entered. + school_details_cannot_be_verified: We could not verify school details entered by the applicant. teaching_certificate_illegible: The teaching qualification certificate (or translation) is illegible or in a format that we cannot accept. teaching_hours_not_fulfilled: The required teaching hours have not been fulfilled. teaching_qualification: We were not provided with sufficient evidence to confirm the teaching qualification entered on the online application form. diff --git a/spec/system/assessor_interface/requesting_further_information_spec.rb b/spec/system/assessor_interface/requesting_further_information_spec.rb index 03bde869da..92a8c1dcae 100644 --- a/spec/system/assessor_interface/requesting_further_information_spec.rb +++ b/spec/system/assessor_interface/requesting_further_information_spec.rb @@ -75,9 +75,7 @@ def when_i_select_request_further_information def and_i_see_the_further_information_request_items expect(assessor_request_further_information_page.items.count).to eq(1) - expect( - assessor_request_further_information_page.items.first.heading.text, - ).to eq( + expect(assessor_request_further_information_page).to have_content( "Subjects entered are acceptable for QTS, but the uploaded qualifications do not match them.", ) expect( diff --git a/spec/system/teacher_interface/further_information_spec.rb b/spec/system/teacher_interface/further_information_spec.rb index c34a9a0293..4292ab2ad4 100644 --- a/spec/system/teacher_interface/further_information_spec.rb +++ b/spec/system/teacher_interface/further_information_spec.rb @@ -159,9 +159,7 @@ def and_i_see_the_check_your_answers_items expect(rows.first.key.text).to eq( "Tell us more about the subjects you can teach", ) - expect(rows.second.key.text).to eq( - "Add your work history contact’s details", - ) + expect(rows.second.key.text).to eq("Add work history details") expect(rows.last.key.text).to eq("Upload your identity document") end @@ -233,7 +231,7 @@ def text_check_answers_item def work_history_task_list_item teacher_further_information_requested_page.task_list.find_item( - "Add your work history contact’s details", + "Add work history details", ) end From 7b6d7c06d9a3fecce2d7b334fd7a24fff6bc5ab1 Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Tue, 17 Oct 2023 16:30:24 +0100 Subject: [PATCH 3/4] Made changes following product review --- .../further_information_requests/preview.html.erb | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/app/views/assessor_interface/further_information_requests/preview.html.erb b/app/views/assessor_interface/further_information_requests/preview.html.erb index e060c2741a..dd3032cb9b 100644 --- a/app/views/assessor_interface/further_information_requests/preview.html.erb +++ b/app/views/assessor_interface/further_information_requests/preview.html.erb @@ -1,19 +1,12 @@ <% content_for :page_title, "Check the further information you’re asking the applicant for" %> <% content_for :back_link_url, edit_assessor_interface_application_form_assessment_path(@application_form, @assessment) %> -

- Check the information you’re asking the applicant for -

- -

This screen shows your reasons for requesting further information, along with your notes to the applicant.

-

If you need to change your notes, you’ll need to go back to the relevant section.

- -

Your further information request reasons and notes

+

Check the information you’re asking the applicant for

<% @further_information_request.items.group_by(&:failure_reason_key).each do |failure_reason_key, items| %> <% if failure_reason_key == "school_details_cannot_be_verified" %>
-

Reason for request

+

Reason for request

<% if items.size == 1 %>

We were unable to verify the details for <%= items.first.work_history.school_name %>.

<% else %> @@ -24,7 +17,7 @@ <% end %> <% end %> -

Note to applicant

+

Note to applicant

<%= govuk_inset_text do %> <%= simple_format items.first.failure_reason_assessor_feedback %> From b4bb668b7d29c090c84386d54cc708ae93e98b09 Mon Sep 17 00:00:00 2001 From: Shujat Khalid Date: Wed, 18 Oct 2023 09:58:01 +0100 Subject: [PATCH 4/4] Adjusted heading sizes --- .../further_information_requests/preview.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/assessor_interface/further_information_requests/preview.html.erb b/app/views/assessor_interface/further_information_requests/preview.html.erb index dd3032cb9b..c12fbf359f 100644 --- a/app/views/assessor_interface/further_information_requests/preview.html.erb +++ b/app/views/assessor_interface/further_information_requests/preview.html.erb @@ -6,7 +6,7 @@ <% @further_information_request.items.group_by(&:failure_reason_key).each do |failure_reason_key, items| %> <% if failure_reason_key == "school_details_cannot_be_verified" %>
-

Reason for request

+

Reason for request

<% if items.size == 1 %>

We were unable to verify the details for <%= items.first.work_history.school_name %>.

<% else %> @@ -17,7 +17,7 @@ <% end %> <% end %> -

Note to applicant

+

Note to applicant

<%= govuk_inset_text do %> <%= simple_format items.first.failure_reason_assessor_feedback %> @@ -28,7 +28,7 @@

<%= t(item.failure_reason_key, scope: %i[assessor_interface assessment_sections failure_reasons as_statement]) %>

-

Note to applicant

+

Note to applicant

<%= govuk_inset_text do %> <%= simple_format item.failure_reason_assessor_feedback %>