Skip to content

Revert "AQTS 787 error message location" #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "AQTS 787 error message location" #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ...views/assessor_interface/assessment_sections/_english_language_exemption_content.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
<%= yield :assessment_section_top_of_form %>

<% if application_form.english_language_citizenship_exempt %>
<h2 class="govuk-heading-m">English language exemption by birth/citizenship</h2>
<p class="govuk-body">
Expand Down
4 changes: 1 addition & 3 deletions app/views/assessor_interface/assessment_sections/_form.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<%= form_with model: form, url: [:assessor_interface, view_object.application_form, view_object.assessment, @view_object.assessment_section], method: :put do |f| %>
<%= f.govuk_error_summary %>

<%= yield :assessment_section_top_of_form %>


<% if view_object.show_english_language_exemption_checkbox? %>
<% if view_object.assessment_section.personal_information? %>
<% english_language_section_passed_label = t("#{view_object.assessment_section.key}_#{view_object.application_form.requires_passport_as_identity_proof? ? 'passport' : 'id'}", scope: %i[assessor_interface assessment_sections english_language_proficiency passed]) %>
Expand Down
37 changes: 18 additions & 19 deletions app/views/assessor_interface/assessment_sections/show.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,26 @@

<% content_for :page_title, title_with_error_prefix(t(".title.#{preliminary_key}.#{section_key}"), error: @form.errors.any?) %>
<% content_for :back_link_url, assessor_interface_application_form_path(@application_form) %>
<% content_for(:assessment_section_top_of_form) do %>
<%= render "linked_application_forms",
application_forms_contact_email_used_as_teacher: @view_object.work_history_application_forms_contact_email_used_as_teacher,
application_forms_contact_email_used_as_reference: @view_object.work_history_application_forms_contact_email_used_as_reference %>

<%= render "shared/assessor_header",
title: t(".title.#{preliminary_key}.#{section_key}"),
application_form: @view_object.application_form %>

<% if @view_object.show_teacher_name_and_date_of_birth? %>
<h2 class="govuk-heading-m"><%= @view_object.teacher_name_and_date_of_birth %></h2>
<% end %>

<%= render "#{section_key}_summary",
region: @view_object.region,
application_form: @view_object.application_form,
assessment: @view_object.assessment,
assessment_section: @view_object.assessment_section,
highlighted_work_history_contact_emails: @view_object.highlighted_work_history_contact_emails %>

<%= render "linked_application_forms",
application_forms_contact_email_used_as_teacher: @view_object.work_history_application_forms_contact_email_used_as_teacher,
application_forms_contact_email_used_as_reference: @view_object.work_history_application_forms_contact_email_used_as_reference %>

<%= render "shared/assessor_header",
title: t(".title.#{preliminary_key}.#{section_key}"),
application_form: @view_object.application_form %>

<% if @view_object.show_teacher_name_and_date_of_birth? %>
<h2 class="govuk-heading-m"><%= @view_object.teacher_name_and_date_of_birth %></h2>
<% end %>

<%= render "#{section_key}_summary",
region: @view_object.region,
application_form: @view_object.application_form,
assessment: @view_object.assessment,
assessment_section: @view_object.assessment_section,
highlighted_work_history_contact_emails: @view_object.highlighted_work_history_contact_emails %>

<% if @view_object.show_form? %>
<%= render "form", form: @form, view_object: @view_object %>
<% end %>
Expand Down
2 changes: 1 addition & 1 deletion spec/support/autoload/page_objects/assessor_interface/assessment_section.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class AssessmentSection < SitePrism::Page
".govuk-checkboxes__item"
elements :failure_reason_note_textareas,
".govuk-checkboxes__conditional .govuk-textarea"
element :continue_button, "button.govuk-button"
element :continue_button, "button"
end

section :preliminary_form, "form" do
Expand Down