From d3b465157a5fa73409d52e0745c3b545da8f710e Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Fri, 22 Dec 2023 10:58:18 +0000 Subject: [PATCH] Update select qualifications views This updates the content on the two views related to selecting the qualification requests, and choose whether to verify qualifications in the first place. --- .../edit_qualification_requests.html.erb | 25 +++++++------------ .../edit_verify_qualifications.html.erb | 10 +++++--- config/locales/assessor_interface.en.yml | 4 --- config/locales/helpers.en.yml | 16 ++++++------ 4 files changed, 23 insertions(+), 32 deletions(-) diff --git a/app/views/assessor_interface/assessment_recommendation_verify/edit_qualification_requests.html.erb b/app/views/assessor_interface/assessment_recommendation_verify/edit_qualification_requests.html.erb index 2062962b33..6e0b44df7b 100644 --- a/app/views/assessor_interface/assessment_recommendation_verify/edit_qualification_requests.html.erb +++ b/app/views/assessor_interface/assessment_recommendation_verify/edit_qualification_requests.html.erb @@ -1,29 +1,22 @@ -<% content_for :page_title, title_with_error_prefix(t(".heading"), error: @form.errors.any?) %> -<% content_for :back_link_url, verify_qualifications_assessor_interface_application_form_assessment_assessment_recommendation_verify_path(@application_form) %> +<% title = "Verify qualifications" %> + +<% content_for :page_title, title_with_error_prefix(title, error: @form.errors.any?) %> +<% content_for :back_link_url, verify_qualifications_assessor_interface_application_form_assessment_assessment_recommendation_verify_path(@application_form, @assessment) %> <%= form_with model: @form, url: [:qualification_requests, :assessor_interface, @application_form, @assessment, :assessment_recommendation_verify] do |f| %> <%= f.govuk_error_summary %> -

<%= t(".heading") %>

+

<%= title %>

+ +

The list of submitted qualifications is shown below.

-

The list of qualifications that the applicant has submitted is shown below:

+

You will be able to check your selection before submitting.

<%= f.govuk_collection_check_boxes :qualification_ids, @application_form.qualifications.ordered, :id, ->(qualification) { qualification_title(qualification) }, - small: true, - legend: nil %> - - <%= govuk_inset_text do %> -

- You can deselect 1 or more qualifications from the list if you do not want to verify them. -

- <% end %> - -

- If you’re happy to proceed, select ‘Continue’. -

+ small: true %> <%= f.govuk_submit do %> <%= govuk_link_to "Cancel", [:assessor_interface, @application_form] %> diff --git a/app/views/assessor_interface/assessment_recommendation_verify/edit_verify_qualifications.html.erb b/app/views/assessor_interface/assessment_recommendation_verify/edit_verify_qualifications.html.erb index e4d7b8b401..ba4a528a7a 100644 --- a/app/views/assessor_interface/assessment_recommendation_verify/edit_verify_qualifications.html.erb +++ b/app/views/assessor_interface/assessment_recommendation_verify/edit_verify_qualifications.html.erb @@ -1,17 +1,19 @@ -<% content_for :page_title, title_with_error_prefix(t(".heading"), error: @form.errors.any?) %> +<% title = "Do you want to verify qualifications?" %> + +<% content_for :page_title, title_with_error_prefix(title, error: @form.errors.any?) %> <% content_for :back_link_url, assessor_interface_application_form_path(@application_form) %> <%= form_with model: @form, url: [:verify_qualifications, :assessor_interface, @application_form, @assessment, :assessment_recommendation_verify] do |f| %> <%= f.govuk_error_summary %> -

<%= t(".heading") %>

+

<%= title %>

- If you choose to verify this applicant’s qualifications, you’ll need to submit 1 or more verification requests to Ecctis. + If you choose to verify this qualifications an admin will request consent and submit verification requests to Ecctis.

- On the next screen you’ll see a list of the applicant’s qualifications. You can select which ones you want to verify. + You can select which qualifications to verify on the next screen.

<%= f.govuk_collection_radio_buttons :verify_qualifications, %i[true false], :itself, legend: nil %> diff --git a/config/locales/assessor_interface.en.yml b/config/locales/assessor_interface.en.yml index f0df3250e0..4a938b6d81 100644 --- a/config/locales/assessor_interface.en.yml +++ b/config/locales/assessor_interface.en.yml @@ -85,10 +85,6 @@ en: heading: Send application for review assessment_recommendation_verify: - edit_qualification_requests: - heading: Verify qualifications - edit_verify_qualifications: - heading: Do you want to verify qualifications? edit_reference_requests: heading: Request work history references edit_professional_standing: diff --git a/config/locales/helpers.en.yml b/config/locales/helpers.en.yml index e743842674..87d6672826 100644 --- a/config/locales/helpers.en.yml +++ b/config/locales/helpers.en.yml @@ -113,16 +113,16 @@ en: false: "No" failure_assessor_note: 'Internal note: Briefly explain why you selected ‘No’' failed_options: - true: "Yes, mark as ‘Rejected’" - false: "No, allow more time for a response" + true: Yes, mark as rejected + false: No, allow more time for a response assessor_interface_requestable_review_form: passed_options: - true: "Yes" - false: "No" + true: Yes, mark as accepted + false: No, mark as rejected assessor_interface_requestable_verify_passed_form: passed_options: - true: "Yes, mark as completed" - false: "No, send for review" + true: Yes, mark as completed + false: No, send for review assessor_interface_verify_professional_standing_form: verify_professional_standing_options: true: Yes, verify LoPS @@ -130,7 +130,7 @@ en: assessor_interface_verify_qualifications_form: verify_qualifications_options: true: Yes, verify qualifications - false: No, skip this step + false: No, do not verify assessor_interface_work_history_contact_form: name: Change full name job: Change job title @@ -281,7 +281,7 @@ en: passed: Does the response show that the qualification is legitimate? failed: Do you want to mark this qualification as ‘Rejected’? assessor_interface_select_qualifications_form: - qualification_ids: Qualification + qualification_ids: Select the qualifications you want to verify. assessor_interface_select_work_histories_form: work_history_ids: School eligibility_interface_region_form: