The status of this application has been changed to ’<%= @view_object.status %>‘.
<% end %> -<% if @view_object.application_form.declined? %> +<% if @view_object.assessment.review? %> +An assessor will now review the application and make a decision on awarding or declining QTS.
+<% elsif @view_object.application_form.declined? %>The application will be deleted after 90 days unless the applicant chooses to appeal.
<% elsif @view_object.application_form.awarded_pending_checks? %>This status will appear while the award is reconciled with the information in the Database of Qualified Teachers (DQT).
diff --git a/app/views/assessor_interface/assessment_recommendation_review/edit.html.erb b/app/views/assessor_interface/assessment_recommendation_review/edit.html.erb new file mode 100644 index 0000000000..b6a6de1219 --- /dev/null +++ b/app/views/assessor_interface/assessment_recommendation_review/edit.html.erb @@ -0,0 +1,26 @@ +<% content_for :page_title, "Send application for review" %> +<% content_for :back_link_url, assessor_interface_application_form_path(@application_form) %> + +The following verification tasks have been flagged for review:
+ +<%= govuk_table do |table| + if @professional_standing_request.present? + table.with_caption(text: "LoPS") + table.with_head do |head| + head.with_row do |row| + row.with_cell(text: "Internal note") + row.with_cell(text: "Status") + end + end + table.with_body do |body| + body.with_row do |row| + row.with_cell { simple_format @professional_standing_request.verify_note } + row.with_cell { render(StatusTag::Component.new(@professional_standing_request.status)) } + end + end + end +end %> + +<%= govuk_button_to "Continue", [:assessor_interface, @application_form, @assessment, :assessment_recommendation_review], method: :put %> 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? diff --git a/config/routes.rb b/config/routes.rb index 3e106f6e04..99e6aa39ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -64,6 +64,11 @@ post "confirm", to: "assessment_recommendation_decline#update_confirm" end + resource :assessment_recommendation_review, + controller: "assessment_recommendation_review", + path: "/recommendation/review", + only: %i[edit update] + resource :assessment_recommendation_verify, controller: "assessment_recommendation_verify", path: "/recommendation/verify", diff --git a/spec/factories/assessments.rb b/spec/factories/assessments.rb index 7e48efd8e7..3e07c547b0 100644 --- a/spec/factories/assessments.rb +++ b/spec/factories/assessments.rb @@ -52,6 +52,16 @@ recommended_at { Time.zone.now } end + trait :review do + recommendation { "review" } + recommended_at { Time.zone.now } + end + + trait :verify do + recommendation { "verify" } + recommended_at { Time.zone.now } + end + trait :with_preliminary_qualifications_section do after(:create) do |assessment, _evaulator| create(:assessment_section, :preliminary, :qualifications, assessment:) diff --git a/spec/lib/application_form_status_updater_spec.rb b/spec/lib/application_form_status_updater_spec.rb index d5e64460e1..1d89a43d7f 100644 --- a/spec/lib/application_form_status_updater_spec.rb +++ b/spec/lib/application_form_status_updater_spec.rb @@ -430,6 +430,17 @@ end end + context "when a reviewed assessment" do + before do + application_form.update!(submitted_at: Time.zone.now) + create(:assessment, :review, application_form:) + end + + include_examples "changes action required by", "assessor" + include_examples "changes stage", "review" + include_examples "changes statuses", %w[review] + end + context "with a started assessment" do before do application_form.update!(submitted_at: Time.zone.now) diff --git a/spec/support/autoload/page_objects/assessor_interface/assessment_recommendation_review.rb b/spec/support/autoload/page_objects/assessor_interface/assessment_recommendation_review.rb new file mode 100644 index 0000000000..9651d47fd5 --- /dev/null +++ b/spec/support/autoload/page_objects/assessor_interface/assessment_recommendation_review.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +module PageObjects + module AssessorInterface + class AssessmentRecommendationReview < SitePrism::Page + set_url "/assessor/applications/{application_form_id}/assessments/{assessment_id}" \ + "/recommendation/review/edit" + + element :continue_button, ".govuk-button" + end + end +end diff --git a/spec/support/page_helpers.rb b/spec/support/page_helpers.rb index f67c1e11ab..15ac105c72 100644 --- a/spec/support/page_helpers.rb +++ b/spec/support/page_helpers.rb @@ -22,6 +22,11 @@ def assessor_application_status_page PageObjects::AssessorInterface::ApplicationStatus.new end + def assessor_assessment_recommendation_review_page + @assessor_assessment_recommendation_review_page ||= + PageObjects::AssessorInterface::AssessmentRecommendationReview.new + end + def assessor_assessment_section_page @assessor_assessment_section_page ||= PageObjects::AssessorInterface::AssessmentSection.new diff --git a/spec/system/assessor_interface/reviewing_verifications_spec.rb b/spec/system/assessor_interface/reviewing_verifications_spec.rb new file mode 100644 index 0000000000..8147908d1e --- /dev/null +++ b/spec/system/assessor_interface/reviewing_verifications_spec.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +require "rails_helper" + +RSpec.describe "Assessor reviewing verifications", type: :system do + before do + given_the_service_is_open + given_i_am_authorized_as_an_assessor_user + given_there_is_an_application_form_with_failed_verifications + end + + it "sends for review" do + # TODO: review functionality is not built yet, this page can never be reached + when_i_visit_the( + :assessor_assessment_recommendation_review_page, + application_form_id:, + assessment_id:, + ) + then_i_see_the( + :assessor_application_page, + application_id: application_form_id, + ) + end + + private + + def given_there_is_an_application_form_with_failed_verifications + application_form + end + + def application_form + @application_form ||= + create(:application_form, :submitted).tap do |application_form| + assessment = create(:assessment, :verify, application_form:) + create( + :professional_standing_request, + :received, + assessment:, + verify_passed: false, + ) + end + end + + def application_form_id + application_form.id + end + + def assessment_id + application_form.assessment.id + end +end