diff --git a/app/views/assessor_interface/assessments/edit.html.erb b/app/views/assessor_interface/assessments/edit.html.erb index bced7bbc10..e3836b4dac 100644 --- a/app/views/assessor_interface/assessments/edit.html.erb +++ b/app/views/assessor_interface/assessments/edit.html.erb @@ -1,26 +1,34 @@ -<% content_for :page_title, "#{"Error: " if @form.errors.any?}#{t("helpers.legend.assessor_interface_assessment_recommendation_form.recommendation")}" %> +<% legend = if @assessment.verify? + t(".legend.verify") + elsif @assessment.review? + t(".legend.review") + else + t(".legend.other") + end %> + +<% hint = if @assessment.can_verify? + t(".hint.can_verify") + elsif @assessment.can_review? + t(".hint.can_review") + elsif @assessment.can_award? + t(".hint.can_award") + else + t(".hint.cant_award") + end %> + +<% content_for :page_title, "#{"Error: " if @form.errors.any?}#{legend}" %> <% content_for :back_link_url, assessor_interface_application_form_path(@application_form) %> <%= form_with model: @form, url: [:assessor_interface, @application_form, @assessment], method: :put do |f| %> <%= f.govuk_error_summary %> - <% - hint = if @assessment.can_verify? - t(".hint.can_verify") - elsif @assessment.can_award? - t(".hint.can_award") - else - t(".hint.cant_award") - end - %> - <%= f.govuk_collection_radio_buttons :recommendation, @assessment.available_recommendations, :itself, - legend: { size: "xl", tag: "h1" }, + legend: { size: "xl", tag: "h1", text: legend }, hint: { text: hint } %> <%= f.govuk_submit prevent_double_click: false do %> - <%= govuk_link_to "Cancel", assessor_interface_application_form_path(@application_form) %> + <%= govuk_link_to "Cancel", [:assessor_interface, @application_form] %> <% end %> <% end %> diff --git a/config/locales/assessor_interface.en.yml b/config/locales/assessor_interface.en.yml index a44c957bb2..1b30e6c22f 100644 --- a/config/locales/assessor_interface.en.yml +++ b/config/locales/assessor_interface.en.yml @@ -32,8 +32,13 @@ en: assessments: edit: + legend: + other: QTS review complete + review: Assessment decision + verify: Verification decision hint: can_award: You’ve completed your assessment of this QTS application and reviewed the work references. + can_review: You’ve completed your verification checks. can_verify: You’ve completed your review of this QTS application and marked all sections as complete to your satisfaction. cant_award: You’ve completed your review of this QTS application and marked 1 or more sections as not completed to your satisfaction. diff --git a/config/locales/helpers.en.yml b/config/locales/helpers.en.yml index d018a569c9..36f91f592f 100644 --- a/config/locales/helpers.en.yml +++ b/config/locales/helpers.en.yml @@ -275,8 +275,6 @@ en: document: "Example: The right-hand section of your teaching qualification document is missing, please take a new image and upload it." decline: "Example: We declined this QTS application as you already have another application in progress." legend: - assessor_interface_assessment_recommendation_form: - recommendation: QTS review completed 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?