From 52a9bd6e809eba27dba33372a5219c31cb2d5ea4 Mon Sep 17 00:00:00 2001 From: Thomas Leese Date: Tue, 12 Sep 2023 11:14:01 +0100 Subject: [PATCH] Reorder support console fields This moves around a number of fields so it matches the design. There shouldn't be any functional changes. --- ...country_region_information_fields.html.erb | 12 +-- .../support_interface/regions/edit.html.erb | 87 +++++++++++-------- 2 files changed, 55 insertions(+), 44 deletions(-) diff --git a/app/views/shared/support_interface/_country_region_information_fields.html.erb b/app/views/shared/support_interface/_country_region_information_fields.html.erb index 98188c7fb0..8bc61fdba1 100644 --- a/app/views/shared/support_interface/_country_region_information_fields.html.erb +++ b/app/views/shared/support_interface/_country_region_information_fields.html.erb @@ -1,15 +1,15 @@ -

Additional information

+

Additional content information

<%= f.govuk_fieldset legend: { text: "Proof of qualifications", size: "s" } do %> -

Example: ‘We cannot accept the National Certificate in Education (NCE) or the Teachers Certificate Grade II from Nigeria, as these do not meet the required level.’

+

Example: ‘We cannot accept the National Certificate in Education (NCE) or the Teachers Certificate Grade II from Nigeria, as these do not meet the required level.’

<%= f.govuk_text_area :qualifications_information, label: { text: "Qualifications" }, rows: 5 %> <% end %> <%= f.govuk_fieldset legend: { text: "Proof that you’re recognised as a teacher", size: "s" } do %> -

Example: ‘TRCN will charge you a fee of ₦60,000 for providing the Letter of Professional standing. They’ll also need your QTS application reference number, as well as copies of your teaching documents.’

+

Example: ‘TRCN will charge you a fee of ₦60,000 for providing the Letter of Professional standing. They’ll also need your QTS application reference number, as well as copies of your teaching documents.’

- <%= f.govuk_text_area :sanction_information, label: { text: "Sanction" }, rows: 5 %> - <%= f.govuk_text_area :status_information, label: { text: "Status" }, rows: 5 %> - <%= f.govuk_text_area :other_information, label: { text: "Other" }, rows: 5 %> + <%= f.govuk_text_area :sanction_information, label: { text: "For sanctions" }, rows: 5 %> + <%= f.govuk_text_area :status_information, label: { text: "For statuses" }, rows: 5 %> + <%= f.govuk_text_area :other_information, label: { text: "For other" }, rows: 5 %> <% end %> diff --git a/app/views/support_interface/regions/edit.html.erb b/app/views/support_interface/regions/edit.html.erb index af4c5d3261..1939e61461 100644 --- a/app/views/support_interface/regions/edit.html.erb +++ b/app/views/support_interface/regions/edit.html.erb @@ -5,15 +5,6 @@

<%= CountryName.from_region(@region) %>

- <%= f.govuk_collection_radio_buttons :application_form_skip_work_history, - [ - OpenStruct.new(value: :true, label: "Yes"), - OpenStruct.new(value: :false, label: "No") - ], - :value, - :label, - legend: { text: "Skip work history?" } %> - <%= f.govuk_collection_radio_buttons :requires_preliminary_check, [ OpenStruct.new(value: :true, label: "Yes"), @@ -23,18 +14,57 @@ :label, legend: { text: "Will applications be subject to a preliminary check?" } %> + <%= f.govuk_fieldset legend: { text: "Application form changes" } do %> + <%= f.govuk_collection_radio_buttons :application_form_skip_work_history, + [ + OpenStruct.new(value: :true, label: "Yes"), + OpenStruct.new(value: :false, label: "No") + ], + :value, + :label, + legend: { text: "Remove work history?", size: "s" } %> + + <%= f.govuk_collection_radio_buttons :reduced_evidence_accepted, + [ + OpenStruct.new(value: :true, label: "Yes"), + OpenStruct.new(value: :false, label: "No") + ], + :value, + :label, + legend: { text: "Remove work history contact details and allow applicant to choose any SELT provider to prove their English proficiency?", size: "s" }, + hint: { text: "Allows QTS to be awarded without any work references being provided." } %> + + <%= f.govuk_collection_radio_buttons :written_statement_optional, + [ + OpenStruct.new(value: :true, label: "Yes"), + OpenStruct.new(value: :false, label: "No") + ], + :value, + :label, + legend: { text: "Applicant can submit without uploading the written statement?", size: "s" }, + hint: { text: "Only applies if a written statement is requested." } %> + <% end %> + <%= f.govuk_fieldset legend: { text: "Teacher status and sanctions checks" } do %> - <%= f.govuk_collection_select :status_check, [ - OpenStruct.new(id: 'online', name: 'Online'), - OpenStruct.new(id: 'written', name: 'Written'), - OpenStruct.new(id: 'none', name: 'None') - ], :id, :name, label: { text: "How will teacher status be checked?", size: "s" } %> + <%= f.govuk_collection_select :status_check, + [ + OpenStruct.new(id: "online", name: "Online"), + OpenStruct.new(id: "written", name: "Written"), + OpenStruct.new(id: "none", name: "None") + ], + :id, + :name, + label: { text: "How will teacher status be checked?", size: "s" } %> - <%= f.govuk_collection_select :sanction_check, [ - OpenStruct.new(id: 'online', name: 'Online'), - OpenStruct.new(id: 'written', name: 'Written'), - OpenStruct.new(id: 'none', name: 'None') - ], :id, :name, label: { text: "How will sanctions be checked?", size: "s" } %> + <%= f.govuk_collection_select :sanction_check, + [ + OpenStruct.new(id: "online", name: "Online"), + OpenStruct.new(id: "written", name: "Written"), + OpenStruct.new(id: "none", name: "None") + ], + :id, + :name, + label: { text: "How will sanctions be checked?", size: "s" } %> <% end %> <%= f.govuk_fieldset legend: { text: "Teaching authority details" } do %> @@ -64,25 +94,6 @@ legend: { text: "Will the teaching authority only send the letter of professional standing (LOPS) directly to the TRA?", size: "s" } %> <% end %> - <%= f.govuk_collection_radio_buttons :reduced_evidence_accepted, - [ - OpenStruct.new(value: :true, label: "Yes"), - OpenStruct.new(value: :false, label: "No") - ], - :value, - :label, - legend: { text: "Accept reduced evidence?" } %> - - <%= f.govuk_collection_radio_buttons :written_statement_optional, - [ - OpenStruct.new(value: :true, label: "Yes"), - OpenStruct.new(value: :false, label: "No") - ], - :value, - :label, - legend: { text: "Applicant can submit without uploading the written statement?" }, - hint: { text: "Only applies if a written statement is requested." } %> - <%= render "shared/support_interface/country_region_information_fields", f: %> <%= f.govuk_submit "Preview", name: "preview", value: "true" do %>