From 500ec33658bedad8b2b35f8d933893ab9e341bca Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 5 May 2023 15:58:28 +0100
Subject: [PATCH 001/352] Remove banner from dashboard

---
 .../info_messages/_award_season_closed.html.slim       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/app/views/content_only/info_messages/_award_season_closed.html.slim b/app/views/content_only/info_messages/_award_season_closed.html.slim
index 2da270193b..3b2026d63b 100644
--- a/app/views/content_only/info_messages/_award_season_closed.html.slim
+++ b/app/views/content_only/info_messages/_award_season_closed.html.slim
@@ -1,15 +1,5 @@
 article.group role="article"
   div
-    .govuk-notification-banner role="region" aria-labelledby="govuk-notification-banner-title" data-module="govuk-notification-banner"
-      .govuk-notification-banner__header
-        .govuk-notification-banner__title#govuk-notification-banner-title
-          | Important
-      .govuk-notification-banner__content
-        p.govuk-notification-banner__heading.name-change-notification
-          | We are delighted to announce that the name of these Awards has changed to The King's Awards for Enterprise. The first King's Awards will be announced on 21 April 2023, The Late Queen Elizabeth II's birthday. Please see the
-          =<> link_to "official press notice", "https://www.gov.uk/government/news/king-charles-iii-continues-queen-elizabeths-legacy-by-giving-his-majestys-name-to-prestigious-awards", target: '_blank'
-          | for further details.
-
     .application-notice.info-notice
       p.govuk-body
         = render "content_only/info_messages/new_users_message"

From a365e19034c07e06463ee8d4c65864a629afb939 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Wed, 21 Jun 2023 13:47:16 +0200
Subject: [PATCH 002/352] tweak case status report

---
 Gemfile.lock                              |  5 +++++
 app/models/reports/cases_status_report.rb |  4 ++--
 app/models/reports/form_answer.rb         | 16 ++++++++++++++--
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 58c7508f10..1c637713a3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -482,6 +482,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.2)
     minitest (5.18.0)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
@@ -503,6 +504,9 @@ GEM
       activerecord (>= 4.0.0)
       activesupport (>= 4.0.0)
     nio4r (2.5.9)
+    nokogiri (1.14.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-linux)
@@ -834,6 +838,7 @@ GEM
     zxcvbn (0.1.9)
 
 PLATFORMS
+  ruby
   x86_64-darwin-21
   x86_64-linux
 
diff --git a/app/models/reports/cases_status_report.rb b/app/models/reports/cases_status_report.rb
index b47c9023ab..9da2ac08c9 100644
--- a/app/models/reports/cases_status_report.rb
+++ b/app/models/reports/cases_status_report.rb
@@ -67,11 +67,11 @@ class Reports::CasesStatusReport
       method: :overall_status
     },
     {
-      label: "ACReceived",
+      label: "Additional Financials Received",
       method: :ac_received
     },
     {
-      label: "ACChecked",
+      label: "Additional Financials Checked",
       method: :ac_checked
     },
     {
diff --git a/app/models/reports/form_answer.rb b/app/models/reports/form_answer.rb
index 9d5c2ebe02..1613a0ccb5 100644
--- a/app/models/reports/form_answer.rb
+++ b/app/models/reports/form_answer.rb
@@ -76,11 +76,19 @@ def press_release_updated
   end
 
   def ac_received
-    bool obj.audit_certificate.present?
+    if po_sd_provided_actual_figures?
+      "N/A - provided actual figures"
+    else
+      bool obj.audit_certificate.present?
+    end
   end
 
   def ac_checked
-    bool obj.audit_certificate.try(:reviewed?)
+    if po_sd_provided_actual_figures?
+      "N/A"
+    else
+      bool obj.audit_certificate.try(:reviewed?)
+    end
   end
 
   def case_assigned
@@ -223,4 +231,8 @@ def case_summary_status
   def overall_status
     obj.state.humanize
   end
+
+  def po_sd_provided_actual_figures?
+    %w[mobility development].include?(obj.award_type) && obj.document["product_estimated_figures"] == "no"
+  end
 end

From 7364d75ee1c5e8e560ea8a8116adb9d8d7acb9ec Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 21 Jun 2023 16:21:58 +0400
Subject: [PATCH 003/352] Fix DEPRECATION WARNING to skip_pipeline for assets

---
 Gemfile.lock                              |  5 ++++-
 app/views/layouts/govuk_template.html.erb | 18 +++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 58c7508f10..d36350301b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -503,6 +503,8 @@ GEM
       activerecord (>= 4.0.0)
       activesupport (>= 4.0.0)
     nio4r (2.5.9)
+    nokogiri (1.14.3-arm64-darwin)
+      racc (~> 1.4)
     nokogiri (1.14.3-x86_64-darwin)
       racc (~> 1.4)
     nokogiri (1.14.3-x86_64-linux)
@@ -834,6 +836,7 @@ GEM
     zxcvbn (0.1.9)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-21
   x86_64-linux
 
@@ -942,4 +945,4 @@ RUBY VERSION
    ruby 2.7.7p221
 
 BUNDLED WITH
-   2.4.8
+   2.4.4
diff --git a/app/views/layouts/govuk_template.html.erb b/app/views/layouts/govuk_template.html.erb
index 903d250f9b..fce0c17c7e 100644
--- a/app/views/layouts/govuk_template.html.erb
+++ b/app/views/layouts/govuk_template.html.erb
@@ -20,8 +20,8 @@
     <script type="text/javascript">
       (function(){if(window.opera){return;}
        setTimeout(function(){var a=document,g,b={families:(g=
-       ["nta"]),urls:["<%= asset_path "fonts-ie8.css" %>"]},
-       c="<%= asset_path "vendor/goog/webfont-debug.js" %>",d="script",
+       ["nta"]),urls:["<%= asset_path "fonts-ie8.css", skip_pipeline: true %>"]},
+       c="<%= asset_path "vendor/goog/webfont-debug.js", skip_pipeline: true %>",d="script",
        e=a.createElement(d),f=a.getElementsByTagName(d)[0],h=g.length;WebFontConfig
        ={custom:b},e.src=c,f.parentNode.insertBefore(e,f);for(;h=h-1;a.documentElement
        .className+=' wf-'+g[h].replace(/\s/g,'').toLowerCase()+'-n4-loading');},0)
@@ -33,14 +33,14 @@
 
     <%= stylesheet_pack_tag 'application' %>
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= image_url('favicon.ico') %>]" type="image/x-icon">
-    <link rel="mask-icon" href="<%= image_url('govuk-mask-icon.svg') %>]" color="blue">
-    <link rel="apple-touch-icon" sizes="180x180" href="<%= image_url('govuk-apple-touch-icon-180x180.png') %>]">
-    <link rel="apple-touch-icon" sizes="167x167" href="<%= image_url('govuk-apple-touch-icon-167x167.png') %>]">
-    <link rel="apple-touch-icon" sizes="152x152" href="<%= image_url('govuk-apple-touch-icon-152x152.png') %>]">
-    <link rel="apple-touch-icon" href="<%= image_url('govuk-apple-touch-icon.png') %>]">
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= image_url('favicon.ico', skip_pipeline: true) %>]" type="image/x-icon">
+    <link rel="mask-icon" href="<%= image_url('govuk-mask-icon.svg', skip_pipeline: true) %>]" color="blue">
+    <link rel="apple-touch-icon" sizes="180x180" href="<%= image_url('govuk-apple-touch-icon-180x180.png', skip_pipeline: true) %>]">
+    <link rel="apple-touch-icon" sizes="167x167" href="<%= image_url('govuk-apple-touch-icon-167x167.png', skip_pipeline: true) %>]">
+    <link rel="apple-touch-icon" sizes="152x152" href="<%= image_url('govuk-apple-touch-icon-152x152.png', skip_pipeline: true) %>]">
+    <link rel="apple-touch-icon" href="<%= image_url('govuk-apple-touch-icon.png', skip_pipeline: true) %>]">
 
-    <meta property="og:image" content="<%= asset_path "opengraph-image.png" %>">
+    <meta property="og:image" content="<%= asset_path "opengraph-image.png", skip_pipeline: true %>">
 
     <%= yield :head %>
   </head>

From 3ec44fd877d5f7695a00751a17f395bb6341d98b Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 21 Jun 2023 16:24:05 +0400
Subject: [PATCH 004/352] Remove CustomEmailWorker to fix WARN

---
 app/controllers/admin/custom_emails_controller.rb | 2 +-
 app/workers/custom_email_worker.rb                | 8 --------
 spec/workers/custom_email_worker_spec.rb          | 8 --------
 3 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 app/workers/custom_email_worker.rb
 delete mode 100644 spec/workers/custom_email_worker_spec.rb

diff --git a/app/controllers/admin/custom_emails_controller.rb b/app/controllers/admin/custom_emails_controller.rb
index bbe767e960..63645e8ab1 100644
--- a/app/controllers/admin/custom_emails_controller.rb
+++ b/app/controllers/admin/custom_emails_controller.rb
@@ -14,7 +14,7 @@ def create
 
     @form = CustomEmailForm.new(custom_email_form_attributes)
     if @form.valid?
-      CustomEmailWorker.perform_async(custom_email_form_attributes)
+      CustomEmailForm.new(custom_email_form_attributes.permit!.to_h.with_indifferent_access).send!
       redirect_to admin_custom_email_path, notice: "Email was successfully scheduled"
     else
       render :show
diff --git a/app/workers/custom_email_worker.rb b/app/workers/custom_email_worker.rb
deleted file mode 100644
index 0ae4467ddc..0000000000
--- a/app/workers/custom_email_worker.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-class CustomEmailWorker
-  include Sidekiq::Worker
-
-  def perform(request)
-    puts "processing email #{request}"
-    CustomEmailForm.new(JSON.parse(request).with_indifferent_access).send!
-  end
-end
diff --git a/spec/workers/custom_email_worker_spec.rb b/spec/workers/custom_email_worker_spec.rb
deleted file mode 100644
index 9736ae4f3c..0000000000
--- a/spec/workers/custom_email_worker_spec.rb
+++ /dev/null
@@ -1,8 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe CustomEmailWorker do
-  it 'should perform correctly' do
-    allow_any_instance_of(CustomEmailForm).to receive(:send!) {true}
-    described_class.new.perform({}.to_json)
-  end
-end

From 0beda811da95ccdee9fc4fbdce327947a5675359 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 21 Jun 2023 16:42:44 +0400
Subject: [PATCH 005/352] Fix warn: URI.escape is obsolete

---
 app/helpers/winners_awards_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/winners_awards_helper.rb b/app/helpers/winners_awards_helper.rb
index 4c1bd031e1..1baad0e05a 100644
--- a/app/helpers/winners_awards_helper.rb
+++ b/app/helpers/winners_awards_helper.rb
@@ -1,7 +1,8 @@
 module WinnersAwardsHelper
   def static_s3_asset_path(year, file_name)
     file_path = "winners assets #{year}/#{file_name}"
-    URI.encode("https://s3-eu-west-1.amazonaws.com/qae-winners-assets/#{file_path}")
+
+    "https://s3-eu-west-1.amazonaws.com/qae-winners-assets/#{CGI.escape(file_path)}"
   end
 end
 

From d0980c993c67bd0287724a8a217e625a3821710f Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 21 Jun 2023 16:49:34 +0400
Subject: [PATCH 006/352] Fix DEPRECATION WARNING about ActiveModel::Errors
 methods

---
 app/validators/company_registration_number_validator.rb | 2 +-
 spec/models/assessor_assignment_spec.rb                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/validators/company_registration_number_validator.rb b/app/validators/company_registration_number_validator.rb
index 21c5820839..1f155421e9 100644
--- a/app/validators/company_registration_number_validator.rb
+++ b/app/validators/company_registration_number_validator.rb
@@ -18,7 +18,7 @@ def validate_each(record, attribute, value)
     return if options[:allow_blank] && value.blank?
     return if options[:allow_empty] && value == ""
     unless self.class.valid?(value)
-      record.errors[attribute] << (options[:message] || "is not a valid company registration number")
+      record.errors.add(attribute, message: options[:message] || "is not a valid company registration number")
     end
   end
 end
diff --git a/spec/models/assessor_assignment_spec.rb b/spec/models/assessor_assignment_spec.rb
index c20a44a857..5a8852bb73 100644
--- a/spec/models/assessor_assignment_spec.rb
+++ b/spec/models/assessor_assignment_spec.rb
@@ -13,7 +13,7 @@
         attributes.each do |meth|
           obj = build_assignment_with(:trade, meth)
           expect(obj).to_not be_valid
-          expect(obj.errors.keys).to include(form.desc(meth).to_sym)
+          expect(obj.errors.attribute_names).to include(form.desc(meth).to_sym)
         end
       end
     end
@@ -47,7 +47,7 @@
         attributes.each do |meth|
           obj = build_assignment_with(:development, meth)
           expect(obj).to_not be_valid
-          expect(obj.errors.keys).to include(form.desc(meth).to_sym)
+          expect(obj.errors.attribute_names).to include(form.desc(meth).to_sym)
         end
       end
     end
@@ -63,7 +63,7 @@
         end
         it "is invalid" do
           expect(subject).to_not be_valid
-          expect(subject.errors.keys).to include(:commercial_success_rate)
+          expect(subject.errors.attribute_names).to include(:commercial_success_rate)
         end
       end
     end
@@ -158,7 +158,7 @@
     it "can not have assigned assessor" do
       subject.assessor_id = 1
       expect(subject).to_not be_valid
-      expect(subject.errors.values.join).to match("cannot be present for this")
+      expect(subject.errors.map { |error| error.message }.join(', ')).to match("cannot be present for this")
     end
   end
 

From 0352533a47529ec5e29c15ddbaa63e5998bd88e6 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 21 Jun 2023 18:32:02 +0400
Subject: [PATCH 007/352] Add paper_trail-association_tracking gem

---
 Gemfile      | 1 +
 Gemfile.lock | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/Gemfile b/Gemfile
index 61fe26583d..298ae473f4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,6 +15,7 @@ gem 'pg'
 
 # Track Changes
 gem 'paper_trail', '~> 10.3'
+gem 'paper_trail-association_tracking'
 
 # Assets & Templates
 gem 'sprockets', '~> 3.7.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index d36350301b..6fb380468f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -519,6 +519,8 @@ GEM
     paper_trail (10.3.1)
       activerecord (>= 4.2)
       request_store (~> 1.1)
+    paper_trail-association_tracking (2.1.3)
+      paper_trail (< 12.0)
     parallel (1.23.0)
     parser (3.2.2.1)
       ast (~> 2.4.1)
@@ -886,6 +888,7 @@ DEPENDENCIES
   nilify_blanks
   nokogiri
   paper_trail (~> 10.3)
+  paper_trail-association_tracking
   pdf-inspector
   pg
   pg_search (~> 2.3.3)

From a60d88e065b29f67d09bd2c871229c46b971f271 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 21 Jun 2023 18:49:28 +0400
Subject: [PATCH 008/352] Fix webmock spec settings

---
 spec/rails_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 3fe17b6233..83a443b219 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -35,7 +35,7 @@ def matches?(source_file)
 
 Dotenv.overload('.env.test')
 
-WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true)
+WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true, net_http_connect_on_start: true)
 
 # Require all support files.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }

From 14393b621f0551ea30460a0355812b2585d5c797 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Thu, 22 Jun 2023 13:16:16 +0400
Subject: [PATCH 009/352] Fix WebMock spec settings

---
 spec/rails_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 83a443b219..517a96747f 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -35,7 +35,8 @@ def matches?(source_file)
 
 Dotenv.overload('.env.test')
 
-WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true, net_http_connect_on_start: true)
+WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true)
+WebMock.allow_net_connect!(net_http_connect_on_start: true)
 
 # Require all support files.
 Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }

From 3a8a00b7728da6ba8eff701b07c24402da30f90c Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Thu, 22 Jun 2023 13:30:53 +0400
Subject: [PATCH 010/352] Bump capybara gem from 3.33.0 to 3.39.2

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 298ae473f4..020d73fd48 100644
--- a/Gemfile
+++ b/Gemfile
@@ -180,7 +180,7 @@ end
 
 group :test do
   gem 'factory_bot_rails'
-  gem 'capybara', '3.33'
+  gem 'capybara', '3.39.2'
   gem 'poltergeist'
   gem 'database_cleaner-active_record'
   gem 'launchy'
diff --git a/Gemfile.lock b/Gemfile.lock
index 6fb380468f..fc5605f23f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -105,13 +105,14 @@ GEM
     browser (2.4.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.33.0)
+    capybara (3.39.2)
       addressable
+      matrix
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
       rack (>= 1.6.0)
       rack-test (>= 0.6.3)
-      regexp_parser (~> 1.5)
+      regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
     carrierwave (1.3.3)
       activemodel (>= 4.0.0)
@@ -476,6 +477,7 @@ GEM
       notifications-ruby-client (~> 5.1)
       rack (>= 2.1.4.1)
     marcel (1.0.2)
+    matrix (0.4.2)
     method_source (1.0.0)
     middleware (0.1.0)
     mime-types (3.4.1)
@@ -850,7 +852,7 @@ DEPENDENCIES
   bootscale
   bootstrap-sass (~> 3.4)
   browser (= 2.4.0)
-  capybara (= 3.33)
+  capybara (= 3.39.2)
   carrierwave (~> 1.3)
   ckeditor
   codeclimate_circle_ci_coverage

From a8eae966180921d1b0ca28f99730fe0968498c48 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Thu, 22 Jun 2023 12:39:56 +0200
Subject: [PATCH 011/352] add case index report

---
 app/controllers/admin/reports_controller.rb   |  2 +-
 app/models/reports/admin_report.rb            | 18 +++++
 app/models/reports/case_index_report.rb       | 75 +++++++++++++++++++
 app/models/reports/csv_helper.rb              | 12 +--
 app/models/reports/form_answer.rb             |  4 +
 app/views/admin/dashboard/downloads.html.slim |  2 +
 .../dashboard/downloads/_case_index.html.slim | 11 +++
 .../downloads/_case_index_link.html.slim      | 12 +++
 spec/models/reports/admin_report_spec.rb      | 10 +++
 9 files changed, 139 insertions(+), 7 deletions(-)
 create mode 100644 app/models/reports/case_index_report.rb
 create mode 100644 app/views/admin/dashboard/downloads/_case_index.html.slim
 create mode 100644 app/views/admin/dashboard/downloads/_case_index_link.html.slim

diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 4c53f064c7..3c32cae330 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -60,7 +60,7 @@ def stream_csv
   end
 
   def csv_filename
-    "#{params[:id] || "report"}.csv"
+    resource.csv_filename.presence || "#{params[:id] || "report"}.csv"
   end
 
   def resource
diff --git a/app/models/reports/admin_report.rb b/app/models/reports/admin_report.rb
index 3f396164e5..a5878d8c49 100644
--- a/app/models/reports/admin_report.rb
+++ b/app/models/reports/admin_report.rb
@@ -15,6 +15,8 @@ def as_csv
       Reports::PressBookList.new(year).stream
     when "cases-status"
       Reports::CasesStatusReport.new(year).stream
+    when "case-index"
+      Reports::CaseIndexReport.new(year).stream
     when "entries-report"
       Reports::AllEntries.new(year).stream
     when "discrepancies_between_primary_and_secondary_appraisals"
@@ -30,6 +32,22 @@ def as_csv
     end
   end
 
+  def csv_filename
+    sub_type = ""
+    if category == "trade" &&
+       id == "case-index" &&
+       year.year != 2016
+       # For 2016 we use one report for both trade years modes ('3 to 5' and '6 plus')
+      sub_type = "_#{params[:years_mode]}"
+    end
+
+    case id
+    when "case-index"
+      time = Time.zone.now.strftime("%e_%b_%Y_at_%-l:%M%P")
+      "#{::FormAnswer::AWARD_TYPE_FULL_NAMES[params[:category]]}_award#{sub_type}_#{id}_#{time}.csv"
+    end
+  end
+
   def as_xlsx
     case id
     when "compiled-press-book"
diff --git a/app/models/reports/case_index_report.rb b/app/models/reports/case_index_report.rb
new file mode 100644
index 0000000000..9b923b5491
--- /dev/null
+++ b/app/models/reports/case_index_report.rb
@@ -0,0 +1,75 @@
+class Reports::CaseIndexReport
+  include Reports::CSVHelper
+
+  MAPPING = [
+    {
+      label: "URN",
+      method: :urn
+    },
+    {
+      label: "Category",
+      method: :category
+    },
+    {
+      label: "CompanyName",
+      method: :company_or_nominee_name
+    },
+    {
+      label: "Overall status",
+      method: :overall_status
+    },
+    {
+      label: "SIC Code",
+      method: :sic_code
+    },
+    {
+      label: "Employees",
+      method: :employees
+    },
+    {
+      label: "CurrentQueensAwardHolder",
+      method: :current_queens_award_holder
+    },
+    {
+      label: "Verdict",
+      method: :empty_column
+    },
+    {
+      label: "Panel Comments",
+      method: :empty_column
+    },
+    {
+      label: "Feedback",
+      method: :empty_column
+    }
+  ]
+
+  def initialize(year)
+    @year = year
+  end
+
+  def build
+    prepare_response(scoped_collection)
+  end
+
+  def build_for_lead(current_subject)
+    scoped = scoped_collection.where(award_type: current_subject.categories_as_lead)
+
+    prepare_response(scoped)
+  end
+
+  def stream
+    prepare_stream(scoped_collection)
+  end
+
+  private
+
+  def scoped_collection
+    @year.form_answers.submitted
+                      .order(:sic_code)
+  end
+
+  def mapping
+    MAPPING
+  end
+end
diff --git a/app/models/reports/csv_helper.rb b/app/models/reports/csv_helper.rb
index 09c0ae2708..36051393ae 100644
--- a/app/models/reports/csv_helper.rb
+++ b/app/models/reports/csv_helper.rb
@@ -55,11 +55,11 @@ def prepare_stream(scope, limited_access = false)
 
   private
 
-    def headers
-      mapping.map { |m| m[:label] }
-    end
+  def headers
+    mapping.map { |m| m[:label] }
+  end
 
-    def sanitize_string(string)
-      string.present? ? string.to_s.tr("\n","").squish : ""
-    end
+  def sanitize_string(string)
+    string.present? ? string.to_s.tr("\n","").squish : ""
+  end
 end
diff --git a/app/models/reports/form_answer.rb b/app/models/reports/form_answer.rb
index 1613a0ccb5..528e663f60 100644
--- a/app/models/reports/form_answer.rb
+++ b/app/models/reports/form_answer.rb
@@ -232,6 +232,10 @@ def overall_status
     obj.state.humanize
   end
 
+  def empty_column
+    ""
+  end
+
   def po_sd_provided_actual_figures?
     %w[mobility development].include?(obj.award_type) && obj.document["product_estimated_figures"] == "no"
   end
diff --git a/app/views/admin/dashboard/downloads.html.slim b/app/views/admin/dashboard/downloads.html.slim
index 528c6a49d3..ad55703d71 100644
--- a/app/views/admin/dashboard/downloads.html.slim
+++ b/app/views/admin/dashboard/downloads.html.slim
@@ -24,5 +24,7 @@
         = render "admin/dashboard/downloads/pdf_reports"
       .downloads-page__section
         = render "admin/dashboard/downloads/case_summaries"
+      .downloads-page__section
+        = render "admin/dashboard/downloads/case_index"
       .downloads-page__section
         = render "admin/dashboard/downloads/assessors_progress"
diff --git a/app/views/admin/dashboard/downloads/_case_index.html.slim b/app/views/admin/dashboard/downloads/_case_index.html.slim
new file mode 100644
index 0000000000..9e1525af76
--- /dev/null
+++ b/app/views/admin/dashboard/downloads/_case_index.html.slim
@@ -0,0 +1,11 @@
+h3
+  ' Case Index
+ul.download-list
+  - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|
+    - next if key.to_s == "promotion" && hide_promotion?
+
+    - if key == "trade" && @award_year.year != 2016
+      = render 'admin/dashboard/downloads/case_index_link', key: key, value: value, years_mode: 3
+      = render 'admin/dashboard/downloads/case_index_link', key: key, value: value, years_mode: 6
+    - else
+      = render 'admin/dashboard/downloads/case_index_link', key: key, value: value
diff --git a/app/views/admin/dashboard/downloads/_case_index_link.html.slim b/app/views/admin/dashboard/downloads/_case_index_link.html.slim
new file mode 100644
index 0000000000..bb6532c5cb
--- /dev/null
+++ b/app/views/admin/dashboard/downloads/_case_index_link.html.slim
@@ -0,0 +1,12 @@
+- link_ops = {category: key, format: :csv, year: @award_year.year}
+/ For 2016 we use one report for both trade years modes ('3 to 5' and '6 plus')
+- link_ops[:years_mode] = years_mode if key == "trade" && @award_year.year != 2016
+
+li.download-item
+  p.download-item__title
+    - if key == "trade" && @award_year.year != 2016
+      = "International Trade (#{years_mode} years)"
+    - else
+      = value
+
+  = link_to "Download", admin_report_path("case-index", link_ops), class: "download-link", aria: { label: "Download #{value}" }
diff --git a/spec/models/reports/admin_report_spec.rb b/spec/models/reports/admin_report_spec.rb
index ca1c18b189..d2ef25a6a1 100644
--- a/spec/models/reports/admin_report_spec.rb
+++ b/spec/models/reports/admin_report_spec.rb
@@ -51,6 +51,16 @@
         expect(data).to include(form_answer.urn)
       end
     end
+
+    describe "case index report" do
+      let(:id) { "case-index" }
+      before { create_test_forms }
+
+      it "generates the CSV" do
+        data = normalize_output(subject)
+        expect(data).to include(form_answer.urn)
+      end
+    end
   end
 end
 

From 9a12d0a86083f165e822988c8899ef7db109feeb Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Fri, 23 Jun 2023 13:53:40 +0400
Subject: [PATCH 012/352] Enable load_defaults 6.1

---
 app/controllers/form_controller.rb            |   2 +-
 app/decorators/form_answer_decorator.rb       |   8 +-
 app/form_pointers/financial_table.rb          |   8 +-
 app/form_pointers/financial_year_pointer.rb   |   8 +-
 app/form_pointers/form_financial_pointer.rb   |   8 +-
 .../award_years/v2018/enterprise_promotion.rb |  16 +--
 .../enterprise_promotion_step1.rb             |   2 +-
 .../enterprise_promotion_step2.rb             |   2 +-
 .../enterprise_promotion_step3.rb             |   2 +-
 .../enterprise_promotion_step4.rb             |   2 +-
 .../enterprise_promotion_step5.rb             |   2 +-
 .../enterprise_promotion_step6.rb             |   2 +-
 app/forms/award_years/v2018/innovation.rb     |  16 +--
 .../v2018/innovation/innovation_step1.rb      |   2 +-
 .../v2018/innovation/innovation_step2.rb      |   2 +-
 .../v2018/innovation/innovation_step3.rb      |   2 +-
 .../v2018/innovation/innovation_step4.rb      |   2 +-
 .../v2018/innovation/innovation_step5.rb      |   2 +-
 .../v2018/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2018/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |   2 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |   2 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2018/qae_forms.rb      |  12 +-
 .../award_years/v2018/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |   2 +-
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2018/sustainable_development.rb          |  16 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          |   2 +-
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 .../sustainable_development_step6.rb          |   2 +-
 app/forms/award_years/v2019/innovation.rb     |  16 +--
 .../v2019/innovation/innovation_step1.rb      |   2 +-
 .../v2019/innovation/innovation_step2.rb      |   2 +-
 .../v2019/innovation/innovation_step3.rb      |   2 +-
 .../v2019/innovation/innovation_step4.rb      |   2 +-
 .../v2019/innovation/innovation_step5.rb      |   2 +-
 .../v2019/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2019/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |   2 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |   2 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2019/qae_forms.rb      |  10 +-
 .../award_years/v2019/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |   2 +-
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2019/sustainable_development.rb          |  16 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          |   2 +-
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 .../sustainable_development_step6.rb          |   2 +-
 app/forms/award_years/v2020/innovation.rb     |  16 +--
 .../v2020/innovation/innovation_step1.rb      |   2 +-
 .../v2020/innovation/innovation_step2.rb      |   2 +-
 .../v2020/innovation/innovation_step3.rb      |  12 +-
 .../v2020/innovation/innovation_step4.rb      |   2 +-
 .../v2020/innovation/innovation_step5.rb      |   2 +-
 .../v2020/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2020/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |  12 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |  10 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2020/qae_forms.rb      |  10 +-
 .../award_years/v2020/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |  64 +++++------
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2020/sustainable_development.rb          |  14 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          | 104 +++++++++---------
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 app/forms/award_years/v2021/innovation.rb     |  16 +--
 .../v2021/innovation/innovation_step1.rb      |   2 +-
 .../v2021/innovation/innovation_step2.rb      |   2 +-
 .../v2021/innovation/innovation_step3.rb      |   2 +-
 .../v2021/innovation/innovation_step4.rb      |   2 +-
 .../v2021/innovation/innovation_step5.rb      |   2 +-
 .../v2021/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2021/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |   2 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |   2 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2021/qae_forms.rb      |  10 +-
 .../award_years/v2021/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |   2 +-
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2021/sustainable_development.rb          |  14 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          |   2 +-
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 app/forms/award_years/v2022/innovation.rb     |  16 +--
 .../v2022/innovation/innovation_step1.rb      |   2 +-
 .../v2022/innovation/innovation_step2.rb      |   2 +-
 .../v2022/innovation/innovation_step3.rb      |   2 +-
 .../v2022/innovation/innovation_step4.rb      |   2 +-
 .../v2022/innovation/innovation_step5.rb      |   2 +-
 .../v2022/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2022/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |   2 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |   2 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2022/qae_forms.rb      |  10 +-
 .../award_years/v2022/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |   2 +-
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2022/sustainable_development.rb          |  14 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          |   2 +-
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 app/forms/award_years/v2023/innovation.rb     |  16 +--
 .../v2023/innovation/innovation_step1.rb      |   2 +-
 .../v2023/innovation/innovation_step2.rb      |   2 +-
 .../v2023/innovation/innovation_step3.rb      |   2 +-
 .../v2023/innovation/innovation_step4.rb      |   2 +-
 .../v2023/innovation/innovation_step5.rb      |   2 +-
 .../v2023/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2023/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |   2 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |   2 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2023/qae_forms.rb      |  10 +-
 .../award_years/v2023/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |   2 +-
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2023/sustainable_development.rb          |  14 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          |   2 +-
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 app/forms/award_years/v2024/innovation.rb     |  16 +--
 .../v2024/innovation/innovation_step1.rb      |   2 +-
 .../v2024/innovation/innovation_step2.rb      |   2 +-
 .../v2024/innovation/innovation_step3.rb      |   2 +-
 .../v2024/innovation/innovation_step4.rb      |   2 +-
 .../v2024/innovation/innovation_step5.rb      |   2 +-
 .../v2024/innovation/innovation_step6.rb      |   2 +-
 .../award_years/v2024/international_trade.rb  |  16 +--
 .../international_trade_step1.rb              |   2 +-
 .../international_trade_step2.rb              |   2 +-
 .../international_trade_step3.rb              |   2 +-
 .../international_trade_step4.rb              |   2 +-
 .../international_trade_step5.rb              |   2 +-
 .../international_trade_step6.rb              |   2 +-
 app/forms/award_years/v2024/qae_forms.rb      |  10 +-
 .../award_years/v2024/social_mobility.rb      |  16 +--
 .../social_mobility/social_mobility_step1.rb  |   2 +-
 .../social_mobility/social_mobility_step2.rb  |   2 +-
 .../social_mobility/social_mobility_step3.rb  |   2 +-
 .../social_mobility/social_mobility_step4.rb  |   2 +-
 .../social_mobility/social_mobility_step5.rb  |   2 +-
 .../social_mobility/social_mobility_step6.rb  |   2 +-
 .../v2024/sustainable_development.rb          |  14 +--
 .../sustainable_development_step1.rb          |   2 +-
 .../sustainable_development_step2.rb          |   2 +-
 .../sustainable_development_step3.rb          |   2 +-
 .../sustainable_development_step4.rb          |   2 +-
 .../sustainable_development_step5.rb          |   2 +-
 app/forms/qae_form_builder.rb                 |   8 +-
 .../about_section_question.rb                 |   2 +-
 .../qae_form_builder/address_question.rb      |   2 +-
 .../qae_form_builder/award_holder_question.rb |   2 +-
 ...trade_goods_and_services_label_question.rb |   2 +-
 .../by_years_label_question.rb                |   4 +-
 .../qae_form_builder/by_years_question.rb     |   4 +-
 .../checkbox_seria_question.rb                |   2 +-
 .../qae_form_builder/comment_question.rb      |   2 +-
 .../qae_form_builder/confirm_question.rb      |   2 +-
 .../contact_email_question.rb                 |   2 +-
 .../qae_form_builder/contact_question.rb      |   2 +-
 .../qae_form_builder/country_question.rb      |   2 +-
 app/forms/qae_form_builder/date_question.rb   |   2 +-
 .../qae_form_builder/dropdown_question.rb     |   2 +-
 .../head_of_business_question.rb              |   2 +-
 app/forms/qae_form_builder/header_question.rb |   2 +-
 ...innovation_financial_year_date_question.rb |   2 +-
 app/forms/qae_form_builder/matrix_question.rb |   2 +-
 ...y_application_category_options_question.rb |   4 +
 ...ation_category_options_question_builder.rb |   4 +
 ...on_category_options_question_validator.rb} |   8 +-
 .../multi_question_decorator.rb               |   2 +-
 .../multi_question_validator.rb               |   2 +-
 app/forms/qae_form_builder/number_question.rb |   2 +-
 .../one_option_by_years_label_question.rb     |   2 +-
 .../one_option_by_years_question.rb           |   2 +-
 .../options_business_name_changed_question.rb |   2 +-
 .../qae_form_builder/options_question.rb      |   2 +-
 .../position_details_question.rb              |   2 +-
 .../press_contact_details_question.rb         |   2 +-
 .../previous_name_question.rb                 |   2 +-
 app/forms/qae_form_builder/qae_decorator.rb   |   6 +-
 app/forms/qae_form_builder/qae_form.rb        |   6 +-
 .../qae_form_builder/qae_form_decorator.rb    |   4 +-
 .../queen_award_applications_question.rb      |   2 +-
 .../queen_award_holder_question.rb            |   2 +-
 app/forms/qae_form_builder/question.rb        |  16 +--
 .../qae_form_builder/regions_question.rb      |   4 +-
 .../sic_code_dropdown_question.rb             |   4 +-
 app/forms/qae_form_builder/step.rb            |  20 ++--
 ...subsidiaries_associates_plants_question.rb |   2 +-
 .../qae_form_builder/supporters_question.rb   |   2 +-
 app/forms/qae_form_builder/text_question.rb   |   2 +-
 .../qae_form_builder/textarea_question.rb     |   2 +-
 .../trade_commercial_success_question.rb      |   2 +-
 ..._recent_financial_year_options_question.rb |   2 +-
 .../turnover_exports_calculation_question.rb  |   2 +-
 app/forms/qae_form_builder/upload_question.rb |   2 +-
 .../qae_form_builder/user_info_question.rb    |   2 +-
 app/forms/qae_form_builder/year_question.rb   |   2 +-
 app/models/account.rb                         |   2 +-
 app/models/aggregated_award_year_pdf.rb       |   2 +-
 app/models/assessor_assignment.rb             |   8 +-
 app/models/audit_log.rb                       |   4 +-
 app/models/case_summary_hard_copy_pdf.rb      |   2 +-
 app/models/comment.rb                         |   4 +-
 app/models/commercial_figures_file.rb         |   2 +-
 app/models/concerns/reviewable.rb             |   2 +-
 app/models/concerns/shortlisted_document.rb   |   2 +-
 app/models/deadline.rb                        |   2 +-
 app/models/draft_note.rb                      |   4 +-
 app/models/eligibility.rb                     |   4 +-
 app/models/email_notification.rb              |   2 +-
 app/models/feedback.rb                        |   6 +-
 app/models/feedback_hard_copy_pdf.rb          |   2 +-
 app/models/form_answer.rb                     |  30 ++---
 app/models/form_answer_attachment.rb          |   4 +-
 app/models/form_answer_progress.rb            |   2 +-
 app/models/form_answer_transition.rb          |   2 +-
 app/models/palace_attendee.rb                 |   2 +-
 app/models/palace_invite.rb                   |   2 +-
 app/models/press_summary.rb                   |   4 +-
 app/models/reports/all_entries.rb             |   2 +-
 .../reports/assessors_progress_report.rb      |   2 +-
 app/models/reports/cases_status_report.rb     |   2 +-
 app/models/reports/csv_helper.rb              |   2 +-
 ...etween_primary_and_secondary_appraisals.rb |   2 +-
 app/models/reports/press_book_list.rb         |   2 +-
 .../reception_buckingham_palace_report.rb     |   2 +-
 app/models/reports/registered_users.rb        |   2 +-
 app/models/settings.rb                        |   2 +-
 app/models/shortlisted_documents_wrapper.rb   |   2 +-
 app/models/support_letter.rb                  |   6 +-
 app/models/support_letter_attachment.rb       |   6 +-
 app/models/supporter.rb                       |   4 +-
 app/models/user.rb                            |   2 +-
 app/models/vat_returns_file.rb                |   2 +-
 .../case_summary_pdfs/general/data_pointer.rb |   8 +-
 app/pdf_generators/form_pdf.rb                |   6 +-
 .../qae_pdf_forms/custom_questions/lists.rb   |  30 ++---
 .../qae_pdf_forms/general/question_pointer.rb |  68 ++++++------
 .../shared_pdf_helpers/data_helpers.rb        |   2 +-
 .../company_details/_sic_form.html.slim       |   2 +-
 .../qae_form/_address_question.html.slim      |   2 +-
 app/views/qae_form/_question.html.slim        |   4 +-
 config/application.rb                         |   2 +
 lib/{qae.rb => q_a_e.rb}                      |   0
 lib/sic_code.rb                               |   4 +-
 spec/decorators/form_answer_decorator_spec.rb |   4 +-
 spec/lib/qae_form_builder_spec.rb             |   4 +-
 spec/lib/sic_code_spec.rb                     |   4 +-
 spec/models/aggregated_award_year_pdf_spec.rb |   2 +-
 spec/models/audit_certificate_spec.rb         |   4 +-
 spec/models/eligibility_spec.rb               |   4 +-
 spec/models/form_answer_spec.rb               |   4 -
 spec/models/support_letter_attachment_spec.rb |   5 -
 spec/rails_helper.rb                          |   2 +-
 spec/support/database_cleaner.rb              |  37 +++++--
 spec/unit/qae_form_builder_spec.rb            |  20 ++--
 ...pany_registration_number_validator_spec.rb |   2 +-
 .../case_summary_worker_spec.rb               |   4 +-
 322 files changed, 814 insertions(+), 802 deletions(-)
 create mode 100644 app/forms/qae_form_builder/mobility_application_category_options_question.rb
 create mode 100644 app/forms/qae_form_builder/mobility_application_category_options_question_builder.rb
 rename app/forms/qae_form_builder/{mobility_application_category_options.rb => mobility_application_category_options_question_validator.rb} (73%)
 rename lib/{qae.rb => q_a_e.rb} (100%)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index a99fdf1788..807a62ece5 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -54,7 +54,7 @@ class FormController < ApplicationController
 
   expose(:questions_with_references) do
     all_form_questions.select do |q|
-      !q.is_a?(QAEFormBuilder::HeaderQuestion) &&
+      !q.is_a?(QaeFormBuilder::HeaderQuestion) &&
       (q.ref.present? || q.sub_ref.present?)
     end
   end
diff --git a/app/decorators/form_answer_decorator.rb b/app/decorators/form_answer_decorator.rb
index a5c77fa1c8..7ae05fe915 100644
--- a/app/decorators/form_answer_decorator.rb
+++ b/app/decorators/form_answer_decorator.rb
@@ -154,7 +154,7 @@ def progress_text
 
   def average_growth_for(year)
     if object.sic_code.present?
-      sic = SICCode.find_by(code: object.sic_code)
+      sic = SicCode.find_by(code: object.sic_code)
       sic.by_year(year) if sic
     end
   end
@@ -168,7 +168,7 @@ def all_average_growths
   def sic_code_name
     sic = object.sic_code
     if sic.present?
-      SICCode.find_by(code: sic).name
+      SicCode.find_by(code: sic).name
     end
   end
 
@@ -180,7 +180,7 @@ def corp_responsibility_required_keys
     object.award_form.steps.detect do |step|
       step.short_title == "Declaration of Corporate Responsibility"
     end.questions.select do |q|
-      q.is_a?(QAEFormBuilder::TextareaQuestion) && q.required
+      q.is_a?(QaeFormBuilder::TextareaQuestion) && q.required
     end.map(&:key)
        .map(&:to_s)
   end
@@ -198,7 +198,7 @@ def awarded?
   def average_growth_legend(years = [1, 2, 3])
     growths = years.map { |y| average_growth_for(y) }.uniq
     growths.map do |g|
-      note = SICCode::NOTES[g]
+      note = SicCode::NOTES[g]
       "#{g} - #{note}" if note
     end.compact.join("\n")
   end
diff --git a/app/form_pointers/financial_table.rb b/app/form_pointers/financial_table.rb
index 3c31cb4e0c..a0184c2a05 100644
--- a/app/form_pointers/financial_table.rb
+++ b/app/form_pointers/financial_table.rb
@@ -153,10 +153,10 @@ def one_option_question_or_development?
   end
 
   def one_option_question?
-    question.is_a?(QAEFormBuilder::OneOptionByYearsLabelQuestionDecorator) ||
-      question.is_a?(QAEFormBuilder::OneOptionByYearsQuestionDecorator) ||
-      question.is_a?(QAEFormBuilder::OneOptionByYearsLabelQuestion) ||
-      question.is_a?(QAEFormBuilder::OneOptionByYearsQuestion)
+    question.is_a?(QaeFormBuilder::OneOptionByYearsLabelQuestionDecorator) ||
+      question.is_a?(QaeFormBuilder::OneOptionByYearsQuestionDecorator) ||
+      question.is_a?(QaeFormBuilder::OneOptionByYearsLabelQuestion) ||
+      question.is_a?(QaeFormBuilder::OneOptionByYearsQuestion)
   end
 
   def innovation_years_number
diff --git a/app/form_pointers/financial_year_pointer.rb b/app/form_pointers/financial_year_pointer.rb
index 998f235ff0..a8885b0e9b 100644
--- a/app/form_pointers/financial_year_pointer.rb
+++ b/app/form_pointers/financial_year_pointer.rb
@@ -21,13 +21,13 @@ def data
 
   def fetch_data
     case question.delegate_obj
-    when QAEFormBuilder::ByYearsLabelQuestion
+    when QaeFormBuilder::ByYearsLabelQuestion
       fetch_year_labels
-    when QAEFormBuilder::ByYearsQuestion
+    when QaeFormBuilder::ByYearsQuestion
       fetch_years
-    when QAEFormBuilder::OneOptionByYearsLabelQuestion
+    when QaeFormBuilder::OneOptionByYearsLabelQuestion
       fetch_one_option_year_labels
-    when QAEFormBuilder::OneOptionByYearsQuestion
+    when QaeFormBuilder::OneOptionByYearsQuestion
       fetch_one_option_years
     end
   end
diff --git a/app/form_pointers/form_financial_pointer.rb b/app/form_pointers/form_financial_pointer.rb
index 8c2b0e81a2..7c172d668d 100644
--- a/app/form_pointers/form_financial_pointer.rb
+++ b/app/form_pointers/form_financial_pointer.rb
@@ -13,10 +13,10 @@ class FormFinancialPointer
               :options
 
   TARGET_FINANCIAL_DATA_QUESTION_TYPES = [
-    QAEFormBuilder::ByYearsLabelQuestion,
-    QAEFormBuilder::ByYearsQuestion,
-    QAEFormBuilder::OneOptionByYearsLabelQuestion,
-    QAEFormBuilder::OneOptionByYearsQuestion
+    QaeFormBuilder::ByYearsLabelQuestion,
+    QaeFormBuilder::ByYearsQuestion,
+    QaeFormBuilder::OneOptionByYearsLabelQuestion,
+    QaeFormBuilder::OneOptionByYearsQuestion
   ]
   YEAR_LABELS = %w(day month year)
   IN_PROGRESS = "-"
diff --git a/app/forms/award_years/v2018/enterprise_promotion.rb b/app/forms/award_years/v2018/enterprise_promotion.rb
index d10251913c..58defb80ef 100644
--- a/app/forms/award_years/v2018/enterprise_promotion.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion.rb
@@ -5,36 +5,36 @@
 require "award_years/v2018/enterprise_promotion/enterprise_promotion_step5"
 require "award_years/v2018/enterprise_promotion/enterprise_promotion_step6"
 
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion
-      @promotion ||= QAEFormBuilder.build "Enterprise Promotion Award Nomination" do
+      @promotion ||= QaeFormBuilder.build "Enterprise Promotion Award Nomination" do
         step "Nominee",
              "Nominee",
-             &AwardYears::V2018::QAEForms.promotion_step1
+             &AwardYears::V2018::QaeForms.promotion_step1
 
         step "Nominee Background",
              "Nominee Background",
              { id: :position_details_step },
-             &AwardYears::V2018::QAEForms.promotion_step2
+             &AwardYears::V2018::QaeForms.promotion_step2
 
         step "Recommendation",
              "Recommendation",
-             &AwardYears::V2018::QAEForms.promotion_step3
+             &AwardYears::V2018::QaeForms.promotion_step3
 
         step "Letters of Support",
              "Letters of Support",
              { id: :letters_of_support_step },
-             &AwardYears::V2018::QAEForms.promotion_step4
+             &AwardYears::V2018::QaeForms.promotion_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2018::QAEForms.promotion_step5
+             &AwardYears::V2018::QaeForms.promotion_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2018::QAEForms.promotion_step6
+             &AwardYears::V2018::QaeForms.promotion_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb
index 6e22fd01cd..2ba0f74cd5 100644
--- a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion_step1
       @promotion_step1 ||= proc do
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb
index 04717e28ad..e9ac8b4a77 100644
--- a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion_step2
       @promotion_step2 ||= proc do
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb
index 7d95cbb413..c06618da72 100644
--- a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion_step3
       @promotion_step3 ||= proc do
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb
index 372fae795b..b38fba7254 100644
--- a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion_step4
       @promotion_step4 ||= proc do
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb
index a36dcfb2dd..c9de603bd3 100644
--- a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion_step5
       @promotion_step5 ||= proc do
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb
index 363ce6135e..f3cb08dec6 100644
--- a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb
+++ b/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def promotion_step6
       @promotion_step6 ||= proc do
diff --git a/app/forms/award_years/v2018/innovation.rb b/app/forms/award_years/v2018/innovation.rb
index 455a5af143..d0125a675a 100644
--- a/app/forms/award_years/v2018/innovation.rb
+++ b/app/forms/award_years/v2018/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2018/innovation/innovation_step5"
 require "award_years/v2018/innovation/innovation_step6"
 
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2018::QAEForms.innovation_step1
+             &AwardYears::V2018::QaeForms.innovation_step1
 
         step "Your Innovation",
              "Your Innovation",
-             &AwardYears::V2018::QAEForms.innovation_step2
+             &AwardYears::V2018::QaeForms.innovation_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2018::QAEForms.innovation_step3
+             &AwardYears::V2018::QaeForms.innovation_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2018::QAEForms.innovation_step4
+             &AwardYears::V2018::QaeForms.innovation_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2018::QAEForms.innovation_step5
+             &AwardYears::V2018::QaeForms.innovation_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2018::QAEForms.innovation_step6
+             &AwardYears::V2018::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2018/innovation/innovation_step1.rb b/app/forms/award_years/v2018/innovation/innovation_step1.rb
index db17121370..9458f5b157 100644
--- a/app/forms/award_years/v2018/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2018/innovation/innovation_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2018/innovation/innovation_step2.rb b/app/forms/award_years/v2018/innovation/innovation_step2.rb
index 05b61865c3..c156bd3e85 100644
--- a/app/forms/award_years/v2018/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2018/innovation/innovation_step2.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2018/innovation/innovation_step3.rb b/app/forms/award_years/v2018/innovation/innovation_step3.rb
index c6444924ba..2958983a37 100644
--- a/app/forms/award_years/v2018/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2018/innovation/innovation_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
diff --git a/app/forms/award_years/v2018/innovation/innovation_step4.rb b/app/forms/award_years/v2018/innovation/innovation_step4.rb
index 2f18365ec5..d14f2a5d15 100644
--- a/app/forms/award_years/v2018/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2018/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2018/innovation/innovation_step5.rb b/app/forms/award_years/v2018/innovation/innovation_step5.rb
index be42cf5cbe..53c59d0e8e 100644
--- a/app/forms/award_years/v2018/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2018/innovation/innovation_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2018/innovation/innovation_step6.rb b/app/forms/award_years/v2018/innovation/innovation_step6.rb
index 46d030c011..26dd473d9b 100644
--- a/app/forms/award_years/v2018/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2018/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2018/international_trade.rb b/app/forms/award_years/v2018/international_trade.rb
index 06982818b6..ad9c325064 100644
--- a/app/forms/award_years/v2018/international_trade.rb
+++ b/app/forms/award_years/v2018/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2018/international_trade/international_trade_step5"
 require "award_years/v2018/international_trade/international_trade_step6"
 
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2018::QAEForms.trade_step1
+             &AwardYears::V2018::QaeForms.trade_step1
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2018::QAEForms.trade_step2
+             &AwardYears::V2018::QaeForms.trade_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2018::QAEForms.trade_step3
+             &AwardYears::V2018::QaeForms.trade_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2018::QAEForms.trade_step4
+             &AwardYears::V2018::QaeForms.trade_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2018::QAEForms.trade_step5
+             &AwardYears::V2018::QaeForms.trade_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2018::QAEForms.trade_step6
+             &AwardYears::V2018::QaeForms.trade_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step1.rb b/app/forms/award_years/v2018/international_trade/international_trade_step1.rb
index 97dfebade5..e16aed83ca 100644
--- a/app/forms/award_years/v2018/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2018/international_trade/international_trade_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step2.rb b/app/forms/award_years/v2018/international_trade/international_trade_step2.rb
index 1d5644960f..eaa2cd4ea8 100644
--- a/app/forms/award_years/v2018/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2018/international_trade/international_trade_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step3.rb b/app/forms/award_years/v2018/international_trade/international_trade_step3.rb
index 01d42c33a9..363b672686 100644
--- a/app/forms/award_years/v2018/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2018/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step4.rb b/app/forms/award_years/v2018/international_trade/international_trade_step4.rb
index cfc659d420..b1cd0109be 100644
--- a/app/forms/award_years/v2018/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2018/international_trade/international_trade_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step5.rb b/app/forms/award_years/v2018/international_trade/international_trade_step5.rb
index 82d9fbea30..5f2f0a8991 100644
--- a/app/forms/award_years/v2018/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2018/international_trade/international_trade_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step6.rb b/app/forms/award_years/v2018/international_trade/international_trade_step6.rb
index 285193678e..58ca77aa54 100644
--- a/app/forms/award_years/v2018/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2018/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2018/qae_forms.rb b/app/forms/award_years/v2018/qae_forms.rb
index d80dcf6065..22d40c4cda 100644
--- a/app/forms/award_years/v2018/qae_forms.rb
+++ b/app/forms/award_years/v2018/qae_forms.rb
@@ -1,8 +1,8 @@
-require 'award_years/v2018/innovation'
-require 'award_years/v2018/international_trade'
-require 'award_years/v2018/sustainable_development'
-require 'award_years/v2018/social_mobility'
-require 'award_years/v2018/enterprise_promotion'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
+require_relative 'enterprise_promotion'
 
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
 end
diff --git a/app/forms/award_years/v2018/social_mobility.rb b/app/forms/award_years/v2018/social_mobility.rb
index 9c4fee4862..8ddb3285de 100644
--- a/app/forms/award_years/v2018/social_mobility.rb
+++ b/app/forms/award_years/v2018/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2018/social_mobility/social_mobility_step5"
 require "award_years/v2018/social_mobility/social_mobility_step6"
 
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2018::QAEForms.mobility_step1
+             &AwardYears::V2018::QaeForms.mobility_step1
 
         step "Your Social Mobility Programme(s)",
              "Your Social Mobility",
-             &AwardYears::V2018::QAEForms.mobility_step2
+             &AwardYears::V2018::QaeForms.mobility_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2018::QAEForms.mobility_step3
+             &AwardYears::V2018::QaeForms.mobility_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2018::QAEForms.mobility_step4
+             &AwardYears::V2018::QaeForms.mobility_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2018::QAEForms.mobility_step5
+             &AwardYears::V2018::QaeForms.mobility_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2018::QAEForms.mobility_step6
+             &AwardYears::V2018::QaeForms.mobility_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2018/social_mobility/social_mobility_step1.rb
index 5742217aa2..d74c4236db 100644
--- a/app/forms/award_years/v2018/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2018/social_mobility/social_mobility_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2018/social_mobility/social_mobility_step2.rb
index 7a2fa96e37..0b11d0b5d3 100644
--- a/app/forms/award_years/v2018/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2018/social_mobility/social_mobility_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2018/social_mobility/social_mobility_step3.rb
index 2957584ede..72cb8c15b7 100644
--- a/app/forms/award_years/v2018/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2018/social_mobility/social_mobility_step3.rb
@@ -1,6 +1,6 @@
 
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2018/social_mobility/social_mobility_step4.rb
index 321746dc1d..95300ad5f5 100644
--- a/app/forms/award_years/v2018/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2018/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2018/social_mobility/social_mobility_step5.rb
index 3a6a30de34..4aba67c912 100644
--- a/app/forms/award_years/v2018/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2018/social_mobility/social_mobility_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2018/social_mobility/social_mobility_step6.rb
index 83bd952f77..dada4f9736 100644
--- a/app/forms/award_years/v2018/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2018/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2018/sustainable_development.rb b/app/forms/award_years/v2018/sustainable_development.rb
index 3803c3cd69..d0765931db 100644
--- a/app/forms/award_years/v2018/sustainable_development.rb
+++ b/app/forms/award_years/v2018/sustainable_development.rb
@@ -5,34 +5,34 @@
 require "award_years/v2018/sustainable_development/sustainable_development_step5"
 require "award_years/v2018/sustainable_development/sustainable_development_step6"
 
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2018::QAEForms.development_step1
+             &AwardYears::V2018::QaeForms.development_step1
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2018::QAEForms.development_step2
+             &AwardYears::V2018::QaeForms.development_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2018::QAEForms.development_step3
+             &AwardYears::V2018::QaeForms.development_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2018::QAEForms.development_step4
+             &AwardYears::V2018::QaeForms.development_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2018::QAEForms.development_step5
+             &AwardYears::V2018::QaeForms.development_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2018::QAEForms.development_step6
+             &AwardYears::V2018::QaeForms.development_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb
index 2779b17295..c7b07733b9 100644
--- a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb
index 8224f8e09b..052f3e144e 100644
--- a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb
index ad595947d8..d8ad5dcf7b 100644
--- a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb
index b524d65d79..eda0d05a7b 100644
--- a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb
index 583d722ed6..78556cca7c 100644
--- a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb
index 5308dd7db4..f56514b352 100644
--- a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb
+++ b/app/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2018::QAEForms
+class AwardYears::V2018::QaeForms
   class << self
     def development_step6
       @development_step6 ||= proc do
diff --git a/app/forms/award_years/v2019/innovation.rb b/app/forms/award_years/v2019/innovation.rb
index 3c0d82f0ab..a63298f504 100644
--- a/app/forms/award_years/v2019/innovation.rb
+++ b/app/forms/award_years/v2019/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2019/innovation/innovation_step5"
 require "award_years/v2019/innovation/innovation_step6"
 
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2019::QAEForms.innovation_step1
+             &AwardYears::V2019::QaeForms.innovation_step1
 
         step "Your Innovation",
              "Your Innovation",
-             &AwardYears::V2019::QAEForms.innovation_step2
+             &AwardYears::V2019::QaeForms.innovation_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2019::QAEForms.innovation_step3
+             &AwardYears::V2019::QaeForms.innovation_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2019::QAEForms.innovation_step4
+             &AwardYears::V2019::QaeForms.innovation_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2019::QAEForms.innovation_step5
+             &AwardYears::V2019::QaeForms.innovation_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2019::QAEForms.innovation_step6
+             &AwardYears::V2019::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2019/innovation/innovation_step1.rb b/app/forms/award_years/v2019/innovation/innovation_step1.rb
index 5038f037d7..9d0a22ff29 100644
--- a/app/forms/award_years/v2019/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2019/innovation/innovation_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2019/innovation/innovation_step2.rb b/app/forms/award_years/v2019/innovation/innovation_step2.rb
index 182e36a793..d32bcaedfe 100644
--- a/app/forms/award_years/v2019/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2019/innovation/innovation_step2.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2019/innovation/innovation_step3.rb b/app/forms/award_years/v2019/innovation/innovation_step3.rb
index 0e3b81103b..ec4022c6a0 100644
--- a/app/forms/award_years/v2019/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2019/innovation/innovation_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
diff --git a/app/forms/award_years/v2019/innovation/innovation_step4.rb b/app/forms/award_years/v2019/innovation/innovation_step4.rb
index 88ad356f30..6cc849f27c 100644
--- a/app/forms/award_years/v2019/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2019/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2019/innovation/innovation_step5.rb b/app/forms/award_years/v2019/innovation/innovation_step5.rb
index 130291371f..66d565e208 100644
--- a/app/forms/award_years/v2019/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2019/innovation/innovation_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2019/innovation/innovation_step6.rb b/app/forms/award_years/v2019/innovation/innovation_step6.rb
index 4bda7d8880..f1b267def6 100644
--- a/app/forms/award_years/v2019/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2019/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2019/international_trade.rb b/app/forms/award_years/v2019/international_trade.rb
index 289127f232..808ca73ac5 100644
--- a/app/forms/award_years/v2019/international_trade.rb
+++ b/app/forms/award_years/v2019/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2019/international_trade/international_trade_step5"
 require "award_years/v2019/international_trade/international_trade_step6"
 
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2019::QAEForms.trade_step1
+             &AwardYears::V2019::QaeForms.trade_step1
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2019::QAEForms.trade_step2
+             &AwardYears::V2019::QaeForms.trade_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2019::QAEForms.trade_step3
+             &AwardYears::V2019::QaeForms.trade_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2019::QAEForms.trade_step4
+             &AwardYears::V2019::QaeForms.trade_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2019::QAEForms.trade_step5
+             &AwardYears::V2019::QaeForms.trade_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2019::QAEForms.trade_step6
+             &AwardYears::V2019::QaeForms.trade_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step1.rb b/app/forms/award_years/v2019/international_trade/international_trade_step1.rb
index 18f6f29af0..cccab7550d 100644
--- a/app/forms/award_years/v2019/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2019/international_trade/international_trade_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step2.rb b/app/forms/award_years/v2019/international_trade/international_trade_step2.rb
index 241571ad8a..803c325043 100644
--- a/app/forms/award_years/v2019/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2019/international_trade/international_trade_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step3.rb b/app/forms/award_years/v2019/international_trade/international_trade_step3.rb
index 57bb798a7d..ad1bfa4482 100644
--- a/app/forms/award_years/v2019/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2019/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step4.rb b/app/forms/award_years/v2019/international_trade/international_trade_step4.rb
index bd134d24f0..4f158afe38 100644
--- a/app/forms/award_years/v2019/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2019/international_trade/international_trade_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step5.rb b/app/forms/award_years/v2019/international_trade/international_trade_step5.rb
index 05364587cb..bff0cb1ce2 100644
--- a/app/forms/award_years/v2019/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2019/international_trade/international_trade_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step6.rb b/app/forms/award_years/v2019/international_trade/international_trade_step6.rb
index 7fe1d21d6c..d856b446e9 100644
--- a/app/forms/award_years/v2019/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2019/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2019/qae_forms.rb b/app/forms/award_years/v2019/qae_forms.rb
index 274ea54c51..84e07ef4fe 100644
--- a/app/forms/award_years/v2019/qae_forms.rb
+++ b/app/forms/award_years/v2019/qae_forms.rb
@@ -1,7 +1,7 @@
-require 'award_years/v2019/innovation'
-require 'award_years/v2019/international_trade'
-require 'award_years/v2019/sustainable_development'
-require 'award_years/v2019/social_mobility'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
 
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
 end
diff --git a/app/forms/award_years/v2019/social_mobility.rb b/app/forms/award_years/v2019/social_mobility.rb
index 114cf62acb..dbbd084442 100644
--- a/app/forms/award_years/v2019/social_mobility.rb
+++ b/app/forms/award_years/v2019/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2019/social_mobility/social_mobility_step5"
 require "award_years/v2019/social_mobility/social_mobility_step6"
 
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2019::QAEForms.mobility_step1
+             &AwardYears::V2019::QaeForms.mobility_step1
 
         step "Your Social Mobility Programme(s)",
              "Your Social Mobility",
-             &AwardYears::V2019::QAEForms.mobility_step2
+             &AwardYears::V2019::QaeForms.mobility_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2019::QAEForms.mobility_step3
+             &AwardYears::V2019::QaeForms.mobility_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2019::QAEForms.mobility_step4
+             &AwardYears::V2019::QaeForms.mobility_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2019::QAEForms.mobility_step5
+             &AwardYears::V2019::QaeForms.mobility_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2019::QAEForms.mobility_step6
+             &AwardYears::V2019::QaeForms.mobility_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2019/social_mobility/social_mobility_step1.rb
index b2de17c12a..948204f3d2 100644
--- a/app/forms/award_years/v2019/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2019/social_mobility/social_mobility_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2019/social_mobility/social_mobility_step2.rb
index 44c7671411..9c679e2d99 100644
--- a/app/forms/award_years/v2019/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2019/social_mobility/social_mobility_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2019/social_mobility/social_mobility_step3.rb
index 33072cc036..5cfdc56316 100644
--- a/app/forms/award_years/v2019/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2019/social_mobility/social_mobility_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2019/social_mobility/social_mobility_step4.rb
index f06378f3d4..311bbc6ff6 100644
--- a/app/forms/award_years/v2019/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2019/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2019/social_mobility/social_mobility_step5.rb
index 7ffd88b414..7392481db0 100644
--- a/app/forms/award_years/v2019/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2019/social_mobility/social_mobility_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2019/social_mobility/social_mobility_step6.rb
index a3632197b2..9295ecd369 100644
--- a/app/forms/award_years/v2019/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2019/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2019/sustainable_development.rb b/app/forms/award_years/v2019/sustainable_development.rb
index addff093e2..fe3f69021c 100644
--- a/app/forms/award_years/v2019/sustainable_development.rb
+++ b/app/forms/award_years/v2019/sustainable_development.rb
@@ -5,34 +5,34 @@
 require "award_years/v2019/sustainable_development/sustainable_development_step5"
 require "award_years/v2019/sustainable_development/sustainable_development_step6"
 
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2019::QAEForms.development_step1
+             &AwardYears::V2019::QaeForms.development_step1
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2019::QAEForms.development_step2
+             &AwardYears::V2019::QaeForms.development_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2019::QAEForms.development_step3
+             &AwardYears::V2019::QaeForms.development_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2019::QAEForms.development_step4
+             &AwardYears::V2019::QaeForms.development_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2019::QAEForms.development_step5
+             &AwardYears::V2019::QaeForms.development_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2019::QAEForms.development_step6
+             &AwardYears::V2019::QaeForms.development_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb
index be3fc110ea..5e0ab6e146 100644
--- a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb
index eaf7d5bd81..cfe5bf7d45 100644
--- a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb
index bb0f3d89c7..0d2948b329 100644
--- a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb
index 1157f107ab..be5394f689 100644
--- a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb
index 88acd97b89..6eb2ccb4d0 100644
--- a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb
index aa3a0c45fe..a2d718846e 100644
--- a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb
+++ b/app/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2019::QAEForms
+class AwardYears::V2019::QaeForms
   class << self
     def development_step6
       @development_step6 ||= proc do
diff --git a/app/forms/award_years/v2020/innovation.rb b/app/forms/award_years/v2020/innovation.rb
index c14f2df4df..2d20f70156 100644
--- a/app/forms/award_years/v2020/innovation.rb
+++ b/app/forms/award_years/v2020/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2020/innovation/innovation_step5"
 require "award_years/v2020/innovation/innovation_step6"
 
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2020::QAEForms.innovation_step1
+             &AwardYears::V2020::QaeForms.innovation_step1
 
         step "Your Innovation",
              "Your Innovation",
-             &AwardYears::V2020::QAEForms.innovation_step2
+             &AwardYears::V2020::QaeForms.innovation_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2020::QAEForms.innovation_step3
+             &AwardYears::V2020::QaeForms.innovation_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2020::QAEForms.innovation_step4
+             &AwardYears::V2020::QaeForms.innovation_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2020::QAEForms.innovation_step5
+             &AwardYears::V2020::QaeForms.innovation_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2020::QAEForms.innovation_step6
+             &AwardYears::V2020::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2020/innovation/innovation_step1.rb b/app/forms/award_years/v2020/innovation/innovation_step1.rb
index 549dbfa194..93b4833ad9 100644
--- a/app/forms/award_years/v2020/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2020/innovation/innovation_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2020/innovation/innovation_step2.rb b/app/forms/award_years/v2020/innovation/innovation_step2.rb
index 392b1b0126..dc901833b7 100644
--- a/app/forms/award_years/v2020/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2020/innovation/innovation_step2.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2020/innovation/innovation_step3.rb b/app/forms/award_years/v2020/innovation/innovation_step3.rb
index 96c9ca7458..047c8615e6 100644
--- a/app/forms/award_years/v2020/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2020/innovation/innovation_step3.rb
@@ -1,17 +1,17 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
         header :commercial_success_info_block, "" do
           context %(
-            <h3>About this section</h3>    
-            <p> 
+            <h3>About this section</h3>
+            <p>
               All applicants for any Queen’s Award must demonstrate a certain level of financial performance. This section enables you to show the impact that your innovation had on your organisation's financial performance.
-            </p>  
+            </p>
             <h3>Small organisations</h3>
             <p>
-              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can. 
+              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can.
             </p>
             <h3>Estimated figures</h3>
             <p>
@@ -25,7 +25,7 @@ def innovation_step3
             )],
             [:bold, "Small organisations"],
             [:normal, %(
-              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can. 
+              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can.
             )],
             [:bold, "Estimated figures"],
             [:normal, %(
diff --git a/app/forms/award_years/v2020/innovation/innovation_step4.rb b/app/forms/award_years/v2020/innovation/innovation_step4.rb
index 0369d6d5e3..cb3f8839b7 100644
--- a/app/forms/award_years/v2020/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2020/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2020/innovation/innovation_step5.rb b/app/forms/award_years/v2020/innovation/innovation_step5.rb
index bea2e32bd0..ab9f297115 100644
--- a/app/forms/award_years/v2020/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2020/innovation/innovation_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2020/innovation/innovation_step6.rb b/app/forms/award_years/v2020/innovation/innovation_step6.rb
index 07d7502c7f..607a3c04a5 100644
--- a/app/forms/award_years/v2020/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2020/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2020/international_trade.rb b/app/forms/award_years/v2020/international_trade.rb
index 11a89b5f3c..90e80e6e67 100644
--- a/app/forms/award_years/v2020/international_trade.rb
+++ b/app/forms/award_years/v2020/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2020/international_trade/international_trade_step5"
 require "award_years/v2020/international_trade/international_trade_step6"
 
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2020::QAEForms.trade_step1
+             &AwardYears::V2020::QaeForms.trade_step1
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2020::QAEForms.trade_step2
+             &AwardYears::V2020::QaeForms.trade_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2020::QAEForms.trade_step3
+             &AwardYears::V2020::QaeForms.trade_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2020::QAEForms.trade_step4
+             &AwardYears::V2020::QaeForms.trade_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2020::QAEForms.trade_step5
+             &AwardYears::V2020::QaeForms.trade_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2020::QAEForms.trade_step6
+             &AwardYears::V2020::QaeForms.trade_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step1.rb b/app/forms/award_years/v2020/international_trade/international_trade_step1.rb
index 65e9743550..7f11878a72 100644
--- a/app/forms/award_years/v2020/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2020/international_trade/international_trade_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step2.rb b/app/forms/award_years/v2020/international_trade/international_trade_step2.rb
index 53a24e2406..07a4b6c5dd 100644
--- a/app/forms/award_years/v2020/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2020/international_trade/international_trade_step2.rb
@@ -1,32 +1,32 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
         header :your_internation_trade_header, "" do
           context %(
-            <h3>About this section</h3>  
+            <h3>About this section</h3>
             <p>
-              This section enables you to present the details of your products or services that you export and to give us the evidence of their commercial impact on your business.         
+              This section enables you to present the details of your products or services that you export and to give us the evidence of their commercial impact on your business.
             </p>
             <p>
               Please avoid using technical language in this section.
             </p>
             <h3>Small organisations</h3>
             <p>
-              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing, we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can. 
+              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing, we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can.
             </p>
           )
 
           pdf_context_with_header_blocks [
             [:bold, "About this section"],
             [:normal, %(
-              This section enables you to present the details of your products or services that you export and to give us the evidence of their commercial impact on your business.         
+              This section enables you to present the details of your products or services that you export and to give us the evidence of their commercial impact on your business.
               Please avoid using technical language in this section.
             )],
             [:bold, "Small organisations"],
             [:normal, %(
-              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing, we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can. 
+              Queen’s Awards for Enterprise is committed to acknowledging efforts of organisations of all sizes. When assessing, we consider what is reasonable performance given the size and sector of your organisation. If you are a small organisation, do not be intimidated by the questions that are less relevant to you - answer them to a degree you can.
             )]
           ]
         end
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step3.rb b/app/forms/award_years/v2020/international_trade/international_trade_step3.rb
index 13fb96a754..6523a9f6ec 100644
--- a/app/forms/award_years/v2020/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2020/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step4.rb b/app/forms/award_years/v2020/international_trade/international_trade_step4.rb
index 5ab8ca92ff..c5e912acac 100644
--- a/app/forms/award_years/v2020/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2020/international_trade/international_trade_step4.rb
@@ -1,19 +1,19 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
         header :complete_now_header, "" do
           context %(
-            <h3>About this section</h3>           
+            <h3>About this section</h3>
             <p>
-              The Declaration of Corporate Responsibility is a chance for you to show your responsible business conduct and its social, economic and environmental impact. All applicants for a Queen’s Award for Enterprise must demonstrate how they meet commonly accepted standards for corporate responsibility. Applicants who are not able to demonstrate corporate social responsibility will not be successful.        
+              The Declaration of Corporate Responsibility is a chance for you to show your responsible business conduct and its social, economic and environmental impact. All applicants for a Queen’s Award for Enterprise must demonstrate how they meet commonly accepted standards for corporate responsibility. Applicants who are not able to demonstrate corporate social responsibility will not be successful.
             </p>
             <h3>Small organisations</h3>
             <p>
               We recognise that for many smaller organisations the extent to which they can deliver high impact Corporate Responsibility may be limited. Given this, please answer the questions in a way that best suits your organisation.
             </p>
-            <h3>Answering questions</h3>    
+            <h3>Answering questions</h3>
             <p>
               The guidance notes below each section are not exhaustive. Where possible, please support your answers with quantitative evidence of your initiatives, improvements and successes; and describe any relevant policies or handbooks that you have in place.
             </p>
@@ -22,7 +22,7 @@ def trade_step4
           pdf_context_with_header_blocks [
             [:bold, "About this section"],
             [:normal, %(
-              The Declaration of Corporate Responsibility is a chance for you to show your responsible business conduct and its social, economic and environmental impact. All applicants for a Queen’s Award for Enterprise must demonstrate how they meet commonly accepted standards for corporate responsibility. Applicants who are not able to demonstrate corporate social responsibility will not be successful.        
+              The Declaration of Corporate Responsibility is a chance for you to show your responsible business conduct and its social, economic and environmental impact. All applicants for a Queen’s Award for Enterprise must demonstrate how they meet commonly accepted standards for corporate responsibility. Applicants who are not able to demonstrate corporate social responsibility will not be successful.
             )],
             [:bold, "Small organisations"],
             [:normal, %(
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step5.rb b/app/forms/award_years/v2020/international_trade/international_trade_step5.rb
index ebeb7a609f..77bd6c9b1f 100644
--- a/app/forms/award_years/v2020/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2020/international_trade/international_trade_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step6.rb b/app/forms/award_years/v2020/international_trade/international_trade_step6.rb
index c6fed05910..140697d44b 100644
--- a/app/forms/award_years/v2020/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2020/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2020/qae_forms.rb b/app/forms/award_years/v2020/qae_forms.rb
index 05550469ff..c968917571 100644
--- a/app/forms/award_years/v2020/qae_forms.rb
+++ b/app/forms/award_years/v2020/qae_forms.rb
@@ -1,7 +1,7 @@
-require 'award_years/v2020/innovation'
-require 'award_years/v2020/international_trade'
-require 'award_years/v2020/sustainable_development'
-require 'award_years/v2020/social_mobility'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
 
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
 end
diff --git a/app/forms/award_years/v2020/social_mobility.rb b/app/forms/award_years/v2020/social_mobility.rb
index 0a203b6f35..0a018fefdc 100644
--- a/app/forms/award_years/v2020/social_mobility.rb
+++ b/app/forms/award_years/v2020/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2020/social_mobility/social_mobility_step5"
 require "award_years/v2020/social_mobility/social_mobility_step6"
 
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2020::QAEForms.mobility_step1
+             &AwardYears::V2020::QaeForms.mobility_step1
 
         step "Your Social Mobility Programme(s)",
              "Your Social Mobility",
-             &AwardYears::V2020::QAEForms.mobility_step2
+             &AwardYears::V2020::QaeForms.mobility_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2020::QAEForms.mobility_step3
+             &AwardYears::V2020::QaeForms.mobility_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2020::QAEForms.mobility_step4
+             &AwardYears::V2020::QaeForms.mobility_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2020::QAEForms.mobility_step5
+             &AwardYears::V2020::QaeForms.mobility_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2020::QAEForms.mobility_step6
+             &AwardYears::V2020::QaeForms.mobility_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2020/social_mobility/social_mobility_step1.rb
index 46c9617485..2b7b4bff39 100644
--- a/app/forms/award_years/v2020/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2020/social_mobility/social_mobility_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2020/social_mobility/social_mobility_step2.rb
index 910bc93694..3a343f8b15 100644
--- a/app/forms/award_years/v2020/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2020/social_mobility/social_mobility_step2.rb
@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
         header :mobility_b_section_header, "" do
           context %(
-            <h3>About this section</h3> 
+            <h3>About this section</h3>
 
             <p>This section enables you to present the details of your social mobility programme and to give us the evidence on how your programme benefits your staff and your organisation.</p>
 
@@ -35,7 +35,7 @@ def mobility_step2
               <li>A programme which makes career opportunities more accessible by offering non-graduate routes such as well-structured traineeships, apprenticeships or internships, or by reforming recruitment practices and offering clear paths for progression.</li>
               <li>A programme which fosters workplaces where employees have equal access to ongoing support and progression opportunities to further their careers and champions a culture of inclusiveness at every level.</li>
             </ul>
- 
+
             <p>Please note, a programme could be an initiative, activity, course, system, business model approach or strategy, service or application, practice, policy or product. It can include activities to promote opportunity directly in your organisation or through local or national outreach programmes.</p>
 
             <h3>Types of activities</h3>
@@ -64,7 +64,7 @@ def mobility_step2
             <h3>Answering questions</h3>
 
             <p>
-              If you have more than one social mobility programme, please provide details. 
+              If you have more than one social mobility programme, please provide details.
               <br />
               Please try to avoid using technical jargon in this section.
             </p>
@@ -84,13 +84,13 @@ def mobility_step2
               We classify people as being from a lower or higher socio-economic background based on these variables:
 
               \u2022 The National Statistics Socio-economic classification (NS-SEC) of parent's occupation.
-              
+
               \u2022 This is based on the type of job the main or highest income earner in the household had as their main job when the person was 14.
-              
+
               \u2022 Whether they were receiving free school meals.
-              
+
               \u2022 The highest level of qualifications achieved by either parent(s) or guardian(s) by the time the person was 18.
-              
+
               \u2022 The type of school the person attended.
             )],
             [:bold, "Qualifying programmes"],
@@ -98,9 +98,9 @@ def mobility_step2
               You should demonstrate positive impacts in at least one of the following:
 
               \u2022 A programme which provides careers advice, skills development or mentoring that prepare young people from disadvantaged or lower socio-economic backgrounds for the world of work or accessible, structured work experience.
-              
+
               \u2022 A programme which makes career opportunities more accessible by offering non-graduate routes such as well-structured traineeships, apprenticeships or internships, or by reforming recruitment practices and offering clear paths for progression.
-              
+
               \u2022 A programme which fosters workplaces where employees have equal access to ongoing support and progression opportunities to further their careers and champions a culture of inclusiveness at every level.
 
               Please note, a programme could be an initiative, activity, course, system, business model approach or strategy, service or application, practice, policy or product. It can include activities to promote opportunity directly in your organisation or through local or national outreach programmes.
@@ -110,17 +110,17 @@ def mobility_step2
               When considering positive impacts, the following may help in clarifying what we are looking for in your application:
 
               \u2022 Accessible routes - broadening access to job opportunities by creating accessible routes to employment. This could be by providing jobs for people leaving school, college, university or prisons, for example, through quality traineeships, internships, apprenticeships or graduate schemes.
-              
+
               \u2022 Careers advice – provide careers advice or information to help people make more informed career choices as part of your recruitment initiatives such as traineeships, internships, apprenticeships or graduate schemes.
-              
+
               \u2022 Work placements - preparing people for the world of work through inspiring work experiences and internships.
-              
+
               \u2022 Fairer recruitment - widening your recruitment pool and making your recruitment process fairer by assessing potential skills rather than background - social-economic or academic. For example, by removing applicants’ names or school names from CVs, providing unconscious bias training for recruitment assessors.
-              
+
               \u2022 Early careers - fostering a ‘youth-friendly’ culture in your workplace where young employees from disadvantaged backgrounds are invested in and developed to progress in their careers.
-              
+
               \u2022 Advancement - developing career paths to senior positions that are open to all and track the progress of employees from non-graduate routes.
-              
+
               \u2022 Advocacy and leadership - demonstrate strong external leadership or advocacy promoting social mobility within and beyond your organisation. For example, by getting more staff involved in efforts to improve social mobility, by encouraging supply chains to take action on social mobility.
             )],
             [:bold, "Overarching criteria"],
@@ -180,23 +180,23 @@ def mobility_step2
             </p>
             <p>
               Please include:
-   
+
               a) The aims of the programme.
 
               b) Which disadvantaged group(s) is your programme targeted towards?
 
               c) the proportion of those on the programme which come from disadvantaged backgrounds. If you are offering work placements or work experience, include statistics on what percentage of those people then go on into full-time employment, either within your company or the sector.
-              
+
               d) What does your programme provide to your target group(s)?
-              
+
               e) Provide evidence of what makes your social mobility programme exemplary. For example, the programme may be exemplary as a result of:
 
               \u2022 An exemplary overall strategy where complementary programmes are linked to form a powerful series of engagements to inform, inspire, guide, recruit and develop people;
-              
+
               \u2022 Developing a unique or innovative social mobility programme;
-              
+
               \u2022 Forming effective partnerships with charities, schools or Jobcentres or Local Enterprise Partnerships;
-              
+
               \u2022 Leading the way in your company by doing something that has never been done before.
             </p>
           }
@@ -242,7 +242,7 @@ def mobility_step2
               Briefly describe your core business and what factors or issues motivated your organisation to provide the programme.
 
               Please include details on:
-   
+
               a) What was the situation before the inception of this programme?
 
               b) Why did you choose this particular programme and how does it align with the core aims and values of your organisation?
@@ -259,7 +259,7 @@ def mobility_step2
           required
           context %{
             <p>
-              Please describe the impact of your programme. 
+              Please describe the impact of your programme.
 
               Where possible please include:
             </p>
@@ -294,21 +294,21 @@ def mobility_step2
           pdf_context %{
             <p>
               Please describe the impact of your programme.
-     
+
               Where possible please include:
 
               a) How you measure the success of your programme? For example, are key performance indicators (KPIs) used? If so, how are they set and monitored? Are the KPIs being met and what happens if they are not?
 
               b) State what quantifiable measures were used to evaluate the success of the programme to your organisation, employees or others in meeting objectives for performance. Wherever possible, use a balance of quantitative (for example, numbers and figures) and qualitative (for example, comments, feedback from people, key stakeholders) evidence to support your application. Focus on what impact your activities have achieved to date but include the longer-term outcomes as well.
-              
+
               c) What has the programme achieved for your targeted group(s)?
-              
+
               d) How does your programme benefit your usual day to day operations?
-              
+
               e) How does the scale of this programme compare with wider talent management activities?
-              
+
               f) Who is ultimately responsible for the programme’s success?
-              
+
               g) Who is responsible for the day-to-day management of the programme?
 
               You may include chart(s) to make it easier for assessors to understand how your programme is managed in section E.
@@ -342,9 +342,9 @@ def mobility_step2
               Please provide evidence on how your organisation improved the employability of the people who engaged in your programme and how it has raised their career aspirations and confidence. Improvements in employability could be as a result of teaching skills such as leadership, communication, team-work, resilience.
 
               If possible, use a balance of quantitative (for example, numbers, figures) and qualitative (for example, comments, feedback from people, key stakeholders) evidence.
- 
+
               Focus on what impact your activities have achieved to date but include the longer-term outcomes as well.
-  
+
               Include the impact of the programme on the local community and at a regional and national level.
             </p>
           }
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2020/social_mobility/social_mobility_step3.rb
index 5560170593..9097135e2b 100644
--- a/app/forms/award_years/v2020/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2020/social_mobility/social_mobility_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2020/social_mobility/social_mobility_step4.rb
index c8f2d66ade..c539ffea5f 100644
--- a/app/forms/award_years/v2020/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2020/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2020/social_mobility/social_mobility_step5.rb
index 1846a661f6..7c0117b904 100644
--- a/app/forms/award_years/v2020/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2020/social_mobility/social_mobility_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2020/social_mobility/social_mobility_step6.rb
index 643dff43ea..ba8d69501b 100644
--- a/app/forms/award_years/v2020/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2020/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2020/sustainable_development.rb b/app/forms/award_years/v2020/sustainable_development.rb
index 094807acae..54e16daa1a 100644
--- a/app/forms/award_years/v2020/sustainable_development.rb
+++ b/app/forms/award_years/v2020/sustainable_development.rb
@@ -4,30 +4,30 @@
 require "award_years/v2020/sustainable_development/sustainable_development_step4"
 require "award_years/v2020/sustainable_development/sustainable_development_step5"
 
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2020::QAEForms.development_step1
+             &AwardYears::V2020::QaeForms.development_step1
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2020::QAEForms.development_step2
+             &AwardYears::V2020::QaeForms.development_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2020::QAEForms.development_step3
+             &AwardYears::V2020::QaeForms.development_step3
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2020::QAEForms.development_step4
+             &AwardYears::V2020::QaeForms.development_step4
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2020::QAEForms.development_step5
+             &AwardYears::V2020::QaeForms.development_step5
       end
     end
   end
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb
index 7e479a3171..29982fe1fb 100644
--- a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb
index a198c628a5..ad053aeb88 100644
--- a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb
@@ -1,13 +1,13 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
         header :development_b_section_header, "" do
           context %(
-            <h3>About this section</h3>  
+            <h3>About this section</h3>
             <p>
-              Read this section before planning the answers. 
+              Read this section before planning the answers.
               Try not to repeat points, instead refer to the relevant answer you have previously provided to another question.
               <br />
               Avoid using technical jargon.
@@ -50,7 +50,7 @@ def development_step2
           pdf_context_with_header_blocks [
             [:bold, "About this section"],
             [:normal, %(
-              Read this section before planning the answers. 
+              Read this section before planning the answers.
               Try not to repeat points, instead refer to the relevant answer you have previously provided to another question.
               Avoid using technical jargon.
             )],
@@ -61,58 +61,58 @@ def development_step2
             [:bold, "Sustainable Development Goals (SDGs)"],
             [:normal, %(
               You may find it helpful to familiarise yourself with the United Nations (UN) 17 Sustainable Development Goals (SDGs). While they include impacts at a national level, you may want to reference the real positive impact your organisation contributes towards them.
- 
+
               You do not need to show impact in each of these areas, only the ones that are most applicable to your sustainable development actions or interventions.
-  
-              \u2022 GOAL 1: No Poverty 
+
+              \u2022 GOAL 1: No Poverty
               https://www.un.org/development/desa/disabilities/envision2030-goal1.html
 
-              \u2022 GOAL 2: Zero Hunger 
+              \u2022 GOAL 2: Zero Hunger
               https://www.un.org/development/desa/disabilities/envision2030-goal2.html
 
-              \u2022 GOAL 3: Good Health and Well-being 
+              \u2022 GOAL 3: Good Health and Well-being
               https://www.un.org/development/desa/disabilities/envision2030-goal3.html
 
-              \u2022 GOAL 4: Quality Education 
+              \u2022 GOAL 4: Quality Education
               https://www.un.org/development/desa/disabilities/envision2030-goal4.html
-              
-              \u2022 GOAL 5: Gender Equality 
+
+              \u2022 GOAL 5: Gender Equality
               https://www.un.org/development/desa/disabilities/envision2030-goal5.html
-              
-              \u2022 GOAL 6: Clean Water and Sanitation 
+
+              \u2022 GOAL 6: Clean Water and Sanitation
               https://www.un.org/development/desa/disabilities/envision2030-goal6.html
-              
-              \u2022 GOAL 7: Affordable and Clean Energy 
+
+              \u2022 GOAL 7: Affordable and Clean Energy
               https://www.un.org/development/desa/disabilities/envision2030-goal7.html
-              
-              \u2022 GOAL 8: Decent Work and Economic Growth 
+
+              \u2022 GOAL 8: Decent Work and Economic Growth
               https://www.un.org/development/desa/disabilities/envision2030-goal8.html
-              
-              \u2022 GOAL 9: Industry, Innovation and Infrastructure 
+
+              \u2022 GOAL 9: Industry, Innovation and Infrastructure
               https://www.un.org/development/desa/disabilities/envision2030-goal9.html
-              
-              \u2022 GOAL 10: Reduced Inequality 
+
+              \u2022 GOAL 10: Reduced Inequality
               https://www.un.org/development/desa/disabilities/envision2030-goal10.html
-              
-              \u2022 GOAL 11: Sustainable Cities and Communities 
+
+              \u2022 GOAL 11: Sustainable Cities and Communities
               https://www.un.org/development/desa/disabilities/envision2030-goal11.html
-              
-              \u2022 GOAL 12: Responsible Consumption and Production 
+
+              \u2022 GOAL 12: Responsible Consumption and Production
               https://www.un.org/development/desa/disabilities/envision2030-goal12.html
-              
-              \u2022 GOAL 13: Climate Action 
+
+              \u2022 GOAL 13: Climate Action
               https://www.un.org/development/desa/disabilities/envision2030-goal13.html
-              
-              \u2022 GOAL 14: Life Below Water 
+
+              \u2022 GOAL 14: Life Below Water
               https://www.un.org/development/desa/disabilities/envision2030-goal14.html
-              
-              \u2022 GOAL 15: Life on Land 
+
+              \u2022 GOAL 15: Life on Land
               https://www.un.org/development/desa/disabilities/envision2030-goal15.html
-              
-              \u2022 GOAL 16: Peace and Justice Strong Institutions 
+
+              \u2022 GOAL 16: Peace and Justice Strong Institutions
               https://www.un.org/development/desa/disabilities/envision2030-goal16.html
-              
-              \u2022 GOAL 17: Partnerships to achieve the Goal 
+
+              \u2022 GOAL 17: Partnerships to achieve the Goal
               https://www.un.org/development/desa/disabilities/envision2030-goal17.html
             )]
           ]
@@ -155,10 +155,10 @@ def development_step2
                 Developing unique or innovative ways, products or services to be sustainable.
               </li>
               <li>
-                Forming effective partnerships with other organisations, for example, businesses in your supply chain, charities or schools. 
+                Forming effective partnerships with other organisations, for example, businesses in your supply chain, charities or schools.
               </li>
               <li>
-                Leading the way in your company, sector or market by doing something that has never been done before. 
+                Leading the way in your company, sector or market by doing something that has never been done before.
               </li>
             </ul>
           }
@@ -181,12 +181,12 @@ def development_step2
             </p>
             <p>
               \u2022 An overall strategy where complementary programmes are linked to form a powerful series of engagements to inform, inspire, guide, recruit or develop people.
-   
+
               \u2022 Developing unique or innovative ways, products or services to be sustainable.
-     
-              \u2022 Forming effective partnerships with other organisations, for example, businesses in your supply chain, charities or schools. 
-  
-              \u2022 Leading the way in your company, sector or market by doing something that has never been done before. 
+
+              \u2022 Forming effective partnerships with other organisations, for example, businesses in your supply chain, charities or schools.
+
+              \u2022 Leading the way in your company, sector or market by doing something that has never been done before.
             </p>
           }
 
@@ -200,7 +200,7 @@ def development_step2
           required
           context %(
             <p>
-              If your application is successful, this description will appear in the London Gazette. 
+              If your application is successful, this description will appear in the London Gazette.
             </p>
           )
           rows 2
@@ -241,19 +241,19 @@ def development_step2
           required
           context %{
             <p>
-              Please describe the impact. Focus on what impact your activities have achieved to date but include the longer-term outcomes as well.  
+              Please describe the impact. Focus on what impact your activities have achieved to date but include the longer-term outcomes as well.
             </p>
             <p>
-              Wherever possible, use a balance of quantitative (for example, numbers and figures) and qualitative (for example, comments, feedback from people, main stakeholders) evidence to support your application. 
+              Wherever possible, use a balance of quantitative (for example, numbers and figures) and qualitative (for example, comments, feedback from people, main stakeholders) evidence to support your application.
             </p>
             <p>
-              Where possible, please include:  
+              Where possible, please include:
             </p>
             <p>
-              a) How you measure the success of your sustainability intervention? For example, are key performance indicators (KPIs) or targets used? If so, how are they set and monitored? Are the KPIs or targets being met, and what happens if they are not? 
+              a) How you measure the success of your sustainability intervention? For example, are key performance indicators (KPIs) or targets used? If so, how are they set and monitored? Are the KPIs or targets being met, and what happens if they are not?
             </p>
             <p>
-              b) State what qualitative measures were used to evaluate the success of your sustainable business objectives to your organisation, customers, employees or others in meeting objectives for performance. 
+              b) State what qualitative measures were used to evaluate the success of your sustainable business objectives to your organisation, customers, employees or others in meeting objectives for performance.
             </p>
             <p>
               c) The impact of your sustainable objectives. For example, impact on your organisation, employees, customers, stakeholders, supply chain, communities, regions or others, such as overseas clients or markets.
@@ -275,11 +275,11 @@ def development_step2
           }
           context %{
             <p>
-              a) Who is ultimately responsible for the organisation’s sustainability interventions and their success?  
+              a) Who is ultimately responsible for the organisation’s sustainability interventions and their success?
             </p>
             <p>
               b) Who is responsible for the day-to-day management, and the main areas of sustainability, in your organisation?<br />
-              You may include flow charts to make it easier for assessors to understand how your programme is managed in section D of this form. 
+              You may include flow charts to make it easier for assessors to understand how your programme is managed in section D of this form.
             </p>
             <p>
               c) What is the senior decision makers’ commitment to the future sustainable growth of the organisation?
@@ -313,7 +313,7 @@ def development_step2
           }
           context %{
             <p>
-              Please include:  
+              Please include:
             </p>
             <p>
               a) How is sustainability embedded in your organisation’s culture and values?
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb
index 0663ff50dd..7d7857a6a8 100644
--- a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb
index 507a46cc02..713f6f1c6f 100644
--- a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb
index 5074bc899b..6a4d2d224e 100644
--- a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2020::QAEForms
+class AwardYears::V2020::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/award_years/v2021/innovation.rb b/app/forms/award_years/v2021/innovation.rb
index ad564d088a..1257bd25af 100644
--- a/app/forms/award_years/v2021/innovation.rb
+++ b/app/forms/award_years/v2021/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2021/innovation/innovation_step5"
 require "award_years/v2021/innovation/innovation_step6"
 
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2021::QAEForms.innovation_step1
+             &AwardYears::V2021::QaeForms.innovation_step1
 
         step "Your Innovation",
              "Your Innovation",
-             &AwardYears::V2021::QAEForms.innovation_step2
+             &AwardYears::V2021::QaeForms.innovation_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2021::QAEForms.innovation_step3
+             &AwardYears::V2021::QaeForms.innovation_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2021::QAEForms.innovation_step4
+             &AwardYears::V2021::QaeForms.innovation_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2021::QAEForms.innovation_step5
+             &AwardYears::V2021::QaeForms.innovation_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2021::QAEForms.innovation_step6
+             &AwardYears::V2021::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2021/innovation/innovation_step1.rb b/app/forms/award_years/v2021/innovation/innovation_step1.rb
index f8f65d1ebc..85eb60cff0 100644
--- a/app/forms/award_years/v2021/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2021/innovation/innovation_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2021/innovation/innovation_step2.rb b/app/forms/award_years/v2021/innovation/innovation_step2.rb
index ec622e3263..23ff920188 100644
--- a/app/forms/award_years/v2021/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2021/innovation/innovation_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2021/innovation/innovation_step3.rb b/app/forms/award_years/v2021/innovation/innovation_step3.rb
index 4841688e24..51976fa23f 100644
--- a/app/forms/award_years/v2021/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2021/innovation/innovation_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
diff --git a/app/forms/award_years/v2021/innovation/innovation_step4.rb b/app/forms/award_years/v2021/innovation/innovation_step4.rb
index 885b8d19a1..f40ecd10c1 100644
--- a/app/forms/award_years/v2021/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2021/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2021/innovation/innovation_step5.rb b/app/forms/award_years/v2021/innovation/innovation_step5.rb
index 33fe9656b1..422820d840 100644
--- a/app/forms/award_years/v2021/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2021/innovation/innovation_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2021/innovation/innovation_step6.rb b/app/forms/award_years/v2021/innovation/innovation_step6.rb
index 1285c7e1bd..4758ae59cd 100644
--- a/app/forms/award_years/v2021/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2021/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2021/international_trade.rb b/app/forms/award_years/v2021/international_trade.rb
index 250dd9f0ab..5741ac3d60 100644
--- a/app/forms/award_years/v2021/international_trade.rb
+++ b/app/forms/award_years/v2021/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2021/international_trade/international_trade_step5"
 require "award_years/v2021/international_trade/international_trade_step6"
 
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2021::QAEForms.trade_step1
+             &AwardYears::V2021::QaeForms.trade_step1
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2021::QAEForms.trade_step2
+             &AwardYears::V2021::QaeForms.trade_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2021::QAEForms.trade_step3
+             &AwardYears::V2021::QaeForms.trade_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2021::QAEForms.trade_step4
+             &AwardYears::V2021::QaeForms.trade_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2021::QAEForms.trade_step5
+             &AwardYears::V2021::QaeForms.trade_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2021::QAEForms.trade_step6
+             &AwardYears::V2021::QaeForms.trade_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step1.rb b/app/forms/award_years/v2021/international_trade/international_trade_step1.rb
index 1b1c021b71..32d0c8deb4 100644
--- a/app/forms/award_years/v2021/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2021/international_trade/international_trade_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step2.rb b/app/forms/award_years/v2021/international_trade/international_trade_step2.rb
index d60ae9b6c5..d724016944 100644
--- a/app/forms/award_years/v2021/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2021/international_trade/international_trade_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step3.rb b/app/forms/award_years/v2021/international_trade/international_trade_step3.rb
index 5dae5b71b0..d5e9e055af 100644
--- a/app/forms/award_years/v2021/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2021/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step4.rb b/app/forms/award_years/v2021/international_trade/international_trade_step4.rb
index 58f3e1fad5..757271fb9c 100644
--- a/app/forms/award_years/v2021/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2021/international_trade/international_trade_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step5.rb b/app/forms/award_years/v2021/international_trade/international_trade_step5.rb
index 09c7e4016d..403d02b4c4 100644
--- a/app/forms/award_years/v2021/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2021/international_trade/international_trade_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step6.rb b/app/forms/award_years/v2021/international_trade/international_trade_step6.rb
index 7ec3909f8c..9081213c23 100644
--- a/app/forms/award_years/v2021/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2021/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2021/qae_forms.rb b/app/forms/award_years/v2021/qae_forms.rb
index fa26e65cfc..723b27c88c 100644
--- a/app/forms/award_years/v2021/qae_forms.rb
+++ b/app/forms/award_years/v2021/qae_forms.rb
@@ -1,7 +1,7 @@
-require 'award_years/v2021/innovation'
-require 'award_years/v2021/international_trade'
-require 'award_years/v2021/sustainable_development'
-require 'award_years/v2021/social_mobility'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
 
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
 end
diff --git a/app/forms/award_years/v2021/social_mobility.rb b/app/forms/award_years/v2021/social_mobility.rb
index 3c4387f32b..ce262d33c7 100644
--- a/app/forms/award_years/v2021/social_mobility.rb
+++ b/app/forms/award_years/v2021/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2021/social_mobility/social_mobility_step5"
 require "award_years/v2021/social_mobility/social_mobility_step6"
 
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2021::QAEForms.mobility_step1
+             &AwardYears::V2021::QaeForms.mobility_step1
 
         step "Your Social Mobility Programme(s)",
              "Your Social Mobility",
-             &AwardYears::V2021::QAEForms.mobility_step2
+             &AwardYears::V2021::QaeForms.mobility_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2021::QAEForms.mobility_step3
+             &AwardYears::V2021::QaeForms.mobility_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2021::QAEForms.mobility_step4
+             &AwardYears::V2021::QaeForms.mobility_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2021::QAEForms.mobility_step5
+             &AwardYears::V2021::QaeForms.mobility_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2021::QAEForms.mobility_step6
+             &AwardYears::V2021::QaeForms.mobility_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2021/social_mobility/social_mobility_step1.rb
index 8355cf659c..b2b57db6a5 100644
--- a/app/forms/award_years/v2021/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2021/social_mobility/social_mobility_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2021/social_mobility/social_mobility_step2.rb
index c165d867b3..1e4dd93690 100644
--- a/app/forms/award_years/v2021/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2021/social_mobility/social_mobility_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2021/social_mobility/social_mobility_step3.rb
index c6039f1eaf..ec9510a626 100644
--- a/app/forms/award_years/v2021/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2021/social_mobility/social_mobility_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2021/social_mobility/social_mobility_step4.rb
index cd26757623..31affed6cf 100644
--- a/app/forms/award_years/v2021/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2021/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2021/social_mobility/social_mobility_step5.rb
index a0af229238..a675f9cf9c 100644
--- a/app/forms/award_years/v2021/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2021/social_mobility/social_mobility_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2021/social_mobility/social_mobility_step6.rb
index d6df5d904e..613ee1fc1f 100644
--- a/app/forms/award_years/v2021/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2021/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2021/sustainable_development.rb b/app/forms/award_years/v2021/sustainable_development.rb
index 368987e382..4618a0cd57 100644
--- a/app/forms/award_years/v2021/sustainable_development.rb
+++ b/app/forms/award_years/v2021/sustainable_development.rb
@@ -4,30 +4,30 @@
 require "award_years/v2021/sustainable_development/sustainable_development_step4"
 require "award_years/v2021/sustainable_development/sustainable_development_step5"
 
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2021::QAEForms.development_step1
+             &AwardYears::V2021::QaeForms.development_step1
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2021::QAEForms.development_step2
+             &AwardYears::V2021::QaeForms.development_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2021::QAEForms.development_step3
+             &AwardYears::V2021::QaeForms.development_step3
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2021::QAEForms.development_step4
+             &AwardYears::V2021::QaeForms.development_step4
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2021::QAEForms.development_step5
+             &AwardYears::V2021::QaeForms.development_step5
       end
     end
   end
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb
index 9a6a504526..32a0f9932b 100644
--- a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb
index 220cc6c387..c1ca0e784f 100644
--- a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb
index 652c984b87..a0231d91a4 100644
--- a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb
index c134b97ca7..7adef5e8b1 100644
--- a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb
index 952def55b2..11f36e1579 100644
--- a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2021::QAEForms
+class AwardYears::V2021::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/award_years/v2022/innovation.rb b/app/forms/award_years/v2022/innovation.rb
index 85f9e3e9da..d979d9a52b 100644
--- a/app/forms/award_years/v2022/innovation.rb
+++ b/app/forms/award_years/v2022/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2022/innovation/innovation_step5"
 require "award_years/v2022/innovation/innovation_step6"
 
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2022::QAEForms.innovation_step1
+             &AwardYears::V2022::QaeForms.innovation_step1
 
         step "Your Innovation",
              "Your Innovation",
-             &AwardYears::V2022::QAEForms.innovation_step2
+             &AwardYears::V2022::QaeForms.innovation_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2022::QAEForms.innovation_step3
+             &AwardYears::V2022::QaeForms.innovation_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2022::QAEForms.innovation_step4
+             &AwardYears::V2022::QaeForms.innovation_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2022::QAEForms.innovation_step5
+             &AwardYears::V2022::QaeForms.innovation_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2022::QAEForms.innovation_step6
+             &AwardYears::V2022::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2022/innovation/innovation_step1.rb b/app/forms/award_years/v2022/innovation/innovation_step1.rb
index 460483710f..6b643215bb 100644
--- a/app/forms/award_years/v2022/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2022/innovation/innovation_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2022/innovation/innovation_step2.rb b/app/forms/award_years/v2022/innovation/innovation_step2.rb
index cabd8535dd..4b9af4ad26 100644
--- a/app/forms/award_years/v2022/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2022/innovation/innovation_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2022/innovation/innovation_step3.rb b/app/forms/award_years/v2022/innovation/innovation_step3.rb
index c4f1597085..09746cd66a 100644
--- a/app/forms/award_years/v2022/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2022/innovation/innovation_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
diff --git a/app/forms/award_years/v2022/innovation/innovation_step4.rb b/app/forms/award_years/v2022/innovation/innovation_step4.rb
index 2d1fc5f1da..745032709c 100644
--- a/app/forms/award_years/v2022/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2022/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2022/innovation/innovation_step5.rb b/app/forms/award_years/v2022/innovation/innovation_step5.rb
index 71a5d2a155..9fa3da81d2 100644
--- a/app/forms/award_years/v2022/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2022/innovation/innovation_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2022/innovation/innovation_step6.rb b/app/forms/award_years/v2022/innovation/innovation_step6.rb
index 31aacce978..c2a9592bb1 100644
--- a/app/forms/award_years/v2022/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2022/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2022/international_trade.rb b/app/forms/award_years/v2022/international_trade.rb
index 7efa11e83a..0987016ab7 100644
--- a/app/forms/award_years/v2022/international_trade.rb
+++ b/app/forms/award_years/v2022/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2022/international_trade/international_trade_step5"
 require "award_years/v2022/international_trade/international_trade_step6"
 
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2022::QAEForms.trade_step1
+             &AwardYears::V2022::QaeForms.trade_step1
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2022::QAEForms.trade_step2
+             &AwardYears::V2022::QaeForms.trade_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2022::QAEForms.trade_step3
+             &AwardYears::V2022::QaeForms.trade_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2022::QAEForms.trade_step4
+             &AwardYears::V2022::QaeForms.trade_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2022::QAEForms.trade_step5
+             &AwardYears::V2022::QaeForms.trade_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2022::QAEForms.trade_step6
+             &AwardYears::V2022::QaeForms.trade_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step1.rb b/app/forms/award_years/v2022/international_trade/international_trade_step1.rb
index a87721a8b4..4caaa944be 100644
--- a/app/forms/award_years/v2022/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2022/international_trade/international_trade_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step2.rb b/app/forms/award_years/v2022/international_trade/international_trade_step2.rb
index b18e9daac4..c67414a58f 100644
--- a/app/forms/award_years/v2022/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2022/international_trade/international_trade_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step3.rb b/app/forms/award_years/v2022/international_trade/international_trade_step3.rb
index 6b3bde77e5..ac114398a3 100644
--- a/app/forms/award_years/v2022/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2022/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step4.rb b/app/forms/award_years/v2022/international_trade/international_trade_step4.rb
index c0bbc65d8d..98c4b26d4d 100644
--- a/app/forms/award_years/v2022/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2022/international_trade/international_trade_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step5.rb b/app/forms/award_years/v2022/international_trade/international_trade_step5.rb
index 89afe0720f..54ebd26809 100644
--- a/app/forms/award_years/v2022/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2022/international_trade/international_trade_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step6.rb b/app/forms/award_years/v2022/international_trade/international_trade_step6.rb
index f41f783a7a..b60c5c2f86 100644
--- a/app/forms/award_years/v2022/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2022/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2022/qae_forms.rb b/app/forms/award_years/v2022/qae_forms.rb
index 8c73828b59..72d85c3cb7 100644
--- a/app/forms/award_years/v2022/qae_forms.rb
+++ b/app/forms/award_years/v2022/qae_forms.rb
@@ -1,7 +1,7 @@
-require 'award_years/v2022/innovation'
-require 'award_years/v2022/international_trade'
-require 'award_years/v2022/sustainable_development'
-require 'award_years/v2022/social_mobility'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
 
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
 end
diff --git a/app/forms/award_years/v2022/social_mobility.rb b/app/forms/award_years/v2022/social_mobility.rb
index b9e18b9184..752cb50ebf 100644
--- a/app/forms/award_years/v2022/social_mobility.rb
+++ b/app/forms/award_years/v2022/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2022/social_mobility/social_mobility_step5"
 require "award_years/v2022/social_mobility/social_mobility_step6"
 
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2022::QAEForms.mobility_step1
+             &AwardYears::V2022::QaeForms.mobility_step1
 
         step "Your Social Mobility Programme(s)",
              "Your Social Mobility",
-             &AwardYears::V2022::QAEForms.mobility_step2
+             &AwardYears::V2022::QaeForms.mobility_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2022::QAEForms.mobility_step3
+             &AwardYears::V2022::QaeForms.mobility_step3
 
         step "Declaration of Corporate Responsibility",
              "Declaration of Corporate Responsibility",
-             &AwardYears::V2022::QAEForms.mobility_step4
+             &AwardYears::V2022::QaeForms.mobility_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2022::QAEForms.mobility_step5
+             &AwardYears::V2022::QaeForms.mobility_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2022::QAEForms.mobility_step6
+             &AwardYears::V2022::QaeForms.mobility_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2022/social_mobility/social_mobility_step1.rb
index 6c6041cea4..2ec2051d5b 100644
--- a/app/forms/award_years/v2022/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2022/social_mobility/social_mobility_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2022/social_mobility/social_mobility_step2.rb
index 23f74bcf15..b2bf53e569 100644
--- a/app/forms/award_years/v2022/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2022/social_mobility/social_mobility_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2022/social_mobility/social_mobility_step3.rb
index 4c7774c9f8..d071f19e8c 100644
--- a/app/forms/award_years/v2022/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2022/social_mobility/social_mobility_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2022/social_mobility/social_mobility_step4.rb
index 0a9214bbd3..c065e07b81 100644
--- a/app/forms/award_years/v2022/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2022/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2022/social_mobility/social_mobility_step5.rb
index 93aaca5fd6..5a78cf471a 100644
--- a/app/forms/award_years/v2022/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2022/social_mobility/social_mobility_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2022/social_mobility/social_mobility_step6.rb
index 08c65dadd4..09accdbc93 100644
--- a/app/forms/award_years/v2022/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2022/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2022/sustainable_development.rb b/app/forms/award_years/v2022/sustainable_development.rb
index c479af2194..84bbad9780 100644
--- a/app/forms/award_years/v2022/sustainable_development.rb
+++ b/app/forms/award_years/v2022/sustainable_development.rb
@@ -4,30 +4,30 @@
 require "award_years/v2022/sustainable_development/sustainable_development_step4"
 require "award_years/v2022/sustainable_development/sustainable_development_step5"
 
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Company Information",
              "Company Information",
-             &AwardYears::V2022::QAEForms.development_step1
+             &AwardYears::V2022::QaeForms.development_step1
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2022::QAEForms.development_step2
+             &AwardYears::V2022::QaeForms.development_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2022::QAEForms.development_step3
+             &AwardYears::V2022::QaeForms.development_step3
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2022::QAEForms.development_step4
+             &AwardYears::V2022::QaeForms.development_step4
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2022::QAEForms.development_step5
+             &AwardYears::V2022::QaeForms.development_step5
       end
     end
   end
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb
index fde118751a..e6f6110365 100644
--- a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb
index 14031e261f..7268b6138e 100644
--- a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb
index 3099681bc8..f15494049e 100644
--- a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb
index 643af8fb79..e5bdfa1b26 100644
--- a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb
index 93cc24b67c..7741970014 100644
--- a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2022::QAEForms
+class AwardYears::V2022::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/award_years/v2023/innovation.rb b/app/forms/award_years/v2023/innovation.rb
index f67bb883a6..18ecb756a3 100644
--- a/app/forms/award_years/v2023/innovation.rb
+++ b/app/forms/award_years/v2023/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2023/innovation/innovation_step5"
 require "award_years/v2023/innovation/innovation_step6"
 
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Company information",
              "Company information",
-             &AwardYears::V2023::QAEForms.innovation_step1
+             &AwardYears::V2023::QaeForms.innovation_step1
 
         step "Your innovation",
              "Your innovation",
-             &AwardYears::V2023::QAEForms.innovation_step2
+             &AwardYears::V2023::QaeForms.innovation_step2
 
         step "Commercial performance",
              "Commercial performance",
-             &AwardYears::V2023::QAEForms.innovation_step3
+             &AwardYears::V2023::QaeForms.innovation_step3
 
         step "Corporate Social Responsibility (CSR)",
              "Corporate Social Responsibility (CSR)",
-             &AwardYears::V2023::QAEForms.innovation_step4
+             &AwardYears::V2023::QaeForms.innovation_step4
 
         step "Supplementary materials",
              "Supplementary materials",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2023::QAEForms.innovation_step5
+             &AwardYears::V2023::QaeForms.innovation_step5
 
         step "Authorise and submit",
              "Authorise and submit",
-             &AwardYears::V2023::QAEForms.innovation_step6
+             &AwardYears::V2023::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2023/innovation/innovation_step1.rb b/app/forms/award_years/v2023/innovation/innovation_step1.rb
index 91c6f7a1d1..66b86a68a5 100644
--- a/app/forms/award_years/v2023/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2023/innovation/innovation_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2023/innovation/innovation_step2.rb b/app/forms/award_years/v2023/innovation/innovation_step2.rb
index d326100af7..942ee5cd1c 100644
--- a/app/forms/award_years/v2023/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2023/innovation/innovation_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2023/innovation/innovation_step3.rb b/app/forms/award_years/v2023/innovation/innovation_step3.rb
index b3db6ddb04..f3090b014f 100644
--- a/app/forms/award_years/v2023/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2023/innovation/innovation_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
diff --git a/app/forms/award_years/v2023/innovation/innovation_step4.rb b/app/forms/award_years/v2023/innovation/innovation_step4.rb
index 23330754e8..70ea79bcb6 100644
--- a/app/forms/award_years/v2023/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2023/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2023/innovation/innovation_step5.rb b/app/forms/award_years/v2023/innovation/innovation_step5.rb
index 70c7d4f741..8a1e635e54 100644
--- a/app/forms/award_years/v2023/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2023/innovation/innovation_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2023/innovation/innovation_step6.rb b/app/forms/award_years/v2023/innovation/innovation_step6.rb
index f814263421..d781166e0d 100644
--- a/app/forms/award_years/v2023/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2023/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2023/international_trade.rb b/app/forms/award_years/v2023/international_trade.rb
index 09d1538cb3..53843efcde 100644
--- a/app/forms/award_years/v2023/international_trade.rb
+++ b/app/forms/award_years/v2023/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2023/international_trade/international_trade_step5"
 require "award_years/v2023/international_trade/international_trade_step6"
 
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Company information",
              "Company information",
-             &AwardYears::V2023::QAEForms.trade_step1
+             &AwardYears::V2023::QaeForms.trade_step1
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2023::QAEForms.trade_step2
+             &AwardYears::V2023::QaeForms.trade_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2023::QAEForms.trade_step3
+             &AwardYears::V2023::QaeForms.trade_step3
 
         step "Corporate Social Responsibility (CSR)",
              "Corporate Social Responsibility (CSR)",
-             &AwardYears::V2023::QAEForms.trade_step4
+             &AwardYears::V2023::QaeForms.trade_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2023::QAEForms.trade_step5
+             &AwardYears::V2023::QaeForms.trade_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2023::QAEForms.trade_step6
+             &AwardYears::V2023::QaeForms.trade_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step1.rb b/app/forms/award_years/v2023/international_trade/international_trade_step1.rb
index ba474c277f..21c58bddeb 100644
--- a/app/forms/award_years/v2023/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2023/international_trade/international_trade_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step2.rb b/app/forms/award_years/v2023/international_trade/international_trade_step2.rb
index 1628bf53cf..0cc1518732 100644
--- a/app/forms/award_years/v2023/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2023/international_trade/international_trade_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step3.rb b/app/forms/award_years/v2023/international_trade/international_trade_step3.rb
index 9fed7aa975..edeaa3e8d0 100644
--- a/app/forms/award_years/v2023/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2023/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step4.rb b/app/forms/award_years/v2023/international_trade/international_trade_step4.rb
index 9b9bf9057f..6b455ea2fe 100644
--- a/app/forms/award_years/v2023/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2023/international_trade/international_trade_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step5.rb b/app/forms/award_years/v2023/international_trade/international_trade_step5.rb
index a41cc8951c..8364e8330f 100644
--- a/app/forms/award_years/v2023/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2023/international_trade/international_trade_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step6.rb b/app/forms/award_years/v2023/international_trade/international_trade_step6.rb
index 2b5f8da7be..761f9d9175 100644
--- a/app/forms/award_years/v2023/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2023/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2023/qae_forms.rb b/app/forms/award_years/v2023/qae_forms.rb
index e7bc4d3d55..1dfece6ba3 100644
--- a/app/forms/award_years/v2023/qae_forms.rb
+++ b/app/forms/award_years/v2023/qae_forms.rb
@@ -1,7 +1,7 @@
-require 'award_years/v2023/innovation'
-require 'award_years/v2023/international_trade'
-require 'award_years/v2023/sustainable_development'
-require 'award_years/v2023/social_mobility'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
 
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
 end
diff --git a/app/forms/award_years/v2023/social_mobility.rb b/app/forms/award_years/v2023/social_mobility.rb
index 0ced67bbd3..886cd9f17f 100644
--- a/app/forms/award_years/v2023/social_mobility.rb
+++ b/app/forms/award_years/v2023/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2023/social_mobility/social_mobility_step5"
 require "award_years/v2023/social_mobility/social_mobility_step6"
 
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Company information",
              "Company information",
-             &AwardYears::V2023::QAEForms.mobility_step1
+             &AwardYears::V2023::QaeForms.mobility_step1
 
         step "Your Social Mobility Programme(s)",
              "Your Social Mobility Programme(s)",
-             &AwardYears::V2023::QAEForms.mobility_step2
+             &AwardYears::V2023::QaeForms.mobility_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2023::QAEForms.mobility_step3
+             &AwardYears::V2023::QaeForms.mobility_step3
 
         step "Corporate Social Responsibility (CSR)",
              "Corporate Social Responsibility (CSR)",
-             &AwardYears::V2023::QAEForms.mobility_step4
+             &AwardYears::V2023::QaeForms.mobility_step4
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2023::QAEForms.mobility_step5
+             &AwardYears::V2023::QaeForms.mobility_step5
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2023::QAEForms.mobility_step6
+             &AwardYears::V2023::QaeForms.mobility_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2023/social_mobility/social_mobility_step1.rb
index 8b316841ad..1ccf8c6e9a 100644
--- a/app/forms/award_years/v2023/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2023/social_mobility/social_mobility_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2023/social_mobility/social_mobility_step2.rb
index c470b11dc3..3485e7002a 100644
--- a/app/forms/award_years/v2023/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2023/social_mobility/social_mobility_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2023/social_mobility/social_mobility_step3.rb
index 8b1bb40e6c..4f97c87987 100644
--- a/app/forms/award_years/v2023/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2023/social_mobility/social_mobility_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2023/social_mobility/social_mobility_step4.rb
index 3540011e8a..11a2e3ea64 100644
--- a/app/forms/award_years/v2023/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2023/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2023/social_mobility/social_mobility_step5.rb
index a264dc1a21..086b83dd6d 100644
--- a/app/forms/award_years/v2023/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2023/social_mobility/social_mobility_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2023/social_mobility/social_mobility_step6.rb
index c11aee34bf..7f77a14167 100644
--- a/app/forms/award_years/v2023/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2023/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2023/sustainable_development.rb b/app/forms/award_years/v2023/sustainable_development.rb
index 2f2ca3cfca..78b9eee9dc 100644
--- a/app/forms/award_years/v2023/sustainable_development.rb
+++ b/app/forms/award_years/v2023/sustainable_development.rb
@@ -4,30 +4,30 @@
 require "award_years/v2023/sustainable_development/sustainable_development_step4"
 require "award_years/v2023/sustainable_development/sustainable_development_step5"
 
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Company information",
              "Company information",
-             &AwardYears::V2023::QAEForms.development_step1
+             &AwardYears::V2023::QaeForms.development_step1
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2023::QAEForms.development_step2
+             &AwardYears::V2023::QaeForms.development_step2
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2023::QAEForms.development_step3
+             &AwardYears::V2023::QaeForms.development_step3
 
         step "Add Website Address/Documents",
              "Add Website Address/Documents",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2023::QAEForms.development_step4
+             &AwardYears::V2023::QaeForms.development_step4
 
         step "Authorise & Submit",
              "Authorise & Submit",
-             &AwardYears::V2023::QAEForms.development_step5
+             &AwardYears::V2023::QaeForms.development_step5
       end
     end
   end
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb
index d1144b25a4..41555dcbae 100644
--- a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb
index 49b591cb89..9e0b123614 100644
--- a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb
index ccf9c70a3a..3d7c8e7ae4 100644
--- a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb
index 3b7a0c27d4..4f35bd0362 100644
--- a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb
index 414a5b8d6a..46e24b680f 100644
--- a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2023::QAEForms
+class AwardYears::V2023::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/award_years/v2024/innovation.rb b/app/forms/award_years/v2024/innovation.rb
index c54f9a11ab..a33be59eef 100644
--- a/app/forms/award_years/v2024/innovation.rb
+++ b/app/forms/award_years/v2024/innovation.rb
@@ -5,34 +5,34 @@
 require "award_years/v2024/innovation/innovation_step5"
 require "award_years/v2024/innovation/innovation_step6"
 
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation
-      @innovation ||= QAEFormBuilder.build "Innovation Award Application" do
+      @innovation ||= QaeFormBuilder.build "Innovation Award Application" do
         step "Consent & due diligence",
              "Consent & due diligence",
-             &AwardYears::V2024::QAEForms.innovation_step1
+             &AwardYears::V2024::QaeForms.innovation_step1
 
         step "Company information",
              "Company information",
-             &AwardYears::V2024::QAEForms.innovation_step2
+             &AwardYears::V2024::QaeForms.innovation_step2
 
         step "Your innovation",
              "Your innovation",
-             &AwardYears::V2024::QAEForms.innovation_step3
+             &AwardYears::V2024::QaeForms.innovation_step3
 
         step "Commercial performance",
              "Commercial performance",
-             &AwardYears::V2024::QAEForms.innovation_step4
+             &AwardYears::V2024::QaeForms.innovation_step4
 
         step "Environmental, social & corporate governance (ESG)",
              "Environmental, social & corporate governance (ESG)",
-             &AwardYears::V2024::QAEForms.innovation_step5
+             &AwardYears::V2024::QaeForms.innovation_step5
 
         step "Supplementary materials & confirmation",
              "Supplementary materials & confirmation",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2024::QAEForms.innovation_step6
+             &AwardYears::V2024::QaeForms.innovation_step6
       end
     end
   end
diff --git a/app/forms/award_years/v2024/innovation/innovation_step1.rb b/app/forms/award_years/v2024/innovation/innovation_step1.rb
index fb9c20f019..9f91a9ddee 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation_step1
       @innovation_step1 ||= proc do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step2.rb b/app/forms/award_years/v2024/innovation/innovation_step2.rb
index 18399588dd..912950812e 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation_step2
       @innovation_step2 ||= proc do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step3.rb b/app/forms/award_years/v2024/innovation/innovation_step3.rb
index 0329a8b673..21216e4064 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step3.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation_step3
       @innovation_step3 ||= proc do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index 3245beda7e..73935c2b50 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation_step4
       @innovation_step4 ||= proc do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step5.rb b/app/forms/award_years/v2024/innovation/innovation_step5.rb
index 774aabe33f..c72faee533 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step5.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step5.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation_step5
       @innovation_step5 ||= proc do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step6.rb b/app/forms/award_years/v2024/innovation/innovation_step6.rb
index 3c51816567..cdaa95a67f 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step6.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def innovation_step6
       @innovation_step6 ||= proc do
diff --git a/app/forms/award_years/v2024/international_trade.rb b/app/forms/award_years/v2024/international_trade.rb
index aa1748a46e..3a5f0891b2 100644
--- a/app/forms/award_years/v2024/international_trade.rb
+++ b/app/forms/award_years/v2024/international_trade.rb
@@ -5,34 +5,34 @@
 require "award_years/v2024/international_trade/international_trade_step5"
 require "award_years/v2024/international_trade/international_trade_step6"
 
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade
-      @trade ||= QAEFormBuilder.build "International Trade Award Application" do
+      @trade ||= QaeFormBuilder.build "International Trade Award Application" do
         step "Consent & due diligence",
              "Consent & due diligence",
-             &AwardYears::V2024::QAEForms.trade_step1
+             &AwardYears::V2024::QaeForms.trade_step1
 
         step "Company information",
              "Company information",
-             &AwardYears::V2024::QAEForms.trade_step2
+             &AwardYears::V2024::QaeForms.trade_step2
 
         step "Your International Trade",
              "Your International Trade",
-             &AwardYears::V2024::QAEForms.trade_step3
+             &AwardYears::V2024::QaeForms.trade_step3
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2024::QAEForms.trade_step4
+             &AwardYears::V2024::QaeForms.trade_step4
 
         step "Environmental, Social & Corporate Governance (ESG)",
              "Environmental, Social & Corporate Governance (ESG)",
-             &AwardYears::V2024::QAEForms.trade_step5
+             &AwardYears::V2024::QaeForms.trade_step5
 
         step "Supplementary materials & confirmation",
              "Supplementary materials & confirmation",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2024::QAEForms.trade_step6
+             &AwardYears::V2024::QaeForms.trade_step6
 
       end
     end
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
index df378d884d..8340e63305 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade_step1
       @trade_step1 ||= proc do
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
index 3a436b64bf..ee807e77a7 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step3.rb b/app/forms/award_years/v2024/international_trade/international_trade_step3.rb
index b96d895121..78d83eee42 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step3.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade_step3
       @trade_step3 ||= proc do
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step4.rb b/app/forms/award_years/v2024/international_trade/international_trade_step4.rb
index a09bff530c..a339f8539f 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step4.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade_step4
       @trade_step4 ||= proc do
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step5.rb b/app/forms/award_years/v2024/international_trade/international_trade_step5.rb
index 67a738529a..dea6363c3e 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step5.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step5.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade_step5
       @trade_step5 ||= proc do
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step6.rb b/app/forms/award_years/v2024/international_trade/international_trade_step6.rb
index 54e361f996..97b38fb576 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step6.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def trade_step6
       @trade_step6 ||= proc do
diff --git a/app/forms/award_years/v2024/qae_forms.rb b/app/forms/award_years/v2024/qae_forms.rb
index 2c681decca..9b5b5ecd69 100644
--- a/app/forms/award_years/v2024/qae_forms.rb
+++ b/app/forms/award_years/v2024/qae_forms.rb
@@ -1,7 +1,7 @@
-require 'award_years/v2024/innovation'
-require 'award_years/v2024/international_trade'
-require 'award_years/v2024/sustainable_development'
-require 'award_years/v2024/social_mobility'
+require_relative 'innovation'
+require_relative 'international_trade'
+require_relative 'sustainable_development'
+require_relative 'social_mobility'
 
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
 end
diff --git a/app/forms/award_years/v2024/social_mobility.rb b/app/forms/award_years/v2024/social_mobility.rb
index 24a0061a6a..1e41519a30 100644
--- a/app/forms/award_years/v2024/social_mobility.rb
+++ b/app/forms/award_years/v2024/social_mobility.rb
@@ -5,34 +5,34 @@
 require "award_years/v2024/social_mobility/social_mobility_step5"
 require "award_years/v2024/social_mobility/social_mobility_step6"
 
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility
-      @mobility ||= QAEFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
+      @mobility ||= QaeFormBuilder.build "Promoting Opportunity Award (through social mobility) Application" do
         step "Consent & due diligence",
              "Consent & due diligence",
-             &AwardYears::V2024::QAEForms.mobility_step1
+             &AwardYears::V2024::QaeForms.mobility_step1
 
         step "Company information",
              "Company information",
-             &AwardYears::V2024::QAEForms.mobility_step2
+             &AwardYears::V2024::QaeForms.mobility_step2
 
         step "Your Social Mobility Initiative",
              "Your Social Mobility Initiative",
-             &AwardYears::V2024::QAEForms.mobility_step3
+             &AwardYears::V2024::QaeForms.mobility_step3
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2024::QAEForms.mobility_step4
+             &AwardYears::V2024::QaeForms.mobility_step4
 
         step "Environmental, Social & Corporate Governance (ESG)",
              "Environmental, Social & Corporate Governance (ESG)",
-             &AwardYears::V2024::QAEForms.mobility_step5
+             &AwardYears::V2024::QaeForms.mobility_step5
 
         step "Supplementary materials & confirmation",
              "Supplementary materials & confirmation",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2024::QAEForms.mobility_step6
+             &AwardYears::V2024::QaeForms.mobility_step6
 
       end
     end
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
index f1d2059cdc..57b9c08451 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility_step1
       @mobility_step1 ||= proc do
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
index db722a4e0d..e9259da144 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility_step2
       @mobility_step2 ||= proc do
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
index 992fe5d498..a005b46379 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility_step3
       @mobility_step3 ||= proc do
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step4.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step4.rb
index 5bd7ca5cbc..9a12446642 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step4.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility_step4
       @mobility_step4 ||= proc do
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step5.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step5.rb
index 62c4cea85d..ce674fba1f 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step5.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step5.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility_step5
       @mobility_step5 ||= proc do
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step6.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step6.rb
index 6f81ec80e1..55640b3fc7 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step6.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step6.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def mobility_step6
       @mobility_step6 ||= proc do
diff --git a/app/forms/award_years/v2024/sustainable_development.rb b/app/forms/award_years/v2024/sustainable_development.rb
index c6b49e7a2f..3ded4a653d 100644
--- a/app/forms/award_years/v2024/sustainable_development.rb
+++ b/app/forms/award_years/v2024/sustainable_development.rb
@@ -4,30 +4,30 @@
 require "award_years/v2024/sustainable_development/sustainable_development_step4"
 require "award_years/v2024/sustainable_development/sustainable_development_step5"
 
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def development
-      @development ||= QAEFormBuilder.build "Sustainable Development Award Application" do
+      @development ||= QaeFormBuilder.build "Sustainable Development Award Application" do
         step "Consent & Due Diligence",
              "Consent & Due Diligence",
-             &AwardYears::V2024::QAEForms.development_step1
+             &AwardYears::V2024::QaeForms.development_step1
 
         step "Company information",
              "Company information",
-             &AwardYears::V2024::QAEForms.development_step2
+             &AwardYears::V2024::QaeForms.development_step2
 
         step "Your Sustainable Development",
              "Your Sustainable Development",
-             &AwardYears::V2024::QAEForms.development_step3
+             &AwardYears::V2024::QaeForms.development_step3
 
         step "Commercial Performance",
              "Commercial Performance",
-             &AwardYears::V2024::QAEForms.development_step4
+             &AwardYears::V2024::QaeForms.development_step4
 
         step "Supplementary Materials & Confirmation",
              "Supplementary Materials & Confirmation",
              { id: :add_website_address_documents_step },
-             &AwardYears::V2024::QAEForms.development_step5
+             &AwardYears::V2024::QaeForms.development_step5
       end
     end
   end
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
index 5139046680..6183b8b76d 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def development_step1
       @development_step1 ||= proc do
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
index 95f31abe63..6fadde1105 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
@@ -1,5 +1,5 @@
 # coding: utf-8
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def development_step2
       @development_step2 ||= proc do
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
index 8719cc7574..c5e2c0256c 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def development_step3
       @development_step3 ||= proc do
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb
index f373b4ad9f..511fb23adb 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def development_step4
       @development_step4 ||= proc do
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb
index e8fffdf673..53f70df948 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb
@@ -1,4 +1,4 @@
-class AwardYears::V2024::QAEForms
+class AwardYears::V2024::QaeForms
   class << self
     def development_step5
       @development_step5 ||= proc do
diff --git a/app/forms/qae_form_builder.rb b/app/forms/qae_form_builder.rb
index 3bfdb4b018..b2d7d7335f 100644
--- a/app/forms/qae_form_builder.rb
+++ b/app/forms/qae_form_builder.rb
@@ -19,7 +19,9 @@
 require "qae_form_builder/year_question"
 require "qae_form_builder/upload_question"
 require "qae_form_builder/options_business_name_changed_question"
-require "qae_form_builder/mobility_application_category_options"
+require "qae_form_builder/mobility_application_category_options_question"
+require "qae_form_builder/mobility_application_category_options_question_validator"
+require "qae_form_builder/mobility_application_category_options_question_builder"
 
 require "qae_form_builder/subsidiaries_associates_plants_question"
 require "qae_form_builder/award_holder_question"
@@ -52,11 +54,11 @@
 
 require "qae_form_builder/matrix_question"
 
-class QAEFormBuilder
+class QaeFormBuilder
   class << self
 
     def build title, &block
-      form = QAEForm.new title
+      form = QaeForm.new title
       form.instance_eval &block if block_given?
       form
     end
diff --git a/app/forms/qae_form_builder/about_section_question.rb b/app/forms/qae_form_builder/about_section_question.rb
index 1a558ccc69..efc5210fa7 100644
--- a/app/forms/qae_form_builder/about_section_question.rb
+++ b/app/forms/qae_form_builder/about_section_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class AboutSectionQuestionValidator < HeaderQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/address_question.rb b/app/forms/qae_form_builder/address_question.rb
index 71162b0b38..5f091b21e1 100644
--- a/app/forms/qae_form_builder/address_question.rb
+++ b/app/forms/qae_form_builder/address_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class AddressQuestionValidator < QuestionValidator
     NO_VALIDATION_SUB_FIELDS = [:street, :county]
     def errors
diff --git a/app/forms/qae_form_builder/award_holder_question.rb b/app/forms/qae_form_builder/award_holder_question.rb
index 783e53ea9f..f0af28a554 100644
--- a/app/forms/qae_form_builder/award_holder_question.rb
+++ b/app/forms/qae_form_builder/award_holder_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class AwardHolderQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/app/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
index ebb347ab0e..bc4ec55de4 100644
--- a/app/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
+++ b/app/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class ByTradeGoodsAndServicesLabelQuestionValidator < QuestionValidator
     HUMANIZED_ATTRS = {
       "desc_short" => "Description"
diff --git a/app/forms/qae_form_builder/by_years_label_question.rb b/app/forms/qae_form_builder/by_years_label_question.rb
index fb6ea4c9bd..c1b0d1362c 100644
--- a/app/forms/qae_form_builder/by_years_label_question.rb
+++ b/app/forms/qae_form_builder/by_years_label_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class ByYearsLabelQuestionValidator < QuestionValidator
     REQUIRED_SUB_FIELDS = %i[day month year].freeze
 
@@ -76,7 +76,7 @@ def active_by_year_condition
       delegate_obj.by_year_conditions.find do |c|
         if c.question_value.respond_to?(:call)
           q = form[c.question_key]
-          if q.is_a?(QAEFormBuilder::DateQuestion) || q.is_a?(QAEFormBuilder::DateQuestionDecorator)
+          if q.is_a?(QaeFormBuilder::DateQuestion) || q.is_a?(QaeFormBuilder::DateQuestionDecorator)
 
             date = []
             q.required_sub_fields.each do |sub|
diff --git a/app/forms/qae_form_builder/by_years_question.rb b/app/forms/qae_form_builder/by_years_question.rb
index 2d05e0ea07..f4cc2072be 100644
--- a/app/forms/qae_form_builder/by_years_question.rb
+++ b/app/forms/qae_form_builder/by_years_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class ByYearsQuestionValidator < QuestionValidator
   end
 
@@ -39,7 +39,7 @@ def active_by_year_condition
       delegate_obj.by_year_conditions.find do |c|
         if c.question_value.respond_to?(:call)
           q = form[c.question_key]
-          if q.is_a?(QAEFormBuilder::DateQuestion) || q.is_a?(QAEFormBuilder::DateQuestionDecorator)
+          if q.is_a?(QaeFormBuilder::DateQuestion) || q.is_a?(QaeFormBuilder::DateQuestionDecorator)
             date = []
             q.required_sub_fields.each do |sub|
               date << q.input_value(suffix: sub.keys[0])
diff --git a/app/forms/qae_form_builder/checkbox_seria_question.rb b/app/forms/qae_form_builder/checkbox_seria_question.rb
index 05ce55ca17..96ab6adb8d 100644
--- a/app/forms/qae_form_builder/checkbox_seria_question.rb
+++ b/app/forms/qae_form_builder/checkbox_seria_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class CheckboxSeriaQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/comment_question.rb b/app/forms/qae_form_builder/comment_question.rb
index cf71547257..27e01ac8f3 100644
--- a/app/forms/qae_form_builder/comment_question.rb
+++ b/app/forms/qae_form_builder/comment_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class CommentQuestionValidator < QuestionValidator
     def errors
       {}
diff --git a/app/forms/qae_form_builder/confirm_question.rb b/app/forms/qae_form_builder/confirm_question.rb
index 7f87e11f06..995f2ea1f8 100644
--- a/app/forms/qae_form_builder/confirm_question.rb
+++ b/app/forms/qae_form_builder/confirm_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class ConfirmQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/contact_email_question.rb b/app/forms/qae_form_builder/contact_email_question.rb
index f322b879f6..0766dbb233 100644
--- a/app/forms/qae_form_builder/contact_email_question.rb
+++ b/app/forms/qae_form_builder/contact_email_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class ContactEmailQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/contact_question.rb b/app/forms/qae_form_builder/contact_question.rb
index ac9d5b6c78..4566d0aa49 100644
--- a/app/forms/qae_form_builder/contact_question.rb
+++ b/app/forms/qae_form_builder/contact_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class ContactQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/country_question.rb b/app/forms/qae_form_builder/country_question.rb
index af99df6464..88a2ab2097 100644
--- a/app/forms/qae_form_builder/country_question.rb
+++ b/app/forms/qae_form_builder/country_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class CountryQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/date_question.rb b/app/forms/qae_form_builder/date_question.rb
index f32058be0d..394019bfc0 100644
--- a/app/forms/qae_form_builder/date_question.rb
+++ b/app/forms/qae_form_builder/date_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class DateQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/dropdown_question.rb b/app/forms/qae_form_builder/dropdown_question.rb
index 92ad611c5f..882c076d37 100644
--- a/app/forms/qae_form_builder/dropdown_question.rb
+++ b/app/forms/qae_form_builder/dropdown_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class DropdownQuestionValidator < OptionsQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/head_of_business_question.rb b/app/forms/qae_form_builder/head_of_business_question.rb
index 204cc2a405..103a474e6b 100644
--- a/app/forms/qae_form_builder/head_of_business_question.rb
+++ b/app/forms/qae_form_builder/head_of_business_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class HeadOfBusinessQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/header_question.rb b/app/forms/qae_form_builder/header_question.rb
index 7fd8e780e9..a671b12f42 100644
--- a/app/forms/qae_form_builder/header_question.rb
+++ b/app/forms/qae_form_builder/header_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class HeaderQuestionValidator < QuestionValidator
     def errors
       {}
diff --git a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
index 7c8ba036c1..415cb5dea7 100644
--- a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
+++ b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class InnovationFinancialYearDateQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/matrix_question.rb b/app/forms/qae_form_builder/matrix_question.rb
index b785b5966a..d9b788fd37 100644
--- a/app/forms/qae_form_builder/matrix_question.rb
+++ b/app/forms/qae_form_builder/matrix_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class MatrixQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/mobility_application_category_options_question.rb b/app/forms/qae_form_builder/mobility_application_category_options_question.rb
new file mode 100644
index 0000000000..bfe3c9f0d9
--- /dev/null
+++ b/app/forms/qae_form_builder/mobility_application_category_options_question.rb
@@ -0,0 +1,4 @@
+class QaeFormBuilder
+  class MobilityApplicationCategoryOptionsQuestion < OptionsQuestion
+  end
+end
diff --git a/app/forms/qae_form_builder/mobility_application_category_options_question_builder.rb b/app/forms/qae_form_builder/mobility_application_category_options_question_builder.rb
new file mode 100644
index 0000000000..463f475643
--- /dev/null
+++ b/app/forms/qae_form_builder/mobility_application_category_options_question_builder.rb
@@ -0,0 +1,4 @@
+class QaeFormBuilder
+  class MobilityApplicationCategoryOptionsQuestionBuilder < OptionsQuestionBuilder
+  end
+end
diff --git a/app/forms/qae_form_builder/mobility_application_category_options.rb b/app/forms/qae_form_builder/mobility_application_category_options_question_validator.rb
similarity index 73%
rename from app/forms/qae_form_builder/mobility_application_category_options.rb
rename to app/forms/qae_form_builder/mobility_application_category_options_question_validator.rb
index dda1091293..12ee5ed394 100644
--- a/app/forms/qae_form_builder/mobility_application_category_options.rb
+++ b/app/forms/qae_form_builder/mobility_application_category_options_question_validator.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class MobilityApplicationCategoryOptionsQuestionValidator < OptionsQuestionValidator
     def errors
       result = super
@@ -10,10 +10,4 @@ def errors
       result
     end
   end
-
-  class MobilityApplicationCategoryOptionsQuestionBuilder < OptionsQuestionBuilder
-  end
-
-  class MobilityApplicationCategoryOptionsQuestion < OptionsQuestion
-  end
 end
diff --git a/app/forms/qae_form_builder/multi_question_decorator.rb b/app/forms/qae_form_builder/multi_question_decorator.rb
index 2a6aaf73d0..f4cbb9697d 100644
--- a/app/forms/qae_form_builder/multi_question_decorator.rb
+++ b/app/forms/qae_form_builder/multi_question_decorator.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder::MultiQuestionDecorator < QAEFormBuilder::QuestionDecorator
+class QaeFormBuilder::MultiQuestionDecorator < QaeFormBuilder::QuestionDecorator
   def entities
     @entities ||= (answers[delegate_obj.key.to_s] || [])
   end
diff --git a/app/forms/qae_form_builder/multi_question_validator.rb b/app/forms/qae_form_builder/multi_question_validator.rb
index f0e59d9fd2..13813eb23e 100644
--- a/app/forms/qae_form_builder/multi_question_validator.rb
+++ b/app/forms/qae_form_builder/multi_question_validator.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder::MultiQuestionValidator < QAEFormBuilder::QuestionValidator
+class QaeFormBuilder::MultiQuestionValidator < QaeFormBuilder::QuestionValidator
   def errors
     result = super
 
diff --git a/app/forms/qae_form_builder/number_question.rb b/app/forms/qae_form_builder/number_question.rb
index 1d13cb438b..4007fb696e 100644
--- a/app/forms/qae_form_builder/number_question.rb
+++ b/app/forms/qae_form_builder/number_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class NumberQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/one_option_by_years_label_question.rb b/app/forms/qae_form_builder/one_option_by_years_label_question.rb
index 3f5221945e..b51c5b1abd 100644
--- a/app/forms/qae_form_builder/one_option_by_years_label_question.rb
+++ b/app/forms/qae_form_builder/one_option_by_years_label_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class OneOptionByYearsLabelQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/one_option_by_years_question.rb b/app/forms/qae_form_builder/one_option_by_years_question.rb
index 096fcfd1c8..11138e178c 100644
--- a/app/forms/qae_form_builder/one_option_by_years_question.rb
+++ b/app/forms/qae_form_builder/one_option_by_years_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class OneOptionByYearsQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/options_business_name_changed_question.rb b/app/forms/qae_form_builder/options_business_name_changed_question.rb
index 12474ceb29..313c0b422f 100644
--- a/app/forms/qae_form_builder/options_business_name_changed_question.rb
+++ b/app/forms/qae_form_builder/options_business_name_changed_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class OptionsBusinessNameChangedQuestionValidator < OptionsQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/options_question.rb b/app/forms/qae_form_builder/options_question.rb
index d3f4354923..4778badae1 100644
--- a/app/forms/qae_form_builder/options_question.rb
+++ b/app/forms/qae_form_builder/options_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class OptionsQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/position_details_question.rb b/app/forms/qae_form_builder/position_details_question.rb
index 1bce92ff65..509b0b2865 100644
--- a/app/forms/qae_form_builder/position_details_question.rb
+++ b/app/forms/qae_form_builder/position_details_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class PositionDetailsQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/press_contact_details_question.rb b/app/forms/qae_form_builder/press_contact_details_question.rb
index df88010946..4755273d67 100644
--- a/app/forms/qae_form_builder/press_contact_details_question.rb
+++ b/app/forms/qae_form_builder/press_contact_details_question.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class QAEFormBuilder
+class QaeFormBuilder
   class PressContactDetailsQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/previous_name_question.rb b/app/forms/qae_form_builder/previous_name_question.rb
index d972f9580f..f4681aa1b3 100644
--- a/app/forms/qae_form_builder/previous_name_question.rb
+++ b/app/forms/qae_form_builder/previous_name_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class PreviousNameQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/qae_decorator.rb b/app/forms/qae_form_builder/qae_decorator.rb
index 47b61aa428..e23a20d322 100644
--- a/app/forms/qae_form_builder/qae_decorator.rb
+++ b/app/forms/qae_form_builder/qae_decorator.rb
@@ -1,6 +1,6 @@
-class QAEFormBuilder
+class QaeFormBuilder
 
-  class QAEDecorator
+  class QaeDecorator
     attr_reader :delegate_obj
 
     def initialize obj, decorator_options = {}
@@ -31,4 +31,4 @@ def wrap o, options
 
   end
 
-end 
+end
diff --git a/app/forms/qae_form_builder/qae_form.rb b/app/forms/qae_form_builder/qae_form.rb
index c3e0391889..06dfce2229 100644
--- a/app/forms/qae_form_builder/qae_form.rb
+++ b/app/forms/qae_form_builder/qae_form.rb
@@ -1,6 +1,6 @@
-class QAEFormBuilder
+class QaeFormBuilder
 
-  class QAEForm
+  class QaeForm
     attr_reader :title, :opts, :steps, :questions_by_key
 
     def initialize title, opts={}
@@ -16,7 +16,7 @@ def [] key
     end
 
     def decorate options = {}
-      QAEFormDecorator.new self, options
+      QaeFormDecorator.new self, options
     end
 
     def step title, short_title, options = {}, &block
diff --git a/app/forms/qae_form_builder/qae_form_decorator.rb b/app/forms/qae_form_builder/qae_form_decorator.rb
index 66ea280f66..f235e86207 100644
--- a/app/forms/qae_form_builder/qae_form_decorator.rb
+++ b/app/forms/qae_form_builder/qae_form_decorator.rb
@@ -1,6 +1,6 @@
-class QAEFormBuilder
+class QaeFormBuilder
 
-  class QAEFormDecorator < QAEDecorator
+  class QaeFormDecorator < QaeDecorator
 
     def form_name
       @decorator_options[:form_name] || 'form'
diff --git a/app/forms/qae_form_builder/queen_award_applications_question.rb b/app/forms/qae_form_builder/queen_award_applications_question.rb
index fef9fec669..39acff8fe0 100644
--- a/app/forms/qae_form_builder/queen_award_applications_question.rb
+++ b/app/forms/qae_form_builder/queen_award_applications_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class QueenAwardApplicationsQuestionValidator < MultiQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/queen_award_holder_question.rb b/app/forms/qae_form_builder/queen_award_holder_question.rb
index 7c0aa6593a..b2265c93c1 100644
--- a/app/forms/qae_form_builder/queen_award_holder_question.rb
+++ b/app/forms/qae_form_builder/queen_award_holder_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class QueenAwardHolderQuestionValidator < MultiQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/question.rb b/app/forms/qae_form_builder/question.rb
index d28342944a..9a7ba7ac19 100644
--- a/app/forms/qae_form_builder/question.rb
+++ b/app/forms/qae_form_builder/question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class QuestionValidator
     # multifield questions that can not be simply validated
     SKIP_PRESENCE_VALIDATION_QUESTIONS = [
@@ -56,7 +56,7 @@ def limit_with_buffer(limit)
     end
   end
 
-  class QuestionDecorator < QAEDecorator
+  class QuestionDecorator < QaeDecorator
     def input_name options = {}
       if options[:index]
         suffix = options.fetch(:suffix)
@@ -177,7 +177,7 @@ def validate
         error = {}
 
         question_class = delegate_obj.class.name.demodulize
-        validator_class = "QAEFormBuilder::#{question_class}Validator".constantize
+        validator_class = "QaeFormBuilder::#{question_class}Validator".constantize
 
         validator = validator_class.new(self, answers)
         errors.merge!(validator.errors)
@@ -311,13 +311,13 @@ def children_conditions(questions_with_references)
     end
 
     def can_have_conditional_hints?
-      delegate_obj.is_a?(QAEFormBuilder::OptionsQuestion) ||
-      delegate_obj.is_a?(QAEFormBuilder::TradeCommercialSuccessQuestion)
+      delegate_obj.is_a?(QaeFormBuilder::OptionsQuestion) ||
+      delegate_obj.is_a?(QaeFormBuilder::TradeCommercialSuccessQuestion)
     end
 
     def can_have_parent_conditional_hints?
-      !delegate_obj.is_a?(QAEFormBuilder::HeaderQuestion) &&
-      !delegate_obj.is_a?(QAEFormBuilder::TradeMostRecentFinancialYearOptionsQuestion)
+      !delegate_obj.is_a?(QaeFormBuilder::HeaderQuestion) &&
+      !delegate_obj.is_a?(QaeFormBuilder::TradeMostRecentFinancialYearOptionsQuestion)
     end
 
     def pdf_conditional_hints(questions_with_references)
@@ -581,7 +581,7 @@ def title
 
     def decorate options = {}
       kls_name = self.class.name.split('::').last
-      kls = QAEFormBuilder.const_get "#{kls_name}Decorator" rescue nil
+      kls = QaeFormBuilder.const_get "#{kls_name}Decorator" rescue nil
       (kls || QuestionDecorator).new self, options
     end
 
diff --git a/app/forms/qae_form_builder/regions_question.rb b/app/forms/qae_form_builder/regions_question.rb
index fa3ac1f2c7..0d246946c1 100644
--- a/app/forms/qae_form_builder/regions_question.rb
+++ b/app/forms/qae_form_builder/regions_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class RegionsQuestionValidator < DropdownQuestionValidator
     def errors
       result = super
@@ -20,7 +20,7 @@ class RegionsQuestionBuilder < DropdownQuestionBuilder
 
   class RegionsQuestionDecorator < QuestionDecorator
     def regions
-      ::QAEFormBuilder::AddressQuestionDecorator::REGIONS.sort
+      ::QaeFormBuilder::AddressQuestionDecorator::REGIONS.sort
     end
 
     def entities
diff --git a/app/forms/qae_form_builder/sic_code_dropdown_question.rb b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
index e6824aab42..6ffaa2a5c8 100644
--- a/app/forms/qae_form_builder/sic_code_dropdown_question.rb
+++ b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class SicCodeDropdownQuestionValidator < QuestionValidator
   end
 
@@ -9,7 +9,7 @@ class SicCodeDropdownQuestion < DropdownQuestion
     def options
       return @options if @options.any?
 
-      @options = SICCode.collection.map do |text, value|
+      @options = SicCode.collection.map do |text, value|
         QuestionAnswerOption.new(value, text)
       end
     end
diff --git a/app/forms/qae_form_builder/step.rb b/app/forms/qae_form_builder/step.rb
index 2801920bbc..bc5ad2d8ec 100644
--- a/app/forms/qae_form_builder/step.rb
+++ b/app/forms/qae_form_builder/step.rb
@@ -1,8 +1,8 @@
 require 'active_support/inflector'
 
-class QAEFormBuilder
+class QaeFormBuilder
 
-  class StepDecorator < QAEDecorator
+  class StepDecorator < QaeDecorator
 
     QUESTIONS_WITH_NOT_REJECTING_BLANKS_ON_SAVE = %w(
       innovation_materials
@@ -45,7 +45,7 @@ def allowed_questions_params_list(form_data, document)
         allowed_params[question.key] = hashify_params(form_data[question.key])
 
         question_possible_sub_keys(question).each do |sub_question_key|
-          allowed_params[sub_question_key] = if question.delegate_obj.is_a?(QAEFormBuilder::ByYearsQuestion) || question.delegate_obj.is_a?(QAEFormBuilder::OneOptionByYearsQuestion)
+          allowed_params[sub_question_key] = if question.delegate_obj.is_a?(QaeFormBuilder::ByYearsQuestion) || question.delegate_obj.is_a?(QaeFormBuilder::OneOptionByYearsQuestion)
             # Sometimes users can input commas, we are stripping them
             form_data[sub_question_key].to_s.delete(",")
           else
@@ -53,7 +53,7 @@ def allowed_questions_params_list(form_data, document)
           end
         end
 
-        if question.delegate_obj.is_a?(QAEFormBuilder::UploadQuestion) &&
+        if question.delegate_obj.is_a?(QaeFormBuilder::UploadQuestion) &&
             hashify_params(form_data[question.key]).nil?
           # This code handles case when user removes all attachments / links
           # from Form: Add Website Address/Documents section
@@ -94,7 +94,7 @@ def question_possible_sub_keys(question)
       if by_year_conditions.present?
         sub_question_keys += question.by_year_conditions.map do |c|
           (1..c.years).map do |y|
-            if question.delegate_obj.is_a?(QAEFormBuilder::ByYearsLabelQuestion)
+            if question.delegate_obj.is_a?(QaeFormBuilder::ByYearsLabelQuestion)
               [:day, :month, :year].map do |i|
                 "#{y}of#{c.years}#{i}"
               end
@@ -105,7 +105,7 @@ def question_possible_sub_keys(question)
         end.flatten
       end
 
-      if question.delegate_obj.is_a?(QAEFormBuilder::MatrixQuestion)
+      if question.delegate_obj.is_a?(QaeFormBuilder::MatrixQuestion)
         sub_question_keys += question.x_headings.map do |x_heading|
           question.y_headings.map do |y_heading|
             "#{x_heading.key}_#{y_heading.key}"
@@ -116,9 +116,9 @@ def question_possible_sub_keys(question)
         end.flatten
       end
 
-      if question.delegate_obj.is_a?(QAEFormBuilder::OneOptionByYearsLabelQuestion) || question.delegate_obj.is_a?(QAEFormBuilder::OneOptionByYearsQuestion)
+      if question.delegate_obj.is_a?(QaeFormBuilder::OneOptionByYearsLabelQuestion) || question.delegate_obj.is_a?(QaeFormBuilder::OneOptionByYearsQuestion)
         sub_question_keys += (1..3).map do |y|
-          if question.delegate_obj.is_a?(QAEFormBuilder::OneOptionByYearsLabelQuestion)
+          if question.delegate_obj.is_a?(QaeFormBuilder::OneOptionByYearsLabelQuestion)
             [:day, :month, :year].map do |i|
               "#{y}of3#{i}"
             end
@@ -158,8 +158,8 @@ def submit text, &block
     end
 
     def method_missing(meth, *args, &block)
-      klass_builder = QAEFormBuilder.const_get("#{meth.to_s.camelize}QuestionBuilder") rescue nil
-      klass = QAEFormBuilder.const_get("#{meth.to_s.camelize}Question") rescue nil
+      klass_builder = QaeFormBuilder.const_get("#{meth.to_s.camelize}QuestionBuilder") rescue nil
+      klass = QaeFormBuilder.const_get("#{meth.to_s.camelize}Question") rescue nil
 
       if klass_builder && klass && args.length >= 2 && args.length <= 3
         id, title, opts = args
diff --git a/app/forms/qae_form_builder/subsidiaries_associates_plants_question.rb b/app/forms/qae_form_builder/subsidiaries_associates_plants_question.rb
index be42dc7813..158b036156 100644
--- a/app/forms/qae_form_builder/subsidiaries_associates_plants_question.rb
+++ b/app/forms/qae_form_builder/subsidiaries_associates_plants_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class SubsidiariesAssociatesPlantsQuestionValidator < MultiQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/supporters_question.rb b/app/forms/qae_form_builder/supporters_question.rb
index 3aabec40bc..b3d283b948 100644
--- a/app/forms/qae_form_builder/supporters_question.rb
+++ b/app/forms/qae_form_builder/supporters_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class SupportersQuestionValidator < QuestionValidator
     MIN_LIMIT = 2
 
diff --git a/app/forms/qae_form_builder/text_question.rb b/app/forms/qae_form_builder/text_question.rb
index cbf7e5e34f..0d9ef10d3c 100644
--- a/app/forms/qae_form_builder/text_question.rb
+++ b/app/forms/qae_form_builder/text_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class TextQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/textarea_question.rb b/app/forms/qae_form_builder/textarea_question.rb
index 4b81e308e0..42833056f9 100644
--- a/app/forms/qae_form_builder/textarea_question.rb
+++ b/app/forms/qae_form_builder/textarea_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class TextareaQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/trade_commercial_success_question.rb b/app/forms/qae_form_builder/trade_commercial_success_question.rb
index ea4940c36a..ee04bec829 100644
--- a/app/forms/qae_form_builder/trade_commercial_success_question.rb
+++ b/app/forms/qae_form_builder/trade_commercial_success_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class TradeCommercialSuccessQuestionValidator < OptionsQuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb b/app/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb
index 7602e60be6..70036fb802 100644
--- a/app/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb
+++ b/app/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class TradeMostRecentFinancialYearOptionsQuestionValidator < OptionsQuestionValidator
     def errors
       result = {}
diff --git a/app/forms/qae_form_builder/turnover_exports_calculation_question.rb b/app/forms/qae_form_builder/turnover_exports_calculation_question.rb
index f9204cf961..5d326921bb 100644
--- a/app/forms/qae_form_builder/turnover_exports_calculation_question.rb
+++ b/app/forms/qae_form_builder/turnover_exports_calculation_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class TurnoverExportsCalculationQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/upload_question.rb b/app/forms/qae_form_builder/upload_question.rb
index 3f7e3365a1..8116ee2582 100644
--- a/app/forms/qae_form_builder/upload_question.rb
+++ b/app/forms/qae_form_builder/upload_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class UploadQuestionValidator < QuestionValidator
   end
 
diff --git a/app/forms/qae_form_builder/user_info_question.rb b/app/forms/qae_form_builder/user_info_question.rb
index e503d8b7f6..f8547de2f8 100644
--- a/app/forms/qae_form_builder/user_info_question.rb
+++ b/app/forms/qae_form_builder/user_info_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class UserInfoQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/forms/qae_form_builder/year_question.rb b/app/forms/qae_form_builder/year_question.rb
index b191777163..7b45bde259 100644
--- a/app/forms/qae_form_builder/year_question.rb
+++ b/app/forms/qae_form_builder/year_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class YearQuestionValidator < QuestionValidator
     def errors
       result = super
diff --git a/app/models/account.rb b/app/models/account.rb
index 8e3efbc74b..f97d35e104 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -10,7 +10,7 @@ class Account < ApplicationRecord
   has_many :mobility_eligibilities, class_name: 'Eligibility::Mobility'
   has_many :promotion_eligibilities, class_name: 'Eligibility::Promotion'
 
-  belongs_to :owner, class_name: 'User', autosave: false, inverse_of: :owned_account
+  belongs_to :owner, class_name: 'User', autosave: false, inverse_of: :owned_account, optional: true
   validates :owner, presence: true
 
   def basic_eligibility
diff --git a/app/models/aggregated_award_year_pdf.rb b/app/models/aggregated_award_year_pdf.rb
index f8495bf822..6cb3e49c95 100644
--- a/app/models/aggregated_award_year_pdf.rb
+++ b/app/models/aggregated_award_year_pdf.rb
@@ -2,7 +2,7 @@ class AggregatedAwardYearPdf < ApplicationRecord
 
   TYPES = %w(case_summary feedback)
 
-  belongs_to :award_year
+  belongs_to :award_year, optional: true
 
   validates :award_year_id, uniqueness: { scope: [:award_category, :type_of_report, :sub_type] },
                             presence: true
diff --git a/app/models/assessor_assignment.rb b/app/models/assessor_assignment.rb
index 5952da3a9d..ec510d91f3 100644
--- a/app/models/assessor_assignment.rb
+++ b/app/models/assessor_assignment.rb
@@ -31,10 +31,10 @@ class AssessorAssignment < ApplicationRecord
   end
 
   begin :associations
-    belongs_to :assessor
-    belongs_to :form_answer
-    belongs_to :editable, polymorphic: true
-    belongs_to :award_year
+    belongs_to :assessor, optional: true
+    belongs_to :form_answer, optional: true
+    belongs_to :editable, polymorphic: true, optional: true
+    belongs_to :award_year, optional: true
   end
 
   begin :scopes
diff --git a/app/models/audit_log.rb b/app/models/audit_log.rb
index 8d4da014ae..5874ff467b 100644
--- a/app/models/audit_log.rb
+++ b/app/models/audit_log.rb
@@ -3,8 +3,8 @@ class AuditLog < ApplicationRecord
   validates :subject_id, presence: true
   validates :action_type, presence: true
 
-  belongs_to :subject, polymorphic: true
-  belongs_to :auditable, polymorphic: true
+  belongs_to :subject, polymorphic: true, optional: true
+  belongs_to :auditable, polymorphic: true, optional: true
 
   scope :data_export, -> { where(auditable_type: nil).or(where(action_type: "download_form_answer")) }
   scope :data_update, -> { where(auditable_type: "FormAnswer").where("action_type != 'download_form_answer'") }
diff --git a/app/models/case_summary_hard_copy_pdf.rb b/app/models/case_summary_hard_copy_pdf.rb
index 9bdaae6aae..9f9e3c03cc 100644
--- a/app/models/case_summary_hard_copy_pdf.rb
+++ b/app/models/case_summary_hard_copy_pdf.rb
@@ -1,5 +1,5 @@
 class CaseSummaryHardCopyPdf < ApplicationRecord
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   mount_uploader :file, FormAnswerPdfVersionUploader
 
diff --git a/app/models/comment.rb b/app/models/comment.rb
index 641f20a338..74bfbb6b48 100644
--- a/app/models/comment.rb
+++ b/app/models/comment.rb
@@ -1,6 +1,6 @@
 class Comment < ApplicationRecord
-  belongs_to :commentable, polymorphic: true
-  belongs_to :authorable, polymorphic: true
+  belongs_to :commentable, polymorphic: true, optional: true
+  belongs_to :authorable, polymorphic: true, optional: true
 
   validates :body, presence: true
 
diff --git a/app/models/commercial_figures_file.rb b/app/models/commercial_figures_file.rb
index 641fe786e4..255f3f0b4f 100644
--- a/app/models/commercial_figures_file.rb
+++ b/app/models/commercial_figures_file.rb
@@ -10,5 +10,5 @@ class CommercialFiguresFile < ActiveRecord::Base
   validates :form_answer_id, uniqueness: true,
             presence: true
 
-  belongs_to :shortlisted_documents_wrapper
+  belongs_to :shortlisted_documents_wrapper, optional: true
 end
diff --git a/app/models/concerns/reviewable.rb b/app/models/concerns/reviewable.rb
index 2f444bc7fd..0e4c81aebb 100644
--- a/app/models/concerns/reviewable.rb
+++ b/app/models/concerns/reviewable.rb
@@ -2,7 +2,7 @@ module Reviewable
   extend ActiveSupport::Concern
 
   included do
-    belongs_to :reviewable, polymorphic: true
+    belongs_to :reviewable, polymorphic: true, optional: true
 
     validates :reviewable_type,
               :reviewable_id,
diff --git a/app/models/concerns/shortlisted_document.rb b/app/models/concerns/shortlisted_document.rb
index 3372947929..8b69b02e28 100644
--- a/app/models/concerns/shortlisted_document.rb
+++ b/app/models/concerns/shortlisted_document.rb
@@ -8,7 +8,7 @@ module ShortlistedDocument
     include ::InfectedFileCleaner
     clean_after_scan :attachment
 
-    belongs_to :form_answer
+    belongs_to :form_answer, optional: true
   end
 
   def original_filename
diff --git a/app/models/deadline.rb b/app/models/deadline.rb
index e5c8f8eefa..c26e7c59db 100644
--- a/app/models/deadline.rb
+++ b/app/models/deadline.rb
@@ -6,7 +6,7 @@ class Deadline < ApplicationRecord
 
   date_time_for :trigger_at
 
-  belongs_to :settings
+  belongs_to :settings, optional: true
 
   AVAILABLE_DEADLINES = [
     "award_year_switch",
diff --git a/app/models/draft_note.rb b/app/models/draft_note.rb
index 260443cfb0..01594bb6dd 100644
--- a/app/models/draft_note.rb
+++ b/app/models/draft_note.rb
@@ -5,8 +5,8 @@ class DraftNote < ApplicationRecord
             :authorable_id,
             presence: true
 
-  belongs_to :notable, polymorphic: true
-  belongs_to :authorable, polymorphic: true
+  belongs_to :notable, polymorphic: true, optional: true
+  belongs_to :authorable, polymorphic: true, optional: true
 
   before_save :update_content_updated_at
 
diff --git a/app/models/eligibility.rb b/app/models/eligibility.rb
index a353f8cae1..85962561ef 100644
--- a/app/models/eligibility.rb
+++ b/app/models/eligibility.rb
@@ -3,8 +3,8 @@ class Eligibility < ApplicationRecord
 
   AWARD_NAME = ""
 
-  belongs_to :account
-  belongs_to :form_answer
+  belongs_to :account, optional: true
+  belongs_to :form_answer, optional: true
 
   attr_accessor :current_step,
                 :force_validate_now
diff --git a/app/models/email_notification.rb b/app/models/email_notification.rb
index 962ae406cb..75088f18ce 100644
--- a/app/models/email_notification.rb
+++ b/app/models/email_notification.rb
@@ -25,7 +25,7 @@ class EmailNotification < ApplicationRecord
 
   date_time_for :trigger_at
 
-  belongs_to :settings
+  belongs_to :settings, optional: true
 
   enumerize :kind, in: NOTIFICATION_KINDS
 
diff --git a/app/models/feedback.rb b/app/models/feedback.rb
index bed274f160..1b518f5f34 100644
--- a/app/models/feedback.rb
+++ b/app/models/feedback.rb
@@ -2,13 +2,13 @@ class Feedback < ApplicationRecord
 
   has_paper_trail unless: Proc.new { |t| Rails.env.test? }
 
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   store_accessor :document, FeedbackForm.fields
 
   scope :submitted, -> { where submitted: true }
-  belongs_to :authorable, polymorphic: true
-  belongs_to :award_year
+  belongs_to :authorable, polymorphic: true, optional: true
+  belongs_to :award_year, optional: true
 
   validates :form_answer_id, uniqueness: true
 
diff --git a/app/models/feedback_hard_copy_pdf.rb b/app/models/feedback_hard_copy_pdf.rb
index 6c5e55e2c0..f3db0d1b74 100644
--- a/app/models/feedback_hard_copy_pdf.rb
+++ b/app/models/feedback_hard_copy_pdf.rb
@@ -1,5 +1,5 @@
 class FeedbackHardCopyPdf < ApplicationRecord
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   mount_uploader :file, FormAnswerPdfVersionUploader
 
diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
index ad2b218b7c..b8381ff2d2 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -1,10 +1,10 @@
-require 'award_years/v2018/qae_forms'
-require 'award_years/v2019/qae_forms'
-require 'award_years/v2020/qae_forms'
-require 'award_years/v2021/qae_forms'
-require 'award_years/v2022/qae_forms'
-require 'award_years/v2023/qae_forms'
-require 'award_years/v2024/qae_forms'
+require_relative '../forms/award_years/v2018/qae_forms'
+require_relative '../forms/award_years/v2019/qae_forms'
+require_relative '../forms/award_years/v2020/qae_forms'
+require_relative '../forms/award_years/v2021/qae_forms'
+require_relative '../forms/award_years/v2022/qae_forms'
+require_relative '../forms/award_years/v2023/qae_forms'
+require_relative '../forms/award_years/v2024/qae_forms'
 
 class FormAnswer < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
@@ -75,10 +75,10 @@ class FormAnswer < ApplicationRecord
   mount_uploader :pdf_version, FormAnswerPdfVersionUploader
 
   begin :associations
-    belongs_to :user
-    belongs_to :account
-    belongs_to :award_year
-    belongs_to :company_details_editable, polymorphic: true
+    belongs_to :user, optional: true
+    belongs_to :account, optional: true
+    belongs_to :award_year, optional: true
+    belongs_to :company_details_editable, polymorphic: true, optional: true
 
     has_one :form_basic_eligibility, class_name: 'Eligibility::Basic', dependent: :destroy
     has_one :trade_eligibility, class_name: 'Eligibility::Trade', dependent: :destroy
@@ -99,8 +99,8 @@ class FormAnswer < ApplicationRecord
     has_one :case_summary_hard_copy_pdf, dependent: :destroy
     has_one :feedback_hard_copy_pdf, dependent: :destroy
 
-    belongs_to :primary_assessor, class_name: "Assessor", foreign_key: :primary_assessor_id
-    belongs_to :secondary_assessor, class_name: "Assessor", foreign_key: :secondary_assessor_id
+    belongs_to :primary_assessor, optional: true, class_name: "Assessor", foreign_key: :primary_assessor_id
+    belongs_to :secondary_assessor, optional: true, class_name: "Assessor", foreign_key: :secondary_assessor_id
     has_many :form_answer_attachments, dependent: :destroy
     has_many :support_letter_attachments, dependent: :destroy
     has_many :commercial_figures_files, dependent: :destroy
@@ -144,7 +144,7 @@ def secondary
                              in: POSSIBLE_AWARDS
                            }
     validates_uniqueness_of :urn, allow_nil: true, allow_blank: true
-    validates :sic_code, format: { with: SICCode::REGEX }, allow_nil: true, allow_blank: true
+    validates :sic_code, format: { with: SicCode::REGEX }, allow_nil: true, allow_blank: true
     validate :validate_answers
   end
 
@@ -569,7 +569,7 @@ def validate_answers
   end
 
   def award_form_class_name(year)
-    "::AwardYears::V#{year}::QAEForms"
+    "::AwardYears::V#{year}::QaeForms"
   end
 
   def self.transition_class
diff --git a/app/models/form_answer_attachment.rb b/app/models/form_answer_attachment.rb
index fd4c4eb3c0..6fdc27ef2b 100644
--- a/app/models/form_answer_attachment.rb
+++ b/app/models/form_answer_attachment.rb
@@ -1,6 +1,6 @@
 class FormAnswerAttachment < ApplicationRecord
-  belongs_to :form_answer
-  belongs_to :attachable, polymorphic: true
+  belongs_to :form_answer, optional: true
+  belongs_to :attachable, polymorphic: true, optional: true
 
   mount_uploader :file, FormAnswerAttachmentUploader
   scan_file      :file
diff --git a/app/models/form_answer_progress.rb b/app/models/form_answer_progress.rb
index 7d2d0b5922..0327009eb7 100644
--- a/app/models/form_answer_progress.rb
+++ b/app/models/form_answer_progress.rb
@@ -1,5 +1,5 @@
 class FormAnswerProgress < ApplicationRecord
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   validates :form_answer_id, presence: true
 
diff --git a/app/models/form_answer_transition.rb b/app/models/form_answer_transition.rb
index c622129725..f088914102 100644
--- a/app/models/form_answer_transition.rb
+++ b/app/models/form_answer_transition.rb
@@ -1,7 +1,7 @@
 class FormAnswerTransition < ApplicationRecord
   include Statesman::Adapters::ActiveRecordTransition
 
-  belongs_to :form_answer, inverse_of: :form_answer_transitions
+  belongs_to :form_answer, optional: true, inverse_of: :form_answer_transitions
 
   def transitable
     t_type = metadata["transitable_type"]
diff --git a/app/models/palace_attendee.rb b/app/models/palace_attendee.rb
index d30a36d0c5..9f2f170b37 100644
--- a/app/models/palace_attendee.rb
+++ b/app/models/palace_attendee.rb
@@ -1,5 +1,5 @@
 class PalaceAttendee < ApplicationRecord
-  belongs_to :palace_invite
+  belongs_to :palace_invite, optional: true
 
   validates :palace_invite,
             :title,
diff --git a/app/models/palace_invite.rb b/app/models/palace_invite.rb
index ed426eb909..5304ef1aa7 100644
--- a/app/models/palace_invite.rb
+++ b/app/models/palace_invite.rb
@@ -1,5 +1,5 @@
 class PalaceInvite < ApplicationRecord
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   has_many :palace_attendees, dependent: :destroy, autosave: true
 
diff --git a/app/models/press_summary.rb b/app/models/press_summary.rb
index 1a7ddbd210..896d127b67 100644
--- a/app/models/press_summary.rb
+++ b/app/models/press_summary.rb
@@ -1,5 +1,5 @@
 class PressSummary < ApplicationRecord
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   validates :form_answer, :token, presence: true
   validates :body, presence: true, unless: :contact_details_update?
@@ -15,7 +15,7 @@ class PressSummary < ApplicationRecord
 
   before_validation :set_token, on: :create
 
-  belongs_to :authorable, polymorphic: true
+  belongs_to :authorable, optional: true, polymorphic: true
 
   attr_accessor :contact_details_update, :body_update
 
diff --git a/app/models/reports/all_entries.rb b/app/models/reports/all_entries.rb
index 09e7be4d93..9d105adb5a 100644
--- a/app/models/reports/all_entries.rb
+++ b/app/models/reports/all_entries.rb
@@ -1,5 +1,5 @@
 class Reports::AllEntries
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/app/models/reports/assessors_progress_report.rb b/app/models/reports/assessors_progress_report.rb
index 796bff9bd0..21481e9e19 100644
--- a/app/models/reports/assessors_progress_report.rb
+++ b/app/models/reports/assessors_progress_report.rb
@@ -1,5 +1,5 @@
 class Reports::AssessorsProgressReport
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   CSV_HEADERS = [
     "Assessor ID",
diff --git a/app/models/reports/cases_status_report.rb b/app/models/reports/cases_status_report.rb
index b47c9023ab..128348de50 100644
--- a/app/models/reports/cases_status_report.rb
+++ b/app/models/reports/cases_status_report.rb
@@ -1,5 +1,5 @@
 class Reports::CasesStatusReport
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/app/models/reports/csv_helper.rb b/app/models/reports/csv_helper.rb
index 09c0ae2708..13f63c8729 100644
--- a/app/models/reports/csv_helper.rb
+++ b/app/models/reports/csv_helper.rb
@@ -1,6 +1,6 @@
 require "csv"
 
-module Reports::CSVHelper
+module Reports::CsvHelper
   def build
     CSV.generate(encoding: "UTF-8", force_quotes: true) do |csv|
       csv << headers
diff --git a/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb b/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb
index b4ab80bee2..3686ec3618 100644
--- a/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb
+++ b/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb
@@ -1,5 +1,5 @@
 class Reports::DiscrepanciesBetweenPrimaryAndSecondaryAppraisals
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/app/models/reports/press_book_list.rb b/app/models/reports/press_book_list.rb
index 00721a1028..68e550eb62 100644
--- a/app/models/reports/press_book_list.rb
+++ b/app/models/reports/press_book_list.rb
@@ -1,5 +1,5 @@
 class Reports::PressBookList
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/app/models/reports/reception_buckingham_palace_report.rb b/app/models/reports/reception_buckingham_palace_report.rb
index 30a8c7cb02..458127ddc4 100644
--- a/app/models/reports/reception_buckingham_palace_report.rb
+++ b/app/models/reports/reception_buckingham_palace_report.rb
@@ -1,5 +1,5 @@
 class Reports::ReceptionBuckinghamPalaceReport
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/app/models/reports/registered_users.rb b/app/models/reports/registered_users.rb
index 1d3420abc4..d1930355b1 100644
--- a/app/models/reports/registered_users.rb
+++ b/app/models/reports/registered_users.rb
@@ -1,5 +1,5 @@
 class Reports::RegisteredUsers
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/app/models/settings.rb b/app/models/settings.rb
index e40eaa94a4..0fea05affb 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -4,7 +4,7 @@ class Settings < ApplicationRecord
   has_many :deadlines, dependent: :destroy
   has_many :email_notifications, dependent: :destroy
 
-  belongs_to :award_year, inverse_of: :settings
+  belongs_to :award_year, optional: true, inverse_of: :settings
 
   validates :award_year, presence: true
 
diff --git a/app/models/shortlisted_documents_wrapper.rb b/app/models/shortlisted_documents_wrapper.rb
index 5af1a4098e..6df651f337 100644
--- a/app/models/shortlisted_documents_wrapper.rb
+++ b/app/models/shortlisted_documents_wrapper.rb
@@ -3,7 +3,7 @@ class ShortlistedDocumentsWrapper < ActiveRecord::Base
 
   has_one :commercial_figures_file
   has_many :vat_returns_files
-  belongs_to :form_answer
+  belongs_to :form_answer, optional: true
 
   validate :valid_for_submission?
 
diff --git a/app/models/support_letter.rb b/app/models/support_letter.rb
index 8c7e2bc24c..b0d78d59e3 100644
--- a/app/models/support_letter.rb
+++ b/app/models/support_letter.rb
@@ -1,8 +1,8 @@
 class SupportLetter < ApplicationRecord
   begin :associations
-    belongs_to :supporter
-    belongs_to :form_answer
-    belongs_to :user
+    belongs_to :supporter, optional: true
+    belongs_to :form_answer, optional: true
+    belongs_to :user, optional: true
 
     has_one :support_letter_attachment, autosave: true, dependent: :destroy
   end
diff --git a/app/models/support_letter_attachment.rb b/app/models/support_letter_attachment.rb
index c3640ba459..81c6f2eb1b 100644
--- a/app/models/support_letter_attachment.rb
+++ b/app/models/support_letter_attachment.rb
@@ -6,9 +6,9 @@ class SupportLetterAttachment < ApplicationRecord
   clean_after_scan :attachment
 
   begin :associations
-    belongs_to :user
-    belongs_to :form_answer
-    belongs_to :support_letter
+    belongs_to :user, optional: true
+    belongs_to :form_answer, optional: true
+    belongs_to :support_letter, optional: true
   end
 
   begin :validations
diff --git a/app/models/supporter.rb b/app/models/supporter.rb
index c8984b14ad..068289c0ec 100644
--- a/app/models/supporter.rb
+++ b/app/models/supporter.rb
@@ -2,8 +2,8 @@
 
 class Supporter < ApplicationRecord
   begin :associations
-    belongs_to :form_answer
-    belongs_to :user
+    belongs_to :form_answer, optional: true
+    belongs_to :user, optional: true
 
     has_one :support_letter, dependent: :destroy
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 762bba2147..2c65404673 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -44,7 +44,7 @@ class User < ApplicationRecord
                          source: :feedback
     has_one :owned_account, foreign_key: :owner_id, class_name: 'Account'
 
-    belongs_to :account
+    belongs_to :account, optional: true
     has_many :form_answer_attachments, as: :attachable
     has_many :support_letter_attachments, dependent: :destroy
     has_many :supporters, dependent: :destroy
diff --git a/app/models/vat_returns_file.rb b/app/models/vat_returns_file.rb
index 27f81a131d..dc7570503c 100644
--- a/app/models/vat_returns_file.rb
+++ b/app/models/vat_returns_file.rb
@@ -7,7 +7,7 @@ class VatReturnsFile < ActiveRecord::Base
               maximum: 5.megabytes.to_i
             }
 
-  belongs_to :shortlisted_documents_wrapper
+  belongs_to :shortlisted_documents_wrapper, optional: true
 
   after_destroy :unsubmit_if_needed
 
diff --git a/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb b/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
index 01807fb2e8..1ec837efb9 100644
--- a/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
+++ b/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
@@ -16,7 +16,7 @@ def undefined_value
 
   def current_awards_question
     all_questions.detect do |q|
-      q.delegate_obj.is_a?(QAEFormBuilder::QueenAwardHolderQuestion)
+      q.delegate_obj.is_a?(QaeFormBuilder::QueenAwardHolderQuestion)
     end
   end
 
@@ -26,7 +26,7 @@ def organisation_type
 
   def application_type_question
     all_questions.detect do |q|
-      q.delegate_obj.is_a?(QAEFormBuilder::CheckboxSeriaQuestion) &&
+      q.delegate_obj.is_a?(QaeFormBuilder::CheckboxSeriaQuestion) &&
       q.application_type_question.present?
     end
   end
@@ -49,8 +49,8 @@ def sic_code
 
   def current_awards_question
     all_questions.detect do |q|
-      q.delegate_obj.is_a?(QAEFormBuilder::QueenAwardHolderQuestion) ||
-        q.delegate_obj.is_a?(QAEFormBuilder::QueenAwardApplicationsQuestion)
+      q.delegate_obj.is_a?(QaeFormBuilder::QueenAwardHolderQuestion) ||
+        q.delegate_obj.is_a?(QaeFormBuilder::QueenAwardApplicationsQuestion)
     end
   end
 
diff --git a/app/pdf_generators/form_pdf.rb b/app/pdf_generators/form_pdf.rb
index 7f02ce26ac..60590281f6 100644
--- a/app/pdf_generators/form_pdf.rb
+++ b/app/pdf_generators/form_pdf.rb
@@ -18,7 +18,7 @@ class FormPdf < Prawn::Document
     development_was_launched_since
   )
   JUST_NOTES = [
-    "QAEFormBuilder::HeaderQuestion"
+    "QaeFormBuilder::HeaderQuestion"
   ]
   DEFAULT_ANSWER_COLOR = "5B5656"
 
@@ -49,9 +49,9 @@ def initialize(form_answer, pdf_blank_mode=false)
       a.clean?
     end
     @filled_answers = fetch_filled_answers
-    
+
     @financial_pointer = FormFinancialPointer.new(@form_answer.decorate)
-    
+
     generate!
   end
 
diff --git a/app/pdf_generators/qae_pdf_forms/custom_questions/lists.rb b/app/pdf_generators/qae_pdf_forms/custom_questions/lists.rb
index 4753f97c6c..5cb5aa38d1 100644
--- a/app/pdf_generators/qae_pdf_forms/custom_questions/lists.rb
+++ b/app/pdf_generators/qae_pdf_forms/custom_questions/lists.rb
@@ -1,9 +1,9 @@
 module QaePdfForms::CustomQuestions::Lists
   LIST_TYPES = [
-    QAEFormBuilder::AwardHolderQuestion,
-    QAEFormBuilder::QueenAwardApplicationsQuestion,
-    QAEFormBuilder::PositionDetailsQuestion,
-    QAEFormBuilder::ByTradeGoodsAndServicesLabelQuestion
+    QaeFormBuilder::AwardHolderQuestion,
+    QaeFormBuilder::QueenAwardApplicationsQuestion,
+    QaeFormBuilder::PositionDetailsQuestion,
+    QaeFormBuilder::ByTradeGoodsAndServicesLabelQuestion
   ]
   AWARD_HOLDER_LIST_HEADERS = [
     "Award/personal honour title",
@@ -41,7 +41,7 @@ def render_list
         render_word_limit
       end
     else
-      if question.delegate_obj.is_a?(QAEFormBuilder::ByTradeGoodsAndServicesLabelQuestion)
+      if question.delegate_obj.is_a?(QaeFormBuilder::ByTradeGoodsAndServicesLabelQuestion)
         render_by_trade_goods_question
       else
         render_word_limit
@@ -68,17 +68,17 @@ def render_by_trade_goods_question
 
   def list_headers
     case question.delegate_obj
-    when QAEFormBuilder::AwardHolderQuestion
+    when QaeFormBuilder::AwardHolderQuestion
       if question.award_years_present
         AWARD_HOLDER_LIST_HEADERS
       else
         NOMINATION_AWARD_LIST_HEADERS
       end
-    when QAEFormBuilder::QueenAwardApplicationsQuestion
+    when QaeFormBuilder::QueenAwardApplicationsQuestion
       AWARD_APPLICATIONS_LIST_HEADERS
-    when QAEFormBuilder::PositionDetailsQuestion
+    when QaeFormBuilder::PositionDetailsQuestion
       POSITION_LIST_HEADERS
-    when QAEFormBuilder::ByTradeGoodsAndServicesLabelQuestion
+    when QaeFormBuilder::ByTradeGoodsAndServicesLabelQuestion
       TRADE_GOODS_AND_SERVICES_HEADERS
     else
       raise "[#{self.class.name}] Unrecognized list type!"
@@ -163,20 +163,20 @@ def trade_goods_conditions(prepared_item)
 
   def list_rows
     if humanized_answer.present?
-      if question.delegate_obj.is_a? QAEFormBuilder::ByTradeGoodsAndServicesLabelQuestion
+      if question.delegate_obj.is_a? QaeFormBuilder::ByTradeGoodsAndServicesLabelQuestion
         render_goods_and_services
       else
         humanized_answer.map do |item|
           case question.delegate_obj
-          when QAEFormBuilder::AwardHolderQuestion
+          when QaeFormBuilder::AwardHolderQuestion
             award_holder_query_conditions(item)
-          when QAEFormBuilder::QueenAwardApplicationsQuestion
+          when QaeFormBuilder::QueenAwardApplicationsQuestion
             award_applications_query_conditions(item)
-          when QAEFormBuilder::QueenAwardHolderQuestion
+          when QaeFormBuilder::QueenAwardHolderQuestion
             queen_award_holder_query_conditions(item)
-          when QAEFormBuilder::PositionDetailsQuestion
+          when QaeFormBuilder::PositionDetailsQuestion
             position_details_query_conditions(item)
-          when QAEFormBuilder::SubsidiariesAssociatesPlantsQuestion
+          when QaeFormBuilder::SubsidiariesAssociatesPlantsQuestion
             subsidiaries_associates_plants_query_conditions(item)
           end
         end.compact
diff --git a/app/pdf_generators/qae_pdf_forms/general/question_pointer.rb b/app/pdf_generators/qae_pdf_forms/general/question_pointer.rb
index 02145c375c..0423f9d340 100644
--- a/app/pdf_generators/qae_pdf_forms/general/question_pointer.rb
+++ b/app/pdf_generators/qae_pdf_forms/general/question_pointer.rb
@@ -39,22 +39,22 @@ class QaePdfForms::General::QuestionPointer
   ANSWER_FONT_END = "</color>".freeze
 
   BLOCK_QUESTIONS = [
-    QAEFormBuilder::AwardHolderQuestion,
-    QAEFormBuilder::QueenAwardHolderQuestion,
-    QAEFormBuilder::QueenAwardApplicationsQuestion,
-    QAEFormBuilder::PositionDetailsQuestion,
-    QAEFormBuilder::SubsidiariesAssociatesPlantsQuestion,
-    QAEFormBuilder::ByTradeGoodsAndServicesLabelQuestion,
-    QAEFormBuilder::UploadQuestion,
-    QAEFormBuilder::ByYearsLabelQuestion,
-    QAEFormBuilder::TradeMostRecentFinancialYearOptionsQuestion,
-    QAEFormBuilder::ByYearsQuestion,
-    QAEFormBuilder::MatrixQuestion,
-    QAEFormBuilder::OneOptionByYearsLabelQuestion,
-    QAEFormBuilder::OneOptionByYearsQuestion,
-    QAEFormBuilder::SupportersQuestion,
-    QAEFormBuilder::TextareaQuestion,
-    QAEFormBuilder::TextQuestion
+    QaeFormBuilder::AwardHolderQuestion,
+    QaeFormBuilder::QueenAwardHolderQuestion,
+    QaeFormBuilder::QueenAwardApplicationsQuestion,
+    QaeFormBuilder::PositionDetailsQuestion,
+    QaeFormBuilder::SubsidiariesAssociatesPlantsQuestion,
+    QaeFormBuilder::ByTradeGoodsAndServicesLabelQuestion,
+    QaeFormBuilder::UploadQuestion,
+    QaeFormBuilder::ByYearsLabelQuestion,
+    QaeFormBuilder::TradeMostRecentFinancialYearOptionsQuestion,
+    QaeFormBuilder::ByYearsQuestion,
+    QaeFormBuilder::MatrixQuestion,
+    QaeFormBuilder::OneOptionByYearsLabelQuestion,
+    QaeFormBuilder::OneOptionByYearsQuestion,
+    QaeFormBuilder::SupportersQuestion,
+    QaeFormBuilder::TextareaQuestion,
+    QaeFormBuilder::TextQuestion
   ]
 
   def initialize(ops = {})
@@ -84,7 +84,7 @@ def set_questions_with_references
 
   def set_non_header_questions
     @non_header_questions = form_pdf.all_questions.select do |q|
-      !q.delegate_obj.is_a?(QAEFormBuilder::HeaderQuestion)
+      !q.delegate_obj.is_a?(QaeFormBuilder::HeaderQuestion)
     end
   end
 
@@ -103,7 +103,7 @@ def render!
   end
 
   def render_bottom_space
-    if question.delegate_obj.class.to_s != "QAEFormBuilder::HeaderQuestion" ||
+    if question.delegate_obj.class.to_s != "QaeFormBuilder::HeaderQuestion" ||
        question.classes != "regular-question" ||
        question.classes == "application-notice help-notice"
 
@@ -153,7 +153,7 @@ def render_pdf_hint
   end
 
   def render_header_hint
-    if question.delegate_obj.is_a?(QAEFormBuilder::HeaderQuestion) &&
+    if question.delegate_obj.is_a?(QaeFormBuilder::HeaderQuestion) &&
       (question.ref.present? || question.sub_ref.present?) &&
       SKIP_HEADER_HINT_KEYS.exclude?(question.key.to_s)
 
@@ -347,18 +347,18 @@ def question_block_type(question)
   def question_answer(question)
     unless FormPdf::JUST_NOTES.include?(question.delegate_obj.class.to_s)
       case question.delegate_obj
-      when QAEFormBuilder::UploadQuestion
+      when QaeFormBuilder::UploadQuestion
         form_pdf.indent 7.mm do
           render_attachments
         end
-      when QAEFormBuilder::SicCodeDropdownQuestion
+      when QaeFormBuilder::SicCodeDropdownQuestion
         if q_visible? && humanized_answer.present?
           form_pdf.render_standart_answer_block(question_option_title)
         else
           form_pdf.default_bottom_margin
           form_pdf.text "Select #{question.title}"
         end
-      when QAEFormBuilder::TradeMostRecentFinancialYearOptionsQuestion, QAEFormBuilder::OptionsQuestion
+      when QaeFormBuilder::TradeMostRecentFinancialYearOptionsQuestion, QaeFormBuilder::OptionsQuestion
         if q_visible? && humanized_answer.present?
           chosen_option = question.options.detect{ |option| option.value.to_s == humanized_answer.to_s }
           form_pdf.render_standart_answer_block(question_option_title)
@@ -375,7 +375,7 @@ def question_answer(question)
             end
           end
         end
-      when QAEFormBuilder::ConfirmQuestion
+      when QaeFormBuilder::ConfirmQuestion
         if q_visible? && humanized_answer.present?
           question_text = interpolate_deadlines(question_checked_value_title)
 
@@ -383,35 +383,35 @@ def question_answer(question)
         else
           question_option_box interpolate_deadlines(question.pdf_text || question.text)
         end
-      when QAEFormBuilder::MatrixQuestion
+      when QaeFormBuilder::MatrixQuestion
         render_matrix
-      when QAEFormBuilder::ByYearsLabelQuestion, QAEFormBuilder::OneOptionByYearsLabelQuestion
+      when QaeFormBuilder::ByYearsLabelQuestion, QaeFormBuilder::OneOptionByYearsLabelQuestion
         form_pdf.indent 7.mm do
           render_years_labels_table
         end
-      when QAEFormBuilder::ByYearsQuestion, QAEFormBuilder::TurnoverExportsCalculationQuestion, QAEFormBuilder::OneOptionByYearsQuestion
+      when QaeFormBuilder::ByYearsQuestion, QaeFormBuilder::TurnoverExportsCalculationQuestion, QaeFormBuilder::OneOptionByYearsQuestion
         render_years_table
-      when QAEFormBuilder::QueenAwardHolderQuestion
+      when QaeFormBuilder::QueenAwardHolderQuestion
         if humanized_answer.present?
           render_queen_award_holder
         else
           render_queen_award_holder_header
         end
-      when QAEFormBuilder::QueenAwardApplicationsQuestion
+      when QaeFormBuilder::QueenAwardApplicationsQuestion
         if humanized_answer.present?
           render_queen_award_applications
         else
           render_queen_award_applications_header
         end
-      when QAEFormBuilder::SubsidiariesAssociatesPlantsQuestion
+      when QaeFormBuilder::SubsidiariesAssociatesPlantsQuestion
         if humanized_answer.present?
           render_subsidiaries_plants
         end
-      when QAEFormBuilder::SupportersQuestion
+      when QaeFormBuilder::SupportersQuestion
         form_pdf.indent 7.mm do
           render_supporters
         end
-      when QAEFormBuilder::TextareaQuestion
+      when QaeFormBuilder::TextareaQuestion
         title = q_visible? && humanized_answer.present? ? humanized_answer : ""
 
         form_pdf.default_bottom_margin
@@ -421,7 +421,7 @@ def question_answer(question)
         form_pdf.indent 7.mm do
           render_list
         end
-      when QAEFormBuilder::CheckboxSeriaQuestion
+      when QaeFormBuilder::CheckboxSeriaQuestion
         render_checkbox_selected_values
       else
         title = q_visible? && humanized_answer.present? ? humanized_answer : ""
@@ -534,11 +534,11 @@ def attachment_by_type(_k, v)
   def complex_question
     render_question_title_with_ref_or_not
 
-    if question.delegate_obj.class.to_s == "QAEFormBuilder::AddressQuestion"
+    if question.delegate_obj.class.to_s == "QaeFormBuilder::AddressQuestion"
       render_context_and_answer_blocks
     end
 
-    if question.delegate_obj.class.to_s == "QAEFormBuilder::PressContactDetailsQuestion"
+    if question.delegate_obj.class.to_s == "QaeFormBuilder::PressContactDetailsQuestion"
       render_context_and_answer_blocks
     end
 
diff --git a/app/pdf_generators/shared_pdf_helpers/data_helpers.rb b/app/pdf_generators/shared_pdf_helpers/data_helpers.rb
index c7a6594b49..ef67442520 100644
--- a/app/pdf_generators/shared_pdf_helpers/data_helpers.rb
+++ b/app/pdf_generators/shared_pdf_helpers/data_helpers.rb
@@ -21,7 +21,7 @@ def sub_category
 
   def sub_category_question
     all_questions.detect do |q|
-      q.delegate_obj.is_a?(QAEFormBuilder::OptionsQuestion) &&
+      q.delegate_obj.is_a?(QaeFormBuilder::OptionsQuestion) &&
       q.sub_category_question.present?
     end
   end
diff --git a/app/views/admin/form_answers/company_details/_sic_form.html.slim b/app/views/admin/form_answers/company_details/_sic_form.html.slim
index 9d8b416b5d..4bae946f4b 100644
--- a/app/views/admin/form_answers/company_details/_sic_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_sic_form.html.slim
@@ -24,7 +24,7 @@
                       wrapper_html: { class: "form-group" },
                       input_html: { class: "form-control select2" },
                       as: :select,
-                      collection: SICCode.collection,
+                      collection: SicCode.collection,
                       include_blank: false,
                       label: false
           .form-actions.text-right
diff --git a/app/views/qae_form/_address_question.html.slim b/app/views/qae_form/_address_question.html.slim
index 3044f08677..4b75824cec 100644
--- a/app/views/qae_form/_address_question.html.slim
+++ b/app/views/qae_form/_address_question.html.slim
@@ -69,5 +69,5 @@ div role="group" id="q_#{question.key}"
         .clear
 
         - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
-        - klass <<(QAEFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+        - klass <<(QaeFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
         input.govuk-input.js-trigger-autosave class=klass type="text" id=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key) name=question.input_name(suffix: sub_field_key) autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
diff --git a/app/views/qae_form/_question.html.slim b/app/views/qae_form/_question.html.slim
index 4ac4188f28..97f31855ea 100644
--- a/app/views/qae_form/_question.html.slim
+++ b/app/views/qae_form/_question.html.slim
@@ -33,7 +33,7 @@
                   span.todo
                     = ref.to_s
 
-        - if question.delegate_obj.is_a?(QAEFormBuilder::HeaderQuestion)
+        - if question.delegate_obj.is_a?(QaeFormBuilder::HeaderQuestion)
           - if question.ref || question.sub_ref
               span.question-context.question-debug.govuk-hint id="hint_for_#{question.key}"
                 = "Please note #{(question.ref || question.sub_ref).delete(" ")} is just a heading for the following sub-questions."
@@ -103,7 +103,7 @@
                   span.todo
                     = ref.to_s
 
-        - if question.delegate_obj.is_a?(QAEFormBuilder::HeaderQuestion)
+        - if question.delegate_obj.is_a?(QaeFormBuilder::HeaderQuestion)
           - if question.ref || question.sub_ref
               span.question-context.question-debug.govuk-hint id="hint_for_#{question.key}"
                 = "Please note #{(question.ref || question.sub_ref).delete(" ")} is just a heading for the following sub-questions."
diff --git a/config/application.rb b/config/application.rb
index bdb3ffe750..7c8dccf970 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,6 +9,8 @@
 
 module Qae
   class Application < Rails::Application
+    config.load_defaults 6.1
+
     #initializer :regenerate_require_cache, before: :load_environment_config do
     #  Bootscale.regenerate
     #end
diff --git a/lib/qae.rb b/lib/q_a_e.rb
similarity index 100%
rename from lib/qae.rb
rename to lib/q_a_e.rb
diff --git a/lib/sic_code.rb b/lib/sic_code.rb
index 47162da865..2aa61b1982 100644
--- a/lib/sic_code.rb
+++ b/lib/sic_code.rb
@@ -1,6 +1,6 @@
 require "csv"
 
-class SICCode < ActiveYaml::Base
+class SicCode < ActiveYaml::Base
   REGEX = /\A\d{4}(\/\d{1})?\z/ # based on the sic codes spreadsheet
 
   set_root_path "#{Rails.root}/db/fixtures"
@@ -52,6 +52,6 @@ def name
   end
 
   def self.collection
-    SICCode.all.sort_by(&:code).map { |sic| [sic.name, sic.code] }
+    SicCode.all.sort_by(&:code).map { |sic| [sic.name, sic.code] }
   end
 end
diff --git a/spec/decorators/form_answer_decorator_spec.rb b/spec/decorators/form_answer_decorator_spec.rb
index 599a446b20..36907b2b7b 100644
--- a/spec/decorators/form_answer_decorator_spec.rb
+++ b/spec/decorators/form_answer_decorator_spec.rb
@@ -46,7 +46,7 @@
     let(:year) { 1 }
 
     context "sic code present" do
-      let(:sic_code) { SICCode.first }
+      let(:sic_code) { SicCode.first }
       it "returns average growth for specific year" do
         expect(subject.average_growth_for(year)).to eq(sic_code.by_year(year))
       end
@@ -91,7 +91,7 @@
 
   describe "#dashboard_status" do
     it "returns fill progress when application is not submitted" do
-     form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SICCode.first.code })
+     form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SicCode.first.code })
       expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...9%")
     end
 
diff --git a/spec/lib/qae_form_builder_spec.rb b/spec/lib/qae_form_builder_spec.rb
index c651512c49..af717926fd 100644
--- a/spec/lib/qae_form_builder_spec.rb
+++ b/spec/lib/qae_form_builder_spec.rb
@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe QAEFormBuilder do
+describe QaeFormBuilder do
   subject do
     described_class.build 'Dummy Award' do
       step 'Step1', 'step1', &DummyForm.step1
@@ -57,4 +57,4 @@ def self.step1
       end
     }
   end
-end
\ No newline at end of file
+end
diff --git a/spec/lib/sic_code_spec.rb b/spec/lib/sic_code_spec.rb
index 6a0d77b842..bed53b799c 100644
--- a/spec/lib/sic_code_spec.rb
+++ b/spec/lib/sic_code_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-describe SICCode do
+describe SicCode do
   describe "regex" do
     let(:regex) { described_class::REGEX }
 
@@ -20,7 +20,7 @@
   end
 
   describe "#by_year" do
-    subject { SICCode.first }
+    subject { SicCode.first }
 
     it "gets average growth by year" do
       expect(subject.by_year(1)).to eq(subject.year1)
diff --git a/spec/models/aggregated_award_year_pdf_spec.rb b/spec/models/aggregated_award_year_pdf_spec.rb
index 44946e6658..e50fcbbc15 100644
--- a/spec/models/aggregated_award_year_pdf_spec.rb
+++ b/spec/models/aggregated_award_year_pdf_spec.rb
@@ -5,6 +5,6 @@
   it { is_expected.to validate_presence_of(:award_category) }
   it { is_expected.to validate_presence_of(:type_of_report) }
   it { is_expected.to validate_presence_of(:award_year_id) }
-  it { is_expected.to belong_to(:award_year) }
+  it { is_expected.to belong_to(:award_year).optional }
 
 end
diff --git a/spec/models/audit_certificate_spec.rb b/spec/models/audit_certificate_spec.rb
index e9d21eb633..3c30cc43f0 100644
--- a/spec/models/audit_certificate_spec.rb
+++ b/spec/models/audit_certificate_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe AuditCertificate, type: :model do
   describe "associations" do
-    it { should belong_to(:form_answer) }
+    it { should belong_to(:form_answer).optional }
   end
 
   describe "validations" do
@@ -20,7 +20,7 @@
       }
     end
   end
-  
+
   describe 'save' do
     it 'should set changes_description' do
       audit_certificate = create(:audit_certificate, changes_description: "test")
diff --git a/spec/models/eligibility_spec.rb b/spec/models/eligibility_spec.rb
index 765a08bd74..7929dd8667 100644
--- a/spec/models/eligibility_spec.rb
+++ b/spec/models/eligibility_spec.rb
@@ -2,8 +2,8 @@
 
 describe Eligibility do
 
-  it {is_expected.to belong_to(:account)}
-  it {is_expected.to belong_to(:form_answer)}
+  it {is_expected.to belong_to(:account).optional }
+  it {is_expected.to belong_to(:form_answer).optional }
 
   describe 'base validation' do
     it 'should raise error' do
diff --git a/spec/models/form_answer_spec.rb b/spec/models/form_answer_spec.rb
index 995e3a2e05..848e9b0fe5 100644
--- a/spec/models/form_answer_spec.rb
+++ b/spec/models/form_answer_spec.rb
@@ -4,10 +4,6 @@
   let(:award_year) { create(:award_year, year: 2019) }
   let(:form_answer) { build(:form_answer) }
 
-  describe "associations" do
-    it { should belong_to(:user) }
-  end
-
   describe 'class methods & scopes ' do
     it ".hard_copy_generated should filter correctly" do
       target = FormAnswer.submitted.where("feedback_hard_copy_generated" => true).to_sql
diff --git a/spec/models/support_letter_attachment_spec.rb b/spec/models/support_letter_attachment_spec.rb
index e8b4f3ae3b..211521cb95 100644
--- a/spec/models/support_letter_attachment_spec.rb
+++ b/spec/models/support_letter_attachment_spec.rb
@@ -1,11 +1,6 @@
 require "rails_helper"
 
 RSpec.describe SupportLetterAttachment, type: :model do
-  describe "associations" do
-    it { should belong_to(:user) }
-    it { should belong_to(:form_answer) }
-  end
-
   describe "validations" do
     %w(user form_answer attachment).each do |field_name|
       it { should validate_presence_of field_name }
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 517a96747f..a72a503d39 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -46,7 +46,7 @@ def matches?(source_file)
 Capybara.register_driver(:chrome_headless) do |app|
   options = ::Selenium::WebDriver::Chrome::Options.new
 
-  options.add_argument('--headless')
+  options.add_argument('--headless') if ENV['TEST_IN_BROWSER'].nil?
   options.add_argument('--no-sandbox')
   options.add_argument('--disable-gpu')
   options.add_argument('--disable-dev-shm-usage')
diff --git a/spec/support/database_cleaner.rb b/spec/support/database_cleaner.rb
index 1a17261e81..2a057ae701 100644
--- a/spec/support/database_cleaner.rb
+++ b/spec/support/database_cleaner.rb
@@ -1,21 +1,36 @@
 RSpec.configure do |config|
-  config.before(:suite) do
-    DatabaseCleaner[:active_record].clean_with(:truncation)
-  end
+  # config.before(:suite) do
+  #   DatabaseCleaner[:active_record].clean_with(:truncation)
+  # end
+  #
+  # config.before(:each) do
+  #   DatabaseCleaner[:active_record].strategy = :transaction
+  # end
+  #
+  # config.before(:each, js: true) do
+  #   DatabaseCleaner[:active_record].strategy = :truncation
+  # end
+  #
+  # config.before(:each) do
+  #   DatabaseCleaner[:active_record].start
+  # end
+  #
+  # config.after(:each) do
+  #   DatabaseCleaner[:active_record].clean
+  # end
 
-  config.before(:each) do
-    DatabaseCleaner[:active_record].strategy = :transaction
-  end
+  config.use_transactional_fixtures = false
 
-  config.before(:each, js: true) do
-    DatabaseCleaner[:active_record].strategy = :truncation
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
   end
 
   config.before(:each) do
-    DatabaseCleaner[:active_record].start
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.start
   end
 
-  config.after(:each) do
-    DatabaseCleaner[:active_record].clean
+  config.append_after(:each) do
+    DatabaseCleaner.clean
   end
 end
diff --git a/spec/unit/qae_form_builder_spec.rb b/spec/unit/qae_form_builder_spec.rb
index f44aae3e02..342e318b46 100644
--- a/spec/unit/qae_form_builder_spec.rb
+++ b/spec/unit/qae_form_builder_spec.rb
@@ -1,20 +1,20 @@
 require 'rails_helper'
 
-describe QAEFormBuilder do
+describe QaeFormBuilder do
 
-  it 'should build QAEFormBuilder::Form instances' do
-    empty = QAEFormBuilder.build 'test'
+  it 'should build QaeFormBuilder::Form instances' do
+    empty = QaeFormBuilder.build 'test'
     expect(empty.title).to eq('test')
-    expect(empty).to be_instance_of(QAEFormBuilder::QAEForm)
+    expect(empty).to be_instance_of(QaeFormBuilder::QaeForm)
   end
 
   it 'should build 0 steps for empty block' do
-    empty = QAEFormBuilder.build 'test'
+    empty = QaeFormBuilder.build 'test'
     expect(empty.steps).to eq([])
   end
 
   it 'should build form steps' do
-    sample = QAEFormBuilder.build 'test' do
+    sample = QaeFormBuilder.build 'test' do
       step 'Eligibility', 'El'
       step 'Company Info', 'CI'
       step 'Goods or Services', 'Goods', custom_option: :foo
@@ -27,7 +27,7 @@
   end
 
   it 'should build questions inside steps' do
-    sample = QAEFormBuilder.build 'test' do
+    sample = QaeFormBuilder.build 'test' do
       step 'Eligibility', 'El' do
         text :org_kind, 'What kind of organisation are you?'
         text :org_uk, 'Is your business based in UK?' do
@@ -48,7 +48,7 @@
   end
 
   it 'should navigate between steps with decorator' do
-    sample = QAEFormBuilder.build 'test' do
+    sample = QaeFormBuilder.build 'test' do
       step 'A', 'A'
       step 'B', 'B'
     end
@@ -67,7 +67,7 @@
   end
 
   it 'should report visible? depending on conditionals' do
-    sample = QAEFormBuilder.build 'test' do
+    sample = QaeFormBuilder.build 'test' do
       step 'test_step', 'test step' do
         options :parent, 'Parent' do
           yes_no
@@ -87,7 +87,7 @@
 
   describe "Drop conditions" do
     let(:sample) do
-      QAEFormBuilder.build 'test' do
+      QaeFormBuilder.build 'test' do
         step 'test_step', 'test step' do
           options :grandparent, 'Grand' do
             option '2 years', '2'
diff --git a/spec/validators/company_registration_number_validator_spec.rb b/spec/validators/company_registration_number_validator_spec.rb
index 23747c5382..da04accecf 100644
--- a/spec/validators/company_registration_number_validator_spec.rb
+++ b/spec/validators/company_registration_number_validator_spec.rb
@@ -15,7 +15,7 @@ def self.model_name
     end
   end
 
-  before(:each) do
+  before(:suite) do
     ActiveRecord::Base.connection.create_table :company_registration_number_validator_test do |t|
       t.string :registration_number
     end
diff --git a/spec/workers/hard_copy_generators/case_summary_worker_spec.rb b/spec/workers/hard_copy_generators/case_summary_worker_spec.rb
index c3e45c7953..15afdcf754 100644
--- a/spec/workers/hard_copy_generators/case_summary_worker_spec.rb
+++ b/spec/workers/hard_copy_generators/case_summary_worker_spec.rb
@@ -1,10 +1,10 @@
 require 'rails_helper'
 
-RSpec.describe HardCopyPdfGenerators::Aggregated::CaseSummaryWorker do
+RSpec.describe HardCopyPdfGenerators::CaseSummaryWorker do
   it 'should perform correctly' do
     form_answer = build_stubbed(:form_answer)
     expect(FormAnswer).to receive(:find).with(1) {form_answer}
-    expect(form_answer).to receive(:generate_case_summary_hard_copy_pdf!) 
+    expect(form_answer).to receive(:generate_case_summary_hard_copy_pdf!)
     described_class.new.perform(1)
   end
 end

From c5f438c9ed52b31b9249208c8c26af8ddfc156f2 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 26 Jun 2023 10:23:24 +0100
Subject: [PATCH 013/352] Change buildpack version to v1.10.2

---
 bin/deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/deploy b/bin/deploy
index db430326a4..fe9029022f 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -10,7 +10,7 @@ curl -X POST \
 $SLACK_WEBHOOK
 
 # Pin ruby buildpack
-export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.9.4"
+export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.2"
 
 cf create-app-manifest "$CF_APP"-worker
 cf push -f "$CF_APP"-worker_manifest.yml -b $CF_BUILDPACK

From a5675b49ef202cd29f69ed881ba9287ee8708e01 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Mon, 26 Jun 2023 16:04:14 +0400
Subject: [PATCH 014/352] Upgrade rails to 7 and ruby to 3.2.2

---
 .ruby-version                                 |   2 +-
 Gemfile                                       |  11 +-
 Gemfile.lock                                  | 161 +++++++++---------
 .../by_years_label_question.rb                |   2 +-
 .../qae_form_builder/by_years_question.rb     |   2 +-
 .../turnover_exports_calculation_question.rb  |   2 +-
 app/validators/file_size_validator.rb         |   2 +-
 bin/rails                                     |   6 +-
 bin/rake                                      |   4 +-
 bin/setup                                     |  46 +++--
 config/application.rb                         |  11 +-
 config/boot.rb                                |   5 +-
 config/cable.yml                              |  10 ++
 config/environment.rb                         |   2 +-
 config/environments/development.rb            |  83 ++++-----
 config/environments/test.rb                   |  35 ++--
 .../initializers/content_security_policy.rb   |  42 ++---
 config/initializers/inflections.rb            |   8 +-
 .../new_framework_defaults_7_0.rb             | 148 ++++++++++++++++
 config/initializers/paper_trail.rb            |   1 -
 config/initializers/permissions_policy.rb     |  11 ++
 db/schema.rb                                  |   2 +-
 spec/rails_helper.rb                          |   4 +
 yarn.lock                                     |   6 +-
 24 files changed, 399 insertions(+), 207 deletions(-)
 create mode 100644 config/cable.yml
 create mode 100644 config/initializers/new_framework_defaults_7_0.rb
 create mode 100644 config/initializers/permissions_policy.rb

diff --git a/.ruby-version b/.ruby-version
index 1f7da99d4e..be94e6f53d 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.7
+3.2.2
diff --git a/Gemfile b/Gemfile
index 020d73fd48..c94a711df0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,9 @@ source 'https://rubygems.org'
 
 git_source(:github) { |name| "https://github.com/#{name}.git" }
 
-ruby '~> 2.7.7'
+ruby '~> 3.2.2'
 
-gem 'rails', '6.1.7.3'
+gem 'rails', '7.0.5'
 gem 'websocket-extensions', '~> 0.1.5'
 
 # SSL redirect
@@ -14,7 +14,7 @@ gem 'rack-ssl-enforcer'
 gem 'pg'
 
 # Track Changes
-gem 'paper_trail', '~> 10.3'
+gem 'paper_trail', '~> 12.2.0'
 gem 'paper_trail-association_tracking'
 
 # Assets & Templates
@@ -30,7 +30,7 @@ gem 'govuk-components'
 gem 'uglifier', '>= 2.7.2'
 gem 'js_cookie_rails', '2.1.4'
 gem 'ckeditor'
-gem 'webpacker', '6.0.0.beta.7'
+gem 'webpacker', '6.0.0.rc.6'
 
 # Autolinking in admin mass user mailer
 gem 'rails_autolink'
@@ -38,7 +38,6 @@ gem 'rails_autolink'
 # Decorators & Exposing named methods
 gem 'draper', '~> 4.0'
 gem 'decent_exposure'
-gem 'decent_decoration'
 
 gem 'hashie', '~> 3.5'
 
@@ -49,7 +48,7 @@ gem 'responders', '~> 3.0'
 gem 'rails-html-sanitizer', '~> 1.4.4'
 
 # JSON
-gem 'json', '2.3.0'
+gem 'json'
 gem 'jbuilder', '~> 2.10.1'
 gem 'gon', '>= 6.4.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index fc5605f23f..0661bb38a8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -11,71 +11,77 @@ GEM
   specs:
     Ascii85 (1.1.0)
     CFPropertyList (2.3.6)
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.5)
+      actionpack (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activesupport (= 7.0.5)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.5)
+      actionview (= 7.0.5)
+      activesupport (= 7.0.5)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (7.0.5)
+      actionpack (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (7.0.5)
+      activesupport (= 7.0.5)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
     active_hash (3.1.1)
       activesupport (>= 5.0.0)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (7.0.5)
+      activesupport (= 7.0.5)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (7.0.5)
+      activesupport (= 7.0.5)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activerecord (7.0.5)
+      activemodel (= 7.0.5)
+      activesupport (= 7.0.5)
+    activestorage (7.0.5)
+      actionpack (= 7.0.5)
+      activejob (= 7.0.5)
+      activerecord (= 7.0.5)
+      activesupport (= 7.0.5)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.3)
+    activesupport (7.0.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
@@ -162,8 +168,6 @@ GEM
     database_cleaner-core (2.0.1)
     date (3.3.3)
     debug_inspector (1.1.0)
-    decent_decoration (0.1.0)
-      decent_exposure (~> 3.0)
     decent_exposure (3.0.4)
       activesupport (>= 4.0)
     descendants_tracker (0.0.4)
@@ -420,7 +424,7 @@ GEM
     http-cookie (1.0.5)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.13.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     ice_nine (0.11.2)
@@ -435,7 +439,7 @@ GEM
       railties (>= 3.2.16)
     js_cookie_rails (2.1.4)
       railties (>= 3.1)
-    json (2.3.0)
+    json (2.6.3)
     jwt (2.7.0)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
@@ -461,9 +465,9 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.20.0)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -484,7 +488,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    minitest (5.18.0)
+    minitest (5.18.1)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     multi_json (1.15.0)
@@ -505,11 +509,11 @@ GEM
       activerecord (>= 4.0.0)
       activesupport (>= 4.0.0)
     nio4r (2.5.9)
-    nokogiri (1.14.3-arm64-darwin)
+    nokogiri (1.15.2-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-darwin)
+    nokogiri (1.15.2-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.3-x86_64-linux)
+    nokogiri (1.15.2-x86_64-linux)
       racc (~> 1.4)
     notifications-ruby-client (5.4.0)
       jwt (>= 1.5, < 3)
@@ -518,11 +522,11 @@ GEM
     ovirt-engine-sdk (4.4.1)
       json (>= 1, < 3)
     pagy (6.0.4)
-    paper_trail (10.3.1)
-      activerecord (>= 4.2)
+    paper_trail (12.2.0)
+      activerecord (>= 5.2)
       request_store (~> 1.1)
-    paper_trail-association_tracking (2.1.3)
-      paper_trail (< 12.0)
+    paper_trail-association_tracking (2.2.1)
+      paper_trail (>= 12.0)
     parallel (1.23.0)
     parser (3.2.2.1)
       ast (~> 2.4.1)
@@ -570,7 +574,7 @@ GEM
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
     raabro (1.4.0)
-    racc (1.6.2)
+    racc (1.7.1)
     rack (2.2.7)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -583,21 +587,20 @@ GEM
     rack-ssl-enforcer (0.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (7.0.5)
+      actioncable (= 7.0.5)
+      actionmailbox (= 7.0.5)
+      actionmailer (= 7.0.5)
+      actionpack (= 7.0.5)
+      actiontext (= 7.0.5)
+      actionview (= 7.0.5)
+      activejob (= 7.0.5)
+      activemodel (= 7.0.5)
+      activerecord (= 7.0.5)
+      activestorage (= 7.0.5)
+      activesupport (= 7.0.5)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.5)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -619,12 +622,13 @@ GEM
       railties (> 3.1)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    railties (7.0.5)
+      actionpack (= 7.0.5)
+      activesupport (= 7.0.5)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
@@ -778,7 +782,7 @@ GEM
     ssrf_filter (1.0.8)
     statesman (3.5.0)
     temple (0.8.2)
-    thor (1.2.1)
+    thor (1.2.2)
     thread_safe (0.3.6)
     tilt (2.0.11)
     timecop (0.9.6)
@@ -818,7 +822,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff
-    webpacker (6.0.0.beta.7)
+    webpacker (6.0.0.rc.6)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
@@ -860,7 +864,6 @@ DEPENDENCIES
   country_select (~> 3.1)
   curb (= 0.9.10)
   database_cleaner-active_record
-  decent_decoration
   decent_exposure
   devise (~> 4.7)
   devise-authy (>= 1.10.0)
@@ -880,7 +883,7 @@ DEPENDENCIES
   jquery-rails (= 4.4.0)
   jquery-ui-rails (= 6.0.1)
   js_cookie_rails (= 2.1.4)
-  json (= 2.3.0)
+  json
   kaminari
   launchy
   letter_opener
@@ -889,7 +892,7 @@ DEPENDENCIES
   mail-notify (~> 1.0)
   nilify_blanks
   nokogiri
-  paper_trail (~> 10.3)
+  paper_trail (~> 12.2.0)
   paper_trail-association_tracking
   pdf-inspector
   pg
@@ -905,7 +908,7 @@ DEPENDENCIES
   rack-mini-profiler (>= 0.10.1)
   rack-protection (= 3.0.5)
   rack-ssl-enforcer
-  rails (= 6.1.7.3)
+  rails (= 7.0.5)
   rails-controller-testing
   rails-healthcheck
   rails-html-sanitizer (~> 1.4.4)
@@ -942,12 +945,12 @@ DEPENDENCIES
   vigilion-rails (~> 2.2.0)
   virtus
   webmock (= 3.5.0)
-  webpacker (= 6.0.0.beta.7)
+  webpacker (= 6.0.0.rc.6)
   websocket-extensions (~> 0.1.5)
   wicked (~> 1.1)
 
 RUBY VERSION
-   ruby 2.7.7p221
+   ruby 3.2.2p53
 
 BUNDLED WITH
    2.4.4
diff --git a/app/forms/qae_form_builder/by_years_label_question.rb b/app/forms/qae_form_builder/by_years_label_question.rb
index c1b0d1362c..72aa117ffb 100644
--- a/app/forms/qae_form_builder/by_years_label_question.rb
+++ b/app/forms/qae_form_builder/by_years_label_question.rb
@@ -113,7 +113,7 @@ def label label
     end
 
     def by_year_condition k, v, num, options = {}
-      @q.by_year_conditions << ByYearsCondition.new(k, v, num, options)
+      @q.by_year_conditions << ByYearsCondition.new(k, v, num, **options)
     end
   end
 
diff --git a/app/forms/qae_form_builder/by_years_question.rb b/app/forms/qae_form_builder/by_years_question.rb
index f4cc2072be..39333c0943 100644
--- a/app/forms/qae_form_builder/by_years_question.rb
+++ b/app/forms/qae_form_builder/by_years_question.rb
@@ -75,7 +75,7 @@ def label label
     end
 
     def by_year_condition k, v, num, options = {}
-      @q.by_year_conditions << ByYearsCondition.new(k, v, num, options)
+      @q.by_year_conditions << ByYearsCondition.new(k, v, num, **options)
     end
 
     def employees_question
diff --git a/app/forms/qae_form_builder/turnover_exports_calculation_question.rb b/app/forms/qae_form_builder/turnover_exports_calculation_question.rb
index 5d326921bb..2bf3f48b3e 100644
--- a/app/forms/qae_form_builder/turnover_exports_calculation_question.rb
+++ b/app/forms/qae_form_builder/turnover_exports_calculation_question.rb
@@ -35,7 +35,7 @@ def label label
     end
 
     def by_year_condition k, v, num, options = {}
-      @q.by_year_conditions << ByYearsCondition.new(k, v, num, options)
+      @q.by_year_conditions << ByYearsCondition.new(k, v, num, **options)
     end
 
     def turnover key
diff --git a/app/validators/file_size_validator.rb b/app/validators/file_size_validator.rb
index a2f7293399..fad3ec6d32 100644
--- a/app/validators/file_size_validator.rb
+++ b/app/validators/file_size_validator.rb
@@ -56,7 +56,7 @@ def validate_each(record, attribute, value)
       default_message = options[MESSAGES[key]]
       errors_options[:message] ||= default_message if default_message
 
-      record.errors.add(attribute, MESSAGES[key], errors_options)
+      record.errors.add(attribute, MESSAGES[key], **errors_options)
     end
   end
 
diff --git a/bin/rails b/bin/rails
index 0739660237..efc0377492 100755
--- a/bin/rails
+++ b/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../config/application', __dir__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../config/application", __dir__)
+require_relative "../config/boot"
+require "rails/commands"
diff --git a/bin/rake b/bin/rake
index 17240489f6..4fbf10b960 100755
--- a/bin/rake
+++ b/bin/rake
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run
diff --git a/bin/setup b/bin/setup
index bc40207616..ec47b79b3b 100755
--- a/bin/setup
+++ b/bin/setup
@@ -1,23 +1,33 @@
-#!/usr/bin/env sh
+#!/usr/bin/env ruby
+require "fileutils"
 
-# Set up Ruby dependencies via Bundler
-if ! command -v bundle > /dev/null; then
-  gem install bundler --no-document
-fi
+# path to your application root.
+APP_ROOT = File.expand_path("..", __dir__)
 
-bundle install
+def system!(*args)
+  system(*args) || abort("\n== Command #{args} failed ==")
+end
 
-# Set up the database
-bundle exec rake db:setup
+FileUtils.chdir APP_ROOT do
+  # This script is a way to set up or update your development environment automatically.
+  # This script is idempotent, so that you can run it at any time and get an expectable outcome.
+  # Add necessary setup steps to this file.
 
-# Set up configurable environment variables
-if [ ! -f .env ]; then
-  cp .env.example .env
-fi
+  puts "== Installing dependencies =="
+  system! "gem install bundler --conservative"
+  system("bundle check") || system!("bundle install")
 
-# Pick a port for Foreman
-if ! command -v foreman > /dev/null; then
-  printf 'Foreman is not installed.\n'
-  printf 'See https://github.com/ddollar/foreman for install instructions.\n'
-  exit 1
-fi
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   FileUtils.cp "config/database.yml.sample", "config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system! "bin/rails db:prepare"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system! "bin/rails log:clear tmp:clear"
+
+  puts "\n== Restarting application server =="
+  system! "bin/rails restart"
+end
diff --git a/config/application.rb b/config/application.rb
index 7c8dccf970..12470ed95f 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -9,7 +9,7 @@
 
 module Qae
   class Application < Rails::Application
-    config.load_defaults 6.1
+    config.load_defaults 7.0
 
     #initializer :regenerate_require_cache, before: :load_environment_config do
     #  Bootscale.regenerate
@@ -43,8 +43,13 @@ class Application < Rails::Application
     #NOTE: This works like Rails 4. For Rails 5, we can use
     # `config.eager_load_paths << Rails.root.join('lib')` but still it is not recommended for Threadsafty.
     # Need to take look in to it.
-    config.enable_dependency_loading = true
-    config.autoload_paths << Rails.root.join('lib')
+    # config.enable_dependency_loading = true
+
+    # config.add_autoload_paths_to_load_path=false
+    # config.eager_load = false
+    config.autoload_once_paths << "#{root}/lib"
+    config.autoload_paths << "#{root}/lib"
+    config.eager_load_paths << "#{root}/lib"
 
     config.generators do |g|
       g.test_framework :rspec
diff --git a/config/boot.rb b/config/boot.rb
index 13b9376d85..282011619d 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,4 +1,3 @@
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
 
-require 'bundler/setup' # Set up gems listed in the Gemfile.
-#require 'bootscale/setup'
+require "bundler/setup" # Set up gems listed in the Gemfile.
diff --git a/config/cable.yml b/config/cable.yml
new file mode 100644
index 0000000000..48d02bebc8
--- /dev/null
+++ b/config/cable.yml
@@ -0,0 +1,10 @@
+development:
+  adapter: async
+
+test:
+  adapter: test
+
+production:
+  adapter: redis
+  url: <%= ENV.fetch("REDIS_URL") { "redis://localhost:6379/1" } %>
+  channel_prefix: qae_production
diff --git a/config/environment.rb b/config/environment.rb
index 426333bb46..cac5315775 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -1,5 +1,5 @@
 # Load the Rails application.
-require_relative 'application'
+require_relative "application"
 
 # Initialize the Rails application.
 Rails.application.initialize!
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 70822fe7b7..8500f459a8 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -1,8 +1,10 @@
+require "active_support/core_ext/integer/time"
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # In the development environment your application's code is reloaded on
-  # every request. This slows down response time but is perfect for development
+  # In the development environment your application's code is reloaded any time
+  # it changes. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -11,69 +13,58 @@
 
   # Show full error reports.
   config.consider_all_requests_local = true
-  config.action_controller.perform_caching = true
+
+  # Enable server timing
+  config.server_timing = true
 
   # Enable/disable caching. By default caching is disabled.
   # Run rails dev:cache to toggle caching.
-  # if Rails.root.join('tmp', 'caching-dev.txt').exist?
-  #   config.cache_store = :memory_store
-  #   config.public_file_server.headers = {
-  #     'Cache-Control' => "public, max-age=#{2.days.to_i}"
-  #   }
-  # else
-  #   config.cache_store = :null_store
-  # end
-
-  # Store uploaded files on the local file system (see config/storage.yml for options)
+  if Rails.root.join("tmp/caching-dev.txt").exist?
+    config.action_controller.perform_caching = true
+    config.action_controller.enable_fragment_cache_logging = true
+
+    config.cache_store = :memory_store
+    config.public_file_server.headers = {
+      "Cache-Control" => "public, max-age=#{2.days.to_i}"
+    }
+  else
+    config.action_controller.perform_caching = false
+
+    config.cache_store = :null_store
+  end
+
+  # Store uploaded files on the local file system (see config/storage.yml for options).
   config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = true
+  config.action_mailer.raise_delivery_errors = false
+
+  config.action_mailer.perform_caching = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
   # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
-  # Do not compress assets.
-  config.assets.compress = false
-
   # Highlight code that triggered database queries in logs.
   config.active_record.verbose_query_logs = true
 
-  # Debug mode disables concatenation and preprocessing of assets.
-  # This option may cause significant delays in view rendering with a large
-  # number of complex assets.
-  config.assets.debug = true
-
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
-  # Adds additional error checking when serving assets at runtime.
-  # Checks for improperly declared sprockets dependencies.
-  # Raises helpful error messages.
-  config.assets.raise_runtime_errors = true
-
-  config.action_mailer.default_url_options = { host: ENV['MAILER_HOST'], port: 3000 }
-  config.action_mailer.asset_host = "https://#{ENV['ASSET_HOST']}"
-  config.action_mailer.delivery_method = :letter_opener
-  # config.action_mailer.delivery_method = :notify
-  # config.action_mailer.notify_settings = {
-  #   api_key: ENV['GOV_UK_NOTIFY_API_KEY']
-  # }
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
-
-  # configure the devise email layout
-  # config.to_prepare { Devise::Mailer.layout "mailer" }
-
-  # Configure Rails.logger to log to both STDOUT and development.log file.
-  config.log_level = :debug
+  # Raises error for missing translations.
+  # config.i18n.raise_on_missing_translations = true
 
-  # Use an evented file watcher to asynchronously detect changes in source code,
-  # routes, locales, etc. This feature depends on the listen gem.
-  # config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
-  config.action_view.annotate_rendered_view_with_filenames = true
+  # Uncomment if you wish to allow Action Cable access from any origin.
+  # config.action_cable.disable_request_forgery_protection = true
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index ca01793873..9df275e5f2 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -1,21 +1,25 @@
+require "active_support/core_ext/integer/time"
+
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
+  # Turn false under Spring and add config.action_view.cache_template_loading = true.
   config.cache_classes = true
 
-  # Do not eager load code on boot. This avoids loading your whole application
-  # just for the purpose of running a single test. If you are using a tool that
-  # preloads Rails for running tests, you may have to set it to true.
+  # Eager loading loads your whole application. When running a single test locally,
+  # this probably isn't necessary. It's a good idea to do in a continuous integration
+  # system, or in some way before deploying your code.
   config.eager_load = false
 
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
+    "Cache-Control" => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.
@@ -28,7 +32,7 @@
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
 
-  # Store uploaded files on the local file system in a temporary directory
+  # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
   config.action_mailer.perform_caching = false
@@ -43,8 +47,17 @@
   config.action_mailer.default_url_options = { host: "example.com" }  # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # Raise exceptions for disallowed deprecations.
+  config.active_support.disallowed_deprecation = :raise
+
+  # Tell Active Support which deprecation messages to disallow.
+  config.active_support.disallowed_deprecation_warnings = []
+
+  # Raises error for missing translations.
+  # config.i18n.raise_on_missing_translations = true
+
+  # Annotate rendered view with file names.
+  # config.action_view.annotate_rendered_view_with_filenames = true
 
   config.active_job.queue_adapter = :test
   config.cache_store = :null_store
diff --git a/config/initializers/content_security_policy.rb b/config/initializers/content_security_policy.rb
index d3bcaa5ec8..54f47cf15f 100644
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,25 +1,25 @@
 # Be sure to restart your server when you modify this file.
 
-# Define an application-wide content security policy
-# For further information see the following documentation
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+# Define an application-wide content security policy.
+# See the Securing Rails Applications Guide for more information:
+# https://guides.rubyonrails.org/security.html#content-security-policy-header
 
-# Rails.application.config.content_security_policy do |policy|
-#   policy.default_src :self, :https
-#   policy.font_src    :self, :https, :data
-#   policy.img_src     :self, :https, :data
-#   policy.object_src  :none
-#   policy.script_src  :self, :https
-#   policy.style_src   :self, :https
-
-#   # Specify URI for violation reports
-#   # policy.report_uri "/csp-violation-report-endpoint"
+# Rails.application.configure do
+#   config.content_security_policy do |policy|
+#     policy.default_src :self, :https
+#     policy.font_src    :self, :https, :data
+#     policy.img_src     :self, :https, :data
+#     policy.object_src  :none
+#     policy.script_src  :self, :https
+#     policy.style_src   :self, :https
+#     # Specify URI for violation reports
+#     # policy.report_uri "/csp-violation-report-endpoint"
+#   end
+#
+#   # Generate session nonces for permitted importmap and inline scripts
+#   config.content_security_policy_nonce_generator = ->(request) { request.session.id.to_s }
+#   config.content_security_policy_nonce_directives = %w(script-src)
+#
+#   # Report violations without enforcing the policy.
+#   # config.content_security_policy_report_only = true
 # end
-
-# If you are using UJS then enable automatic nonce generation
-# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
-
-# Report CSP violations to a specified URI
-# For further information see the following documentation:
-# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
-# Rails.application.config.content_security_policy_report_only = true
diff --git a/config/initializers/inflections.rb b/config/initializers/inflections.rb
index ac033bf9dc..3860f659ea 100644
--- a/config/initializers/inflections.rb
+++ b/config/initializers/inflections.rb
@@ -4,13 +4,13 @@
 # are locale specific, and you may define rules for as many different
 # locales as you wish. All of these examples are active by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
+#   inflect.plural /^(ox)$/i, "\\1en"
+#   inflect.singular /^(ox)en/i, "\\1"
+#   inflect.irregular "person", "people"
 #   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
 # ActiveSupport::Inflector.inflections(:en) do |inflect|
-#   inflect.acronym 'RESTful'
+#   inflect.acronym "RESTful"
 # end
diff --git a/config/initializers/new_framework_defaults_7_0.rb b/config/initializers/new_framework_defaults_7_0.rb
new file mode 100644
index 0000000000..0f8d420541
--- /dev/null
+++ b/config/initializers/new_framework_defaults_7_0.rb
@@ -0,0 +1,148 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file eases your Rails 7.0 framework defaults upgrade.
+#
+# Uncomment each configuration one by one to switch to the new default.
+# Once your application is ready to run with all new defaults, you can remove
+# this file and set the `config.load_defaults` to `7.0`.
+#
+# Read the Guide for Upgrading Ruby on Rails for more info on each option.
+# https://guides.rubyonrails.org/upgrading_ruby_on_rails.html
+
+# `button_to` view helper will render `<button>` element, regardless of whether
+# or not the content is passed as the first argument or as a block.
+# Rails.application.config.action_view.button_to_generates_button_tag = true
+
+# `stylesheet_link_tag` view helper will not render the media attribute by default.
+# Rails.application.config.action_view.apply_stylesheet_media_default = false
+
+# Change the digest class for the key generators to `OpenSSL::Digest::SHA256`.
+# Changing this default means invalidate all encrypted messages generated by
+# your application and, all the encrypted cookies. Only change this after you
+# rotated all the messages using the key rotator.
+#
+# See upgrading guide for more information on how to build a rotator.
+# https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html
+# Rails.application.config.active_support.key_generator_hash_digest_class = OpenSSL::Digest::SHA256
+
+# Change the digest class for ActiveSupport::Digest.
+# Changing this default means that for example Etags change and
+# various cache keys leading to cache invalidation.
+# Rails.application.config.active_support.hash_digest_class = OpenSSL::Digest::SHA256
+
+# Don't override ActiveSupport::TimeWithZone.name and use the default Ruby
+# implementation.
+# Rails.application.config.active_support.remove_deprecated_time_with_zone_name = true
+
+# Calls `Rails.application.executor.wrap` around test cases.
+# This makes test cases behave closer to an actual request or job.
+# Several features that are normally disabled in test, such as Active Record query cache
+# and asynchronous queries will then be enabled.
+# Rails.application.config.active_support.executor_around_test_case = true
+
+# Define the isolation level of most of Rails internal state.
+# If you use a fiber based server or job processor, you should set it to `:fiber`.
+# Otherwise the default of `:thread` if preferable.
+# Rails.application.config.active_support.isolation_level = :thread
+
+# Set both the `:open_timeout` and `:read_timeout` values for `:smtp` delivery method.
+# Rails.application.config.action_mailer.smtp_timeout = 5
+
+# The ActiveStorage video previewer will now use scene change detection to generate
+# better preview images (rather than the previous default of using the first frame
+# of the video).
+# Rails.application.config.active_storage.video_preview_arguments =
+#   "-vf 'select=eq(n\\,0)+eq(key\\,1)+gt(scene\\,0.015),loop=loop=-1:size=2,trim=start_frame=1' -frames:v 1 -f image2"
+
+# Automatically infer `inverse_of` for associations with a scope.
+# Rails.application.config.active_record.automatic_scope_inversing = true
+
+# Raise when running tests if fixtures contained foreign key violations
+# Rails.application.config.active_record.verify_foreign_keys_for_fixtures = true
+
+# Disable partial inserts.
+# This default means that all columns will be referenced in INSERT queries
+# regardless of whether they have a default or not.
+# Rails.application.config.active_record.partial_inserts = false
+
+# Protect from open redirect attacks in `redirect_back_or_to` and `redirect_to`.
+# Rails.application.config.action_controller.raise_on_open_redirects = true
+
+# Change the variant processor for Active Storage.
+# Changing this default means updating all places in your code that
+# generate variants to use image processing macros and ruby-vips
+# operations. See the upgrading guide for detail on the changes required.
+# The `:mini_magick` option is not deprecated; it's fine to keep using it.
+# Rails.application.config.active_storage.variant_processor = :vips
+
+# Enable parameter wrapping for JSON.
+# Previously this was set in an initializer. It's fine to keep using that initializer if you've customized it.
+# To disable parameter wrapping entirely, set this config to `false`.
+# Rails.application.config.action_controller.wrap_parameters_by_default = true
+
+# Specifies whether generated namespaced UUIDs follow the RFC 4122 standard for namespace IDs provided as a
+# `String` to `Digest::UUID.uuid_v3` or `Digest::UUID.uuid_v5` method calls.
+#
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-use-rfc4122-namespaced-uuids for
+# more information.
+# Rails.application.config.active_support.use_rfc4122_namespaced_uuids = true
+
+# Change the default headers to disable browsers' flawed legacy XSS protection.
+# Rails.application.config.action_dispatch.default_headers = {
+#   "X-Frame-Options" => "SAMEORIGIN",
+#   "X-XSS-Protection" => "0",
+#   "X-Content-Type-Options" => "nosniff",
+#   "X-Download-Options" => "noopen",
+#   "X-Permitted-Cross-Domain-Policies" => "none",
+#   "Referrer-Policy" => "strict-origin-when-cross-origin"
+# }
+
+
+# ** Please read carefully, this must be configured in config/application.rb **
+# Change the format of the cache entry.
+# Changing this default means that all new cache entries added to the cache
+# will have a different format that is not supported by Rails 6.1 applications.
+# Only change this value after your application is fully deployed to Rails 7.0
+# and you have no plans to rollback.
+# When you're ready to change format, add this to `config/application.rb` (NOT this file):
+#  config.active_support.cache_format_version = 7.0
+
+
+# Cookie serializer: 2 options
+#
+# If you're upgrading and haven't set `cookies_serializer` previously, your cookie serializer
+# is `:marshal`. The default for new apps is `:json`.
+#
+# Rails.application.config.action_dispatch.cookies_serializer = :json
+#
+#
+# To migrate an existing application to the `:json` serializer, use the `:hybrid` option.
+#
+# Rails transparently deserializes existing (Marshal-serialized) cookies on read and
+# re-writes them in the JSON format.
+#
+# It is fine to use `:hybrid` long term; you should do that until you're confident *all* your cookies
+# have been converted to JSON. To keep using `:hybrid` long term, move this config to its own
+# initializer or to `config/application.rb`.
+#
+# Rails.application.config.action_dispatch.cookies_serializer = :hybrid
+#
+#
+# If your cookies can't yet be serialized to JSON, keep using `:marshal` for backward-compatibility.
+#
+# If you have configured the serializer elsewhere, you can remove this section of the file.
+#
+# See https://guides.rubyonrails.org/action_controller_overview.html#cookies for more information.
+
+# Change the return value of `ActionDispatch::Request#content_type` to the Content-Type header without modification.
+# Rails.application.config.action_dispatch.return_only_request_media_type_on_content_type = false
+
+# Active Storage `has_many_attached` relationships will default to replacing the current collection instead of appending to it.
+# Thus, to support submitting an empty collection, the `file_field` helper will render an hidden field `include_hidden` by default when `multiple_file_field_include_hidden` is set to `true`.
+# See https://guides.rubyonrails.org/configuring.html#config-active-storage-multiple-file-field-include-hidden for more information.
+# Rails.application.config.active_storage.multiple_file_field_include_hidden = true
+
+# ** Please read carefully, this must be configured in config/application.rb (NOT this file) **
+# Disables the deprecated #to_s override in some Ruby core classes
+# See https://guides.rubyonrails.org/configuring.html#config-active-support-disable-to-s-conversion for more information.
+# config.active_support.disable_to_s_conversion = true
diff --git a/config/initializers/paper_trail.rb b/config/initializers/paper_trail.rb
index 2aa79f16c8..76908386ec 100644
--- a/config/initializers/paper_trail.rb
+++ b/config/initializers/paper_trail.rb
@@ -1,3 +1,2 @@
 PaperTrail.config.track_associations = false
-PaperTrail::Rails::Engine.eager_load!
 PaperTrail.serializer = PaperTrail::Serializers::JSON
diff --git a/config/initializers/permissions_policy.rb b/config/initializers/permissions_policy.rb
new file mode 100644
index 0000000000..00f64d71b0
--- /dev/null
+++ b/config/initializers/permissions_policy.rb
@@ -0,0 +1,11 @@
+# Define an application-wide HTTP permissions policy. For further
+# information see https://developers.google.com/web/updates/2018/06/feature-policy
+#
+# Rails.application.config.permissions_policy do |f|
+#   f.camera      :none
+#   f.gyroscope   :none
+#   f.microphone  :none
+#   f.usb         :none
+#   f.fullscreen  :self
+#   f.payment     :self, "https://secure.example.com"
+# end
diff --git a/db/schema.rb b/db/schema.rb
index bb1103ce5c..4790033dfb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160607172315) do
+ActiveRecord::Schema[6.1].define(version: 20160607172315) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index a72a503d39..053643b551 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -82,6 +82,10 @@ def matches?(source_file)
 ActiveRecord::Migration.maintain_test_schema!
 Qae::Application.load_tasks
 
+RSpec::Sidekiq.configure do |config|
+  config.warn_when_jobs_not_processed_by_sidekiq = false
+end
+
 RSpec.configure do |config|
   config.include FactoryBot::Syntax::Methods
   config.include UserStepDefinitions, type: :feature
diff --git a/yarn.lock b/yarn.lock
index cc285272ee..e13a8e9d6a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1710,9 +1710,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001366:
-  version "1.0.30001366"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001366.tgz#c73352c83830a9eaf2dea0ff71fb4b9a4bbaa89c"
-  integrity sha512-yy7XLWCubDobokgzudpkKux8e0UOOnLHE6mlNJBzT3lZJz6s5atSEzjoL+fsCPkI0G8MP5uVdDx1ur/fXEWkZA==
+  version "1.0.30001508"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001508.tgz"
+  integrity sha512-sdQZOJdmt3GJs1UMNpCCCyeuS2IEGLXnHyAo9yIO5JJDjbjoVRij4M1qep6P6gFpptD1PqIYgzM+gwJbOi92mw==
 
 caseless@~0.12.0:
   version "0.12.0"

From 92573e1f179c9050293a88b8322702f2b4b4f994 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Mon, 26 Jun 2023 16:18:19 +0400
Subject: [PATCH 015/352] fix typo

---
 app/views/layouts/govuk_template.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/govuk_template.html.erb b/app/views/layouts/govuk_template.html.erb
index fce0c17c7e..4b49a209d2 100644
--- a/app/views/layouts/govuk_template.html.erb
+++ b/app/views/layouts/govuk_template.html.erb
@@ -33,7 +33,7 @@
 
     <%= stylesheet_pack_tag 'application' %>
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= image_url('favicon.ico', skip_pipeline: true) %>]" type="image/x-icon">
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= image_url('favicon.ico', skip_pipeline: true) %>" type="image/x-icon">
     <link rel="mask-icon" href="<%= image_url('govuk-mask-icon.svg', skip_pipeline: true) %>]" color="blue">
     <link rel="apple-touch-icon" sizes="180x180" href="<%= image_url('govuk-apple-touch-icon-180x180.png', skip_pipeline: true) %>]">
     <link rel="apple-touch-icon" sizes="167x167" href="<%= image_url('govuk-apple-touch-icon-167x167.png', skip_pipeline: true) %>]">

From cca9155e2019e467c25899eb7979efea5a052948 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Tue, 27 Jun 2023 10:27:24 +0200
Subject: [PATCH 016/352] rename the reports, fix scoping

---
 app/models/reports/admin_report.rb            |  2 +-
 app/models/reports/case_index_report.rb       | 24 ++++++++++++-------
 .../dashboard/downloads/_case_index.html.slim |  2 +-
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/app/models/reports/admin_report.rb b/app/models/reports/admin_report.rb
index a5878d8c49..6b008bd571 100644
--- a/app/models/reports/admin_report.rb
+++ b/app/models/reports/admin_report.rb
@@ -16,7 +16,7 @@ def as_csv
     when "cases-status"
       Reports::CasesStatusReport.new(year).stream
     when "case-index"
-      Reports::CaseIndexReport.new(year).stream
+      Reports::CaseIndexReport.new(year, category: category, years_mode: params[:years_mode]).stream
     when "entries-report"
       Reports::AllEntries.new(year).stream
     when "discrepancies_between_primary_and_secondary_appraisals"
diff --git a/app/models/reports/case_index_report.rb b/app/models/reports/case_index_report.rb
index 9b923b5491..431ccd7dba 100644
--- a/app/models/reports/case_index_report.rb
+++ b/app/models/reports/case_index_report.rb
@@ -44,20 +44,16 @@ class Reports::CaseIndexReport
     }
   ]
 
-  def initialize(year)
+  def initialize(year, options = {})
     @year = year
+    @category = options[:category]
+    @years_mode = options[:years_mode]
   end
 
   def build
     prepare_response(scoped_collection)
   end
 
-  def build_for_lead(current_subject)
-    scoped = scoped_collection.where(award_type: current_subject.categories_as_lead)
-
-    prepare_response(scoped)
-  end
-
   def stream
     prepare_stream(scoped_collection)
   end
@@ -65,8 +61,18 @@ def stream
   private
 
   def scoped_collection
-    @year.form_answers.submitted
-                      .order(:sic_code)
+    scope = @year.form_answers
+      .shortlisted
+      .where(award_type: @category)
+      .order(:sic_code)
+
+    if @category == "trade"
+      years_mode_query = @years_mode.to_s == '3' ? '3 to 5' : '6 plus'
+
+      scope = scope.where("form_answers.document #>> '{trade_commercial_success}' = '#{years_mode_query}'")
+    end
+
+    scope
   end
 
   def mapping
diff --git a/app/views/admin/dashboard/downloads/_case_index.html.slim b/app/views/admin/dashboard/downloads/_case_index.html.slim
index 9e1525af76..fbc45a11bd 100644
--- a/app/views/admin/dashboard/downloads/_case_index.html.slim
+++ b/app/views/admin/dashboard/downloads/_case_index.html.slim
@@ -1,5 +1,5 @@
 h3
-  ' Case Index
+  ' Case Indexes
 ul.download-list
   - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|
     - next if key.to_s == "promotion" && hide_promotion?

From 0ccd5eb53c12739c8357f295f4cb92cd53970917 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Tue, 27 Jun 2023 10:17:42 +0200
Subject: [PATCH 017/352] add keyboard controls to admin filters

---
 .../admin/applications-filter.js.coffee       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/app/assets/javascripts/admin/applications-filter.js.coffee b/app/assets/javascripts/admin/applications-filter.js.coffee
index df455e6264..e73a4b6a69 100644
--- a/app/assets/javascripts/admin/applications-filter.js.coffee
+++ b/app/assets/javascripts/admin/applications-filter.js.coffee
@@ -1,6 +1,34 @@
 ready = ->
   filterApplicationsDropdowns()
 
+  # processing arrow keys in admin dropdowns
+  $(document).on "keydown", (e) ->
+    return unless $(".dropdown.open").length > 0
+
+    select = $(".dropdown.open").first()
+
+    if e.keyCode == 40
+      e.preventDefault()
+      e.stopPropagation()
+
+      if $(".dropdown-menu li.checkbox input:focus", select).length is 0
+        $(".dropdown-menu li.checkbox input", select)[0].focus()
+      else
+        element = $(".dropdown-menu li.checkbox input:focus", select).closest("li")
+        next_element = element.next()
+        $("input", next_element).focus()
+
+    if e.keyCode == 38
+      e.preventDefault()
+      e.stopPropagation()
+
+      if $(".dropdown-menu li.checkbox input:focus", select).length is 0
+        $(".dropdown-menu li.checkbox input", select).last().focus()
+      else
+        element = $(".dropdown-menu li.checkbox input:focus", select).closest("li")
+        prev_element = element.prev()
+        $("input", prev_element).focus()
+
 filterApplicationsDropdowns = () ->
   # Change the checked value on dropbox and the filtered text
   $(".applications-filter .dropdown-menu").each () ->
@@ -29,6 +57,7 @@ filterApplicationsDropdowns = () ->
       $(this).find("label[data-value='select_all'] input").attr('checked', 'checked')
       $(this).closest(".dropdown").find(".text-filter").text("All")
 
+
   $(".applications-filter .dropdown-toggle").on "click", (e) ->
     e.preventDefault()
     e.stopPropagation()

From 13b46937aa36ae7dc64291343ba92149325866b0 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 28 Jun 2023 14:21:39 +0400
Subject: [PATCH 018/352] Comment unused image links

---
 app/views/layouts/govuk_template.html.erb | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/govuk_template.html.erb b/app/views/layouts/govuk_template.html.erb
index 4b49a209d2..2e35de9681 100644
--- a/app/views/layouts/govuk_template.html.erb
+++ b/app/views/layouts/govuk_template.html.erb
@@ -33,12 +33,13 @@
 
     <%= stylesheet_pack_tag 'application' %>
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%= image_url('favicon.ico', skip_pipeline: true) %>" type="image/x-icon">
-    <link rel="mask-icon" href="<%= image_url('govuk-mask-icon.svg', skip_pipeline: true) %>]" color="blue">
-    <link rel="apple-touch-icon" sizes="180x180" href="<%= image_url('govuk-apple-touch-icon-180x180.png', skip_pipeline: true) %>]">
-    <link rel="apple-touch-icon" sizes="167x167" href="<%= image_url('govuk-apple-touch-icon-167x167.png', skip_pipeline: true) %>]">
-    <link rel="apple-touch-icon" sizes="152x152" href="<%= image_url('govuk-apple-touch-icon-152x152.png', skip_pipeline: true) %>]">
-    <link rel="apple-touch-icon" href="<%= image_url('govuk-apple-touch-icon.png', skip_pipeline: true) %>]">
+    <!--    TODO: There were wrong links. It looks like we don't use them-->
+    <!--    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="<%#= image_url('favicon.ico', skip_pipeline: true) %>" type="image/x-icon">-->
+    <!--    <link rel="mask-icon" href="<%#= image_url('govuk-mask-icon.svg', skip_pipeline: true) %>" color="blue">-->
+    <!--    <link rel="apple-touch-icon" sizes="180x180" href="<%#= image_url('govuk-apple-touch-icon-180x180.png', skip_pipeline: true) %>">-->
+    <!--    <link rel="apple-touch-icon" sizes="167x167" href="<%#= image_url('govuk-apple-touch-icon-167x167.png', skip_pipeline: true) %>">-->
+    <!--    <link rel="apple-touch-icon" sizes="152x152" href="<%#= image_url('govuk-apple-touch-icon-152x152.png', skip_pipeline: true) %>">-->
+    <!--    <link rel="apple-touch-icon" href="<%#= image_url('govuk-apple-touch-icon.png', skip_pipeline: true) %>">-->
 
     <meta property="og:image" content="<%= asset_path "opengraph-image.png", skip_pipeline: true %>">
 

From c8ae8fa6e18c3bcfce654f346a366371f8f44f7a Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 28 Jun 2023 16:12:13 +0400
Subject: [PATCH 019/352] Fix specs

---
 Gemfile                                       |   4 +-
 Gemfile.lock                                  |  12 +--
 app/assets/images/favicon.ico                 | Bin 0 -> 684 bytes
 config/application.rb                         |   3 +-
 config/puma.rb                                |   1 -
 .../steps/application_form_creation_steps.rb  |   1 +
 spec/factories/settings_factory.rb            |   6 +-
 spec/features/users/account_creation_spec.rb  |   2 +
 .../collaborator_registration_flow_spec.rb    |   1 +
 .../eligibility_form_fulfillment_spec.rb      |   1 +
 ...motion_letters_of_support_reminder_spec.rb |   1 +
 .../reminder_to_submit_mailer_spec.rb         |   1 +
 spec/rails_helper.rb                          |  95 ++++++++----------
 spec/search/form_answer_search_spec.rb        |   1 +
 spec/spec_helper.rb                           |  11 +-
 spec/support/capybara.rb                      |  23 +++++
 .../awards2014/development/base_spec.rb       |   2 +
 .../awards2014/innovation/base_spec.rb        |   1 +
 .../awards2014/trade/base_spec.rb             |   1 +
 19 files changed, 93 insertions(+), 74 deletions(-)
 create mode 100644 app/assets/images/favicon.ico
 create mode 100644 spec/support/capybara.rb

diff --git a/Gemfile b/Gemfile
index c94a711df0..ec533a4f4e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,7 +126,7 @@ gem 'nilify_blanks'
 gem 'curb', '0.9.10'
 
 # Web server
-gem 'puma', '~> 4.3.12'
+gem 'puma', '~> 6.3.0'
 
 # Performance & Error reporting
 gem 'appsignal'
@@ -179,7 +179,7 @@ end
 
 group :test do
   gem 'factory_bot_rails'
-  gem 'capybara', '3.39.2'
+  gem 'capybara', '~> 3.39.0'
   gem 'poltergeist'
   gem 'database_cleaner-active_record'
   gem 'launchy'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0661bb38a8..43a8f81d32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -564,7 +564,7 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     public_suffix (5.0.1)
-    puma (4.3.12)
+    puma (6.3.0)
       nio4r (~> 2.0)
     pundit (0.3.0)
       activesupport (>= 3.0.0)
@@ -686,7 +686,7 @@ GEM
     rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.2)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
@@ -697,7 +697,7 @@ GEM
     rspec-sidekiq (3.1.0)
       rspec-core (~> 3.0, >= 3.0.0)
       sidekiq (>= 2.4.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     rspec_junit_formatter (0.2.3)
       builder (< 4)
       rspec-core (>= 2, < 4, != 2.12.0)
@@ -730,7 +730,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.9.0)
+    selenium-webdriver (4.10.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
@@ -856,7 +856,7 @@ DEPENDENCIES
   bootscale
   bootstrap-sass (~> 3.4)
   browser (= 2.4.0)
-  capybara (= 3.39.2)
+  capybara (~> 3.39.0)
   carrierwave (~> 1.3)
   ckeditor
   codeclimate_circle_ci_coverage
@@ -901,7 +901,7 @@ DEPENDENCIES
   prawn
   prawn-table
   pry-byebug
-  puma (~> 4.3.12)
+  puma (~> 6.3.0)
   pundit (~> 0.3)
   pusher (= 0.15.2)
   rack-cors (~> 1.0)
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..31485ebf039579890032f5a1c8d7014d485efbd3
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv00000
z008+zyMF)x010qNS#tmY07w7;07w8v$!k6U000Sga6xAP000mG000mGT*j@#0006B
zNkl<ZILoDyJ%|%g5XWcU$1ZU<O3c39ZA>GcAP0wtpdg5X2%?pOSZJqcA=sUjh~*Xb
zidR~QcA||SqMbIzMl?zwg<0~lirks(=Np^LkxODY@DHzfGxL8lzc)ZcFi*bkUsOsh
zj^7c{=3(=Sl~SQ)SvQ3ccRbJAJu8RJDL%$Izh{j32>>93SW!yt-L?T^>>wiAMD)iP
z^9~VrBI43y9ug4*L2woToL;Z@WEAi`PdbkC84>FMP#9x$r_(twVla}}c<qdo@{m&M
zt=75=0MPIEb40uZ06&Q67h~*1y<WHDI8LWVFvh$risBpR{Kj}tYyANLc1S5#8Dpoa
z)oK)m;r%HCMBI;vju7Iw@B8P*KrXnh`;~}(M^SW(h}JC2Iz6j{$HtfzV=S~R>$Xy=
zQLELM>$+c(BzYD^(RI)B0>;>$EX!U@K}1AQN-f&9{eUr6&$8@|5MrN{@?^W+My1qY
z$8lbzY5Kg|?Oq;-xM=_Y5Cp+p+qN$NK$)iLBV)`b&iQ#M<<TTbmbKQeCx2m!!AM~k
zKCDzKR|kW^HDk<sW6bwBj@LcU+eJi4zu!-{Fql+XmQOd}E@-WraU8EJrH)7`S0}%5
zW(NQOjYi`m=X|Lw%Vt@Ynuyl&JYUvYx5h{K=PD0}!z)EmGy%W?0Lt@xMQh!fxyt{e
zzmf9y3(u&G3IG5AB6?I<bW?9;ba!ELWdHzp+H*|FPfAtr%uP&B4N6T+sRRHooCVab
S45>{30000<MNUMnLSTZ2z$RP(

literal 0
HcmV?d00001

diff --git a/config/application.rb b/config/application.rb
index 12470ed95f..276e87bbdb 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -46,7 +46,8 @@ class Application < Rails::Application
     # config.enable_dependency_loading = true
 
     # config.add_autoload_paths_to_load_path=false
-    # config.eager_load = false
+    config.eager_load = false
+
     config.autoload_once_paths << "#{root}/lib"
     config.autoload_paths << "#{root}/lib"
     config.eager_load_paths << "#{root}/lib"
diff --git a/config/puma.rb b/config/puma.rb
index 3bcc291f82..e29d3459d2 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -11,7 +11,6 @@
 
 preload_app!
 
-rackup      DefaultRackup
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
 port        ENV.fetch("PORT") { 3000 }
diff --git a/spec/acceptance/steps/application_form_creation_steps.rb b/spec/acceptance/steps/application_form_creation_steps.rb
index 56653c9bbc..412caceae2 100644
--- a/spec/acceptance/steps/application_form_creation_steps.rb
+++ b/spec/acceptance/steps/application_form_creation_steps.rb
@@ -3,6 +3,7 @@
 end
 
 step "settings with submission deadlines exists" do
+  AwardYear.current # init a new instance
   FactoryBot.create(:settings, :submission_deadlines)
 end
 
diff --git a/spec/factories/settings_factory.rb b/spec/factories/settings_factory.rb
index 084fd89fdf..62358a8a5e 100644
--- a/spec/factories/settings_factory.rb
+++ b/spec/factories/settings_factory.rb
@@ -4,7 +4,11 @@
 
     initialize_with do
       begin
-        Settings.where(attributes).first_or_create
+        if attributes.present?
+          Settings.where(attributes).first_or_create
+        else
+          Settings.first_or_create
+        end
       rescue ActiveRecord::RecordNotUnique
         retry
       end
diff --git a/spec/features/users/account_creation_spec.rb b/spec/features/users/account_creation_spec.rb
index 8f8f0f7668..a600672458 100644
--- a/spec/features/users/account_creation_spec.rb
+++ b/spec/features/users/account_creation_spec.rb
@@ -3,6 +3,8 @@
 Warden.test_mode!
 
 describe "Account forms" do
+  let!(:award_year) { AwardYear.current }
+
   describe "Fill in first step form" do
     before do
       visit new_user_registration_path
diff --git a/spec/features/users/collaborator_registration_flow_spec.rb b/spec/features/users/collaborator_registration_flow_spec.rb
index b06951d7db..eb6aceb7ae 100644
--- a/spec/features/users/collaborator_registration_flow_spec.rb
+++ b/spec/features/users/collaborator_registration_flow_spec.rb
@@ -3,6 +3,7 @@
 Warden.test_mode!
 
 describe "Collaborator registration flow" do
+  let!(:award_year) { AwardYear.current }
   let!(:acc_admin) { create(:user, role: "account_admin") }
 
   before do
diff --git a/spec/features/users/eligibility_form_fulfillment_spec.rb b/spec/features/users/eligibility_form_fulfillment_spec.rb
index 60f5e05b18..12f1b39844 100644
--- a/spec/features/users/eligibility_form_fulfillment_spec.rb
+++ b/spec/features/users/eligibility_form_fulfillment_spec.rb
@@ -4,6 +4,7 @@
 
 describe "Eligibility forms" do
   let!(:user) { create(:user, :completed_profile) }
+  let!(:award_year) { AwardYear.current }
   let!(:collaborator) { create(:user, :completed_profile, role: "regular", account: user.account) }
 
   before do
diff --git a/spec/mailers/account_mailers/promotion_letters_of_support_reminder_spec.rb b/spec/mailers/account_mailers/promotion_letters_of_support_reminder_spec.rb
index acbc96d562..59b5d09c28 100644
--- a/spec/mailers/account_mailers/promotion_letters_of_support_reminder_spec.rb
+++ b/spec/mailers/account_mailers/promotion_letters_of_support_reminder_spec.rb
@@ -2,6 +2,7 @@
 
 describe AccountMailers::PromotionLettersOfSupportReminderMailer do
   let(:user) { create :user }
+  let!(:award_year) { AwardYear.current }
   let(:form_answer) { create :form_answer, :promotion, user: user }
 
   let!(:settings) { create :settings, :submission_deadlines }
diff --git a/spec/mailers/account_mailers/reminder_to_submit_mailer_spec.rb b/spec/mailers/account_mailers/reminder_to_submit_mailer_spec.rb
index 664f347026..ff50f0498b 100644
--- a/spec/mailers/account_mailers/reminder_to_submit_mailer_spec.rb
+++ b/spec/mailers/account_mailers/reminder_to_submit_mailer_spec.rb
@@ -2,6 +2,7 @@
 
 describe AccountMailers::ReminderToSubmitMailer do
   let(:user) { create :user }
+  let!(:award_year) { AwardYear.current }
   let(:form_answer) { create :form_answer, user: user }
   let!(:settings) { create(:settings, :submission_deadlines) }
 
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 053643b551..03f5699770 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -1,8 +1,19 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
+require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
-
+require_relative '../config/environment'
+# Prevent database truncation if the environment is production
+abort("The Rails environment is running in production mode!") if Rails.env.production?
+require 'rspec/rails'
+require "shoulda/matchers"
+# require "webmock/rspec"
 require "simplecov"
 require "codeclimate-test-reporter"
+#
+# WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true)
+# WebMock.allow_net_connect!(net_http_connect_on_start: true)
+#
+
 
 SimpleCov.add_filter "vendor"
 
@@ -23,43 +34,7 @@ def matches?(source_file)
   end
 end
 
-require File.expand_path('../../config/environment', __FILE__)
-# Prevent database truncation if the environment is production
-abort("The Rails environment is running in production mode!") if Rails.env.production?
-require 'spec_helper'
-require 'rspec/rails'
-require "capybara/rspec"
-require "shoulda/matchers"
-require "webmock/rspec"
-require 'selenium-webdriver'
-
-Dotenv.overload('.env.test')
-
-WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true)
-WebMock.allow_net_connect!(net_http_connect_on_start: true)
-
-# Require all support files.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
-
-Capybara.server = :puma
-
-Capybara.register_driver(:chrome_headless) do |app|
-  options = ::Selenium::WebDriver::Chrome::Options.new
-
-  options.add_argument('--headless') if ENV['TEST_IN_BROWSER'].nil?
-  options.add_argument('--no-sandbox')
-  options.add_argument('--disable-gpu')
-  options.add_argument('--disable-dev-shm-usage')
-  options.add_argument('--window-size=1400,1400')
-
-  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
-end
-
-Capybara.javascript_driver = :chrome_headless
-Capybara.default_max_wait_time = 5
-
 ActiveRecord::Migration.check_pending!
-
 # Add additional requires below this line. Rails is not loaded until this point!
 
 # Requires supporting ruby files with custom matchers and macros, etc, in
@@ -74,12 +49,17 @@ def matches?(source_file)
 # of increasing the boot-up time by auto-requiring all files in the support
 # directory. Alternatively, in the individual `*_spec.rb` files, manually
 # require only the support files necessary.
-#
-# Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f }
 
-# Checks for pending migration and applies them before tests are run.
-# If you are not using ActiveRecord, you can remove this line.
-ActiveRecord::Migration.maintain_test_schema!
+Dir[Rails.root.join('spec', 'support', '**', '*.rb')].sort.each { |f| require f }
+
+# Checks for pending migrations and applies them before tests are run.
+# If you are not using ActiveRecord, you can remove these lines.
+begin
+  ActiveRecord::Migration.maintain_test_schema!
+rescue ActiveRecord::PendingMigrationError => e
+  abort e.to_s.strip
+end
+
 Qae::Application.load_tasks
 
 RSpec::Sidekiq.configure do |config|
@@ -94,6 +74,9 @@ def matches?(source_file)
 
   config.raise_error_for_unimplemented_steps = true
 
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false
   # instead of true.
@@ -103,18 +86,20 @@ def matches?(source_file)
   # #build is no longer building an association if this is set to true
   # fixes some specs that use #build instead of #create
   FactoryBot.use_parent_strategy = false
+  # You can uncomment this line to turn off ActiveRecord support entirely.
+  # config.use_active_record = false
 
-  config.before :each do
-    # SENDGRID RELATED STUBS - BEGIN
-    stub_request(:get, "https://sendgrid.com/api/spamreports.get.json?api_key=test_smtp_password&api_user=test_smtp_username&email=test@example.com").
-      to_return(status: 200, body: "", headers: {})
-
-    stub_sendgrid_bounced_emails_check_request("test@irrelevant.com")
-    stub_sendgrid_bounced_emails_check_request("test@example.com")
-    # SENDGRID RELATED STUBS - END
-
-    AwardYear.current
-  end
+  # config.before :each do
+  #   # SENDGRID RELATED STUBS - BEGIN
+  #   stub_request(:get, "https://sendgrid.com/api/spamreports.get.json?api_key=test_smtp_password&api_user=test_smtp_username&email=test@example.com").
+  #     to_return(status: 200, body: "", headers: {})
+  #
+  #   stub_sendgrid_bounced_emails_check_request("test@irrelevant.com")
+  #   stub_sendgrid_bounced_emails_check_request("test@example.com")
+  #   # SENDGRID RELATED STUBS - END
+  #
+  #   AwardYear.current
+  # end
 
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
@@ -123,12 +108,12 @@ def matches?(source_file)
   # You can disable this behaviour by removing the line below, and instead
   # explicitly tag your specs with their type, e.g.:
   #
-  #     RSpec.describe UsersController, :type => :controller do
+  #     RSpec.describe UsersController, type: :controller do
   #       # ...
   #     end
   #
   # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/docs
+  # https://rspec.info/features/6-0/rspec-rails
   config.infer_spec_type_from_file_location!
 
   # Filter lines from Rails gems in backtraces.
diff --git a/spec/search/form_answer_search_spec.rb b/spec/search/form_answer_search_spec.rb
index 174f19dd4e..8548c221c1 100644
--- a/spec/search/form_answer_search_spec.rb
+++ b/spec/search/form_answer_search_spec.rb
@@ -30,6 +30,7 @@
 
   context "assessment filters" do
     let(:assessor) { create(:assessor, :lead_for_all) }
+    let!(:award_year) { AwardYear.current }
     let(:form_answer) { create(:form_answer, :trade, :submitted) }
 
     before do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 25b6ffffcc..de1e69de2f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -12,10 +12,7 @@
 # the additional setup, and require it from the spec files that actually need
 # it.
 #
-# The `.rspec` file also contains a few flags that are not defaults but that
-# users commonly want.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+# See https://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   # rspec-expectations config goes here. You can use an alternate
   # assertion/expectation library such as wrong or the stdlib/minitest
@@ -71,9 +68,7 @@
 
   # Limits the available syntax to the non-monkey patched syntax that is
   # recommended. For more details, see:
-  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
+  # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/
   config.disable_monkey_patching!
 
   # Many RSpec users commonly either run the entire suite or an individual
@@ -83,7 +78,7 @@
     # Use the documentation formatter for detailed output,
     # unless a formatter has already been configured
     # (e.g. via a command-line flag).
-    config.default_formatter = 'doc'
+    config.default_formatter = "doc"
   end
 
   # Print the 10 slowest examples and example groups at the
diff --git a/spec/support/capybara.rb b/spec/support/capybara.rb
new file mode 100644
index 0000000000..26aa62a47c
--- /dev/null
+++ b/spec/support/capybara.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'capybara/rails'
+require 'capybara/rspec'
+require 'selenium/webdriver'
+
+Capybara.server = :puma #, { Silent: true }
+
+Capybara.register_driver(:chrome_headless) do |app|
+  options = ::Selenium::WebDriver::Chrome::Options.new
+
+  options.add_argument('--headless') if ENV["TEST_IN_BROWSER"].nil?
+  options.add_argument('--no-sandbox')
+  options.add_argument('--disable-gpu')
+  options.add_argument('--disable-dev-shm-usage')
+  options.add_argument('--window-size=1400,1400')
+
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: options)
+end
+
+# Capybara.default_driver = :chrome_headless
+Capybara.javascript_driver = :chrome_headless
+Capybara.default_max_wait_time = 5
diff --git a/spec/unit/pdf_generators/qae_pdf_forms/awards2014/development/base_spec.rb b/spec/unit/pdf_generators/qae_pdf_forms/awards2014/development/base_spec.rb
index 21f3a78e4b..d678584994 100644
--- a/spec/unit/pdf_generators/qae_pdf_forms/awards2014/development/base_spec.rb
+++ b/spec/unit/pdf_generators/qae_pdf_forms/awards2014/development/base_spec.rb
@@ -1,6 +1,8 @@
 require 'rails_helper'
 
 describe "QaePdfForms::Awards2016::Development::Base" do
+  let!(:award_year) { AwardYear.current }
+
   include_context "pdf file checks"
 
   let(:step1_question_answers) {
diff --git a/spec/unit/pdf_generators/qae_pdf_forms/awards2014/innovation/base_spec.rb b/spec/unit/pdf_generators/qae_pdf_forms/awards2014/innovation/base_spec.rb
index d539004d5a..42edbc697f 100644
--- a/spec/unit/pdf_generators/qae_pdf_forms/awards2014/innovation/base_spec.rb
+++ b/spec/unit/pdf_generators/qae_pdf_forms/awards2014/innovation/base_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 describe "QaePdfForms::Awards2016::Innovation::Base" do
+  let!(:award_year) { AwardYear.current }
   include_context "pdf file checks"
 
   let(:step1_question_answers) {
diff --git a/spec/unit/pdf_generators/qae_pdf_forms/awards2014/trade/base_spec.rb b/spec/unit/pdf_generators/qae_pdf_forms/awards2014/trade/base_spec.rb
index e322c768e7..5ce9f1b54f 100644
--- a/spec/unit/pdf_generators/qae_pdf_forms/awards2014/trade/base_spec.rb
+++ b/spec/unit/pdf_generators/qae_pdf_forms/awards2014/trade/base_spec.rb
@@ -1,6 +1,7 @@
 require 'rails_helper'
 
 describe "QaePdfForms::Awards2016::Trade::Base" do
+  let!(:award_year) { AwardYear.current }
   include_context "pdf file checks"
 
   let(:step1_question_answers) {

From 69fe06a99cc37aa044a59ce8e8b499c381b06a38 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 28 Jun 2023 16:47:05 +0400
Subject: [PATCH 020/352] Fix CI settings

---
 .github/workflows/ci.yml                 | 7 ++++---
 .github/workflows/deploy_development.yml | 2 +-
 .github/workflows/deploy_production.yml  | 2 +-
 Dockerfile                               | 1 +
 Dockerfile.local                         | 5 +++--
 Gemfile.lock                             | 6 +++---
 README.md                                | 4 ++--
 7 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ff062a650..b771dfa164 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"
@@ -60,6 +60,7 @@ jobs:
           gem install bundler
           gem update --system && gem update bundler
           bundle config path vendor/bundle
+          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           yarn install
           bundle install --jobs 4 --retry 3
           RAILS_ENV=test bundle exec rake db:create db:migrate
@@ -81,7 +82,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"
@@ -122,7 +123,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"
diff --git a/.github/workflows/deploy_development.yml b/.github/workflows/deploy_development.yml
index 08eef44d0e..74bd31db81 100644
--- a/.github/workflows/deploy_development.yml
+++ b/.github/workflows/deploy_development.yml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"
diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index 6b52c737ef..044f20bf34 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: "16"
diff --git a/Dockerfile b/Dockerfile
index fda07a158d..c6415d8f78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,4 +18,5 @@ ENV CURL_CONNECT_TIMEOUT=0 CURL_TIMEOUT=0 GEM_PATH="$HOME/vendor/bundle/ruby/${R
 COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 COPY . /app
+RUN bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
 RUN bundle install --without development test --jobs 4 && RAILS_ENV=production bundle exec rake assets:precompile
diff --git a/Dockerfile.local b/Dockerfile.local
index 7578b7fc8f..e2a4ce15b7 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -1,6 +1,6 @@
-ARG RUBY_VERSION=2.7.7
+ARG RUBY_VERSION=3.2.2
 
-FROM ruby:2.7.7
+FROM ruby:3.2.2
 
 ENV HOME=/app
 WORKDIR /app
@@ -18,6 +18,7 @@ COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 RUN bundle config set --local path 'vendor/bundle'
 RUN bundle config set --local without 'development test'
+RUN bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
 RUN gem install bundler:2.4.8 && bundle install --jobs 4 --retry 3
 
 COPY . /app
diff --git a/Gemfile.lock b/Gemfile.lock
index 36fe98c910..03c517b6c7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -488,8 +488,8 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    minitest (5.18.1)
     mini_portile2 (2.8.2)
+    minitest (5.18.1)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
     multi_json (1.15.0)
@@ -845,8 +845,8 @@ GEM
     zxcvbn (0.1.9)
 
 PLATFORMS
-  ruby
   arm64-darwin-21
+  ruby
   x86_64-darwin-21
   x86_64-linux
 
@@ -955,4 +955,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.4
+   2.4.8
diff --git a/README.md b/README.md
index 097ee3c9a2..79578d4811 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@
 
 ## Pre-requisites
 
-- Ruby 2.7.7
+- Ruby 3.2.2
 - `gem install bundler -v 2.4.8`
-- Rails 6.1
+- Rails 7.0.5
 - Postgresql 9.5+
 - Redis 2.8
 - Cloudfountry Client

From afb38a23abd57bf3e6674d8472ce8a018a94e081 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Wed, 28 Jun 2023 18:13:24 +0400
Subject: [PATCH 021/352] Spec fixes

---
 Gemfile                                 |  2 +-
 Gemfile.lock                            | 10 ++++------
 app/models/reports/case_index_report.rb |  2 +-
 spec/models/sendgrid_helper_spec.rb     | 12 ++++++++++++
 spec/rails_helper.rb                    | 19 ++-----------------
 5 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/Gemfile b/Gemfile
index ec533a4f4e..fd8011ace2 100644
--- a/Gemfile
+++ b/Gemfile
@@ -189,6 +189,6 @@ group :test do
   gem 'codeclimate_circle_ci_coverage'
   gem 'rspec_junit_formatter', '0.2.3'
   gem 'timecop'
-  gem 'webmock', '3.5.0'
+  gem 'webmock', '3.18.1'
   gem 'rspec-sidekiq'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 03c517b6c7..9709389076 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -488,7 +488,6 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.2)
     minitest (5.18.1)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
@@ -819,10 +818,10 @@ GEM
       descendants_tracker (~> 0.0, >= 0.0.3)
     warden (1.2.9)
       rack (>= 2.0.9)
-    webmock (3.5.0)
-      addressable (>= 2.3.6)
+    webmock (3.18.1)
+      addressable (>= 2.8.0)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
     webpacker (6.0.0.rc.6)
       activesupport (>= 5.2)
       rack-proxy (>= 0.6.1)
@@ -846,7 +845,6 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
-  ruby
   x86_64-darwin-21
   x86_64-linux
 
@@ -946,7 +944,7 @@ DEPENDENCIES
   vigilion (~> 1.0.4)
   vigilion-rails (~> 2.2.0)
   virtus
-  webmock (= 3.5.0)
+  webmock (= 3.18.1)
   webpacker (= 6.0.0.rc.6)
   websocket-extensions (~> 0.1.5)
   wicked (~> 1.1)
diff --git a/app/models/reports/case_index_report.rb b/app/models/reports/case_index_report.rb
index 9b923b5491..f036f23149 100644
--- a/app/models/reports/case_index_report.rb
+++ b/app/models/reports/case_index_report.rb
@@ -1,5 +1,5 @@
 class Reports::CaseIndexReport
-  include Reports::CSVHelper
+  include Reports::CsvHelper
 
   MAPPING = [
     {
diff --git a/spec/models/sendgrid_helper_spec.rb b/spec/models/sendgrid_helper_spec.rb
index cb9c6570a9..b1083989b2 100644
--- a/spec/models/sendgrid_helper_spec.rb
+++ b/spec/models/sendgrid_helper_spec.rb
@@ -1,6 +1,18 @@
 require 'rails_helper'
 
 RSpec.describe SendgridHelper do
+  before do
+    # SENDGRID RELATED STUBS - BEGIN
+    stub_request(:get, "https://sendgrid.com/api/spamreports.get.json?api_key=test_smtp_password&api_user=test_smtp_username&email=test@example.com").
+      to_return(status: 200, body: "", headers: {})
+
+    stub_sendgrid_bounced_emails_check_request("test@irrelevant.com")
+    stub_sendgrid_bounced_emails_check_request("test@example.com")
+    # SENDGRID RELATED STUBS - END
+
+    AwardYear.current
+  end
+
   context 'with sendgrid configured' do
     around do |example|
       smtp_settings = Rails.configuration.action_mailer.smtp_settings
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index 03f5699770..00a47c01d5 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -6,14 +6,11 @@
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'rspec/rails'
 require "shoulda/matchers"
-# require "webmock/rspec"
+require 'webmock/rspec'
 require "simplecov"
 require "codeclimate-test-reporter"
-#
-# WebMock.disable_net_connect!(allow: "codeclimate.com", allow_localhost: true)
-# WebMock.allow_net_connect!(net_http_connect_on_start: true)
-#
 
+WebMock.disable_net_connect!(allow: Capybara.server_host, allow_localhost: true)
 
 SimpleCov.add_filter "vendor"
 
@@ -89,18 +86,6 @@ def matches?(source_file)
   # You can uncomment this line to turn off ActiveRecord support entirely.
   # config.use_active_record = false
 
-  # config.before :each do
-  #   # SENDGRID RELATED STUBS - BEGIN
-  #   stub_request(:get, "https://sendgrid.com/api/spamreports.get.json?api_key=test_smtp_password&api_user=test_smtp_username&email=test@example.com").
-  #     to_return(status: 200, body: "", headers: {})
-  #
-  #   stub_sendgrid_bounced_emails_check_request("test@irrelevant.com")
-  #   stub_sendgrid_bounced_emails_check_request("test@example.com")
-  #   # SENDGRID RELATED STUBS - END
-  #
-  #   AwardYear.current
-  # end
-
   # RSpec Rails can automatically mix in different behaviours to your tests
   # based on their file location, for example enabling you to call `get` and
   # `post` in specs under `spec/controllers`.

From 61b8b3cfb07966a93884b57fafffaffd20519eac Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Thu, 29 Jun 2023 12:22:36 +0400
Subject: [PATCH 022/352] Fix CompanyRegistrationNumberValidator spec

---
 ...pany_registration_number_validator_spec.rb | 24 ++-----------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/spec/validators/company_registration_number_validator_spec.rb b/spec/validators/company_registration_number_validator_spec.rb
index da04accecf..8f10e76504 100644
--- a/spec/validators/company_registration_number_validator_spec.rb
+++ b/spec/validators/company_registration_number_validator_spec.rb
@@ -3,24 +3,6 @@
 require "rails_helper"
 
 RSpec.describe CompanyRegistrationNumberValidator do
-  def anonymous_class
-    Class.new(ActiveRecord::Base) do
-      self.table_name = "company_registration_number_validator_test"
-
-      validates :registration_number, company_registration_number: true
-
-      def self.model_name
-        ActiveModel::Name.new(self, nil, "temp")
-      end
-    end
-  end
-
-  before(:suite) do
-    ActiveRecord::Base.connection.create_table :company_registration_number_validator_test do |t|
-      t.string :registration_number
-    end
-  end
-
   it "should validate valid registration number" do
     %w[
       123456
@@ -36,8 +18,7 @@ def self.model_name
       NC001306
       NL000107
     ].each do |registration_number|
-      model = anonymous_class.new(registration_number: registration_number)
-      expect(model).to be_valid
+      expect(CompanyRegistrationNumberValidator.valid?(registration_number)).to be_truthy
     end
   end
 
@@ -47,8 +28,7 @@ def self.model_name
       AB123456
       XXXXXXXX
     ].each do |registration_number|
-      model = anonymous_class.new(registration_number: registration_number)
-      expect(model).to be_invalid
+      expect(CompanyRegistrationNumberValidator.valid?(registration_number)).to be_falsey
     end
   end
 end

From 11d8c6f30ab8fcb04ed9aaf1879fb0735b089c75 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Thu, 29 Jun 2023 15:22:02 +0200
Subject: [PATCH 023/352] fix case index report tests

---
 spec/models/reports/admin_report_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/spec/models/reports/admin_report_spec.rb b/spec/models/reports/admin_report_spec.rb
index d2ef25a6a1..614a47dcd0 100644
--- a/spec/models/reports/admin_report_spec.rb
+++ b/spec/models/reports/admin_report_spec.rb
@@ -53,8 +53,10 @@
     end
 
     describe "case index report" do
+      subject { described_class.new(id, AwardYear.current, category: "mobility") }
+
       let(:id) { "case-index" }
-      before { create_test_forms }
+      before { create(:form_answer, :mobility, :recommended) }
 
       it "generates the CSV" do
         data = normalize_output(subject)

From e642eda28e9b44b1ca1cf243ea26ad5d1edf6018 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Fri, 30 Jun 2023 09:33:06 +0200
Subject: [PATCH 024/352] add keys control to category filter

---
 .../admin/applications-filter.js.coffee           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/assets/javascripts/admin/applications-filter.js.coffee b/app/assets/javascripts/admin/applications-filter.js.coffee
index e73a4b6a69..5547609c72 100644
--- a/app/assets/javascripts/admin/applications-filter.js.coffee
+++ b/app/assets/javascripts/admin/applications-filter.js.coffee
@@ -5,6 +5,13 @@ ready = ->
   $(document).on "keydown", (e) ->
     return unless $(".dropdown.open").length > 0
 
+    if e.keyCode == 40 || e.keyCode == 38
+      e.preventDefault()
+      e.stopPropagation()
+
+  $(document).on "keyup", (e) ->
+    return unless $(".dropdown.open").length > 0
+
     select = $(".dropdown.open").first()
 
     if e.keyCode == 40
@@ -16,6 +23,10 @@ ready = ->
       else
         element = $(".dropdown-menu li.checkbox input:focus", select).closest("li")
         next_element = element.next()
+
+        if next_element.hasClass("divider")
+          next_element = next_element.next()
+
         $("input", next_element).focus()
 
     if e.keyCode == 38
@@ -27,6 +38,10 @@ ready = ->
       else
         element = $(".dropdown-menu li.checkbox input:focus", select).closest("li")
         prev_element = element.prev()
+
+        if prev_element.hasClass("divider")
+          prev_element = prev_element.prev()
+
         $("input", prev_element).focus()
 
 filterApplicationsDropdowns = () ->

From bb06b14e0fede5faa810b0db5d93a76aeb8a7123 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 12:05:59 +0100
Subject: [PATCH 025/352] Replicated h3 styling so appearance is not affected
 by correcting order of level headings used in page

---
 app/assets/stylesheets/admin/base.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index c282d56673..12708b4624 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -341,6 +341,16 @@ table .ellipsis {
   clear: both;
 }
 
+.question-group h2 {
+  font-size: 18px;
+  font-weight: bold;
+  line-height: 1.5;
+
+  label {
+    font-weight: bold;
+  }
+}
+
 .question-group h3 {
   font-size: 18px;
   font-weight: bold;

From ca66974e9861de6348dfd33599e5778c2829b246 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 12:06:33 +0100
Subject: [PATCH 026/352] Corrects ordering of level headings used in assessor
 form

---
 app/views/admin/assessors/_form.html.slim | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/admin/assessors/_form.html.slim b/app/views/admin/assessors/_form.html.slim
index ed42e778e9..2a1b556d39 100644
--- a/app/views/admin/assessors/_form.html.slim
+++ b/app/views/admin/assessors/_form.html.slim
@@ -1,7 +1,7 @@
 = simple_form_for [:admin, resource], as: :assessor, url: resource.persisted? ? admin_assessor_path(resource) : admin_assessors_path, html: { class: 'qae-form' } do |f|
   .row.question-group
     .col-lg-2.col-md-3.col-sm-4
-      h3 = f.label :first_name, class: "form-label"
+      h2 = f.label :first_name, class: "form-label"
       = f.input :first_name,
                 wrapper_html: { class: 'form-group' },
                 input_html: { class: 'form-control' },
@@ -9,7 +9,7 @@
 
   .row.question-group
     .col-lg-2.col-md-3.col-sm-4
-      h3 = f.label :last_name, class: "form-label"
+      h2 = f.label :last_name, class: "form-label"
       = f.input :last_name,
                 wrapper_html: { class: 'form-group' },
                 input_html: { class: 'form-control' },
@@ -17,7 +17,7 @@
 
   .row.question-group
     .col-lg-2.col-md-3.col-sm-4
-      h3 = f.label :company, class: "form-label"
+      h2 = f.label :company, class: "form-label"
       = f.input :company,
                 wrapper_html: { class: 'form-group' },
                 input_html: { class: 'form-control' },
@@ -25,14 +25,14 @@
 
   .row.question-group#email-control-group
     .col-md-4.col-sm-6
-      h3 = f.label :email, class: "form-label"
+      h2 = f.label :email, class: "form-label"
       = f.input :email,
                 wrapper_html: { class: 'form-group' },
                 input_html: { class: 'form-control' },
                 label: false
 
   .form-group.question-group
-    h3 = f.label :telephone_number, label: "Telephone (optional)", class: "form-label"
+    h2 = f.label :telephone_number, label: "Telephone (optional)", class: "form-label"
     .row
       .col-md-2.col-sm-3
         = f.input :telephone_number,
@@ -41,7 +41,7 @@
 
   .question-group#password-change-panel
     #password-control-group
-      h3 = f.label :password, class: "form-label"
+      h2 = f.label :password, class: "form-label"
       .row
         .col-md-4.col-sm-6
           .input-group
@@ -64,7 +64,7 @@
             ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
 
     #password-confirmation-control-group
-      h3 = f.label :password_confirmation, label: "Retype password", class: "form-label"
+      h2 = f.label :password_confirmation, label: "Retype password", class: "form-label"
       .row
         .col-md-4.col-sm-6
           .input-group

From b308a4a04a8c64a55ca65215425218ac6f6ba288 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 12:07:08 +0100
Subject: [PATCH 027/352] Updates email notification input field id so they are
 not all the same

---
 app/views/admin/settings/_schedule_new.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/settings/_schedule_new.html.slim b/app/views/admin/settings/_schedule_new.html.slim
index 36c7c6c50f..c4836b1f54 100644
--- a/app/views/admin/settings/_schedule_new.html.slim
+++ b/app/views/admin/settings/_schedule_new.html.slim
@@ -4,7 +4,7 @@
 .well.question-group.notification-new-form
   h3 Schedule new email
   = simple_form_for notification, url: admin_settings_email_notifications_path(year: params[:year]), remote: true, authenticity_token: true, html: { id: "new_email_notification_#{kind}" }  do |f|
-    = f.input :kind, as: :hidden
+    = f.input :kind, as: :hidden, input_html: { id: "email_notification_kind_#{kind}" }
     .control-date
       .form-group
         label.control-label Send at

From 055e46be44a5c09c5eb2edcbe8336db1ea4a3d8c Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 12:26:35 +0100
Subject: [PATCH 028/352] Underline 'edit' links on settings page so not
 relying only on colour to represent link elements

---
 app/assets/stylesheets/admin/page-settings.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/admin/page-settings.scss b/app/assets/stylesheets/admin/page-settings.scss
index fb300ce380..c2ffd888c4 100644
--- a/app/assets/stylesheets/admin/page-settings.scss
+++ b/app/assets/stylesheets/admin/page-settings.scss
@@ -44,6 +44,7 @@
   .edit-deadline {
     margin-right: 10px;
     color: $blue-link-colour;
+    text-decoration: underline;
   }
 
   .email-notification-help {

From a309208b4d6e3ebd254d45aa0c847ed1e347ca98 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 14:07:24 +0100
Subject: [PATCH 029/352] Underline hyperlinks on example email text so not
 relying only on colour to represent link elements

---
 app/assets/stylesheets/admin/page-settings.scss | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/stylesheets/admin/page-settings.scss b/app/assets/stylesheets/admin/page-settings.scss
index c2ffd888c4..da82ee9151 100644
--- a/app/assets/stylesheets/admin/page-settings.scss
+++ b/app/assets/stylesheets/admin/page-settings.scss
@@ -106,6 +106,9 @@
 
     &.email-example {
       max-width: none;
+      a {
+        text-decoration: underline;
+      }
     }
 
     h3 {

From 4d7db9c32d5df787c15c223bb273ae25f4b7eb18 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 14:22:40 +0100
Subject: [PATCH 030/352] Rename ids correctly on award year open stage email
 notification

---
 .../_award_year_open_stage_email_notifications.html.slim    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim
index 196b7ffbfb..3ceec94497 100644
--- a/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#final-stage-email-notifications-heading role="tab"
+  .panel-heading#open-stage-email-notifications-heading role="tab"
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-final-stage" href="#section-final-stage-email-notifications" aria-expanded="true" aria-controls="section-final-stage-email-notifications"
+      a data-toggle="collapse" data-parent="#panel-open-stage" href="#section-open-stage-email-notifications" aria-expanded="true" aria-controls="section-open-stage-email-notifications"
         ' Email notification
-  #section-final-stage-email-notifications.section-appraisal-form.section-final-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="final-stage-email-notifications-heading"
+  #section-open-stage-email-notifications.section-appraisal-form.section-open-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="open-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'award_year_open_notifier'
       = render 'email_notification', kind: 'innovation_submission_started_notification'

From e206b18ab914579d3f73c98dbcb5e928657a3542 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 14:23:13 +0100
Subject: [PATCH 031/352] Rename ids correctly on final stage email
 notification

---
 .../deadlines/_final_stage_email_notifications.html.slim    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim
index 497058cb26..d8fe0dc8a1 100644
--- a/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#shortlisted-stage-email-notifications-heading role="tab"
+  .panel-heading#final-stage-email-notifications-heading role="tab"
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-shortlisted-stage" href="#section-shortlisted-stage-email-notifications" aria-expanded="true" aria-controls="section-shortlisted-stage-email-notifications"
+      a data-toggle="collapse" data-parent="#panel-final-stage" href="#section-final-stage-email-notifications" aria-expanded="true" aria-controls="section-final-stage-email-notifications"
         ' Email notification
-  #section-shortlisted-stage-email-notifications.section-appraisal-form.section-shortlisted-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="shortlisted-stage-email-notifications-heading"
+  #section-final-stage-email-notifications.section-appraisal-form.section-final-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="final-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'winners_notification'
       = render 'email_notification', kind: 'winners_head_of_organisation_notification'

From 22950f38918c1c29d40c59b0c4d325347625e8a6 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 4 Jul 2023 14:25:33 +0100
Subject: [PATCH 032/352] Rename ids correctly on shortlisted stage email
 notification

---
 .../_shortlisted_stage_email_notifications.html.slim        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim
index b61e7d02a8..6edc4215b8 100644
--- a/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#final-stage-email-notifications-heading role="tab"
+  .panel-heading#shortlisted-stage-email-notifications-heading role="tab"
     h2.panel-title
-      a data-toggle="collapse" data-parent="#panel-final-stage" href="#section-final-stage-email-notifications" aria-expanded="true" aria-controls="section-final-stage-email-notifications"
+      a data-toggle="collapse" data-parent="#panel-shortlisted-stage" href="#section-shortlisted-stage-email-notifications" aria-expanded="true" aria-controls="section-shortlisted-stage-email-notifications"
         ' Email notification
-  #section-final-stage-email-notifications.section-appraisal-form.section-final-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="final-stage-email-notifications-heading"
+  #section-shortlisted-stage-email-notifications.section-appraisal-form.section-shortlisted-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="shortlisted-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'shortlisted_notifier'
       = render 'email_notification', kind: 'shortlisted_po_sd_notifier'

From 7c02cae22ed014e3927a2bedced4cae7b7461fdc Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 5 Jul 2023 10:40:27 +0100
Subject: [PATCH 033/352] Corrects level headings on assessor downloads page

---
 app/assets/stylesheets/admin/page-dashboard.scss          | 8 ++++++++
 .../dashboard/downloads/_assessors_progress.html.slim     | 2 +-
 app/views/admin/dashboard/downloads/_case_index.html.slim | 2 +-
 .../admin/dashboard/downloads/_case_summaries.html.slim   | 2 +-
 .../admin/dashboard/downloads/_csv_reports.html.slim      | 2 +-
 .../admin/dashboard/downloads/_pdf_reports.html.slim      | 2 +-
 .../downloads/_primary_vs_secondary_appraisals.html.slim  | 2 +-
 7 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/admin/page-dashboard.scss b/app/assets/stylesheets/admin/page-dashboard.scss
index 6e556ce893..7b4e0ec058 100644
--- a/app/assets/stylesheets/admin/page-dashboard.scss
+++ b/app/assets/stylesheets/admin/page-dashboard.scss
@@ -245,6 +245,14 @@
     color: black;
   }
 
+  .downloads-page__section {
+    h2 {
+      font-size: 24px;
+      font-weight: bold;
+      color: black;
+    }
+  }
+
   .download-list {
     margin: 1em 0 4em;
     padding: 0;
diff --git a/app/views/admin/dashboard/downloads/_assessors_progress.html.slim b/app/views/admin/dashboard/downloads/_assessors_progress.html.slim
index 104a77b139..35860398c0 100644
--- a/app/views/admin/dashboard/downloads/_assessors_progress.html.slim
+++ b/app/views/admin/dashboard/downloads/_assessors_progress.html.slim
@@ -1,4 +1,4 @@
-h3
+h2
   ' Assessor's Progress Report
 ul.download-list
   - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|
diff --git a/app/views/admin/dashboard/downloads/_case_index.html.slim b/app/views/admin/dashboard/downloads/_case_index.html.slim
index fbc45a11bd..355fc791b9 100644
--- a/app/views/admin/dashboard/downloads/_case_index.html.slim
+++ b/app/views/admin/dashboard/downloads/_case_index.html.slim
@@ -1,4 +1,4 @@
-h3
+h2
   ' Case Indexes
 ul.download-list
   - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|
diff --git a/app/views/admin/dashboard/downloads/_case_summaries.html.slim b/app/views/admin/dashboard/downloads/_case_summaries.html.slim
index 718102838a..131d145080 100644
--- a/app/views/admin/dashboard/downloads/_case_summaries.html.slim
+++ b/app/views/admin/dashboard/downloads/_case_summaries.html.slim
@@ -1,4 +1,4 @@
-h3
+h2
   ' Case Summaries
 ul.download-list
   - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|
diff --git a/app/views/admin/dashboard/downloads/_csv_reports.html.slim b/app/views/admin/dashboard/downloads/_csv_reports.html.slim
index 387c2587a6..fe9a9d7921 100644
--- a/app/views/admin/dashboard/downloads/_csv_reports.html.slim
+++ b/app/views/admin/dashboard/downloads/_csv_reports.html.slim
@@ -1,4 +1,4 @@
-h3
+h2
   ' Reports
 ul.download-list
   li.download-item
diff --git a/app/views/admin/dashboard/downloads/_pdf_reports.html.slim b/app/views/admin/dashboard/downloads/_pdf_reports.html.slim
index 25471e84e5..8bda9502ab 100644
--- a/app/views/admin/dashboard/downloads/_pdf_reports.html.slim
+++ b/app/views/admin/dashboard/downloads/_pdf_reports.html.slim
@@ -1,4 +1,4 @@
-h3
+h2
   ' Feedback
 ul.download-list
   - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|
diff --git a/app/views/admin/dashboard/downloads/_primary_vs_secondary_appraisals.html.slim b/app/views/admin/dashboard/downloads/_primary_vs_secondary_appraisals.html.slim
index f3a8615694..64e7fab63f 100644
--- a/app/views/admin/dashboard/downloads/_primary_vs_secondary_appraisals.html.slim
+++ b/app/views/admin/dashboard/downloads/_primary_vs_secondary_appraisals.html.slim
@@ -1,4 +1,4 @@
-h3
+h2
   ' Discrepancies between primary and secondary appraisals
 ul.download-list
   - FormAnswer::AWARD_TYPE_FULL_NAMES.each do |key, value|

From 2a033d91a585963bde6b07f9bc1bee2f1f0ca097 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 5 Jul 2023 11:05:26 +0100
Subject: [PATCH 034/352] Adds aria hidden attributes to hidden input fields

---
 app/views/assessor/form_answers/index.html.slim | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/views/assessor/form_answers/index.html.slim b/app/views/assessor/form_answers/index.html.slim
index f9100f13ae..341cbe918e 100644
--- a/app/views/assessor/form_answers/index.html.slim
+++ b/app/views/assessor/form_answers/index.html.slim
@@ -6,10 +6,8 @@ h1.admin-page-heading
   .row
     .col-md-4.col-sm-5.col-xs-12
       .form-group.search-input
-        = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { label: "Search applications" }
-        label for="award_type" class="visuallyhidden"
-          ' Award type
-        = text_field_tag :award_type, params[:award_type], class: "visuallyhidden"
+        = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { hidden: true }, id: "award_year", tabindex: "-1"
+        = text_field_tag :award_type, params[:award_type], class: "visuallyhidden", aria: { hidden: true }, tabindex: "-1"
         = f.input :query, label: false, input_html: { class: "form-control", placeholder: "Search...", type: "search", aria: {label: 'Search applications'} }
         = submit_tag :submit, class: 'search-submit'
 
@@ -32,7 +30,7 @@ h1.admin-page-heading
 - # this bulk assignment form breaks the flow of the sorting + filtering forms, as the form needs to do a update somewhere else than the forms above and below. So you'll see some duplication of fields. Commented on them so no one removes them by accident
 = render("assessor/form_answers/bulk_assignment")
 
-= simple_form_for @search, url: assessor_form_answers_path, method: :get, as: :search, html: { class: 'search-form'} do |f|
+= simple_form_for @search, url: assessor_form_answers_path, method: :get, as: :search, html: { class: 'search-form', id: 'application_table_search_form' } do |f|
   = hidden_field_tag :award_type, category_picker.current_award_type
   label for="year" class="visuallyhidden"
     ' Award year

From 9daf4e8f1beb6dbaad2e6a3de8c5f255d9b42631 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 5 Jul 2023 11:34:58 +0100
Subject: [PATCH 035/352] Combines h2 and h3 styling within question-group
 class, they currently look the same

---
 app/assets/stylesheets/admin/base.scss | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 12708b4624..750878b5c5 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -341,17 +341,7 @@ table .ellipsis {
   clear: both;
 }
 
-.question-group h2 {
-  font-size: 18px;
-  font-weight: bold;
-  line-height: 1.5;
-
-  label {
-    font-weight: bold;
-  }
-}
-
-.question-group h3 {
+.question-group h2, h3 {
   font-size: 18px;
   font-weight: bold;
   line-height: 1.5;

From b68da359fb2c9dea85818b39b70716f1b6790483 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 5 Jul 2023 14:00:08 +0100
Subject: [PATCH 036/352] Add unique ids

---
 app/views/assessor/form_answers/index.html.slim | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/assessor/form_answers/index.html.slim b/app/views/assessor/form_answers/index.html.slim
index 341cbe918e..7c656c7d85 100644
--- a/app/views/assessor/form_answers/index.html.slim
+++ b/app/views/assessor/form_answers/index.html.slim
@@ -31,24 +31,24 @@ h1.admin-page-heading
 = render("assessor/form_answers/bulk_assignment")
 
 = simple_form_for @search, url: assessor_form_answers_path, method: :get, as: :search, html: { class: 'search-form', id: 'application_table_search_form' } do |f|
-  = hidden_field_tag :award_type, category_picker.current_award_type
+  = hidden_field_tag :award_type, category_picker.current_award_type, id: "award_type_application_table_search_form"
   label for="year" class="visuallyhidden"
     ' Award year
   = text_field_tag :year, @award_year.year, class: "visuallyhidden"
 
   - # status filters need to be here because the filtering is done in the other form above, so in order not to break filtering, we need to duplicate it here
   = f.simple_fields_for [:filters, @search.filters] do |h|
-    = h.label :status, class: "visuallyhidden"
+    = h.label :status, class: "visuallyhidden", for: "status_application_table_search_form"
     = h.input :status,
               collection: FormAnswerStatus::AssessorFilter.options,
               label: false,
-              input_html: { multiple: true, class: 'visuallyhidden'}
+              input_html: { multiple: true, class: 'visuallyhidden', id: 'status_application_table_search_form' }
 
-    = h.label :sub_status, class: "visuallyhidden"
+    = h.label :sub_status, class: "visuallyhidden", for: "sub_status_application_table_search_form"
     = h.input :sub_status,
               collection: FormAnswerStatus::AssessorFilter.sub_options(current_assessor),
               label: false,
-              input_html: { multiple: true, class: 'visuallyhidden'}
+              input_html: { multiple: true, class: 'visuallyhidden', id: 'sub_status_application_table_search_form'}
 
   .row
     .col-xs-12

From a98dce8f3a4a5e01d3a4f749bab3fa4de9945793 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 6 Jul 2023 10:57:14 +0100
Subject: [PATCH 037/352] Move load data button outside of table cpation

---
 .../stylesheets/admin/page-dashboard.scss     | 90 ++++++++++---------
 .../dashboard/_applications_report.html.slim  |  9 +-
 .../totals_by_day/_registrations.html.slim    | 10 +--
 .../totals_by_month/_registrations.html.slim  |  9 +-
 .../totals_by_week/_registrations.html.slim   | 11 +--
 5 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/app/assets/stylesheets/admin/page-dashboard.scss b/app/assets/stylesheets/admin/page-dashboard.scss
index 7b4e0ec058..bab4e9febd 100644
--- a/app/assets/stylesheets/admin/page-dashboard.scss
+++ b/app/assets/stylesheets/admin/page-dashboard.scss
@@ -80,6 +80,52 @@
 
 }
 
+.dashboard-table__wrapper {
+  .btn {
+    position: relative;
+    padding-left: 2.5em;
+
+    &:before {
+      content: " ";
+      display: block;
+      position: absolute;
+      top: 9px;
+      left: 10px;
+      background-size: 1em auto;
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 1em;
+      height: 1em;
+    }
+
+    @media (min-width: 768px) {
+      position: absolute;
+      right: 0;
+      top: 3em;
+    }
+
+    &[disabled] {
+      opacity: 0.7;
+    }
+
+    &.btn--load:before {
+      background-image: image-url("icon_load.svg");
+    }
+
+    &.btn--reload:before {
+      background-image: image-url("icon_update.svg");
+    }
+
+    &.btn--loading:before {
+      background-image: image-url("icon_loading.svg");
+      background-size: 1.15em auto;
+      width: 1.2em;
+      height: 1.5em;
+      top: 7px;
+    }
+  }
+}
+
 .dashboard-table {
   table-layout: fixed;
   overflow-x: scroll;
@@ -124,50 +170,6 @@
         top: -1px;
       }
     }
-
-    .btn {
-      position: relative;
-      padding-left: 2.5em;
-
-      &:before {
-        content: " ";
-        display: block;
-        position: absolute;
-        top: 9px;
-        left: 10px;
-        background-size: 1em auto;
-        background-repeat: no-repeat;
-        background-position: center;
-        width: 1em;
-        height: 1em;
-      }
-
-      @media (min-width: 768px) {
-        position: absolute;
-        right: 0;
-        top: 3em;
-      }
-
-      &[disabled] {
-        opacity: 0.7;
-      }
-
-      &.btn--load:before {
-        background-image: image-url("icon_load.svg");
-      }
-
-      &.btn--reload:before {
-        background-image: image-url("icon_update.svg");
-      }
-
-      &.btn--loading:before {
-        background-image: image-url("icon_loading.svg");
-        background-size: 1.15em auto;
-        width: 1.2em;
-        height: 1.5em;
-        top: 7px;
-      }
-    }
   }
 
   th, td {
diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index a5cc975d1a..15d7f7dcb6 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -1,11 +1,12 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       = title
-      a.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
-        | Updating data
     = render "admin/dashboard/totals_#{kind}/table_head"
 
     tbody
diff --git a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
index 028310fbed..2da44c190b 100644
--- a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
@@ -1,12 +1,12 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day") aria-label="Load data for new account registrations table"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day")
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden
-        | Updating data
-
     thead
       tr
         th.bold.border-right width="150"
diff --git a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
index b7bc73fe17..07fe16c3c8 100644
--- a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
@@ -1,11 +1,12 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month") aria-label="Load data for new account registrations table"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month")
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden
-        | Updating data
 
     thead
       tr
diff --git a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
index de4e6dcb82..61080abf6a 100644
--- a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
@@ -1,12 +1,13 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week") aria-label="Load data for new account registrations table"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week")
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden
-        | Updating data
-
+      
     thead
       tr
         th.bold.border-right width="150"

From a4b9fe5b8539c1d445fdf3f03e20113992d44c5f Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 6 Jul 2023 09:14:58 +0100
Subject: [PATCH 038/352] Add skip link to admin pages

---
 app/assets/stylesheets/application-admin.scss | 12 ++++++++++++
 app/views/layouts/application-admin.html.slim |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index 309ba6c42e..a0350cc0a0 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -49,3 +49,15 @@ $todo-black: #333;
     outline: 4px solid $todo-yellow !important;
   }
 }
+
+.skip-main-content {
+  position: absolute;
+    top: -100px;
+    z-index: 9999999999999999999999;
+
+    &:focus {
+      top: 20px;
+      left: 20px;
+      color: white !important;
+    }
+}
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 984a285c23..579bfcedf9 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -38,6 +38,8 @@ html.no-js
   body#admin-layout data-autosave-token="#{current_admin.try(:autosave_token)}" class="admin-layout #{controller_name}-page #{action_name}-page #{controller_name}-#{action_name}-page #{yield :page_class} #{'layout-dev' if Rails.env.development?}"
     #site-wrapper
       #site-wrapper-margin
+        a href="#main-container" class="btn btn-lg skip-main-content" onclick="document.getElementById('main-container').focus()" role="button"
+          | Skip to main content
         #site-header.clearfix
           .navbar.clearfix role="navigation"
             .container.clearfix

From 9164a472244d472faa24c4b45588e7f06cef76bb Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 6 Jul 2023 10:57:14 +0100
Subject: [PATCH 039/352] Move load data button outside of table cpation

---
 .../stylesheets/admin/page-dashboard.scss     | 90 ++++++++++---------
 .../dashboard/_applications_report.html.slim  |  9 +-
 .../totals_by_day/_registrations.html.slim    | 10 +--
 .../totals_by_month/_registrations.html.slim  |  9 +-
 .../totals_by_week/_registrations.html.slim   | 11 +--
 5 files changed, 67 insertions(+), 62 deletions(-)

diff --git a/app/assets/stylesheets/admin/page-dashboard.scss b/app/assets/stylesheets/admin/page-dashboard.scss
index 7b4e0ec058..bab4e9febd 100644
--- a/app/assets/stylesheets/admin/page-dashboard.scss
+++ b/app/assets/stylesheets/admin/page-dashboard.scss
@@ -80,6 +80,52 @@
 
 }
 
+.dashboard-table__wrapper {
+  .btn {
+    position: relative;
+    padding-left: 2.5em;
+
+    &:before {
+      content: " ";
+      display: block;
+      position: absolute;
+      top: 9px;
+      left: 10px;
+      background-size: 1em auto;
+      background-repeat: no-repeat;
+      background-position: center;
+      width: 1em;
+      height: 1em;
+    }
+
+    @media (min-width: 768px) {
+      position: absolute;
+      right: 0;
+      top: 3em;
+    }
+
+    &[disabled] {
+      opacity: 0.7;
+    }
+
+    &.btn--load:before {
+      background-image: image-url("icon_load.svg");
+    }
+
+    &.btn--reload:before {
+      background-image: image-url("icon_update.svg");
+    }
+
+    &.btn--loading:before {
+      background-image: image-url("icon_loading.svg");
+      background-size: 1.15em auto;
+      width: 1.2em;
+      height: 1.5em;
+      top: 7px;
+    }
+  }
+}
+
 .dashboard-table {
   table-layout: fixed;
   overflow-x: scroll;
@@ -124,50 +170,6 @@
         top: -1px;
       }
     }
-
-    .btn {
-      position: relative;
-      padding-left: 2.5em;
-
-      &:before {
-        content: " ";
-        display: block;
-        position: absolute;
-        top: 9px;
-        left: 10px;
-        background-size: 1em auto;
-        background-repeat: no-repeat;
-        background-position: center;
-        width: 1em;
-        height: 1em;
-      }
-
-      @media (min-width: 768px) {
-        position: absolute;
-        right: 0;
-        top: 3em;
-      }
-
-      &[disabled] {
-        opacity: 0.7;
-      }
-
-      &.btn--load:before {
-        background-image: image-url("icon_load.svg");
-      }
-
-      &.btn--reload:before {
-        background-image: image-url("icon_update.svg");
-      }
-
-      &.btn--loading:before {
-        background-image: image-url("icon_loading.svg");
-        background-size: 1.15em auto;
-        width: 1.2em;
-        height: 1.5em;
-        top: 7px;
-      }
-    }
   }
 
   th, td {
diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index a5cc975d1a..15d7f7dcb6 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -1,11 +1,12 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       = title
-      a.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
-        | Updating data
     = render "admin/dashboard/totals_#{kind}/table_head"
 
     tbody
diff --git a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
index 028310fbed..2da44c190b 100644
--- a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
@@ -1,12 +1,12 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day") aria-label="Load data for new account registrations table"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day")
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden
-        | Updating data
-
     thead
       tr
         th.bold.border-right width="150"
diff --git a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
index b7bc73fe17..07fe16c3c8 100644
--- a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
@@ -1,11 +1,12 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month") aria-label="Load data for new account registrations table"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month")
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden
-        | Updating data
 
     thead
       tr
diff --git a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
index de4e6dcb82..61080abf6a 100644
--- a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
@@ -1,12 +1,13 @@
 .dashboard-table__wrapper.dashboard-report
+  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week") aria-label="Load data for new account registrations table"
+    | Load data
+  button.btn.btn-primary.btn--loading.updating-data.hidden
+    | Updating data
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week")
-        | Load data
-      button.btn.btn-primary.btn--loading.updating-data.hidden
-        | Updating data
-
+      
     thead
       tr
         th.bold.border-right width="150"

From c929848fb9be023517bc5946e21a328d1dd6b7bb Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 6 Jul 2023 09:14:58 +0100
Subject: [PATCH 040/352] Add skip link to admin pages

---
 app/assets/stylesheets/application-admin.scss | 12 ++++++++++++
 app/views/layouts/application-admin.html.slim |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index 309ba6c42e..a0350cc0a0 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -49,3 +49,15 @@ $todo-black: #333;
     outline: 4px solid $todo-yellow !important;
   }
 }
+
+.skip-main-content {
+  position: absolute;
+    top: -100px;
+    z-index: 9999999999999999999999;
+
+    &:focus {
+      top: 20px;
+      left: 20px;
+      color: white !important;
+    }
+}
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 984a285c23..579bfcedf9 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -38,6 +38,8 @@ html.no-js
   body#admin-layout data-autosave-token="#{current_admin.try(:autosave_token)}" class="admin-layout #{controller_name}-page #{action_name}-page #{controller_name}-#{action_name}-page #{yield :page_class} #{'layout-dev' if Rails.env.development?}"
     #site-wrapper
       #site-wrapper-margin
+        a href="#main-container" class="btn btn-lg skip-main-content" onclick="document.getElementById('main-container').focus()" role="button"
+          | Skip to main content
         #site-header.clearfix
           .navbar.clearfix role="navigation"
             .container.clearfix

From 4ee488b8bfc90235fdac72f2a567ef484364f8a3 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:07:22 +0100
Subject: [PATCH 041/352] Add title attribute to select2 span

---
 app/assets/javascripts/application-admin.js.coffee | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/application-admin.js.coffee b/app/assets/javascripts/application-admin.js.coffee
index 3bce4c9425..db0728c9e7 100644
--- a/app/assets/javascripts/application-admin.js.coffee
+++ b/app/assets/javascripts/application-admin.js.coffee
@@ -30,4 +30,6 @@ $(document).ready(() ->
   ($ ".timepicker").timePicker()
   ($ ".datepicker").datepicker({dateFormat: "dd/mm/yy"})
   ($ "select.select2").select2({width: "style"})
+  $("#assessor_assignment_collection_primary_assessor_id").next("span").find("span.select2-selection--single").attr("title", "Select a primary assessor")
+  $("#assessor_assignment_collection_secondary_assessor_id").next("span").find("span.select2-selection--single").attr("title", "Select a secondary assessor")
 )

From c68bb7249fc97aab6a1adb668cad9e383957b73b Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:08:46 +0100
Subject: [PATCH 042/352] Correct level headings on bulk_assignment form

---
 app/assets/stylesheets/admin/page-applications.scss        | 6 ++++++
 app/views/assessor/form_answers/_bulk_assignment.html.slim | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 2d94aa7248..22ddf7d833 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -623,6 +623,12 @@
     }
   }
 
+  h2 {
+    font-size: 18px;
+    font-weight: bold;
+    line-height: 1.5;
+  }
+
   h3 {
     margin-top: 0;
   }
diff --git a/app/views/assessor/form_answers/_bulk_assignment.html.slim b/app/views/assessor/form_answers/_bulk_assignment.html.slim
index 9d3be973db..54c08e45c0 100644
--- a/app/views/assessor/form_answers/_bulk_assignment.html.slim
+++ b/app/views/assessor/form_answers/_bulk_assignment.html.slim
@@ -4,7 +4,7 @@
 
     .bulk-assign-assessors-form
       .well
-        h3 Bulk Assign Assessors
+        h2 Bulk Assign Assessors
 
         p Please make sure that the correct applications are selected in the list before assigning assessors.
         br

From 43ae1399817f38ebbe77d7ac1c077656a6579c5a Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 6 Jul 2023 16:31:10 +0100
Subject: [PATCH 043/352] Corrects structure of homepage link/logo image

---
 .../stylesheets/admin/header-footer.scss      | 32 +++----------------
 app/views/layouts/application-admin.html.slim |  5 ++-
 .../layouts/application-assessor.html.slim    |  5 ++-
 app/views/layouts/application-judge.html.slim |  5 ++-
 app/views/layouts/twofactor.html.slim         |  5 ++-
 5 files changed, 12 insertions(+), 40 deletions(-)

diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 314dd0cf84..227771b723 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -253,36 +253,12 @@
   
   // moving down here seems to make it work
   .navbar-brand {
-    width: 58px;
-    height: 67px;
-    padding-top: 0;
+    padding-top: 14px;
     padding-bottom: 0;
     text-align: left;
-    text-indent: -9999px;
-    background-image: image-url("logo-admin.png");
-    background-repeat: no-repeat;
-    background-position: center center;
-    background-size: 28px 37px;
-    color: $govuk-light-blue;
-
-    @include is-retina {
-      background-image: image-url("logo-admin@2.png");
-    }
-
-    @include screen-md-max {
-      width: 50px;
-      background-size: 20px 26px;
-    }
-
-    .lte-ie8 & {
-      width: 58px !important;
-      height: 67px !important;
-      margin-top: 3px !important;
-      padding-top: 0 !important;
-      padding-bottom: 0 !important;
-      text-indent: -9999px !important;
-      background: image-url("logo-admin.png") no-repeat center center !important;
-      background-size: 28px 37px !important;
+    img {
+      width: 28px;
+      height: 33px;
     }
   }
 }
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 984a285c23..937ac048f1 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -48,9 +48,8 @@ html.no-js
                   span.icon-bar
                   span.icon-bar
 
-                = link_to "King's Awards for Enterprise - Admin",
-                          admin_root_path,
-                          class: 'navbar-brand'
+                = link_to admin_root_path, class:'navbar-brand' do
+                  = image_tag 'logo-admin.png', alt: "King's Awards for Enterprise - Admin"
 
               .navbar-collapse.collapse#nav-main-collapse.clearfix
                 ul.nav.navbar-nav
diff --git a/app/views/layouts/application-assessor.html.slim b/app/views/layouts/application-assessor.html.slim
index 384de7aa4b..5a67e432b8 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -48,9 +48,8 @@ html.no-js
                   span.icon-bar
                   span.icon-bar
 
-                = link_to "King's Awards for Enterprise - Assessor",
-                          assessor_root_path,
-                          class: 'navbar-brand'
+                = link_to assessor_root_path, class:'navbar-brand' do
+                  = image_tag 'logo-admin.png', alt: "King's Awards for Enterprise - Assessor"
 
               .navbar-collapse.collapse#nav-main-collapse
                 ul.nav.navbar-nav role="tablist"
diff --git a/app/views/layouts/application-judge.html.slim b/app/views/layouts/application-judge.html.slim
index d788f43f9a..3fd42c2fc6 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -48,9 +48,8 @@ html.no-js
                   span.icon-bar
                   span.icon-bar
 
-                = link_to "King's Awards for Enterprise - Judge",
-                          judge_root_path,
-                          class: 'navbar-brand'
+                = link_to judge_root_path, class:'navbar-brand' do
+                  = image_tag 'logo-admin.png', alt: "King's Awards for Enterprise - Judge"
 
               .navbar-collapse.collapse#nav-main-collapse
                 ul.nav.navbar-nav role="navigation"
diff --git a/app/views/layouts/twofactor.html.slim b/app/views/layouts/twofactor.html.slim
index ef61c63578..a0856ad4c2 100644
--- a/app/views/layouts/twofactor.html.slim
+++ b/app/views/layouts/twofactor.html.slim
@@ -42,9 +42,8 @@ html.no-js
                   span.icon-bar
                   span.icon-bar
 
-                = link_to "King's Awards for Enterprise - Admin",
-                          admin_root_path,
-                          class: 'navbar-brand'
+                = link_to admin_root_path, class:'navbar-brand' do
+                  = image_tag 'logo-admin.png', alt: "King's Awards for Enterprise - Admin"
 
               .navbar-collapse.collapse#nav-main-collapse
 

From 4ad1cafbe6412ae3a3e9c08796a5bca419d6b016 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 6 Jul 2023 20:01:23 +0000
Subject: [PATCH 044/352] Bump sanitize from 6.0.1 to 6.0.2

Bumps [sanitize](https://github.com/rgrove/sanitize) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/rgrove/sanitize/releases)
- [Changelog](https://github.com/rgrove/sanitize/blob/main/HISTORY.md)
- [Commits](https://github.com/rgrove/sanitize/compare/v6.0.1...v6.0.2)

---
updated-dependencies:
- dependency-name: sanitize
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 1c637713a3..2ea70a0927 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -568,7 +568,7 @@ GEM
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
     raabro (1.4.0)
-    racc (1.6.2)
+    racc (1.7.1)
     rack (2.2.7)
     rack-cors (1.1.1)
       rack (>= 2.0.0)
@@ -713,7 +713,7 @@ GEM
       nokogiri (>= 1.10.8)
       rubyzip (>= 1.3.0)
     rubyzip (2.3.2)
-    sanitize (6.0.1)
+    sanitize (6.0.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     sassc (2.4.0)

From b3d01b27a7490b47a96b23a361d7ca181992c345 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:29:23 +0100
Subject: [PATCH 045/352] Add role tooltip and aria label to span

---
 app/views/admin/settings/_deadline_form.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 957ca6031b..6c74c52fd2 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -26,7 +26,7 @@
 
     span.deadline-help
       - if deadline.help_message.present?
-        span.glyphicon-info-sign.help-message
+        span.glyphicon-info-sign.help-message role="tooltip" aria-label=deadline.help_message
           .help-message-text
             = deadline.help_message
 - else

From abe32341fe4ee040287cb04509790faa0f17ce9d Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:29:51 +0100
Subject: [PATCH 046/352] Correct colour contrast on hints

---
 app/assets/stylesheets/admin/_variables.scss | 1 -
 app/assets/stylesheets/admin/base.scss       | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index aa42f93392..38fa6783be 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -17,7 +17,6 @@ $amber:           #f39200;
 $red:             #e30613;
 $blue:            #3276b1;
 $selectable:      #e3e3e3;
-$hint:            #737373;
 
 $error-border-colour: #f2dede;
 
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 750878b5c5..71b05cee7e 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -568,7 +568,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   display: block;
   margin-top: 10px;
   margin-bottom: 10px;
-  color: $hint;
+  color: $grey-dark;
   font-size: 14px;
 }
 

From 336023ba1e5dc8e915e95c3d3125e52a64a704c6 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:32:03 +0100
Subject: [PATCH 047/352] Change positioning of labels and inputs to be one
 above the other

---
 .../stylesheets/admin/page-applications.scss  | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 22ddf7d833..5ad8416fd7 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -641,28 +641,6 @@
     margin-left: 10px;
   }
 
-  .form-group {
-    position: relative;
-    padding-left: 26em;
-
-    @include screen-sm-max {
-      padding-left: 0;
-    }
-  }
-
-  .control-label {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 26em;
-
-    @include screen-sm-max {
-      position: relative;
-      width: auto;
-      float: none;
-    }
-  }
-
   .select2-container {
     width: 100% !important;
   }

From 91ece1399cc3984e662ef397452f71cae643f5d5 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 7 Jul 2023 09:57:52 +0100
Subject: [PATCH 048/352] Correct contrast ratios on red buttons

---
 app/assets/stylesheets/admin/base.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 71b05cee7e..dafe25ab5f 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -693,6 +693,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 }
 
+.btn-danger {
+  background-color: $red !important;
+}
+
 // Icons
 .icon-comment,
 .icon-flagged,

From 7bde67c471034bab72e0c4a1881f2d4c26fadc31 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 7 Jul 2023 11:24:39 +0100
Subject: [PATCH 049/352] Darken hint colour & blue/yellow/green text to meet
 contrast ratios

---
 app/assets/stylesheets/admin/_variables.scss | 6 +++---
 app/assets/stylesheets/admin/base.scss       | 7 ++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index 38fa6783be..eff616a8cd 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -12,15 +12,15 @@ $grey-tab:        #aaa;
 $grey-tab-hover:  #666;
 $grey-panel:      #dadad9;
 $white-true:      #fff;
-$green:           #93c355;
-$amber:           #f39200;
+$green:           #5C802D;
+$amber:           #A86500;
 $red:             #e30613;
 $blue:            #3276b1;
 $selectable:      #e3e3e3;
 
 $error-border-colour: #f2dede;
 
-$list-actions:        #337ab7;
+$list-actions:        #1A66A8;
 $list-actions-danger: #a94442;
 
 $pagination-background: #e6e6e6;
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index dafe25ab5f..b56f0a1bd6 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -2,6 +2,7 @@
 
 // Basic
 a {
+  color: $blue-link-colour;
   &:active,
   &:focus {
     outline: none !important;
@@ -1133,7 +1134,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   small {
     display: block;
     margin-top: 0.25em;
-    color: #777777;
+    color: $grey-dark;
     font-size: 14px;
     text-transform: none;
   }
@@ -1211,7 +1212,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .comment-action {
   display: block;
   margin-top: 10px;
-  color: $grey;
+  color: $grey-dark;
   font-size: 14px;
 
   .divider {
@@ -1234,7 +1235,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   &,
   &:hover,
   &:focus {
-    color: $grey;
+    color: $grey-dark;
   }
 
   .flagged-visible {

From ad9c7640866965e1aadd3618a81fdc253c6ff3c6 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 7 Jul 2023 17:38:28 +0100
Subject: [PATCH 050/352] Wrap list items in <li> tags

---
 .../reports/_primary_vs_secondary_appraisals.html.slim   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/views/assessor/reports/_primary_vs_secondary_appraisals.html.slim b/app/views/assessor/reports/_primary_vs_secondary_appraisals.html.slim
index e49340f84c..8a4e8de784 100644
--- a/app/views/assessor/reports/_primary_vs_secondary_appraisals.html.slim
+++ b/app/views/assessor/reports/_primary_vs_secondary_appraisals.html.slim
@@ -7,9 +7,10 @@
       - next if key.to_s == "promotion" && hide_promotion?
       - link_ops = {category: key, format: :csv, year: @award_year.year}
 
-      = link_to assessor_report_path("discrepancies_between_primary_and_secondary_appraisals", link_ops), class: "action-title"
-        span.glyphicon.glyphicon-download-alt.black
-        span.visible-lg.visible-md
-        = value
+      li
+        = link_to assessor_report_path("discrepancies_between_primary_and_secondary_appraisals", link_ops), class: "action-title"
+          span.glyphicon.glyphicon-download-alt.black
+          span.visible-lg.visible-md
+          = value
         
   .clear

From efa666f766b280436b635ce3da1015a027ec11df Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 11:49:01 +0100
Subject: [PATCH 051/352] Assigns unique ids to textareas for
 verdict/comments/rag sections

---
 app/views/admin/comments/_form.html.slim                      | 2 +-
 .../appraisal_form_components/_rag_section.html.slim          | 4 ++--
 .../appraisal_form_components/_verdict_section.html.slim      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/comments/_form.html.slim b/app/views/admin/comments/_form.html.slim
index 6e9ae18d53..4a79727a87 100644
--- a/app/views/admin/comments/_form.html.slim
+++ b/app/views/admin/comments/_form.html.slim
@@ -2,7 +2,7 @@
   label
     ' Add a comment
   = f.hidden_field :section
-  = f.text_area :body, class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment"
+  = f.text_area :body, id: "#{f.object.section}_comment_body", class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment"
   .comment-actions
     = f.check_box :flagged
     = link_to "#flag-comment", class: "link-flag-comment js-link-flag-comment"
diff --git a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
index 4be79288c4..d2f220c661 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
@@ -36,8 +36,8 @@
       .clear
 
     = f.input section.desc,
-              wrapper_html: { class: 'form-group' },
-              input_html: { class: 'form-control js-char-count', rows: 5, "data-word-max" => (@form_answer.promotion? ? 1500 : 1200), "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.id}-#{section.desc}" },
+              wrapper_html: { class: 'form-group'},
+              input_html: {id: "#{f.object.position}_#{section.desc}_comment", class: 'form-control js-char-count', rows: 5, "data-word-max" => (@form_answer.promotion? ? 1500 : 1200), "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.id}-#{section.desc}" },
               as: :text,
               label: false
 
diff --git a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
index 4d4745c96a..0c12837bc7 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
@@ -35,7 +35,7 @@
       .clear
     = f.input section.desc,
               wrapper_html: { class: 'form-group' },
-              input_html: { class: 'form-control js-char-count', rows: 5, "data-word-max" => 1200, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.id}-#{section.desc}"},
+              input_html: {id: "#{f.object.position}_#{section.desc}_verdict", class: 'form-control js-char-count', rows: 5, "data-word-max" => 1200, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.id}-#{section.desc}"},
               as: :text,
               label: false
 

From e9aad39425a4b0dd042dad802c2c90d0e4b24574 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 12:22:03 +0100
Subject: [PATCH 052/352] Assigns unique id to assessor assignment selects

---
 app/views/admin/form_answers/_assessors_section.html.slim | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/_assessors_section.html.slim b/app/views/admin/form_answers/_assessors_section.html.slim
index 788261729f..0e6d1e7747 100644
--- a/app/views/admin/form_answers/_assessors_section.html.slim
+++ b/app/views/admin/form_answers/_assessors_section.html.slim
@@ -31,7 +31,8 @@
           .form-fields
             = form.select :assessor_id,
                           available_assessors_for_select,
-                          { include_blank: true }
+                          { include_blank: true },
+                          id: 'assessor_assignment_primary_assessor_id'
 
           = link_to "#", class: "form-edit-link"
             span.glyphicon.glyphicon-pencil
@@ -61,7 +62,10 @@
                    authenticity_token: true do |form|
 
           .form-fields
-            = form.select :assessor_id, available_assessors_for_select, { include_blank: true }
+            = form.select :assessor_id,
+                          available_assessors_for_select,
+                          { include_blank: true },
+                          id: 'assessor_assignment_secondary_assessor_id'
           = link_to "#", class: "form-edit-link"
             span.glyphicon.glyphicon-pencil
             ' Edit

From 1d0dbe8d83e29913bb241c1b1a42dcca236b5c27 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 13:58:10 +0100
Subject: [PATCH 053/352] Adds unique id to file upload

---
 app/views/admin/audit_certificate/_form.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index 0393b6661d..9e067b8d4d 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -17,7 +17,7 @@
 
     .form-group
       label.form-label Document title
-      = form.text_field :attachment, class: "form-control attachment-title"
+      = form.text_field :attachment, class: "form-control attachment-title", id: "audit_certificate_attachment_input"
 
     .form-actions.text-right
       = link_to "Cancel", "#", class: "btn btn-default btn-cancel"

From a61f348fa0978ba3364cc7ba3b30465e5fdb082e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 10 Jul 2023 14:12:09 +0100
Subject: [PATCH 054/352] Fix word-wrap on long links when zoomed

---
 app/assets/stylesheets/admin/page-settings.scss | 1 +
 app/assets/stylesheets/frontend/layout.scss     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/admin/page-settings.scss b/app/assets/stylesheets/admin/page-settings.scss
index da82ee9151..9d24b6e12f 100644
--- a/app/assets/stylesheets/admin/page-settings.scss
+++ b/app/assets/stylesheets/admin/page-settings.scss
@@ -108,6 +108,7 @@
       max-width: none;
       a {
         text-decoration: underline;
+        overflow-wrap: break-word;
       }
     }
 
diff --git a/app/assets/stylesheets/frontend/layout.scss b/app/assets/stylesheets/frontend/layout.scss
index 34ad63f11d..769a92fa31 100644
--- a/app/assets/stylesheets/frontend/layout.scss
+++ b/app/assets/stylesheets/frontend/layout.scss
@@ -628,6 +628,7 @@ header.page-header aside .inner {
     &.sidebar-helpline {
       a {
         text-decoration: underline;
+        overflow-wrap: break-word;
       }
     }
   }

From c0764c2ef809e1a578df5d539719a5949d2c0d29 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:50:18 +0100
Subject: [PATCH 055/352] Adds unique ids for previous wins hidden field and
 form

---
 .../company_details/previous_wins/_form.html.slim             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
index c98078375b..28f8d7fb22 100644
--- a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
@@ -1,9 +1,9 @@
 = simple_form_for [namespace_name, @form_answer],
                   remote: true,
                   authenticity_token: true,
-                  html: { "data-type" => "html" } do |f|
+                  html: { "data-type" => "html", id: "previous_wins_form" } do |f|
 
-  = hidden_field_tag :section, "previous_wins"
+  = hidden_field_tag :section, "previous_wins", id: "previous_wins_section_hidden_field"
   .form-container
     = render "admin/form_answers/company_details/previous_wins/show"
 

From 5b7760beb24800356c6c07f169a28e08b0aecf6c Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 16:51:07 +0100
Subject: [PATCH 056/352] Adds unique id for admin comment textarea

---
 app/views/admin/comments/_form.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/comments/_form.html.slim b/app/views/admin/comments/_form.html.slim
index 4a79727a87..492dacfb36 100644
--- a/app/views/admin/comments/_form.html.slim
+++ b/app/views/admin/comments/_form.html.slim
@@ -1,10 +1,10 @@
 .form-container.comment-new
   label
     ' Add a comment
-  = f.hidden_field :section
+  = f.hidden_field :section, id: "#{f.object.section}_section_hidden_field"
   = f.text_area :body, id: "#{f.object.section}_comment_body", class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment"
   .comment-actions
-    = f.check_box :flagged
+    = f.check_box :flagged, id: "#{f.object.section}_flagged_hidden_checkbox"
     = link_to "#flag-comment", class: "link-flag-comment js-link-flag-comment"
       span.unflagged-visible
         ' Mark as flagged

From 7b98dff1b263b18362e69ef28ce9892631d17993 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:00:35 +0100
Subject: [PATCH 057/352] Adds unique id for admin comment form

---
 app/views/admin/form_answers/_section_admin_comments.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/_section_admin_comments.html.slim b/app/views/admin/form_answers/_section_admin_comments.html.slim
index d054b41c62..d248edcc1f 100644
--- a/app/views/admin/form_answers/_section_admin_comments.html.slim
+++ b/app/views/admin/form_answers/_section_admin_comments.html.slim
@@ -19,7 +19,7 @@
     .panel-body
       .comments-container data-comment-form=new_admin_form_answer_comment_path(@form_answer)
         - if !(defined? read_only)
-          = form_for([:admin, @form_answer, @form_answer.comments.new(section: "admin")]) do |f|
+          = form_for([:admin, @form_answer, @form_answer.comments.new(section: "admin")], html: { id: "admin_comment_form" }) do |f|
             = render('admin/comments/form', f: f)
           .comment-insert
         - if !(defined? read_only)

From 2df3894d5f9c9593487e8de5df202a14d7831790 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:02:49 +0100
Subject: [PATCH 058/352] Adds unique ids for primary appraisal section hidden
 field and form

---
 .../form_answers/_section_appraisal_form_primary.html.slim    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index ac587cf7c6..44f795349b 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -12,9 +12,9 @@
       = simple_form_for([namespace_name, primary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "json"}) do |f|
+                        html: { "data-type" => "json", id: "primary_appraisal_form" }) do |f|
 
-        = hidden_field_tag :updated_section
+        = hidden_field_tag :updated_section, nil, id: "primary_updated_section_hidden_field"
         = render_section(resource, f)
         = f.submit "Save changes", class: "if-js-hide btn btn-primary"
       .clear

From 69285f08cae2b9fc491de573786053cd79e71d4e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:03:16 +0100
Subject: [PATCH 059/352] Adds unique ids for secondary appraisal section
 hidden field and form

---
 .../form_answers/_section_appraisal_form_secondary.html.slim  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 41c5453011..367aeb26b5 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -12,9 +12,9 @@
       = simple_form_for([namespace_name, secondary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "json"}) do |f|
+                        html: { "data-type" => "json", id: "secondary_appraisal_form"}) do |f|
 
-        = hidden_field_tag :updated_section
+        = hidden_field_tag :updated_section, nil, id: "secondary_updated_section_hidden_field"
         = render_section(resource, f)
         = f.submit "Save changes", class: "if-js-hide btn btn-primary"
       .clear

From fe6568a6a9ee347a9a2bf51d3fd3ba7b89e0f223 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 10 Jul 2023 17:03:20 +0100
Subject: [PATCH 060/352] Adds button tags and roles to links on admin pages

---
 app/views/admin/dashboard/_applications_report.html.slim      | 2 +-
 .../admin/dashboard/totals_by_day/_registrations.html.slim    | 2 +-
 .../admin/dashboard/totals_by_month/_registrations.html.slim  | 2 +-
 .../admin/dashboard/totals_by_week/_registrations.html.slim   | 4 ++--
 app/views/admin/settings/_deadline_form.html.slim             | 4 ++--
 app/views/admin/settings/_email_notification.html.slim        | 4 ++--
 app/views/admin/settings/_schedule_new.html.slim              | 2 +-
 app/views/admin/settings/show.html.slim                       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index 15d7f7dcb6..44f48f55ae 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -1,5 +1,5 @@
 .dashboard-table__wrapper.dashboard-report
-  a.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
+  button.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
     | Load data
   button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
     | Updating data
diff --git a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
index 2da44c190b..3040fc8939 100644
--- a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
@@ -1,5 +1,5 @@
 .dashboard-table__wrapper.dashboard-report
-  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day") aria-label="Load data for new account registrations table"
+  button.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day") aria-label="Load data for new account registrations table"
     | Load data
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
diff --git a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
index 07fe16c3c8..ed6d8d4da3 100644
--- a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
@@ -1,5 +1,5 @@
 .dashboard-table__wrapper.dashboard-report
-  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month") aria-label="Load data for new account registrations table"
+  button.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month") aria-label="Load data for new account registrations table"
     | Load data
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
diff --git a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
index 61080abf6a..cbb416c7ac 100644
--- a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
@@ -1,5 +1,5 @@
 .dashboard-table__wrapper.dashboard-report
-  a.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week") aria-label="Load data for new account registrations table"
+  button.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week") aria-label="Load data for new account registrations table"
     | Load data
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
@@ -7,7 +7,7 @@
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations
-      
+
     thead
       tr
         th.bold.border-right width="150"
diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 6c74c52fd2..0efba686ce 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -18,11 +18,11 @@
                     input_html: { id: '' }
 
           .control-action
-            = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide"
+            = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button"
             input type="button" value="Save" class="btn btn-primary btn-submit"
         .clear
 
-    = link_to "Edit", "#", class: "edit-deadline if-no-js-hide"
+    = link_to "Edit", "#", class: "edit-deadline if-no-js-hide", role: "button"
 
     span.deadline-help
       - if deadline.help_message.present?
diff --git a/app/views/admin/settings/_email_notification.html.slim b/app/views/admin/settings/_email_notification.html.slim
index ada2d00cbf..6046dd061a 100644
--- a/app/views/admin/settings/_email_notification.html.slim
+++ b/app/views/admin/settings/_email_notification.html.slim
@@ -12,12 +12,12 @@
             = help_message
 
   p
-    = link_to "View email example", "#", class: "link-email-example if-no-js-hide"
+    = link_to "View email example", "#", class: "link-email-example if-no-js-hide", role: "button"
 
   .email-example.well
     = MailRenderer.new.public_send(kind)
 
-  = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide"
+  = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide", role: "button"
 
   .notification-form
     = render "schedule_new", notification: @settings.email_notifications.build(kind: kind), kind: kind
diff --git a/app/views/admin/settings/_schedule_new.html.slim b/app/views/admin/settings/_schedule_new.html.slim
index c4836b1f54..d35078aad6 100644
--- a/app/views/admin/settings/_schedule_new.html.slim
+++ b/app/views/admin/settings/_schedule_new.html.slim
@@ -13,6 +13,6 @@
                   input_html: { id: "" }
 
     .control-action
-      = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide"
+      = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button"
       = f.submit "Save", class: "btn btn-primary btn-submit"
     .clear
diff --git a/app/views/admin/settings/show.html.slim b/app/views/admin/settings/show.html.slim
index 01bb5f1093..a5358dea0f 100644
--- a/app/views/admin/settings/show.html.slim
+++ b/app/views/admin/settings/show.html.slim
@@ -7,7 +7,7 @@
     = render "layouts/admin_award_year"
 
     - if ::ServerEnvironment.local_or_dev_or_staging_server?
-      = link_to "Run Notifications", run_notifications_admin_settings_email_notifications_url, method: :post,
+      = button_to "Run Notifications", run_notifications_admin_settings_email_notifications_url, method: :post,
       class: "btn btn-primary"
   .clear
   br

From f699ef993bb68cddd8df569138ae46803e6c0343 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:04:04 +0100
Subject: [PATCH 061/352] Adds unique ids for submit appraisal form hidden
 field

---
 .../_submit_appraisal_form.html.slim                          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
index 4f103ede8d..1d7fe998a3 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
@@ -3,7 +3,7 @@
             authenticity_token: true,
             class: "submit-assessment")
 
-    = hidden_field_tag :assessment_id, assessment.id
+    = hidden_field_tag :assessment_id, assessment.id, id: "#{assessment.position}_assessment_id_submit_appraisal_form_hidden_field"
 
     .feedback-holder
 
@@ -18,7 +18,7 @@
     - unlock_url = namespace_name == :admin ? unlock_admin_assessment_submission_url(assessment) : unlock_assessor_assessment_submission_url(assessment)
 
     = form_tag unlock_url, method: :patch do
-      = hidden_field_tag :assessment_id, assessment.id
+      = hidden_field_tag :assessment_id, assessment.id, id: "#{assessment.position}_assessment_id_unlock_appraisal_form_hidden_field"
       .feedback-holder.alert.alert-success
         ' Assessment submitted
 

From 473d9400416a8f0154b16a31e8cbe717dc5ce505 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:04:30 +0100
Subject: [PATCH 062/352] Adds unique ids for rag section select

---
 .../appraisal_form_components/_rag_section.html.slim            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
index d2f220c661..7ad9781161 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
@@ -8,7 +8,7 @@
               as: :select,
               label: false,
               collection: form.options,
-              input_html: { class: "if-js-hide", "data-updated-section" => section.rate }
+              input_html: { class: "if-js-hide", "data-updated-section" => section.rate, id: "#{f.object.position}_#{section.desc}_select" }
 
     label.form-label.form-label-rag
       span.rag_section_label

From 465e16a99d5c551aa9ecbb3b5729a4f998bf4c13 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:04:50 +0100
Subject: [PATCH 063/352] Adds unique ids for verdict section select

---
 .../appraisal_form_components/_verdict_section.html.slim        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
index 0c12837bc7..250296f2a0 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
@@ -8,7 +8,7 @@
               as: :select,
               label: false,
               collection: form.options,
-              input_html: { class: "if-js-hide", "data-updated-section"  => section.desc}
+              input_html: { class: "if-js-hide", "data-updated-section"  => section.desc, id: "#{f.object.position}_#{section.desc}_select"}
 
     label.form-label.form-label-rag
       = section.label

From e215864133cab4506f8298ccb40606bad0ded596 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 10 Jul 2023 17:05:31 +0100
Subject: [PATCH 064/352] Adds unique ids for hidden field and form on company
 name section

---
 .../form_answers/company_details/_company_name_form.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/company_details/_company_name_form.html.slim b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
index 89ac3cff42..2b9cf4109b 100644
--- a/app/views/admin/form_answers/company_details/_company_name_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
@@ -4,9 +4,9 @@
     = simple_form_for [namespace_name, @form_answer],
                       remote: true,
                       authenticity_token: true,
-                      html: { "data-type" => "html", class: "company-name-form"} do |f|
+                      html: { "data-type" => "html", class: "company-name-form", id: "company-name-form-admin-appraisal"} do |f|
 
-      = hidden_field_tag :section, "company_name"
+      = hidden_field_tag :section, "company_name", id: "section_company_name_hidden_field"
       .form-container
         label.form-label = account_name
         .form-value

From c0dd6dfb97021d73321cd6b8b51968aeeb7ab8bd Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 09:25:26 +0100
Subject: [PATCH 065/352] Remove tab roles from collapsable components on
 Settings pages

---
 .../_application_submission_stage_deadlines.html.slim       | 4 ++--
 ...plication_submission_stage_email_notifications.html.slim | 4 ++--
 .../_award_year_open_stage_email_notifications.html.slim    | 4 ++--
 .../settings/deadlines/_final_stage_deadlines.html.slim     | 4 ++--
 .../deadlines/_final_stage_email_notifications.html.slim    | 4 ++--
 .../deadlines/_registration_stage_deadlines.html.slim       | 4 ++--
 .../deadlines/_shortlisted_stage_deadlines.html.slim        | 4 ++--
 .../_shortlisted_stage_email_notifications.html.slim        | 4 ++--
 app/views/admin/settings/show.html.slim                     | 2 +-
 .../settings/stages/_application_submission_stage.html.slim | 6 +++---
 app/views/admin/settings/stages/_final_stage.html.slim      | 6 +++---
 .../admin/settings/stages/_registration_stage.html.slim     | 6 +++---
 .../admin/settings/stages/_shortlisted_stage.html.slim      | 6 +++---
 13 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/app/views/admin/settings/deadlines/_application_submission_stage_deadlines.html.slim b/app/views/admin/settings/deadlines/_application_submission_stage_deadlines.html.slim
index 86fb8c30cd..594970b8b8 100644
--- a/app/views/admin/settings/deadlines/_application_submission_stage_deadlines.html.slim
+++ b/app/views/admin/settings/deadlines/_application_submission_stage_deadlines.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#application-submission-stage-deadlines-heading role="tab"
+  .panel-heading#application-submission-stage-deadlines-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-application-submission-stage" href="#section-application-submission-stage-deadlines" aria-expanded="true" aria-controls="section-application-submission-stage-deadlines"
         ' Deadlines
-  #section-application-submission-stage-deadlines.section-appraisal-form.section-application-submission-stage-deadlines.panel-collapse.collapse.in role="tabpanel" aria-labelledby="application-submission-stage-deadlines-heading"
+  #section-application-submission-stage-deadlines.section-appraisal-form.section-application-submission-stage-deadlines.panel-collapse.collapse.in aria-labelledby="application-submission-stage-deadlines-heading"
     .panel-body
       ul
         li = render 'deadline_form', kind: 'innovation_submission_start'
diff --git a/app/views/admin/settings/deadlines/_application_submission_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_application_submission_stage_email_notifications.html.slim
index 77c620f13c..ab41f92076 100644
--- a/app/views/admin/settings/deadlines/_application_submission_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_application_submission_stage_email_notifications.html.slim
@@ -1,8 +1,8 @@
 .panel.panel-default
-  .panel-heading#application-submission-stage-email-notifications-heading role="tab"
+  .panel-heading#application-submission-stage-email-notifications-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-application-submission-stage" href="#section-application-submission-stage-email-notifications" aria-expanded="true" aria-controls="section-application-submission-stage-email-notifications"
         ' Email notification
-  #section-application-submission-stage-email-notifications.section-appraisal-form.section-application-submission-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="application-submission-stage-email-notifications-heading"
+  #section-application-submission-stage-email-notifications.section-appraisal-form.section-application-submission-stage-email-notifications.panel-collapse.collapse.in aria-labelledby="application-submission-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'reminder_to_submit'
diff --git a/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim
index 3ceec94497..2b8266d5d6 100644
--- a/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_award_year_open_stage_email_notifications.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#open-stage-email-notifications-heading role="tab"
+  .panel-heading#open-stage-email-notifications-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-open-stage" href="#section-open-stage-email-notifications" aria-expanded="true" aria-controls="section-open-stage-email-notifications"
         ' Email notification
-  #section-open-stage-email-notifications.section-appraisal-form.section-open-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="open-stage-email-notifications-heading"
+  #section-open-stage-email-notifications.section-appraisal-form.section-open-stage-email-notifications.panel-collapse.collapse.in aria-labelledby="open-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'award_year_open_notifier'
       = render 'email_notification', kind: 'innovation_submission_started_notification'
diff --git a/app/views/admin/settings/deadlines/_final_stage_deadlines.html.slim b/app/views/admin/settings/deadlines/_final_stage_deadlines.html.slim
index 31a096104c..7447223b3a 100644
--- a/app/views/admin/settings/deadlines/_final_stage_deadlines.html.slim
+++ b/app/views/admin/settings/deadlines/_final_stage_deadlines.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#shortlisted-stage-deadlines-heading role="tab"
+  .panel-heading#shortlisted-stage-deadlines-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-shortlisted-stage" href="#section-shortlisted-stage-deadlines" aria-expanded="true" aria-controls="section-shortlisted-stage-deadlines"
         ' Deadlines
-  #section-shortlisted-stage-deadlines.section-appraisal-form.section-shortlisted-stage-deadlines.panel-collapse.collapse.in role="tabpanel" aria-labelledby="shortlisted-stage-deadlines-heading"
+  #section-shortlisted-stage-deadlines.section-appraisal-form.section-shortlisted-stage-deadlines.panel-collapse.collapse.in aria-labelledby="shortlisted-stage-deadlines-heading"
     .panel-body
       ul
         li = render 'deadline_form', kind: 'buckingham_palace_attendees_details'
diff --git a/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim
index d8fe0dc8a1..6767ce012b 100644
--- a/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_final_stage_email_notifications.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#final-stage-email-notifications-heading role="tab"
+  .panel-heading#final-stage-email-notifications-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-final-stage" href="#section-final-stage-email-notifications" aria-expanded="true" aria-controls="section-final-stage-email-notifications"
         ' Email notification
-  #section-final-stage-email-notifications.section-appraisal-form.section-final-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="final-stage-email-notifications-heading"
+  #section-final-stage-email-notifications.section-appraisal-form.section-final-stage-email-notifications.panel-collapse.collapse.in aria-labelledby="final-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'winners_notification'
       = render 'email_notification', kind: 'winners_head_of_organisation_notification'
diff --git a/app/views/admin/settings/deadlines/_registration_stage_deadlines.html.slim b/app/views/admin/settings/deadlines/_registration_stage_deadlines.html.slim
index c4fe6ef8eb..034b66d4fe 100644
--- a/app/views/admin/settings/deadlines/_registration_stage_deadlines.html.slim
+++ b/app/views/admin/settings/deadlines/_registration_stage_deadlines.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#registration-stage-deadlines-heading role="tab"
+  .panel-heading#registration-stage-deadlines-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-registration-stage" href="#section-registration-stage-deadlines" aria-expanded="true" aria-controls="section-registration-stage-deadlines"
         ' Deadlines
-  #section-registration-stage-deadlines.section-appraisal-form.section-registration-stage-deadlines.panel-collapse.collapse.in role="tabpanel" aria-labelledby="registration-stage-deadlines-heading"
+  #section-registration-stage-deadlines.section-appraisal-form.section-registration-stage-deadlines.panel-collapse.collapse.in aria-labelledby="registration-stage-deadlines-heading"
     .panel-body
       ul
         li = render 'deadline_form', kind: 'award_year_switch'
diff --git a/app/views/admin/settings/deadlines/_shortlisted_stage_deadlines.html.slim b/app/views/admin/settings/deadlines/_shortlisted_stage_deadlines.html.slim
index 9b67e24812..507695e98b 100644
--- a/app/views/admin/settings/deadlines/_shortlisted_stage_deadlines.html.slim
+++ b/app/views/admin/settings/deadlines/_shortlisted_stage_deadlines.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#final-stage-deadlines-heading role="tab"
+  .panel-heading#final-stage-deadlines-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-final-stage" href="#section-final-stage-deadlines" aria-expanded="true" aria-controls="section-final-stage-deadlines"
         ' Deadlines
-  #section-final-stage-deadlines.section-appraisal-form.section-final-stage-deadlines.panel-collapse.collapse.in role="tabpanel" aria-labelledby="final-stage-deadlines-heading"
+  #section-final-stage-deadlines.section-appraisal-form.section-final-stage-deadlines.panel-collapse.collapse.in aria-labelledby="final-stage-deadlines-heading"
     .panel-body
       ul
         li = render 'deadline_form', kind: 'audit_certificates'
diff --git a/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim b/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim
index 6edc4215b8..c61a50c7c5 100644
--- a/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim
+++ b/app/views/admin/settings/deadlines/_shortlisted_stage_email_notifications.html.slim
@@ -1,9 +1,9 @@
 .panel.panel-default
-  .panel-heading#shortlisted-stage-email-notifications-heading role="tab"
+  .panel-heading#shortlisted-stage-email-notifications-heading
     h2.panel-title
       a data-toggle="collapse" data-parent="#panel-shortlisted-stage" href="#section-shortlisted-stage-email-notifications" aria-expanded="true" aria-controls="section-shortlisted-stage-email-notifications"
         ' Email notification
-  #section-shortlisted-stage-email-notifications.section-appraisal-form.section-shortlisted-stage-email-notifications.panel-collapse.collapse.in role="tabpanel" aria-labelledby="shortlisted-stage-email-notifications-heading"
+  #section-shortlisted-stage-email-notifications.section-appraisal-form.section-shortlisted-stage-email-notifications.panel-collapse.collapse.in aria-labelledby="shortlisted-stage-email-notifications-heading"
     .panel-body
       = render 'email_notification', kind: 'shortlisted_notifier'
       = render 'email_notification', kind: 'shortlisted_po_sd_notifier'
diff --git a/app/views/admin/settings/show.html.slim b/app/views/admin/settings/show.html.slim
index 01bb5f1093..9e9f8045ba 100644
--- a/app/views/admin/settings/show.html.slim
+++ b/app/views/admin/settings/show.html.slim
@@ -12,7 +12,7 @@
   .clear
   br
 
-  .panel-group#admin-settings-parent role="tablist" aria-multiselectable="true"
+  .panel-group#admin-settings-parent
     = render "admin/settings/stages/registration_stage"
     = render "admin/settings/stages/application_submission_stage"
     = render "admin/settings/stages/shortlisted_stage"
diff --git a/app/views/admin/settings/stages/_application_submission_stage.html.slim b/app/views/admin/settings/stages/_application_submission_stage.html.slim
index bd235a4b19..7949628e3f 100644
--- a/app/views/admin/settings/stages/_application_submission_stage.html.slim
+++ b/app/views/admin/settings/stages/_application_submission_stage.html.slim
@@ -1,10 +1,10 @@
 .panel.panel-default.panel-parent
-  .panel-heading#application-submission-stage-heading role="tab"
+  .panel-heading#application-submission-stage-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#admin-settings" href="#application-submission-stage" aria-expanded="true" aria-controls="application-submission-stage"
         ' Application Submission Stage
-  #application-submission-stage.panel-collapse.collapse.in role="tabpanel" aria-labelledby="application-submission-stage-heading"
+  #application-submission-stage.panel-collapse.collapse.in aria-labelledby="application-submission-stage-heading"
     .panel-body
-      .panel-group#panel-application-submission-stage-parent role="tablist" aria-multiselectable="true"
+      .panel-group#panel-application-submission-stage-parent
         = render "admin/settings/deadlines/application_submission_stage_deadlines"
         = render "admin/settings/deadlines/application_submission_stage_email_notifications"
diff --git a/app/views/admin/settings/stages/_final_stage.html.slim b/app/views/admin/settings/stages/_final_stage.html.slim
index c9d2594da4..38c97d7ccc 100644
--- a/app/views/admin/settings/stages/_final_stage.html.slim
+++ b/app/views/admin/settings/stages/_final_stage.html.slim
@@ -1,10 +1,10 @@
 .panel.panel-default.panel-parent
-  .panel-heading role="tab" id="final-stage-header"
+  .panel-heading id="final-stage-header"
     h2.panel-title
       a.collapsed data-toggle="collapse" data-parent="#admin-settings" href="#final-stage" aria-expanded="false" aria-controls="final-stage"
         ' Final Stage
-  #final-stage.panel-collapse.collapse.in role="tabpanel" aria-labelledby="final-stage-header"
+  #final-stage.panel-collapse.collapse.in aria-labelledby="final-stage-header"
     .panel-body
-      .panel-group#panel-final-stage-parent role="tablist" aria-multiselectable="true"
+      .panel-group#panel-final-stage-parent
         = render "admin/settings/deadlines/final_stage_deadlines"
         = render "admin/settings/deadlines/final_stage_email_notifications"
diff --git a/app/views/admin/settings/stages/_registration_stage.html.slim b/app/views/admin/settings/stages/_registration_stage.html.slim
index 401f18cd10..ab0f0fe4e5 100644
--- a/app/views/admin/settings/stages/_registration_stage.html.slim
+++ b/app/views/admin/settings/stages/_registration_stage.html.slim
@@ -1,10 +1,10 @@
 .panel.panel-default.panel-parent
-  .panel-heading#registration-stage-heading role="tab"
+  .panel-heading#registration-stage-heading
     h2.panel-title
       a data-toggle="collapse" data-parent="#admin-settings" href="#registration-stage" aria-expanded="true" aria-controls="registration-stage"
         ' Registration Stage
-  #registration-stage.panel-collapse.collapse.in role="tabpanel" aria-labelledby="registration-stage-heading"
+  #registration-stage.panel-collapse.collapse.in aria-labelledby="registration-stage-heading"
     .panel-body
-      .panel-group#panel-registration-stage-parent role="tablist" aria-multiselectable="true"
+      .panel-group#panel-registration-stage-parent
         = render "admin/settings/deadlines/registration_stage_deadlines"
         = render "admin/settings/deadlines/award_year_open_stage_email_notifications"
diff --git a/app/views/admin/settings/stages/_shortlisted_stage.html.slim b/app/views/admin/settings/stages/_shortlisted_stage.html.slim
index 74be733c90..dafe9c1730 100644
--- a/app/views/admin/settings/stages/_shortlisted_stage.html.slim
+++ b/app/views/admin/settings/stages/_shortlisted_stage.html.slim
@@ -1,10 +1,10 @@
 .panel.panel-default.panel-parent
-  .panel-heading role="tab" id="shortlisted-stage-header"
+  .panel-heading id="shortlisted-stage-header"
     h2.panel-title
       a.collapsed data-toggle="collapse" data-parent="#admin-settings" href="#shortlisted-stage" aria-expanded="false" aria-controls="shortlisted-stage"
         ' Shortlisted Stage
-  #shortlisted-stage.panel-collapse.collapse.in role="tabpanel" aria-labelledby="shortlisted-stage-header"
+  #shortlisted-stage.panel-collapse.collapse.in aria-labelledby="shortlisted-stage-header"
     .panel-body
-      .panel-group#panel-shortlisted-stage-parent role="tablist" aria-multiselectable="true"
+      .panel-group#panel-shortlisted-stage-parent
         = render "admin/settings/deadlines/shortlisted_stage_deadlines"
         = render "admin/settings/deadlines/shortlisted_stage_email_notifications"

From 067ba08661449da2c5cd5f0e8bb667b044051c3e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 09:25:45 +0100
Subject: [PATCH 066/352] Remove tab roles from collapsable components on Users
 pages

---
 app/views/admin/users/_form.html.slim | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/admin/users/_form.html.slim b/app/views/admin/users/_form.html.slim
index d1aca920b4..d2bde7535e 100644
--- a/app/views/admin/users/_form.html.slim
+++ b/app/views/admin/users/_form.html.slim
@@ -1,49 +1,49 @@
 = simple_form_for [:admin, resource], html: { class: "qae-form" } do |f|
-  .panel-group#user-form-panel-parent role="tablist" aria-multiselectable="true"
+  .panel-group#user-form-panel-parent
     .panel.panel-default
-      .panel-heading#user-details-heading role="tab"
+      .panel-heading#user-details-heading
         h2.panel-title
           a data-toggle="collapse" data-parent="#user-form-panel" href="#user-details" aria-expanded="true" aria-controls="user-details"
             = controller_name == "users" ? "Applicant" : controller_name.singularize.titleize
             '  Details
-      #user-details.section-user-details.panel-collapse.collapse.in role="tabpanel" aria-labelledby="user-details-heading"
+      #user-details.section-user-details.panel-collapse.collapse.in aria-labelledby="user-details-heading"
         .panel-body
           = render "fields_user_details", f: f
 
     .panel.panel-default
-      .panel-heading role="tab" id="organisation-details-header"
+      .panel-heading id="organisation-details-header"
         h2.panel-title
           a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#organisation-details" aria-expanded="false" aria-controls="organisation-details"
             ' Organisation Details
-      #organisation-details.section-organisation-details.panel-collapse.collapse role="tabpanel" aria-labelledby="organisation-details-header"
+      #organisation-details.section-organisation-details.panel-collapse.collapse aria-labelledby="organisation-details-header"
         .panel-body
           = render "fields_organisation_details", f: f
 
     .panel.panel-default
-      .panel-heading role="tab" id="contact-preferences-header"
+      .panel-heading id="contact-preferences-header"
         h2.panel-title
           a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#contact-preferences" aria-expanded="false" aria-controls="contact-preferences"
             ' Contact Preferences
-      #contact-preferences.section-contact-preferences.panel-collapse.collapse role="tabpanel" aria-labelledby="contact-preferences-header"
+      #contact-preferences.section-contact-preferences.panel-collapse.collapse aria-labelledby="contact-preferences-header"
         .panel-body
           = render "fields_contact_preferences", f: f
 
     - unless action_name == "new"
       .panel.panel-default
-        .panel-heading role="tab" id="section-collaborators-header"
+        .panel-heading id="section-collaborators-header"
           h2.panel-title
             a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-collaborators" aria-expanded="false" aria-controls="section-collaborators"
               ' Collaborators
-        #section-collaborators.section-collaborators.panel-collapse.collapse role="tabpanel" aria-labelledby="section-collaborators-header"
+        #section-collaborators.section-collaborators.panel-collapse.collapse aria-labelledby="section-collaborators-header"
           .panel-body
             = render "fields_collaborators", f: f, resource: resource
 
     .panel.panel-default
-      .panel-heading role="tab" id="section-password-header"
+      .panel-heading id="section-password-header"
         h2.panel-title
           a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-password" aria-expanded="false" aria-controls="section-password"
             ' Password
-      #section-password.section-password.panel-collapse.collapse role="tabpanel" aria-labelledby="section-password-header"
+      #section-password.section-password.panel-collapse.collapse aria-labelledby="section-password-header"
         .panel-body
           = render "fields_password", f: f
 

From e2527f656b60bda5edc99c1a5c288f55387393d7 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 09:34:25 +0100
Subject: [PATCH 067/352] Remove tab roles from collapsable components on
 Appraisal page

---
 .../_section_admin_comments.html.slim         |  4 +--
 ...section_appraisal_form_moderated.html.slim |  4 +--
 .../_section_appraisal_form_primary.html.slim |  4 +--
 ...section_appraisal_form_secondary.html.slim |  4 +--
 .../_section_case_summary.html.slim           |  6 ++--
 .../_section_company_details.html.slim        |  4 +--
 .../_section_critical_comments.html.slim      |  4 +--
 .../_section_draft_notes.html.slim            |  4 +--
 .../_section_financial_summary.html.slim      |  4 +--
 .../_section_palace_attendees.html.slim       |  4 +--
 .../_section_press_summary.html.slim          |  4 +--
 .../form_answers/_submitted_view.html.slim    | 28 +++++++++----------
 12 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/app/views/admin/form_answers/_section_admin_comments.html.slim b/app/views/admin/form_answers/_section_admin_comments.html.slim
index d248edcc1f..97599014b9 100644
--- a/app/views/admin/form_answers/_section_admin_comments.html.slim
+++ b/app/views/admin/form_answers/_section_admin_comments.html.slim
@@ -1,5 +1,5 @@
 .panel.panel-default
-  .panel-heading#admin-comments-heading role="tab"
+  .panel-heading#admin-comments-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-application-info" href="#section-admin-comments" aria-expanded="true" aria-controls="section-admin-comments"
         ' Admin Comments
@@ -15,7 +15,7 @@
               - last_comment = @form_answer.comments.admin.first
               = "Updated by #{message_author_name(last_comment.author)} - #{l(last_comment.created_at, format: :date_at_time)}"
 
-  #section-admin-comments.section-admin-comments.panel-collapse.collapse role="tabpanel" aria-labelledby="admin-comments-heading"
+  #section-admin-comments.section-admin-comments.panel-collapse.collapse aria-labelledby="admin-comments-heading"
     .panel-body
       .comments-container data-comment-form=new_admin_form_answer_comment_path(@form_answer)
         - if !(defined? read_only)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index 05312b8071..7bbf273744 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -1,5 +1,5 @@
 .panel.panel-default
-  .panel-heading#appraisal-form-moderated-heading role="tab"
+  .panel-heading#appraisal-form-moderated-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-moderated" aria-expanded="true" aria-controls="section-appraisal-form-moderated"
         ' Appraisal Form (Moderated)
@@ -7,7 +7,7 @@
           small
             = moderated_assessment.last_editor_info
 
-  #section-appraisal-form-moderated.section-appraisal-form.section-appraisal-form-moderated.panel-collapse.collapse role="tabpanel" aria-labelledby="appraisal-form-moderated-heading"
+  #section-appraisal-form-moderated.section-appraisal-form.section-appraisal-form-moderated.panel-collapse.collapse aria-labelledby="appraisal-form-moderated-heading"
     .panel-body
       = simple_form_for([namespace_name, moderated_assessment],
                         remote: true,
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index 44f795349b..d56ca28429 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -1,12 +1,12 @@
 .panel.panel-default
-  .panel-heading#appraisal-form-primary-heading role="tab"
+  .panel-heading#appraisal-form-primary-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-primary" aria-expanded="true" aria-controls="section-appraisal-form-primary"
         ' Appraisal Form (Primary)
         - if primary_assessment.last_editor_info.present?
           small
             = primary_assessment.last_editor_info
-  #section-appraisal-form-primary.section-appraisal-form.section-appraisal-form-primary.panel-collapse.collapse role="tabpanel" aria-labelledby="appraisal-form-primary-heading"
+  #section-appraisal-form-primary.section-appraisal-form.section-appraisal-form-primary.panel-collapse.collapse aria-labelledby="appraisal-form-primary-heading"
     .panel-body
 
       = simple_form_for([namespace_name, primary_assessment],
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 367aeb26b5..69dd56706e 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -1,12 +1,12 @@
 .panel.panel-default
-  .panel-heading#appraisal-form-secondary-heading role="tab"
+  .panel-heading#appraisal-form-secondary-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-secondary" aria-expanded="true" aria-controls="section-appraisal-form-secondary"
         ' Appraisal Form (Secondary)
         - if secondary_assessment.last_editor_info.present?
           small
             = secondary_assessment.last_editor_info
-  #section-appraisal-form-secondary.section-appraisal-form.section-appraisal-form-secondary.panel-collapse.collapse role="tabpanel" aria-labelledby="appraisal-form-secondary-heading"
+  #section-appraisal-form-secondary.section-appraisal-form.section-appraisal-form-secondary.panel-collapse.collapse aria-labelledby="appraisal-form-secondary-heading"
     .panel-body
 
       = simple_form_for([namespace_name, secondary_assessment],
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index 52c0a058ab..7ed131b6fd 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -2,7 +2,7 @@
   - visible_case_summaries(current_subject, resource).each do |assessment_obj|
     - assessment = assessment_obj.assessment
     .panel.panel-parent
-      .panel-heading role="tab" id="case-summary-heading-#{assessment.position}"
+      .panel-heading id="case-summary-heading-#{assessment.position}"
         h4.panel-title
           a data-toggle="collapse" href="#section-case-summary-#{assessment.position}" aria-expanded="true" aria-controls="section-case-summary-#{assessment.position}"
             ' Case Summary (for recommended or reserved applications only)
@@ -11,7 +11,7 @@
             - if assessment.editable.present?
               small
                 = "Updated by #{message_author_name(assessment.editable)} - #{format_date(assessment.updated_at)}"
-      .panel-collapse.collapse role="tabpanel" aria-labelledby="case-summary-heading-#{assessment.position}" id="section-case-summary-#{assessment.position}" class="section-case-summary-#{assessment.position}"
+      .panel-collapse.collapse aria-labelledby="case-summary-heading-#{assessment.position}" id="section-case-summary-#{assessment.position}" class="section-case-summary-#{assessment.position}"
 
         .panel-body
           /.alert.alert-glyphicon.alert-info
@@ -27,7 +27,7 @@
             = render partial: "admin/form_answers/appraisal_form_components/application_background_section",
               locals: { f: f}
             = render_section(resource, f)
-            = hidden_field_tag :updated_section
+            = hidden_field_tag :updated_section, nil, id: "updated_section_#{assessment.position}"
             = f.submit "Save changes", class: "if-js-hide btn btn-primary"
 
           .clear
diff --git a/app/views/admin/form_answers/_section_company_details.html.slim b/app/views/admin/form_answers/_section_company_details.html.slim
index 73147ec23c..a60489900e 100644
--- a/app/views/admin/form_answers/_section_company_details.html.slim
+++ b/app/views/admin/form_answers/_section_company_details.html.slim
@@ -1,5 +1,5 @@
 .panel.panel-default
-  .panel-heading#company-details-heading role="tab"
+  .panel-heading#company-details-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-application-info" href="#section-company-details" aria-expanded="true" aria-controls="section-company-details"
         = @form_answer.promotion? ? "Nominee Details" : "Company Details"
@@ -8,7 +8,7 @@
             = "Updated by: #{resource.company_details_editable.decorate.full_name} - #{format_date(resource.company_details_updated_at)}"
 
 
-  #section-company-details.section-company-details.panel-collapse.collapse role="tabpanel" aria-labelledby="company-details-heading"
+  #section-company-details.section-company-details.panel-collapse.collapse aria-labelledby="company-details-heading"
     .panel-body.company-details-forms
       = render "admin/form_answers/company_details/company_name_form"
       = render "admin/form_answers/company_details/organisation_type_form"
diff --git a/app/views/admin/form_answers/_section_critical_comments.html.slim b/app/views/admin/form_answers/_section_critical_comments.html.slim
index c2f774e758..4369010663 100644
--- a/app/views/admin/form_answers/_section_critical_comments.html.slim
+++ b/app/views/admin/form_answers/_section_critical_comments.html.slim
@@ -1,5 +1,5 @@
 .panel.panel-default
-  .panel-heading#critical-comments-heading role="tab"
+  .panel-heading#critical-comments-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-critical-comments" aria-expanded="true" aria-controls="section-critical-comments"
         ' Critical Comments
@@ -15,7 +15,7 @@
               - last_comment = @form_answer.comments.critical.first
               = "Updated by #{message_author_name(last_comment.author)} - #{l(last_comment.created_at, format: :date_at_time)}"
 
-  #section-critical-comments.section-critical-comments.panel-collapse.collapse role="tabpanel" aria-labelledby="critical-comments-heading"
+  #section-critical-comments.section-critical-comments.panel-collapse.collapse aria-labelledby="critical-comments-heading"
     .panel-body
       .comments-container.comment-assessor
         = form_for([namespace_name, @form_answer, @form_answer.comments.new(section: "critical")]) do |f|
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index 94cc21bde6..81d85c3fb2 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -1,13 +1,13 @@
 - @form_answer.draft_note || @form_answer.build_draft_note
 
 .panel.panel-default
-  .panel-heading#draft-notes-heading role="tab"
+  .panel-heading#draft-notes-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-draft-notes" aria-expanded="true" aria-controls="section-draft-notes"
         ' Draft Notes
         - if @form_answer.draft_note.decorate.try(:last_updated_by).present?
           small= @form_answer.draft_note.decorate.try(:last_updated_by)
-  #section-draft-notes.section-draft-notes.panel-collapse.collapse role="tabpanel" aria-labelledby="draft-notes-heading"
+  #section-draft-notes.section-draft-notes.panel-collapse.collapse aria-labelledby="draft-notes-heading"
     .panel-body
       = simple_form_for([namespace_name, @form_answer, @form_answer.draft_note],
                         remote: true,
diff --git a/app/views/admin/form_answers/_section_financial_summary.html.slim b/app/views/admin/form_answers/_section_financial_summary.html.slim
index 512f01bff3..9c73ea4790 100644
--- a/app/views/admin/form_answers/_section_financial_summary.html.slim
+++ b/app/views/admin/form_answers/_section_financial_summary.html.slim
@@ -1,6 +1,6 @@
 - if !financial_pointer.period_length.zero? && @form_answer.submitted?
   .panel.panel-default
-    .panel-heading#financial-summary-heading role="tab"
+    .panel-heading#financial-summary-heading
       h4.panel-title
         a data-toggle="collapse" data-parent="#submitted-application" href="#financial-summary" aria-expanded="true" aria-controls="financial-summary"
           ' Financial Summary
@@ -11,7 +11,7 @@
               ' -
               = l @form_answer.financial_summary_updated_at.to_datetime, format: :date_at_time
 
-    #financial-summary.section-financial-summary.panel-collapse.collapse role="tabpanel" aria-labelledby="financial-summary-heading"
+    #financial-summary.section-financial-summary.panel-collapse.collapse aria-labelledby="financial-summary-heading"
       .panel-body
         = render "admin/form_answers/financials_review"
         = render "admin/form_answers/financial_summary/list", financial_pointer: financial_pointer
diff --git a/app/views/admin/form_answers/_section_palace_attendees.html.slim b/app/views/admin/form_answers/_section_palace_attendees.html.slim
index 00985f6eb4..e40693f72f 100644
--- a/app/views/admin/form_answers/_section_palace_attendees.html.slim
+++ b/app/views/admin/form_answers/_section_palace_attendees.html.slim
@@ -1,11 +1,11 @@
 - if @form_answer.palace_invite.present?
   - palace_invite = @form_answer.palace_invite
   .panel.panel-default
-    .panel-heading#palace-attendees-heading role="tab"
+    .panel-heading#palace-attendees-heading
       h4.panel-title
         a data-toggle="collapse" data-parent="#panel-winners" href="#section-palace-attendees" aria-expanded="true" aria-controls="section-palace-attendees"
           ' Palace Attendees
-    #section-palace-attendees.section-palace-attendees.panel-collapse.collapse role="tabpanel" aria-labelledby="palace-attendees-heading"
+    #section-palace-attendees.section-palace-attendees.panel-collapse.collapse aria-labelledby="palace-attendees-heading"
       .panel-body.if-no-js-hide
         - palace_invite.palace_attendees.build if palace_invite.palace_attendees.blank?
         - palace_invite.palace_attendees.each_with_index do |pa, index|
diff --git a/app/views/admin/form_answers/_section_press_summary.html.slim b/app/views/admin/form_answers/_section_press_summary.html.slim
index 88cceaf526..077ae971cc 100644
--- a/app/views/admin/form_answers/_section_press_summary.html.slim
+++ b/app/views/admin/form_answers/_section_press_summary.html.slim
@@ -1,11 +1,11 @@
 .panel.panel-default
-  .panel-heading#press-summary-heading role="tab"
+  .panel-heading#press-summary-heading
     h4.panel-title
       a data-toggle="collapse" data-parent="#panel-winners" href="#section-press-summary" aria-expanded="true" aria-controls="section-press-summary"
         ' Press Book Notes
         small.updated-by
           - if @form_answer.press_summary_updated_by
             = @form_answer.press_summary_updated_by
-  #section-press-summary.section-press-summary.panel-collapse.collapse role="tabpanel" aria-labelledby="press-summary-heading"
+  #section-press-summary.section-press-summary.panel-collapse.collapse aria-labelledby="press-summary-heading"
     .panel-body
       = render "admin/press_summaries/section", form_answer: @form_answer
diff --git a/app/views/admin/form_answers/_submitted_view.html.slim b/app/views/admin/form_answers/_submitted_view.html.slim
index 9bc0544551..dacb654402 100644
--- a/app/views/admin/form_answers/_submitted_view.html.slim
+++ b/app/views/admin/form_answers/_submitted_view.html.slim
@@ -1,26 +1,26 @@
 - title "Admin: Application #{@form_answer.urn.presence}"
 
-.panel-group#submitted-application-parent-parent role="tablist" aria-multiselectable="true"
+.panel-group#submitted-application-parent-parent
   .panel.panel-default.panel-parent
-    .panel-heading#application-info-heading role="tab"
+    .panel-heading#application-info-heading
       h4.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info"
           ' Application info
-    #section-application-info.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="application-info-heading"
+    #section-application-info.section-application-info.panel-collapse.collapse.in aria-labelledby="application-info-heading"
       .panel-body
-        .panel-group#panel-application-info-parent role="tablist" aria-multiselectable="true"
+        .panel-group#panel-application-info-parent
           = render "section_admin_comments"
           = render "section_company_details"
           = render "section_financial_summary"
 
   .panel.panel-default.panel-parent
-    .panel-heading#assessment-heading role="tab"
+    .panel-heading#assessment-heading
       h4.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment"
           ' Assessment
-    #section-assessment.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="assessment-heading"
+    #section-assessment.section-application-info.panel-collapse.collapse.in aria-labelledby="assessment-heading"
       .panel-body
-        .panel-group#panel-assessment-parent role="tablist" aria-multiselectable="true"
+        .panel-group#panel-assessment-parent
           = render "section_critical_comments"
           = render "section_draft_notes"
           = render "admin/form_answers/section_appraisal_form_primary"
@@ -32,7 +32,7 @@
 
   - if show_feedback_section?
     .panel.panel-default.panel-parent
-      .panel-heading#feedback-heading role="tab"
+      .panel-heading#feedback-heading
         h4.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback"
             ' Feedback (for not recommended applications only)
@@ -43,30 +43,30 @@
             - if @form_answer.feedback_updated_by
               small
                 = @form_answer.feedback_updated_by
-      #section-feedback.section-application-info.panel-collapse.collapse role="tabpanel" aria-labelledby="feedback-heading"
+      #section-feedback.section-application-info.panel-collapse.collapse aria-labelledby="feedback-heading"
         .panel-body
           = render "admin/feedbacks/section", form_answer: @form_answer
 
   - if show_winners_section?
     .panel.panel-default.panel-parent
-      .panel-heading#winners-heading role="tab"
+      .panel-heading#winners-heading
         h4.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners"
             ' Recipients
-      #section-winners.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="winners-heading"
+      #section-winners.section-application-info.panel-collapse.collapse.in aria-labelledby="winners-heading"
         .panel-body
-          .panel-group#panel-winners-parent role="tablist" aria-multiselectable="true"
+          .panel-group#panel-winners-parent
             - if show_press_summary_subsection?
               = render "section_press_summary"
             - if show_palace_attendees_subsection?
               = render "section_palace_attendees"
 
   .panel.panel-default.panel-parent
-    .panel-heading#logs-heading role="tab"
+    .panel-heading#logs-heading
       h4.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-logs" aria-expanded="true" aria-controls="section-logs"
           ' Application Audit Log
-    #section-logs.section-application-info.panel-collapse.collapse role="tabpanel" aria-labelledby="logs-heading"
+    #section-logs.section-application-info.panel-collapse.collapse aria-labelledby="logs-heading"
       .panel-body
         - @audit_events.reverse.each do |log|
           p = log.to_s

From 77c537bbea6a641cd210075fe0c3128444ee242a Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 11:15:29 +0100
Subject: [PATCH 068/352] Correct populate_comment_form to accept prefix now
 that ids are unique for comment textareas

---
 .../admin/form_answers/comments_management_spec.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/spec/features/admin/form_answers/comments_management_spec.rb b/spec/features/admin/form_answers/comments_management_spec.rb
index 8eff18f067..b015a20fa5 100644
--- a/spec/features/admin/form_answers/comments_management_spec.rb
+++ b/spec/features/admin/form_answers/comments_management_spec.rb
@@ -18,14 +18,14 @@
 
   it "adds the comment" do
     within admin_comments do
-      populate_comment_form
+      populate_comment_form("admin")
       expect { click_button "Comment" }.to change { Comment.count }.by(1)
     end
   end
 
   it "deletes the comment" do
     within admin_comments do
-      populate_comment_form
+      populate_comment_form("admin")
       click_button "Comment"
     end
 
@@ -36,7 +36,7 @@
 
   it "displays the comments" do
     within admin_comments do
-      populate_comment_form
+      populate_comment_form("admin")
       click_button "Comment"
       visit admin_form_answer_path(form_answer)
     end
@@ -49,7 +49,7 @@
         first("#admin-comments-heading a").click
 
         within admin_comments do
-          populate_comment_form
+          populate_comment_form("admin")
           find(".js-link-flag-comment").click
           click_button "Comment"
           expect(page).to have_selector(".comment-flagged", count: 1)
@@ -70,7 +70,7 @@
         first("#critical-comments-heading a").click
 
         within critical_comments do
-          populate_comment_form
+          populate_comment_form("critical")
           find(".js-link-flag-comment").click
           click_button "Comment"
 
@@ -84,8 +84,8 @@
 
   private
 
-  def populate_comment_form
-    fill_in("comment_body", with: "body")
+  def populate_comment_form(prefix)
+    fill_in("#{prefix}_comment_body", with: "body")
   end
 end
 # TODO: can be added as shared example per assessor

From 1f43626837246e7a5a7dbbbc9d20a9d8b5056a60 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 12:56:25 +0100
Subject: [PATCH 069/352] Correct tests for verdict and comments to accomodate
 new ids

---
 .../_verdict_section.html.slim                 |  2 +-
 .../shared_contexts/appraisal_form_context.rb  | 18 +++++++-----------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
index 250296f2a0..cdd0c28288 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
@@ -35,7 +35,7 @@
       .clear
     = f.input section.desc,
               wrapper_html: { class: 'form-group' },
-              input_html: {id: "#{f.object.position}_#{section.desc}_verdict", class: 'form-control js-char-count', rows: 5, "data-word-max" => 1200, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.id}-#{section.desc}"},
+              input_html: {id: "#{f.object.position}_verdict", class: 'form-control js-char-count', rows: 5, "data-word-max" => 1200, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.id}-#{section.desc}"},
               as: :text,
               label: false
 
diff --git a/spec/support/shared_contexts/appraisal_form_context.rb b/spec/support/shared_contexts/appraisal_form_context.rb
index de39078aac..3ac3f873df 100644
--- a/spec/support/shared_contexts/appraisal_form_context.rb
+++ b/spec/support/shared_contexts/appraisal_form_context.rb
@@ -30,9 +30,9 @@
 
     context "multiple descriptions change" do
       it "updates the form in separation" do
-        assert_multiple_description_change(primary, primary_header)
-        assert_multiple_description_change(secondary, secondary_header)
-        assert_multiple_description_change(moderated, moderated_header)
+        assert_multiple_description_change(primary, primary_header, "primary")
+        assert_multiple_description_change(secondary, secondary_header, "secondary")
+        assert_multiple_description_change(moderated, moderated_header, "moderated")
       end
     end
   end
@@ -106,7 +106,7 @@ def assert_description_change(section_id, header_id)
   within section_id do
     within ".#{selector}" do
       expect(page).to have_selector("textarea", count: 1)
-      fill_in(selector, with: text)
+      find("textarea").fill_in(with: text)
     end
     within parent_selector do
       find(".form-save-link").click
@@ -127,18 +127,14 @@ def assert_description_change(section_id, header_id)
   visit show_path
 end
 
-def assert_multiple_description_change(section_id, header_id)
+def assert_multiple_description_change(section_id, header_id, prefix)
   text = "should NOT be saved"
   text2 = "should be saved"
   find("#{header_id} .panel-title a").click
   take_a_nap
 
   within section_id do
-    unless section_id == moderated
-      fill_in("assessor_assignment_level_of_innovation_desc", with: text)
-    end
-
-    fill_in("assessor_assignment_verdict_desc", with: text2)
+    fill_in("#{prefix}_verdict", with: text2)
     all(".form-save-link").last.click
     wait_for_ajax
   end
@@ -152,7 +148,7 @@ def assert_multiple_description_change(section_id, header_id)
 
     all(".form-edit-link").last.click
 
-    expect(page.find("#assessor_assignment_verdict_desc").text).to eq  text2
+    expect(page.find("##{prefix}_verdict").text).to eq  text2
   end
 end
 

From f3478fb0ab5b315d72b1772cbd05c6b839bdace9 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 11 Jul 2023 14:38:10 +0100
Subject: [PATCH 070/352] Adds unique aria labels for buttons

---
 .../admin/settings/_deadline_form.html.slim   |  4 +--
 .../settings/_email_notification.html.slim    |  4 +--
 config/locales/en.yml                         | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 6c74c52fd2..5126420101 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -19,10 +19,10 @@
 
           .control-action
             = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide"
-            input type="button" value="Save" class="btn btn-primary btn-submit"
+            input type="button" value="Save" class="btn btn-primary btn-submit" aria-label="Save #{I18n.t("deadline_buttons.#{kind}")}"
         .clear
 
-    = link_to "Edit", "#", class: "edit-deadline if-no-js-hide"
+    = link_to "Edit", "#", class: "edit-deadline if-no-js-hide", aria: {label: "Edit #{I18n.t("deadline_buttons.#{kind}")}"}
 
     span.deadline-help
       - if deadline.help_message.present?
diff --git a/app/views/admin/settings/_email_notification.html.slim b/app/views/admin/settings/_email_notification.html.slim
index ada2d00cbf..c218575b05 100644
--- a/app/views/admin/settings/_email_notification.html.slim
+++ b/app/views/admin/settings/_email_notification.html.slim
@@ -12,12 +12,12 @@
             = help_message
 
   p
-    = link_to "View email example", "#", class: "link-email-example if-no-js-hide"
+    = link_to "View email example", "#", class: "link-email-example if-no-js-hide", aria: {label: "View #{I18n.t("email_buttons.#{kind}")} example"}
 
   .email-example.well
     = MailRenderer.new.public_send(kind)
 
-  = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide"
+  = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide", aria: {label: "Schedule #{I18n.t("email_buttons.#{kind}")}"}
 
   .notification-form
     = render "schedule_new", notification: @settings.email_notifications.build(kind: kind), kind: kind
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1cace5259d..6cf5e34d57 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -145,6 +145,38 @@ en:
     buckingham_palace_attendees_invite: Buckingham Palace Reception on
     audit_certificates: Additional Financials documents due by
 
+  deadline_buttons:
+    award_year_switch: "award year opening date"
+    innovation_submission_start: "Innovation submission period start date"
+    trade_submission_start: "International Trade submission period start date"
+    development_submission_start: "Sustainable Development submission period start date"
+    mobility_submission_start: "Promoting Opportunity submission period start date"
+    submission_end: "submission period end date"
+    audit_certificates: "additional financial documents due by date"
+    buckingham_palace_attendees_details: "end of embargo date"
+    buckingham_palace_media_information: "media information presentation date"
+    buckingham_palace_confirm_press_book_notes: "deadline for recipients to finalise the press release"
+    buckingham_palace_reception_attendee_information_due_by: "deadline for recipients to finalise palace attendees"
+    buckingham_palace_attendees_invite: "palace reception date"
+
+  email_buttons:
+    award_year_open_notifier: "new award year open notification"
+    innovation_submission_started_notification: "Innovation applications open notification"
+    trade_submission_started_notification: "International Trade applications open notification"
+    development_submission_started_notification: "Sustainable Development applications open notification"
+    mobility_submission_started_notification: "Promoting Opportunites applications open notification"
+    reminder_to_submit: "reminder to submit applications notification"
+    shortlisted_notifier: "shortlisted notification for Innovation and International Trade applications"
+    shortlisted_po_sd_notifier: "shortlisted notification for Sustainable Development and Promoting Opportunities applications with estimated figures"
+    shortlisted_po_sd_with_actual_figures_notifier: "shortlisted notification for sustainable development and promoting opportunities applications with actual figures"
+    shortlisted_audit_certificate_reminder: "reminder notification for Innovation and International Trade applications to supply Verification of Commercial Figures"
+    shortlisted_po_sd_reminder: "reminder notification for Sustainable Development and Promoting Opportunities applications to supply financial statements"
+    not_shortlisted_notifier: "notification to unsuccessful applicants"
+    winners_notification: "notification to successful applicants"
+    winners_head_of_organisation_notification: "notification to head of successful applications"
+    buckingham_palace_invite: "palace invite notification"
+    unsuccessful_notification: "notification to unsuccessful applicants"
+
   deadline_help_messages:
     award_year_switch: "This date marks the start of the new award year, and will update the website accordingly. Users will not yet be able to start any applications"
     submission_start: "This date is when the applications for the current award year become available."

From bb7978b812edc986cb8648f6e7b63ab619cfbb53 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 14:39:58 +0100
Subject: [PATCH 071/352] Darken red and amber colours further

---
 app/assets/stylesheets/admin/_variables.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index eff616a8cd..88a3197d11 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -13,8 +13,8 @@ $grey-tab-hover:  #666;
 $grey-panel:      #dadad9;
 $white-true:      #fff;
 $green:           #5C802D;
-$amber:           #A86500;
-$red:             #e30613;
+$amber:           #995C00;
+$red:             #A0030E;
 $blue:            #3276b1;
 $selectable:      #e3e3e3;
 

From 02151115c75c0fc85170491ff9d84636487ede79 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 11 Jul 2023 17:41:32 +0100
Subject: [PATCH 072/352] Darkens green

---
 app/assets/stylesheets/admin/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index 88a3197d11..991b69736b 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -12,7 +12,7 @@ $grey-tab:        #aaa;
 $grey-tab-hover:  #666;
 $grey-panel:      #dadad9;
 $white-true:      #fff;
-$green:           #5C802D;
+$green:           #3E541D;
 $amber:           #995C00;
 $red:             #A0030E;
 $blue:            #3276b1;

From 15b6bfe91e5c3aabfb19024f6ee1bf16bff0022f Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 12 Jul 2023 13:50:44 +0100
Subject: [PATCH 073/352] Adds unique ids to forms and hidden fields on admin
 appraisal view

---
 .../form_answers/company_details/_address_form.html.slim     | 4 ++--
 .../company_details/_company_name_form.html.slim             | 2 +-
 .../company_details/_date_trading_form.html.slim             | 4 ++--
 .../company_details/_goods_services_form.html.slim           | 4 ++--
 .../company_details/_organisation_head_form.html.slim        | 4 ++--
 .../company_details/_organisation_type_form.html.slim        | 4 ++--
 .../company_details/_registration_number_form.html.slim      | 4 ++--
 .../admin/form_answers/company_details/_sic_form.html.slim   | 5 +++--
 .../company_details/_this_entry_relates_to_form.html.slim    | 4 ++--
 .../form_answers/company_details/_website_form.html.slim     | 4 ++--
 .../company_details/parent_company/_form.html.slim           | 2 +-
 11 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/app/views/admin/form_answers/company_details/_address_form.html.slim b/app/views/admin/form_answers/company_details/_address_form.html.slim
index 61d85b3461..6d379d4206 100644
--- a/app/views/admin/form_answers/company_details/_address_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_address_form.html.slim
@@ -33,7 +33,7 @@
         - if user_can_edit(@form_answer, :address)
           = simple_form_for([namespace_name, resource],
                             remote: true,
-                            authenticity_token: true, html: { "data-type" => "html" }) do |f|
+                            authenticity_token: true, html: { "data-type" => "html", id: "address_form_admin_appraisal" }) do |f|
 
             = hidden_field_tag :section, "address"
             .input.form-group.form-fields.form-block
@@ -148,7 +148,7 @@
                           remote: true,
                           authenticity_token: true, html: { "data-type" => "html" }) do |f|
 
-          = hidden_field_tag :section, "address"
+          = hidden_field_tag :section, "address", id: "section_address_hidden_field"
           .input.form-group.form-fields.form-block
             = f.simple_fields_for(:data) do |f|
               - if @form_answer.promotion?
diff --git a/app/views/admin/form_answers/company_details/_company_name_form.html.slim b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
index 2b9cf4109b..720f735125 100644
--- a/app/views/admin/form_answers/company_details/_company_name_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
@@ -4,7 +4,7 @@
     = simple_form_for [namespace_name, @form_answer],
                       remote: true,
                       authenticity_token: true,
-                      html: { "data-type" => "html", class: "company-name-form", id: "company-name-form-admin-appraisal"} do |f|
+                      html: { "data-type" => "html", class: "company-name-form", id: "company_name_form_admin_appraisal"} do |f|
 
       = hidden_field_tag :section, "company_name", id: "section_company_name_hidden_field"
       .form-container
diff --git a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
index 5878edbf3c..81a1baa16b 100644
--- a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
@@ -3,8 +3,8 @@
     .form-group
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html" } do |f|
-        = hidden_field_tag :section, "date_trading"
+                        authenticity_token: true, html: { "data-type" => "html", id: "date_trading_form_admin_appraisal" } do |f|
+        = hidden_field_tag :section, "date_trading", id: "section_date_trading_hidden_field"
 
         .form-container
           label.form-label Date started trading
diff --git a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
index 7e9f5ed48f..53b81cf884 100644
--- a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
@@ -15,8 +15,8 @@
                   p
                     = service["desc_short"]
       - if user_can_edit(@form_answer, :goods_services)
-        = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { "data-type" => "html" } do |f|
-          = hidden_field_tag :section, "goods_services"
+        = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { "data-type" => "html", id: "goods_services_form_admin_appraisal" } do |f|
+          = hidden_field_tag :section, "goods_services", id: "section_goods_services_hidden_field"
           .form-fields.form-block
             = f.simple_fields_for(:data) do |f|
               - if !@form_answer.trade?
diff --git a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
index 6efe75aa7a..2944064d93 100644
--- a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
@@ -3,8 +3,8 @@
     .form-group
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html" } do |f|
-        = hidden_field_tag :section, "organisation_head"
+                        authenticity_token: true, html: { "data-type" => "html", id: "organisation_head_form_admin_appraisal" } do |f|
+        = hidden_field_tag :section, "organisation_head", id: "section_organisation_head_hidden_field"
 
         .form-container
           label.form-label Head of organisation
diff --git a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
index 1ada741e8e..fb328ae878 100644
--- a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
@@ -5,8 +5,8 @@
     .form-group class="#{'form-edit' if @form_answer.organisation_type.blank?}"
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html" } do |f|
-        = hidden_field_tag :section, "organisation_type"
+                        authenticity_token: true, html: { "data-type" => "html", id: "organisation_type_form_admin_appraisal" } do |f|
+        = hidden_field_tag :section, "organisation_type", id: "section_organisation_type_hidden_field"
 
         .form-container
           label.form-label = title
diff --git a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
index 16cbbd52ad..9a8893ec7b 100644
--- a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
@@ -4,8 +4,8 @@
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "html", class: "registration-number-form"} do |f|
-        = hidden_field_tag :section, "registration_number"
+                        html: { "data-type" => "html", class: "registration-number-form", id: "registration_number_form_admin_appraisal" } do |f|
+        = hidden_field_tag :section, "registration_number", id: "section_registration_number_hidden_field"
         .form-container
           label.form-label Company/charity registration number
 
diff --git a/app/views/admin/form_answers/company_details/_sic_form.html.slim b/app/views/admin/form_answers/company_details/_sic_form.html.slim
index 9d8b416b5d..056fef66c9 100644
--- a/app/views/admin/form_answers/company_details/_sic_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_sic_form.html.slim
@@ -6,9 +6,10 @@
     .form-group.sic-code class="#{'form-edit' if @form_answer.sic_code.blank?}"
       = simple_form_for [namespace_name, @form_answer],
                         remote: true,
-                        authenticity_token: true do |f|
+                        authenticity_token: true,
+                        html: { "data-type" => "html", id: "sic_code_form_admin_appraisal" } do |f|
 
-        = hidden_field_tag :section, "sic_code"
+        = hidden_field_tag :section, "sic_code", id: "section_sic_code_hidden_field"
 
         .form-container
           label.form-label SIC code
diff --git a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
index 084ec9ef75..d9c9f84372 100644
--- a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
@@ -5,8 +5,8 @@
     .form-group class="#{'form-edit' if @form_answer.this_entry_relates_to.blank?}"
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html" } do |f|
-        = hidden_field_tag :section, "this_entry_relates_to"
+                        authenticity_token: true, html: { "data-type" => "html", id: "this_entry_relates_to_form_admin_apprraisal" } do |f|
+        = hidden_field_tag :section, "this_entry_relates_to", id: "section_this_entry_relates_to_hidden_field"
 
         .form-container
           label.form-label = title
diff --git a/app/views/admin/form_answers/company_details/_website_form.html.slim b/app/views/admin/form_answers/company_details/_website_form.html.slim
index 565b51089d..2d899c3162 100644
--- a/app/views/admin/form_answers/company_details/_website_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_website_form.html.slim
@@ -3,8 +3,8 @@
     .form-group class="#{'form-edit' if @form_answer.website_url.blank?}"
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html" } do |f|
-        = hidden_field_tag :section, "website"
+                        authenticity_token: true, html: { "data-type" => "html", id: "website_form_admin_appraisal" } do |f|
+        = hidden_field_tag :section, "website", id: "section_website_hidden_field"
 
         .form-container
           label.form-label Website address
diff --git a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
index 956336f522..84607b3a57 100644
--- a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
@@ -2,7 +2,7 @@
   = simple_form_for [namespace_name, resource],
                     remote: true,
                     authenticity_token: true, html: { "data-type" => "html" } do |f|
-    = hidden_field_tag :section, "parent_company"
+    = hidden_field_tag :section, "parent_company", id: "section_parent_company_hidden_field"
 
     .form-container
       = render "admin/form_answers/company_details/parent_company/show"

From b76ce576a5539936b067b196804aa437209fee38 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:08:14 +0100
Subject: [PATCH 074/352] Add unique id for bulk assignment checkboxes

---
 app/views/assessor/form_answers/_list_body.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/assessor/form_answers/_list_body.html.slim b/app/views/assessor/form_answers/_list_body.html.slim
index 2de43a1a6b..11f9df9a4f 100644
--- a/app/views/assessor/form_answers/_list_body.html.slim
+++ b/app/views/assessor/form_answers/_list_body.html.slim
@@ -2,7 +2,7 @@ tbody
   - FormAnswerDecorator.decorate_collection(@form_answers).each do |obj|
     tr
       - if current_subject.categories_as_lead.include?(category_picker.current_award_type)
-        td = check_box_tag :check, obj.id, false, class: "form-answer-check", aria: { label: "Select nomination #{obj.id} for bulk action" }
+        td = check_box_tag :check, obj.id, false, class: "form-answer-check", id: "check_nominiation_#{obj.id}", aria: { label: "Select nomination #{obj.id} for bulk action" }
 
       td.td-title
         - unless obj.company_or_nominee_name.nil?

From 20c7cc8cb3e19067aa1836a319e3f37fc38e450a Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:35:03 +0100
Subject: [PATCH 075/352] Update
 app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim

Co-authored-by: Louis Kirkham <65811538+TheDancingClown@users.noreply.github.com>
---
 .../company_details/_this_entry_relates_to_form.html.slim       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
index d9c9f84372..0b7b5547c7 100644
--- a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
@@ -5,7 +5,7 @@
     .form-group class="#{'form-edit' if @form_answer.this_entry_relates_to.blank?}"
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html", id: "this_entry_relates_to_form_admin_apprraisal" } do |f|
+                        authenticity_token: true, html: { "data-type" => "html", id: "this_entry_relates_to_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "this_entry_relates_to", id: "section_this_entry_relates_to_hidden_field"
 
         .form-container

From ecca59ebe020e31b7a2955b76409b2aa9f29e0f1 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 12 Jul 2023 14:35:14 +0100
Subject: [PATCH 076/352] Update
 app/views/assessor/form_answers/_list_body.html.slim

Co-authored-by: Louis Kirkham <65811538+TheDancingClown@users.noreply.github.com>
---
 app/views/assessor/form_answers/_list_body.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/assessor/form_answers/_list_body.html.slim b/app/views/assessor/form_answers/_list_body.html.slim
index 11f9df9a4f..3d22b8fbb0 100644
--- a/app/views/assessor/form_answers/_list_body.html.slim
+++ b/app/views/assessor/form_answers/_list_body.html.slim
@@ -2,7 +2,7 @@ tbody
   - FormAnswerDecorator.decorate_collection(@form_answers).each do |obj|
     tr
       - if current_subject.categories_as_lead.include?(category_picker.current_award_type)
-        td = check_box_tag :check, obj.id, false, class: "form-answer-check", id: "check_nominiation_#{obj.id}", aria: { label: "Select nomination #{obj.id} for bulk action" }
+        td = check_box_tag :check, obj.id, false, class: "form-answer-check", id: "check_nomination_#{obj.id}", aria: { label: "Select nomination #{obj.id} for bulk action" }
 
       td.td-title
         - unless obj.company_or_nominee_name.nil?

From e0f767238a167ae7e68281334d24aa6b50816697 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 12 Jul 2023 16:10:45 +0100
Subject: [PATCH 077/352] Add aria-hidden attribute to hidden form fields

---
 app/views/assessor/form_answers/index.html.slim | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/views/assessor/form_answers/index.html.slim b/app/views/assessor/form_answers/index.html.slim
index 7c656c7d85..9b0057a42e 100644
--- a/app/views/assessor/form_answers/index.html.slim
+++ b/app/views/assessor/form_answers/index.html.slim
@@ -32,23 +32,25 @@ h1.admin-page-heading
 
 = simple_form_for @search, url: assessor_form_answers_path, method: :get, as: :search, html: { class: 'search-form', id: 'application_table_search_form' } do |f|
   = hidden_field_tag :award_type, category_picker.current_award_type, id: "award_type_application_table_search_form"
-  label for="year" class="visuallyhidden"
+  label for="year" class="visuallyhidden" aria-hidden="true"
     ' Award year
-  = text_field_tag :year, @award_year.year, class: "visuallyhidden"
+  = text_field_tag :year, @award_year.year, class: "visuallyhidden", aria: { hidden: true }
 
   - # status filters need to be here because the filtering is done in the other form above, so in order not to break filtering, we need to duplicate it here
   = f.simple_fields_for [:filters, @search.filters] do |h|
-    = h.label :status, class: "visuallyhidden", for: "status_application_table_search_form"
+    = h.label :status, class: "visuallyhidden", for: "status_application_table_search_form", aria: { hidden: true }
     = h.input :status,
               collection: FormAnswerStatus::AssessorFilter.options,
               label: false,
-              input_html: { multiple: true, class: 'visuallyhidden', id: 'status_application_table_search_form' }
+              input_html: { multiple: true, class: 'visuallyhidden', id: 'status_application_table_search_form' },
+              aria: { hidden: true }
 
-    = h.label :sub_status, class: "visuallyhidden", for: "sub_status_application_table_search_form"
+    = h.label :sub_status, class: "visuallyhidden", for: "sub_status_application_table_search_form", aria: { hidden: true }
     = h.input :sub_status,
               collection: FormAnswerStatus::AssessorFilter.sub_options(current_assessor),
               label: false,
-              input_html: { multiple: true, class: 'visuallyhidden', id: 'sub_status_application_table_search_form'}
+              input_html: { multiple: true, class: 'visuallyhidden', id: 'sub_status_application_table_search_form'},
+              aria: { hidden: true }
 
   .row
     .col-xs-12

From a3b768abb5d06d508d3cb5ec13e0e314e20367dc Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 13 Jul 2023 09:29:49 +0100
Subject: [PATCH 078/352] removes placeholder and adds label to search input

---
 app/assets/stylesheets/admin/page-applications.scss |  2 +-
 app/views/admin/form_answers/index.html.slim        | 12 +++++++-----
 app/views/admin/users/index.html.slim               |  8 +++++---
 app/views/assessor/form_answers/index.html.slim     | 12 +++++++-----
 4 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 5ad8416fd7..1368f55844 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -7,7 +7,7 @@
 .applications-filter {
   margin-bottom: 20px;
 
-  .applications-filter__label {
+  .applications-filter__label, .search-input__label {
     display: block;
     text-transform: uppercase;
     padding-right: 10px;
diff --git a/app/views/admin/form_answers/index.html.slim b/app/views/admin/form_answers/index.html.slim
index 09ec2c8263..2831dafc5e 100644
--- a/app/views/admin/form_answers/index.html.slim
+++ b/app/views/admin/form_answers/index.html.slim
@@ -2,13 +2,15 @@
 
 h1.admin-page-heading
   | Applications
-= simple_form_for @search, url: admin_form_answers_path, method: :get, as: :search, html: { class: 'search-form'} do |f|
+= simple_form_for @search, url: admin_form_answers_path, method: :get, as: :search, html: { class: 'search-form' } do |f|
   .row
     .col-md-4.col-sm-5.col-xs-12
-      .form-group.search-input
-        = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { label: "Search applications" }
-        = f.input :query, label: false, input_html: { class: "form-control", placeholder: "Search...", type: "search", aria: {label: 'Search applications'} }
-        = submit_tag :submit, class: 'search-submit'
+      .applications-filter
+        = f.label :query, "Search", class: "search-input__label"
+        .form-group.search-input
+          = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { hidden: true }
+          = f.input :query, label: false, input_html: { class: "form-control", type: "search", aria: { label: 'Search applications' }}
+          = submit_tag :submit, class: 'search-submit'
 
   = render "shared/form_answers/top_statuses_filters", f: f,
                                                        options: FormAnswerStatus::AdminFilter.options,
diff --git a/app/views/admin/users/index.html.slim b/app/views/admin/users/index.html.slim
index 33f893e8ec..5524eed8c4 100644
--- a/app/views/admin/users/index.html.slim
+++ b/app/views/admin/users/index.html.slim
@@ -8,9 +8,11 @@
 
     .row
       .col-md-4.col-sm-5.col-xs-12
-        .form-group.search-input
-          = f.input :query, label: false, input_html: { class: "form-control", placeholder: "Search...", type: "search", aria: { label: "Search users" } }
-          = submit_tag :submit, class: 'search-submit'
+        .applications-filter
+          = f.label :query, "Search", class: "search-input__label"
+          .form-group.search-input
+            = f.input :query, label: false, input_html: { class: "form-control", type: "search", aria: { label: "Search users" } }
+            = submit_tag :submit, class: 'search-submit'
 
       .col-md-3.col-sm-4.col-xs-12.pull-right.text-right
         = link_to public_send("new_admin_#{controller_name.singularize}_path"), class: 'new-user btn btn-secondary btn-md' do
diff --git a/app/views/assessor/form_answers/index.html.slim b/app/views/assessor/form_answers/index.html.slim
index 7c656c7d85..33c3a850d7 100644
--- a/app/views/assessor/form_answers/index.html.slim
+++ b/app/views/assessor/form_answers/index.html.slim
@@ -5,11 +5,13 @@ h1.admin-page-heading
 = simple_form_for @search, url: assessor_form_answers_path, method: :get, as: :search do |f|
   .row
     .col-md-4.col-sm-5.col-xs-12
-      .form-group.search-input
-        = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { hidden: true }, id: "award_year", tabindex: "-1"
-        = text_field_tag :award_type, params[:award_type], class: "visuallyhidden", aria: { hidden: true }, tabindex: "-1"
-        = f.input :query, label: false, input_html: { class: "form-control", placeholder: "Search...", type: "search", aria: {label: 'Search applications'} }
-        = submit_tag :submit, class: 'search-submit'
+      .applications-filter
+        = f.label :query, "Search", class: "search-input__label"
+        .form-group.search-input
+          = text_field_tag :year, params[:year] || @award_year.year, class: "visuallyhidden", aria: { hidden: true }, id: "award_year", tabindex: "-1"
+          = text_field_tag :award_type, params[:award_type], class: "visuallyhidden", aria: { hidden: true }, tabindex: "-1"
+          = f.input :query, label: false, input_html: { class: "form-control", type: "search", aria: {label: 'Search applications'} }
+          = submit_tag :submit, class: 'search-submit'
 
   = render "shared/form_answers/top_statuses_filters", f: f,
                                                       options: FormAnswerStatus::AssessorFilter.options,

From 4745433911dee9752809fe7649fed4e47f3c5b99 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 13 Jul 2023 09:56:09 +0100
Subject: [PATCH 079/352] Change apply button border color on focus for
 contrast

---
 app/assets/stylesheets/admin/page-applications.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 1368f55844..602b88a031 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -60,6 +60,10 @@
       li.checkbox,
       li.apply {
         padding: 0 10px;
+        
+        .btn:focus {
+          border-color: #5C5C5C;
+        }
       }
     }
   }

From 32ac61bd403b88a09c83cb3160bc37e70ee08df3 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 13 Jul 2023 09:58:15 +0100
Subject: [PATCH 080/352] Correct level headings on assessor appraisal view

---
 .../assessor/form_answers/_submitted_view.html.slim    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/assessor/form_answers/_submitted_view.html.slim b/app/views/assessor/form_answers/_submitted_view.html.slim
index 8eed21f37b..d0c8ea2df2 100644
--- a/app/views/assessor/form_answers/_submitted_view.html.slim
+++ b/app/views/assessor/form_answers/_submitted_view.html.slim
@@ -1,7 +1,7 @@
 .panel-group#submitted-application-parent role="tablist" aria-multiselectable="true"
   .panel.panel-default.panel-parent
     .panel-heading#application-info-heading role="tab"
-      h4.panel-title
+      h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info"
           ' Application info
     #section-application-info.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="application-info-heading"
@@ -13,7 +13,7 @@
 
   .panel.panel-default.panel-parent
     .panel-heading#assessment-heading role="tab"
-      h4.panel-title
+      h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment"
           ' Assessment
     #section-assessment.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="assessment-heading"
@@ -34,7 +34,7 @@
   - if show_feedback_section?
     .panel.panel-default.panel-parent
       .panel-heading#feedback-heading role="tab"
-        h4.panel-title
+        h2.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback"
             ' Feedback (for not recommended applications only)
             small.panel-subtitle-small
@@ -51,7 +51,7 @@
   - if show_winners_section?
     .panel.panel-default.panel-parent
       .panel-heading#winners-heading role="tab"
-        h4.panel-title
+        h2.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners"
             ' Recipients
       #section-winners.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="winners-heading"
@@ -64,7 +64,7 @@
 
   .panel.panel-default.panel-parent
     .panel-heading#logs-heading role="tab"
-      h4.panel-title
+      h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-logs" aria-expanded="true" aria-controls="section-logs"
           ' Application Audit Log
     #section-logs.section-application-info.panel-collapse.collapse role="tabpanel" aria-labelledby="logs-heading"

From d766a02d72668b36def1380690efe5ea1dab956e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 13 Jul 2023 09:59:13 +0100
Subject: [PATCH 081/352] Keep styling the same after changing level heading
 order

---
 app/assets/stylesheets/admin/base.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index b56f0a1bd6..dc1456f884 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -1404,6 +1404,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .panel-title {
   font-weight: bold;
   text-transform: uppercase;
+  font-size: 16px;
+  line-height: 1.1 !important;
 
   > a {
     padding-left: 25px;

From f8666a53e023e6ffb302a2af1bafa7e7f34da383 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:01:53 +0100
Subject: [PATCH 082/352] Correct level headings on admin appraisal view

---
 .../form_answers/_section_admin_comments.html.slim     |  2 +-
 .../_section_appraisal_form_moderated.html.slim        |  2 +-
 .../_section_appraisal_form_primary.html.slim          |  2 +-
 .../_section_appraisal_form_secondary.html.slim        |  2 +-
 .../admin/form_answers/_section_case_summary.html.slim |  2 +-
 .../form_answers/_section_company_details.html.slim    |  2 +-
 .../form_answers/_section_critical_comments.html.slim  |  2 +-
 .../admin/form_answers/_section_draft_notes.html.slim  |  2 +-
 .../form_answers/_section_financial_summary.html.slim  |  2 +-
 .../form_answers/_section_palace_attendees.html.slim   |  2 +-
 .../form_answers/_section_press_summary.html.slim      |  2 +-
 app/views/admin/form_answers/_submitted_view.html.slim | 10 +++++-----
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/views/admin/form_answers/_section_admin_comments.html.slim b/app/views/admin/form_answers/_section_admin_comments.html.slim
index 97599014b9..0b9caabda7 100644
--- a/app/views/admin/form_answers/_section_admin_comments.html.slim
+++ b/app/views/admin/form_answers/_section_admin_comments.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#admin-comments-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-application-info" href="#section-admin-comments" aria-expanded="true" aria-controls="section-admin-comments"
         ' Admin Comments
         span.comments-number
diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index 7bbf273744..b586e45740 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#appraisal-form-moderated-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-moderated" aria-expanded="true" aria-controls="section-appraisal-form-moderated"
         ' Appraisal Form (Moderated)
         - if moderated_assessment.last_editor_info.present?
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index d56ca28429..6662b3076a 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#appraisal-form-primary-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-primary" aria-expanded="true" aria-controls="section-appraisal-form-primary"
         ' Appraisal Form (Primary)
         - if primary_assessment.last_editor_info.present?
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 69dd56706e..6581f710b6 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#appraisal-form-secondary-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-secondary" aria-expanded="true" aria-controls="section-appraisal-form-secondary"
         ' Appraisal Form (Secondary)
         - if secondary_assessment.last_editor_info.present?
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index 7ed131b6fd..bbf8477118 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -3,7 +3,7 @@
     - assessment = assessment_obj.assessment
     .panel.panel-parent
       .panel-heading id="case-summary-heading-#{assessment.position}"
-        h4.panel-title
+        h3.panel-title
           a data-toggle="collapse" href="#section-case-summary-#{assessment.position}" aria-expanded="true" aria-controls="section-case-summary-#{assessment.position}"
             ' Case Summary (for recommended or reserved applications only)
             small.panel-subtitle-small
diff --git a/app/views/admin/form_answers/_section_company_details.html.slim b/app/views/admin/form_answers/_section_company_details.html.slim
index a60489900e..c27c760b5b 100644
--- a/app/views/admin/form_answers/_section_company_details.html.slim
+++ b/app/views/admin/form_answers/_section_company_details.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#company-details-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-application-info" href="#section-company-details" aria-expanded="true" aria-controls="section-company-details"
         = @form_answer.promotion? ? "Nominee Details" : "Company Details"
         - if resource.company_details_updated_at && resource.company_details_editable
diff --git a/app/views/admin/form_answers/_section_critical_comments.html.slim b/app/views/admin/form_answers/_section_critical_comments.html.slim
index 4369010663..cd0188dbcb 100644
--- a/app/views/admin/form_answers/_section_critical_comments.html.slim
+++ b/app/views/admin/form_answers/_section_critical_comments.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#critical-comments-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-critical-comments" aria-expanded="true" aria-controls="section-critical-comments"
         ' Critical Comments
         span.comments-number
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index 81d85c3fb2..9dd1bfd832 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -2,7 +2,7 @@
 
 .panel.panel-default
   .panel-heading#draft-notes-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-assessment" href="#section-draft-notes" aria-expanded="true" aria-controls="section-draft-notes"
         ' Draft Notes
         - if @form_answer.draft_note.decorate.try(:last_updated_by).present?
diff --git a/app/views/admin/form_answers/_section_financial_summary.html.slim b/app/views/admin/form_answers/_section_financial_summary.html.slim
index 9c73ea4790..c5de1ca6e0 100644
--- a/app/views/admin/form_answers/_section_financial_summary.html.slim
+++ b/app/views/admin/form_answers/_section_financial_summary.html.slim
@@ -1,7 +1,7 @@
 - if !financial_pointer.period_length.zero? && @form_answer.submitted?
   .panel.panel-default
     .panel-heading#financial-summary-heading
-      h4.panel-title
+      h3.panel-title
         a data-toggle="collapse" data-parent="#submitted-application" href="#financial-summary" aria-expanded="true" aria-controls="financial-summary"
           ' Financial Summary
           - if @form_answer.financial_summary_updated_by
diff --git a/app/views/admin/form_answers/_section_palace_attendees.html.slim b/app/views/admin/form_answers/_section_palace_attendees.html.slim
index e40693f72f..18bfdce24d 100644
--- a/app/views/admin/form_answers/_section_palace_attendees.html.slim
+++ b/app/views/admin/form_answers/_section_palace_attendees.html.slim
@@ -2,7 +2,7 @@
   - palace_invite = @form_answer.palace_invite
   .panel.panel-default
     .panel-heading#palace-attendees-heading
-      h4.panel-title
+      h3.panel-title
         a data-toggle="collapse" data-parent="#panel-winners" href="#section-palace-attendees" aria-expanded="true" aria-controls="section-palace-attendees"
           ' Palace Attendees
     #section-palace-attendees.section-palace-attendees.panel-collapse.collapse aria-labelledby="palace-attendees-heading"
diff --git a/app/views/admin/form_answers/_section_press_summary.html.slim b/app/views/admin/form_answers/_section_press_summary.html.slim
index 077ae971cc..ac2e04ca3b 100644
--- a/app/views/admin/form_answers/_section_press_summary.html.slim
+++ b/app/views/admin/form_answers/_section_press_summary.html.slim
@@ -1,6 +1,6 @@
 .panel.panel-default
   .panel-heading#press-summary-heading
-    h4.panel-title
+    h3.panel-title
       a data-toggle="collapse" data-parent="#panel-winners" href="#section-press-summary" aria-expanded="true" aria-controls="section-press-summary"
         ' Press Book Notes
         small.updated-by
diff --git a/app/views/admin/form_answers/_submitted_view.html.slim b/app/views/admin/form_answers/_submitted_view.html.slim
index dacb654402..e20383b386 100644
--- a/app/views/admin/form_answers/_submitted_view.html.slim
+++ b/app/views/admin/form_answers/_submitted_view.html.slim
@@ -3,7 +3,7 @@
 .panel-group#submitted-application-parent-parent
   .panel.panel-default.panel-parent
     .panel-heading#application-info-heading
-      h4.panel-title
+      h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info"
           ' Application info
     #section-application-info.section-application-info.panel-collapse.collapse.in aria-labelledby="application-info-heading"
@@ -15,7 +15,7 @@
 
   .panel.panel-default.panel-parent
     .panel-heading#assessment-heading
-      h4.panel-title
+      h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment"
           ' Assessment
     #section-assessment.section-application-info.panel-collapse.collapse.in aria-labelledby="assessment-heading"
@@ -33,7 +33,7 @@
   - if show_feedback_section?
     .panel.panel-default.panel-parent
       .panel-heading#feedback-heading
-        h4.panel-title
+        h2.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback"
             ' Feedback (for not recommended applications only)
             small.panel-subtitle-small
@@ -50,7 +50,7 @@
   - if show_winners_section?
     .panel.panel-default.panel-parent
       .panel-heading#winners-heading
-        h4.panel-title
+        h2.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners"
             ' Recipients
       #section-winners.section-application-info.panel-collapse.collapse.in aria-labelledby="winners-heading"
@@ -63,7 +63,7 @@
 
   .panel.panel-default.panel-parent
     .panel-heading#logs-heading
-      h4.panel-title
+      h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-logs" aria-expanded="true" aria-controls="section-logs"
           ' Application Audit Log
     #section-logs.section-application-info.panel-collapse.collapse aria-labelledby="logs-heading"

From 6aae36860abfacfe593a1a281e9b1f9080afadab Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 13 Jul 2023 10:03:24 +0100
Subject: [PATCH 083/352] Remove tab roles from assessor appraisal view

---
 .../form_answers/_submitted_view.html.slim    | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/assessor/form_answers/_submitted_view.html.slim b/app/views/assessor/form_answers/_submitted_view.html.slim
index d0c8ea2df2..daad1b373a 100644
--- a/app/views/assessor/form_answers/_submitted_view.html.slim
+++ b/app/views/assessor/form_answers/_submitted_view.html.slim
@@ -1,24 +1,24 @@
-.panel-group#submitted-application-parent role="tablist" aria-multiselectable="true"
+.panel-group#submitted-application-parent
   .panel.panel-default.panel-parent
-    .panel-heading#application-info-heading role="tab"
+    .panel-heading#application-info-heading
       h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info"
           ' Application info
-    #section-application-info.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="application-info-heading"
+    #section-application-info.section-application-info.panel-collapse.collapse.in aria-labelledby="application-info-heading"
       .panel-body
-        .panel-group#panel-application-info role="tablist" aria-multiselectable="true"
+        .panel-group#panel-application-info
           = render "admin/form_answers/section_admin_comments", { read_only: true }
           = render "admin/form_answers/section_company_details"
           = render "admin/form_answers/section_financial_summary"
 
   .panel.panel-default.panel-parent
-    .panel-heading#assessment-heading role="tab"
+    .panel-heading#assessment-heading
       h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment"
           ' Assessment
-    #section-assessment.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="assessment-heading"
+    #section-assessment.section-application-info.panel-collapse.collapse.in aria-labelledby="assessment-heading"
       .panel-body
-        .panel-group#panel-assessment-parent role="tablist" aria-multiselectable="true"
+        .panel-group#panel-assessment-parent
           = render "admin/form_answers/section_critical_comments"
           = render "admin/form_answers/section_draft_notes"
           - if primary_assessment.visible_for?(current_subject)
@@ -33,7 +33,7 @@
 
   - if show_feedback_section?
     .panel.panel-default.panel-parent
-      .panel-heading#feedback-heading role="tab"
+      .panel-heading#feedback-heading
         h2.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback"
             ' Feedback (for not recommended applications only)
@@ -44,30 +44,30 @@
             - if @form_answer.feedback_updated_by
               small
                 = @form_answer.feedback_updated_by
-      #section-feedback.section-application-info.panel-collapse.collapse role="tabpanel" aria-labelledby="feedback-heading"
+      #section-feedback.section-application-info.panel-collapse.collapse aria-labelledby="feedback-heading"
         .panel-body
           = render "admin/feedbacks/section", form_answer: @form_answer
 
   - if show_winners_section?
     .panel.panel-default.panel-parent
-      .panel-heading#winners-heading role="tab"
+      .panel-heading#winners-heading
         h2.panel-title
           a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners"
             ' Recipients
-      #section-winners.section-application-info.panel-collapse.collapse.in role="tabpanel" aria-labelledby="winners-heading"
+      #section-winners.section-application-info.panel-collapse.collapse.in aria-labelledby="winners-heading"
         .panel-body
-          .panel-group#panel-winners-parent role="tablist" aria-multiselectable="true"
+          .panel-group#panel-winners-parent
             - if show_press_summary_subsection?
               = render "admin/form_answers/section_press_summary"
             - if show_palace_attendees_subsection?
               = render "admin/form_answers/section_palace_attendees"
 
   .panel.panel-default.panel-parent
-    .panel-heading#logs-heading role="tab"
+    .panel-heading#logs-heading
       h2.panel-title
         a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-logs" aria-expanded="true" aria-controls="section-logs"
           ' Application Audit Log
-    #section-logs.section-application-info.panel-collapse.collapse role="tabpanel" aria-labelledby="logs-heading"
+    #section-logs.section-application-info.panel-collapse.collapse aria-labelledby="logs-heading"
       .panel-body
         - @audit_events.reverse.each do |log|
           p = log.to_s

From 8a176c6932d9b4a382627189bcd09782cd56aa66 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:28:09 -0300
Subject: [PATCH 084/352] CSS: Extract styles related to status badge into
 separate file

---
 app/assets/stylesheets/application-admin.scss |  1 +
 app/assets/stylesheets/frontend/status.scss   | 42 +++++++++++++++++++
 .../stylesheets/frontend/views/dashboard.scss | 26 ------------
 app/assets/stylesheets/qae.scss               |  1 +
 4 files changed, 44 insertions(+), 26 deletions(-)
 create mode 100644 app/assets/stylesheets/frontend/status.scss

diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index a0350cc0a0..2116659e06 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -13,6 +13,7 @@ $error-colour: #df3034;
 $yellow: #ffbf47;
 $button-colour: #00823b;
 @import "frontend/password_guidance";
+@import "frontend/status";
 
 @import "admin/variables";
 @import "admin/toggle";
diff --git a/app/assets/stylesheets/frontend/status.scss b/app/assets/stylesheets/frontend/status.scss
new file mode 100644
index 0000000000..db1a91b6c2
--- /dev/null
+++ b/app/assets/stylesheets/frontend/status.scss
@@ -0,0 +1,42 @@
+$status-red: #9c1111;
+$status-green: #3b816f;
+
+.label-status {
+  padding: 0 3px;
+  border: 2px solid transparent;
+  border-radius: 3px;
+  font-size: 12px;
+  font-weight: 700;
+  text-transform: uppercase;
+  text-decoration: none !important;
+  display: inline-block;
+  font-family: "GDS Transport", arial, sans-serif;
+
+
+  &.label-status-red {
+    border-color: $status-red;
+    color: $status-red;
+  }
+
+  &.label-status-green {
+    border-color: $status-green;
+    color: $status-green;
+  }
+}
+
+[data-status-reversible='true'],
+[data-status-reversible] {
+  .label-status + a,
+  .label-status + button,
+  .label-status + form {
+    display: initial;
+  }
+}
+
+[data-status-reversible='false'] {
+  .label-status + a,
+  .label-status + button,
+  .label-status + form {
+    display: none;
+  }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/frontend/views/dashboard.scss b/app/assets/stylesheets/frontend/views/dashboard.scss
index d385d770cd..5fd3741592 100644
--- a/app/assets/stylesheets/frontend/views/dashboard.scss
+++ b/app/assets/stylesheets/frontend/views/dashboard.scss
@@ -256,32 +256,6 @@
   }
 }
 
-$status-red: #9c1111;
-$status-green: #3b816f;
-
-.label-status {
-  padding: 0 3px;
-  border: 2px solid transparent;
-  border-radius: 3px;
-  font-size: 12px;
-  font-weight: 700;
-  text-transform: uppercase;
-  text-decoration: none !important;
-  display: inline-block;
-  font-family: "GDS Transport", arial, sans-serif;
-
-
-  &.label-status-red {
-    border-color: $status-red;
-    color: $status-red;
-  }
-
-  &.label-status-green {
-    border-color: $status-green;
-    color: $status-green;
-  }
-}
-
 .post-dashboard-actions {
   padding-left: 0;
   list-style: none;
diff --git a/app/assets/stylesheets/qae.scss b/app/assets/stylesheets/qae.scss
index f1ade5a364..01bea0afe9 100644
--- a/app/assets/stylesheets/qae.scss
+++ b/app/assets/stylesheets/qae.scss
@@ -89,6 +89,7 @@ $gutter-one-sixth: $gutter/6;
 
 // Password strength
 @import "frontend/password_guidance";
+@import "frontend/status";
 
 // HIGHLIGHT PLACEHOLDER BITS
 $todo-yellow: #ffff00;

From a598f72d805537221ec6a06e263364635310e5c9 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:28:49 -0300
Subject: [PATCH 085/352] CSS: Add `space-x-*` utility classes

---
 app/assets/stylesheets/admin/base.scss | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index dc1456f884..8203068231 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -2115,3 +2115,27 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
   }
 }
+
+.space-x-1 > :not([hidden]) ~ :not([hidden]) {
+  margin-left: 0.5rem;
+}
+
+.space-x-2 > :not([hidden]) ~ :not([hidden]) {
+  margin-left: 1rem;
+}
+
+.space-x-3 > :not([hidden]) ~ :not([hidden]) {
+  margin-left: 1.5rem;
+}
+
+.space-y-1 > :not([hidden]) ~ :not([hidden]) {
+  margin-top: 0.5rem;
+}
+
+.space-y-2 > :not([hidden]) ~ :not([hidden]) {
+  margin-top: 1rem;
+}
+
+.space-y-3 > :not([hidden]) ~ :not([hidden]) {
+  margin-top: 1.5rem;
+}

From 0074603e020f06898e74b7b03abff59f8336a8d0 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:30:29 -0300
Subject: [PATCH 086/352] Unify code related to the same conditions

---
 .../content_only/post_submission/_shortlisted.html.slim    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/views/content_only/post_submission/_shortlisted.html.slim b/app/views/content_only/post_submission/_shortlisted.html.slim
index 8a63facb26..6ccc673b30 100644
--- a/app/views/content_only/post_submission/_shortlisted.html.slim
+++ b/app/views/content_only/post_submission/_shortlisted.html.slim
@@ -65,14 +65,13 @@
                 | Latest financial information
 
               span.award-info.govuk-body
-                - unless award.shortlisted_documents_submitted?
-                  span.pull-right
-                    ' Due by
-                    = application_deadline_short(:audit_certificates)
                 - if award.shortlisted_documents_submitted?
                   span.label-status.label-status-green
                     ' Completed
                 - else
+                  span.pull-right
+                    ' Due by
+                    = application_deadline_short(:audit_certificates)
                   = link_to users_form_answer_figures_and_vat_returns_url(award)
                     span.label-status.label-status-red
                       ' Incomplete

From 69e2ca48d5810cc93f8fabd8d6326f6d230e1c45 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:31:56 -0300
Subject: [PATCH 087/352] Add horizontal divider between file sections

---
 app/views/admin/form_answers/_section_documents.html.slim | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index 05d6f52759..bcab67ec45 100644
--- a/app/views/admin/form_answers/_section_documents.html.slim
+++ b/app/views/admin/form_answers/_section_documents.html.slim
@@ -15,11 +15,13 @@
       = render "admin/form_answers/docs/not_completed_audit_certificate"
     = render "admin/form_answers/docs/download_original_application_pdf_before_deadline"
 
+.well
   .sidebar-section
     h2
       ' Application & Supporting Docs
     = render "admin/form_answers/docs/application_and_supporting_docs"
 
+.well
   .sidebar-section
     h2
       ' Post Shortlisting Docs
@@ -38,6 +40,7 @@
     h2.todo-placeholder
       ' EP ?
 
+.well
   .sidebar-section
     h2
       ' Other Docs

From e009416bc3e7763a2a1a0d65e88a2970bbac9df2 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:34:00 -0300
Subject: [PATCH 088/352] Display status badge for docs within shortlisted
 applications

---
 .../form_answers/_section_documents.html.slim | 19 +++++++++++--------
 .../admin/form_answers/docs/_status.html.slim |  7 +++++++
 2 files changed, 18 insertions(+), 8 deletions(-)
 create mode 100644 app/views/admin/form_answers/docs/_status.html.slim

diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index bcab67ec45..ba2e318fb9 100644
--- a/app/views/admin/form_answers/_section_documents.html.slim
+++ b/app/views/admin/form_answers/_section_documents.html.slim
@@ -25,15 +25,18 @@
   .sidebar-section
     h2
       ' Post Shortlisting Docs
-    .document-list
-      = render "admin/form_answers/docs/post_shortlisting_docs", resource: resource
 
-    - if @form_answer.audit_certificate.blank? && Settings.after_shortlisting_stage?
-      br
-      .sidebar-section.no-margin-bottom
-        - if @form_answer.requires_vocf?
-          #audit-certificate-form
-            = render "admin/audit_certificate/form", form_answer: @form_answer, audit_certificate: @form_answer.build_audit_certificate
+    - if @form_answer.requires_vocf?
+      .document-list.space-y-2
+        = render(partial: "admin/form_answers/docs/status", locals: { form_answer: @form_answer })
+        = render "admin/form_answers/docs/post_shortlisting_docs", resource: resource
+
+      - if @form_answer.audit_certificate.blank? && Settings.after_shortlisting_stage?
+        .sidebar-section.no-margin-bottom.space-y-3
+          - if @form_answer.requires_vocf?
+            #audit-certificate-form
+              - audit_certificate = @form_answer.build_audit_certificate
+              = render "admin/audit_certificate/form", form_answer: @form_answer, audit_certificate: audit_certificate 
 
   / TODO Only appears for EP but for now we need to think more on it
   /.sidebar-section
diff --git a/app/views/admin/form_answers/docs/_status.html.slim b/app/views/admin/form_answers/docs/_status.html.slim
new file mode 100644
index 0000000000..aacce42a1a
--- /dev/null
+++ b/app/views/admin/form_answers/docs/_status.html.slim
@@ -0,0 +1,7 @@
+- if form_answer.audit_certificate.present?
+  span.label-status.label-status-green
+    ' Complete 
+  
+- else
+  span.label-status.label-status-red
+    ' Incomplete

From 76ed4e4d90ddfa7fac1679be647b26f4bee38f5b Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:37:36 -0300
Subject: [PATCH 089/352] Complete / Uncomplete toggle functions for
 `ShortlistedDocumentsWrapper`

---
 app/models/shortlisted_documents_wrapper.rb | 26 +++++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/app/models/shortlisted_documents_wrapper.rb b/app/models/shortlisted_documents_wrapper.rb
index 5af1a4098e..dfa451c067 100644
--- a/app/models/shortlisted_documents_wrapper.rb
+++ b/app/models/shortlisted_documents_wrapper.rb
@@ -7,13 +7,21 @@ class ShortlistedDocumentsWrapper < ActiveRecord::Base
 
   validate :valid_for_submission?
 
-  def submit
-    self.submitted_at = Time.zone.now
-    save
+  def complete
+    set_submission_date
+  end
+  alias_method :submit, :complete
+
+  def uncomplete
+    set_submission_date(nil)
+  end
+
+  def submittable?
+    !submitted? && requirements_fulfilled?
   end
 
   def submitted?
-    submitted_at?
+    !submitted_at.nil?
   end
 
   def no_changes_necessary?
@@ -25,11 +33,19 @@ def confirmed_changes?
   end
 
   private
+  
+  def set_submission_date(timestamp = Time.zone.now)
+    self.update(submitted_at: timestamp)
+  end
+
+  def requirements_fulfilled?
+    vat_returns_files.any? { |resource| resource&.attachment.present? }
+  end
 
   def valid_for_submission?
     return true unless submitted?
 
-    if vat_returns_files.first&.attachment.present?
+    if requirements_fulfilled?
       true
     else
       errors.add(:base, "You need to add at least one VAT returns file")

From 2f1ae150a3ac7326c93e62955a76ffa6d4105068 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:38:44 -0300
Subject: [PATCH 090/352] Re-work `AdminShortlistedDocsContext`

---
 .../commercial_figures_files_controller.rb    |  12 ++-
 .../admin/vat_returns_files_controller.rb     |   8 +-
 .../commercial_figures_files_controller.rb    |   8 +-
 .../assessor/vat_returns_files_controller.rb  |   8 +-
 .../admin_shortlisted_docs_context.rb         | 100 +++++++++++++++++-
 5 files changed, 125 insertions(+), 11 deletions(-)

diff --git a/app/controllers/admin/commercial_figures_files_controller.rb b/app/controllers/admin/commercial_figures_files_controller.rb
index 7dabcea0b7..571bba9f5f 100644
--- a/app/controllers/admin/commercial_figures_files_controller.rb
+++ b/app/controllers/admin/commercial_figures_files_controller.rb
@@ -1,7 +1,15 @@
 class Admin::CommercialFiguresFilesController < Admin::BaseController
   include AdminShortlistedDocsContext
 
-  def file_model_name
-    "commercial_figures_files"
+  def build_resource
+    begin_of_association_chain.build_commercial_figures_file(permitted_params)
+  end
+
+  def relationship_name
+    :commercial_figures_file
+  end
+
+  def resource_class
+    CommercialFiguresFile
   end
 end
diff --git a/app/controllers/admin/vat_returns_files_controller.rb b/app/controllers/admin/vat_returns_files_controller.rb
index a5fa820bf4..1e9f2e3675 100644
--- a/app/controllers/admin/vat_returns_files_controller.rb
+++ b/app/controllers/admin/vat_returns_files_controller.rb
@@ -1,7 +1,11 @@
 class Admin::VatReturnsFilesController < Admin::BaseController
   include AdminShortlistedDocsContext
 
-  def file_model_name
-    "vat_returns_files"
+  def relationship_name
+    :vat_returns_files
+  end
+
+  def resource_class
+    VatReturnsFile
   end
 end
diff --git a/app/controllers/assessor/commercial_figures_files_controller.rb b/app/controllers/assessor/commercial_figures_files_controller.rb
index baadfc2c95..da609ebe28 100644
--- a/app/controllers/assessor/commercial_figures_files_controller.rb
+++ b/app/controllers/assessor/commercial_figures_files_controller.rb
@@ -1,7 +1,11 @@
 class Assessor::CommercialFiguresFilesController < Assessor::BaseController
   include AdminShortlistedDocsContext
 
-  def file_model_name
-    "commercial_figures_files"
+  def relationship_name
+    :commercial_figures_file
+  end
+
+  def resource_class
+    CommercialFiguresFile
   end
 end
diff --git a/app/controllers/assessor/vat_returns_files_controller.rb b/app/controllers/assessor/vat_returns_files_controller.rb
index 62c8e1be05..98dbe6922d 100644
--- a/app/controllers/assessor/vat_returns_files_controller.rb
+++ b/app/controllers/assessor/vat_returns_files_controller.rb
@@ -1,7 +1,11 @@
 class Assessor::VatReturnsFilesController < Assessor::BaseController
   include AdminShortlistedDocsContext
 
-  def file_model_name
-    "vat_returns_files"
+  def relationship_name
+    :vat_returns_files
+  end
+
+  def resource_class
+    VatReturnsFile
   end
 end
diff --git a/app/controllers/concerns/admin_shortlisted_docs_context.rb b/app/controllers/concerns/admin_shortlisted_docs_context.rb
index 2f179aa68b..dd01eafc74 100644
--- a/app/controllers/concerns/admin_shortlisted_docs_context.rb
+++ b/app/controllers/concerns/admin_shortlisted_docs_context.rb
@@ -1,16 +1,110 @@
 module AdminShortlistedDocsContext
   def show
     authorize form_answer, :download_commercial_figures?
-    file_record = form_answer.public_send(file_model_name).find(params[:id])
 
-    send_data file_record.attachment.read,
-              filename: file_record.attachment.file.filename,
+    send_data resource.attachment.read,
+              filename: resource.attachment.file.filename,
               disposition: "attachment"
   end
 
+  def create
+    attachment = build_resource
+    attachment.form_answer = form_answer
+
+    authorize begin_of_association_chain, :create?
+
+    if attachment.save
+      log_event
+
+      respond_to do |format|
+        format.html do
+          redirect_to [namespace_name, form_answer]
+        end
+
+        format.js do
+          render partial: "admin/figures_and_vat_returns/file",
+                 locals: { attachment: attachment },
+                 content_type: "text/plain"
+        end
+      end
+    else
+      respond_to do |format|
+        format.html do
+          redirect_to [namespace_name, form_answer], alert: attachment.errors.full_messages.join(", ")
+        end
+
+        format.js do
+          render partial: "admin/figures_and_vat_returns/form",
+                 locals: {
+                   form_answer: form_answer, 
+                   attachment: attachment
+                 },
+                 content_type: "text/plain",
+                 status: 422
+        end
+      end
+    end
+  end
+
+  def destroy
+    authorize begin_of_association_chain, :destroy?
+    log_event if resource.destroy
+
+    respond_to do |format|
+      format.html do
+        if request.xhr? || request.format.js?
+          head :ok
+        else
+          redirect_to [namespace_name, form_answer]
+        end
+      end
+    end
+  end
+
   private
 
+  def action_type
+    case action_name
+    when "create"
+      "#{permitted_params_key}_uploaded"
+    when "destroy"
+      "#{permitted_params_key}_destroyed"
+    else
+      raise "Attempted to log an unsupported action (#{action_name})"
+    end
+  end
+
   def form_answer
     @form_answer ||= FormAnswer.find(params[:form_answer_id])
   end
+
+  def begin_of_association_chain
+    @_begin_of_association_chain ||= 
+      (form_answer.shortlisted_documents_wrapper || form_answer.build_shortlisted_documents_wrapper)
+
+    return @_begin_of_association_chain if @_begin_of_association_chain.persisted?
+    
+    @_begin_of_association_chain.save!
+    @_begin_of_association_chain
+  end
+
+  def association_chain
+    begin_of_association_chain.send(relationship_name)
+  end
+
+  def resource
+    @_resource ||= resource_class.find(params[:id])
+  end
+
+  def build_resource
+    association_chain.build(permitted_params)
+  end
+
+  def permitted_params_key
+    resource_class.to_s.underscore
+  end
+
+  def permitted_params
+    params.require(permitted_params_key).permit(:attachment)
+  end
 end

From f82a71d1a50899d08b45b0d0af4714595d196a1e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:40:26 -0300
Subject: [PATCH 091/352] Add policy functions related to
 `ShortlistedDocumentsWrapper`

---
 app/helpers/partials_visibility_helper.rb            | 5 +++++
 app/policies/shortlisted_documents_wrapper_policy.rb | 9 +++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 app/policies/shortlisted_documents_wrapper_policy.rb

diff --git a/app/helpers/partials_visibility_helper.rb b/app/helpers/partials_visibility_helper.rb
index fb4b9bb56b..b1bd471508 100644
--- a/app/helpers/partials_visibility_helper.rb
+++ b/app/helpers/partials_visibility_helper.rb
@@ -42,6 +42,11 @@ def show_remove_form_answer_attachment?(attachment)
     attachment.uploaded_not_by_user? && policy(attachment).destroy?
   end
 
+  def show_shortlisted_document?(attachment)
+    document = attachment&.shortlisted_documents_wrapper
+    attachment.present? && policy(document).destroy?
+  end
+
   private
 
   def admin_lead_or_primary?
diff --git a/app/policies/shortlisted_documents_wrapper_policy.rb b/app/policies/shortlisted_documents_wrapper_policy.rb
new file mode 100644
index 0000000000..03e3d19b05
--- /dev/null
+++ b/app/policies/shortlisted_documents_wrapper_policy.rb
@@ -0,0 +1,9 @@
+class ShortlistedDocumentsWrapperPolicy < FormAnswerAttachmentPolicy
+  def destroy?
+    admin_or_lead_or_assigned?(record.form_answer)
+  end
+
+  def submit?
+    admin_or_lead_or_assigned?(record.form_answer)
+  end
+end

From d46b6c61896afa79eb17841e160639fae01618ef Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:42:09 -0300
Subject: [PATCH 092/352] Controller methods for submitting docs for
 shortlisted applications

---
 ...listed_documents_submissions_controller.rb |  3 ++
 ...listed_documents_submissions_controller.rb |  3 ++
 ...min_shortlisted_docs_submission_context.rb | 34 +++++++++++++++++++
 .../create.js.erb                             |  1 +
 .../create.js.erb                             |  1 +
 config/routes.rb                              |  2 ++
 6 files changed, 44 insertions(+)
 create mode 100644 app/controllers/admin/shortlisted_documents_submissions_controller.rb
 create mode 100644 app/controllers/assessor/shortlisted_documents_submissions_controller.rb
 create mode 100644 app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
 create mode 100644 app/views/admin/shortlisted_documents_submissions/create.js.erb
 create mode 100644 app/views/assessor/shortlisted_documents_submissions/create.js.erb

diff --git a/app/controllers/admin/shortlisted_documents_submissions_controller.rb b/app/controllers/admin/shortlisted_documents_submissions_controller.rb
new file mode 100644
index 0000000000..bfd30bbc87
--- /dev/null
+++ b/app/controllers/admin/shortlisted_documents_submissions_controller.rb
@@ -0,0 +1,3 @@
+class Admin::ShortlistedDocumentsSubmissionsController < Admin::BaseController
+  include AdminShortlistedDocsSubmissionContext
+end
diff --git a/app/controllers/assessor/shortlisted_documents_submissions_controller.rb b/app/controllers/assessor/shortlisted_documents_submissions_controller.rb
new file mode 100644
index 0000000000..cd23418a44
--- /dev/null
+++ b/app/controllers/assessor/shortlisted_documents_submissions_controller.rb
@@ -0,0 +1,3 @@
+class Assessor::ShortlistedDocumentsSubmissionsController < Assessor::BaseController
+  include AdminShortlistedDocsSubmissionContext
+end
diff --git a/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
new file mode 100644
index 0000000000..70e2b1da58
--- /dev/null
+++ b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
@@ -0,0 +1,34 @@
+module AdminShortlistedDocsSubmissionContext
+  def create
+    authorize resource, :submit?
+
+    resource.submitted? ? resource.uncomplete : resource.complete
+
+    respond_to do |format|
+      format.html do
+        redirect_to [namespace_name, form_answer], alert: render_errors
+      end
+
+      format.js
+    end
+  end
+
+  private
+
+  def render_errors
+    resource.errors.full_messages.join(", ") if resource.errors.any?
+  end
+
+  def form_answer
+    @form_answer ||= FormAnswer.find(params[:form_answer_id])
+  end
+
+  def resource
+    @resource ||= (form_answer.shortlisted_documents_wrapper || form_answer.build_shortlisted_documents_wrapper)
+
+    return @resource if @resource.persisted?
+    
+    @resource.save!
+    @resource
+  end
+end
diff --git a/app/views/admin/shortlisted_documents_submissions/create.js.erb b/app/views/admin/shortlisted_documents_submissions/create.js.erb
new file mode 100644
index 0000000000..e548fe166b
--- /dev/null
+++ b/app/views/admin/shortlisted_documents_submissions/create.js.erb
@@ -0,0 +1 @@
+$("#shortlisted-documents-status").replaceWith("<%= escape_javascript(render partial: "admin/figures_and_vat_returns/status", locals: { form_answer: @form_answer, figures_form: @resource }) %>");
diff --git a/app/views/assessor/shortlisted_documents_submissions/create.js.erb b/app/views/assessor/shortlisted_documents_submissions/create.js.erb
new file mode 100644
index 0000000000..e548fe166b
--- /dev/null
+++ b/app/views/assessor/shortlisted_documents_submissions/create.js.erb
@@ -0,0 +1 @@
+$("#shortlisted-documents-status").replaceWith("<%= escape_javascript(render partial: "admin/figures_and_vat_returns/status", locals: { form_answer: @form_answer, figures_form: @resource }) %>");
diff --git a/config/routes.rb b/config/routes.rb
index 78a78ec0a2..809f873d28 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -180,6 +180,7 @@
       resources :audit_certificates, only: [:show, :create]
       resources :commercial_figures_files, only: [:show]
       resources :vat_returns_files, only: [:show]
+      resources :shortlisted_documents_submissions, only: [:create]
 
       resources :feedbacks, only: [:create, :update] do
         member do
@@ -287,6 +288,7 @@
       end
       resources :commercial_figures_files, only: [:show]
       resources :vat_returns_files, only: [:show]
+      resources :shortlisted_documents_submissions, only: [:create]
 
       resources :feedbacks, only: [:create, :update] do
         member do

From e58da4ee2db2f4c77929191f57227bbf87e84668 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:42:56 -0300
Subject: [PATCH 093/352] Update UI

---
 .../_actual_figures.html.slim                 | 13 ++++++++++
 .../_attachment.html.slim                     | 21 +++++++++++++++
 .../figures_and_vat_returns/_file.html.slim   | 26 +++++++++++++++++++
 .../figures_and_vat_returns/_form.html.slim   | 20 ++++++++++++++
 .../figures_and_vat_returns/_status.html.slim | 22 ++++++++++++++++
 .../_vat_returns.html.slim                    | 13 ++++++++++
 .../form_answers/_section_documents.html.slim | 12 +++++++++
 config/routes.rb                              |  8 +++---
 8 files changed, 131 insertions(+), 4 deletions(-)
 create mode 100644 app/views/admin/figures_and_vat_returns/_actual_figures.html.slim
 create mode 100644 app/views/admin/figures_and_vat_returns/_attachment.html.slim
 create mode 100644 app/views/admin/figures_and_vat_returns/_file.html.slim
 create mode 100644 app/views/admin/figures_and_vat_returns/_form.html.slim
 create mode 100644 app/views/admin/figures_and_vat_returns/_status.html.slim
 create mode 100644 app/views/admin/figures_and_vat_returns/_vat_returns.html.slim

diff --git a/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim b/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim
new file mode 100644
index 0000000000..016c534b59
--- /dev/null
+++ b/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim
@@ -0,0 +1,13 @@
+label
+  | Variance explanation document
+
+.document-list.space-y-3
+  p.p-empty class="#{'visuallyhidden' if figures_form.commercial_figures_file.present?}"
+    ' No document has been attached.
+  ul.list-unstyled.list-actions
+    - if figures_form.commercial_figures_file.present?
+      = render(partial: "admin/figures_and_vat_returns/file", collection: Array.wrap(figures_form.commercial_figures_file), as: :attachment)
+  .clear
+
+#commercial-figures-attachment-form
+  = render("admin/figures_and_vat_returns/form", form_answer: form_answer, attachment: figures_form.commercial_figures_file || figures_form.build_commercial_figures_file)
diff --git a/app/views/admin/figures_and_vat_returns/_attachment.html.slim b/app/views/admin/figures_and_vat_returns/_attachment.html.slim
new file mode 100644
index 0000000000..730f6b40bf
--- /dev/null
+++ b/app/views/admin/figures_and_vat_returns/_attachment.html.slim
@@ -0,0 +1,21 @@
+.js-commercial-figures-file
+  = link_to item&.original_filename,
+    item&.attachment&.url,
+    class: "file-url",
+    target: "_blank"
+
+  - if item&.persisted?
+    - delete_url = public_send(url_method, @form_answer, item)
+  - else
+    - delete_url = public_send(url_method, @form_answer, id: "PLACEHOLDER")
+
+  .if-js-hide
+    = button_to "Remove", delete_url,
+                          method: :delete,
+                          class: "govuk-button govuk-button--secondary"
+    .clear
+
+  .if-no-js-hide
+    = link_to "Remove", delete_url,
+                        method: :delete,
+                        class: "govuk-link remove-link", form_class: "non-js-button-to"
diff --git a/app/views/admin/figures_and_vat_returns/_file.html.slim b/app/views/admin/figures_and_vat_returns/_file.html.slim
new file mode 100644
index 0000000000..ece2d3a722
--- /dev/null
+++ b/app/views/admin/figures_and_vat_returns/_file.html.slim
@@ -0,0 +1,26 @@
+- if show_shortlisted_document?(attachment)
+  li[class="#{attachment.model_name.param_key.dasherize}"]
+    - if show_shortlisted_document?(attachment)
+      small.pull-right
+        = form_for([namespace_name, attachment.form_answer, attachment],
+                    html: { class: "#{attachment.model_name.param_key.dasherize}-destroyer", method: :delete, style: "display:inline-block;" }) do |f|
+
+          = f.submit 'Remove', class: 'if-js-hide'
+
+          = link_to "#", class: "text-danger if-no-js-hide", data: {confirm: "Are you sure?"}
+            span.glyphicon.glyphicon-remove
+            span.visible-lg.visible-md
+              ' Remove
+
+    - if Rails.env.test? || attachment.clean?
+      = link_to [namespace_name, attachment.form_answer, attachment], target: "_blank", class: "action-title"
+        span.glyphicon.glyphicon-file
+        = attachment.original_filename
+
+    - elsif attachment.file_scan_results.to_s == "infected"
+      span.glyphicon.glyphicon-file
+      = "Failed virus scanner check (#{attachment.original_filename})"
+
+    - else
+      span.glyphicon.glyphicon-file
+      = "Scanning '#{attachment.original_filename}' file"
diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
new file mode 100644
index 0000000000..e7216bd330
--- /dev/null
+++ b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -0,0 +1,20 @@
+/ since fileupload can not return real status of the response
+/ we search for this input in success callback to determine
+/ whether file was saved or not
+.span
+  = hidden_field_tag "valid", "false", id: "#{attachment.model_name.param_key}-valid"
+= form_for [namespace_name, form_answer, attachment], html: { multipart: true } do |form|
+  .well.js-attachment-form
+    h3 Attach document
+
+    - if form.object.errors.any?
+      .errors = form.object.errors.full_messages.join(", ")
+
+    ul.list-unstyled
+    p
+    .attachment-link.if-js-hide
+      = form.file_field :attachment
+
+    .form-actions.text-right
+      = link_to "Cancel", "#", class: "btn btn-default btn-cancel"
+      = form.submit "Attach", class: "btn btn-primary btn-submit"
diff --git a/app/views/admin/figures_and_vat_returns/_status.html.slim b/app/views/admin/figures_and_vat_returns/_status.html.slim
new file mode 100644
index 0000000000..0bbb8d26c4
--- /dev/null
+++ b/app/views/admin/figures_and_vat_returns/_status.html.slim
@@ -0,0 +1,22 @@
+#shortlisted-documents-status.space-x-2[data-status-reversible="#{figures_form.submitted? || figures_form.submittable?}"]
+  - if figures_form.submitted?
+
+    span.label-status.label-status-green
+      ' Complete 
+    
+    = form_with url: [namespace_name, form_answer, :shortlisted_documents_submissions], html: { method: :post } do |f|
+      = f.submit "Mark as incomplete", class: "if-js-hide"
+
+      = link_to "#", class: "if-no-js-hide"
+        ' Mark as incomplete
+
+  - else
+    span.label-status.label-status-red
+      ' Incomplete
+
+    - if figures_form.submittable?
+      = form_with url: [namespace_name, form_answer, :shortlisted_documents_submissions], html: { method: :post } do |f|
+        = f.submit "Mark as completed", class: "if-js-hide"
+
+        = link_to "#", class: "if-no-js-hide"
+          ' Mark as completed
diff --git a/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim b/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim
new file mode 100644
index 0000000000..8d9aeb4530
--- /dev/null
+++ b/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim
@@ -0,0 +1,13 @@
+label
+  | Latest financial statements and VAT returns
+
+.document-list.space-y-3
+  p.p-empty class="#{'visuallyhidden' if figures_form.vat_returns_files.any?}"
+    ' No documents have been attached.
+  ul.list-unstyled.list-actions
+    - if figures_form.vat_returns_files.any?
+      = render(partial: "admin/figures_and_vat_returns/file", collection: figures_form.vat_returns_files, as: :attachment)
+  .clear
+
+#vat-returns-attachment-form
+  = render("admin/figures_and_vat_returns/form", form_answer: form_answer, attachment: figures_form.vat_returns_files.build)
diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index ba2e318fb9..35e7320c3a 100644
--- a/app/views/admin/form_answers/_section_documents.html.slim
+++ b/app/views/admin/form_answers/_section_documents.html.slim
@@ -38,6 +38,16 @@
               - audit_certificate = @form_answer.build_audit_certificate
               = render "admin/audit_certificate/form", form_answer: @form_answer, audit_certificate: audit_certificate 
 
+    - elsif @form_answer.provided_estimates? 
+      - figures_form = @form_answer.shortlisted_documents_wrapper || @form_answer.build_shortlisted_documents_wrapper
+
+      = render(partial: "admin/figures_and_vat_returns/status", locals: { form_answer: @form_answer, figures_form: figures_form })
+
+      #vat-returns-section
+        = render(partial: "admin/figures_and_vat_returns/vat_returns", locals: { form_answer: @form_answer, figures_form: figures_form })
+      #commercial-figures-section
+        = render(partial: "admin/figures_and_vat_returns/actual_figures", locals: { form_answer: @form_answer, figures_form: figures_form })
+
   / TODO Only appears for EP but for now we need to think more on it
   /.sidebar-section
     h2.todo-placeholder
@@ -60,5 +70,7 @@
 
 
 #audit-certificate-buffer
+#vat-returns-buffer
+#commercial-figures-buffer
 #list-of-procedure-buffer
 #attachment-buffer
diff --git a/config/routes.rb b/config/routes.rb
index 809f873d28..f013dfbe94 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -178,8 +178,8 @@
       resources :form_answer_attachments, only: [:create, :show, :destroy]
       resources :support_letters, only: [:show]
       resources :audit_certificates, only: [:show, :create]
-      resources :commercial_figures_files, only: [:show]
-      resources :vat_returns_files, only: [:show]
+      resources :commercial_figures_files, only: [:create, :show, :destroy]
+      resources :vat_returns_files, only: [:create, :show, :destroy]
       resources :shortlisted_documents_submissions, only: [:create]
 
       resources :feedbacks, only: [:create, :update] do
@@ -286,8 +286,8 @@
       resources :audit_certificates, only: [:show, :create] do
         get :download_initial_pdf, on: :collection
       end
-      resources :commercial_figures_files, only: [:show]
-      resources :vat_returns_files, only: [:show]
+      resources :commercial_figures_files, only: [:create, :show, :destroy]
+      resources :vat_returns_files, only: [:create, :show, :destroy]
       resources :shortlisted_documents_submissions, only: [:create]
 
       resources :feedbacks, only: [:create, :update] do

From 92fe0dcb80d479f087a5a51d934372000999d65e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 14 Jul 2023 11:43:10 +0100
Subject: [PATCH 094/352] Better border colour for inputs

---
 app/assets/images/icon-flag-sm-grey.png         | Bin 138 -> 225 bytes
 app/assets/images/icon-flag-sm-grey@2.png       | Bin 212 -> 375 bytes
 app/assets/stylesheets/admin/base.scss          |   6 +++++-
 app/assets/stylesheets/admin/forms.scss         |  10 ++++++++++
 .../stylesheets/admin/page-applications.scss    |   4 +++-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/assets/images/icon-flag-sm-grey.png b/app/assets/images/icon-flag-sm-grey.png
index 45799bdfa7d22bb46212fe07384857bdca26db14..e229c9966a1ace7a28d2da1b7a2d642e4e43e84c 100644
GIT binary patch
delta 208
zcmV;>05AWF0pS6V8Gi-<007Y8E=d3Y00DDSM?wIu&K&6g005gwL_t(2Q|-_(3PLdq
z24I^r=1)UU;3QtaNpN@6Rpc##n~N845L{infhTy-Mk+k0%A-Ai9n=2{NgM!U=8gA$
zI%#+=gCPgtlu}x%>SfG+fHDN&KtwBMzLoV+P=-XLi!m-#^-0kLijj9!0N`w9d*@sy
zBK;2la5b}IjBy)6cz!Sc2Du9n&6xRKyX*kgA~LUq^Zy^TT<HZr@?fyk3Au6r0000<
KMNUMnLSTZ=#Z?Oc

delta 120
zcmaFJ*u^+OvXF&=fuZWfvqL~C(9^{+q=GRy;%og?9yT2Y4aS!E@Z8wcMn%T<`C)70
zQakh-8{UWMMla==c%Y>|TsP@J!2ayeKU!ujefg{X)~||EZA!8X=w&N=?#B@1?83yb
XNFrC-_RDS`py3Rju6{1-oD!M<HESz_

diff --git a/app/assets/images/icon-flag-sm-grey@2.png b/app/assets/images/icon-flag-sm-grey@2.png
index abdad7be9443ecce0f2afab67201c8dba6de0be7..75189afa6b5ab9448778bb7f9f9d819a1d8b3a4c 100644
GIT binary patch
delta 359
zcmV-t0hs>O0rvus8Gi-<001^F-sJ!Q00DDSM?wIu&K&6g00A*cL_t(YOYPJ@OT$1E
z0PuT|&yd|uBKZo*y_Y-4hlyAx(Xm)TYIQ6QQv3pT(8WpOAP9nkn}axco=*e=NvOSR
zn+}C!2}v&Rm-puah{)pah~s!mYyDhaw{eClAf?<+)AYKHz<*_o8c^OOqLH<BS1I+h
zDmD|S29;6{f*{yQlH_$6%n4M3BI2PCVvmU4e6fXqMrJ)@%zl<-@AI&wfifr}J_5ig
zGanGqXA@f)Xq51QnfqZF4x%Xf`hC_a(7^5h;Aow|B><eY1|Z@T0LIKbB%+VG8_j0~
z5%FFKab>OTYhbNk{(EPk45XApW<FL*-THilv&o1!0f6(OC@%6m|Mm@9U02Hh5pS4z
zY>YW^Z6IH)2CV&e-2t=u()GYOtzC(_5;-g2T(J35^aCk0!`B20ist|T002ovPDHLk
FV1f<<q0#^V

delta 195
zcmV;!06hQq0@MMJ8Gi%-005jP7H$9l0GmlfK~#7F?b0Pw1V9)7VZ7iZTze<cE7l7M
zCsNTwryzL>(hHg>I27dEwVWIOqpn0`Cx7cz6u%m*G93aKvjI|sLq=?X<YSjE8z8ya
zp~D79@2t~e4x|FFtkPf(q&$zzQD+Xm*$p!`AiyybCLqZ<3p_OG&yePhZTj@Ll;?we
xMor!!$SKp*n7s5gE3{aAKKb6i3;ctBPy)Blo<R!kD;xj-002ovPDHLkV1f;0Q04#t

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index b56f0a1bd6..adf1f40f3c 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -815,7 +815,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   background-size: 18px 16px;
   text-align: left;
   text-indent: -9999px;
-  opacity: 0.3;
+  opacity: 0.8;
   display: inline-block;
 
   @include is-retina {
@@ -1180,6 +1180,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     &:last-child {
       margin-bottom: 0;
     }
+
+    .btn-default {
+      border-color: #5C5C5C;
+    }
   }
 }
 
diff --git a/app/assets/stylesheets/admin/forms.scss b/app/assets/stylesheets/admin/forms.scss
index 0a7ab143fe..e00f5eeb03 100644
--- a/app/assets/stylesheets/admin/forms.scss
+++ b/app/assets/stylesheets/admin/forms.scss
@@ -11,3 +11,13 @@
 .has-royal-family-connections-wrapper {
   padding-left: 20px;
 }
+
+input.form-control, select.form-control,
+.input-group-addon, textarea,
+.btn-default, .select2-selection {
+  border-color: #5C5C5C !important;
+}
+
+.input-group-addon {
+  height: 2.42em !important;
+}
diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 602b88a031..ad97f3ac51 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -57,10 +57,12 @@
 
     .dropdown-menu {
       min-width: 250px;
+      border-color: #666666;
+
       li.checkbox,
       li.apply {
         padding: 0 10px;
-        
+
         .btn:focus {
           border-color: #5C5C5C;
         }

From 28adb186238b648d13ccb1e4e1d10fdd0453129b Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 14 Jul 2023 13:38:10 +0100
Subject: [PATCH 095/352] Change link default colour

---
 app/assets/stylesheets/admin/_variables.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index 991b69736b..6464d2c51a 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -28,5 +28,5 @@ $pagination-border: #adadad;
 
 $header-hover: #444;
 
-$blue-link-colour: #1A66A8;
+$blue-link-colour: #3264A3;
 $govuk-light-blue: #5694ca;

From 754e2b6365899f957b2b83f67c42c736014f6a36 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 00:43:25 -0300
Subject: [PATCH 096/352] JS: Make everything work with JS

---
 .../javascripts/admin/form_answers.js.coffee  | 121 ++++++++++++++++++
 1 file changed, 121 insertions(+)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index e7e2ca50b1..783f866051 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -25,6 +25,22 @@ ready = ->
     $(".attachment-link", wrapper).prepend("<span class='glyphicon glyphicon-paperclip'></span>")
     $(".attachment-link", wrapper).prependTo("#new_form_answer_attachment")
 
+    wrapper = $("#vat-returns-section")
+    $(".attachment-link", wrapper).removeClass("if-js-hide")
+    $(".attachment-link", wrapper).addClass("btn btn-default btn-block btn-attachment")
+    $(".attachment-link", wrapper).prepend("<span class='btn-title'>Attach document</span>")
+    $(".attachment-link", wrapper).prepend("<span class='glyphicon glyphicon-paperclip'></span>")
+    $(".attachment-link", wrapper).prependTo("#new_vat_returns_file")
+
+    wrapper = $("#commercial-figures-section")
+    $(".attachment-link", wrapper).removeClass("if-js-hide")
+    $(".attachment-link", wrapper).addClass("btn btn-default btn-block btn-attachment")
+    $(".attachment-link", wrapper).prepend("<span class='btn-title'>Attach document</span>")
+    $(".attachment-link", wrapper).prepend("<span class='glyphicon glyphicon-paperclip'></span>")
+    $(".attachment-link", wrapper).prependTo("#new_commercial_figures_file")
+
+    toggleCommercialFiguresButtonVisibility()
+
     wrapper = $("#audit-certificate-form")
     $(".attachment-link", wrapper).removeClass("if-js-hide")
     $(".attachment-link", wrapper).addClass("btn btn-default btn-block btn-attachment")
@@ -32,6 +48,12 @@ ready = ->
     $(".attachment-link", wrapper).prepend("<span class='glyphicon glyphicon-paperclip'></span>")
     $(".attachment-link", wrapper).prependTo("#new_audit_certificate")
 
+  toggleCommercialFiguresButtonVisibility = ->
+    if ($('.commercial-figures-file').length == 0)
+      $('#commercial-figures-attachment-form').removeClass('visuallyhidden')
+    else
+      $('#commercial-figures-attachment-form').addClass('visuallyhidden')
+
   $("#new_review_audit_certificate").on "ajax:success", (e, data, status, xhr) ->
     $(this).find(".form-group").removeClass("form-edit")
     $(this).find(".form-edit-link").remove()
@@ -96,6 +118,105 @@ ready = ->
       format: "js"
       "audit_certificate[attachment]": $("#audit_certificate_attachment").val()
 
+  if $("html").hasClass("lte-ie7")
+    $(".attachment-link", $("#commercial-figures-section")).removeClass("if-js-hide")
+  else
+    do initializeFileUpload = ->
+      selector = $("#commercial-figures-attachment-form form")
+      selector.fileupload
+        autoUpload: true
+        dataType: "html"
+        forceIframeTransport: true
+        success: (result, textStatus, jqXHR) ->
+          result = $($.parseHTML(result))
+          $("#commercial-figures-buffer").append(result.text())
+
+          if $("#commercial-figures-file-valid", $("#commercial-figures-buffer")).length
+            $("#commercial-figures-section").html(result.text())
+            moveAttachDocumentButton()
+          else
+            form = $("#commercial-figures-attachment-form form")
+            section = form.closest("#commercial-figures-section")
+            section.find(".document-list .p-empty").addClass("visuallyhidden")
+            section.find(".document-list ul").append(result.text())
+
+          toggleCommercialFiguresButtonVisibility()
+          $("#commercial-figures-buffer").empty()
+
+  $("#commercial-figures-attachment-form form").on "fileuploadsubmit", (e, data) ->
+    data.formData =
+      authenticity_token: $("meta[name='csrf-token']").attr("content")
+      format: "js"
+      "commercial_figures_file[attachment]": $("#commercial_figures_file_attachment").val()
+
+  $(document).on 'click', ".commercial-figures-file-destroyer a", (e) ->
+    e.preventDefault()
+    form = $(this).parents('.commercial-figures-file-destroyer')
+    section = form.closest("#commercial-figures-section")
+    $.ajax
+      url: form.attr('action'),
+      type: 'DELETE'
+    form.parents('.commercial-figures-file').remove()
+    if $('.commercial-figures-file').length == 0
+      section.find(".document-list .p-empty").removeClass("visuallyhidden")
+      $('#commercial-figures-attachment-form').toggleClass('visuallyhidden', $('.commercial-figures-file').length != 0)
+      initializeFileUpload()
+    
+    toggleCommercialFiguresButtonVisibility()
+
+  if $("html").hasClass("lte-ie7")
+    $(".attachment-link", $("#vat-returns-section")).removeClass("if-js-hide")
+  else
+    do initializeFileUpload = ->
+      selector = $("#vat-returns-attachment-form form")
+      selector.fileupload
+        autoUpload: true
+        dataType: "html"
+        forceIframeTransport: true
+        success: (result, textStatus, jqXHR) ->
+          result = $($.parseHTML(result))
+          $("#vat-returns-buffer").append(result.text())
+
+          if $("#vat-returns-file-valid", $("#vat-returns-buffer")).length
+            $("#application-attachment-form").html(result.text())
+            moveAttachDocumentButton()
+            initializeFileUpload()
+          else
+            form = $("#vat-returns-attachment-form form")
+            section = form.closest("#vat-returns-section")
+            section.find(".document-list .p-empty").addClass("visuallyhidden")
+            section.find(".document-list ul").append(result.text())
+
+          $("#vat-returns-buffer").empty()
+
+  $("#vat-returns-attachment-form form").on "fileuploadsubmit", (e, data) ->
+    data.formData =
+      authenticity_token: $("meta[name='csrf-token']").attr("content")
+      format: "js"
+      "vat_returns_file[attachment]": $("#vat_returns_file_attachment").val()
+
+  $(document).on 'click', ".vat-returns-file-destroyer a", (e) ->
+    e.preventDefault()
+    form = $(this).parents('.vat-returns-file-destroyer')
+    section = form.closest("#vat-returns-section")
+    $.ajax
+      url: form.attr('action'),
+      type: 'DELETE'
+    form.parents('.vat-returns-file').remove()
+    if $('.vat-returns-file').length == 0
+      section.find(".document-list .p-empty").removeClass("visuallyhidden")
+      $('#shortlisted-documents-status').attr('data-status-reversible', 'false')
+    else 
+      $('#shortlisted-documents-status').attr('data-status-reversible', 'true')
+
+  $(document).on 'click', "#shortlisted-documents-status a", (e) ->
+    e.preventDefault()
+    form = $(this).closest('form')
+    $.ajax
+      url: form.attr('action'),
+      dataType: 'script',
+      type: 'POST'
+
   if $("html").hasClass("lte-ie7")
     $(".attachment-link", $("#application-attachment-form")).removeClass("if-js-hide")
   else

From 51316dc36c469c8596aa689912daf7e0e0b6a1fb Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 01:09:52 -0300
Subject: [PATCH 097/352] Log audit certificate deletion

---
 app/controllers/admin/form_answers_controller.rb | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/form_answers_controller.rb b/app/controllers/admin/form_answers_controller.rb
index 3d9d2fe13b..582c3711de 100644
--- a/app/controllers/admin/form_answers_controller.rb
+++ b/app/controllers/admin/form_answers_controller.rb
@@ -53,7 +53,7 @@ def edit
   def remove_audit_certificate
     authorize @form_answer, :remove_audit_certificate?
 
-    @form_answer.audit_certificate.destroy
+    log_event if @form_answer.audit_certificate.destroy
 
     respond_to do |format|
       format.html do
@@ -88,8 +88,18 @@ def awarded_trade_applications
   def resource
     @form_answer ||= load_resource
   end
+  alias_method :form_answer, :resource
 
   def load_versions
     @versions = FormAnswerVersionsDispatcher.new(@form_answer).versions
   end
+
+  def action_type
+    case action_name
+    when "remove_audit_certificate"
+      "audit_certificate_destroyed"
+    else
+      raise "Attempted to log an unsupported action (#{action_name})"
+    end
+  end
 end

From c93996e58ae0bdac8616105b873f7487ca8ceaa2 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 11:46:07 -0300
Subject: [PATCH 098/352] Remove `ul` HTML tag - seems redundant

---
 app/views/admin/audit_certificate/_form.html.slim       | 2 --
 app/views/admin/figures_and_vat_returns/_form.html.slim | 2 --
 app/views/admin/form_answer_attachments/_form.html.slim | 3 ---
 3 files changed, 7 deletions(-)

diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index 9e067b8d4d..8bb91ff40f 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -10,8 +10,6 @@
     - if form.object.errors.any?
       .errors = form.object.errors.full_messages.join(", ")
 
-    ul.list-unstyled
-    p
     .attachment-link.if-js-hide
       = form.file_field :attachment
 
diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
index e7216bd330..c8fcb55b53 100644
--- a/app/views/admin/figures_and_vat_returns/_form.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -10,8 +10,6 @@
     - if form.object.errors.any?
       .errors = form.object.errors.full_messages.join(", ")
 
-    ul.list-unstyled
-    p
     .attachment-link.if-js-hide
       = form.file_field :attachment
 
diff --git a/app/views/admin/form_answer_attachments/_form.html.slim b/app/views/admin/form_answer_attachments/_form.html.slim
index ae45e44ced..14127c8da8 100644
--- a/app/views/admin/form_answer_attachments/_form.html.slim
+++ b/app/views/admin/form_answer_attachments/_form.html.slim
@@ -10,8 +10,6 @@
     - if form.object.errors.any?
       .errors = form.object.errors.full_messages.join(", ")
 
-    ul.list-unstyled
-    p
     .attachment-link.if-js-hide
       = form.file_field :file
 
@@ -25,7 +23,6 @@
 
             ' Only admin can view this document
 
-
     .form-actions.text-right
       = link_to "Cancel", "#", class: "btn btn-default btn-cancel"
       = form.submit "Attach", class: "btn btn-primary btn-submit"

From 9ffbf8ceedd7de48594db2c9d03ab13a2dc9d417 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 14 Jul 2023 11:55:38 -0300
Subject: [PATCH 099/352] Update `select2` to `4.1.0`

---
 vendor/assets/javascripts/select2.full.min.js | 5 ++---
 vendor/assets/stylesheets/select2.min.css     | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/vendor/assets/javascripts/select2.full.min.js b/vendor/assets/javascripts/select2.full.min.js
index 03a9801b10..dbb4325052 100755
--- a/vendor/assets/javascripts/select2.full.min.js
+++ b/vendor/assets/javascripts/select2.full.min.js
@@ -1,3 +1,2 @@
-/*! Select2 4.0.0 | https://github.com/select2/select2/blob/master/LICENSE.md */!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):a("object"==typeof exports?require("jquery"):jQuery)}(function(a){var b=function(){if(a&&a.fn&&a.fn.select2&&a.fn.select2.amd)var b=a.fn.select2.amd;var b;return function(){if(!b||!b.requirejs){b?c=b:b={};var a,c,d;!function(b){function e(a,b){return u.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n=b&&b.split("/"),o=s.map,p=o&&o["*"]||{};if(a&&"."===a.charAt(0))if(b){for(n=n.slice(0,n.length-1),a=a.split("/"),g=a.length-1,s.nodeIdCompat&&w.test(a[g])&&(a[g]=a[g].replace(w,"")),a=n.concat(a),k=0;k<a.length;k+=1)if(m=a[k],"."===m)a.splice(k,1),k-=1;else if(".."===m){if(1===k&&(".."===a[2]||".."===a[0]))break;k>0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}else 0===a.indexOf("./")&&(a=a.substring(2));if((n||p)&&o){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),n)for(l=n.length;l>0;l-=1)if(e=o[n.slice(0,l).join("/")],e&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&p&&p[d]&&(i=p[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,c){return function(){return n.apply(b,v.call(arguments,0).concat([a,c]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){q[a]=b}}function j(a){if(e(r,a)){var c=r[a];delete r[a],t[a]=!0,m.apply(b,c)}if(!e(q,a)&&!e(t,a))throw new Error("No "+a);return q[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return function(){return s&&s.config&&s.config[a]||{}}}var m,n,o,p,q={},r={},s={},t={},u=Object.prototype.hasOwnProperty,v=[].slice,w=/\.js$/;o=function(a,b){var c,d=k(a),e=d[0];return a=d[1],e&&(e=f(e,b),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(b)):f(a,b):(a=f(a,b),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},p={require:function(a){return g(a)},exports:function(a){var b=q[a];return"undefined"!=typeof b?b:q[a]={}},module:function(a){return{id:a,uri:"",exports:q[a],config:l(a)}}},m=function(a,c,d,f){var h,k,l,m,n,s,u=[],v=typeof d;if(f=f||a,"undefined"===v||"function"===v){for(c=!c.length&&d.length?["require","exports","module"]:c,n=0;n<c.length;n+=1)if(m=o(c[n],f),k=m.f,"require"===k)u[n]=p.require(a);else if("exports"===k)u[n]=p.exports(a),s=!0;else if("module"===k)h=u[n]=p.module(a);else if(e(q,k)||e(r,k)||e(t,k))u[n]=j(k);else{if(!m.p)throw new Error(a+" missing "+k);m.p.load(m.n,g(f,!0),i(k),{}),u[n]=q[k]}l=d?d.apply(q[a],u):void 0,a&&(h&&h.exports!==b&&h.exports!==q[a]?q[a]=h.exports:l===b&&s||(q[a]=l))}else a&&(q[a]=d)},a=c=n=function(a,c,d,e,f){if("string"==typeof a)return p[a]?p[a](c):j(o(a,c).f);if(!a.splice){if(s=a,s.deps&&n(s.deps,s.callback),!c)return;c.splice?(a=c,c=d,d=null):a=b}return c=c||function(){},"function"==typeof d&&(d=e,e=f),e?m(b,a,c,d):setTimeout(function(){m(b,a,c,d)},4),n},n.config=function(a){return n(a)},a._defined=q,d=function(a,b,c){b.splice||(c=b,b=[]),e(q,a)||e(r,a)||(r[a]=[a,b,c])},d.amd={jQuery:!0}}(),b.requirejs=a,b.require=c,b.define=d}}(),b.define("almond",function(){}),b.define("jquery",[],function(){var b=a||$;return null==b&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),b}),b.define("select2/utils",["jquery"],function(a){function b(a){var b=a.prototype,c=[];for(var d in b){var e=b[d];"function"==typeof e&&"constructor"!==d&&c.push(d)}return c}var c={};c.Extend=function(a,b){function c(){this.constructor=a}var d={}.hasOwnProperty;for(var e in b)d.call(b,e)&&(a[e]=b[e]);return c.prototype=b.prototype,a.prototype=new c,a.__super__=b.prototype,a},c.Decorate=function(a,c){function d(){var b=Array.prototype.unshift,d=c.prototype.constructor.length,e=a.prototype.constructor;d>0&&(b.call(arguments,a.prototype.constructor),e=c.prototype.constructor),e.apply(this,arguments)}function e(){this.constructor=d}var f=b(c),g=b(a);c.displayName=a.displayName,d.prototype=new e;for(var h=0;h<g.length;h++){var i=g[h];d.prototype[i]=a.prototype[i]}for(var j=(function(a){var b=function(){};a in d.prototype&&(b=d.prototype[a]);var e=c.prototype[a];return function(){var a=Array.prototype.unshift;return a.call(arguments,b),e.apply(this,arguments)}}),k=0;k<f.length;k++){var l=f[k];d.prototype[l]=j(l)}return d};var d=function(){this.listeners={}};return d.prototype.on=function(a,b){this.listeners=this.listeners||{},a in this.listeners?this.listeners[a].push(b):this.listeners[a]=[b]},d.prototype.trigger=function(a){var b=Array.prototype.slice;this.listeners=this.listeners||{},a in this.listeners&&this.invoke(this.listeners[a],b.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},d.prototype.invoke=function(a,b){for(var c=0,d=a.length;d>c;c++)a[c].apply(this,b)},c.Observable=d,c.generateChars=function(a){for(var b="",c=0;a>c;c++){var d=Math.floor(36*Math.random());b+=d.toString(36)}return b},c.bind=function(a,b){return function(){a.apply(b,arguments)}},c._convertData=function(a){for(var b in a){var c=b.split("-"),d=a;if(1!==c.length){for(var e=0;e<c.length;e++){var f=c[e];f=f.substring(0,1).toLowerCase()+f.substring(1),f in d||(d[f]={}),e==c.length-1&&(d[f]=a[b]),d=d[f]}delete a[b]}}return a},c.hasScroll=function(b,c){var d=a(c),e=c.style.overflowX,f=c.style.overflowY;return e!==f||"hidden"!==f&&"visible"!==f?"scroll"===e||"scroll"===f?!0:d.innerHeight()<c.scrollHeight||d.innerWidth()<c.scrollWidth:!1},c.escapeMarkup=function(a){var b={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof a?a:String(a).replace(/[&<>"'\/\\]/g,function(a){return b[a]})},c.appendMany=function(b,c){if("1.7"===a.fn.jquery.substr(0,3)){var d=a();a.map(c,function(a){d=d.add(a)}),c=d}b.append(c)},c}),b.define("select2/results",["jquery","./utils"],function(a,b){function c(a,b,d){this.$element=a,this.data=d,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<ul class="select2-results__options" role="tree"></ul>');return this.options.get("multiple")&&b.attr("aria-multiselectable","true"),this.$results=b,b},c.prototype.clear=function(){this.$results.empty()},c.prototype.displayMessage=function(b){var c=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var d=a('<li role="treeitem" class="select2-results__option"></li>'),e=this.options.get("translations").get(b.message);d.append(c(e(b.args))),this.$results.append(d)},c.prototype.append=function(a){this.hideLoading();var b=[];if(null==a.results||0===a.results.length)return void(0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"}));a.results=this.sort(a.results);for(var c=0;c<a.results.length;c++){var d=a.results[c],e=this.option(d);b.push(e)}this.$results.append(b)},c.prototype.position=function(a,b){var c=b.find(".select2-results");c.append(a)},c.prototype.sort=function(a){var b=this.options.get("sorter");return b(a)},c.prototype.setClasses=function(){var b=this;this.data.current(function(c){var d=a.map(c,function(a){return a.id.toString()}),e=b.$results.find(".select2-results__option[aria-selected]");e.each(function(){var b=a(this),c=a.data(this,"data"),e=""+c.id;null!=c.element&&c.element.selected||null==c.element&&a.inArray(e,d)>-1?b.attr("aria-selected","true"):b.attr("aria-selected","false")});var f=e.filter("[aria-selected=true]");f.length>0?f.first().trigger("mouseenter"):e.first().trigger("mouseenter")})},c.prototype.showLoading=function(a){this.hideLoading();var b=this.options.get("translations").get("searching"),c={disabled:!0,loading:!0,text:b(a)},d=this.option(c);d.className+=" loading-results",this.$results.prepend(d)},c.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},c.prototype.option=function(b){var c=document.createElement("li");c.className="select2-results__option";var d={role:"treeitem","aria-selected":"false"};b.disabled&&(delete d["aria-selected"],d["aria-disabled"]="true"),null==b.id&&delete d["aria-selected"],null!=b._resultId&&(c.id=b._resultId),b.title&&(c.title=b.title),b.children&&(d.role="group",d["aria-label"]=b.text,delete d["aria-selected"]);for(var e in d){var f=d[e];c.setAttribute(e,f)}if(b.children){var g=a(c),h=document.createElement("strong");h.className="select2-results__group";{a(h)}this.template(b,h);for(var i=[],j=0;j<b.children.length;j++){var k=b.children[j],l=this.option(k);i.push(l)}var m=a("<ul></ul>",{"class":"select2-results__options select2-results__options--nested"});m.append(i),g.append(h),g.append(m)}else this.template(b,c);return a.data(c,"data",b),c},c.prototype.bind=function(b){var c=this,d=b.id+"-results";this.$results.attr("id",d),b.on("results:all",function(a){c.clear(),c.append(a.data),b.isOpen()&&c.setClasses()}),b.on("results:append",function(a){c.append(a.data),b.isOpen()&&c.setClasses()}),b.on("query",function(a){c.showLoading(a)}),b.on("select",function(){b.isOpen()&&c.setClasses()}),b.on("unselect",function(){b.isOpen()&&c.setClasses()}),b.on("open",function(){c.$results.attr("aria-expanded","true"),c.$results.attr("aria-hidden","false"),c.setClasses(),c.ensureHighlightVisible()}),b.on("close",function(){c.$results.attr("aria-expanded","false"),c.$results.attr("aria-hidden","true"),c.$results.removeAttr("aria-activedescendant")}),b.on("results:toggle",function(){var a=c.getHighlightedResults();0!==a.length&&a.trigger("mouseup")}),b.on("results:select",function(){var a=c.getHighlightedResults();if(0!==a.length){var b=a.data("data");"true"==a.attr("aria-selected")?c.trigger("close"):c.trigger("select",{data:b})}}),b.on("results:previous",function(){var a=c.getHighlightedResults(),b=c.$results.find("[aria-selected]"),d=b.index(a);if(0!==d){var e=d-1;0===a.length&&(e=0);var f=b.eq(e);f.trigger("mouseenter");var g=c.$results.offset().top,h=f.offset().top,i=c.$results.scrollTop()+(h-g);0===e?c.$results.scrollTop(0):0>h-g&&c.$results.scrollTop(i)}}),b.on("results:next",function(){var a=c.getHighlightedResults(),b=c.$results.find("[aria-selected]"),d=b.index(a),e=d+1;if(!(e>=b.length)){var f=b.eq(e);f.trigger("mouseenter");var g=c.$results.offset().top+c.$results.outerHeight(!1),h=f.offset().top+f.outerHeight(!1),i=c.$results.scrollTop()+h-g;0===e?c.$results.scrollTop(0):h>g&&c.$results.scrollTop(i)}}),b.on("results:focus",function(a){a.element.addClass("select2-results__option--highlighted")}),b.on("results:message",function(a){c.displayMessage(a)}),a.fn.mousewheel&&this.$results.on("mousewheel",function(a){var b=c.$results.scrollTop(),d=c.$results.get(0).scrollHeight-c.$results.scrollTop()+a.deltaY,e=a.deltaY>0&&b-a.deltaY<=0,f=a.deltaY<0&&d<=c.$results.height();e?(c.$results.scrollTop(0),a.preventDefault(),a.stopPropagation()):f&&(c.$results.scrollTop(c.$results.get(0).scrollHeight-c.$results.height()),a.preventDefault(),a.stopPropagation())}),this.$results.on("mouseup",".select2-results__option[aria-selected]",function(b){var d=a(this),e=d.data("data");return"true"===d.attr("aria-selected")?void(c.options.get("multiple")?c.trigger("unselect",{originalEvent:b,data:e}):c.trigger("close")):void c.trigger("select",{originalEvent:b,data:e})}),this.$results.on("mouseenter",".select2-results__option[aria-selected]",function(){var b=a(this).data("data");c.getHighlightedResults().removeClass("select2-results__option--highlighted"),c.trigger("results:focus",{data:b,element:a(this)})})},c.prototype.getHighlightedResults=function(){var a=this.$results.find(".select2-results__option--highlighted");return a},c.prototype.destroy=function(){this.$results.remove()},c.prototype.ensureHighlightVisible=function(){var a=this.getHighlightedResults();if(0!==a.length){var b=this.$results.find("[aria-selected]"),c=b.index(a),d=this.$results.offset().top,e=a.offset().top,f=this.$results.scrollTop()+(e-d),g=e-d;f-=2*a.outerHeight(!1),2>=c?this.$results.scrollTop(0):(g>this.$results.outerHeight()||0>g)&&this.$results.scrollTop(f)}},c.prototype.template=function(b,c){var d=this.options.get("templateResult"),e=this.options.get("escapeMarkup"),f=d(b);null==f?c.style.display="none":"string"==typeof f?c.innerHTML=e(f):a(c).append(f)},c}),b.define("select2/keys",[],function(){var a={BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46};return a}),b.define("select2/selection/base",["jquery","../utils","../keys"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,b.Observable),d.prototype.render=function(){var b=a('<span class="select2-selection" role="combobox" aria-autocomplete="list" aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=this.$element.data("old-tabindex")?this._tabindex=this.$element.data("old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),b.attr("title",this.$element.attr("title")),b.attr("tabindex",this._tabindex),this.$selection=b,b},d.prototype.bind=function(a){var b=this,d=(a.id+"-container",a.id+"-results");this.container=a,this.$selection.on("focus",function(a){b.trigger("focus",a)}),this.$selection.on("blur",function(a){b.trigger("blur",a)}),this.$selection.on("keydown",function(a){b.trigger("keypress",a),a.which===c.SPACE&&a.preventDefault()}),a.on("results:focus",function(a){b.$selection.attr("aria-activedescendant",a.data._resultId)}),a.on("selection:update",function(a){b.update(a.data)}),a.on("open",function(){b.$selection.attr("aria-expanded","true"),b.$selection.attr("aria-owns",d),b._attachCloseHandler(a)}),a.on("close",function(){b.$selection.attr("aria-expanded","false"),b.$selection.removeAttr("aria-activedescendant"),b.$selection.removeAttr("aria-owns"),b.$selection.focus(),b._detachCloseHandler(a)}),a.on("enable",function(){b.$selection.attr("tabindex",b._tabindex)}),a.on("disable",function(){b.$selection.attr("tabindex","-1")})},d.prototype._attachCloseHandler=function(b){a(document.body).on("mousedown.select2."+b.id,function(b){var c=a(b.target),d=c.closest(".select2"),e=a(".select2.select2-container--open");e.each(function(){var b=a(this);if(this!=d[0]){var c=b.data("element");c.select2("close")}})})},d.prototype._detachCloseHandler=function(b){a(document.body).off("mousedown.select2."+b.id)},d.prototype.position=function(a,b){var c=b.find(".selection");c.append(a)},d.prototype.destroy=function(){this._detachCloseHandler(this.container)},d.prototype.update=function(){throw new Error("The `update` method must be defined in child classes.")},d}),b.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(a,b,c){function d(){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--single"),a.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><span role="presentation"></span></span>'),a},d.prototype.bind=function(a){var b=this;d.__super__.bind.apply(this,arguments);var c=a.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",c),this.$selection.attr("aria-labelledby",c),this.$selection.on("mousedown",function(a){1===a.which&&b.trigger("toggle",{originalEvent:a})}),this.$selection.on("focus",function(){}),this.$selection.on("blur",function(){}),a.on("selection:update",function(a){b.update(a.data)})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a){var b=this.options.get("templateSelection"),c=this.options.get("escapeMarkup");return c(b(a))},d.prototype.selectionContainer=function(){return a("<span></span>")},d.prototype.update=function(a){if(0===a.length)return void this.clear();var b=a[0],c=this.display(b),d=this.$selection.find(".select2-selection__rendered");d.empty().append(c),d.prop("title",b.title||b.text)},d}),b.define("select2/selection/multiple",["jquery","./base","../utils"],function(a,b,c){function d(){d.__super__.constructor.apply(this,arguments)}return c.Extend(d,b),d.prototype.render=function(){var a=d.__super__.render.call(this);return a.addClass("select2-selection--multiple"),a.html('<ul class="select2-selection__rendered"></ul>'),a},d.prototype.bind=function(){var b=this;d.__super__.bind.apply(this,arguments),this.$selection.on("click",function(a){b.trigger("toggle",{originalEvent:a})}),this.$selection.on("click",".select2-selection__choice__remove",function(c){var d=a(this),e=d.parent(),f=e.data("data");b.trigger("unselect",{originalEvent:c,data:f})})},d.prototype.clear=function(){this.$selection.find(".select2-selection__rendered").empty()},d.prototype.display=function(a){var b=this.options.get("templateSelection"),c=this.options.get("escapeMarkup");return c(b(a))},d.prototype.selectionContainer=function(){var b=a('<li class="select2-selection__choice"><span class="select2-selection__choice__remove" role="presentation">&times;</span></li>');return b},d.prototype.update=function(a){if(this.clear(),0!==a.length){for(var b=[],d=0;d<a.length;d++){var e=a[d],f=this.display(e),g=this.selectionContainer();g.append(f),g.prop("title",e.title||e.text),g.data("data",e),b.push(g)}var h=this.$selection.find(".select2-selection__rendered");c.appendMany(h,b)}},d}),b.define("select2/selection/placeholder",["../utils"],function(){function a(a,b,c){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c)}return a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.createPlaceholder=function(a,b){var c=this.selectionContainer();return c.html(this.display(b)),c.addClass("select2-selection__placeholder").removeClass("select2-selection__choice"),c},a.prototype.update=function(a,b){var c=1==b.length&&b[0].id!=this.placeholder.id,d=b.length>1;if(d||c)return a.call(this,b);this.clear();var e=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(e)},a}),b.define("select2/selection/allowClear",["jquery","../keys"],function(a,b){function c(){}return c.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(a){d._handleClear(a)}),b.on("keypress",function(a){d._handleKeyboardClear(a,b)})},c.prototype._handleClear=function(a,b){if(!this.options.get("disabled")){var c=this.$selection.find(".select2-selection__clear");if(0!==c.length){b.stopPropagation();for(var d=c.data("data"),e=0;e<d.length;e++){var f={data:d[e]};if(this.trigger("unselect",f),f.prevented)return}this.$element.val(this.placeholder.id).trigger("change"),this.trigger("toggle")}}},c.prototype._handleKeyboardClear=function(a,c,d){d.isOpen()||(c.which==b.DELETE||c.which==b.BACKSPACE)&&this._handleClear(c)},c.prototype.update=function(b,c){if(b.call(this,c),!(this.$selection.find(".select2-selection__placeholder").length>0||0===c.length)){var d=a('<span class="select2-selection__clear">&times;</span>');d.data("data",c),this.$selection.find(".select2-selection__rendered").prepend(d)}},c}),b.define("select2/selection/search",["jquery","../utils","../keys"],function(a,b,c){function d(a,b,c){a.call(this,b,c)}return d.prototype.render=function(b){var c=a('<li class="select2-search select2-search--inline"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></li>');this.$searchContainer=c,this.$search=c.find("input");var d=b.call(this);return d},d.prototype.bind=function(a,b,d){var e=this;a.call(this,b,d),b.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus()}),b.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val(""),e.$search.focus()}),b.on("enable",function(){e.$search.prop("disabled",!1)}),b.on("disable",function(){e.$search.prop("disabled",!0)}),this.$selection.on("focusin",".select2-search--inline",function(a){e.trigger("focus",a)}),this.$selection.on("focusout",".select2-search--inline",function(a){e.trigger("blur",a)}),this.$selection.on("keydown",".select2-search--inline",function(a){a.stopPropagation(),e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented();var b=a.which;if(b===c.BACKSPACE&&""===e.$search.val()){var d=e.$searchContainer.prev(".select2-selection__choice");if(d.length>0){var f=d.data("data");e.searchRemoveChoice(f),a.preventDefault()}}}),this.$selection.on("input",".select2-search--inline",function(){e.$selection.off("keyup.search")}),this.$selection.on("keyup.search input",".select2-search--inline",function(a){e.handleSearch(a)})},d.prototype.createPlaceholder=function(a,b){this.$search.attr("placeholder",b.text)},d.prototype.update=function(a,b){this.$search.attr("placeholder",""),a.call(this,b),this.$selection.find(".select2-selection__rendered").append(this.$searchContainer),this.resizeSearch()},d.prototype.handleSearch=function(){if(this.resizeSearch(),!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},d.prototype.searchRemoveChoice=function(a,b){this.trigger("unselect",{data:b}),this.trigger("open"),this.$search.val(b.text+" ")},d.prototype.resizeSearch=function(){this.$search.css("width","25px");var a="";if(""!==this.$search.attr("placeholder"))a=this.$selection.find(".select2-selection__rendered").innerWidth();else{var b=this.$search.val().length+1;a=.75*b+"em"}this.$search.css("width",a)},d}),b.define("select2/selection/eventRelay",["jquery"],function(a){function b(){}return b.prototype.bind=function(b,c,d){var e=this,f=["open","opening","close","closing","select","selecting","unselect","unselecting"],g=["opening","closing","selecting","unselecting"];b.call(this,c,d),c.on("*",function(b,c){if(-1!==a.inArray(b,f)){c=c||{};var d=a.Event("select2:"+b,{params:c});e.$element.trigger(d),-1!==a.inArray(b,g)&&(c.prevented=d.isDefaultPrevented())}})},b}),b.define("select2/translation",["jquery","require"],function(a,b){function c(a){this.dict=a||{}}return c.prototype.all=function(){return this.dict},c.prototype.get=function(a){return this.dict[a]},c.prototype.extend=function(b){this.dict=a.extend({},b.all(),this.dict)},c._cache={},c.loadPath=function(a){if(!(a in c._cache)){var d=b(a);c._cache[a]=d}return new c(c._cache[a])},c}),b.define("select2/diacritics",[],function(){var a={"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ω":"ω","ς":"σ"};return a}),b.define("select2/data/base",["../utils"],function(a){function b(){b.__super__.constructor.call(this)}return a.Extend(b,a.Observable),b.prototype.current=function(){throw new Error("The `current` method must be defined in child classes.")},b.prototype.query=function(){throw new Error("The `query` method must be defined in child classes.")},b.prototype.bind=function(){},b.prototype.destroy=function(){},b.prototype.generateResultId=function(b,c){var d=b.id+"-result-";return d+=a.generateChars(4),d+=null!=c.id?"-"+c.id.toString():"-"+a.generateChars(4)},b}),b.define("select2/data/select",["./base","../utils","jquery"],function(a,b,c){function d(a,b){this.$element=a,this.options=b,d.__super__.constructor.call(this)}return b.Extend(d,a),d.prototype.current=function(a){var b=[],d=this;this.$element.find(":selected").each(function(){var a=c(this),e=d.item(a);b.push(e)}),a(b)},d.prototype.select=function(a){var b=this;if(a.selected=!0,c(a.element).is("option"))return a.element.selected=!0,void this.$element.trigger("change");if(this.$element.prop("multiple"))this.current(function(d){var e=[];a=[a],a.push.apply(a,d);for(var f=0;f<a.length;f++){var g=a[f].id;-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")});else{var d=a.id;this.$element.val(d),this.$element.trigger("change")}},d.prototype.unselect=function(a){var b=this;if(this.$element.prop("multiple"))return a.selected=!1,c(a.element).is("option")?(a.element.selected=!1,void this.$element.trigger("change")):void this.current(function(d){for(var e=[],f=0;f<d.length;f++){var g=d[f].id;g!==a.id&&-1===c.inArray(g,e)&&e.push(g)}b.$element.val(e),b.$element.trigger("change")})},d.prototype.bind=function(a){var b=this;this.container=a,a.on("select",function(a){b.select(a.data)}),a.on("unselect",function(a){b.unselect(a.data)})},d.prototype.destroy=function(){this.$element.find("*").each(function(){c.removeData(this,"data")})},d.prototype.query=function(a,b){var d=[],e=this,f=this.$element.children();f.each(function(){var b=c(this);if(b.is("option")||b.is("optgroup")){var f=e.item(b),g=e.matches(a,f);null!==g&&d.push(g)}}),b({results:d})},d.prototype.addOptions=function(a){b.appendMany(this.$element,a)},d.prototype.option=function(a){var b;a.children?(b=document.createElement("optgroup"),b.label=a.text):(b=document.createElement("option"),void 0!==b.textContent?b.textContent=a.text:b.innerText=a.text),a.id&&(b.value=a.id),a.disabled&&(b.disabled=!0),a.selected&&(b.selected=!0),a.title&&(b.title=a.title);var d=c(b),e=this._normalizeItem(a);return e.element=b,c.data(b,"data",e),d},d.prototype.item=function(a){var b={};
-if(b=c.data(a[0],"data"),null!=b)return b;if(a.is("option"))b={id:a.val(),text:a.text(),disabled:a.prop("disabled"),selected:a.prop("selected"),title:a.prop("title")};else if(a.is("optgroup")){b={text:a.prop("label"),children:[],title:a.prop("title")};for(var d=a.children("option"),e=[],f=0;f<d.length;f++){var g=c(d[f]),h=this.item(g);e.push(h)}b.children=e}return b=this._normalizeItem(b),b.element=a[0],c.data(a[0],"data",b),b},d.prototype._normalizeItem=function(a){c.isPlainObject(a)||(a={id:a,text:a}),a=c.extend({},{text:""},a);var b={selected:!1,disabled:!1};return null!=a.id&&(a.id=a.id.toString()),null!=a.text&&(a.text=a.text.toString()),null==a._resultId&&a.id&&null!=this.container&&(a._resultId=this.generateResultId(this.container,a)),c.extend({},b,a)},d.prototype.matches=function(a,b){var c=this.options.get("matcher");return c(a,b)},d}),b.define("select2/data/array",["./select","../utils","jquery"],function(a,b,c){function d(a,b){var c=b.get("data")||[];d.__super__.constructor.call(this,a,b),this.addOptions(this.convertToOptions(c))}return b.Extend(d,a),d.prototype.select=function(a){var b=this.$element.find("option").filter(function(b,c){return c.value==a.id.toString()});0===b.length&&(b=this.option(a),this.addOptions(b)),d.__super__.select.call(this,a)},d.prototype.convertToOptions=function(a){function d(a){return function(){return c(this).val()==a.id}}for(var e=this,f=this.$element.find("option"),g=f.map(function(){return e.item(c(this)).id}).get(),h=[],i=0;i<a.length;i++){var j=this._normalizeItem(a[i]);if(c.inArray(j.id,g)>=0){var k=f.filter(d(j)),l=this.item(k),m=(c.extend(!0,{},l,j),this.option(l));k.replaceWith(m)}else{var n=this.option(j);if(j.children){var o=this.convertToOptions(j.children);b.appendMany(n,o)}h.push(n)}}return h},d}),b.define("select2/data/ajax",["./array","../utils","jquery"],function(a,b,c){function d(b,c){this.ajaxOptions=this._applyDefaults(c.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),a.__super__.constructor.call(this,b,c)}return b.Extend(d,a),d.prototype._applyDefaults=function(a){var b={data:function(a){return{q:a.term}},transport:function(a,b,d){var e=c.ajax(a);return e.then(b),e.fail(d),e}};return c.extend({},b,a,!0)},d.prototype.processResults=function(a){return a},d.prototype.query=function(a,b){function d(){var d=f.transport(f,function(d){var f=e.processResults(d,a);e.options.get("debug")&&window.console&&console.error&&(f&&f.results&&c.isArray(f.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),b(f)},function(){});e._request=d}var e=this;null!=this._request&&(c.isFunction(this._request.abort)&&this._request.abort(),this._request=null);var f=c.extend({type:"GET"},this.ajaxOptions);"function"==typeof f.url&&(f.url=f.url(a)),"function"==typeof f.data&&(f.data=f.data(a)),this.ajaxOptions.delay&&""!==a.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(d,this.ajaxOptions.delay)):d()},d}),b.define("select2/data/tags",["jquery"],function(a){function b(b,c,d){var e=d.get("tags"),f=d.get("createTag");if(void 0!==f&&(this.createTag=f),b.call(this,c,d),a.isArray(e))for(var g=0;g<e.length;g++){var h=e[g],i=this._normalizeItem(h),j=this.option(i);this.$element.append(j)}}return b.prototype.query=function(a,b,c){function d(a,f){for(var g=a.results,h=0;h<g.length;h++){var i=g[h],j=null!=i.children&&!d({results:i.children},!0),k=i.text===b.term;if(k||j)return f?!1:(a.data=g,void c(a))}if(f)return!0;var l=e.createTag(b);if(null!=l){var m=e.option(l);m.attr("data-select2-tag",!0),e.addOptions([m]),e.insertTag(g,l)}a.results=g,c(a)}var e=this;return this._removeOldTags(),null==b.term||null!=b.page?void a.call(this,b,c):void a.call(this,b,d)},b.prototype.createTag=function(b,c){var d=a.trim(c.term);return""===d?null:{id:d,text:d}},b.prototype.insertTag=function(a,b,c){b.unshift(c)},b.prototype._removeOldTags=function(){var b=(this._lastTag,this.$element.find("option[data-select2-tag]"));b.each(function(){this.selected||a(this).remove()})},b}),b.define("select2/data/tokenizer",["jquery"],function(a){function b(a,b,c){var d=c.get("tokenizer");void 0!==d&&(this.tokenizer=d),a.call(this,b,c)}return b.prototype.bind=function(a,b,c){a.call(this,b,c),this.$search=b.dropdown.$search||b.selection.$search||c.find(".select2-search__field")},b.prototype.query=function(a,b,c){function d(a){e.select(a)}var e=this;b.term=b.term||"";var f=this.tokenizer(b,this.options,d);f.term!==b.term&&(this.$search.length&&(this.$search.val(f.term),this.$search.focus()),b.term=f.term),a.call(this,b,c)},b.prototype.tokenizer=function(b,c,d,e){for(var f=d.get("tokenSeparators")||[],g=c.term,h=0,i=this.createTag||function(a){return{id:a.term,text:a.term}};h<g.length;){var j=g[h];if(-1!==a.inArray(j,f)){var k=g.substr(0,h),l=a.extend({},c,{term:k}),m=i(l);e(m),g=g.substr(h+1)||"",h=0}else h++}return{term:g}},b}),b.define("select2/data/minimumInputLength",[],function(){function a(a,b,c){this.minimumInputLength=c.get("minimumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",b.term.length<this.minimumInputLength?void this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumInputLength",[],function(){function a(a,b,c){this.maximumInputLength=c.get("maximumInputLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){return b.term=b.term||"",this.maximumInputLength>0&&b.term.length>this.maximumInputLength?void this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:b.term,params:b}}):void a.call(this,b,c)},a}),b.define("select2/data/maximumSelectionLength",[],function(){function a(a,b,c){this.maximumSelectionLength=c.get("maximumSelectionLength"),a.call(this,b,c)}return a.prototype.query=function(a,b,c){var d=this;this.current(function(e){var f=null!=e?e.length:0;return d.maximumSelectionLength>0&&f>=d.maximumSelectionLength?void d.trigger("results:message",{message:"maximumSelected",args:{maximum:d.maximumSelectionLength}}):void a.call(d,b,c)})},a}),b.define("select2/dropdown",["jquery","./utils"],function(a,b){function c(a,b){this.$element=a,this.options=b,c.__super__.constructor.call(this)}return b.Extend(c,b.Observable),c.prototype.render=function(){var b=a('<span class="select2-dropdown"><span class="select2-results"></span></span>');return b.attr("dir",this.options.get("dir")),this.$dropdown=b,b},c.prototype.position=function(){},c.prototype.destroy=function(){this.$dropdown.remove()},c}),b.define("select2/dropdown/search",["jquery","../utils"],function(a){function b(){}return b.prototype.render=function(b){var c=b.call(this),d=a('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" role="textbox" /></span>');return this.$searchContainer=d,this.$search=d.find("input"),c.prepend(d),c},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),this.$search.on("keydown",function(a){e.trigger("keypress",a),e._keyUpPrevented=a.isDefaultPrevented()}),this.$search.on("input",function(){a(this).off("keyup")}),this.$search.on("keyup input",function(a){e.handleSearch(a)}),c.on("open",function(){e.$search.attr("tabindex",0),e.$search.focus(),window.setTimeout(function(){e.$search.focus()},0)}),c.on("close",function(){e.$search.attr("tabindex",-1),e.$search.val("")}),c.on("results:all",function(a){if(null==a.query.term||""===a.query.term){var b=e.showSearch(a);b?e.$searchContainer.removeClass("select2-search--hide"):e.$searchContainer.addClass("select2-search--hide")}})},b.prototype.handleSearch=function(){if(!this._keyUpPrevented){var a=this.$search.val();this.trigger("query",{term:a})}this._keyUpPrevented=!1},b.prototype.showSearch=function(){return!0},b}),b.define("select2/dropdown/hidePlaceholder",[],function(){function a(a,b,c,d){this.placeholder=this.normalizePlaceholder(c.get("placeholder")),a.call(this,b,c,d)}return a.prototype.append=function(a,b){b.results=this.removePlaceholder(b.results),a.call(this,b)},a.prototype.normalizePlaceholder=function(a,b){return"string"==typeof b&&(b={id:"",text:b}),b},a.prototype.removePlaceholder=function(a,b){for(var c=b.slice(0),d=b.length-1;d>=0;d--){var e=b[d];this.placeholder.id===e.id&&c.splice(d,1)}return c},a}),b.define("select2/dropdown/infiniteScroll",["jquery"],function(a){function b(a,b,c,d){this.lastParams={},a.call(this,b,c,d),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return b.prototype.append=function(a,b){this.$loadingMore.remove(),this.loading=!1,a.call(this,b),this.showLoadingMore(b)&&this.$results.append(this.$loadingMore)},b.prototype.bind=function(b,c,d){var e=this;b.call(this,c,d),c.on("query",function(a){e.lastParams=a,e.loading=!0}),c.on("query:append",function(a){e.lastParams=a,e.loading=!0}),this.$results.on("scroll",function(){var b=a.contains(document.documentElement,e.$loadingMore[0]);if(!e.loading&&b){var c=e.$results.offset().top+e.$results.outerHeight(!1),d=e.$loadingMore.offset().top+e.$loadingMore.outerHeight(!1);c+50>=d&&e.loadMore()}})},b.prototype.loadMore=function(){this.loading=!0;var b=a.extend({},{page:1},this.lastParams);b.page++,this.trigger("query:append",b)},b.prototype.showLoadingMore=function(a,b){return b.pagination&&b.pagination.more},b.prototype.createLoadingMore=function(){var b=a('<li class="option load-more" role="treeitem"></li>'),c=this.options.get("translations").get("loadingMore");return b.html(c(this.lastParams)),b},b}),b.define("select2/dropdown/attachBody",["jquery","../utils"],function(a,b){function c(a,b,c){this.$dropdownParent=c.get("dropdownParent")||document.body,a.call(this,b,c)}return c.prototype.bind=function(a,b,c){var d=this,e=!1;a.call(this,b,c),b.on("open",function(){d._showDropdown(),d._attachPositioningHandler(b),e||(e=!0,b.on("results:all",function(){d._positionDropdown(),d._resizeDropdown()}),b.on("results:append",function(){d._positionDropdown(),d._resizeDropdown()}))}),b.on("close",function(){d._hideDropdown(),d._detachPositioningHandler(b)}),this.$dropdownContainer.on("mousedown",function(a){a.stopPropagation()})},c.prototype.position=function(a,b,c){b.attr("class",c.attr("class")),b.removeClass("select2"),b.addClass("select2-container--open"),b.css({position:"absolute",top:-999999}),this.$container=c},c.prototype.render=function(b){var c=a("<span></span>"),d=b.call(this);return c.append(d),this.$dropdownContainer=c,c},c.prototype._hideDropdown=function(){this.$dropdownContainer.detach()},c.prototype._attachPositioningHandler=function(c){var d=this,e="scroll.select2."+c.id,f="resize.select2."+c.id,g="orientationchange.select2."+c.id,h=this.$container.parents().filter(b.hasScroll);h.each(function(){a(this).data("select2-scroll-position",{x:a(this).scrollLeft(),y:a(this).scrollTop()})}),h.on(e,function(){var b=a(this).data("select2-scroll-position");a(this).scrollTop(b.y)}),a(window).on(e+" "+f+" "+g,function(){d._positionDropdown(),d._resizeDropdown()})},c.prototype._detachPositioningHandler=function(c){var d="scroll.select2."+c.id,e="resize.select2."+c.id,f="orientationchange.select2."+c.id,g=this.$container.parents().filter(b.hasScroll);g.off(d),a(window).off(d+" "+e+" "+f)},c.prototype._positionDropdown=function(){var b=a(window),c=this.$dropdown.hasClass("select2-dropdown--above"),d=this.$dropdown.hasClass("select2-dropdown--below"),e=null,f=(this.$container.position(),this.$container.offset());f.bottom=f.top+this.$container.outerHeight(!1);var g={height:this.$container.outerHeight(!1)};g.top=f.top,g.bottom=f.top+g.height;var h={height:this.$dropdown.outerHeight(!1)},i={top:b.scrollTop(),bottom:b.scrollTop()+b.height()},j=i.top<f.top-h.height,k=i.bottom>f.bottom+h.height,l={left:f.left,top:g.bottom};c||d||(e="below"),k||!j||c?!j&&k&&c&&(e="below"):e="above",("above"==e||c&&"below"!==e)&&(l.top=g.top-h.height),null!=e&&(this.$dropdown.removeClass("select2-dropdown--below select2-dropdown--above").addClass("select2-dropdown--"+e),this.$container.removeClass("select2-container--below select2-container--above").addClass("select2-container--"+e)),this.$dropdownContainer.css(l)},c.prototype._resizeDropdown=function(){this.$dropdownContainer.width();var a={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(a.minWidth=a.width,a.width="auto"),this.$dropdown.css(a)},c.prototype._showDropdown=function(){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},c}),b.define("select2/dropdown/minimumResultsForSearch",[],function(){function a(b){for(var c=0,d=0;d<b.length;d++){var e=b[d];e.children?c+=a(e.children):c++}return c}function b(a,b,c,d){this.minimumResultsForSearch=c.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),a.call(this,b,c,d)}return b.prototype.showSearch=function(b,c){return a(c.data.results)<this.minimumResultsForSearch?!1:b.call(this,c)},b}),b.define("select2/dropdown/selectOnClose",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("close",function(){d._handleSelectOnClose()})},a.prototype._handleSelectOnClose=function(){var a=this.getHighlightedResults();a.length<1||this.trigger("select",{data:a.data("data")})},a}),b.define("select2/dropdown/closeOnSelect",[],function(){function a(){}return a.prototype.bind=function(a,b,c){var d=this;a.call(this,b,c),b.on("select",function(a){d._selectTriggered(a)}),b.on("unselect",function(a){d._selectTriggered(a)})},a.prototype._selectTriggered=function(a,b){var c=b.originalEvent;c&&c.ctrlKey||this.trigger("close")},a}),b.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(a){var b=a.input.length-a.maximum,c="Please delete "+b+" character";return 1!=b&&(c+="s"),c},inputTooShort:function(a){var b=a.minimum-a.input.length,c="Please enter "+b+" or more characters";return c},loadingMore:function(){return"Loading more results…"},maximumSelected:function(a){var b="You can only select "+a.maximum+" item";return 1!=a.maximum&&(b+="s"),b},noResults:function(){return"No results found"},searching:function(){return"Searching…"}}}),b.define("select2/defaults",["jquery","require","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./i18n/en"],function(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C){function D(){this.reset()}D.prototype.apply=function(l){if(l=a.extend({},this.defaults,l),null==l.dataAdapter){if(l.dataAdapter=null!=l.ajax?o:null!=l.data?n:m,l.minimumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,r)),l.maximumInputLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,s)),l.maximumSelectionLength>0&&(l.dataAdapter=j.Decorate(l.dataAdapter,t)),l.tags&&(l.dataAdapter=j.Decorate(l.dataAdapter,p)),(null!=l.tokenSeparators||null!=l.tokenizer)&&(l.dataAdapter=j.Decorate(l.dataAdapter,q)),null!=l.query){var C=b(l.amdBase+"compat/query");l.dataAdapter=j.Decorate(l.dataAdapter,C)}if(null!=l.initSelection){var D=b(l.amdBase+"compat/initSelection");l.dataAdapter=j.Decorate(l.dataAdapter,D)}}if(null==l.resultsAdapter&&(l.resultsAdapter=c,null!=l.ajax&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,x)),null!=l.placeholder&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,w)),l.selectOnClose&&(l.resultsAdapter=j.Decorate(l.resultsAdapter,A))),null==l.dropdownAdapter){if(l.multiple)l.dropdownAdapter=u;else{var E=j.Decorate(u,v);l.dropdownAdapter=E}if(0!==l.minimumResultsForSearch&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,z)),l.closeOnSelect&&(l.dropdownAdapter=j.Decorate(l.dropdownAdapter,B)),null!=l.dropdownCssClass||null!=l.dropdownCss||null!=l.adaptDropdownCssClass){var F=b(l.amdBase+"compat/dropdownCss");l.dropdownAdapter=j.Decorate(l.dropdownAdapter,F)}l.dropdownAdapter=j.Decorate(l.dropdownAdapter,y)}if(null==l.selectionAdapter){if(l.selectionAdapter=l.multiple?e:d,null!=l.placeholder&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,f)),l.allowClear&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,g)),l.multiple&&(l.selectionAdapter=j.Decorate(l.selectionAdapter,h)),null!=l.containerCssClass||null!=l.containerCss||null!=l.adaptContainerCssClass){var G=b(l.amdBase+"compat/containerCss");l.selectionAdapter=j.Decorate(l.selectionAdapter,G)}l.selectionAdapter=j.Decorate(l.selectionAdapter,i)}if("string"==typeof l.language)if(l.language.indexOf("-")>0){var H=l.language.split("-"),I=H[0];l.language=[l.language,I]}else l.language=[l.language];if(a.isArray(l.language)){var J=new k;l.language.push("en");for(var K=l.language,L=0;L<K.length;L++){var M=K[L],N={};try{N=k.loadPath(M)}catch(O){try{M=this.defaults.amdLanguageBase+M,N=k.loadPath(M)}catch(P){l.debug&&window.console&&console.warn&&console.warn('Select2: The language file for "'+M+'" could not be automatically loaded. A fallback will be used instead.');continue}}J.extend(N)}l.translations=J}else{var Q=k.loadPath(this.defaults.amdLanguageBase+"en"),R=new k(l.language);R.extend(Q),l.translations=R}return l},D.prototype.reset=function(){function b(a){function b(a){return l[a]||a}return a.replace(/[^\u0000-\u007E]/g,b)}function c(d,e){if(""===a.trim(d.term))return e;if(e.children&&e.children.length>0){for(var f=a.extend(!0,{},e),g=e.children.length-1;g>=0;g--){var h=e.children[g],i=c(d,h);null==i&&f.children.splice(g,1)}return f.children.length>0?f:c(d,f)}var j=b(e.text).toUpperCase(),k=b(d.term).toUpperCase();return j.indexOf(k)>-1?e:null}this.defaults={amdBase:"./",amdLanguageBase:"./i18n/",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:j.escapeMarkup,language:C,matcher:c,minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,sorter:function(a){return a},templateResult:function(a){return a.text},templateSelection:function(a){return a.text},theme:"default",width:"resolve"}},D.prototype.set=function(b,c){var d=a.camelCase(b),e={};e[d]=c;var f=j._convertData(e);a.extend(this.defaults,f)};var E=new D;return E}),b.define("select2/options",["require","jquery","./defaults","./utils"],function(a,b,c,d){function e(b,e){if(this.options=b,null!=e&&this.fromElement(e),this.options=c.apply(this.options),e&&e.is("input")){var f=a(this.get("amdBase")+"compat/inputData");this.options.dataAdapter=d.Decorate(this.options.dataAdapter,f)}}return e.prototype.fromElement=function(a){var c=["select2"];null==this.options.multiple&&(this.options.multiple=a.prop("multiple")),null==this.options.disabled&&(this.options.disabled=a.prop("disabled")),null==this.options.language&&(a.prop("lang")?this.options.language=a.prop("lang").toLowerCase():a.closest("[lang]").prop("lang")&&(this.options.language=a.closest("[lang]").prop("lang"))),null==this.options.dir&&(this.options.dir=a.prop("dir")?a.prop("dir"):a.closest("[dir]").prop("dir")?a.closest("[dir]").prop("dir"):"ltr"),a.prop("disabled",this.options.disabled),a.prop("multiple",this.options.multiple),a.data("select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),a.data("data",a.data("select2Tags")),a.data("tags",!0)),a.data("ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),a.attr("ajax--url",a.data("ajaxUrl")),a.data("ajax--url",a.data("ajaxUrl")));var e={};e=b.fn.jquery&&"1."==b.fn.jquery.substr(0,2)&&a[0].dataset?b.extend(!0,{},a[0].dataset,a.data()):a.data();var f=b.extend(!0,{},e);f=d._convertData(f);for(var g in f)b.inArray(g,c)>-1||(b.isPlainObject(this.options[g])?b.extend(this.options[g],f[g]):this.options[g]=f[g]);return this},e.prototype.get=function(a){return this.options[a]},e.prototype.set=function(a,b){this.options[a]=b},e}),b.define("select2/core",["jquery","./options","./utils","./keys"],function(a,b,c,d){var e=function(a,c){null!=a.data("select2")&&a.data("select2").destroy(),this.$element=a,this.id=this._generateId(a),c=c||{},this.options=new b(c,a),e.__super__.constructor.call(this);var d=a.attr("tabindex")||0;a.data("old-tabindex",d),a.attr("tabindex","-1");var f=this.options.get("dataAdapter");this.dataAdapter=new f(a,this.options);var g=this.render();this._placeContainer(g);var h=this.options.get("selectionAdapter");this.selection=new h(a,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,g);var i=this.options.get("dropdownAdapter");this.dropdown=new i(a,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,g);var j=this.options.get("resultsAdapter");this.results=new j(a,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var k=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(a){k.trigger("selection:update",{data:a})}),a.addClass("select2-hidden-accessible"),a.attr("aria-hidden","true"),this._syncAttributes(),a.data("select2",this)};return c.Extend(e,c.Observable),e.prototype._generateId=function(a){var b="";return b=null!=a.attr("id")?a.attr("id"):null!=a.attr("name")?a.attr("name")+"-"+c.generateChars(2):c.generateChars(4),b="select2-"+b},e.prototype._placeContainer=function(a){a.insertAfter(this.$element);var b=this._resolveWidth(this.$element,this.options.get("width"));null!=b&&a.css("width",b)},e.prototype._resolveWidth=function(a,b){var c=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==b){var d=this._resolveWidth(a,"style");return null!=d?d:this._resolveWidth(a,"element")}if("element"==b){var e=a.outerWidth(!1);return 0>=e?"auto":e+"px"}if("style"==b){var f=a.attr("style");if("string"!=typeof f)return null;for(var g=f.split(";"),h=0,i=g.length;i>h;h+=1){var j=g[h].replace(/\s/g,""),k=j.match(c);if(null!==k&&k.length>=1)return k[1]}return null}return b},e.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},e.prototype._registerDomEvents=function(){var b=this;this.$element.on("change.select2",function(){b.dataAdapter.current(function(a){b.trigger("selection:update",{data:a})})}),this._sync=c.bind(this._syncAttributes,this),this.$element[0].attachEvent&&this.$element[0].attachEvent("onpropertychange",this._sync);var d=window.MutationObserver||window.WebKitMutationObserver||window.MozMutationObserver;null!=d?(this._observer=new d(function(c){a.each(c,b._sync)}),this._observer.observe(this.$element[0],{attributes:!0,subtree:!1})):this.$element[0].addEventListener&&this.$element[0].addEventListener("DOMAttrModified",b._sync,!1)},e.prototype._registerDataEvents=function(){var a=this;this.dataAdapter.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerSelectionEvents=function(){var b=this,c=["toggle"];this.selection.on("toggle",function(){b.toggleDropdown()}),this.selection.on("*",function(d,e){-1===a.inArray(d,c)&&b.trigger(d,e)})},e.prototype._registerDropdownEvents=function(){var a=this;this.dropdown.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerResultsEvents=function(){var a=this;this.results.on("*",function(b,c){a.trigger(b,c)})},e.prototype._registerEvents=function(){var a=this;this.on("open",function(){a.$container.addClass("select2-container--open")}),this.on("close",function(){a.$container.removeClass("select2-container--open")}),this.on("enable",function(){a.$container.removeClass("select2-container--disabled")}),this.on("disable",function(){a.$container.addClass("select2-container--disabled")}),this.on("focus",function(){a.$container.addClass("select2-container--focus")}),this.on("blur",function(){a.$container.removeClass("select2-container--focus")}),this.on("query",function(b){a.isOpen()||a.trigger("open"),this.dataAdapter.query(b,function(c){a.trigger("results:all",{data:c,query:b})})}),this.on("query:append",function(b){this.dataAdapter.query(b,function(c){a.trigger("results:append",{data:c,query:b})})}),this.on("keypress",function(b){var c=b.which;a.isOpen()?c===d.ENTER?(a.trigger("results:select"),b.preventDefault()):c===d.SPACE&&b.ctrlKey?(a.trigger("results:toggle"),b.preventDefault()):c===d.UP?(a.trigger("results:previous"),b.preventDefault()):c===d.DOWN?(a.trigger("results:next"),b.preventDefault()):(c===d.ESC||c===d.TAB)&&(a.close(),b.preventDefault()):(c===d.ENTER||c===d.SPACE||(c===d.DOWN||c===d.UP)&&b.altKey)&&(a.open(),b.preventDefault())})},e.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.options.get("disabled")?(this.isOpen()&&this.close(),this.trigger("disable")):this.trigger("enable")},e.prototype.trigger=function(a,b){var c=e.__super__.trigger,d={open:"opening",close:"closing",select:"selecting",unselect:"unselecting"};if(a in d){var f=d[a],g={prevented:!1,name:a,args:b};if(c.call(this,f,g),g.prevented)return void(b.prevented=!0)}c.call(this,a,b)},e.prototype.toggleDropdown=function(){this.options.get("disabled")||(this.isOpen()?this.close():this.open())},e.prototype.open=function(){this.isOpen()||(this.trigger("query",{}),this.trigger("open"))},e.prototype.close=function(){this.isOpen()&&this.trigger("close")},e.prototype.isOpen=function(){return this.$container.hasClass("select2-container--open")},e.prototype.enable=function(a){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),(null==a||0===a.length)&&(a=[!0]);var b=!a[0];this.$element.prop("disabled",b)},e.prototype.data=function(){this.options.get("debug")&&arguments.length>0&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var a=[];return this.dataAdapter.current(function(b){a=b}),a},e.prototype.val=function(b){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==b||0===b.length)return this.$element.val();var c=b[0];a.isArray(c)&&(c=a.map(c,function(a){return a.toString()})),this.$element.val(c).trigger("change")},e.prototype.destroy=function(){this.$container.remove(),this.$element[0].detachEvent&&this.$element[0].detachEvent("onpropertychange",this._sync),null!=this._observer?(this._observer.disconnect(),this._observer=null):this.$element[0].removeEventListener&&this.$element[0].removeEventListener("DOMAttrModified",this._sync,!1),this._sync=null,this.$element.off(".select2"),this.$element.attr("tabindex",this.$element.data("old-tabindex")),this.$element.removeClass("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},e.prototype.render=function(){var b=a('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return b.attr("dir",this.options.get("dir")),this.$container=b,this.$container.addClass("select2-container--"+this.options.get("theme")),b.data("element",this.$element),b},e}),b.define("select2/compat/utils",["jquery"],function(a){function b(b,c,d){var e,f,g=[];e=a.trim(b.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0===this.indexOf("select2-")&&g.push(this)})),e=a.trim(c.attr("class")),e&&(e=""+e,a(e.split(/\s+/)).each(function(){0!==this.indexOf("select2-")&&(f=d(this),null!=f&&g.push(f))})),b.attr("class",g.join(" "))}return{syncCssClasses:b}}),b.define("select2/compat/containerCss",["jquery","./utils"],function(a,b){function c(){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("containerCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptContainerCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("containerCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/dropdownCss",["jquery","./utils"],function(a,b){function c(){return null}function d(){}return d.prototype.render=function(d){var e=d.call(this),f=this.options.get("dropdownCssClass")||"";a.isFunction(f)&&(f=f(this.$element));var g=this.options.get("adaptDropdownCssClass");if(g=g||c,-1!==f.indexOf(":all:")){f=f.replace(":all","");var h=g;g=function(a){var b=h(a);return null!=b?b+" "+a:a}}var i=this.options.get("dropdownCss")||{};return a.isFunction(i)&&(i=i(this.$element)),b.syncCssClasses(e,this.$element,g),e.css(i),e.addClass(f),e},d}),b.define("select2/compat/initSelection",["jquery"],function(a){function b(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `initSelection` option has been deprecated in favor of a custom data adapter that overrides the `current` method. This method is now called multiple times instead of a single time when the instance is initialized. Support will be removed for the `initSelection` option in future versions of Select2"),this.initSelection=c.get("initSelection"),this._isInitialized=!1,a.call(this,b,c)}return b.prototype.current=function(b,c){var d=this;return this._isInitialized?void b.call(this,c):void this.initSelection.call(null,this.$element,function(b){d._isInitialized=!0,a.isArray(b)||(b=[b]),c(b)})},b}),b.define("select2/compat/inputData",["jquery"],function(a){function b(a,b,c){this._currentData=[],this._valueSeparator=c.get("valueSeparator")||",","hidden"===b.prop("type")&&c.get("debug")&&console&&console.warn&&console.warn("Select2: Using a hidden input with Select2 is no longer supported and may stop working in the future. It is recommended to use a `<select>` element instead."),a.call(this,b,c)}return b.prototype.current=function(b,c){function d(b,c){var e=[];return b.selected||-1!==a.inArray(b.id,c)?(b.selected=!0,e.push(b)):b.selected=!1,b.children&&e.push.apply(e,d(b.children,c)),e}for(var e=[],f=0;f<this._currentData.length;f++){var g=this._currentData[f];e.push.apply(e,d(g,this.$element.val().split(this._valueSeparator)))}c(e)},b.prototype.select=function(b,c){if(this.options.get("multiple")){var d=this.$element.val();d+=this._valueSeparator+c.id,this.$element.val(d),this.$element.trigger("change")}else this.current(function(b){a.map(b,function(a){a.selected=!1})}),this.$element.val(c.id),this.$element.trigger("change")},b.prototype.unselect=function(a,b){var c=this;b.selected=!1,this.current(function(a){for(var d=[],e=0;e<a.length;e++){var f=a[e];
-b.id!=f.id&&d.push(f.id)}c.$element.val(d.join(c._valueSeparator)),c.$element.trigger("change")})},b.prototype.query=function(a,b,c){for(var d=[],e=0;e<this._currentData.length;e++){var f=this._currentData[e],g=this.matches(b,f);null!==g&&d.push(g)}c({results:d})},b.prototype.addOptions=function(b,c){var d=a.map(c,function(b){return a.data(b[0],"data")});this._currentData.push.apply(this._currentData,d)},b}),b.define("select2/compat/matcher",["jquery"],function(a){function b(b){function c(c,d){var e=a.extend(!0,{},d);if(null==c.term||""===a.trim(c.term))return e;if(d.children){for(var f=d.children.length-1;f>=0;f--){var g=d.children[f],h=b(c.term,g.text,g);h||e.children.splice(f,1)}if(e.children.length>0)return e}return b(c.term,d.text,d)?e:null}return c}return b}),b.define("select2/compat/query",[],function(){function a(a,b,c){c.get("debug")&&window.console&&console.warn&&console.warn("Select2: The `query` option has been deprecated in favor of a custom data adapter that overrides the `query` method. Support will be removed for the `query` option in future versions of Select2."),a.call(this,b,c)}return a.prototype.query=function(a,b,c){b.callback=c;var d=this.options.get("query");d.call(null,b)},a}),b.define("select2/dropdown/attachContainer",[],function(){function a(a,b,c){a.call(this,b,c)}return a.prototype.position=function(a,b,c){var d=c.find(".dropdown-wrapper");d.append(b),b.addClass("select2-dropdown--below"),c.addClass("select2-container--below")},a}),b.define("select2/dropdown/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$dropdown.on(d.join(" "),function(a){a.stopPropagation()})},a}),b.define("select2/selection/stopPropagation",[],function(){function a(){}return a.prototype.bind=function(a,b,c){a.call(this,b,c);var d=["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"];this.$selection.on(d.join(" "),function(a){a.stopPropagation()})},a}),b.define("jquery.select2",["jquery","require","./select2/core","./select2/defaults"],function(a,b,c,d){if(b("jquery.mousewheel"),null==a.fn.select2){var e=["open","close","destroy"];a.fn.select2=function(b){if(b=b||{},"object"==typeof b)return this.each(function(){{var d=a.extend({},b,!0);new c(a(this),d)}}),this;if("string"==typeof b){var d=this.data("select2");null==d&&window.console&&console.error&&console.error("The select2('"+b+"') method was called on an element that is not using Select2.");var f=Array.prototype.slice.call(arguments,1),g=d[b](f);return a.inArray(b,e)>-1?this:g}throw new Error("Invalid arguments for Select2: "+b)}}return null==a.fn.select2.defaults&&(a.fn.select2.defaults=d),c}),function(c){"function"==typeof b.define&&b.define.amd?b.define("jquery.mousewheel",["jquery"],c):"object"==typeof exports?module.exports=c:c(a)}(function(a){function b(b){var g=b||window.event,h=i.call(arguments,1),j=0,l=0,m=0,n=0,o=0,p=0;if(b=a.event.fix(g),b.type="mousewheel","detail"in g&&(m=-1*g.detail),"wheelDelta"in g&&(m=g.wheelDelta),"wheelDeltaY"in g&&(m=g.wheelDeltaY),"wheelDeltaX"in g&&(l=-1*g.wheelDeltaX),"axis"in g&&g.axis===g.HORIZONTAL_AXIS&&(l=-1*m,m=0),j=0===m?l:m,"deltaY"in g&&(m=-1*g.deltaY,j=m),"deltaX"in g&&(l=g.deltaX,0===m&&(j=-1*l)),0!==m||0!==l){if(1===g.deltaMode){var q=a.data(this,"mousewheel-line-height");j*=q,m*=q,l*=q}else if(2===g.deltaMode){var r=a.data(this,"mousewheel-page-height");j*=r,m*=r,l*=r}if(n=Math.max(Math.abs(m),Math.abs(l)),(!f||f>n)&&(f=n,d(g,n)&&(f/=40)),d(g,n)&&(j/=40,l/=40,m/=40),j=Math[j>=1?"floor":"ceil"](j/f),l=Math[l>=1?"floor":"ceil"](l/f),m=Math[m>=1?"floor":"ceil"](m/f),k.settings.normalizeOffset&&this.getBoundingClientRect){var s=this.getBoundingClientRect();o=b.clientX-s.left,p=b.clientY-s.top}return b.deltaX=l,b.deltaY=m,b.deltaFactor=f,b.offsetX=o,b.offsetY=p,b.deltaMode=0,h.unshift(b,j,l,m),e&&clearTimeout(e),e=setTimeout(c,200),(a.event.dispatch||a.event.handle).apply(this,h)}}function c(){f=null}function d(a,b){return k.settings.adjustOldDeltas&&"mousewheel"===a.type&&b%120===0}var e,f,g=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],h="onwheel"in document||document.documentMode>=9?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],i=Array.prototype.slice;if(a.event.fixHooks)for(var j=g.length;j;)a.event.fixHooks[g[--j]]=a.event.mouseHooks;var k=a.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var c=h.length;c;)this.addEventListener(h[--c],b,!1);else this.onmousewheel=b;a.data(this,"mousewheel-line-height",k.getLineHeight(this)),a.data(this,"mousewheel-page-height",k.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var c=h.length;c;)this.removeEventListener(h[--c],b,!1);else this.onmousewheel=null;a.removeData(this,"mousewheel-line-height"),a.removeData(this,"mousewheel-page-height")},getLineHeight:function(b){var c=a(b),d=c["offsetParent"in a.fn?"offsetParent":"parent"]();return d.length||(d=a("body")),parseInt(d.css("fontSize"),10)||parseInt(c.css("fontSize"),10)||16},getPageHeight:function(b){return a(b).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};a.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})}),{define:b.define,require:b.require}}(),c=b.require("jquery.select2");return a.fn.select2.amd=b,c});
+/*! Select2 4.1.0-rc.0 | https://github.com/select2/select2/blob/master/LICENSE.md */
+!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(t){var e,n,p,o,r,h,f,g,m,v,y,s,i,_,a,a=(t&&t.fn&&t.fn.select2&&t.fn.select2.amd&&(u=t.fn.select2.amd),u&&u.requirejs||(u?n=u:u={},g={},m={},v={},y={},s=Object.prototype.hasOwnProperty,i=[].slice,_=/\.js$/,h=function(e,t){var n,s,i=c(e),o=i[0],t=t[1];return e=i[1],o&&(n=x(o=l(o,t))),o?e=n&&n.normalize?n.normalize(e,(s=t,function(e){return l(e,s)})):l(e,t):(o=(i=c(e=l(e,t)))[0],e=i[1],o&&(n=x(o))),{f:o?o+"!"+e:e,n:e,pr:o,p:n}},f={require:function(e){return w(e)},exports:function(e){var t=g[e];return void 0!==t?t:g[e]={}},module:function(e){return{id:e,uri:"",exports:g[e],config:(t=e,function(){return v&&v.config&&v.config[t]||{}})};var t}},o=function(e,t,n,s){var i,o,r,a,l,c=[],u=typeof n,d=A(s=s||e);if("undefined"==u||"function"==u){for(t=!t.length&&n.length?["require","exports","module"]:t,a=0;a<t.length;a+=1)if("require"===(o=(r=h(t[a],d)).f))c[a]=f.require(e);else if("exports"===o)c[a]=f.exports(e),l=!0;else if("module"===o)i=c[a]=f.module(e);else if(b(g,o)||b(m,o)||b(y,o))c[a]=x(o);else{if(!r.p)throw new Error(e+" missing "+o);r.p.load(r.n,w(s,!0),function(t){return function(e){g[t]=e}}(o),{}),c[a]=g[o]}u=n?n.apply(g[e],c):void 0,e&&(i&&i.exports!==p&&i.exports!==g[e]?g[e]=i.exports:u===p&&l||(g[e]=u))}else e&&(g[e]=n)},e=n=r=function(e,t,n,s,i){if("string"==typeof e)return f[e]?f[e](t):x(h(e,A(t)).f);if(!e.splice){if((v=e).deps&&r(v.deps,v.callback),!t)return;t.splice?(e=t,t=n,n=null):e=p}return t=t||function(){},"function"==typeof n&&(n=s,s=i),s?o(p,e,t,n):setTimeout(function(){o(p,e,t,n)},4),r},r.config=function(e){return r(e)},e._defined=g,(a=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(g,e)||b(m,e)||(m[e]=[e,t,n])}).amd={jQuery:!0},u.requirejs=e,u.require=n,u.define=a),u.define("almond",function(){}),u.define("jquery",[],function(){var e=t||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),u.define("select2/utils",["jquery"],function(o){var s={};function c(e){var t,n=e.prototype,s=[];for(t in n)"function"==typeof n[t]&&"constructor"!==t&&s.push(t);return s}s.Extend=function(e,t){var n,s={}.hasOwnProperty;function i(){this.constructor=e}for(n in t)s.call(t,n)&&(e[n]=t[n]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},s.Decorate=function(s,i){var e=c(i),t=c(s);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=s.prototype.constructor;0<t&&(e.call(arguments,s.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=s.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var r=t[n];o.prototype[r]=s.prototype[r]}for(var a=0;a<e.length;a++){var l=e[a];o.prototype[l]=function(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}(l)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,s=e.length;n<s;n++)e[n].apply(this,t)},s.Observable=e,s.generateChars=function(e){for(var t="",n=0;n<e;n++)t+=Math.floor(36*Math.random()).toString(36);return t},s.bind=function(e,t){return function(){e.apply(t,arguments)}},s._convertData=function(e){for(var t in e){var n=t.split("-"),s=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in s||(s[o]={}),i==n.length-1&&(s[o]=e[t]),s=s[o]}delete e[t]}}return e},s.hasScroll=function(e,t){var n=o(t),s=t.style.overflowX,i=t.style.overflowY;return(s!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===s||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},s.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},s.__cache={};var n=0;return s.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null!=t||(t=e.id?"select2-data-"+e.id:"select2-data-"+(++n).toString()+"-"+s.generateChars(4),e.setAttribute("data-select2-id",t)),t},s.StoreData=function(e,t,n){e=s.GetUniqueElementId(e);s.__cache[e]||(s.__cache[e]={}),s.__cache[e][t]=n},s.GetData=function(e,t){var n=s.GetUniqueElementId(e);return t?s.__cache[n]&&null!=s.__cache[n][t]?s.__cache[n][t]:o(e).data(t):s.__cache[n]},s.RemoveData=function(e){var t=s.GetUniqueElementId(e);null!=s.__cache[t]&&delete s.__cache[t],e.removeAttribute("data-select2-id")},s.copyNonInternalCssClasses=function(e,t){var n=(n=e.getAttribute("class").trim().split(/\s+/)).filter(function(e){return 0===e.indexOf("select2-")}),t=(t=t.getAttribute("class").trim().split(/\s+/)).filter(function(e){return 0!==e.indexOf("select2-")}),t=n.concat(t);e.setAttribute("class",t.join(" "))},s}),u.define("select2/results",["jquery","./utils"],function(d,p){function s(e,t,n){this.$element=e,this.data=n,this.options=t,s.__super__.constructor.call(this)}return p.Extend(s,p.Observable),s.prototype.render=function(){var e=d('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},s.prototype.clear=function(){this.$results.empty()},s.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=d('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),s=this.options.get("translations").get(e.message);n.append(t(s(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},s.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},s.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var s=e.results[n],s=this.option(s);t.push(s)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},s.prototype.position=function(e,t){t.find(".select2-results").append(e)},s.prototype.sort=function(e){return this.options.get("sorter")(e)},s.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option--selectable"),t=e.filter(".select2-results__option--selected");(0<t.length?t:e).first().trigger("mouseenter"),this.ensureHighlightVisible()},s.prototype.setClasses=function(){var t=this;this.data.current(function(e){var s=e.map(function(e){return e.id.toString()});t.$results.find(".select2-results__option--selectable").each(function(){var e=d(this),t=p.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<s.indexOf(n)?(this.classList.add("select2-results__option--selected"),e.attr("aria-selected","true")):(this.classList.remove("select2-results__option--selected"),e.attr("aria-selected","false"))})})},s.prototype.showLoading=function(e){this.hideLoading();e={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},e=this.option(e);e.className+=" loading-results",this.$results.prepend(e)},s.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},s.prototype.option=function(e){var t=document.createElement("li");t.classList.add("select2-results__option"),t.classList.add("select2-results__option--selectable");var n,s={role:"option"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(n in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(s["aria-disabled"]="true",t.classList.remove("select2-results__option--selectable"),t.classList.add("select2-results__option--disabled")),null==e.id&&t.classList.remove("select2-results__option--selectable"),null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(s.role="group",s["aria-label"]=e.text,t.classList.remove("select2-results__option--selectable"),t.classList.add("select2-results__option--group")),s){var o=s[n];t.setAttribute(n,o)}if(e.children){var r=d(t),a=document.createElement("strong");a.className="select2-results__group",this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],u=this.option(u);l.push(u)}i=d("<ul></ul>",{class:"select2-results__options select2-results__options--nested",role:"none"});i.append(l),r.append(a),r.append(i)}else this.template(e,t);return p.StoreData(t,"data",e),t},s.prototype.bind=function(t,e){var i=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){i.clear(),i.append(e.data),t.isOpen()&&(i.setClasses(),i.highlightFirstItem())}),t.on("results:append",function(e){i.append(e.data),t.isOpen()&&i.setClasses()}),t.on("query",function(e){i.hideMessages(),i.showLoading(e)}),t.on("select",function(){t.isOpen()&&(i.setClasses(),i.options.get("scrollAfterSelect")&&i.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(i.setClasses(),i.options.get("scrollAfterSelect")&&i.highlightFirstItem())}),t.on("open",function(){i.$results.attr("aria-expanded","true"),i.$results.attr("aria-hidden","false"),i.setClasses(),i.ensureHighlightVisible()}),t.on("close",function(){i.$results.attr("aria-expanded","false"),i.$results.attr("aria-hidden","true"),i.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=i.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e,t=i.getHighlightedResults();0!==t.length&&(e=p.GetData(t[0],"data"),t.hasClass("select2-results__option--selected")?i.trigger("close",{}):i.trigger("select",{data:e}))}),t.on("results:previous",function(){var e,t=i.getHighlightedResults(),n=i.$results.find(".select2-results__option--selectable"),s=n.index(t);s<=0||(e=s-1,0===t.length&&(e=0),(s=n.eq(e)).trigger("mouseenter"),t=i.$results.offset().top,n=s.offset().top,s=i.$results.scrollTop()+(n-t),0===e?i.$results.scrollTop(0):n-t<0&&i.$results.scrollTop(s))}),t.on("results:next",function(){var e,t=i.getHighlightedResults(),n=i.$results.find(".select2-results__option--selectable"),s=n.index(t)+1;s>=n.length||((e=n.eq(s)).trigger("mouseenter"),t=i.$results.offset().top+i.$results.outerHeight(!1),n=e.offset().top+e.outerHeight(!1),e=i.$results.scrollTop()+n-t,0===s?i.$results.scrollTop(0):t<n&&i.$results.scrollTop(e))}),t.on("results:focus",function(e){e.element[0].classList.add("select2-results__option--highlighted"),e.element[0].setAttribute("aria-selected","true")}),t.on("results:message",function(e){i.displayMessage(e)}),d.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=i.$results.scrollTop(),n=i.$results.get(0).scrollHeight-t+e.deltaY,t=0<e.deltaY&&t-e.deltaY<=0,n=e.deltaY<0&&n<=i.$results.height();t?(i.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):n&&(i.$results.scrollTop(i.$results.get(0).scrollHeight-i.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option--selectable",function(e){var t=d(this),n=p.GetData(this,"data");t.hasClass("select2-results__option--selected")?i.options.get("multiple")?i.trigger("unselect",{originalEvent:e,data:n}):i.trigger("close",{}):i.trigger("select",{originalEvent:e,data:n})}),this.$results.on("mouseenter",".select2-results__option--selectable",function(e){var t=p.GetData(this,"data");i.getHighlightedResults().removeClass("select2-results__option--highlighted").attr("aria-selected","false"),i.trigger("results:focus",{data:t,element:d(this)})})},s.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},s.prototype.destroy=function(){this.$results.remove()},s.prototype.ensureHighlightVisible=function(){var e,t,n,s,i=this.getHighlightedResults();0!==i.length&&(e=this.$results.find(".select2-results__option--selectable").index(i),s=this.$results.offset().top,t=i.offset().top,n=this.$results.scrollTop()+(t-s),s=t-s,n-=2*i.outerHeight(!1),e<=2?this.$results.scrollTop(0):(s>this.$results.outerHeight()||s<0)&&this.$results.scrollTop(n))},s.prototype.template=function(e,t){var n=this.options.get("templateResult"),s=this.options.get("escapeMarkup"),e=n(e,t);null==e?t.style.display="none":"string"==typeof e?t.innerHTML=s(e):d(t).append(e)},s}),u.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),u.define("select2/selection/base",["jquery","../utils","../keys"],function(n,s,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return s.Extend(o,s.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=s.GetData(this.$element[0],"old-tabindex")?this._tabindex=s.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,s=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",s),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&s.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),u.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,s){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e[0].classList.add("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var s=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",s).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",s),this.$selection.attr("aria-controls",s),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){var t,n;0!==e.length?(n=e[0],t=this.$selection.find(".select2-selection__rendered"),e=this.display(n,t),t.empty().append(e),(n=n.title||n.text)?t.attr("title",n):t.removeAttr("title")):this.clear()},i}),u.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,c){function o(e,t){o.__super__.constructor.apply(this,arguments)}return c.Extend(o,e),o.prototype.render=function(){var e=o.__super__.render.call(this);return e[0].classList.add("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},o.prototype.bind=function(e,t){var n=this;o.__super__.bind.apply(this,arguments);var s=e.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",s),this.$selection.on("click",function(e){n.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){var t;n.isDisabled()||(t=i(this).parent(),t=c.GetData(t[0],"data"),n.trigger("unselect",{originalEvent:e,data:t}))}),this.$selection.on("keydown",".select2-selection__choice__remove",function(e){n.isDisabled()||e.stopPropagation()})},o.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},o.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},o.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><button type="button" class="select2-selection__choice__remove" tabindex="-1"><span aria-hidden="true">&times;</span></button><span class="select2-selection__choice__display"></span></li>')},o.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=this.$selection.find(".select2-selection__rendered").attr("id")+"-choice-",s=0;s<e.length;s++){var i=e[s],o=this.selectionContainer(),r=this.display(i,o),a=n+c.generateChars(4)+"-";i.id?a+=i.id:a+=c.generateChars(4),o.find(".select2-selection__choice__display").append(r).attr("id",a);var l=i.title||i.text;l&&o.attr("title",l);r=this.options.get("translations").get("removeItem"),l=o.find(".select2-selection__choice__remove");l.attr("title",r()),l.attr("aria-label",r()),l.attr("aria-describedby",a),c.StoreData(o[0],"data",i),t.push(o)}this.$selection.find(".select2-selection__rendered").append(t)}},o}),u.define("select2/selection/placeholder",[],function(){function e(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();n.html(this.display(t)),n[0].classList.add("select2-selection__placeholder"),n[0].classList.remove("select2-selection__choice");t=t.title||t.text||n.text();return this.$selection.find(".select2-selection__rendered").attr("title",t),n},e.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();t=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(t)},e}),u.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,s,a){function e(){}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){s._handleClear(e)}),t.on("keypress",function(e){s._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var s=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:s};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var r=0;r<s.length;r++)if(o={data:s[r]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=s.DELETE&&t.which!=s.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){var n,s;e.call(this,t),this.$selection.find(".select2-selection__clear").remove(),this.$selection[0].classList.remove("select2-selection--clearable"),0<this.$selection.find(".select2-selection__placeholder").length||0===t.length||(n=this.$selection.find(".select2-selection__rendered").attr("id"),s=this.options.get("translations").get("removeAllItems"),(e=i('<button type="button" class="select2-selection__clear" tabindex="-1"><span aria-hidden="true">&times;</span></button>')).attr("title",s()),e.attr("aria-label",s()),e.attr("aria-describedby",n),a.StoreData(e[0],"data",t),this.$selection.prepend(e),this.$selection[0].classList.add("select2-selection--clearable"))},e}),u.define("select2/selection/search",["jquery","../utils","../keys"],function(s,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=this.options.get("translations").get("search"),n=s('<span class="select2-search select2-search--inline"><textarea class="select2-search__field" type="search" tabindex="-1" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" ></textarea></span>');this.$searchContainer=n,this.$search=n.find("textarea"),this.$search.prop("autocomplete",this.options.get("autocomplete")),this.$search.attr("aria-label",t());e=e.call(this);return this._transferTabIndex(),e.append(this.$searchContainer),e},e.prototype.bind=function(e,t,n){var s=this,i=t.id+"-results",o=t.id+"-container";e.call(this,t,n),s.$search.attr("aria-describedby",o),t.on("open",function(){s.$search.attr("aria-controls",i),s.$search.trigger("focus")}),t.on("close",function(){s.$search.val(""),s.resizeSearch(),s.$search.removeAttr("aria-controls"),s.$search.removeAttr("aria-activedescendant"),s.$search.trigger("focus")}),t.on("enable",function(){s.$search.prop("disabled",!1),s._transferTabIndex()}),t.on("disable",function(){s.$search.prop("disabled",!0)}),t.on("focus",function(e){s.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?s.$search.attr("aria-activedescendant",e.data._resultId):s.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){s.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){s._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){var t;e.stopPropagation(),s.trigger("keypress",e),s._keyUpPrevented=e.isDefaultPrevented(),e.which!==l.BACKSPACE||""!==s.$search.val()||0<(t=s.$selection.find(".select2-selection__choice").last()).length&&(t=a.GetData(t[0],"data"),s.searchRemoveChoice(t),e.preventDefault())}),this.$selection.on("click",".select2-search--inline",function(e){s.$search.val()&&e.stopPropagation()});var t=document.documentMode,r=t&&t<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){r?s.$selection.off("input.search input.searchcheck"):s.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){var t;r&&"input"===e.type?s.$selection.off("input.search input.searchcheck"):(t=e.which)!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&s.handleSearch(e)})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){var e;this.resizeSearch(),this._keyUpPrevented||(e=this.$search.val(),this.trigger("query",{term:e})),this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="100%";""===this.$search.attr("placeholder")&&(e=.75*(this.$search.val().length+1)+"em"),this.$search.css("width",e)},e}),u.define("select2/selection/selectionCss",["../utils"],function(n){function e(){}return e.prototype.render=function(e){var t=e.call(this),e=this.options.get("selectionCssClass")||"";return-1!==e.indexOf(":all:")&&(e=e.replace(":all:",""),n.copyNonInternalCssClasses(t[0],this.$element[0])),t.addClass(e),t},e}),u.define("select2/selection/eventRelay",["jquery"],function(r){function e(){}return e.prototype.bind=function(e,t,n){var s=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){var n;-1!==i.indexOf(e)&&(t=t||{},n=r.Event("select2:"+e,{params:t}),s.$element.trigger(n),-1!==o.indexOf(e)&&(t.prevented=n.isDefaultPrevented()))})},e}),u.define("select2/translation",["jquery","require"],function(t,n){function s(e){this.dict=e||{}}return s.prototype.all=function(){return this.dict},s.prototype.get=function(e){return this.dict[e]},s.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},s._cache={},s.loadPath=function(e){var t;return e in s._cache||(t=n(e),s._cache[e]=t),new s(s._cache[e])},s}),u.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),u.define("select2/data/base",["../utils"],function(n){function s(e,t){s.__super__.constructor.call(this)}return n.Extend(s,n.Observable),s.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},s.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},s.prototype.bind=function(e,t){},s.prototype.destroy=function(){},s.prototype.generateResultId=function(e,t){e=e.id+"-result-";return e+=n.generateChars(4),null!=t.id?e+="-"+t.id.toString():e+="-"+n.generateChars(4),e},s}),u.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var t=this;e(Array.prototype.map.call(this.$element[0].querySelectorAll(":checked"),function(e){return t.item(l(e))}))},n.prototype.select=function(i){var e,o=this;if(i.selected=!0,null!=i.element&&"option"===i.element.tagName.toLowerCase())return i.element.selected=!0,void this.$element.trigger("input").trigger("change");this.$element.prop("multiple")?this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var s=i[n].id;-1===t.indexOf(s)&&t.push(s)}o.$element.val(t),o.$element.trigger("input").trigger("change")}):(e=i.id,this.$element.val(e),this.$element.trigger("input").trigger("change"))},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,null!=i.element&&"option"===i.element.tagName.toLowerCase())return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var s=e[n].id;s!==i.id&&-1===t.indexOf(s)&&t.push(s)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(t,e){var n=[],s=this;this.$element.children().each(function(){var e;"option"!==this.tagName.toLowerCase()&&"optgroup"!==this.tagName.toLowerCase()||(e=l(this),e=s.item(e),null!==(e=s.matches(t,e))&&n.push(e))}),e({results:n})},n.prototype.addOptions=function(e){this.$element.append(e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);e=this._normalizeItem(e);return e.element=t,a.StoreData(t,"data",e),l(t)},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;var n=e[0];if("option"===n.tagName.toLowerCase())t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if("optgroup"===n.tagName.toLowerCase()){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var s=e.children("option"),i=[],o=0;o<s.length;o++){var r=l(s[o]),r=this.item(r);i.push(r)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),u.define("select2/data/array",["./select","../utils","jquery"],function(e,t,c){function s(e,t){this._dataToConvert=t.get("data")||[],s.__super__.constructor.call(this,e,t)}return t.Extend(s,e),s.prototype.bind=function(e,t){s.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},s.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),s.__super__.select.call(this,n)},s.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),s=n.map(function(){return t.item(c(this)).id}).get(),i=[];for(var o=0;o<e.length;o++){var r,a,l=this._normalizeItem(e[o]);0<=s.indexOf(l.id)?(r=n.filter(function(e){return function(){return c(this).val()==e.id}}(l)),a=this.item(r),a=c.extend(!0,{},l,a),a=this.option(a),r.replaceWith(a)):(a=this.option(l),l.children&&(l=this.convertToOptions(l.children),a.append(l)),i.push(a))}return i},s}),u.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){e=o.ajax(e);return e.then(t),e.fail(n),e}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(t,n){var s=this;null!=this._request&&("function"==typeof this._request.abort&&this._request.abort(),this._request=null);var i=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=i.transport(i,function(e){e=s.processResults(e,t);s.options.get("debug")&&window.console&&console.error&&(e&&e.results&&Array.isArray(e.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),n(e)},function(){"status"in e&&(0===e.status||"0"===e.status)||s.trigger("results:message",{message:"errorLoading"})});s._request=e}"function"==typeof i.url&&(i.url=i.url.call(this.$element,t)),"function"==typeof i.data&&(i.data=i.data.call(this.$element,t)),this.ajaxOptions.delay&&null!=t.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),u.define("select2/data/tags",["jquery"],function(t){function e(e,t,n){var s=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);i=n.get("insertTag");if(void 0!==i&&(this.insertTag=i),e.call(this,t,n),Array.isArray(s))for(var o=0;o<s.length;o++){var r=s[o],r=this._normalizeItem(r),r=this.option(r);this.$element.append(r)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var s=t.results,i=0;i<s.length;i++){var o=s[i],r=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||r)return!n&&(t.data=s,void u(t))}if(n)return!0;var a,l=d.createTag(c);null!=l&&((a=d.option(l)).attr("data-select2-tag","true"),d.addOptions([a]),d.insertTag(s,l)),t.results=s,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){if(null==t.term)return null;t=t.term.trim();return""===t?null:{id:t,text:t}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||t(this).remove()})},e}),u.define("select2/data/tokenizer",["jquery"],function(c){function e(e,t,n){var s=n.get("tokenizer");void 0!==s&&(this.tokenizer=s),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var s=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t,n=s._normalizeItem(e);s.$element.find("option").filter(function(){return c(this).val()===n.id}).length||((t=s.option(n)).attr("data-select2-tag",!0),s._removeOldTags(),s.addOptions([t])),t=n,s.trigger("select",{data:t})});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,s){for(var i=n.get("tokenSeparators")||[],o=t.term,r=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};r<o.length;){var l=o[r];-1!==i.indexOf(l)?(l=o.substr(0,r),null!=(l=a(c.extend({},t,{term:l})))?(s(l),o=o.substr(r+1)||"",r=0):r++):r++}return{term:o}},e}),u.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),u.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),u.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("select",function(){s._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var s=this;this._checkIfMaximumSelected(function(){e.call(s,t,n)})},e.prototype._checkIfMaximumSelected=function(e,t){var n=this;this.current(function(e){e=null!=e?e.length:0;0<n.maximumSelectionLength&&e>=n.maximumSelectionLength?n.trigger("results:message",{message:"maximumSelected",args:{maximum:n.maximumSelectionLength}}):t&&t()})},e}),u.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),u.define("select2/dropdown/search",["jquery"],function(o){function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("translations").get("search"),e=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=e,this.$search=e.find("input"),this.$search.prop("autocomplete",this.options.get("autocomplete")),this.$search.attr("aria-label",n()),t.prepend(e),t},e.prototype.bind=function(e,t,n){var s=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){s.trigger("keypress",e),s._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){s.handleSearch(e)}),t.on("open",function(){s.$search.attr("tabindex",0),s.$search.attr("aria-controls",i),s.$search.trigger("focus"),window.setTimeout(function(){s.$search.trigger("focus")},0)}),t.on("close",function(){s.$search.attr("tabindex",-1),s.$search.removeAttr("aria-controls"),s.$search.removeAttr("aria-activedescendant"),s.$search.val(""),s.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||s.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(s.showSearch(e)?s.$searchContainer[0].classList.remove("select2-search--hide"):s.$searchContainer[0].classList.add("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?s.$search.attr("aria-activedescendant",e.data._resultId):s.$search.removeAttr("aria-activedescendant")})},e.prototype.handleSearch=function(e){var t;this._keyUpPrevented||(t=this.$search.val(),this.trigger("query",{term:t})),this._keyUpPrevented=!1},e.prototype.showSearch=function(e,t){return!0},e}),u.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,s){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,s)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),s=t.length-1;0<=s;s--){var i=t[s];this.placeholder.id===i.id&&n.splice(s,1)}return n},e}),u.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,s){this.lastParams={},e.call(this,t,n,s),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("query",function(e){s.lastParams=e,s.loading=!0}),t.on("query:append",function(e){s.lastParams=e,s.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);!this.loading&&e&&(e=this.$results.offset().top+this.$results.outerHeight(!1),this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=e+50&&this.loadMore())},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),u.define("select2/dropdown/attachBody",["jquery","../utils"],function(u,r){function e(e,t,n){this.$dropdownParent=u(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("open",function(){s._showDropdown(),s._attachPositioningHandler(t),s._bindContainerResultHandlers(t)}),t.on("close",function(){s._hideDropdown(),s._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t[0].classList.remove("select2"),t[0].classList.add("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=u("<span></span>"),e=e.call(this);return t.append(e),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){var n;this._containerResultsHandlersBound||(n=this,t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0)},e.prototype._attachPositioningHandler=function(e,t){var n=this,s="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,t=this.$container.parents().filter(r.hasScroll);t.each(function(){r.StoreData(this,"select2-scroll-position",{x:u(this).scrollLeft(),y:u(this).scrollTop()})}),t.on(s,function(e){var t=r.GetData(this,"select2-scroll-position");u(this).scrollTop(t.y)}),u(window).on(s+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,s="resize.select2."+t.id,t="orientationchange.select2."+t.id;this.$container.parents().filter(r.hasScroll).off(n),u(window).off(n+" "+s+" "+t)},e.prototype._positionDropdown=function(){var e=u(window),t=this.$dropdown[0].classList.contains("select2-dropdown--above"),n=this.$dropdown[0].classList.contains("select2-dropdown--below"),s=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var r=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-r,e=l>i.bottom+r,a={left:i.left,top:o.bottom},l=this.$dropdownParent;"static"===l.css("position")&&(l=l.offsetParent());i={top:0,left:0};(u.contains(document.body,l[0])||l[0].isConnected)&&(i=l.offset()),a.top-=i.top,a.left-=i.left,t||n||(s="below"),e||!c||t?!c&&e&&t&&(s="below"):s="above",("above"==s||t&&"below"!==s)&&(a.top=o.top-i.top-r),null!=s&&(this.$dropdown[0].classList.remove("select2-dropdown--below"),this.$dropdown[0].classList.remove("select2-dropdown--above"),this.$dropdown[0].classList.add("select2-dropdown--"+s),this.$container[0].classList.remove("select2-container--below"),this.$container[0].classList.remove("select2-container--above"),this.$container[0].classList.add("select2-container--"+s)),this.$dropdownContainer.css(a)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),u.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,s){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,s)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,s=0;s<t.length;s++){var i=t[s];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),u.define("select2/dropdown/selectOnClose",["../utils"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("close",function(e){s._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}n=this.getHighlightedResults();n.length<1||(null!=(n=s.GetData(n[0],"data")).element&&n.element.selected||null==n.element&&n.selected||this.trigger("select",{data:n}))},e}),u.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("select",function(e){s._selectTriggered(e)}),t.on("unselect",function(e){s._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),u.define("select2/dropdown/dropdownCss",["../utils"],function(n){function e(){}return e.prototype.render=function(e){var t=e.call(this),e=this.options.get("dropdownCssClass")||"";return-1!==e.indexOf(":all:")&&(e=e.replace(":all:",""),n.copyNonInternalCssClasses(t[0],this.$element[0])),t.addClass(e),t},e}),u.define("select2/dropdown/tagsSearchHighlight",["../utils"],function(s){function e(){}return e.prototype.highlightFirstItem=function(e){var t=this.$results.find(".select2-results__option--selectable:not(.select2-results__option--selected)");if(0<t.length){var n=t.first(),t=s.GetData(n[0],"data").element;if(t&&t.getAttribute&&"true"===t.getAttribute("data-select2-tag"))return void n.trigger("mouseenter")}e.call(this)},e}),u.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,e="Please delete "+t+" character";return 1!=t&&(e+="s"),e},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"},removeItem:function(){return"Remove item"},search:function(){return"Search"}}}),u.define("select2/defaults",["jquery","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/selectionCss","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./dropdown/dropdownCss","./dropdown/tagsSearchHighlight","./i18n/en"],function(l,o,r,a,c,u,d,p,h,f,g,t,m,v,y,_,b,w,$,x,A,D,S,O,L,E,C,T,q,I,e){function n(){this.reset()}return n.prototype.apply=function(e){var t;null==(e=l.extend(!0,{},this.defaults,e)).dataAdapter&&(null!=e.ajax?e.dataAdapter=y:null!=e.data?e.dataAdapter=v:e.dataAdapter=m,0<e.minimumInputLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,w)),0<e.maximumInputLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,$)),0<e.maximumSelectionLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,x)),e.tags&&(e.dataAdapter=f.Decorate(e.dataAdapter,_)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=f.Decorate(e.dataAdapter,b))),null==e.resultsAdapter&&(e.resultsAdapter=o,null!=e.ajax&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,O)),null!=e.placeholder&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,S)),e.selectOnClose&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,C)),e.tags&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter&&(e.multiple?e.dropdownAdapter=A:(t=f.Decorate(A,D),e.dropdownAdapter=t),0!==e.minimumResultsForSearch&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,E)),e.closeOnSelect&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,T)),null!=e.dropdownCssClass&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,q)),e.dropdownAdapter=f.Decorate(e.dropdownAdapter,L)),null==e.selectionAdapter&&(e.multiple?e.selectionAdapter=a:e.selectionAdapter=r,null!=e.placeholder&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,c)),e.allowClear&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,u)),e.multiple&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,d)),null!=e.selectionCssClass&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,p)),e.selectionAdapter=f.Decorate(e.selectionAdapter,h)),e.language=this._resolveLanguage(e.language),e.language.push("en");for(var n=[],s=0;s<e.language.length;s++){var i=e.language[s];-1===n.indexOf(i)&&n.push(i)}return e.language=n,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdLanguageBase:"./i18n/",autocomplete:"off",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:f.escapeMarkup,language:{},matcher:function e(t,n){if(null==t.term||""===t.term.trim())return n;if(n.children&&0<n.children.length){for(var s=l.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&s.children.splice(i,1);return 0<s.children.length?s:e(t,s)}var o=a(n.text).toUpperCase(),r=a(t.term).toUpperCase();return-1<o.indexOf(r)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,s=this.defaults.language,i=t.prop("lang"),t=t.closest("[lang]").prop("lang"),t=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(s),this._resolveLanguage(t));return e.language=t,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(l.isEmptyObject(e))return[];if(l.isPlainObject(e))return[e];for(var t,n=Array.isArray(e)?e:[e],s=[],i=0;i<n.length;i++)s.push(n[i]),"string"==typeof n[i]&&0<n[i].indexOf("-")&&(t=n[i].split("-")[0],s.push(t));return s},n.prototype._processTranslations=function(e,t){for(var n=new g,s=0;s<e.length;s++){var i=new g,o=e[s];if("string"==typeof o)try{i=g.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=g.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=l.isPlainObject(o)?new g(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[l.camelCase(e)]=t;n=f._convertData(n);l.extend(!0,this.defaults,n)},new n}),u.define("select2/options",["jquery","./defaults","./utils"],function(c,n,u){function e(e,t){this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=n.applyFromElement(this.options,t)),this.options=n.apply(this.options)}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.autocomplete&&e.prop("autocomplete")&&(this.options.autocomplete=e.prop("autocomplete")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),u.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),u.StoreData(e[0],"data",u.GetData(e[0],"select2Tags")),u.StoreData(e[0],"tags",!0)),u.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",u.GetData(e[0],"ajaxUrl")),u.StoreData(e[0],"ajax-Url",u.GetData(e[0],"ajaxUrl")));var n={};function s(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,r="data-";o.substr(0,r.length)==r&&(o=o.substring(r.length),r=u.GetData(e[0],o),n[o.replace(/-([a-z])/g,s)]=r)}c.fn.jquery&&"1."==c.fn.jquery.substr(0,2)&&e[0].dataset&&(n=c.extend(!0,{},e[0].dataset,n));var a,l=c.extend(!0,{},u.GetData(e[0]),n);for(a in l=u._convertData(l))-1<t.indexOf(a)||(c.isPlainObject(this.options[a])?c.extend(this.options[a],l[a]):this.options[a]=l[a]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),u.define("select2/core",["jquery","./options","./utils","./keys"],function(t,i,o,s){var r=function(e,t){null!=o.GetData(e[0],"select2")&&o.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new i(t,e),r.__super__.constructor.call(this);var n=e.attr("tabindex")||0;o.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");t=this.options.get("dataAdapter");this.dataAdapter=new t(e,this.options);n=this.render();this._placeContainer(n);t=this.options.get("selectionAdapter");this.selection=new t(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,n);t=this.options.get("dropdownAdapter");this.dropdown=new t(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,n);n=this.options.get("resultsAdapter");this.results=new n(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var s=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){s.trigger("selection:update",{data:e})}),e[0].classList.add("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),o.StoreData(e[0],"select2",this),e.data("select2",this)};return o.Extend(r,o.Observable),r.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+o.generateChars(2):o.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},r.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},r.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var s=this._resolveWidth(e,"style");return null!=s?s:this._resolveWidth(e,"element")}if("element"==t){s=e.outerWidth(!1);return s<=0?"auto":s+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;e=e.attr("style");if("string"!=typeof e)return null;for(var i=e.split(";"),o=0,r=i.length;o<r;o+=1){var a=i[o].replace(/\s/g,"").match(n);if(null!==a&&1<=a.length)return a[1]}return null},r.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},r.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=o.bind(this._syncAttributes,this),this._syncS=o.bind(this._syncSubtree,this),this._observer=new window.MutationObserver(function(e){t._syncA(),t._syncS(e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})},r.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerSelectionEvents=function(){var n=this,s=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===s.indexOf(e)&&n.trigger(e,t)})},r.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container[0].classList.add("select2-container--open")}),this.on("close",function(){n.$container[0].classList.remove("select2-container--open")}),this.on("enable",function(){n.$container[0].classList.remove("select2-container--disabled")}),this.on("disable",function(){n.$container[0].classList.add("select2-container--disabled")}),this.on("blur",function(){n.$container[0].classList.remove("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===s.ESC||t===s.UP&&e.altKey?(n.close(e),e.preventDefault()):t===s.ENTER||t===s.TAB?(n.trigger("results:select",{}),e.preventDefault()):t===s.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===s.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===s.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===s.ENTER||t===s.SPACE||t===s.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},r.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},r.prototype._isChangeMutation=function(e){var t=this;if(e.addedNodes&&0<e.addedNodes.length){for(var n=0;n<e.addedNodes.length;n++)if(e.addedNodes[n].selected)return!0}else{if(e.removedNodes&&0<e.removedNodes.length)return!0;if(Array.isArray(e))return e.some(function(e){return t._isChangeMutation(e)})}return!1},r.prototype._syncSubtree=function(e){var e=this._isChangeMutation(e),t=this;e&&this.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})},r.prototype.trigger=function(e,t){var n=r.__super__.trigger,s={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in s){var i=s[e],s={prevented:!1,name:e,args:t};if(n.call(this,i,s),s.prevented)return void(t.prevented=!0)}n.call(this,e,t)},r.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},r.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},r.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},r.prototype.isEnabled=function(){return!this.isDisabled()},r.prototype.isDisabled=function(){return this.options.get("disabled")},r.prototype.isOpen=function(){return this.$container[0].classList.contains("select2-container--open")},r.prototype.hasFocus=function(){return this.$container[0].classList.contains("select2-container--focus")},r.prototype.focus=function(e){this.hasFocus()||(this.$container[0].classList.add("select2-container--focus"),this.trigger("focus",{}))},r.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);e=!e[0];this.$element.prop("disabled",e)},r.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},r.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();e=e[0];Array.isArray(e)&&(e=e.map(function(e){return e.toString()})),this.$element.val(e).trigger("input").trigger("change")},r.prototype.destroy=function(){o.RemoveData(this.$container[0]),this.$container.remove(),this._observer.disconnect(),this._observer=null,this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",o.GetData(this.$element[0],"old-tabindex")),this.$element[0].classList.remove("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),o.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},r.prototype.render=function(){var e=t('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container[0].classList.add("select2-container--"+this.options.get("theme")),o.StoreData(e[0],"element",this.$element),e},r}),u.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t[0].classList.add("select2-dropdown--below"),n[0].classList.add("select2-container--below")},e}),u.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),u.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),a=function(u){var d,p,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],h=Array.prototype.slice;if(u.event.fixHooks)for(var n=e.length;n;)u.event.fixHooks[e[--n]]=u.event.mouseHooks;var f=u.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],s,!1);else this.onmousewheel=s;u.data(this,"mousewheel-line-height",f.getLineHeight(this)),u.data(this,"mousewheel-page-height",f.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],s,!1);else this.onmousewheel=null;u.removeData(this,"mousewheel-line-height"),u.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=u(e),e=t["offsetParent"in u.fn?"offsetParent":"parent"]();return e.length||(e=u("body")),parseInt(e.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return u(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function s(e){var t,n=e||window.event,s=h.call(arguments,1),i=0,o=0,r=0,a=0,l=0,c=0;if(e=u.event.fix(n),e.type="mousewheel","detail"in n&&(r=-1*n.detail),"wheelDelta"in n&&(r=n.wheelDelta),"wheelDeltaY"in n&&(r=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*r,r=0),i=0===r?o:r,"deltaY"in n&&(i=r=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===r&&(i=-1*o)),0!==r||0!==o)return 1===n.deltaMode?(i*=t=u.data(this,"mousewheel-line-height"),r*=t,o*=t):2===n.deltaMode&&(i*=t=u.data(this,"mousewheel-page-height"),r*=t,o*=t),a=Math.max(Math.abs(r),Math.abs(o)),(!p||a<p)&&m(n,p=a)&&(p/=40),m(n,a)&&(i/=40,o/=40,r/=40),i=Math[1<=i?"floor":"ceil"](i/p),o=Math[1<=o?"floor":"ceil"](o/p),r=Math[1<=r?"floor":"ceil"](r/p),f.settings.normalizeOffset&&this.getBoundingClientRect&&(a=this.getBoundingClientRect(),l=e.clientX-a.left,c=e.clientY-a.top),e.deltaX=o,e.deltaY=r,e.deltaFactor=p,e.offsetX=l,e.offsetY=c,e.deltaMode=0,s.unshift(e,i,o,r),d&&clearTimeout(d),d=setTimeout(g,200),(u.event.dispatch||u.event.handle).apply(this,s)}function g(){p=null}function m(e,t){return f.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}u.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof u.define&&u.define.amd?u.define("jquery-mousewheel",["jquery"],a):"object"==typeof exports?module.exports=a:a(t),u.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,r){var a;return null==i.fn.select2&&(a=["open","close","destroy"],i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,s=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=r.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,s)}),-1<a.indexOf(t)?this:n}),null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:u.define,require:u.require});function b(e,t){return s.call(e,t)}function l(e,t){var n,s,i,o,r,a,l,c,u,d,p=t&&t.split("/"),h=v.map,f=h&&h["*"]||{};if(e){for(t=(e=e.split("/")).length-1,v.nodeIdCompat&&_.test(e[t])&&(e[t]=e[t].replace(_,"")),"."===e[0].charAt(0)&&p&&(e=p.slice(0,p.length-1).concat(e)),c=0;c<e.length;c++)"."===(d=e[c])?(e.splice(c,1),--c):".."===d&&(0===c||1===c&&".."===e[2]||".."===e[c-1]||0<c&&(e.splice(c-1,2),c-=2));e=e.join("/")}if((p||f)&&h){for(c=(n=e.split("/")).length;0<c;--c){if(s=n.slice(0,c).join("/"),p)for(u=p.length;0<u;--u)if(i=h[p.slice(0,u).join("/")],i=i&&i[s]){o=i,r=c;break}if(o)break;!a&&f&&f[s]&&(a=f[s],l=c)}!o&&a&&(o=a,r=l),o&&(n.splice(0,r,o),e=n.join("/"))}return e}function w(t,n){return function(){var e=i.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),r.apply(p,e.concat([t,n]))}}function x(e){var t;if(b(m,e)&&(t=m[e],delete m[e],y[e]=!0,o.apply(p,t)),!b(g,e)&&!b(y,e))throw new Error("No "+e);return g[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function A(e){return e?c(e):[]}var u=a.require("jquery.select2");return t.fn.select2.amd=a,u});
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/select2.min.css b/vendor/assets/stylesheets/select2.min.css
index 24d6241547..f00f154728 100755
--- a/vendor/assets/stylesheets/select2.min.css
+++ b/vendor/assets/stylesheets/select2.min.css
@@ -1 +1 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle;}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none;}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px;}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none;}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline-block;overflow:hidden;padding-left:8px;text-overflow:ellipsis;white-space:nowrap;}.select2-container .select2-search--inline{float:left;}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none;}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051;}.select2-results{display:block;}.select2-results__options{list-style:none;margin:0;padding:0;}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none;}.select2-results__option[aria-selected]{cursor:pointer;}.select2-container--open .select2-dropdown{left:0;}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0;}.select2-search--dropdown{display:block;padding:4px;}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box;}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none;}.select2-search--dropdown.select2-search--hide{display:none;}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0);}.select2-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px;}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px;}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px;}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999;}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px;}.select2-container--default .select2-selection--single .select2-selection__arrow span{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0;}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left;}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto;}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default;}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none;}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow span{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px;}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;}.select2-container--default .select2-selection--multiple .select2-selection__rendered{box-sizing:border-box;list-style:none;margin:0;padding:0 5px;width:100%;}.select2-container--default .select2-selection--multiple .select2-selection__placeholder{color:#999;margin-top:5px;float:left;}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-top:5px;margin-right:10px;}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px;}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{color:#999;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px;}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover{color:#333;}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice,.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__placeholder{float:right;}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto;}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto;}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0;}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default;}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none;}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0;}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0;}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa;}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto;}.select2-container--default .select2-results__option[role=group]{padding:0;}.select2-container--default .select2-results__option[aria-disabled=true]{color:#999;}.select2-container--default .select2-results__option[aria-selected=true]{background-color:#ddd;}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em;}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0;}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em;}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em;}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em;}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em;}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em;}.select2-container--default .select2-results__option--highlighted[aria-selected]{background-color:#5897fb;color:white;}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px;}.select2-container--classic .select2-selection--single{background-color:#f6f6f6;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #ffffff 50%, #eeeeee 100%);background-image:-o-linear-gradient(top, #ffffff 50%, #eeeeee 100%);background-image:linear-gradient(to bottom, #ffffff 50%, #eeeeee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb;}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px;}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;margin-right:10px;}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999;}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eeeeee 50%, #cccccc 100%);background-image:-o-linear-gradient(top, #eeeeee 50%, #cccccc 100%);background-image:linear-gradient(to bottom, #eeeeee 50%, #cccccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#cccccc', GradientType=0);}.select2-container--classic .select2-selection--single .select2-selection__arrow span{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0;}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left;}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto;}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb;}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none;}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow span{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px;}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #ffffff 0%, #eeeeee 50%);background-image:-o-linear-gradient(top, #ffffff 0%, #eeeeee 50%);background-image:linear-gradient(to bottom, #ffffff 0%, #eeeeee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eeeeee', GradientType=0);}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eeeeee 50%, #ffffff 100%);background-image:-o-linear-gradient(top, #eeeeee 50%, #ffffff 100%);background-image:linear-gradient(to bottom, #eeeeee 50%, #ffffff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#ffffff', GradientType=0);}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0;}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb;}.select2-container--classic .select2-selection--multiple .select2-selection__rendered{list-style:none;margin:0;padding:0 5px;}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none;}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;cursor:default;float:left;margin-right:5px;margin-top:5px;padding:0 5px;}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{color:#888;cursor:pointer;display:inline-block;font-weight:bold;margin-right:2px;}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555;}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{float:right;}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto;}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{margin-left:2px;margin-right:auto;}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb;}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0;}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0;}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;}.select2-container--classic .select2-dropdown{background-color:white;border:1px solid transparent;}.select2-container--classic .select2-dropdown--above{border-bottom:none;}.select2-container--classic .select2-dropdown--below{border-top:none;}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto;}.select2-container--classic .select2-results__option[role=group]{padding:0;}.select2-container--classic .select2-results__option[aria-disabled=true]{color:grey;}.select2-container--classic .select2-results__option--highlighted[aria-selected]{background-color:#3875d7;color:white;}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px;}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb;}
+.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{background-color:transparent;border:none;font-size:1em}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline;list-style:none;padding:0}.select2-container .select2-selection--multiple .select2-selection__clear{background-color:transparent;border:none;font-size:1em}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;margin-left:5px;padding:0;max-width:100%;resize:none;height:18px;vertical-align:bottom;font-family:sans-serif;overflow:hidden;word-break:keep-all}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option--selectable{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;height:26px;margin-right:20px;padding-right:0px}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;padding-bottom:5px;padding-right:5px;position:relative}.select2-container--default .select2-selection--multiple.select2-selection--clearable{padding-right:25px}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;font-weight:bold;height:20px;margin-right:10px;margin-top:5px;position:absolute;right:0;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:inline-block;margin-left:5px;margin-top:5px;padding:0;padding-left:20px;position:relative;max-width:100%;overflow:hidden;text-overflow:ellipsis;vertical-align:bottom;white-space:nowrap}.select2-container--default .select2-selection--multiple .select2-selection__choice__display{cursor:default;padding-left:2px;padding-right:5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{background-color:transparent;border:none;border-right:1px solid #aaa;border-top-left-radius:4px;border-bottom-left-radius:4px;color:#999;cursor:pointer;font-size:1em;font-weight:bold;padding:0 4px;position:absolute;left:0;top:0}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover,.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:focus{background-color:#f1f1f1;color:#333;outline:none}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__display{padding-left:5px;padding-right:2px}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{border-left:1px solid #aaa;border-right:none;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:4px;border-bottom-right-radius:4px}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__clear{float:left;margin-left:10px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--group{padding:0}.select2-container--default .select2-results__option--disabled{color:#999}.select2-container--default .select2-results__option--selected{background-color:#ddd}.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;height:26px;margin-right:20px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0;padding-bottom:5px;padding-right:5px}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;display:inline-block;margin-left:5px;margin-top:5px;padding:0}.select2-container--classic .select2-selection--multiple .select2-selection__choice__display{cursor:default;padding-left:2px;padding-right:5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{background-color:transparent;border:none;border-top-left-radius:4px;border-bottom-left-radius:4px;color:#888;cursor:pointer;font-size:1em;font-weight:bold;padding:0 4px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555;outline:none}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__display{padding-left:5px;padding-right:2px}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:4px;border-bottom-right-radius:4px}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option--group{padding:0}.select2-container--classic .select2-results__option--disabled{color:grey}.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
\ No newline at end of file

From 6e662d61939abe4da006966c2fa34c789f106a27 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 17 Jul 2023 11:05:32 +0100
Subject: [PATCH 100/352] adds focus highlight for buttons, links and
 accordions

---
 app/assets/stylesheets/admin/_variables.scss  |  1 +
 app/assets/stylesheets/admin/base.scss        | 50 +++++++++++++++++++
 .../stylesheets/admin/page-applications.scss  |  4 --
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index 6464d2c51a..bc468ae153 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -30,3 +30,4 @@ $header-hover: #444;
 
 $blue-link-colour: #3264A3;
 $govuk-light-blue: #5694ca;
+$govuk-highlight-yellow: #fd0;
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index b316c675b4..9fe730e701 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -3,12 +3,34 @@
 // Basic
 a {
   color: $blue-link-colour;
+  text-decoration: underline;
   &:active,
+  &:focus:not(.btn-default) {
+    outline: none !important;
+    text-decoration: none !important;
+    border-bottom-color: $black !important;
+    border-bottom-width: 2px !important;
+    border-bottom-style: solid !important;
+  }
+}
+
+.btn, a {
   &:focus {
+    background-color: $govuk-highlight-yellow !important;
+    border-color: $govuk-highlight-yellow;
+    color: $black !important;
     outline: none !important;
   }
 }
 
+.btn-primary {
+  &:focus {
+    border-bottom-color: $black !important;
+    border-bottom-width: 2px !important;
+    border-bottom-style: solid !important;
+  }
+}
+
 span {
   &.visible-lg {
     @include screen-lg-min {
@@ -111,6 +133,7 @@ table .ellipsis {
 
 .btn {
   border-radius: 0;
+  text-decoration: none;
 
   .icon-view,
   .glyphicon,
@@ -1403,6 +1426,13 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   border: none;
   border-radius: 0;
   background-color: $grey-panel;
+
+  &:focus-within {
+    background-color: $govuk-highlight-yellow;
+    border-bottom-color: $black !important;
+    border-bottom-width: 2px !important;
+    border-bottom-style: solid !important;
+  }
 }
 
 .panel-title {
@@ -1419,6 +1449,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     background-size: 12px 8px;
     text-decoration: none;
 
+    &:focus {
+      border-bottom: none !important;
+    }
+
     @include is-retina {
       background-image: image-url("icon-arrow-collapse-down@2.png");
     }
@@ -1473,8 +1507,16 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
       a {
         background-image: image-url("icon-arrow-collapse-down-white.png");
 
+        &:focus {
+          background-image: image-url("icon-arrow-collapse-down.png") !important;
+        }
+
         @include is-retina {
           background-image: image-url("icon-arrow-collapse-down-white@2.png");
+
+          &:focus {
+            background-image: image-url("icon-arrow-collapse-down@2.png") !important;
+          }
         }
       }
     }
@@ -1482,8 +1524,16 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     &.expanded > .panel-title a {
       background-image: image-url("icon-arrow-collapse-up-white.png");
 
+      &:focus {
+        background-image: image-url("icon-arrow-collapse-up.png") !important;
+      }
+
       @include is-retina {
         background-image: image-url("icon-arrow-collapse-up-white@2.png");
+
+        &:focus {
+          background-image: image-url("icon-arrow-collapse-up@2.png") !important;
+        }
       }
     }
   }
diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index ad97f3ac51..d05784a6cb 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -62,10 +62,6 @@
       li.checkbox,
       li.apply {
         padding: 0 10px;
-
-        .btn:focus {
-          border-color: #5C5C5C;
-        }
       }
     }
   }

From 28dce2d453544f9a0f01f7cda89a5cc4696e65ad Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 17 Jul 2023 13:46:21 +0100
Subject: [PATCH 101/352] change icon colour on focus

---
 app/assets/images/icon_load_black.svg         | 24 ++++++++++++
 app/assets/images/icon_loading_black.svg      |  1 +
 app/assets/images/icon_update_black.svg       | 18 +++++++++
 app/assets/stylesheets/admin/base.scss        |  2 +-
 .../stylesheets/admin/header-footer.scss      |  5 ++-
 .../stylesheets/admin/page-dashboard.scss     | 39 ++++++++++++++-----
 6 files changed, 76 insertions(+), 13 deletions(-)
 create mode 100644 app/assets/images/icon_load_black.svg
 create mode 100644 app/assets/images/icon_loading_black.svg
 create mode 100644 app/assets/images/icon_update_black.svg

diff --git a/app/assets/images/icon_load_black.svg b/app/assets/images/icon_load_black.svg
new file mode 100644
index 0000000000..b8d1ed74b2
--- /dev/null
+++ b/app/assets/images/icon_load_black.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="13px" height="14px" viewBox="0 0 13 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>noun_loading_190593</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/load" fill-rule="nonzero">
+            <g id="noun_loading_190593">
+                <g id="Group">
+                    <path d="M12.1055258,8.05995876 C12.039134,8.11249485 11.9523918,8.14569072 11.844,8.14569072 C11.7536495,8.14569072 11.6796082,8.12129897 11.618701,8.08319588 C11.6136495,8.11653608 11.6036907,8.14958763 11.5914227,8.18220619 C11.5883918,8.20053608 11.5829072,8.21814433 11.5777113,8.23560825 C11.5752577,8.25061856 11.5719381,8.26476289 11.5680412,8.27905155 C11.1490515,10.6440412 9.08657732,12.4484536 6.60309278,12.4484536 C3.8176701,12.4484536 1.55154639,10.1823299 1.55154639,7.39690722 C1.55154639,4.61148454 3.8176701,2.34536082 6.60309278,2.34536082 C8.21958763,2.34536082 9.65812371,3.1108866 10.5829897,4.29626804 C10.9251959,3.95406186 11.2674021,3.61185567 11.6096082,3.26964948 C10.4184536,1.82519588 8.61750515,0.902061856 6.60309278,0.902061856 C3.02183505,0.902061856 0.108247423,3.81564948 0.108247423,7.39690722 C0.108247423,10.9781649 3.02183505,13.8917526 6.60309278,13.8917526 C9.83160825,13.8917526 12.5161443,11.5234433 13.0135052,8.43305155 C12.7049278,8.32725773 12.4091959,8.18841237 12.1055258,8.05995876 Z" id="Path" fill="#000000"></path>
+                    <g transform="translate(7.360825, 3.319588)" id="Path">
+                        <line x1="4.04123711" y1="0.721649485" x2="0.721649485" y2="0.721649485" fill="#000000"></line>
+                        <path d="M4.04123711,1.44329897 L0.721649485,1.44329897 C0.323010309,1.44329897 0,1.12014433 0,0.721649485 C0,0.323154639 0.323010309,0 0.721649485,0 L4.04123711,0 C4.43987629,0 4.7628866,0.323154639 4.7628866,0.721649485 C4.7628866,1.12014433 4.43987629,1.44329897 4.04123711,1.44329897 Z" fill="#000000"></path>
+                    </g>
+                    <g transform="translate(10.680412, 0.000000)" id="Path">
+                        <line x1="0.721649485" y1="4.04123711" x2="0.721649485" y2="0.721649485" fill="#000000"></line>
+                        <path d="M0.721649485,4.7628866 C0.323010309,4.7628866 0,4.43973196 0,4.04123711 L0,0.721649485 C0,0.323154639 0.323010309,0 0.721649485,0 C1.12028866,0 1.44329897,0.323154639 1.44329897,0.721649485 L1.44329897,4.04123711 C1.44329897,4.43973196 1.12028866,4.7628866 0.721649485,4.7628866 Z" fill="#000000"></path>
+                    </g>
+                    <circle id="Oval" fill="#000000" cx="12.3039794" cy="8.29896907" r="1"></circle>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/app/assets/images/icon_loading_black.svg b/app/assets/images/icon_loading_black.svg
new file mode 100644
index 0000000000..aa07c11741
--- /dev/null
+++ b/app/assets/images/icon_loading_black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" viewBox="0 0 10 12.5" enable-background="new 0 0 10 10" xml:space="preserve"><path d="M9.688,4.678C9.619,3.954,9.371,3.211,8.986,2.586c-0.396-0.66-0.98-1.225-1.682-1.631c-0.08-0.052-0.162-0.091-0.242-0.129  L7.027,0.809C6.998,0.795,6.969,0.781,6.939,0.767c-0.061-0.03-0.121-0.059-0.191-0.086c-0.051-0.018-0.1-0.037-0.15-0.056  C6.463,0.574,6.324,0.522,6.186,0.492C5.758,0.365,5.32,0.335,4.981,0.324C4.166,0.326,3.349,0.535,2.682,0.912L2.584,0.97  C2.447,1.051,2.305,1.134,2.183,1.233c-0.025,0.02-0.052,0.038-0.077,0.057C2.053,1.329,2.001,1.367,1.949,1.413l-0.243,0.22  c-0.024,0.022-0.05,0.045-0.077,0.074L1.34,2.025l-0.179,0.24C1.11,2.333,1.056,2.405,1.016,2.478c-0.389,0.619-0.631,1.311-0.7,2  c-0.063,0.63,0.006,1.279,0.202,1.881l0.106,0.302c0.011,0.028,0.021,0.05,0.031,0.071l0.016,0.033  c0.021,0.043,0.04,0.084,0.06,0.127C0.767,6.972,0.803,7.05,0.847,7.131l0.199,0.332c0.045,0.067,0.093,0.131,0.14,0.193  C1.21,7.689,1.235,7.721,1.263,7.76C1.552,8.117,1.856,8.411,2.14,8.607C2.163,8.623,2.184,8.64,2.206,8.656  C2.25,8.689,2.294,8.723,2.338,8.748l0.339,0.203L3.05,9.13c0.073,0.034,0.161,0.005,0.198-0.068C3.285,8.988,3.256,8.9,3.184,8.863  L2.83,8.678L2.512,8.47C2.478,8.447,2.445,8.42,2.411,8.393c-0.022-0.02-0.046-0.037-0.071-0.058C2.087,8.146,1.82,7.867,1.57,7.533  C1.546,7.499,1.523,7.465,1.5,7.432c-0.041-0.06-0.082-0.119-0.117-0.176L1.209,6.941c-0.034-0.07-0.065-0.144-0.097-0.219  C1.095,6.678,1.076,6.634,1.058,6.594L1.044,6.559C1.037,6.543,1.029,6.525,1.026,6.516L0.937,6.228  C0.783,5.684,0.742,5.101,0.819,4.539C0.903,3.934,1.14,3.331,1.503,2.797c0.344-0.518,0.87-0.978,1.481-1.294  c0.558-0.288,1.18-0.434,1.85-0.434c0.044,0,0.088,0,0.124,0.001c0.306,0.023,0.663,0.062,1.012,0.181  c0.105,0.027,0.209,0.07,0.318,0.116C6.34,1.389,6.391,1.41,6.434,1.427C6.48,1.448,6.527,1.472,6.572,1.496  c0.029,0.016,0.059,0.031,0.084,0.045l0.035,0.017c0.063,0.033,0.121,0.063,0.178,0.104l0.213,0.14  c0.041,0.028,0.08,0.06,0.119,0.091C7.227,1.914,7.25,1.935,7.279,1.957c0.094,0.068,0.176,0.149,0.264,0.236  c0.031,0.031,0.063,0.063,0.1,0.096c0.031,0.028,0.059,0.064,0.09,0.102c0.021,0.025,0.041,0.05,0.057,0.068  C7.811,2.484,7.83,2.508,7.852,2.533C7.885,2.57,7.914,2.605,7.938,2.64c0.031,0.048,0.064,0.095,0.098,0.142  C8.096,2.868,8.152,2.95,8.195,3.04c0.301,0.534,0.471,1.109,0.506,1.71C8.73,5.268,8.645,5.807,8.453,6.309  C8.289,6.736,8.055,7.131,7.771,7.451C7.732,7.497,7.691,7.539,7.65,7.58C7.623,7.606,7.598,7.633,7.576,7.656  c-0.014,0.013-0.027,0.026-0.039,0.04C7.52,7.715,7.502,7.733,7.486,7.747L7.383,7.833C7.355,7.855,7.33,7.877,7.305,7.898  C7.268,7.932,7.23,7.963,7.197,7.987L7,8.122C6.928,8.176,6.857,8.213,6.791,8.248c-0.035,0.02-0.07,0.037-0.094,0.053  c-0.021,0.01-0.039,0.021-0.057,0.031C6.619,8.344,6.6,8.356,6.572,8.367L6.17,8.537C5.873,8.678,5.742,9.033,5.883,9.332  C5.98,9.541,6.193,9.677,6.424,9.677c0.088,0,0.174-0.019,0.254-0.057l0.373-0.175c0.035-0.016,0.08-0.041,0.125-0.068L7.238,9.34  c0.031-0.019,0.064-0.038,0.1-0.059c0.104-0.06,0.223-0.129,0.328-0.213l0.23-0.173c0.055-0.043,0.107-0.091,0.16-0.14  c0.025-0.023,0.051-0.047,0.08-0.072L8.262,8.57c0.027-0.027,0.055-0.059,0.082-0.089l0.043-0.046  C8.412,8.407,8.438,8.379,8.465,8.35C8.52,8.291,8.576,8.229,8.627,8.161c0.348-0.427,0.631-0.943,0.82-1.497  C9.666,6.021,9.748,5.334,9.688,4.678z" fill="#000000"/></svg>
diff --git a/app/assets/images/icon_update_black.svg b/app/assets/images/icon_update_black.svg
new file mode 100644
index 0000000000..73824e58c6
--- /dev/null
+++ b/app/assets/images/icon_update_black.svg
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14px" height="14px" viewBox="0 0 14 14" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 64 (93537) - https://sketch.com -->
+    <title>noun_update_3235036</title>
+    <desc>Created with Sketch.</desc>
+    <g id="Symbols" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="icon/update" fill="#000000" fill-rule="nonzero">
+            <g id="noun_update_3235036">
+                <g id="Group">
+                    <path d="M2.51788793,3.57693966 C2.54051724,3.54676724 2.56314655,3.51659483 2.58577586,3.48793103 C2.55107759,3.53318966 2.51487069,3.5799569 2.48017241,3.62521552 C2.81357759,3.19375 3.2012931,2.8075431 3.63275862,2.47413793 C3.5875,2.50883621 3.54073276,2.5450431 3.49547414,2.57974138 C3.92543103,2.25086207 4.39461207,1.9762931 4.8924569,1.76508621 C4.83814655,1.78771552 4.78383621,1.81034483 4.73103448,1.83297414 C5.2424569,1.61875 5.77801724,1.47241379 6.32715517,1.39698276 C6.26681034,1.40452586 6.20646552,1.41357759 6.14612069,1.42112069 C6.71487069,1.34568966 7.29116379,1.34568966 7.85840517,1.42112069 C7.79806034,1.41357759 7.73771552,1.40452586 7.67737069,1.39698276 C8.22198276,1.47241379 8.75452586,1.61724138 9.26293103,1.8299569 C9.20862069,1.80732759 9.15431034,1.78469828 9.10150862,1.76206897 C9.60237069,1.97327586 10.074569,2.24935345 10.5075431,2.57974138 C10.4622845,2.5450431 10.4155172,2.50883621 10.3702586,2.47413793 C10.8032328,2.80905172 11.1924569,3.19676724 11.5258621,3.62974138 C11.4911638,3.58448276 11.4549569,3.53771552 11.4202586,3.4924569 C11.7521552,3.92392241 12.0267241,4.39612069 12.237931,4.89849138 C12.2153017,4.84418103 12.1926724,4.78987069 12.1700431,4.73706897 C12.3827586,5.24396552 12.5275862,5.77801724 12.6030172,6.32262931 C12.5954741,6.26228448 12.5864224,6.20193966 12.5788793,6.14159483 C12.6165948,6.42672414 12.6362069,6.71336207 12.6362069,7 C12.6362069,7.175 12.7116379,7.35603448 12.8353448,7.47974138 C12.9530172,7.59741379 13.1461207,7.68642241 13.3150862,7.67887931 C13.4900862,7.67133621 13.6726293,7.61400862 13.7948276,7.47974138 C13.9170259,7.34698276 13.9939655,7.18405172 13.9939655,7 C13.9924569,5.87909483 13.7193966,4.77478448 13.2079741,3.77909483 C12.9590517,3.29482759 12.6452586,2.84676724 12.29375,2.43340517 C11.94375,2.02155172 11.5394397,1.66551724 11.1064655,1.34418103 C10.7127155,1.05150862 10.2842672,0.805603448 9.83469828,0.610991379 C9.32478448,0.392241379 8.80431034,0.217241379 8.25517241,0.123706897 C7.0512931,-0.0829741379 5.79762931,-0.00452586207 4.64655172,0.417887931 C3.50905172,0.835775862 2.47262931,1.52823276 1.68965517,2.4575431 C1.57047414,2.59935345 1.45732759,2.74568966 1.34719828,2.89353448 C1.24913793,3.02478448 1.23706897,3.26616379 1.27931034,3.41702586 C1.32306034,3.57392241 1.44375,3.74590517 1.59159483,3.82284483 C1.74849138,3.90581897 1.94008621,3.94806034 2.11508621,3.89073276 C2.16939655,3.86810345 2.2237069,3.84547414 2.27650862,3.82284483 C2.37607759,3.76099138 2.4575431,3.67952586 2.51788793,3.57693966 L2.51788793,3.57693966 Z" id="Path"></path>
+                    <path d="M4.37952586,2.65215517 C4.08232759,2.65215517 3.78362069,2.65215517 3.48642241,2.65215517 C3.0112069,2.65215517 2.53599138,2.65215517 2.06228448,2.65215517 C1.95366379,2.65215517 1.8450431,2.65215517 1.73491379,2.65215517 C1.9612069,2.87844828 2.1875,3.10474138 2.4137931,3.33103448 C2.4137931,3.03383621 2.4137931,2.73512931 2.4137931,2.43793103 C2.4137931,1.96271552 2.4137931,1.4875 2.4137931,1.0137931 C2.4137931,0.905172414 2.4137931,0.796551724 2.4137931,0.686422414 C2.4137931,0.512931034 2.33836207,0.32887931 2.21465517,0.206681034 C2.09698276,0.0890086207 1.90387931,-8.67361738e-19 1.73491379,0.00754310345 C1.55991379,0.0150862069 1.37737069,0.0724137931 1.25517241,0.206681034 C1.13297414,0.339439655 1.05603448,0.50237069 1.05603448,0.686422414 C1.05603448,0.98362069 1.05603448,1.28232759 1.05603448,1.57952586 C1.05603448,2.05474138 1.05603448,2.5299569 1.05603448,3.00366379 C1.05603448,3.11228448 1.05603448,3.22090517 1.05603448,3.33103448 C1.05603448,3.69762931 1.36681034,4.00991379 1.73491379,4.00991379 C2.03211207,4.00991379 2.33081897,4.00991379 2.62801724,4.00991379 C3.10323276,4.00991379 3.57844828,4.00991379 4.05215517,4.00991379 C4.16077586,4.00991379 4.26939655,4.00991379 4.37952586,4.00991379 C4.55301724,4.00991379 4.73706897,3.93448276 4.85926724,3.81077586 C4.97693966,3.69310345 5.06594828,3.5 5.05840517,3.33103448 C5.05086207,3.15603448 4.99353448,2.97349138 4.85926724,2.8512931 C4.72650862,2.72909483 4.56357759,2.65215517 4.37952586,2.65215517 L4.37952586,2.65215517 Z" id="Path"></path>
+                    <path d="M11.4821121,10.4230603 C11.4594828,10.4532328 11.4368534,10.4834052 11.4142241,10.512069 C11.4489224,10.4668103 11.4851293,10.4200431 11.5198276,10.3747845 C11.1864224,10.80625 10.7987069,11.1924569 10.3672414,11.5258621 C10.4125,11.4911638 10.4592672,11.4549569 10.5045259,11.4202586 C10.074569,11.7491379 9.60538793,12.0237069 9.1075431,12.2349138 C9.16185345,12.2122845 9.21616379,12.1896552 9.26896552,12.1670259 C8.7575431,12.38125 8.22198276,12.5275862 7.67284483,12.6030172 C7.73318966,12.5954741 7.79353448,12.5864224 7.85387931,12.5788793 C7.28512931,12.6543103 6.70883621,12.6543103 6.14159483,12.5788793 C6.20193966,12.5864224 6.26228448,12.5954741 6.32262931,12.6030172 C5.77801724,12.5275862 5.24547414,12.3827586 4.73706897,12.1700431 C4.79137931,12.1926724 4.84568966,12.2153017 4.89849138,12.237931 C4.39762931,12.0267241 3.92543103,11.7506466 3.4924569,11.4202586 C3.53771552,11.4549569 3.58448276,11.4911638 3.62974138,11.5258621 C3.19827586,11.1909483 2.80905172,10.8017241 2.47413793,10.36875 C2.50883621,10.4140086 2.5450431,10.4607759 2.57974138,10.5060345 C2.24784483,10.074569 1.97327586,9.60237069 1.76206897,9.1 C1.78469828,9.15431034 1.80732759,9.20862069 1.8299569,9.26142241 C1.61724138,8.75452586 1.47241379,8.22047414 1.39698276,7.67586207 C1.40452586,7.7362069 1.41357759,7.79655172 1.42112069,7.85689655 C1.38340517,7.57176724 1.3637931,7.28512931 1.3637931,6.99849138 C1.3637931,6.82349138 1.28836207,6.6424569 1.16465517,6.51875 C1.04698276,6.40107759 0.85387931,6.31206897 0.684913793,6.31961207 C0.509913793,6.32715517 0.32737069,6.38448276 0.205172414,6.51875 C0.0829741379,6.65150862 0.00603448276,6.81443966 0.00603448276,6.99849138 C0.00754310345,8.11939655 0.280603448,9.2237069 0.792025862,10.2193966 C1.04094828,10.7036638 1.35474138,11.1517241 1.70625,11.5650862 C2.05625,11.9769397 2.46056034,12.3329741 2.89353448,12.6543103 C3.28728448,12.9469828 3.71573276,13.1928879 4.16530172,13.3875 C4.67521552,13.60625 5.19568966,13.78125 5.74482759,13.8747845 C6.9487069,14.0814655 8.20237069,14.0030172 9.35344828,13.5806034 C10.4909483,13.1627155 11.5273707,12.4702586 12.3103448,11.5409483 C12.4295259,11.3991379 12.5426724,11.2528017 12.6528017,11.1049569 C12.7508621,10.9737069 12.762931,10.7323276 12.7206897,10.5814655 C12.6769397,10.424569 12.55625,10.2525862 12.4084052,10.1756466 C12.2515086,10.0926724 12.0599138,10.050431 11.8849138,10.1077586 C11.8306034,10.1303879 11.7762931,10.1530172 11.7234914,10.1756466 C11.6239224,10.2390086 11.5424569,10.3204741 11.4821121,10.4230603 L11.4821121,10.4230603 Z" id="Path"></path>
+                    <path d="M9.62047414,11.3478448 C9.91767241,11.3478448 10.2163793,11.3478448 10.5135776,11.3478448 C10.9887931,11.3478448 11.4640086,11.3478448 11.9377155,11.3478448 C12.0463362,11.3478448 12.1549569,11.3478448 12.2650862,11.3478448 C12.0387931,11.1215517 11.8125,10.8952586 11.5862069,10.6689655 C11.5862069,10.9661638 11.5862069,11.2648707 11.5862069,11.562069 C11.5862069,12.0372845 11.5862069,12.5125 11.5862069,12.9862069 C11.5862069,13.0948276 11.5862069,13.2034483 11.5862069,13.3135776 C11.5862069,13.487069 11.6616379,13.6711207 11.7853448,13.793319 C11.9030172,13.9109914 12.0961207,14 12.2650862,13.9924569 C12.4400862,13.9849138 12.6226293,13.9275862 12.7448276,13.793319 C12.8670259,13.6605603 12.9439655,13.4976293 12.9439655,13.3135776 C12.9439655,13.0163793 12.9439655,12.7176724 12.9439655,12.4204741 C12.9439655,11.9452586 12.9439655,11.4700431 12.9439655,10.9963362 C12.9439655,10.8877155 12.9439655,10.7790948 12.9439655,10.6689655 C12.9439655,10.3023707 12.6331897,9.99008621 12.2650862,9.99008621 C11.9678879,9.99008621 11.669181,9.99008621 11.3719828,9.99008621 C10.8967672,9.99008621 10.4215517,9.99008621 9.94784483,9.99008621 C9.83922414,9.99008621 9.73060345,9.99008621 9.62047414,9.99008621 C9.44698276,9.99008621 9.26293103,10.0655172 9.14073276,10.1892241 C9.02306034,10.3068966 8.93405172,10.5 8.94159483,10.6689655 C8.94913793,10.8439655 9.00646552,11.0265086 9.14073276,11.1487069 C9.27349138,11.2709052 9.43642241,11.3478448 9.62047414,11.3478448 L9.62047414,11.3478448 Z" id="Path"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 9fe730e701..4d26116a33 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -5,7 +5,7 @@ a {
   color: $blue-link-colour;
   text-decoration: underline;
   &:active,
-  &:focus:not(.btn-default) {
+  &:focus:not(.btn-default, [role=tab]) {
     outline: none !important;
     text-decoration: none !important;
     border-bottom-color: $black !important;
diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 227771b723..e27ff4aa58 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -84,7 +84,7 @@
     border: none;
     border-radius: 0;
     background: $black-header;
-    
+
     .lte-ie7 & {
       height: 81px !important;
       z-index: 100001 !important;
@@ -105,6 +105,7 @@
       color: $white-true;
       text-transform: uppercase;
       background: transparent;
+      text-decoration: none;
 
       @include screen-md-max {
         padding-right: 8px;
@@ -250,7 +251,7 @@
       background-color: $header-hover !important;
     }
   }
-  
+
   // moving down here seems to make it work
   .navbar-brand {
     padding-top: 14px;
diff --git a/app/assets/stylesheets/admin/page-dashboard.scss b/app/assets/stylesheets/admin/page-dashboard.scss
index bab4e9febd..5b3ac884eb 100644
--- a/app/assets/stylesheets/admin/page-dashboard.scss
+++ b/app/assets/stylesheets/admin/page-dashboard.scss
@@ -108,20 +108,39 @@
       opacity: 0.7;
     }
 
-    &.btn--load:before {
-      background-image: image-url("icon_load.svg");
+    &.btn--load {
+
+      &:before {
+        background-image: image-url("icon_load.svg");
+      }
+
+      &:focus:before {
+        background-image: image-url("icon_load_black.svg");
+      }
     }
 
-    &.btn--reload:before {
-      background-image: image-url("icon_update.svg");
+    &.btn--reload {
+      &:before {
+        background-image: image-url("icon_update.svg");
+      }
+
+      &:focus:before {
+        background-image: image-url("icon_update_black.svg");
+      }
     }
 
-    &.btn--loading:before {
-      background-image: image-url("icon_loading.svg");
-      background-size: 1.15em auto;
-      width: 1.2em;
-      height: 1.5em;
-      top: 7px;
+    &.btn--loading {
+      &:before {
+        background-image: image-url("icon_loading.svg");
+        background-size: 1.15em auto;
+        width: 1.2em;
+        height: 1.5em;
+        top: 7px;
+      }
+
+      &:focus:before {
+        background-image: image-url("icon_loading_black.svg");
+      }
     }
   }
 }

From 766869d030231b907bfa45e7b3989ad27ec2e9b6 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 10:59:46 -0300
Subject: [PATCH 102/352] Increase spacing between elements within sidebar
 section

---
 app/views/admin/form_answers/_section_documents.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index 35e7320c3a..b00e569cce 100644
--- a/app/views/admin/form_answers/_section_documents.html.slim
+++ b/app/views/admin/form_answers/_section_documents.html.slim
@@ -22,7 +22,7 @@
     = render "admin/form_answers/docs/application_and_supporting_docs"
 
 .well
-  .sidebar-section
+  .sidebar-section.space-y-2
     h2
       ' Post Shortlisting Docs
 

From 35fc27b0f51164651da3ee2730087ac73b0abc89 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 11:41:33 -0300
Subject: [PATCH 103/352] Add missing translation strings + log creating
 attachment

---
 app/controllers/concerns/audit_certificate_context.rb | 11 +++++++++++
 config/locales/en.yml                                 |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/controllers/concerns/audit_certificate_context.rb b/app/controllers/concerns/audit_certificate_context.rb
index 45a1a1d4c0..ab858e2064 100644
--- a/app/controllers/concerns/audit_certificate_context.rb
+++ b/app/controllers/concerns/audit_certificate_context.rb
@@ -10,6 +10,8 @@ def create
     audit_certificate = form_answer.build_audit_certificate(audit_certificate_params)
 
     if saved = audit_certificate.save
+      log_event
+
       if form_answer.assessors.primary.present?
         Assessors::GeneralMailer.audit_certificate_uploaded(form_answer.id).deliver_later!
       end
@@ -46,6 +48,15 @@ def create
 
   private
 
+  def action_type
+    case action_name
+    when "create"
+      "audit_certificate_uploaded"
+    else
+      raise "Attempted to log an unsupported action (#{action_name})"
+    end
+  end
+
   def resource
     @audit_certificate ||= form_answer.audit_certificate
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6cf5e34d57..93eb8956ad 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -289,7 +289,9 @@ en:
       audit_certificate_destroyed: "removed External Accountant's Report form"
       actual_figures_file_uploaded: "uploaded actual figures"
       actual_figures_file_destroyed: "removed actual figures"
-      vat_returns_file_uploaded: "upload VAT returns"
+      commercial_figures_file_uploaded: "uploaded Variance explanation document"
+      commercial_figures_file_destroyed: "removed Variance explanation document"
+      vat_returns_file_uploaded: "uploaded VAT returns"
       vat_returns_file_destroyed: "removed VAT returns"
       palace_attendee_update: "updated Buckingham Palace attendee details"
       palace_attendee_submit: "confirmed Buckingham Palace attendee details"

From d8cc3a0d88af3309261140a6025fd7c1eaf1d6ae Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 11:42:57 -0300
Subject: [PATCH 104/352] Fix file scan method reference

---
 app/views/admin/figures_and_vat_returns/_file.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/figures_and_vat_returns/_file.html.slim b/app/views/admin/figures_and_vat_returns/_file.html.slim
index ece2d3a722..573d9f6d8d 100644
--- a/app/views/admin/figures_and_vat_returns/_file.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_file.html.slim
@@ -17,7 +17,7 @@
         span.glyphicon.glyphicon-file
         = attachment.original_filename
 
-    - elsif attachment.file_scan_results.to_s == "infected"
+    - elsif attachment.attachment_scan_results.to_s == "infected"
       span.glyphicon.glyphicon-file
       = "Failed virus scanner check (#{attachment.original_filename})"
 

From 29d140a14c3e0ed7ef49456e1087772d82fcbf15 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:45:34 -0300
Subject: [PATCH 105/352] Include GDS autocomplete in the asset pipeline

---
 app/assets/javascripts/application-admin.js.coffee | 1 +
 app/assets/stylesheets/application-admin.scss      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/assets/javascripts/application-admin.js.coffee b/app/assets/javascripts/application-admin.js.coffee
index db0728c9e7..c189de2138 100644
--- a/app/assets/javascripts/application-admin.js.coffee
+++ b/app/assets/javascripts/application-admin.js.coffee
@@ -1,6 +1,7 @@
 #= require jquery
 #= require jquery_ujs
 #= require bootstrap-sprockets
+#= require vendor/accessible-autocomplete.min
 #= require vendor/file_upload/jquery.ui.widget
 #= require vendor/file_upload/jquery.iframe-transport
 #= require vendor/file_upload/jquery.fileupload
diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index 2116659e06..c421852419 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -1,5 +1,6 @@
 /*
  *= require_self
+ *= require accessible-autocomplete
  *= require jquery-ui
  *= require select2.min
  */

From f4bea196aff424132ea2321cd4ef7c53134ed545 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:46:25 -0300
Subject: [PATCH 106/352] Use GDS autocomplete as Select2 replacement

---
 .../javascripts/admin/form_answers.js.coffee      | 13 ++++++++++---
 .../form_answers/_assessors_section.html.slim     | 15 +++++++++------
 .../company_details/_sic_form.html.slim           |  2 +-
 .../form_answers/_bulk_assignment.html.slim       |  8 ++++----
 4 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 783f866051..fd7492260f 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -86,9 +86,16 @@ ready = ->
       stateToggle = $(".section-applicant-status .dropdown-toggle")
       stateToggle.replaceWith("<p class='p-lg'>"+stateToggle.text()+"</p>")
 
-  $(".section-applicant-users .edit_assessor_assignment select").select2()
-  $("#new_assessor_assignment_collection select").select2()
-  $(".bulk-assign-assessors-form select").select2()
+  $('.custom-select').each ->
+    field = $(this)[0]
+    if $(this).is(':disabled') or $(this).is('[readonly]')
+      return
+    accessibleAutocomplete.enhanceSelectElement
+      selectElement: field
+      showAllValues: true
+      dropdownArrow: ->
+        '<span class=\'autocomplete__arrow\'></span>'
+    return
 
   $(".section-applicant-users form").on "ajax:success", (e, data, status, xhr) ->
     form = $(this)
diff --git a/app/views/admin/form_answers/_assessors_section.html.slim b/app/views/admin/form_answers/_assessors_section.html.slim
index 0e6d1e7747..ea5aaf0a12 100644
--- a/app/views/admin/form_answers/_assessors_section.html.slim
+++ b/app/views/admin/form_answers/_assessors_section.html.slim
@@ -13,7 +13,7 @@
       .clear
 
     li.form-group.primary-assessor-assignment
-      label
+      label[for='assessor_assignment_primary_assessor_id']
         ' Primary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
         - if resource.assessors.primary.present?
@@ -31,8 +31,9 @@
           .form-fields
             = form.select :assessor_id,
                           available_assessors_for_select,
-                          { include_blank: true },
-                          id: 'assessor_assignment_primary_assessor_id'
+                          { include_blank: 'Select primary assessor…' },
+                          id: 'assessor_assignment_primary_assessor_id',
+                          class: 'form-control custom-select'
 
           = link_to "#", class: "form-edit-link"
             span.glyphicon.glyphicon-pencil
@@ -46,7 +47,7 @@
       .clear
 
     li.form-group.secondary-assessor-assignment
-      label
+      label[for='assessor_assignment_secondary_assessor_id']
         span.assessor-label Secondary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
         - if resource.assessors.secondary.present?
@@ -64,8 +65,10 @@
           .form-fields
             = form.select :assessor_id,
                           available_assessors_for_select,
-                          { include_blank: true },
-                          id: 'assessor_assignment_secondary_assessor_id'
+                          { include_blank: 'Select secondary assessor…' },
+                          id: 'assessor_assignment_secondary_assessor_id',
+                          class: 'form-control custom-select'
+
           = link_to "#", class: "form-edit-link"
             span.glyphicon.glyphicon-pencil
             ' Edit
diff --git a/app/views/admin/form_answers/company_details/_sic_form.html.slim b/app/views/admin/form_answers/company_details/_sic_form.html.slim
index 056fef66c9..2b4df5ec79 100644
--- a/app/views/admin/form_answers/company_details/_sic_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_sic_form.html.slim
@@ -23,7 +23,7 @@
           .form-fields.form-block
             = f.input :sic_code,
                       wrapper_html: { class: "form-group" },
-                      input_html: { class: "form-control select2" },
+                      input_html: { class: "form-control custom-select" },
                       as: :select,
                       collection: SICCode.collection,
                       include_blank: false,
diff --git a/app/views/assessor/form_answers/_bulk_assignment.html.slim b/app/views/assessor/form_answers/_bulk_assignment.html.slim
index 54c08e45c0..d04f8915ed 100644
--- a/app/views/assessor/form_answers/_bulk_assignment.html.slim
+++ b/app/views/assessor/form_answers/_bulk_assignment.html.slim
@@ -16,15 +16,15 @@
               = f.label :primary_assessor_id, "Assign Primary Assessor to these applications", class: "control-label"
               = f.select :primary_assessor_id,
                          assessors_collection_for_bulk,
-                         { include_blank: true },
-                         class: "form-control"
+                         { include_blank: 'Select primary assessor…' },
+                         class: "form-control custom-select"
 
             .input.select.form-group.secondary-assessor-group
               = f.label :secondary_assessor_id, "Assign Secondary Assessor to these applications", class: "control-label"
               = f.select :secondary_assessor_id,
                          assessors_collection_for_bulk,
-                         { include_blank: true },
-                         class: "form-control"
+                         { include_blank: 'Select secondary assessor…' },
+                         class: "form-control custom-select"
             = f.label :form_answer_ids, class: "if-js-hide visuallyhidden"
             = f.text_field :form_answer_ids, class: "if-js-hide visuallyhidden"
 

From 0ed311e3d4b16aa8d7c8e11784a89c8ad43b7c74 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 17:47:49 -0300
Subject: [PATCH 107/352] Rename `select2` file reference

---
 ...tion.html.slim => _autocomplete_dropdown_question.html.slim} | 0
 app/views/qae_form/_sic_code_dropdown_question.html.slim        | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename app/views/qae_form/{_select2_dropdown_question.html.slim => _autocomplete_dropdown_question.html.slim} (100%)

diff --git a/app/views/qae_form/_select2_dropdown_question.html.slim b/app/views/qae_form/_autocomplete_dropdown_question.html.slim
similarity index 100%
rename from app/views/qae_form/_select2_dropdown_question.html.slim
rename to app/views/qae_form/_autocomplete_dropdown_question.html.slim
diff --git a/app/views/qae_form/_sic_code_dropdown_question.html.slim b/app/views/qae_form/_sic_code_dropdown_question.html.slim
index 375b3d298f..3c8d904d84 100644
--- a/app/views/qae_form/_sic_code_dropdown_question.html.slim
+++ b/app/views/qae_form/_sic_code_dropdown_question.html.slim
@@ -1 +1 @@
-= render "qae_form/select2_dropdown_question", question: question, placeholder: "Select SIC code"
+= render "qae_form/autocomplete_dropdown_question", question: question, placeholder: "Select SIC code"

From 724db666c77ee99cc25b7d6b0d2637ab692842c8 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 18:09:23 -0300
Subject: [PATCH 108/352] Fix specs - use GDS autocomplete

---
 .../assessor/bulk_assessors_assignment_spec.rb         | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/spec/features/assessor/bulk_assessors_assignment_spec.rb b/spec/features/assessor/bulk_assessors_assignment_spec.rb
index aac84af804..821242e806 100644
--- a/spec/features/assessor/bulk_assessors_assignment_spec.rb
+++ b/spec/features/assessor/bulk_assessors_assignment_spec.rb
@@ -41,7 +41,7 @@
 
       open_primary_select
 
-      all(".select2-results__options li")[3].click
+      all(".autocomplete__menu li")[3].click
 
       within ".bulk-assign-assessors-form" do
         click_button "Assign"
@@ -62,9 +62,9 @@
       find(".btn", text: "Bulk Assign Assessors").click
 
       open_primary_select
-      all(".select2-results__options li")[2].click
+      all(".autocomplete__menu li")[2].click
       open_secondary_select
-      all(".select2-results__options li")[3].click
+      all(".autocomplete__menu li")[3].click
 
       within ".bulk-assign-assessors-form" do
         click_button "Assign"
@@ -80,9 +80,9 @@
 end
 
 def open_primary_select
-  page.execute_script("$('#assessor_assignment_collection_primary_assessor_id').select2('open');")
+  page.execute_script("$('#assessor_assignment_collection_primary_assessor_id').click();")
 end
 
 def open_secondary_select
-  page.execute_script("$('#assessor_assignment_collection_secondary_assessor_id').select2('open');")
+  page.execute_script("$('#assessor_assignment_collection_secondary_assessor_id').click();")
 end

From 4bf72db3f5206ff54b4ec4334581d4d094b198a3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 18:09:35 -0300
Subject: [PATCH 109/352] Remove `select2` library

---
 .../javascripts/application-admin.js.coffee   |  4 ---
 .../frontend/select2_dropdowns.js.coffee      |  4 ---
 app/assets/stylesheets/admin/base.scss        |  4 ---
 app/assets/stylesheets/admin/forms.scss       |  2 +-
 .../stylesheets/admin/page-applications.scss  |  8 ------
 app/assets/stylesheets/application-admin.scss |  1 -
 app/assets/stylesheets/frontend/forms.scss    | 26 +------------------
 vendor/assets/javascripts/select2.full.min.js |  2 --
 vendor/assets/stylesheets/select2.min.css     |  1 -
 9 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 app/assets/javascripts/frontend/select2_dropdowns.js.coffee
 delete mode 100755 vendor/assets/javascripts/select2.full.min.js
 delete mode 100755 vendor/assets/stylesheets/select2.min.css

diff --git a/app/assets/javascripts/application-admin.js.coffee b/app/assets/javascripts/application-admin.js.coffee
index c189de2138..6011afb7b2 100644
--- a/app/assets/javascripts/application-admin.js.coffee
+++ b/app/assets/javascripts/application-admin.js.coffee
@@ -7,7 +7,6 @@
 #= require vendor/file_upload/jquery.fileupload
 #= require vendor/file_upload/jquery.fileupload-process
 #= require vendor/file_upload/jquery.fileupload-validate
-#= require select2.full.min
 #= require Countable
 
 # crypt.io: secures browser storage with the SJCL crypto library
@@ -30,7 +29,4 @@ $(document).ready(() ->
   $("html").removeClass("no-js").addClass("js")
   ($ ".timepicker").timePicker()
   ($ ".datepicker").datepicker({dateFormat: "dd/mm/yy"})
-  ($ "select.select2").select2({width: "style"})
-  $("#assessor_assignment_collection_primary_assessor_id").next("span").find("span.select2-selection--single").attr("title", "Select a primary assessor")
-  $("#assessor_assignment_collection_secondary_assessor_id").next("span").find("span.select2-selection--single").attr("title", "Select a secondary assessor")
 )
diff --git a/app/assets/javascripts/frontend/select2_dropdowns.js.coffee b/app/assets/javascripts/frontend/select2_dropdowns.js.coffee
deleted file mode 100644
index dfb520871d..0000000000
--- a/app/assets/javascripts/frontend/select2_dropdowns.js.coffee
+++ /dev/null
@@ -1,4 +0,0 @@
-window.Select2Dropdowns =
-  init: ->
-    if $(".select2").length
-      $(".select2").select2()
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index b316c675b4..1bbe32c8b5 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -470,10 +470,6 @@ table .ellipsis {
   }
 }
 
-.select2-container {
-  width: 100%;
-}
-
 .well {
   background-color: $white-true;
   box-shadow: none;
diff --git a/app/assets/stylesheets/admin/forms.scss b/app/assets/stylesheets/admin/forms.scss
index e00f5eeb03..cdc5037979 100644
--- a/app/assets/stylesheets/admin/forms.scss
+++ b/app/assets/stylesheets/admin/forms.scss
@@ -14,7 +14,7 @@
 
 input.form-control, select.form-control,
 .input-group-addon, textarea,
-.btn-default, .select2-selection {
+.btn-default {
   border-color: #5C5C5C !important;
 }
 
diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index ad97f3ac51..4b2fb6d422 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -538,10 +538,6 @@
     }
   }
 
-  .select2-container {
-    width: 100% !important;
-  }
-
   .form-edit-link {
     position: absolute;
     top: 0;
@@ -647,10 +643,6 @@
     margin-left: 10px;
   }
 
-  .select2-container {
-    width: 100% !important;
-  }
-
   .well {
     margin-bottom: 0;
   }
diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index c421852419..1a4466fc73 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -2,7 +2,6 @@
  *= require_self
  *= require accessible-autocomplete
  *= require jquery-ui
- *= require select2.min
  */
 
 // Bootstrap
diff --git a/app/assets/stylesheets/frontend/forms.scss b/app/assets/stylesheets/frontend/forms.scss
index dc2ba963d3..fc7729529f 100644
--- a/app/assets/stylesheets/frontend/forms.scss
+++ b/app/assets/stylesheets/frontend/forms.scss
@@ -792,30 +792,6 @@ input[type="file"] {
   }
 }
 
-// Select2 dropdowns
-.select2-container {
-  min-width: 14em;
-  width: auto !important;
-  max-width: 100%;
-
-  .select2-selection__rendered {
-    font-size: 14px;
-    white-space: normal !important;
-    overflow: hidden;
-    height: 28px;
-  }
-
-  .select2-search__field {
-    width: 100%;
-    margin: 0;
-    outline: none;
-
-    &:focus {
-      outline: none;
-    }
-  }
-}
-
 // Error styling
 .errors-box {
   padding: $gutter-half $gutter-two-thirds;
@@ -1029,7 +1005,7 @@ input[type="file"] {
 
 // Used or NON JS cases - end
 
-select.js-trigger-autosave.select2.sic_code-selector {
+select.js-trigger-autosave.custom-select.sic_code-selector {
   max-width: 650px;
 }
 
diff --git a/vendor/assets/javascripts/select2.full.min.js b/vendor/assets/javascripts/select2.full.min.js
deleted file mode 100755
index dbb4325052..0000000000
--- a/vendor/assets/javascripts/select2.full.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! Select2 4.1.0-rc.0 | https://github.com/select2/select2/blob/master/LICENSE.md */
-!function(n){"function"==typeof define&&define.amd?define(["jquery"],n):"object"==typeof module&&module.exports?module.exports=function(e,t){return void 0===t&&(t="undefined"!=typeof window?require("jquery"):require("jquery")(e)),n(t),t}:n(jQuery)}(function(t){var e,n,p,o,r,h,f,g,m,v,y,s,i,_,a,a=(t&&t.fn&&t.fn.select2&&t.fn.select2.amd&&(u=t.fn.select2.amd),u&&u.requirejs||(u?n=u:u={},g={},m={},v={},y={},s=Object.prototype.hasOwnProperty,i=[].slice,_=/\.js$/,h=function(e,t){var n,s,i=c(e),o=i[0],t=t[1];return e=i[1],o&&(n=x(o=l(o,t))),o?e=n&&n.normalize?n.normalize(e,(s=t,function(e){return l(e,s)})):l(e,t):(o=(i=c(e=l(e,t)))[0],e=i[1],o&&(n=x(o))),{f:o?o+"!"+e:e,n:e,pr:o,p:n}},f={require:function(e){return w(e)},exports:function(e){var t=g[e];return void 0!==t?t:g[e]={}},module:function(e){return{id:e,uri:"",exports:g[e],config:(t=e,function(){return v&&v.config&&v.config[t]||{}})};var t}},o=function(e,t,n,s){var i,o,r,a,l,c=[],u=typeof n,d=A(s=s||e);if("undefined"==u||"function"==u){for(t=!t.length&&n.length?["require","exports","module"]:t,a=0;a<t.length;a+=1)if("require"===(o=(r=h(t[a],d)).f))c[a]=f.require(e);else if("exports"===o)c[a]=f.exports(e),l=!0;else if("module"===o)i=c[a]=f.module(e);else if(b(g,o)||b(m,o)||b(y,o))c[a]=x(o);else{if(!r.p)throw new Error(e+" missing "+o);r.p.load(r.n,w(s,!0),function(t){return function(e){g[t]=e}}(o),{}),c[a]=g[o]}u=n?n.apply(g[e],c):void 0,e&&(i&&i.exports!==p&&i.exports!==g[e]?g[e]=i.exports:u===p&&l||(g[e]=u))}else e&&(g[e]=n)},e=n=r=function(e,t,n,s,i){if("string"==typeof e)return f[e]?f[e](t):x(h(e,A(t)).f);if(!e.splice){if((v=e).deps&&r(v.deps,v.callback),!t)return;t.splice?(e=t,t=n,n=null):e=p}return t=t||function(){},"function"==typeof n&&(n=s,s=i),s?o(p,e,t,n):setTimeout(function(){o(p,e,t,n)},4),r},r.config=function(e){return r(e)},e._defined=g,(a=function(e,t,n){if("string"!=typeof e)throw new Error("See almond README: incorrect module build, no module name");t.splice||(n=t,t=[]),b(g,e)||b(m,e)||(m[e]=[e,t,n])}).amd={jQuery:!0},u.requirejs=e,u.require=n,u.define=a),u.define("almond",function(){}),u.define("jquery",[],function(){var e=t||$;return null==e&&console&&console.error&&console.error("Select2: An instance of jQuery or a jQuery-compatible library was not found. Make sure that you are including jQuery before Select2 on your web page."),e}),u.define("select2/utils",["jquery"],function(o){var s={};function c(e){var t,n=e.prototype,s=[];for(t in n)"function"==typeof n[t]&&"constructor"!==t&&s.push(t);return s}s.Extend=function(e,t){var n,s={}.hasOwnProperty;function i(){this.constructor=e}for(n in t)s.call(t,n)&&(e[n]=t[n]);return i.prototype=t.prototype,e.prototype=new i,e.__super__=t.prototype,e},s.Decorate=function(s,i){var e=c(i),t=c(s);function o(){var e=Array.prototype.unshift,t=i.prototype.constructor.length,n=s.prototype.constructor;0<t&&(e.call(arguments,s.prototype.constructor),n=i.prototype.constructor),n.apply(this,arguments)}i.displayName=s.displayName,o.prototype=new function(){this.constructor=o};for(var n=0;n<t.length;n++){var r=t[n];o.prototype[r]=s.prototype[r]}for(var a=0;a<e.length;a++){var l=e[a];o.prototype[l]=function(e){var t=function(){};e in o.prototype&&(t=o.prototype[e]);var n=i.prototype[e];return function(){return Array.prototype.unshift.call(arguments,t),n.apply(this,arguments)}}(l)}return o};function e(){this.listeners={}}e.prototype.on=function(e,t){this.listeners=this.listeners||{},e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t]},e.prototype.trigger=function(e){var t=Array.prototype.slice,n=t.call(arguments,1);this.listeners=this.listeners||{},null==n&&(n=[]),0===n.length&&n.push({}),(n[0]._type=e)in this.listeners&&this.invoke(this.listeners[e],t.call(arguments,1)),"*"in this.listeners&&this.invoke(this.listeners["*"],arguments)},e.prototype.invoke=function(e,t){for(var n=0,s=e.length;n<s;n++)e[n].apply(this,t)},s.Observable=e,s.generateChars=function(e){for(var t="",n=0;n<e;n++)t+=Math.floor(36*Math.random()).toString(36);return t},s.bind=function(e,t){return function(){e.apply(t,arguments)}},s._convertData=function(e){for(var t in e){var n=t.split("-"),s=e;if(1!==n.length){for(var i=0;i<n.length;i++){var o=n[i];(o=o.substring(0,1).toLowerCase()+o.substring(1))in s||(s[o]={}),i==n.length-1&&(s[o]=e[t]),s=s[o]}delete e[t]}}return e},s.hasScroll=function(e,t){var n=o(t),s=t.style.overflowX,i=t.style.overflowY;return(s!==i||"hidden"!==i&&"visible"!==i)&&("scroll"===s||"scroll"===i||(n.innerHeight()<t.scrollHeight||n.innerWidth()<t.scrollWidth))},s.escapeMarkup=function(e){var t={"\\":"&#92;","&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#39;","/":"&#47;"};return"string"!=typeof e?e:String(e).replace(/[&<>"'\/\\]/g,function(e){return t[e]})},s.__cache={};var n=0;return s.GetUniqueElementId=function(e){var t=e.getAttribute("data-select2-id");return null!=t||(t=e.id?"select2-data-"+e.id:"select2-data-"+(++n).toString()+"-"+s.generateChars(4),e.setAttribute("data-select2-id",t)),t},s.StoreData=function(e,t,n){e=s.GetUniqueElementId(e);s.__cache[e]||(s.__cache[e]={}),s.__cache[e][t]=n},s.GetData=function(e,t){var n=s.GetUniqueElementId(e);return t?s.__cache[n]&&null!=s.__cache[n][t]?s.__cache[n][t]:o(e).data(t):s.__cache[n]},s.RemoveData=function(e){var t=s.GetUniqueElementId(e);null!=s.__cache[t]&&delete s.__cache[t],e.removeAttribute("data-select2-id")},s.copyNonInternalCssClasses=function(e,t){var n=(n=e.getAttribute("class").trim().split(/\s+/)).filter(function(e){return 0===e.indexOf("select2-")}),t=(t=t.getAttribute("class").trim().split(/\s+/)).filter(function(e){return 0!==e.indexOf("select2-")}),t=n.concat(t);e.setAttribute("class",t.join(" "))},s}),u.define("select2/results",["jquery","./utils"],function(d,p){function s(e,t,n){this.$element=e,this.data=n,this.options=t,s.__super__.constructor.call(this)}return p.Extend(s,p.Observable),s.prototype.render=function(){var e=d('<ul class="select2-results__options" role="listbox"></ul>');return this.options.get("multiple")&&e.attr("aria-multiselectable","true"),this.$results=e},s.prototype.clear=function(){this.$results.empty()},s.prototype.displayMessage=function(e){var t=this.options.get("escapeMarkup");this.clear(),this.hideLoading();var n=d('<li role="alert" aria-live="assertive" class="select2-results__option"></li>'),s=this.options.get("translations").get(e.message);n.append(t(s(e.args))),n[0].className+=" select2-results__message",this.$results.append(n)},s.prototype.hideMessages=function(){this.$results.find(".select2-results__message").remove()},s.prototype.append=function(e){this.hideLoading();var t=[];if(null!=e.results&&0!==e.results.length){e.results=this.sort(e.results);for(var n=0;n<e.results.length;n++){var s=e.results[n],s=this.option(s);t.push(s)}this.$results.append(t)}else 0===this.$results.children().length&&this.trigger("results:message",{message:"noResults"})},s.prototype.position=function(e,t){t.find(".select2-results").append(e)},s.prototype.sort=function(e){return this.options.get("sorter")(e)},s.prototype.highlightFirstItem=function(){var e=this.$results.find(".select2-results__option--selectable"),t=e.filter(".select2-results__option--selected");(0<t.length?t:e).first().trigger("mouseenter"),this.ensureHighlightVisible()},s.prototype.setClasses=function(){var t=this;this.data.current(function(e){var s=e.map(function(e){return e.id.toString()});t.$results.find(".select2-results__option--selectable").each(function(){var e=d(this),t=p.GetData(this,"data"),n=""+t.id;null!=t.element&&t.element.selected||null==t.element&&-1<s.indexOf(n)?(this.classList.add("select2-results__option--selected"),e.attr("aria-selected","true")):(this.classList.remove("select2-results__option--selected"),e.attr("aria-selected","false"))})})},s.prototype.showLoading=function(e){this.hideLoading();e={disabled:!0,loading:!0,text:this.options.get("translations").get("searching")(e)},e=this.option(e);e.className+=" loading-results",this.$results.prepend(e)},s.prototype.hideLoading=function(){this.$results.find(".loading-results").remove()},s.prototype.option=function(e){var t=document.createElement("li");t.classList.add("select2-results__option"),t.classList.add("select2-results__option--selectable");var n,s={role:"option"},i=window.Element.prototype.matches||window.Element.prototype.msMatchesSelector||window.Element.prototype.webkitMatchesSelector;for(n in(null!=e.element&&i.call(e.element,":disabled")||null==e.element&&e.disabled)&&(s["aria-disabled"]="true",t.classList.remove("select2-results__option--selectable"),t.classList.add("select2-results__option--disabled")),null==e.id&&t.classList.remove("select2-results__option--selectable"),null!=e._resultId&&(t.id=e._resultId),e.title&&(t.title=e.title),e.children&&(s.role="group",s["aria-label"]=e.text,t.classList.remove("select2-results__option--selectable"),t.classList.add("select2-results__option--group")),s){var o=s[n];t.setAttribute(n,o)}if(e.children){var r=d(t),a=document.createElement("strong");a.className="select2-results__group",this.template(e,a);for(var l=[],c=0;c<e.children.length;c++){var u=e.children[c],u=this.option(u);l.push(u)}i=d("<ul></ul>",{class:"select2-results__options select2-results__options--nested",role:"none"});i.append(l),r.append(a),r.append(i)}else this.template(e,t);return p.StoreData(t,"data",e),t},s.prototype.bind=function(t,e){var i=this,n=t.id+"-results";this.$results.attr("id",n),t.on("results:all",function(e){i.clear(),i.append(e.data),t.isOpen()&&(i.setClasses(),i.highlightFirstItem())}),t.on("results:append",function(e){i.append(e.data),t.isOpen()&&i.setClasses()}),t.on("query",function(e){i.hideMessages(),i.showLoading(e)}),t.on("select",function(){t.isOpen()&&(i.setClasses(),i.options.get("scrollAfterSelect")&&i.highlightFirstItem())}),t.on("unselect",function(){t.isOpen()&&(i.setClasses(),i.options.get("scrollAfterSelect")&&i.highlightFirstItem())}),t.on("open",function(){i.$results.attr("aria-expanded","true"),i.$results.attr("aria-hidden","false"),i.setClasses(),i.ensureHighlightVisible()}),t.on("close",function(){i.$results.attr("aria-expanded","false"),i.$results.attr("aria-hidden","true"),i.$results.removeAttr("aria-activedescendant")}),t.on("results:toggle",function(){var e=i.getHighlightedResults();0!==e.length&&e.trigger("mouseup")}),t.on("results:select",function(){var e,t=i.getHighlightedResults();0!==t.length&&(e=p.GetData(t[0],"data"),t.hasClass("select2-results__option--selected")?i.trigger("close",{}):i.trigger("select",{data:e}))}),t.on("results:previous",function(){var e,t=i.getHighlightedResults(),n=i.$results.find(".select2-results__option--selectable"),s=n.index(t);s<=0||(e=s-1,0===t.length&&(e=0),(s=n.eq(e)).trigger("mouseenter"),t=i.$results.offset().top,n=s.offset().top,s=i.$results.scrollTop()+(n-t),0===e?i.$results.scrollTop(0):n-t<0&&i.$results.scrollTop(s))}),t.on("results:next",function(){var e,t=i.getHighlightedResults(),n=i.$results.find(".select2-results__option--selectable"),s=n.index(t)+1;s>=n.length||((e=n.eq(s)).trigger("mouseenter"),t=i.$results.offset().top+i.$results.outerHeight(!1),n=e.offset().top+e.outerHeight(!1),e=i.$results.scrollTop()+n-t,0===s?i.$results.scrollTop(0):t<n&&i.$results.scrollTop(e))}),t.on("results:focus",function(e){e.element[0].classList.add("select2-results__option--highlighted"),e.element[0].setAttribute("aria-selected","true")}),t.on("results:message",function(e){i.displayMessage(e)}),d.fn.mousewheel&&this.$results.on("mousewheel",function(e){var t=i.$results.scrollTop(),n=i.$results.get(0).scrollHeight-t+e.deltaY,t=0<e.deltaY&&t-e.deltaY<=0,n=e.deltaY<0&&n<=i.$results.height();t?(i.$results.scrollTop(0),e.preventDefault(),e.stopPropagation()):n&&(i.$results.scrollTop(i.$results.get(0).scrollHeight-i.$results.height()),e.preventDefault(),e.stopPropagation())}),this.$results.on("mouseup",".select2-results__option--selectable",function(e){var t=d(this),n=p.GetData(this,"data");t.hasClass("select2-results__option--selected")?i.options.get("multiple")?i.trigger("unselect",{originalEvent:e,data:n}):i.trigger("close",{}):i.trigger("select",{originalEvent:e,data:n})}),this.$results.on("mouseenter",".select2-results__option--selectable",function(e){var t=p.GetData(this,"data");i.getHighlightedResults().removeClass("select2-results__option--highlighted").attr("aria-selected","false"),i.trigger("results:focus",{data:t,element:d(this)})})},s.prototype.getHighlightedResults=function(){return this.$results.find(".select2-results__option--highlighted")},s.prototype.destroy=function(){this.$results.remove()},s.prototype.ensureHighlightVisible=function(){var e,t,n,s,i=this.getHighlightedResults();0!==i.length&&(e=this.$results.find(".select2-results__option--selectable").index(i),s=this.$results.offset().top,t=i.offset().top,n=this.$results.scrollTop()+(t-s),s=t-s,n-=2*i.outerHeight(!1),e<=2?this.$results.scrollTop(0):(s>this.$results.outerHeight()||s<0)&&this.$results.scrollTop(n))},s.prototype.template=function(e,t){var n=this.options.get("templateResult"),s=this.options.get("escapeMarkup"),e=n(e,t);null==e?t.style.display="none":"string"==typeof e?t.innerHTML=s(e):d(t).append(e)},s}),u.define("select2/keys",[],function(){return{BACKSPACE:8,TAB:9,ENTER:13,SHIFT:16,CTRL:17,ALT:18,ESC:27,SPACE:32,PAGE_UP:33,PAGE_DOWN:34,END:35,HOME:36,LEFT:37,UP:38,RIGHT:39,DOWN:40,DELETE:46}}),u.define("select2/selection/base",["jquery","../utils","../keys"],function(n,s,i){function o(e,t){this.$element=e,this.options=t,o.__super__.constructor.call(this)}return s.Extend(o,s.Observable),o.prototype.render=function(){var e=n('<span class="select2-selection" role="combobox"  aria-haspopup="true" aria-expanded="false"></span>');return this._tabindex=0,null!=s.GetData(this.$element[0],"old-tabindex")?this._tabindex=s.GetData(this.$element[0],"old-tabindex"):null!=this.$element.attr("tabindex")&&(this._tabindex=this.$element.attr("tabindex")),e.attr("title",this.$element.attr("title")),e.attr("tabindex",this._tabindex),e.attr("aria-disabled","false"),this.$selection=e},o.prototype.bind=function(e,t){var n=this,s=e.id+"-results";this.container=e,this.$selection.on("focus",function(e){n.trigger("focus",e)}),this.$selection.on("blur",function(e){n._handleBlur(e)}),this.$selection.on("keydown",function(e){n.trigger("keypress",e),e.which===i.SPACE&&e.preventDefault()}),e.on("results:focus",function(e){n.$selection.attr("aria-activedescendant",e.data._resultId)}),e.on("selection:update",function(e){n.update(e.data)}),e.on("open",function(){n.$selection.attr("aria-expanded","true"),n.$selection.attr("aria-owns",s),n._attachCloseHandler(e)}),e.on("close",function(){n.$selection.attr("aria-expanded","false"),n.$selection.removeAttr("aria-activedescendant"),n.$selection.removeAttr("aria-owns"),n.$selection.trigger("focus"),n._detachCloseHandler(e)}),e.on("enable",function(){n.$selection.attr("tabindex",n._tabindex),n.$selection.attr("aria-disabled","false")}),e.on("disable",function(){n.$selection.attr("tabindex","-1"),n.$selection.attr("aria-disabled","true")})},o.prototype._handleBlur=function(e){var t=this;window.setTimeout(function(){document.activeElement==t.$selection[0]||n.contains(t.$selection[0],document.activeElement)||t.trigger("blur",e)},1)},o.prototype._attachCloseHandler=function(e){n(document.body).on("mousedown.select2."+e.id,function(e){var t=n(e.target).closest(".select2");n(".select2.select2-container--open").each(function(){this!=t[0]&&s.GetData(this,"element").select2("close")})})},o.prototype._detachCloseHandler=function(e){n(document.body).off("mousedown.select2."+e.id)},o.prototype.position=function(e,t){t.find(".selection").append(e)},o.prototype.destroy=function(){this._detachCloseHandler(this.container)},o.prototype.update=function(e){throw new Error("The `update` method must be defined in child classes.")},o.prototype.isEnabled=function(){return!this.isDisabled()},o.prototype.isDisabled=function(){return this.options.get("disabled")},o}),u.define("select2/selection/single",["jquery","./base","../utils","../keys"],function(e,t,n,s){function i(){i.__super__.constructor.apply(this,arguments)}return n.Extend(i,t),i.prototype.render=function(){var e=i.__super__.render.call(this);return e[0].classList.add("select2-selection--single"),e.html('<span class="select2-selection__rendered"></span><span class="select2-selection__arrow" role="presentation"><b role="presentation"></b></span>'),e},i.prototype.bind=function(t,e){var n=this;i.__super__.bind.apply(this,arguments);var s=t.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",s).attr("role","textbox").attr("aria-readonly","true"),this.$selection.attr("aria-labelledby",s),this.$selection.attr("aria-controls",s),this.$selection.on("mousedown",function(e){1===e.which&&n.trigger("toggle",{originalEvent:e})}),this.$selection.on("focus",function(e){}),this.$selection.on("blur",function(e){}),t.on("focus",function(e){t.isOpen()||n.$selection.trigger("focus")})},i.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},i.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},i.prototype.selectionContainer=function(){return e("<span></span>")},i.prototype.update=function(e){var t,n;0!==e.length?(n=e[0],t=this.$selection.find(".select2-selection__rendered"),e=this.display(n,t),t.empty().append(e),(n=n.title||n.text)?t.attr("title",n):t.removeAttr("title")):this.clear()},i}),u.define("select2/selection/multiple",["jquery","./base","../utils"],function(i,e,c){function o(e,t){o.__super__.constructor.apply(this,arguments)}return c.Extend(o,e),o.prototype.render=function(){var e=o.__super__.render.call(this);return e[0].classList.add("select2-selection--multiple"),e.html('<ul class="select2-selection__rendered"></ul>'),e},o.prototype.bind=function(e,t){var n=this;o.__super__.bind.apply(this,arguments);var s=e.id+"-container";this.$selection.find(".select2-selection__rendered").attr("id",s),this.$selection.on("click",function(e){n.trigger("toggle",{originalEvent:e})}),this.$selection.on("click",".select2-selection__choice__remove",function(e){var t;n.isDisabled()||(t=i(this).parent(),t=c.GetData(t[0],"data"),n.trigger("unselect",{originalEvent:e,data:t}))}),this.$selection.on("keydown",".select2-selection__choice__remove",function(e){n.isDisabled()||e.stopPropagation()})},o.prototype.clear=function(){var e=this.$selection.find(".select2-selection__rendered");e.empty(),e.removeAttr("title")},o.prototype.display=function(e,t){var n=this.options.get("templateSelection");return this.options.get("escapeMarkup")(n(e,t))},o.prototype.selectionContainer=function(){return i('<li class="select2-selection__choice"><button type="button" class="select2-selection__choice__remove" tabindex="-1"><span aria-hidden="true">&times;</span></button><span class="select2-selection__choice__display"></span></li>')},o.prototype.update=function(e){if(this.clear(),0!==e.length){for(var t=[],n=this.$selection.find(".select2-selection__rendered").attr("id")+"-choice-",s=0;s<e.length;s++){var i=e[s],o=this.selectionContainer(),r=this.display(i,o),a=n+c.generateChars(4)+"-";i.id?a+=i.id:a+=c.generateChars(4),o.find(".select2-selection__choice__display").append(r).attr("id",a);var l=i.title||i.text;l&&o.attr("title",l);r=this.options.get("translations").get("removeItem"),l=o.find(".select2-selection__choice__remove");l.attr("title",r()),l.attr("aria-label",r()),l.attr("aria-describedby",a),c.StoreData(o[0],"data",i),t.push(o)}this.$selection.find(".select2-selection__rendered").append(t)}},o}),u.define("select2/selection/placeholder",[],function(){function e(e,t,n){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n)}return e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.createPlaceholder=function(e,t){var n=this.selectionContainer();n.html(this.display(t)),n[0].classList.add("select2-selection__placeholder"),n[0].classList.remove("select2-selection__choice");t=t.title||t.text||n.text();return this.$selection.find(".select2-selection__rendered").attr("title",t),n},e.prototype.update=function(e,t){var n=1==t.length&&t[0].id!=this.placeholder.id;if(1<t.length||n)return e.call(this,t);this.clear();t=this.createPlaceholder(this.placeholder);this.$selection.find(".select2-selection__rendered").append(t)},e}),u.define("select2/selection/allowClear",["jquery","../keys","../utils"],function(i,s,a){function e(){}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),null==this.placeholder&&this.options.get("debug")&&window.console&&console.error&&console.error("Select2: The `allowClear` option should be used in combination with the `placeholder` option."),this.$selection.on("mousedown",".select2-selection__clear",function(e){s._handleClear(e)}),t.on("keypress",function(e){s._handleKeyboardClear(e,t)})},e.prototype._handleClear=function(e,t){if(!this.isDisabled()){var n=this.$selection.find(".select2-selection__clear");if(0!==n.length){t.stopPropagation();var s=a.GetData(n[0],"data"),i=this.$element.val();this.$element.val(this.placeholder.id);var o={data:s};if(this.trigger("clear",o),o.prevented)this.$element.val(i);else{for(var r=0;r<s.length;r++)if(o={data:s[r]},this.trigger("unselect",o),o.prevented)return void this.$element.val(i);this.$element.trigger("input").trigger("change"),this.trigger("toggle",{})}}}},e.prototype._handleKeyboardClear=function(e,t,n){n.isOpen()||t.which!=s.DELETE&&t.which!=s.BACKSPACE||this._handleClear(t)},e.prototype.update=function(e,t){var n,s;e.call(this,t),this.$selection.find(".select2-selection__clear").remove(),this.$selection[0].classList.remove("select2-selection--clearable"),0<this.$selection.find(".select2-selection__placeholder").length||0===t.length||(n=this.$selection.find(".select2-selection__rendered").attr("id"),s=this.options.get("translations").get("removeAllItems"),(e=i('<button type="button" class="select2-selection__clear" tabindex="-1"><span aria-hidden="true">&times;</span></button>')).attr("title",s()),e.attr("aria-label",s()),e.attr("aria-describedby",n),a.StoreData(e[0],"data",t),this.$selection.prepend(e),this.$selection[0].classList.add("select2-selection--clearable"))},e}),u.define("select2/selection/search",["jquery","../utils","../keys"],function(s,a,l){function e(e,t,n){e.call(this,t,n)}return e.prototype.render=function(e){var t=this.options.get("translations").get("search"),n=s('<span class="select2-search select2-search--inline"><textarea class="select2-search__field" type="search" tabindex="-1" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" ></textarea></span>');this.$searchContainer=n,this.$search=n.find("textarea"),this.$search.prop("autocomplete",this.options.get("autocomplete")),this.$search.attr("aria-label",t());e=e.call(this);return this._transferTabIndex(),e.append(this.$searchContainer),e},e.prototype.bind=function(e,t,n){var s=this,i=t.id+"-results",o=t.id+"-container";e.call(this,t,n),s.$search.attr("aria-describedby",o),t.on("open",function(){s.$search.attr("aria-controls",i),s.$search.trigger("focus")}),t.on("close",function(){s.$search.val(""),s.resizeSearch(),s.$search.removeAttr("aria-controls"),s.$search.removeAttr("aria-activedescendant"),s.$search.trigger("focus")}),t.on("enable",function(){s.$search.prop("disabled",!1),s._transferTabIndex()}),t.on("disable",function(){s.$search.prop("disabled",!0)}),t.on("focus",function(e){s.$search.trigger("focus")}),t.on("results:focus",function(e){e.data._resultId?s.$search.attr("aria-activedescendant",e.data._resultId):s.$search.removeAttr("aria-activedescendant")}),this.$selection.on("focusin",".select2-search--inline",function(e){s.trigger("focus",e)}),this.$selection.on("focusout",".select2-search--inline",function(e){s._handleBlur(e)}),this.$selection.on("keydown",".select2-search--inline",function(e){var t;e.stopPropagation(),s.trigger("keypress",e),s._keyUpPrevented=e.isDefaultPrevented(),e.which!==l.BACKSPACE||""!==s.$search.val()||0<(t=s.$selection.find(".select2-selection__choice").last()).length&&(t=a.GetData(t[0],"data"),s.searchRemoveChoice(t),e.preventDefault())}),this.$selection.on("click",".select2-search--inline",function(e){s.$search.val()&&e.stopPropagation()});var t=document.documentMode,r=t&&t<=11;this.$selection.on("input.searchcheck",".select2-search--inline",function(e){r?s.$selection.off("input.search input.searchcheck"):s.$selection.off("keyup.search")}),this.$selection.on("keyup.search input.search",".select2-search--inline",function(e){var t;r&&"input"===e.type?s.$selection.off("input.search input.searchcheck"):(t=e.which)!=l.SHIFT&&t!=l.CTRL&&t!=l.ALT&&t!=l.TAB&&s.handleSearch(e)})},e.prototype._transferTabIndex=function(e){this.$search.attr("tabindex",this.$selection.attr("tabindex")),this.$selection.attr("tabindex","-1")},e.prototype.createPlaceholder=function(e,t){this.$search.attr("placeholder",t.text)},e.prototype.update=function(e,t){var n=this.$search[0]==document.activeElement;this.$search.attr("placeholder",""),e.call(this,t),this.resizeSearch(),n&&this.$search.trigger("focus")},e.prototype.handleSearch=function(){var e;this.resizeSearch(),this._keyUpPrevented||(e=this.$search.val(),this.trigger("query",{term:e})),this._keyUpPrevented=!1},e.prototype.searchRemoveChoice=function(e,t){this.trigger("unselect",{data:t}),this.$search.val(t.text),this.handleSearch()},e.prototype.resizeSearch=function(){this.$search.css("width","25px");var e="100%";""===this.$search.attr("placeholder")&&(e=.75*(this.$search.val().length+1)+"em"),this.$search.css("width",e)},e}),u.define("select2/selection/selectionCss",["../utils"],function(n){function e(){}return e.prototype.render=function(e){var t=e.call(this),e=this.options.get("selectionCssClass")||"";return-1!==e.indexOf(":all:")&&(e=e.replace(":all:",""),n.copyNonInternalCssClasses(t[0],this.$element[0])),t.addClass(e),t},e}),u.define("select2/selection/eventRelay",["jquery"],function(r){function e(){}return e.prototype.bind=function(e,t,n){var s=this,i=["open","opening","close","closing","select","selecting","unselect","unselecting","clear","clearing"],o=["opening","closing","selecting","unselecting","clearing"];e.call(this,t,n),t.on("*",function(e,t){var n;-1!==i.indexOf(e)&&(t=t||{},n=r.Event("select2:"+e,{params:t}),s.$element.trigger(n),-1!==o.indexOf(e)&&(t.prevented=n.isDefaultPrevented()))})},e}),u.define("select2/translation",["jquery","require"],function(t,n){function s(e){this.dict=e||{}}return s.prototype.all=function(){return this.dict},s.prototype.get=function(e){return this.dict[e]},s.prototype.extend=function(e){this.dict=t.extend({},e.all(),this.dict)},s._cache={},s.loadPath=function(e){var t;return e in s._cache||(t=n(e),s._cache[e]=t),new s(s._cache[e])},s}),u.define("select2/diacritics",[],function(){return{"Ⓐ":"A","Ａ":"A","À":"A","Á":"A","Â":"A","Ầ":"A","Ấ":"A","Ẫ":"A","Ẩ":"A","Ã":"A","Ā":"A","Ă":"A","Ằ":"A","Ắ":"A","Ẵ":"A","Ẳ":"A","Ȧ":"A","Ǡ":"A","Ä":"A","Ǟ":"A","Ả":"A","Å":"A","Ǻ":"A","Ǎ":"A","Ȁ":"A","Ȃ":"A","Ạ":"A","Ậ":"A","Ặ":"A","Ḁ":"A","Ą":"A","Ⱥ":"A","Ɐ":"A","Ꜳ":"AA","Æ":"AE","Ǽ":"AE","Ǣ":"AE","Ꜵ":"AO","Ꜷ":"AU","Ꜹ":"AV","Ꜻ":"AV","Ꜽ":"AY","Ⓑ":"B","Ｂ":"B","Ḃ":"B","Ḅ":"B","Ḇ":"B","Ƀ":"B","Ƃ":"B","Ɓ":"B","Ⓒ":"C","Ｃ":"C","Ć":"C","Ĉ":"C","Ċ":"C","Č":"C","Ç":"C","Ḉ":"C","Ƈ":"C","Ȼ":"C","Ꜿ":"C","Ⓓ":"D","Ｄ":"D","Ḋ":"D","Ď":"D","Ḍ":"D","Ḑ":"D","Ḓ":"D","Ḏ":"D","Đ":"D","Ƌ":"D","Ɗ":"D","Ɖ":"D","Ꝺ":"D","DZ":"DZ","DŽ":"DZ","Dz":"Dz","Dž":"Dz","Ⓔ":"E","Ｅ":"E","È":"E","É":"E","Ê":"E","Ề":"E","Ế":"E","Ễ":"E","Ể":"E","Ẽ":"E","Ē":"E","Ḕ":"E","Ḗ":"E","Ĕ":"E","Ė":"E","Ë":"E","Ẻ":"E","Ě":"E","Ȅ":"E","Ȇ":"E","Ẹ":"E","Ệ":"E","Ȩ":"E","Ḝ":"E","Ę":"E","Ḙ":"E","Ḛ":"E","Ɛ":"E","Ǝ":"E","Ⓕ":"F","Ｆ":"F","Ḟ":"F","Ƒ":"F","Ꝼ":"F","Ⓖ":"G","Ｇ":"G","Ǵ":"G","Ĝ":"G","Ḡ":"G","Ğ":"G","Ġ":"G","Ǧ":"G","Ģ":"G","Ǥ":"G","Ɠ":"G","Ꞡ":"G","Ᵹ":"G","Ꝿ":"G","Ⓗ":"H","Ｈ":"H","Ĥ":"H","Ḣ":"H","Ḧ":"H","Ȟ":"H","Ḥ":"H","Ḩ":"H","Ḫ":"H","Ħ":"H","Ⱨ":"H","Ⱶ":"H","Ɥ":"H","Ⓘ":"I","Ｉ":"I","Ì":"I","Í":"I","Î":"I","Ĩ":"I","Ī":"I","Ĭ":"I","İ":"I","Ï":"I","Ḯ":"I","Ỉ":"I","Ǐ":"I","Ȉ":"I","Ȋ":"I","Ị":"I","Į":"I","Ḭ":"I","Ɨ":"I","Ⓙ":"J","Ｊ":"J","Ĵ":"J","Ɉ":"J","Ⓚ":"K","Ｋ":"K","Ḱ":"K","Ǩ":"K","Ḳ":"K","Ķ":"K","Ḵ":"K","Ƙ":"K","Ⱪ":"K","Ꝁ":"K","Ꝃ":"K","Ꝅ":"K","Ꞣ":"K","Ⓛ":"L","Ｌ":"L","Ŀ":"L","Ĺ":"L","Ľ":"L","Ḷ":"L","Ḹ":"L","Ļ":"L","Ḽ":"L","Ḻ":"L","Ł":"L","Ƚ":"L","Ɫ":"L","Ⱡ":"L","Ꝉ":"L","Ꝇ":"L","Ꞁ":"L","LJ":"LJ","Lj":"Lj","Ⓜ":"M","Ｍ":"M","Ḿ":"M","Ṁ":"M","Ṃ":"M","Ɱ":"M","Ɯ":"M","Ⓝ":"N","Ｎ":"N","Ǹ":"N","Ń":"N","Ñ":"N","Ṅ":"N","Ň":"N","Ṇ":"N","Ņ":"N","Ṋ":"N","Ṉ":"N","Ƞ":"N","Ɲ":"N","Ꞑ":"N","Ꞥ":"N","NJ":"NJ","Nj":"Nj","Ⓞ":"O","Ｏ":"O","Ò":"O","Ó":"O","Ô":"O","Ồ":"O","Ố":"O","Ỗ":"O","Ổ":"O","Õ":"O","Ṍ":"O","Ȭ":"O","Ṏ":"O","Ō":"O","Ṑ":"O","Ṓ":"O","Ŏ":"O","Ȯ":"O","Ȱ":"O","Ö":"O","Ȫ":"O","Ỏ":"O","Ő":"O","Ǒ":"O","Ȍ":"O","Ȏ":"O","Ơ":"O","Ờ":"O","Ớ":"O","Ỡ":"O","Ở":"O","Ợ":"O","Ọ":"O","Ộ":"O","Ǫ":"O","Ǭ":"O","Ø":"O","Ǿ":"O","Ɔ":"O","Ɵ":"O","Ꝋ":"O","Ꝍ":"O","Œ":"OE","Ƣ":"OI","Ꝏ":"OO","Ȣ":"OU","Ⓟ":"P","Ｐ":"P","Ṕ":"P","Ṗ":"P","Ƥ":"P","Ᵽ":"P","Ꝑ":"P","Ꝓ":"P","Ꝕ":"P","Ⓠ":"Q","Ｑ":"Q","Ꝗ":"Q","Ꝙ":"Q","Ɋ":"Q","Ⓡ":"R","Ｒ":"R","Ŕ":"R","Ṙ":"R","Ř":"R","Ȑ":"R","Ȓ":"R","Ṛ":"R","Ṝ":"R","Ŗ":"R","Ṟ":"R","Ɍ":"R","Ɽ":"R","Ꝛ":"R","Ꞧ":"R","Ꞃ":"R","Ⓢ":"S","Ｓ":"S","ẞ":"S","Ś":"S","Ṥ":"S","Ŝ":"S","Ṡ":"S","Š":"S","Ṧ":"S","Ṣ":"S","Ṩ":"S","Ș":"S","Ş":"S","Ȿ":"S","Ꞩ":"S","Ꞅ":"S","Ⓣ":"T","Ｔ":"T","Ṫ":"T","Ť":"T","Ṭ":"T","Ț":"T","Ţ":"T","Ṱ":"T","Ṯ":"T","Ŧ":"T","Ƭ":"T","Ʈ":"T","Ⱦ":"T","Ꞇ":"T","Ꜩ":"TZ","Ⓤ":"U","Ｕ":"U","Ù":"U","Ú":"U","Û":"U","Ũ":"U","Ṹ":"U","Ū":"U","Ṻ":"U","Ŭ":"U","Ü":"U","Ǜ":"U","Ǘ":"U","Ǖ":"U","Ǚ":"U","Ủ":"U","Ů":"U","Ű":"U","Ǔ":"U","Ȕ":"U","Ȗ":"U","Ư":"U","Ừ":"U","Ứ":"U","Ữ":"U","Ử":"U","Ự":"U","Ụ":"U","Ṳ":"U","Ų":"U","Ṷ":"U","Ṵ":"U","Ʉ":"U","Ⓥ":"V","Ｖ":"V","Ṽ":"V","Ṿ":"V","Ʋ":"V","Ꝟ":"V","Ʌ":"V","Ꝡ":"VY","Ⓦ":"W","Ｗ":"W","Ẁ":"W","Ẃ":"W","Ŵ":"W","Ẇ":"W","Ẅ":"W","Ẉ":"W","Ⱳ":"W","Ⓧ":"X","Ｘ":"X","Ẋ":"X","Ẍ":"X","Ⓨ":"Y","Ｙ":"Y","Ỳ":"Y","Ý":"Y","Ŷ":"Y","Ỹ":"Y","Ȳ":"Y","Ẏ":"Y","Ÿ":"Y","Ỷ":"Y","Ỵ":"Y","Ƴ":"Y","Ɏ":"Y","Ỿ":"Y","Ⓩ":"Z","Ｚ":"Z","Ź":"Z","Ẑ":"Z","Ż":"Z","Ž":"Z","Ẓ":"Z","Ẕ":"Z","Ƶ":"Z","Ȥ":"Z","Ɀ":"Z","Ⱬ":"Z","Ꝣ":"Z","ⓐ":"a","ａ":"a","ẚ":"a","à":"a","á":"a","â":"a","ầ":"a","ấ":"a","ẫ":"a","ẩ":"a","ã":"a","ā":"a","ă":"a","ằ":"a","ắ":"a","ẵ":"a","ẳ":"a","ȧ":"a","ǡ":"a","ä":"a","ǟ":"a","ả":"a","å":"a","ǻ":"a","ǎ":"a","ȁ":"a","ȃ":"a","ạ":"a","ậ":"a","ặ":"a","ḁ":"a","ą":"a","ⱥ":"a","ɐ":"a","ꜳ":"aa","æ":"ae","ǽ":"ae","ǣ":"ae","ꜵ":"ao","ꜷ":"au","ꜹ":"av","ꜻ":"av","ꜽ":"ay","ⓑ":"b","ｂ":"b","ḃ":"b","ḅ":"b","ḇ":"b","ƀ":"b","ƃ":"b","ɓ":"b","ⓒ":"c","ｃ":"c","ć":"c","ĉ":"c","ċ":"c","č":"c","ç":"c","ḉ":"c","ƈ":"c","ȼ":"c","ꜿ":"c","ↄ":"c","ⓓ":"d","ｄ":"d","ḋ":"d","ď":"d","ḍ":"d","ḑ":"d","ḓ":"d","ḏ":"d","đ":"d","ƌ":"d","ɖ":"d","ɗ":"d","ꝺ":"d","dz":"dz","dž":"dz","ⓔ":"e","ｅ":"e","è":"e","é":"e","ê":"e","ề":"e","ế":"e","ễ":"e","ể":"e","ẽ":"e","ē":"e","ḕ":"e","ḗ":"e","ĕ":"e","ė":"e","ë":"e","ẻ":"e","ě":"e","ȅ":"e","ȇ":"e","ẹ":"e","ệ":"e","ȩ":"e","ḝ":"e","ę":"e","ḙ":"e","ḛ":"e","ɇ":"e","ɛ":"e","ǝ":"e","ⓕ":"f","ｆ":"f","ḟ":"f","ƒ":"f","ꝼ":"f","ⓖ":"g","ｇ":"g","ǵ":"g","ĝ":"g","ḡ":"g","ğ":"g","ġ":"g","ǧ":"g","ģ":"g","ǥ":"g","ɠ":"g","ꞡ":"g","ᵹ":"g","ꝿ":"g","ⓗ":"h","ｈ":"h","ĥ":"h","ḣ":"h","ḧ":"h","ȟ":"h","ḥ":"h","ḩ":"h","ḫ":"h","ẖ":"h","ħ":"h","ⱨ":"h","ⱶ":"h","ɥ":"h","ƕ":"hv","ⓘ":"i","ｉ":"i","ì":"i","í":"i","î":"i","ĩ":"i","ī":"i","ĭ":"i","ï":"i","ḯ":"i","ỉ":"i","ǐ":"i","ȉ":"i","ȋ":"i","ị":"i","į":"i","ḭ":"i","ɨ":"i","ı":"i","ⓙ":"j","ｊ":"j","ĵ":"j","ǰ":"j","ɉ":"j","ⓚ":"k","ｋ":"k","ḱ":"k","ǩ":"k","ḳ":"k","ķ":"k","ḵ":"k","ƙ":"k","ⱪ":"k","ꝁ":"k","ꝃ":"k","ꝅ":"k","ꞣ":"k","ⓛ":"l","ｌ":"l","ŀ":"l","ĺ":"l","ľ":"l","ḷ":"l","ḹ":"l","ļ":"l","ḽ":"l","ḻ":"l","ſ":"l","ł":"l","ƚ":"l","ɫ":"l","ⱡ":"l","ꝉ":"l","ꞁ":"l","ꝇ":"l","lj":"lj","ⓜ":"m","ｍ":"m","ḿ":"m","ṁ":"m","ṃ":"m","ɱ":"m","ɯ":"m","ⓝ":"n","ｎ":"n","ǹ":"n","ń":"n","ñ":"n","ṅ":"n","ň":"n","ṇ":"n","ņ":"n","ṋ":"n","ṉ":"n","ƞ":"n","ɲ":"n","ʼn":"n","ꞑ":"n","ꞥ":"n","nj":"nj","ⓞ":"o","ｏ":"o","ò":"o","ó":"o","ô":"o","ồ":"o","ố":"o","ỗ":"o","ổ":"o","õ":"o","ṍ":"o","ȭ":"o","ṏ":"o","ō":"o","ṑ":"o","ṓ":"o","ŏ":"o","ȯ":"o","ȱ":"o","ö":"o","ȫ":"o","ỏ":"o","ő":"o","ǒ":"o","ȍ":"o","ȏ":"o","ơ":"o","ờ":"o","ớ":"o","ỡ":"o","ở":"o","ợ":"o","ọ":"o","ộ":"o","ǫ":"o","ǭ":"o","ø":"o","ǿ":"o","ɔ":"o","ꝋ":"o","ꝍ":"o","ɵ":"o","œ":"oe","ƣ":"oi","ȣ":"ou","ꝏ":"oo","ⓟ":"p","ｐ":"p","ṕ":"p","ṗ":"p","ƥ":"p","ᵽ":"p","ꝑ":"p","ꝓ":"p","ꝕ":"p","ⓠ":"q","ｑ":"q","ɋ":"q","ꝗ":"q","ꝙ":"q","ⓡ":"r","ｒ":"r","ŕ":"r","ṙ":"r","ř":"r","ȑ":"r","ȓ":"r","ṛ":"r","ṝ":"r","ŗ":"r","ṟ":"r","ɍ":"r","ɽ":"r","ꝛ":"r","ꞧ":"r","ꞃ":"r","ⓢ":"s","ｓ":"s","ß":"s","ś":"s","ṥ":"s","ŝ":"s","ṡ":"s","š":"s","ṧ":"s","ṣ":"s","ṩ":"s","ș":"s","ş":"s","ȿ":"s","ꞩ":"s","ꞅ":"s","ẛ":"s","ⓣ":"t","ｔ":"t","ṫ":"t","ẗ":"t","ť":"t","ṭ":"t","ț":"t","ţ":"t","ṱ":"t","ṯ":"t","ŧ":"t","ƭ":"t","ʈ":"t","ⱦ":"t","ꞇ":"t","ꜩ":"tz","ⓤ":"u","ｕ":"u","ù":"u","ú":"u","û":"u","ũ":"u","ṹ":"u","ū":"u","ṻ":"u","ŭ":"u","ü":"u","ǜ":"u","ǘ":"u","ǖ":"u","ǚ":"u","ủ":"u","ů":"u","ű":"u","ǔ":"u","ȕ":"u","ȗ":"u","ư":"u","ừ":"u","ứ":"u","ữ":"u","ử":"u","ự":"u","ụ":"u","ṳ":"u","ų":"u","ṷ":"u","ṵ":"u","ʉ":"u","ⓥ":"v","ｖ":"v","ṽ":"v","ṿ":"v","ʋ":"v","ꝟ":"v","ʌ":"v","ꝡ":"vy","ⓦ":"w","ｗ":"w","ẁ":"w","ẃ":"w","ŵ":"w","ẇ":"w","ẅ":"w","ẘ":"w","ẉ":"w","ⱳ":"w","ⓧ":"x","ｘ":"x","ẋ":"x","ẍ":"x","ⓨ":"y","ｙ":"y","ỳ":"y","ý":"y","ŷ":"y","ỹ":"y","ȳ":"y","ẏ":"y","ÿ":"y","ỷ":"y","ẙ":"y","ỵ":"y","ƴ":"y","ɏ":"y","ỿ":"y","ⓩ":"z","ｚ":"z","ź":"z","ẑ":"z","ż":"z","ž":"z","ẓ":"z","ẕ":"z","ƶ":"z","ȥ":"z","ɀ":"z","ⱬ":"z","ꝣ":"z","Ά":"Α","Έ":"Ε","Ή":"Η","Ί":"Ι","Ϊ":"Ι","Ό":"Ο","Ύ":"Υ","Ϋ":"Υ","Ώ":"Ω","ά":"α","έ":"ε","ή":"η","ί":"ι","ϊ":"ι","ΐ":"ι","ό":"ο","ύ":"υ","ϋ":"υ","ΰ":"υ","ώ":"ω","ς":"σ","’":"'"}}),u.define("select2/data/base",["../utils"],function(n){function s(e,t){s.__super__.constructor.call(this)}return n.Extend(s,n.Observable),s.prototype.current=function(e){throw new Error("The `current` method must be defined in child classes.")},s.prototype.query=function(e,t){throw new Error("The `query` method must be defined in child classes.")},s.prototype.bind=function(e,t){},s.prototype.destroy=function(){},s.prototype.generateResultId=function(e,t){e=e.id+"-result-";return e+=n.generateChars(4),null!=t.id?e+="-"+t.id.toString():e+="-"+n.generateChars(4),e},s}),u.define("select2/data/select",["./base","../utils","jquery"],function(e,a,l){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return a.Extend(n,e),n.prototype.current=function(e){var t=this;e(Array.prototype.map.call(this.$element[0].querySelectorAll(":checked"),function(e){return t.item(l(e))}))},n.prototype.select=function(i){var e,o=this;if(i.selected=!0,null!=i.element&&"option"===i.element.tagName.toLowerCase())return i.element.selected=!0,void this.$element.trigger("input").trigger("change");this.$element.prop("multiple")?this.current(function(e){var t=[];(i=[i]).push.apply(i,e);for(var n=0;n<i.length;n++){var s=i[n].id;-1===t.indexOf(s)&&t.push(s)}o.$element.val(t),o.$element.trigger("input").trigger("change")}):(e=i.id,this.$element.val(e),this.$element.trigger("input").trigger("change"))},n.prototype.unselect=function(i){var o=this;if(this.$element.prop("multiple")){if(i.selected=!1,null!=i.element&&"option"===i.element.tagName.toLowerCase())return i.element.selected=!1,void this.$element.trigger("input").trigger("change");this.current(function(e){for(var t=[],n=0;n<e.length;n++){var s=e[n].id;s!==i.id&&-1===t.indexOf(s)&&t.push(s)}o.$element.val(t),o.$element.trigger("input").trigger("change")})}},n.prototype.bind=function(e,t){var n=this;(this.container=e).on("select",function(e){n.select(e.data)}),e.on("unselect",function(e){n.unselect(e.data)})},n.prototype.destroy=function(){this.$element.find("*").each(function(){a.RemoveData(this)})},n.prototype.query=function(t,e){var n=[],s=this;this.$element.children().each(function(){var e;"option"!==this.tagName.toLowerCase()&&"optgroup"!==this.tagName.toLowerCase()||(e=l(this),e=s.item(e),null!==(e=s.matches(t,e))&&n.push(e))}),e({results:n})},n.prototype.addOptions=function(e){this.$element.append(e)},n.prototype.option=function(e){var t;e.children?(t=document.createElement("optgroup")).label=e.text:void 0!==(t=document.createElement("option")).textContent?t.textContent=e.text:t.innerText=e.text,void 0!==e.id&&(t.value=e.id),e.disabled&&(t.disabled=!0),e.selected&&(t.selected=!0),e.title&&(t.title=e.title);e=this._normalizeItem(e);return e.element=t,a.StoreData(t,"data",e),l(t)},n.prototype.item=function(e){var t={};if(null!=(t=a.GetData(e[0],"data")))return t;var n=e[0];if("option"===n.tagName.toLowerCase())t={id:e.val(),text:e.text(),disabled:e.prop("disabled"),selected:e.prop("selected"),title:e.prop("title")};else if("optgroup"===n.tagName.toLowerCase()){t={text:e.prop("label"),children:[],title:e.prop("title")};for(var s=e.children("option"),i=[],o=0;o<s.length;o++){var r=l(s[o]),r=this.item(r);i.push(r)}t.children=i}return(t=this._normalizeItem(t)).element=e[0],a.StoreData(e[0],"data",t),t},n.prototype._normalizeItem=function(e){e!==Object(e)&&(e={id:e,text:e});return null!=(e=l.extend({},{text:""},e)).id&&(e.id=e.id.toString()),null!=e.text&&(e.text=e.text.toString()),null==e._resultId&&e.id&&null!=this.container&&(e._resultId=this.generateResultId(this.container,e)),l.extend({},{selected:!1,disabled:!1},e)},n.prototype.matches=function(e,t){return this.options.get("matcher")(e,t)},n}),u.define("select2/data/array",["./select","../utils","jquery"],function(e,t,c){function s(e,t){this._dataToConvert=t.get("data")||[],s.__super__.constructor.call(this,e,t)}return t.Extend(s,e),s.prototype.bind=function(e,t){s.__super__.bind.call(this,e,t),this.addOptions(this.convertToOptions(this._dataToConvert))},s.prototype.select=function(n){var e=this.$element.find("option").filter(function(e,t){return t.value==n.id.toString()});0===e.length&&(e=this.option(n),this.addOptions(e)),s.__super__.select.call(this,n)},s.prototype.convertToOptions=function(e){var t=this,n=this.$element.find("option"),s=n.map(function(){return t.item(c(this)).id}).get(),i=[];for(var o=0;o<e.length;o++){var r,a,l=this._normalizeItem(e[o]);0<=s.indexOf(l.id)?(r=n.filter(function(e){return function(){return c(this).val()==e.id}}(l)),a=this.item(r),a=c.extend(!0,{},l,a),a=this.option(a),r.replaceWith(a)):(a=this.option(l),l.children&&(l=this.convertToOptions(l.children),a.append(l)),i.push(a))}return i},s}),u.define("select2/data/ajax",["./array","../utils","jquery"],function(e,t,o){function n(e,t){this.ajaxOptions=this._applyDefaults(t.get("ajax")),null!=this.ajaxOptions.processResults&&(this.processResults=this.ajaxOptions.processResults),n.__super__.constructor.call(this,e,t)}return t.Extend(n,e),n.prototype._applyDefaults=function(e){var t={data:function(e){return o.extend({},e,{q:e.term})},transport:function(e,t,n){e=o.ajax(e);return e.then(t),e.fail(n),e}};return o.extend({},t,e,!0)},n.prototype.processResults=function(e){return e},n.prototype.query=function(t,n){var s=this;null!=this._request&&("function"==typeof this._request.abort&&this._request.abort(),this._request=null);var i=o.extend({type:"GET"},this.ajaxOptions);function e(){var e=i.transport(i,function(e){e=s.processResults(e,t);s.options.get("debug")&&window.console&&console.error&&(e&&e.results&&Array.isArray(e.results)||console.error("Select2: The AJAX results did not return an array in the `results` key of the response.")),n(e)},function(){"status"in e&&(0===e.status||"0"===e.status)||s.trigger("results:message",{message:"errorLoading"})});s._request=e}"function"==typeof i.url&&(i.url=i.url.call(this.$element,t)),"function"==typeof i.data&&(i.data=i.data.call(this.$element,t)),this.ajaxOptions.delay&&null!=t.term?(this._queryTimeout&&window.clearTimeout(this._queryTimeout),this._queryTimeout=window.setTimeout(e,this.ajaxOptions.delay)):e()},n}),u.define("select2/data/tags",["jquery"],function(t){function e(e,t,n){var s=n.get("tags"),i=n.get("createTag");void 0!==i&&(this.createTag=i);i=n.get("insertTag");if(void 0!==i&&(this.insertTag=i),e.call(this,t,n),Array.isArray(s))for(var o=0;o<s.length;o++){var r=s[o],r=this._normalizeItem(r),r=this.option(r);this.$element.append(r)}}return e.prototype.query=function(e,c,u){var d=this;this._removeOldTags(),null!=c.term&&null==c.page?e.call(this,c,function e(t,n){for(var s=t.results,i=0;i<s.length;i++){var o=s[i],r=null!=o.children&&!e({results:o.children},!0);if((o.text||"").toUpperCase()===(c.term||"").toUpperCase()||r)return!n&&(t.data=s,void u(t))}if(n)return!0;var a,l=d.createTag(c);null!=l&&((a=d.option(l)).attr("data-select2-tag","true"),d.addOptions([a]),d.insertTag(s,l)),t.results=s,u(t)}):e.call(this,c,u)},e.prototype.createTag=function(e,t){if(null==t.term)return null;t=t.term.trim();return""===t?null:{id:t,text:t}},e.prototype.insertTag=function(e,t,n){t.unshift(n)},e.prototype._removeOldTags=function(e){this.$element.find("option[data-select2-tag]").each(function(){this.selected||t(this).remove()})},e}),u.define("select2/data/tokenizer",["jquery"],function(c){function e(e,t,n){var s=n.get("tokenizer");void 0!==s&&(this.tokenizer=s),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){e.call(this,t,n),this.$search=t.dropdown.$search||t.selection.$search||n.find(".select2-search__field")},e.prototype.query=function(e,t,n){var s=this;t.term=t.term||"";var i=this.tokenizer(t,this.options,function(e){var t,n=s._normalizeItem(e);s.$element.find("option").filter(function(){return c(this).val()===n.id}).length||((t=s.option(n)).attr("data-select2-tag",!0),s._removeOldTags(),s.addOptions([t])),t=n,s.trigger("select",{data:t})});i.term!==t.term&&(this.$search.length&&(this.$search.val(i.term),this.$search.trigger("focus")),t.term=i.term),e.call(this,t,n)},e.prototype.tokenizer=function(e,t,n,s){for(var i=n.get("tokenSeparators")||[],o=t.term,r=0,a=this.createTag||function(e){return{id:e.term,text:e.term}};r<o.length;){var l=o[r];-1!==i.indexOf(l)?(l=o.substr(0,r),null!=(l=a(c.extend({},t,{term:l})))?(s(l),o=o.substr(r+1)||"",r=0):r++):r++}return{term:o}},e}),u.define("select2/data/minimumInputLength",[],function(){function e(e,t,n){this.minimumInputLength=n.get("minimumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",t.term.length<this.minimumInputLength?this.trigger("results:message",{message:"inputTooShort",args:{minimum:this.minimumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),u.define("select2/data/maximumInputLength",[],function(){function e(e,t,n){this.maximumInputLength=n.get("maximumInputLength"),e.call(this,t,n)}return e.prototype.query=function(e,t,n){t.term=t.term||"",0<this.maximumInputLength&&t.term.length>this.maximumInputLength?this.trigger("results:message",{message:"inputTooLong",args:{maximum:this.maximumInputLength,input:t.term,params:t}}):e.call(this,t,n)},e}),u.define("select2/data/maximumSelectionLength",[],function(){function e(e,t,n){this.maximumSelectionLength=n.get("maximumSelectionLength"),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("select",function(){s._checkIfMaximumSelected()})},e.prototype.query=function(e,t,n){var s=this;this._checkIfMaximumSelected(function(){e.call(s,t,n)})},e.prototype._checkIfMaximumSelected=function(e,t){var n=this;this.current(function(e){e=null!=e?e.length:0;0<n.maximumSelectionLength&&e>=n.maximumSelectionLength?n.trigger("results:message",{message:"maximumSelected",args:{maximum:n.maximumSelectionLength}}):t&&t()})},e}),u.define("select2/dropdown",["jquery","./utils"],function(t,e){function n(e,t){this.$element=e,this.options=t,n.__super__.constructor.call(this)}return e.Extend(n,e.Observable),n.prototype.render=function(){var e=t('<span class="select2-dropdown"><span class="select2-results"></span></span>');return e.attr("dir",this.options.get("dir")),this.$dropdown=e},n.prototype.bind=function(){},n.prototype.position=function(e,t){},n.prototype.destroy=function(){this.$dropdown.remove()},n}),u.define("select2/dropdown/search",["jquery"],function(o){function e(){}return e.prototype.render=function(e){var t=e.call(this),n=this.options.get("translations").get("search"),e=o('<span class="select2-search select2-search--dropdown"><input class="select2-search__field" type="search" tabindex="-1" autocorrect="off" autocapitalize="none" spellcheck="false" role="searchbox" aria-autocomplete="list" /></span>');return this.$searchContainer=e,this.$search=e.find("input"),this.$search.prop("autocomplete",this.options.get("autocomplete")),this.$search.attr("aria-label",n()),t.prepend(e),t},e.prototype.bind=function(e,t,n){var s=this,i=t.id+"-results";e.call(this,t,n),this.$search.on("keydown",function(e){s.trigger("keypress",e),s._keyUpPrevented=e.isDefaultPrevented()}),this.$search.on("input",function(e){o(this).off("keyup")}),this.$search.on("keyup input",function(e){s.handleSearch(e)}),t.on("open",function(){s.$search.attr("tabindex",0),s.$search.attr("aria-controls",i),s.$search.trigger("focus"),window.setTimeout(function(){s.$search.trigger("focus")},0)}),t.on("close",function(){s.$search.attr("tabindex",-1),s.$search.removeAttr("aria-controls"),s.$search.removeAttr("aria-activedescendant"),s.$search.val(""),s.$search.trigger("blur")}),t.on("focus",function(){t.isOpen()||s.$search.trigger("focus")}),t.on("results:all",function(e){null!=e.query.term&&""!==e.query.term||(s.showSearch(e)?s.$searchContainer[0].classList.remove("select2-search--hide"):s.$searchContainer[0].classList.add("select2-search--hide"))}),t.on("results:focus",function(e){e.data._resultId?s.$search.attr("aria-activedescendant",e.data._resultId):s.$search.removeAttr("aria-activedescendant")})},e.prototype.handleSearch=function(e){var t;this._keyUpPrevented||(t=this.$search.val(),this.trigger("query",{term:t})),this._keyUpPrevented=!1},e.prototype.showSearch=function(e,t){return!0},e}),u.define("select2/dropdown/hidePlaceholder",[],function(){function e(e,t,n,s){this.placeholder=this.normalizePlaceholder(n.get("placeholder")),e.call(this,t,n,s)}return e.prototype.append=function(e,t){t.results=this.removePlaceholder(t.results),e.call(this,t)},e.prototype.normalizePlaceholder=function(e,t){return"string"==typeof t&&(t={id:"",text:t}),t},e.prototype.removePlaceholder=function(e,t){for(var n=t.slice(0),s=t.length-1;0<=s;s--){var i=t[s];this.placeholder.id===i.id&&n.splice(s,1)}return n},e}),u.define("select2/dropdown/infiniteScroll",["jquery"],function(n){function e(e,t,n,s){this.lastParams={},e.call(this,t,n,s),this.$loadingMore=this.createLoadingMore(),this.loading=!1}return e.prototype.append=function(e,t){this.$loadingMore.remove(),this.loading=!1,e.call(this,t),this.showLoadingMore(t)&&(this.$results.append(this.$loadingMore),this.loadMoreIfNeeded())},e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("query",function(e){s.lastParams=e,s.loading=!0}),t.on("query:append",function(e){s.lastParams=e,s.loading=!0}),this.$results.on("scroll",this.loadMoreIfNeeded.bind(this))},e.prototype.loadMoreIfNeeded=function(){var e=n.contains(document.documentElement,this.$loadingMore[0]);!this.loading&&e&&(e=this.$results.offset().top+this.$results.outerHeight(!1),this.$loadingMore.offset().top+this.$loadingMore.outerHeight(!1)<=e+50&&this.loadMore())},e.prototype.loadMore=function(){this.loading=!0;var e=n.extend({},{page:1},this.lastParams);e.page++,this.trigger("query:append",e)},e.prototype.showLoadingMore=function(e,t){return t.pagination&&t.pagination.more},e.prototype.createLoadingMore=function(){var e=n('<li class="select2-results__option select2-results__option--load-more"role="option" aria-disabled="true"></li>'),t=this.options.get("translations").get("loadingMore");return e.html(t(this.lastParams)),e},e}),u.define("select2/dropdown/attachBody",["jquery","../utils"],function(u,r){function e(e,t,n){this.$dropdownParent=u(n.get("dropdownParent")||document.body),e.call(this,t,n)}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("open",function(){s._showDropdown(),s._attachPositioningHandler(t),s._bindContainerResultHandlers(t)}),t.on("close",function(){s._hideDropdown(),s._detachPositioningHandler(t)}),this.$dropdownContainer.on("mousedown",function(e){e.stopPropagation()})},e.prototype.destroy=function(e){e.call(this),this.$dropdownContainer.remove()},e.prototype.position=function(e,t,n){t.attr("class",n.attr("class")),t[0].classList.remove("select2"),t[0].classList.add("select2-container--open"),t.css({position:"absolute",top:-999999}),this.$container=n},e.prototype.render=function(e){var t=u("<span></span>"),e=e.call(this);return t.append(e),this.$dropdownContainer=t},e.prototype._hideDropdown=function(e){this.$dropdownContainer.detach()},e.prototype._bindContainerResultHandlers=function(e,t){var n;this._containerResultsHandlersBound||(n=this,t.on("results:all",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:append",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("results:message",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("select",function(){n._positionDropdown(),n._resizeDropdown()}),t.on("unselect",function(){n._positionDropdown(),n._resizeDropdown()}),this._containerResultsHandlersBound=!0)},e.prototype._attachPositioningHandler=function(e,t){var n=this,s="scroll.select2."+t.id,i="resize.select2."+t.id,o="orientationchange.select2."+t.id,t=this.$container.parents().filter(r.hasScroll);t.each(function(){r.StoreData(this,"select2-scroll-position",{x:u(this).scrollLeft(),y:u(this).scrollTop()})}),t.on(s,function(e){var t=r.GetData(this,"select2-scroll-position");u(this).scrollTop(t.y)}),u(window).on(s+" "+i+" "+o,function(e){n._positionDropdown(),n._resizeDropdown()})},e.prototype._detachPositioningHandler=function(e,t){var n="scroll.select2."+t.id,s="resize.select2."+t.id,t="orientationchange.select2."+t.id;this.$container.parents().filter(r.hasScroll).off(n),u(window).off(n+" "+s+" "+t)},e.prototype._positionDropdown=function(){var e=u(window),t=this.$dropdown[0].classList.contains("select2-dropdown--above"),n=this.$dropdown[0].classList.contains("select2-dropdown--below"),s=null,i=this.$container.offset();i.bottom=i.top+this.$container.outerHeight(!1);var o={height:this.$container.outerHeight(!1)};o.top=i.top,o.bottom=i.top+o.height;var r=this.$dropdown.outerHeight(!1),a=e.scrollTop(),l=e.scrollTop()+e.height(),c=a<i.top-r,e=l>i.bottom+r,a={left:i.left,top:o.bottom},l=this.$dropdownParent;"static"===l.css("position")&&(l=l.offsetParent());i={top:0,left:0};(u.contains(document.body,l[0])||l[0].isConnected)&&(i=l.offset()),a.top-=i.top,a.left-=i.left,t||n||(s="below"),e||!c||t?!c&&e&&t&&(s="below"):s="above",("above"==s||t&&"below"!==s)&&(a.top=o.top-i.top-r),null!=s&&(this.$dropdown[0].classList.remove("select2-dropdown--below"),this.$dropdown[0].classList.remove("select2-dropdown--above"),this.$dropdown[0].classList.add("select2-dropdown--"+s),this.$container[0].classList.remove("select2-container--below"),this.$container[0].classList.remove("select2-container--above"),this.$container[0].classList.add("select2-container--"+s)),this.$dropdownContainer.css(a)},e.prototype._resizeDropdown=function(){var e={width:this.$container.outerWidth(!1)+"px"};this.options.get("dropdownAutoWidth")&&(e.minWidth=e.width,e.position="relative",e.width="auto"),this.$dropdown.css(e)},e.prototype._showDropdown=function(e){this.$dropdownContainer.appendTo(this.$dropdownParent),this._positionDropdown(),this._resizeDropdown()},e}),u.define("select2/dropdown/minimumResultsForSearch",[],function(){function e(e,t,n,s){this.minimumResultsForSearch=n.get("minimumResultsForSearch"),this.minimumResultsForSearch<0&&(this.minimumResultsForSearch=1/0),e.call(this,t,n,s)}return e.prototype.showSearch=function(e,t){return!(function e(t){for(var n=0,s=0;s<t.length;s++){var i=t[s];i.children?n+=e(i.children):n++}return n}(t.data.results)<this.minimumResultsForSearch)&&e.call(this,t)},e}),u.define("select2/dropdown/selectOnClose",["../utils"],function(s){function e(){}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("close",function(e){s._handleSelectOnClose(e)})},e.prototype._handleSelectOnClose=function(e,t){if(t&&null!=t.originalSelect2Event){var n=t.originalSelect2Event;if("select"===n._type||"unselect"===n._type)return}n=this.getHighlightedResults();n.length<1||(null!=(n=s.GetData(n[0],"data")).element&&n.element.selected||null==n.element&&n.selected||this.trigger("select",{data:n}))},e}),u.define("select2/dropdown/closeOnSelect",[],function(){function e(){}return e.prototype.bind=function(e,t,n){var s=this;e.call(this,t,n),t.on("select",function(e){s._selectTriggered(e)}),t.on("unselect",function(e){s._selectTriggered(e)})},e.prototype._selectTriggered=function(e,t){var n=t.originalEvent;n&&(n.ctrlKey||n.metaKey)||this.trigger("close",{originalEvent:n,originalSelect2Event:t})},e}),u.define("select2/dropdown/dropdownCss",["../utils"],function(n){function e(){}return e.prototype.render=function(e){var t=e.call(this),e=this.options.get("dropdownCssClass")||"";return-1!==e.indexOf(":all:")&&(e=e.replace(":all:",""),n.copyNonInternalCssClasses(t[0],this.$element[0])),t.addClass(e),t},e}),u.define("select2/dropdown/tagsSearchHighlight",["../utils"],function(s){function e(){}return e.prototype.highlightFirstItem=function(e){var t=this.$results.find(".select2-results__option--selectable:not(.select2-results__option--selected)");if(0<t.length){var n=t.first(),t=s.GetData(n[0],"data").element;if(t&&t.getAttribute&&"true"===t.getAttribute("data-select2-tag"))return void n.trigger("mouseenter")}e.call(this)},e}),u.define("select2/i18n/en",[],function(){return{errorLoading:function(){return"The results could not be loaded."},inputTooLong:function(e){var t=e.input.length-e.maximum,e="Please delete "+t+" character";return 1!=t&&(e+="s"),e},inputTooShort:function(e){return"Please enter "+(e.minimum-e.input.length)+" or more characters"},loadingMore:function(){return"Loading more results…"},maximumSelected:function(e){var t="You can only select "+e.maximum+" item";return 1!=e.maximum&&(t+="s"),t},noResults:function(){return"No results found"},searching:function(){return"Searching…"},removeAllItems:function(){return"Remove all items"},removeItem:function(){return"Remove item"},search:function(){return"Search"}}}),u.define("select2/defaults",["jquery","./results","./selection/single","./selection/multiple","./selection/placeholder","./selection/allowClear","./selection/search","./selection/selectionCss","./selection/eventRelay","./utils","./translation","./diacritics","./data/select","./data/array","./data/ajax","./data/tags","./data/tokenizer","./data/minimumInputLength","./data/maximumInputLength","./data/maximumSelectionLength","./dropdown","./dropdown/search","./dropdown/hidePlaceholder","./dropdown/infiniteScroll","./dropdown/attachBody","./dropdown/minimumResultsForSearch","./dropdown/selectOnClose","./dropdown/closeOnSelect","./dropdown/dropdownCss","./dropdown/tagsSearchHighlight","./i18n/en"],function(l,o,r,a,c,u,d,p,h,f,g,t,m,v,y,_,b,w,$,x,A,D,S,O,L,E,C,T,q,I,e){function n(){this.reset()}return n.prototype.apply=function(e){var t;null==(e=l.extend(!0,{},this.defaults,e)).dataAdapter&&(null!=e.ajax?e.dataAdapter=y:null!=e.data?e.dataAdapter=v:e.dataAdapter=m,0<e.minimumInputLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,w)),0<e.maximumInputLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,$)),0<e.maximumSelectionLength&&(e.dataAdapter=f.Decorate(e.dataAdapter,x)),e.tags&&(e.dataAdapter=f.Decorate(e.dataAdapter,_)),null==e.tokenSeparators&&null==e.tokenizer||(e.dataAdapter=f.Decorate(e.dataAdapter,b))),null==e.resultsAdapter&&(e.resultsAdapter=o,null!=e.ajax&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,O)),null!=e.placeholder&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,S)),e.selectOnClose&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,C)),e.tags&&(e.resultsAdapter=f.Decorate(e.resultsAdapter,I))),null==e.dropdownAdapter&&(e.multiple?e.dropdownAdapter=A:(t=f.Decorate(A,D),e.dropdownAdapter=t),0!==e.minimumResultsForSearch&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,E)),e.closeOnSelect&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,T)),null!=e.dropdownCssClass&&(e.dropdownAdapter=f.Decorate(e.dropdownAdapter,q)),e.dropdownAdapter=f.Decorate(e.dropdownAdapter,L)),null==e.selectionAdapter&&(e.multiple?e.selectionAdapter=a:e.selectionAdapter=r,null!=e.placeholder&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,c)),e.allowClear&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,u)),e.multiple&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,d)),null!=e.selectionCssClass&&(e.selectionAdapter=f.Decorate(e.selectionAdapter,p)),e.selectionAdapter=f.Decorate(e.selectionAdapter,h)),e.language=this._resolveLanguage(e.language),e.language.push("en");for(var n=[],s=0;s<e.language.length;s++){var i=e.language[s];-1===n.indexOf(i)&&n.push(i)}return e.language=n,e.translations=this._processTranslations(e.language,e.debug),e},n.prototype.reset=function(){function a(e){return e.replace(/[^\u0000-\u007E]/g,function(e){return t[e]||e})}this.defaults={amdLanguageBase:"./i18n/",autocomplete:"off",closeOnSelect:!0,debug:!1,dropdownAutoWidth:!1,escapeMarkup:f.escapeMarkup,language:{},matcher:function e(t,n){if(null==t.term||""===t.term.trim())return n;if(n.children&&0<n.children.length){for(var s=l.extend(!0,{},n),i=n.children.length-1;0<=i;i--)null==e(t,n.children[i])&&s.children.splice(i,1);return 0<s.children.length?s:e(t,s)}var o=a(n.text).toUpperCase(),r=a(t.term).toUpperCase();return-1<o.indexOf(r)?n:null},minimumInputLength:0,maximumInputLength:0,maximumSelectionLength:0,minimumResultsForSearch:0,selectOnClose:!1,scrollAfterSelect:!1,sorter:function(e){return e},templateResult:function(e){return e.text},templateSelection:function(e){return e.text},theme:"default",width:"resolve"}},n.prototype.applyFromElement=function(e,t){var n=e.language,s=this.defaults.language,i=t.prop("lang"),t=t.closest("[lang]").prop("lang"),t=Array.prototype.concat.call(this._resolveLanguage(i),this._resolveLanguage(n),this._resolveLanguage(s),this._resolveLanguage(t));return e.language=t,e},n.prototype._resolveLanguage=function(e){if(!e)return[];if(l.isEmptyObject(e))return[];if(l.isPlainObject(e))return[e];for(var t,n=Array.isArray(e)?e:[e],s=[],i=0;i<n.length;i++)s.push(n[i]),"string"==typeof n[i]&&0<n[i].indexOf("-")&&(t=n[i].split("-")[0],s.push(t));return s},n.prototype._processTranslations=function(e,t){for(var n=new g,s=0;s<e.length;s++){var i=new g,o=e[s];if("string"==typeof o)try{i=g.loadPath(o)}catch(e){try{o=this.defaults.amdLanguageBase+o,i=g.loadPath(o)}catch(e){t&&window.console&&console.warn&&console.warn('Select2: The language file for "'+o+'" could not be automatically loaded. A fallback will be used instead.')}}else i=l.isPlainObject(o)?new g(o):o;n.extend(i)}return n},n.prototype.set=function(e,t){var n={};n[l.camelCase(e)]=t;n=f._convertData(n);l.extend(!0,this.defaults,n)},new n}),u.define("select2/options",["jquery","./defaults","./utils"],function(c,n,u){function e(e,t){this.options=e,null!=t&&this.fromElement(t),null!=t&&(this.options=n.applyFromElement(this.options,t)),this.options=n.apply(this.options)}return e.prototype.fromElement=function(e){var t=["select2"];null==this.options.multiple&&(this.options.multiple=e.prop("multiple")),null==this.options.disabled&&(this.options.disabled=e.prop("disabled")),null==this.options.autocomplete&&e.prop("autocomplete")&&(this.options.autocomplete=e.prop("autocomplete")),null==this.options.dir&&(e.prop("dir")?this.options.dir=e.prop("dir"):e.closest("[dir]").prop("dir")?this.options.dir=e.closest("[dir]").prop("dir"):this.options.dir="ltr"),e.prop("disabled",this.options.disabled),e.prop("multiple",this.options.multiple),u.GetData(e[0],"select2Tags")&&(this.options.debug&&window.console&&console.warn&&console.warn('Select2: The `data-select2-tags` attribute has been changed to use the `data-data` and `data-tags="true"` attributes and will be removed in future versions of Select2.'),u.StoreData(e[0],"data",u.GetData(e[0],"select2Tags")),u.StoreData(e[0],"tags",!0)),u.GetData(e[0],"ajaxUrl")&&(this.options.debug&&window.console&&console.warn&&console.warn("Select2: The `data-ajax-url` attribute has been changed to `data-ajax--url` and support for the old attribute will be removed in future versions of Select2."),e.attr("ajax--url",u.GetData(e[0],"ajaxUrl")),u.StoreData(e[0],"ajax-Url",u.GetData(e[0],"ajaxUrl")));var n={};function s(e,t){return t.toUpperCase()}for(var i=0;i<e[0].attributes.length;i++){var o=e[0].attributes[i].name,r="data-";o.substr(0,r.length)==r&&(o=o.substring(r.length),r=u.GetData(e[0],o),n[o.replace(/-([a-z])/g,s)]=r)}c.fn.jquery&&"1."==c.fn.jquery.substr(0,2)&&e[0].dataset&&(n=c.extend(!0,{},e[0].dataset,n));var a,l=c.extend(!0,{},u.GetData(e[0]),n);for(a in l=u._convertData(l))-1<t.indexOf(a)||(c.isPlainObject(this.options[a])?c.extend(this.options[a],l[a]):this.options[a]=l[a]);return this},e.prototype.get=function(e){return this.options[e]},e.prototype.set=function(e,t){this.options[e]=t},e}),u.define("select2/core",["jquery","./options","./utils","./keys"],function(t,i,o,s){var r=function(e,t){null!=o.GetData(e[0],"select2")&&o.GetData(e[0],"select2").destroy(),this.$element=e,this.id=this._generateId(e),t=t||{},this.options=new i(t,e),r.__super__.constructor.call(this);var n=e.attr("tabindex")||0;o.StoreData(e[0],"old-tabindex",n),e.attr("tabindex","-1");t=this.options.get("dataAdapter");this.dataAdapter=new t(e,this.options);n=this.render();this._placeContainer(n);t=this.options.get("selectionAdapter");this.selection=new t(e,this.options),this.$selection=this.selection.render(),this.selection.position(this.$selection,n);t=this.options.get("dropdownAdapter");this.dropdown=new t(e,this.options),this.$dropdown=this.dropdown.render(),this.dropdown.position(this.$dropdown,n);n=this.options.get("resultsAdapter");this.results=new n(e,this.options,this.dataAdapter),this.$results=this.results.render(),this.results.position(this.$results,this.$dropdown);var s=this;this._bindAdapters(),this._registerDomEvents(),this._registerDataEvents(),this._registerSelectionEvents(),this._registerDropdownEvents(),this._registerResultsEvents(),this._registerEvents(),this.dataAdapter.current(function(e){s.trigger("selection:update",{data:e})}),e[0].classList.add("select2-hidden-accessible"),e.attr("aria-hidden","true"),this._syncAttributes(),o.StoreData(e[0],"select2",this),e.data("select2",this)};return o.Extend(r,o.Observable),r.prototype._generateId=function(e){return"select2-"+(null!=e.attr("id")?e.attr("id"):null!=e.attr("name")?e.attr("name")+"-"+o.generateChars(2):o.generateChars(4)).replace(/(:|\.|\[|\]|,)/g,"")},r.prototype._placeContainer=function(e){e.insertAfter(this.$element);var t=this._resolveWidth(this.$element,this.options.get("width"));null!=t&&e.css("width",t)},r.prototype._resolveWidth=function(e,t){var n=/^width:(([-+]?([0-9]*\.)?[0-9]+)(px|em|ex|%|in|cm|mm|pt|pc))/i;if("resolve"==t){var s=this._resolveWidth(e,"style");return null!=s?s:this._resolveWidth(e,"element")}if("element"==t){s=e.outerWidth(!1);return s<=0?"auto":s+"px"}if("style"!=t)return"computedstyle"!=t?t:window.getComputedStyle(e[0]).width;e=e.attr("style");if("string"!=typeof e)return null;for(var i=e.split(";"),o=0,r=i.length;o<r;o+=1){var a=i[o].replace(/\s/g,"").match(n);if(null!==a&&1<=a.length)return a[1]}return null},r.prototype._bindAdapters=function(){this.dataAdapter.bind(this,this.$container),this.selection.bind(this,this.$container),this.dropdown.bind(this,this.$container),this.results.bind(this,this.$container)},r.prototype._registerDomEvents=function(){var t=this;this.$element.on("change.select2",function(){t.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})}),this.$element.on("focus.select2",function(e){t.trigger("focus",e)}),this._syncA=o.bind(this._syncAttributes,this),this._syncS=o.bind(this._syncSubtree,this),this._observer=new window.MutationObserver(function(e){t._syncA(),t._syncS(e)}),this._observer.observe(this.$element[0],{attributes:!0,childList:!0,subtree:!1})},r.prototype._registerDataEvents=function(){var n=this;this.dataAdapter.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerSelectionEvents=function(){var n=this,s=["toggle","focus"];this.selection.on("toggle",function(){n.toggleDropdown()}),this.selection.on("focus",function(e){n.focus(e)}),this.selection.on("*",function(e,t){-1===s.indexOf(e)&&n.trigger(e,t)})},r.prototype._registerDropdownEvents=function(){var n=this;this.dropdown.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerResultsEvents=function(){var n=this;this.results.on("*",function(e,t){n.trigger(e,t)})},r.prototype._registerEvents=function(){var n=this;this.on("open",function(){n.$container[0].classList.add("select2-container--open")}),this.on("close",function(){n.$container[0].classList.remove("select2-container--open")}),this.on("enable",function(){n.$container[0].classList.remove("select2-container--disabled")}),this.on("disable",function(){n.$container[0].classList.add("select2-container--disabled")}),this.on("blur",function(){n.$container[0].classList.remove("select2-container--focus")}),this.on("query",function(t){n.isOpen()||n.trigger("open",{}),this.dataAdapter.query(t,function(e){n.trigger("results:all",{data:e,query:t})})}),this.on("query:append",function(t){this.dataAdapter.query(t,function(e){n.trigger("results:append",{data:e,query:t})})}),this.on("keypress",function(e){var t=e.which;n.isOpen()?t===s.ESC||t===s.UP&&e.altKey?(n.close(e),e.preventDefault()):t===s.ENTER||t===s.TAB?(n.trigger("results:select",{}),e.preventDefault()):t===s.SPACE&&e.ctrlKey?(n.trigger("results:toggle",{}),e.preventDefault()):t===s.UP?(n.trigger("results:previous",{}),e.preventDefault()):t===s.DOWN&&(n.trigger("results:next",{}),e.preventDefault()):(t===s.ENTER||t===s.SPACE||t===s.DOWN&&e.altKey)&&(n.open(),e.preventDefault())})},r.prototype._syncAttributes=function(){this.options.set("disabled",this.$element.prop("disabled")),this.isDisabled()?(this.isOpen()&&this.close(),this.trigger("disable",{})):this.trigger("enable",{})},r.prototype._isChangeMutation=function(e){var t=this;if(e.addedNodes&&0<e.addedNodes.length){for(var n=0;n<e.addedNodes.length;n++)if(e.addedNodes[n].selected)return!0}else{if(e.removedNodes&&0<e.removedNodes.length)return!0;if(Array.isArray(e))return e.some(function(e){return t._isChangeMutation(e)})}return!1},r.prototype._syncSubtree=function(e){var e=this._isChangeMutation(e),t=this;e&&this.dataAdapter.current(function(e){t.trigger("selection:update",{data:e})})},r.prototype.trigger=function(e,t){var n=r.__super__.trigger,s={open:"opening",close:"closing",select:"selecting",unselect:"unselecting",clear:"clearing"};if(void 0===t&&(t={}),e in s){var i=s[e],s={prevented:!1,name:e,args:t};if(n.call(this,i,s),s.prevented)return void(t.prevented=!0)}n.call(this,e,t)},r.prototype.toggleDropdown=function(){this.isDisabled()||(this.isOpen()?this.close():this.open())},r.prototype.open=function(){this.isOpen()||this.isDisabled()||this.trigger("query",{})},r.prototype.close=function(e){this.isOpen()&&this.trigger("close",{originalEvent:e})},r.prototype.isEnabled=function(){return!this.isDisabled()},r.prototype.isDisabled=function(){return this.options.get("disabled")},r.prototype.isOpen=function(){return this.$container[0].classList.contains("select2-container--open")},r.prototype.hasFocus=function(){return this.$container[0].classList.contains("select2-container--focus")},r.prototype.focus=function(e){this.hasFocus()||(this.$container[0].classList.add("select2-container--focus"),this.trigger("focus",{}))},r.prototype.enable=function(e){this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("enable")` method has been deprecated and will be removed in later Select2 versions. Use $element.prop("disabled") instead.'),null!=e&&0!==e.length||(e=[!0]);e=!e[0];this.$element.prop("disabled",e)},r.prototype.data=function(){this.options.get("debug")&&0<arguments.length&&window.console&&console.warn&&console.warn('Select2: Data can no longer be set using `select2("data")`. You should consider setting the value instead using `$element.val()`.');var t=[];return this.dataAdapter.current(function(e){t=e}),t},r.prototype.val=function(e){if(this.options.get("debug")&&window.console&&console.warn&&console.warn('Select2: The `select2("val")` method has been deprecated and will be removed in later Select2 versions. Use $element.val() instead.'),null==e||0===e.length)return this.$element.val();e=e[0];Array.isArray(e)&&(e=e.map(function(e){return e.toString()})),this.$element.val(e).trigger("input").trigger("change")},r.prototype.destroy=function(){o.RemoveData(this.$container[0]),this.$container.remove(),this._observer.disconnect(),this._observer=null,this._syncA=null,this._syncS=null,this.$element.off(".select2"),this.$element.attr("tabindex",o.GetData(this.$element[0],"old-tabindex")),this.$element[0].classList.remove("select2-hidden-accessible"),this.$element.attr("aria-hidden","false"),o.RemoveData(this.$element[0]),this.$element.removeData("select2"),this.dataAdapter.destroy(),this.selection.destroy(),this.dropdown.destroy(),this.results.destroy(),this.dataAdapter=null,this.selection=null,this.dropdown=null,this.results=null},r.prototype.render=function(){var e=t('<span class="select2 select2-container"><span class="selection"></span><span class="dropdown-wrapper" aria-hidden="true"></span></span>');return e.attr("dir",this.options.get("dir")),this.$container=e,this.$container[0].classList.add("select2-container--"+this.options.get("theme")),o.StoreData(e[0],"element",this.$element),e},r}),u.define("select2/dropdown/attachContainer",[],function(){function e(e,t,n){e.call(this,t,n)}return e.prototype.position=function(e,t,n){n.find(".dropdown-wrapper").append(t),t[0].classList.add("select2-dropdown--below"),n[0].classList.add("select2-container--below")},e}),u.define("select2/dropdown/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$dropdown.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),u.define("select2/selection/stopPropagation",[],function(){function e(){}return e.prototype.bind=function(e,t,n){e.call(this,t,n);this.$selection.on(["blur","change","click","dblclick","focus","focusin","focusout","input","keydown","keyup","keypress","mousedown","mouseenter","mouseleave","mousemove","mouseover","mouseup","search","touchend","touchstart"].join(" "),function(e){e.stopPropagation()})},e}),a=function(u){var d,p,e=["wheel","mousewheel","DOMMouseScroll","MozMousePixelScroll"],t="onwheel"in document||9<=document.documentMode?["wheel"]:["mousewheel","DomMouseScroll","MozMousePixelScroll"],h=Array.prototype.slice;if(u.event.fixHooks)for(var n=e.length;n;)u.event.fixHooks[e[--n]]=u.event.mouseHooks;var f=u.event.special.mousewheel={version:"3.1.12",setup:function(){if(this.addEventListener)for(var e=t.length;e;)this.addEventListener(t[--e],s,!1);else this.onmousewheel=s;u.data(this,"mousewheel-line-height",f.getLineHeight(this)),u.data(this,"mousewheel-page-height",f.getPageHeight(this))},teardown:function(){if(this.removeEventListener)for(var e=t.length;e;)this.removeEventListener(t[--e],s,!1);else this.onmousewheel=null;u.removeData(this,"mousewheel-line-height"),u.removeData(this,"mousewheel-page-height")},getLineHeight:function(e){var t=u(e),e=t["offsetParent"in u.fn?"offsetParent":"parent"]();return e.length||(e=u("body")),parseInt(e.css("fontSize"),10)||parseInt(t.css("fontSize"),10)||16},getPageHeight:function(e){return u(e).height()},settings:{adjustOldDeltas:!0,normalizeOffset:!0}};function s(e){var t,n=e||window.event,s=h.call(arguments,1),i=0,o=0,r=0,a=0,l=0,c=0;if(e=u.event.fix(n),e.type="mousewheel","detail"in n&&(r=-1*n.detail),"wheelDelta"in n&&(r=n.wheelDelta),"wheelDeltaY"in n&&(r=n.wheelDeltaY),"wheelDeltaX"in n&&(o=-1*n.wheelDeltaX),"axis"in n&&n.axis===n.HORIZONTAL_AXIS&&(o=-1*r,r=0),i=0===r?o:r,"deltaY"in n&&(i=r=-1*n.deltaY),"deltaX"in n&&(o=n.deltaX,0===r&&(i=-1*o)),0!==r||0!==o)return 1===n.deltaMode?(i*=t=u.data(this,"mousewheel-line-height"),r*=t,o*=t):2===n.deltaMode&&(i*=t=u.data(this,"mousewheel-page-height"),r*=t,o*=t),a=Math.max(Math.abs(r),Math.abs(o)),(!p||a<p)&&m(n,p=a)&&(p/=40),m(n,a)&&(i/=40,o/=40,r/=40),i=Math[1<=i?"floor":"ceil"](i/p),o=Math[1<=o?"floor":"ceil"](o/p),r=Math[1<=r?"floor":"ceil"](r/p),f.settings.normalizeOffset&&this.getBoundingClientRect&&(a=this.getBoundingClientRect(),l=e.clientX-a.left,c=e.clientY-a.top),e.deltaX=o,e.deltaY=r,e.deltaFactor=p,e.offsetX=l,e.offsetY=c,e.deltaMode=0,s.unshift(e,i,o,r),d&&clearTimeout(d),d=setTimeout(g,200),(u.event.dispatch||u.event.handle).apply(this,s)}function g(){p=null}function m(e,t){return f.settings.adjustOldDeltas&&"mousewheel"===e.type&&t%120==0}u.fn.extend({mousewheel:function(e){return e?this.bind("mousewheel",e):this.trigger("mousewheel")},unmousewheel:function(e){return this.unbind("mousewheel",e)}})},"function"==typeof u.define&&u.define.amd?u.define("jquery-mousewheel",["jquery"],a):"object"==typeof exports?module.exports=a:a(t),u.define("jquery.select2",["jquery","jquery-mousewheel","./select2/core","./select2/defaults","./select2/utils"],function(i,e,o,t,r){var a;return null==i.fn.select2&&(a=["open","close","destroy"],i.fn.select2=function(t){if("object"==typeof(t=t||{}))return this.each(function(){var e=i.extend(!0,{},t);new o(i(this),e)}),this;if("string"!=typeof t)throw new Error("Invalid arguments for Select2: "+t);var n,s=Array.prototype.slice.call(arguments,1);return this.each(function(){var e=r.GetData(this,"select2");null==e&&window.console&&console.error&&console.error("The select2('"+t+"') method was called on an element that is not using Select2."),n=e[t].apply(e,s)}),-1<a.indexOf(t)?this:n}),null==i.fn.select2.defaults&&(i.fn.select2.defaults=t),o}),{define:u.define,require:u.require});function b(e,t){return s.call(e,t)}function l(e,t){var n,s,i,o,r,a,l,c,u,d,p=t&&t.split("/"),h=v.map,f=h&&h["*"]||{};if(e){for(t=(e=e.split("/")).length-1,v.nodeIdCompat&&_.test(e[t])&&(e[t]=e[t].replace(_,"")),"."===e[0].charAt(0)&&p&&(e=p.slice(0,p.length-1).concat(e)),c=0;c<e.length;c++)"."===(d=e[c])?(e.splice(c,1),--c):".."===d&&(0===c||1===c&&".."===e[2]||".."===e[c-1]||0<c&&(e.splice(c-1,2),c-=2));e=e.join("/")}if((p||f)&&h){for(c=(n=e.split("/")).length;0<c;--c){if(s=n.slice(0,c).join("/"),p)for(u=p.length;0<u;--u)if(i=h[p.slice(0,u).join("/")],i=i&&i[s]){o=i,r=c;break}if(o)break;!a&&f&&f[s]&&(a=f[s],l=c)}!o&&a&&(o=a,r=l),o&&(n.splice(0,r,o),e=n.join("/"))}return e}function w(t,n){return function(){var e=i.call(arguments,0);return"string"!=typeof e[0]&&1===e.length&&e.push(null),r.apply(p,e.concat([t,n]))}}function x(e){var t;if(b(m,e)&&(t=m[e],delete m[e],y[e]=!0,o.apply(p,t)),!b(g,e)&&!b(y,e))throw new Error("No "+e);return g[e]}function c(e){var t,n=e?e.indexOf("!"):-1;return-1<n&&(t=e.substring(0,n),e=e.substring(n+1,e.length)),[t,e]}function A(e){return e?c(e):[]}var u=a.require("jquery.select2");return t.fn.select2.amd=a,u});
\ No newline at end of file
diff --git a/vendor/assets/stylesheets/select2.min.css b/vendor/assets/stylesheets/select2.min.css
deleted file mode 100755
index f00f154728..0000000000
--- a/vendor/assets/stylesheets/select2.min.css
+++ /dev/null
@@ -1 +0,0 @@
-.select2-container{box-sizing:border-box;display:inline-block;margin:0;position:relative;vertical-align:middle}.select2-container .select2-selection--single{box-sizing:border-box;cursor:pointer;display:block;height:28px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--single .select2-selection__rendered{display:block;padding-left:8px;padding-right:20px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.select2-container .select2-selection--single .select2-selection__clear{background-color:transparent;border:none;font-size:1em}.select2-container[dir="rtl"] .select2-selection--single .select2-selection__rendered{padding-right:8px;padding-left:20px}.select2-container .select2-selection--multiple{box-sizing:border-box;cursor:pointer;display:block;min-height:32px;user-select:none;-webkit-user-select:none}.select2-container .select2-selection--multiple .select2-selection__rendered{display:inline;list-style:none;padding:0}.select2-container .select2-selection--multiple .select2-selection__clear{background-color:transparent;border:none;font-size:1em}.select2-container .select2-search--inline .select2-search__field{box-sizing:border-box;border:none;font-size:100%;margin-top:5px;margin-left:5px;padding:0;max-width:100%;resize:none;height:18px;vertical-align:bottom;font-family:sans-serif;overflow:hidden;word-break:keep-all}.select2-container .select2-search--inline .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-dropdown{background-color:white;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:block;position:absolute;left:-100000px;width:100%;z-index:1051}.select2-results{display:block}.select2-results__options{list-style:none;margin:0;padding:0}.select2-results__option{padding:6px;user-select:none;-webkit-user-select:none}.select2-results__option--selectable{cursor:pointer}.select2-container--open .select2-dropdown{left:0}.select2-container--open .select2-dropdown--above{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--open .select2-dropdown--below{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-search--dropdown{display:block;padding:4px}.select2-search--dropdown .select2-search__field{padding:4px;width:100%;box-sizing:border-box}.select2-search--dropdown .select2-search__field::-webkit-search-cancel-button{-webkit-appearance:none}.select2-search--dropdown.select2-search--hide{display:none}.select2-close-mask{border:0;margin:0;padding:0;display:block;position:fixed;left:0;top:0;min-height:100%;min-width:100%;height:auto;width:auto;opacity:0;z-index:99;background-color:#fff;filter:alpha(opacity=0)}.select2-hidden-accessible{border:0 !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;height:1px !important;overflow:hidden !important;padding:0 !important;position:absolute !important;width:1px !important;white-space:nowrap !important}.select2-container--default .select2-selection--single{background-color:#fff;border:1px solid #aaa;border-radius:4px}.select2-container--default .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--default .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;height:26px;margin-right:20px;padding-right:0px}.select2-container--default .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--default .select2-selection--single .select2-selection__arrow{height:26px;position:absolute;top:1px;right:1px;width:20px}.select2-container--default .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--default[dir="rtl"] .select2-selection--single .select2-selection__arrow{left:1px;right:auto}.select2-container--default.select2-container--disabled .select2-selection--single{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection--single .select2-selection__clear{display:none}.select2-container--default.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--default .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;padding-bottom:5px;padding-right:5px;position:relative}.select2-container--default .select2-selection--multiple.select2-selection--clearable{padding-right:25px}.select2-container--default .select2-selection--multiple .select2-selection__clear{cursor:pointer;font-weight:bold;height:20px;margin-right:10px;margin-top:5px;position:absolute;right:0;padding:1px}.select2-container--default .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;box-sizing:border-box;display:inline-block;margin-left:5px;margin-top:5px;padding:0;padding-left:20px;position:relative;max-width:100%;overflow:hidden;text-overflow:ellipsis;vertical-align:bottom;white-space:nowrap}.select2-container--default .select2-selection--multiple .select2-selection__choice__display{cursor:default;padding-left:2px;padding-right:5px}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove{background-color:transparent;border:none;border-right:1px solid #aaa;border-top-left-radius:4px;border-bottom-left-radius:4px;color:#999;cursor:pointer;font-size:1em;font-weight:bold;padding:0 4px;position:absolute;left:0;top:0}.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:hover,.select2-container--default .select2-selection--multiple .select2-selection__choice__remove:focus{background-color:#f1f1f1;color:#333;outline:none}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__display{padding-left:5px;padding-right:2px}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{border-left:1px solid #aaa;border-right:none;border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:4px;border-bottom-right-radius:4px}.select2-container--default[dir="rtl"] .select2-selection--multiple .select2-selection__clear{float:left;margin-left:10px;margin-right:auto}.select2-container--default.select2-container--focus .select2-selection--multiple{border:solid black 1px;outline:0}.select2-container--default.select2-container--disabled .select2-selection--multiple{background-color:#eee;cursor:default}.select2-container--default.select2-container--disabled .select2-selection__choice__remove{display:none}.select2-container--default.select2-container--open.select2-container--above .select2-selection--single,.select2-container--default.select2-container--open.select2-container--above .select2-selection--multiple{border-top-left-radius:0;border-top-right-radius:0}.select2-container--default.select2-container--open.select2-container--below .select2-selection--single,.select2-container--default.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--default .select2-search--dropdown .select2-search__field{border:1px solid #aaa}.select2-container--default .select2-search--inline .select2-search__field{background:transparent;border:none;outline:0;box-shadow:none;-webkit-appearance:textfield}.select2-container--default .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--default .select2-results__option .select2-results__option{padding-left:1em}.select2-container--default .select2-results__option .select2-results__option .select2-results__group{padding-left:0}.select2-container--default .select2-results__option .select2-results__option .select2-results__option{margin-left:-1em;padding-left:2em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-2em;padding-left:3em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-3em;padding-left:4em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-4em;padding-left:5em}.select2-container--default .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option .select2-results__option{margin-left:-5em;padding-left:6em}.select2-container--default .select2-results__option--group{padding:0}.select2-container--default .select2-results__option--disabled{color:#999}.select2-container--default .select2-results__option--selected{background-color:#ddd}.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable{background-color:#5897fb;color:white}.select2-container--default .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic .select2-selection--single{background-color:#f7f7f7;border:1px solid #aaa;border-radius:4px;outline:0;background-image:-webkit-linear-gradient(top, #fff 50%, #eee 100%);background-image:-o-linear-gradient(top, #fff 50%, #eee 100%);background-image:linear-gradient(to bottom, #fff 50%, #eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic .select2-selection--single:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--single .select2-selection__rendered{color:#444;line-height:28px}.select2-container--classic .select2-selection--single .select2-selection__clear{cursor:pointer;float:right;font-weight:bold;height:26px;margin-right:20px}.select2-container--classic .select2-selection--single .select2-selection__placeholder{color:#999}.select2-container--classic .select2-selection--single .select2-selection__arrow{background-color:#ddd;border:none;border-left:1px solid #aaa;border-top-right-radius:4px;border-bottom-right-radius:4px;height:26px;position:absolute;top:1px;right:1px;width:20px;background-image:-webkit-linear-gradient(top, #eee 50%, #ccc 100%);background-image:-o-linear-gradient(top, #eee 50%, #ccc 100%);background-image:linear-gradient(to bottom, #eee 50%, #ccc 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFCCCCCC', GradientType=0)}.select2-container--classic .select2-selection--single .select2-selection__arrow b{border-color:#888 transparent transparent transparent;border-style:solid;border-width:5px 4px 0 4px;height:0;left:50%;margin-left:-4px;margin-top:-2px;position:absolute;top:50%;width:0}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__clear{float:left}.select2-container--classic[dir="rtl"] .select2-selection--single .select2-selection__arrow{border:none;border-right:1px solid #aaa;border-radius:0;border-top-left-radius:4px;border-bottom-left-radius:4px;left:1px;right:auto}.select2-container--classic.select2-container--open .select2-selection--single{border:1px solid #5897fb}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow{background:transparent;border:none}.select2-container--classic.select2-container--open .select2-selection--single .select2-selection__arrow b{border-color:transparent transparent #888 transparent;border-width:0 4px 5px 4px}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--single{border-top:none;border-top-left-radius:0;border-top-right-radius:0;background-image:-webkit-linear-gradient(top, #fff 0%, #eee 50%);background-image:-o-linear-gradient(top, #fff 0%, #eee 50%);background-image:linear-gradient(to bottom, #fff 0%, #eee 50%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFFFFFFF', endColorstr='#FFEEEEEE', GradientType=0)}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--single{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0;background-image:-webkit-linear-gradient(top, #eee 50%, #fff 100%);background-image:-o-linear-gradient(top, #eee 50%, #fff 100%);background-image:linear-gradient(to bottom, #eee 50%, #fff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFEEEEEE', endColorstr='#FFFFFFFF', GradientType=0)}.select2-container--classic .select2-selection--multiple{background-color:white;border:1px solid #aaa;border-radius:4px;cursor:text;outline:0;padding-bottom:5px;padding-right:5px}.select2-container--classic .select2-selection--multiple:focus{border:1px solid #5897fb}.select2-container--classic .select2-selection--multiple .select2-selection__clear{display:none}.select2-container--classic .select2-selection--multiple .select2-selection__choice{background-color:#e4e4e4;border:1px solid #aaa;border-radius:4px;display:inline-block;margin-left:5px;margin-top:5px;padding:0}.select2-container--classic .select2-selection--multiple .select2-selection__choice__display{cursor:default;padding-left:2px;padding-right:5px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove{background-color:transparent;border:none;border-top-left-radius:4px;border-bottom-left-radius:4px;color:#888;cursor:pointer;font-size:1em;font-weight:bold;padding:0 4px}.select2-container--classic .select2-selection--multiple .select2-selection__choice__remove:hover{color:#555;outline:none}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice{margin-left:5px;margin-right:auto}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__display{padding-left:5px;padding-right:2px}.select2-container--classic[dir="rtl"] .select2-selection--multiple .select2-selection__choice__remove{border-top-left-radius:0;border-bottom-left-radius:0;border-top-right-radius:4px;border-bottom-right-radius:4px}.select2-container--classic.select2-container--open .select2-selection--multiple{border:1px solid #5897fb}.select2-container--classic.select2-container--open.select2-container--above .select2-selection--multiple{border-top:none;border-top-left-radius:0;border-top-right-radius:0}.select2-container--classic.select2-container--open.select2-container--below .select2-selection--multiple{border-bottom:none;border-bottom-left-radius:0;border-bottom-right-radius:0}.select2-container--classic .select2-search--dropdown .select2-search__field{border:1px solid #aaa;outline:0}.select2-container--classic .select2-search--inline .select2-search__field{outline:0;box-shadow:none}.select2-container--classic .select2-dropdown{background-color:#fff;border:1px solid transparent}.select2-container--classic .select2-dropdown--above{border-bottom:none}.select2-container--classic .select2-dropdown--below{border-top:none}.select2-container--classic .select2-results>.select2-results__options{max-height:200px;overflow-y:auto}.select2-container--classic .select2-results__option--group{padding:0}.select2-container--classic .select2-results__option--disabled{color:grey}.select2-container--classic .select2-results__option--highlighted.select2-results__option--selectable{background-color:#3875d7;color:#fff}.select2-container--classic .select2-results__group{cursor:default;display:block;padding:6px}.select2-container--classic.select2-container--open .select2-dropdown{border-color:#5897fb}
\ No newline at end of file

From 89713b429005b46b1f0669f57c3d8c560d319ee4 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:44:13 -0300
Subject: [PATCH 110/352] Install `stimulus`

---
 package.json |  2 ++
 yarn.lock    | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/package.json b/package.json
index ff2aed57cd..269d5bc4f1 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,7 @@
 {
   "dependencies": {
+    "@hotwired/stimulus": "^3.2.1",
+    "@hotwired/stimulus-webpack-helpers": "^1.0.1",
     "@rails/webpacker": "^6.0.0-rc.6",
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.2",
diff --git a/yarn.lock b/yarn.lock
index cc285272ee..0a16691d7f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -920,6 +920,16 @@
   resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
+"@hotwired/stimulus-webpack-helpers@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@hotwired/stimulus-webpack-helpers/-/stimulus-webpack-helpers-1.0.1.tgz#4cd74487adeca576c9865ac2b9fe5cb20cef16dd"
+  integrity sha512-wa/zupVG0eWxRYJjC1IiPBdt3Lruv0RqGN+/DTMmUWUyMAEB27KXmVY6a8YpUVTM7QwVuaLNGW4EqDgrS2upXQ==
+
+"@hotwired/stimulus@^3.2.1":
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@hotwired/stimulus/-/stimulus-3.2.1.tgz#e3de23623b0c52c247aba4cd5d530d257008676b"
+  integrity sha512-HGlzDcf9vv/EQrMJ5ZG6VWNs8Z/xMN+1o2OhV1gKiSG6CqZt5MCBB1gRg5ILiN3U0jEAxuDTNPRfBcnZBDmupQ==
+
 "@jridgewell/gen-mapping@^0.1.0":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996"

From e0f7d95b9346ea0d428690c088b671c2d162c5d3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:53:38 -0300
Subject: [PATCH 111/352] Start integrating `stimulus` into admin UI

---
 app/javascript/admin.js                   |  6 ++++
 app/javascript/application_controller.js  | 35 +++++++++++++++++++++++
 app/javascript/packs/application-admin.js |  1 +
 3 files changed, 42 insertions(+)
 create mode 100644 app/javascript/admin.js
 create mode 100644 app/javascript/application_controller.js
 create mode 100644 app/javascript/packs/application-admin.js

diff --git a/app/javascript/admin.js b/app/javascript/admin.js
new file mode 100644
index 0000000000..2d08e9bc9b
--- /dev/null
+++ b/app/javascript/admin.js
@@ -0,0 +1,6 @@
+import { Application } from '@hotwired/stimulus';
+import { definitionsFromContext } from '@hotwired/stimulus-webpack-helpers';
+
+const application = Application.start();
+const context = require.context('controllers', true, /_controller\.js$/);
+application.load(definitionsFromContext(context));
diff --git a/app/javascript/application_controller.js b/app/javascript/application_controller.js
new file mode 100644
index 0000000000..a42e264de1
--- /dev/null
+++ b/app/javascript/application_controller.js
@@ -0,0 +1,35 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+  get classList() {
+    return this.element.classList;
+  }
+
+  get csrfToken() {
+    return this.metaValue('csrf-token');
+  }
+
+  dispatch(eventName, { target = this.element, detail = {}, bubbles = true, cancelable = true } = {}) {
+    const type = `${this.identifier}:${eventName}`;
+    const event = new CustomEvent(type, { detail, bubbles, cancelable });
+    target.dispatchEvent(event);
+    return event;
+  }
+
+  observeMutations(callback, target = this.element, options = { childList: true, subtree: true }) {
+    const observer = new MutationObserver((mutations) => {
+      observer.disconnect();
+      Promise.resolve().then(start); // eslint-disable-line no-use-before-define
+      callback.call(this, mutations);
+    });
+    function start() {
+      if (target.isConnected) observer.observe(target, options);
+    }
+    start();
+  }
+
+  metaValue(name) {
+    const element = document.head.querySelector(`meta[name="${name}"]`);
+    return element && element.getAttribute('content');
+  }
+}
diff --git a/app/javascript/packs/application-admin.js b/app/javascript/packs/application-admin.js
new file mode 100644
index 0000000000..cc47ae7d7a
--- /dev/null
+++ b/app/javascript/packs/application-admin.js
@@ -0,0 +1 @@
+require('admin')
\ No newline at end of file

From 5592da234dded9f7b1250b1b9853369faa25d4d3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:56:53 -0300
Subject: [PATCH 112/352] Update Webpack config

---
 config/webpack/base.js        | 17 ++++++++++++-----
 config/webpack/development.js |  6 +++---
 config/webpack/production.js  |  6 +++---
 config/webpack/test.js        |  6 +++---
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/config/webpack/base.js b/config/webpack/base.js
index 034c049332..48d8f5e247 100644
--- a/config/webpack/base.js
+++ b/config/webpack/base.js
@@ -1,8 +1,15 @@
-const { webpackConfig, merge } = require('@rails/webpacker')
+const webpack = require('webpack');
+const { merge, webpackConfig } = require('@rails/webpacker');
+
 const customConfig = {
+  plugins: [
+    new webpack.ProvidePlugin({
+      ApplicationController: ['application_controller', 'default'],
+    }),
+  ],
   resolve: {
-    extensions: ['.css', '.scss']
-  }
-}
+    extensions: ['.css', '.scss'],
+  },
+};
 
-module.exports = merge(webpackConfig, customConfig)
\ No newline at end of file
+module.exports = merge(webpackConfig, customConfig);
diff --git a/config/webpack/development.js b/config/webpack/development.js
index c84a413b59..8b54a9ce38 100644
--- a/config/webpack/development.js
+++ b/config/webpack/development.js
@@ -1,5 +1,5 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const webpackConfig = require('./base')
+const webpackConfig = require('./base');
 
-module.exports = webpackConfig
+module.exports = webpackConfig;
diff --git a/config/webpack/production.js b/config/webpack/production.js
index c41e043601..e5ef88d10c 100644
--- a/config/webpack/production.js
+++ b/config/webpack/production.js
@@ -1,5 +1,5 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'production'
+process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
-const webpackConfig = require('./base')
+const webpackConfig = require('./base');
 
-module.exports = webpackConfig
+module.exports = webpackConfig;
diff --git a/config/webpack/test.js b/config/webpack/test.js
index c84a413b59..8b54a9ce38 100644
--- a/config/webpack/test.js
+++ b/config/webpack/test.js
@@ -1,5 +1,5 @@
-process.env.NODE_ENV = process.env.NODE_ENV || 'development'
+process.env.NODE_ENV = process.env.NODE_ENV || 'development';
 
-const webpackConfig = require('./base')
+const webpackConfig = require('./base');
 
-module.exports = webpackConfig
+module.exports = webpackConfig;

From 3925d250c87da064c2aaf7ae7b9577ac7a7e8f6e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:58:08 -0300
Subject: [PATCH 113/352] Include `application-admin.js` within admin layouts

---
 app/views/layouts/application-admin.html.slim    | 1 +
 app/views/layouts/application-assessor.html.slim | 1 +
 app/views/layouts/application-judge.html.slim    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 3bd3ec3729..25b0cbe50d 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -122,4 +122,5 @@ html.no-js
 
     - if should_enable_js?
       = javascript_include_tag 'application-admin'
+      = javascript_pack_tag 'application-admin'
       = javascript_tag "$(function() { AdminAssessorAutomatedPollingOfSession.init('admin'); });"
diff --git a/app/views/layouts/application-assessor.html.slim b/app/views/layouts/application-assessor.html.slim
index 5a67e432b8..6323148a3b 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -96,4 +96,5 @@ html.no-js
 
     - if should_enable_js?
       = javascript_include_tag 'application-admin'
+      = javascript_pack_tag 'application-admin'
       = javascript_tag "$(function() { AdminAssessorAutomatedPollingOfSession.init('assessor'); });"
diff --git a/app/views/layouts/application-judge.html.slim b/app/views/layouts/application-judge.html.slim
index 3fd42c2fc6..a1d45d573a 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -93,4 +93,5 @@ html.no-js
 
     - if should_enable_js?
       = javascript_include_tag 'application-admin'
+      = javascript_pack_tag 'application-admin'
       = javascript_tag "$(function() { AdminAssessorAutomatedPollingOfSession.init('judge'); });"

From e3001d3f8abe93fd10b06ca011c74441712ba584 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:58:36 -0300
Subject: [PATCH 114/352] Add testing controllers

---
 .../controllers/autofocus_first_element_controller.js      | 7 +++++++
 app/javascript/controllers/element_removal_controller.js   | 5 +++++
 2 files changed, 12 insertions(+)
 create mode 100644 app/javascript/controllers/autofocus_first_element_controller.js
 create mode 100644 app/javascript/controllers/element_removal_controller.js

diff --git a/app/javascript/controllers/autofocus_first_element_controller.js b/app/javascript/controllers/autofocus_first_element_controller.js
new file mode 100644
index 0000000000..68d54d6b6f
--- /dev/null
+++ b/app/javascript/controllers/autofocus_first_element_controller.js
@@ -0,0 +1,7 @@
+export default class extends ApplicationController {
+  static targets = ['element'];
+
+  connect() {
+    this.elementTargets[0].focus();
+  }
+}
diff --git a/app/javascript/controllers/element_removal_controller.js b/app/javascript/controllers/element_removal_controller.js
new file mode 100644
index 0000000000..7341e71d5a
--- /dev/null
+++ b/app/javascript/controllers/element_removal_controller.js
@@ -0,0 +1,5 @@
+export default class extends ApplicationController {
+  remove() {
+    this.element.remove();
+  }
+}

From ca8b55cbd0b83f0216384013cf69120c92818ba5 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Sun, 16 Jul 2023 22:59:33 -0300
Subject: [PATCH 115/352] Add `Procfile.webpack` to make Webpack initialization
 optional

---
 Procfile.webpack | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 Procfile.webpack

diff --git a/Procfile.webpack b/Procfile.webpack
new file mode 100644
index 0000000000..6b8c62be87
--- /dev/null
+++ b/Procfile.webpack
@@ -0,0 +1,3 @@
+web: bundle exec rake cf:run_migrations db:migrate && bin/rails server -p $PORT
+worker: bundle exec sidekiq -L ./log/worker.log -C ./config/sidekiq.yml
+webpack: bin/webpack-dev-server
\ No newline at end of file

From d24ea21bf3bbcf2559b20820ba88df74f83b26f0 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 17 Jul 2023 20:35:07 -0300
Subject: [PATCH 116/352] Focus form element when it appears

---
 .../javascripts/admin/form_answers.js.coffee  | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index fd7492260f..3ecca2ff9d 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -1,3 +1,6 @@
+FOCUSABLE_ELEMENTS = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href], [tabindex]:not([tabindex="-1"]):not([disabled]), details:not([disabled]), summary:not(:disabled)'
+FOCUSABLE_FORM_ELEMENTS = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled])'
+
 ready = ->
   htmlDecode = (value) ->
     $("<div/>").html(value).text()
@@ -314,9 +317,15 @@ ready = ->
     if $('.form_answer_attachment').length == 0
       sidebarSection.find(".document-list .p-empty").removeClass("visuallyhidden")
 
-  $(document).on "click", ".form-edit-link", (e) ->
+  $(document).on 'click', '.form-edit-link', (e) ->
     e.preventDefault()
-    $(this).closest(".form-group").addClass("form-edit")
+    element = this.closest('.form-group') || this.closest('form')
+
+    if (element)
+      element.classList.add('form-edit')
+      console.log(element, FOCUSABLE_FORM_ELEMENTS)
+      focus(element, FOCUSABLE_FORM_ELEMENTS)
+
   $(".submit-assessment").on "ajax:error", (e, data, status, xhr) ->
     errors = data.responseJSON
     $(this).addClass("field-with-errors")
@@ -607,3 +616,23 @@ handleRemovingOfAuditCertificate = ->
     return false
 
 $(document).ready(ready)
+
+visible = (el) ->
+  !el.hidden and (!el.type or el.type != 'hidden') and (el.offsetWidth > 0 or el.offsetHeight > 0)
+
+focusable = (el) ->
+  el.tabIndex >= 0 and !el.disabled and visible(el)
+
+focus = (el, elements = FOCUSABLE_ELEMENTS) ->
+  autofocusElement = Array.from(el.querySelectorAll(elements)).filter(focusable)[0]
+  if autofocusElement
+    autofocusElement.focus()
+  return
+
+autofocus = (el) ->
+  autofocusElement = Array.from(el.querySelectorAll('[autofocus]')).filter(focusable)[0]
+  if !autofocusElement
+    autofocusElement = el
+    el.setAttribute('tabindex', '-1')
+  autofocusElement.focus()
+  return
\ No newline at end of file

From bd3c46d932f7f0840acd6f49940da1fdb844ef15 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 18 Jul 2023 09:29:30 +0100
Subject: [PATCH 117/352] adds focus styles for inputs and navbar

---
 app/assets/stylesheets/admin/base.scss        | 19 +++++++++++++++++--
 .../stylesheets/admin/header-footer.scss      |  5 ++---
 app/assets/stylesheets/application-admin.scss |  1 -
 .../_section_case_summary.html.slim           |  2 +-
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 4d26116a33..adc678d69d 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -14,8 +14,8 @@ a {
   }
 }
 
-.btn, a {
-  &:focus {
+.btn, button, a, [role=menuitem] {
+  &:focus, &:focus-within {
     background-color: $govuk-highlight-yellow !important;
     border-color: $govuk-highlight-yellow;
     color: $black !important;
@@ -23,6 +23,17 @@ a {
   }
 }
 
+.search-submit, input[type=search],
+input[type=text], input[type=tel],
+input[type=email], input[type=password],
+input[type=checkbox], select {
+  &:focus {
+    outline: 3px solid #ffdd00;
+    outline-offset: 0;
+    box-shadow: inset 0 0 0 2px;
+  }
+}
+
 .btn-primary {
   &:focus {
     border-bottom-color: $black !important;
@@ -1451,6 +1462,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
     &:focus {
       border-bottom: none !important;
+
+      small {
+        color: $black !important;
+      }
     }
 
     @include is-retina {
diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index e27ff4aa58..18fbd9abf2 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -254,9 +254,8 @@
 
   // moving down here seems to make it work
   .navbar-brand {
-    padding-top: 14px;
-    padding-bottom: 0;
-    text-align: left;
+    padding: 14px;
+    height: 100%;
     img {
       width: 28px;
       height: 33px;
diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index 2116659e06..e1d1153012 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -59,6 +59,5 @@ $todo-black: #333;
     &:focus {
       top: 20px;
       left: 20px;
-      color: white !important;
     }
 }
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index bbf8477118..1dd043273c 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -1,7 +1,7 @@
 - if visible_case_summaries(current_subject, resource)
   - visible_case_summaries(current_subject, resource).each do |assessment_obj|
     - assessment = assessment_obj.assessment
-    .panel.panel-parent
+    .panel.panel-parent.panel-default
       .panel-heading id="case-summary-heading-#{assessment.position}"
         h3.panel-title
           a data-toggle="collapse" href="#section-case-summary-#{assessment.position}" aria-expanded="true" aria-controls="section-case-summary-#{assessment.position}"

From 9bf7403a0664f0355155bb84a7d42a806eacab03 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 18 Jul 2023 07:49:38 -0300
Subject: [PATCH 118/352] Make `focus` fn accessible via `window`

---
 .../javascripts/admin/focusable.js.coffee     | 25 ++++++++++++++++++
 .../javascripts/admin/form_answers.js.coffee  | 26 +------------------
 2 files changed, 26 insertions(+), 25 deletions(-)
 create mode 100644 app/assets/javascripts/admin/focusable.js.coffee

diff --git a/app/assets/javascripts/admin/focusable.js.coffee b/app/assets/javascripts/admin/focusable.js.coffee
new file mode 100644
index 0000000000..4d5f3c5365
--- /dev/null
+++ b/app/assets/javascripts/admin/focusable.js.coffee
@@ -0,0 +1,25 @@
+FOCUSABLE_ELEMENTS = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href], [tabindex]:not([tabindex="-1"]):not([disabled]), details:not([disabled]), summary:not(:disabled)'
+FOCUSABLE_FORM_ELEMENTS = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled])'
+
+window.FOCUSABLE_ELEMENTS = FOCUSABLE_ELEMENTS
+window.FOCUSABLE_FORM_ELEMENTS = FOCUSABLE_FORM_ELEMENTS
+
+visible = (el) ->
+  !el.hidden and (!el.type or el.type != 'hidden') and (el.offsetWidth > 0 or el.offsetHeight > 0)
+
+focusable = (el) ->
+  el.tabIndex >= 0 and !el.disabled and visible(el)
+
+window.focusElement = (el, elements = FOCUSABLE_ELEMENTS) ->
+  autofocusElement = Array.from(el.querySelectorAll(elements)).filter(focusable)[0]
+  if autofocusElement
+    autofocusElement.focus()
+  return
+
+window.autofocusElement = (el) ->
+  autofocusElement = Array.from(el.querySelectorAll('[autofocus]')).filter(focusable)[0]
+  if !autofocusElement
+    autofocusElement = el
+    el.setAttribute('tabindex', '-1')
+  autofocusElement.focus()
+  return
\ No newline at end of file
diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 3ecca2ff9d..785d9187de 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -1,6 +1,3 @@
-FOCUSABLE_ELEMENTS = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href], [tabindex]:not([tabindex="-1"]):not([disabled]), details:not([disabled]), summary:not(:disabled)'
-FOCUSABLE_FORM_ELEMENTS = 'input:not([disabled]), select:not([disabled]), textarea:not([disabled])'
-
 ready = ->
   htmlDecode = (value) ->
     $("<div/>").html(value).text()
@@ -323,8 +320,7 @@ ready = ->
 
     if (element)
       element.classList.add('form-edit')
-      console.log(element, FOCUSABLE_FORM_ELEMENTS)
-      focus(element, FOCUSABLE_FORM_ELEMENTS)
+      window.focusElement(element, window.FOCUSABLE_FORM_ELEMENTS)
 
   $(".submit-assessment").on "ajax:error", (e, data, status, xhr) ->
     errors = data.responseJSON
@@ -616,23 +612,3 @@ handleRemovingOfAuditCertificate = ->
     return false
 
 $(document).ready(ready)
-
-visible = (el) ->
-  !el.hidden and (!el.type or el.type != 'hidden') and (el.offsetWidth > 0 or el.offsetHeight > 0)
-
-focusable = (el) ->
-  el.tabIndex >= 0 and !el.disabled and visible(el)
-
-focus = (el, elements = FOCUSABLE_ELEMENTS) ->
-  autofocusElement = Array.from(el.querySelectorAll(elements)).filter(focusable)[0]
-  if autofocusElement
-    autofocusElement.focus()
-  return
-
-autofocus = (el) ->
-  autofocusElement = Array.from(el.querySelectorAll('[autofocus]')).filter(focusable)[0]
-  if !autofocusElement
-    autofocusElement = el
-    el.setAttribute('tabindex', '-1')
-  autofocusElement.focus()
-  return
\ No newline at end of file

From 365100e638ac6c4d4bd9e2e1d7054ab44fe865b9 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 18 Jul 2023 07:50:52 -0300
Subject: [PATCH 119/352] Focus form elements when they appear on settings page

---
 app/assets/javascripts/admin/settings.js.coffee | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/assets/javascripts/admin/settings.js.coffee b/app/assets/javascripts/admin/settings.js.coffee
index 0c878afbf8..f6ad04f52a 100644
--- a/app/assets/javascripts/admin/settings.js.coffee
+++ b/app/assets/javascripts/admin/settings.js.coffee
@@ -95,6 +95,8 @@ jQuery ->
       ($ ".deadline-form", wrapper).removeClass("hidden")
       ($ e.currentTarget).addClass("hidden")
 
+      window.focusElement(wrapper[0], window.FOCUSABLE_FORM_ELEMENTS)
+
     settingsWrapper.on "click", ".edit-notification", (e) ->
       e.preventDefault()
 
@@ -104,10 +106,14 @@ jQuery ->
       ($ ".notification-edit-form", wrapper).removeClass("hidden")
       ($ ".actions", wrapper).addClass("hidden")
 
+      window.focusElement(wrapper[0], window.FOCUSABLE_FORM_ELEMENTS)
+
     settingsWrapper.on "click", ".btn-add-schedule", (e) ->
       e.preventDefault()
       wrapper = ($ e.currentTarget).closest('.panel-section')
       ($ ".notification-form", wrapper).toggleClass("hidden")
+      
+      window.focusElement(wrapper[0], window.FOCUSABLE_FORM_ELEMENTS)
 
     settingsWrapper.on "click", ".link-email-example", (e) ->
       e.preventDefault()

From d8ed7cbf63029aca39b100137959c7f1175fad65 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 18 Jul 2023 14:32:05 +0100
Subject: [PATCH 120/352] Make password errors more accessible

---
 .../frontend/password-strength-indicator.js   |  6 ++++
 app/assets/stylesheets/admin/_variables.scss  |  1 +
 app/views/admin/admins/_form.html.slim        | 32 ++++++++-----------
 app/views/admin/assessors/_form.html.slim     | 31 ++++++++----------
 app/views/admin/judges/_form.html.slim        | 29 ++++++++---------
 .../admin/users/_fields_password.html.slim    | 31 ++++++++----------
 6 files changed, 59 insertions(+), 71 deletions(-)

diff --git a/app/assets/javascripts/frontend/password-strength-indicator.js b/app/assets/javascripts/frontend/password-strength-indicator.js
index 71f7b07917..0820d7812a 100644
--- a/app/assets/javascripts/frontend/password-strength-indicator.js
+++ b/app/assets/javascripts/frontend/password-strength-indicator.js
@@ -138,6 +138,7 @@ $(function() {
 
         if (someProblem) {
           $('#password-guidance').removeClass("govuk-!-display-none");
+          $('#password-result-span').addClass("visuallyhidden")
         } else {
           $('#password-guidance').addClass("govuk-!-display-none");
         }
@@ -147,8 +148,10 @@ $(function() {
 
         if ($passwordField.val().length == 0) {
           $passwordField.attr('aria-invalid', "true");
+          $('#password-result-span').addClass("visuallyhidden")
         } else if ($.inArray('good-password', guidance) >= 0) {
           $passwordField.attr('aria-invalid', "false");
+          $('#password-result-span').removeClass("visuallyhidden")
         } else {
           $passwordField.attr('aria-invalid', "true");
         }
@@ -160,13 +163,16 @@ $(function() {
 
         if ($passwordConfirmationField.val().length == 0) {
           $passwordConfirmationField.attr('aria-invalid', "true");
+          $('#password-confirmation-result-span').addClass("visuallyhidden")
         } else if ($.inArray('confirmation-not-matching', guidance) >= 0) {
           $passwordConfirmationField.attr('aria-invalid', "true");
           indicator.parent().removeClass('confirmation-matching');
+          $('#password-confirmation-result-span').addClass("visuallyhidden")
         } else if ($.inArray('confirmation-matching', guidance) >= 0) {
           $passwordConfirmationField.attr('aria-invalid', "false");
           if($.inArray('good-password', guidance) >= 0) {
             indicator.parent().addClass('confirmation-matching');
+            $('#password-confirmation-result-span').removeClass("visuallyhidden")
           }
         }
       }
diff --git a/app/assets/stylesheets/admin/_variables.scss b/app/assets/stylesheets/admin/_variables.scss
index bc468ae153..7408574679 100644
--- a/app/assets/stylesheets/admin/_variables.scss
+++ b/app/assets/stylesheets/admin/_variables.scss
@@ -31,3 +31,4 @@ $header-hover: #444;
 $blue-link-colour: #3264A3;
 $govuk-light-blue: #5694ca;
 $govuk-highlight-yellow: #fd0;
+$govuk-warning-red: #d4351c;
diff --git a/app/views/admin/admins/_form.html.slim b/app/views/admin/admins/_form.html.slim
index 15ec8cd341..e0df3f95a7 100644
--- a/app/views/admin/admins/_form.html.slim
+++ b/app/views/admin/admins/_form.html.slim
@@ -26,6 +26,14 @@
   .question-group#password-change-panel
     #password-control-group
       h3 = f.label :password, class: "form-label"
+      .guidance-panel.if-no-js-hide
+        .govuk-form-group--error#password-guidance
+          p.govuk-error-message.text-underline Please improve your password
+          p.govuk-error-message#password-too-short
+            ' It must be at least 10 characters.
+          p.govuk-error-message#parts-of-email It shouldn't include part or all of your email address.
+          p.govuk-error-message#password-entropy
+            ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
       .row
         .col-md-4.col-sm-6
           .input-group
@@ -33,23 +41,15 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control', "data-min-password-length" => "10" },
                       label: false
-            span#password-result-span.input-group-addon
+            span#password-result-span.input-group-addon.visuallyhidden
               i#password-result.glyphicon.glyphicon-ok
       .clear
 
-    .guidance-panel.if-no-js-hide
-      #password-guidance
-        br
-        .alert.alert-warning
-          p.text-underline Please improve your password
-          p#password-too-short
-            ' It must be at least 10 characters.
-          p#parts-of-email It shouldn't include part or all of your email address.
-          p#password-entropy
-            ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
-
     #password-confirmation-control-group
       h3 = f.label :password_confirmation, label: "Retype password", class: "form-label"
+      .if-no-js-hide
+        .govuk-form-group--error#password-confirmation-guidance
+          p.govuk-error-message#password-confirmation-match The confirmation must match the password
       .row
         .col-md-4.col-sm-6
           .input-group
@@ -57,16 +57,10 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-confirmation-result-span.input-group-addon
+            span#password-confirmation-result-span.input-group-addon.visuallyhidden
               i#password-confirmation-result.glyphicon.glyphicon-ok
       .clear
 
-    .if-no-js-hide
-      #password-confirmation-guidance
-        br
-        .alert.alert-warning
-          p#password-confirmation-match The confirmation must match the password
-
   br
   .row
     .col-md-4.col-sm-6
diff --git a/app/views/admin/assessors/_form.html.slim b/app/views/admin/assessors/_form.html.slim
index 2a1b556d39..4ac14b5d9e 100644
--- a/app/views/admin/assessors/_form.html.slim
+++ b/app/views/admin/assessors/_form.html.slim
@@ -42,6 +42,14 @@
   .question-group#password-change-panel
     #password-control-group
       h2 = f.label :password, class: "form-label"
+      .guidance-panel.if-no-js-hide
+        .govuk-form-group--error#password-guidance
+          p.govuk-error-message.text-underline Please improve your password
+          p.govuk-error-message#password-too-short
+            ' It must be at least 10 characters.
+          p.govuk-error-message#parts-of-email It shouldn't include part or all of your email address.
+          p.govuk-error-message#password-entropy
+            ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
       .row
         .col-md-4.col-sm-6
           .input-group
@@ -49,22 +57,15 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-result-span.input-group-addon
+            span#password-result-span.input-group-addon.visuallyhidden
               i#password-result.glyphicon.glyphicon-ok
       .clear
-    .guidance-panel.if-no-js-hide
-      #password-guidance
-        br
-        .alert.alert-warning
-          p.text-underline Please improve your password
-          p#password-too-short
-            ' It must be at least 10 characters.
-          p#parts-of-email It shouldn't include part or all of your email address.
-          p#password-entropy
-            ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
 
     #password-confirmation-control-group
       h2 = f.label :password_confirmation, label: "Retype password", class: "form-label"
+      .if-no-js-hide
+        .govuk-form-group--error#password-confirmation-guidance
+          p.govuk-error-message#password-confirmation-match The confirmation must match the password
       .row
         .col-md-4.col-sm-6
           .input-group
@@ -72,16 +73,10 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-confirmation-result-span.input-group-addon
+            span#password-confirmation-result-span.input-group-addon.visuallyhidden
               i#password-confirmation-result.glyphicon.glyphicon-ok
       .clear
 
-    .if-no-js-hide
-      #password-confirmation-guidance
-        br
-        .alert.alert-warning
-          p#password-confirmation-match The confirmation must match the password
-
   br
 
   .row
diff --git a/app/views/admin/judges/_form.html.slim b/app/views/admin/judges/_form.html.slim
index 63a29d7817..d0d6c3cb8c 100644
--- a/app/views/admin/judges/_form.html.slim
+++ b/app/views/admin/judges/_form.html.slim
@@ -26,6 +26,15 @@
   .question-group#password-change-panel
     #password-control-group
       h3 = f.label :password, class: "form-label"
+      .guidance-panel.if-no-js-hide
+        .govuk-form-group--error#password-guidance
+          p.govuk-error-message.text-underline Please improve your password
+          p.govuk-error-message#password-too-short
+            ' It must be at least 10 characters.
+          p.govuk-error-message#parts-of-email It shouldn't include part or all of your email address.
+          p.govuk-error-message#password-entropy
+            ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
+
       .row
         .col-md-4.col-sm-6
           .input-group
@@ -33,19 +42,9 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-result-span.input-group-addon
+            span#password-result-span.input-group-addon.visuallyhidden
               i#password-result.glyphicon.glyphicon-ok
       .clear
-    .guidance-panel.if-no-js-hide
-      #password-guidance
-        br
-        .alert.alert-warning
-          p.text-underline Please improve your password
-          p#password-too-short
-            ' It must be at least 10 characters.
-          p#parts-of-email It shouldn't include part or all of your email address.
-          p#password-entropy
-            ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
 
     #password-confirmation-control-group
       h3 = f.label :password_confirmation, label: "Retype password", class: "form-label"
@@ -56,15 +55,13 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-confirmation-result-span.input-group-addon
+            span#password-confirmation-result-span.input-group-addon.visuallyhidden
               i#password-confirmation-result.glyphicon.glyphicon-ok
       .clear
 
     .if-no-js-hide
-      #password-confirmation-guidance
-        br
-        .alert.alert-warning
-          p#password-confirmation-match The confirmation must match the password
+      .govuk-form-group--error#password-confirmation-guidance
+        p.govuk-error-message#password-confirmation-match The confirmation must match the password
 
   br
 
diff --git a/app/views/admin/users/_fields_password.html.slim b/app/views/admin/users/_fields_password.html.slim
index 02de52d9ac..d753cc0941 100644
--- a/app/views/admin/users/_fields_password.html.slim
+++ b/app/views/admin/users/_fields_password.html.slim
@@ -18,6 +18,14 @@
       - else
         = f.label :password, label: "Password"
         - password_hint = ""
+    .guidance-panel.if-no-js-hide
+      .govuk-form-group--error#password-guidance
+        p.govuk-error-message.text-underline Please improve your password
+        p.govuk-error-message#password-too-short
+          ' It must be at least 10 characters.
+        p.govuk-error-message#parts-of-email It shouldn't include part or all of your email address.
+        p.govuk-error-message#password-entropy
+          ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
     .row
       .col-md-4.col-sm-6
         .input-group
@@ -25,22 +33,15 @@
                     wrapper_html: { class: "form-group" },
                     input_html: { class: "form-control password-strength-meter" },
                     label_html: { class: "visuallyhidden" }
-          span#password-result-span.input-group-addon
+          span#password-result-span.input-group-addon.visuallyhidden
             i#password-result.glyphicon.glyphicon-ok
         span.hint = password_hint
 
-  .guidance-panel.if-no-js-hide
-    #password-guidance
-      .alert.alert-warning
-        p.text-underline Please improve your password
-        p#password-too-short
-          ' It must be at least 10 characters.
-        p#parts-of-email It shouldn't include part or all of your email address.
-        p#password-entropy
-          ' It must be more complex. Consider using whole sentences (with spaces), lyrics or phrases to make it more memorable.
-
   .question-group#password-confirmation-control-group
     h3 = f.label :password_confirmation, label: "Retype password"
+    .if-no-js-hide
+      .govuk-form-group--error#password-confirmation-guidance
+        p.govuk-error-message#password-confirmation-match The confirmation must match the password
     .row
       .col-md-4.col-sm-6
         .input-group
@@ -48,11 +49,5 @@
                     wrapper_html: { class: "form-group" },
                     input_html: { class: "form-control" },
                     label_html: { class: "visuallyhidden" }
-          span#password-confirmation-result-span.input-group-addon
+          span#password-confirmation-result-span.input-group-addon.visuallyhidden
             i#password-confirmation-result.glyphicon.glyphicon-ok
-
-  .if-no-js-hide
-    #password-confirmation-guidance
-      br
-      .alert.alert-warning
-        p#password-confirmation-match The confirmation must match the password

From 7e2d610a610a1463d36ac86353a3e929e0ef6bcb Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 18 Jul 2023 23:17:18 -0300
Subject: [PATCH 121/352] Use Stimulus controller to add/remove focus

---
 .../javascripts/admin/form_answers.js.coffee  |  4 +-
 .../javascripts/admin/settings.js.coffee      | 14 ++----
 .../controllers/element_focus_controller.js   | 50 +++++++++++++++++++
 3 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 app/javascript/controllers/element_focus_controller.js

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 785d9187de..a6ac29f4ca 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -316,11 +316,9 @@ ready = ->
 
   $(document).on 'click', '.form-edit-link', (e) ->
     e.preventDefault()
-    element = this.closest('.form-group') || this.closest('form')
-
+    element = this.closest('.form-group')
     if (element)
       element.classList.add('form-edit')
-      window.focusElement(element, window.FOCUSABLE_FORM_ELEMENTS)
 
   $(".submit-assessment").on "ajax:error", (e, data, status, xhr) ->
     errors = data.responseJSON
diff --git a/app/assets/javascripts/admin/settings.js.coffee b/app/assets/javascripts/admin/settings.js.coffee
index f6ad04f52a..2b927673fc 100644
--- a/app/assets/javascripts/admin/settings.js.coffee
+++ b/app/assets/javascripts/admin/settings.js.coffee
@@ -95,8 +95,6 @@ jQuery ->
       ($ ".deadline-form", wrapper).removeClass("hidden")
       ($ e.currentTarget).addClass("hidden")
 
-      window.focusElement(wrapper[0], window.FOCUSABLE_FORM_ELEMENTS)
-
     settingsWrapper.on "click", ".edit-notification", (e) ->
       e.preventDefault()
 
@@ -106,14 +104,10 @@ jQuery ->
       ($ ".notification-edit-form", wrapper).removeClass("hidden")
       ($ ".actions", wrapper).addClass("hidden")
 
-      window.focusElement(wrapper[0], window.FOCUSABLE_FORM_ELEMENTS)
-
     settingsWrapper.on "click", ".btn-add-schedule", (e) ->
       e.preventDefault()
       wrapper = ($ e.currentTarget).closest('.panel-section')
       ($ ".notification-form", wrapper).toggleClass("hidden")
-      
-      window.focusElement(wrapper[0], window.FOCUSABLE_FORM_ELEMENTS)
 
     settingsWrapper.on "click", ".link-email-example", (e) ->
       e.preventDefault()
@@ -123,20 +117,20 @@ jQuery ->
     settingsWrapper.on "click", ".btn-cancel", (e) ->
       e.preventDefault()
 
-      form_well = ($ e.currentTarget).closest('.well')
+      well = ($ e.currentTarget).closest('.well')
 
-      if form_well.hasClass("deadline-form")
+      if well.hasClass("deadline-form")
         wrapper = ($ e.currentTarget).closest('.deadline')
         ($ ".form-value", wrapper).removeClass("hidden")
         ($ ".deadline-form", wrapper).addClass("hidden")
         ($ ".edit-deadline", wrapper).removeClass("hidden")
 
-      else if form_well.hasClass("notification-edit-form")
+      else if well.hasClass("notification-edit-form")
         wrapper = ($ e.currentTarget).closest('li')
         ($ ".form-value", wrapper).removeClass("hidden")
         ($ ".notification-edit-form", wrapper).addClass("hidden")
         ($ ".actions", wrapper).removeClass("hidden")
 
-      else if form_well.hasClass("notification-new-form")
+      else if well.hasClass("notification-new-form")
         wrapper = ($ e.currentTarget).closest('.panel-section')
         ($ ".notification-form", wrapper).addClass("hidden")
diff --git a/app/javascript/controllers/element_focus_controller.js b/app/javascript/controllers/element_focus_controller.js
new file mode 100644
index 0000000000..88189b0f2d
--- /dev/null
+++ b/app/javascript/controllers/element_focus_controller.js
@@ -0,0 +1,50 @@
+export default class extends ApplicationController {
+  static targets = ['reveal', 'dismiss'];
+  static values = {
+    selector: String
+  }
+
+  connect() {    
+    if (this.hasRevealTarget) {
+      this.revealTarget.addEventListener('click', () => setTimeout(() => this.focusFirstElement(), 1))
+    }
+
+    if (this.hasDismissTarget) {
+      this.dismissTarget.addEventListener('click', () => setTimeout(() => this.focusElement(), 1))
+    }
+  }
+
+  focusElement(_event) {
+    if (this.hasRevealTarget && this.focusable(this.revealTarget)) {
+      this.revealTarget.focus()
+    }
+  }
+
+  focusFirstElement(_event) {
+    const element = this.focusableElements[0]
+
+    if (element) {
+      element.focus()
+    }
+  }
+
+  // Private
+
+  visible(el) {
+    return !el.hidden && (!el.type || el.type != 'hidden') && (el.offsetWidth > 0 || el.offsetHeight > 0)
+  }
+
+  focusable(el) {
+    return el.tabIndex >= 0 && !el.disabled && this.visible(el)
+  }
+
+  get focusableElements() {
+    return Array.from(this.element.querySelectorAll(this.selectors)).filter((el) => this.focusable(el)) || []
+  }
+
+  get selectors() {
+    return this.hasSelectorValue ? 
+      this.selectorValue : 
+      'input:not([disabled]), select:not([disabled]), textarea:not([disabled])'
+  }
+}

From cce7bfe0cc04a54e031abc200a2e69f4486ee9a7 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 18 Jul 2023 23:19:03 -0300
Subject: [PATCH 122/352] Update partials to use Stimulus controller

---
 .../admin/feedbacks/_feedback_fields.html.slim |  6 +++---
 .../_overall_feedback_field.html.slim          |  6 +++---
 .../form_answers/_assessors_section.html.slim  | 12 ++++++------
 .../form_answers/_financials_review.html.slim  |  8 ++++----
 .../_section_draft_notes.html.slim             |  6 +++---
 .../_application_background_section.html.slim  |  4 ++--
 .../_non_rag_section.html.slim                 |  6 +++---
 .../_rag_section.html.slim                     |  6 +++---
 .../_verdict_section.html.slim                 |  6 +++---
 .../company_details/_address_form.html.slim    | 18 +++++++++---------
 .../_company_name_form.html.slim               |  6 +++---
 .../_date_trading_form.html.slim               |  6 +++---
 .../_goods_services_form.html.slim             |  6 +++---
 .../_organisation_head_form.html.slim          |  6 +++---
 .../_organisation_type_form.html.slim          |  6 +++---
 .../_registration_number_form.html.slim        |  6 +++---
 .../company_details/_sic_form.html.slim        |  6 +++---
 .../_this_entry_relates_to_form.html.slim      |  6 +++---
 .../company_details/_website_form.html.slim    |  6 +++---
 .../parent_company/_form.html.slim             |  6 +++---
 .../previous_wins/_form.html.slim              |  6 +++---
 .../financial_summary/_list.html.slim          |  6 +++---
 .../_palace_attendee.html.slim                 |  5 ++---
 ...s_for_press_enquiries_before_2020.html.slim |  4 ++--
 ...ls_for_press_enquiries_since_2020.html.slim |  4 ++--
 .../admin/press_summaries/_section.html.slim   |  8 ++++----
 .../admin/settings/_deadline_form.html.slim    |  8 ++++----
 .../settings/_email_notification.html.slim     |  4 ++--
 .../admin/settings/_schedule_new.html.slim     |  2 +-
 .../form_answers/_bulk_assignment.html.slim    |  6 +++---
 30 files changed, 95 insertions(+), 96 deletions(-)

diff --git a/app/views/admin/feedbacks/_feedback_fields.html.slim b/app/views/admin/feedbacks/_feedback_fields.html.slim
index 76fa39fb2e..460397528b 100644
--- a/app/views/admin/feedbacks/_feedback_fields.html.slim
+++ b/app/views/admin/feedbacks/_feedback_fields.html.slim
@@ -1,4 +1,4 @@
-.form-group
+.form-group[data-controller="element-focus"]
   .form-container
     strong = feedback_field_value[:label]
     .form-group class=feedback_field
@@ -25,10 +25,10 @@
       .clear
 
       - if policy(feedback).update?
-        = link_to "#", class: "form-edit-link pull-right" do
+        = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" } do
           span.glyphicon.glyphicon-pencil
           ' Edit
         .form-actions.text-right
-          = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+          = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
           = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right"
     .clear
diff --git a/app/views/admin/feedbacks/_overall_feedback_field.html.slim b/app/views/admin/feedbacks/_overall_feedback_field.html.slim
index d6b8e30200..3a8dc769c5 100644
--- a/app/views/admin/feedbacks/_overall_feedback_field.html.slim
+++ b/app/views/admin/feedbacks/_overall_feedback_field.html.slim
@@ -1,4 +1,4 @@
-.form-group
+.form-group[data-controller="element-focus"]
   .form-container
     strong Overall Summary
     .form-value.no-js-update
@@ -11,10 +11,10 @@
     .clear
 
     - if policy(feedback).update?
-      = link_to "#", class: "form-edit-link pull-right" do
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" } do
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right"
     .clear
diff --git a/app/views/admin/form_answers/_assessors_section.html.slim b/app/views/admin/form_answers/_assessors_section.html.slim
index ea5aaf0a12..3d478a6917 100644
--- a/app/views/admin/form_answers/_assessors_section.html.slim
+++ b/app/views/admin/form_answers/_assessors_section.html.slim
@@ -12,7 +12,7 @@
         = resource.lead_assessors
       .clear
 
-    li.form-group.primary-assessor-assignment
+    li.form-group.primary-assessor-assignment[data-controller="element-focus"]
       label[for='assessor_assignment_primary_assessor_id']
         ' Primary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
@@ -35,18 +35,18 @@
                           id: 'assessor_assignment_primary_assessor_id',
                           class: 'form-control custom-select'
 
-          = link_to "#", class: "form-edit-link"
+          = link_to "#", class: "form-edit-link", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
           .form-actions.text-right
             span.if-no-js-hide
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link", data: { element_focus_target: "dismiss" }
             = form.submit "Save", class: "btn btn-primary form-save-button"
           .errors-holder
       .clear
 
-    li.form-group.secondary-assessor-assignment
+    li.form-group.secondary-assessor-assignment[data-controller="element-focus"]
       label[for='assessor_assignment_secondary_assessor_id']
         span.assessor-label Secondary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
@@ -69,13 +69,13 @@
                           id: 'assessor_assignment_secondary_assessor_id',
                           class: 'form-control custom-select'
 
-          = link_to "#", class: "form-edit-link"
+          = link_to "#", class: "form-edit-link", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
           .form-actions.text-right
             span.if-no-js-hide
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link", data: { element_focus_target: "dismiss" }
             = form.submit "Save", class: "btn btn-primary form-save-button"
           .errors-holder
       .clear
diff --git a/app/views/admin/form_answers/_financials_review.html.slim b/app/views/admin/form_answers/_financials_review.html.slim
index cfe20d8946..ea9317df0a 100644
--- a/app/views/admin/form_answers/_financials_review.html.slim
+++ b/app/views/admin/form_answers/_financials_review.html.slim
@@ -10,7 +10,7 @@
 
         = f.input :form_answer_id, as: :hidden
 
-        .form-group
+        .form-group[data-controller="element-focus"]
           = render "admin/form_answers/financial_summary/audit_certificate"
           .input.form-group.form-fields
             .radio
@@ -27,12 +27,12 @@
             .input.form-group.form-fields.form-block
               = f.input :changes_description, as: :text, input_html: { rows: 5, class: "form-control" }, label: "Changes made"
               .clear
-          = link_to "#", class: "form-edit-link pull-right edit-review-audit"
+          = link_to "#", class: "form-edit-link pull-right edit-review-audit", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .form-actions.text-left
             .form-fields
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = link_to "Save", "#", class: "btn btn-primary save-review-audit pull-right", style: "display: none"
 
           .clear
@@ -53,7 +53,7 @@
 
         = f.input :form_answer_id, as: :hidden
 
-        .form-group
+        .form-group[data-controller="element-focus"]
           = render "admin/form_answers/financial_summary/shortlisted_financial_docs", docs_wrapper: resource.shortlisted_documents_wrapper
           .input.form-group.form-fields
             .radio
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index 9dd1bfd832..fdf4431fff 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -14,7 +14,7 @@
                         authenticity_token: true,
                         html: { "data-type" => "json" }) do |f|
 
-        .form-group class="#{'form-edit' if f.object.content.blank?}"
+        .form-group[class="#{'form-edit' if f.object.content.blank?}" data-controller="element-focus"]
           .form-container
             .form-value
               p
@@ -28,11 +28,11 @@
                       as: :text,
                       label: false
 
-            = link_to "#", class: "form-edit-link pull-right"
+            = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
               span.glyphicon.glyphicon-pencil
               ' Edit
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary form-save-link pull-right if-js-hide"
               = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide"
             .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
index e2710987ed..bda474ff6e 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
@@ -1,6 +1,6 @@
 - editable = f.object.editable_for?(current_subject)
 
-.form-group.application-background-section class="#{'form-edit' if f.object.application_background_section_desc.blank? && editable}"
+.form-group.application-background-section[class="#{'form-edit' if f.object.application_background_section_desc.blank? && editable}" data-controller="element-focus"]
   .form-container
     label.form-label Application background
     .form-value
@@ -20,7 +20,7 @@
               label: false
 
     - if editable
-      = link_to "#", class: "form-edit-link pull-right"
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
       = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide"
diff --git a/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
index 984c8d357f..0f1d9dd39f 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
@@ -2,7 +2,7 @@
 
 - editable = f.object.editable_for?(current_subject)
 
-.form-group.rag-section class="#{'form-edit' if f.object.public_send(section.desc).blank? && editable}"
+.form-group.rag-section[class="#{'form-edit' if f.object.public_send(section.desc).blank? && editable}" data-controller="element-focus"]
   .form-container
     label.form-label
       = section.label
@@ -22,10 +22,10 @@
               label: false
 
     - if editable
-      = link_to "#", class: "form-edit-link pull-right"
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", "data-updated-section" => section.desc
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
index 7ad9781161..dcd7d49081 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
@@ -2,7 +2,7 @@
 
 - editable = f.object.editable_for?(current_subject)
 
-.form-group.rag-section class="#{'form-edit' if f.object.public_send(section.desc).blank? && editable} form-#{section.label.parameterize}"
+.form-group.rag-section[class="#{'form-edit' if f.object.public_send(section.desc).blank? && editable} form-#{section.label.parameterize}" data-controller="element-focus"]
   .form-container
     = f.input section.rate,
               as: :select,
@@ -42,10 +42,10 @@
               label: false
 
     - if editable
-      = link_to "#", class: "form-edit-link pull-right"
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", "data-updated-section" => section.desc
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
index cdd0c28288..38a87c3333 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
@@ -2,7 +2,7 @@
 - editable = f.object.editable_for?(current_subject)
 - rag_editable = f.object.moderated_rag_editable_for?(current_subject)
 
-.form-group.verdict-section class="#{'form-edit' if f.object.public_send(section.desc).blank? && editable} form-#{section.label.parameterize}"
+.form-group.verdict-section[class="#{'form-edit' if f.object.public_send(section.desc).blank? && editable} form-#{section.label.parameterize}" data-controller="element-focus"]
   .form-container
     = f.input section.rate,
               as: :select,
@@ -40,10 +40,10 @@
               label: false
 
     - if editable
-      = link_to "#", class: "form-edit-link pull-right"
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", "data-updated-section" => section.desc
       .clear
diff --git a/app/views/admin/form_answers/company_details/_address_form.html.slim b/app/views/admin/form_answers/company_details/_address_form.html.slim
index 6d379d4206..1cf2516a96 100644
--- a/app/views/admin/form_answers/company_details/_address_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_address_form.html.slim
@@ -1,6 +1,6 @@
 .form-group-multiple-parent
   - if @form_answer.promotion?
-    .form-group.form-group-multiple.company-address-personal-form
+    .form-group.form-group-multiple.company-address-personal-form[data-controller="element-focus"]
       .form-container
         label.form-label Nominee Address
 
@@ -88,17 +88,17 @@
                               collection: regions
 
               .form-actions.text-right
-                = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+                = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
                 = f.submit "Save", class: "btn btn-primary pull-right"
 
             .clear
 
-            = link_to "#", class: "form-edit-link pull-right"
+            = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
               span.glyphicon.glyphicon-pencil
               ' Edit
         .clear
 
-  .form-group.form-group-multiple.company-address-form
+  .form-group.form-group-multiple.company-address-form[data-controller="element-focus"]
     .form-container
       label.form-label
         = @form_answer.promotion? ? "Organisation Address" : "Address"
@@ -218,18 +218,18 @@
                               input_html: { class: "form-control" }
 
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
 
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
       .clear
 
   - if @form_answer.promotion?
-    .form-group.form-group-multiple.company-address-nominator-form
+    .form-group.form-group-multiple.company-address-nominator-form[data-controller="element-focus"]
       .form-container
         label.form-label Nominator Address
 
@@ -321,12 +321,12 @@
                               input_html: { class: "form-control" }
 
               .form-actions.text-right
-                = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+                = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
                 = f.submit "Save", class: "btn btn-primary pull-right"
 
             .clear
 
-            = link_to "#", class: "form-edit-link pull-right"
+            = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
               span.glyphicon.glyphicon-pencil
               ' Edit
         .clear
diff --git a/app/views/admin/form_answers/company_details/_company_name_form.html.slim b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
index 720f735125..591eb7ec5b 100644
--- a/app/views/admin/form_answers/company_details/_company_name_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
@@ -1,6 +1,6 @@
 - account_name = @form_answer.promotion? ? "Nominee name" : "Company name"
 - if user_can_edit_company(@form_answer)
-  .form-group
+  .form-group[data-controller="element-focus"]
     = simple_form_for [namespace_name, @form_answer],
                       remote: true,
                       authenticity_token: true,
@@ -30,10 +30,10 @@
                         input_html: { class: "form-control" }
 
           .form-actions.text-right
-            = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+            = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
             = f.submit "Save", class: "btn btn-primary pull-right"
         .clear
-        = link_to "#", class: "form-edit-link pull-right"
+        = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
           span.glyphicon.glyphicon-pencil
           ' Edit
         .clear
diff --git a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
index 81a1baa16b..a530da21bb 100644
--- a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
@@ -1,6 +1,6 @@
 - unless @form_answer.promotion?
   - if user_can_edit(@form_answer, :date_trading)
-    .form-group
+    .form-group[data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true, html: { "data-type" => "html", id: "date_trading_form_admin_appraisal" } do |f|
@@ -27,11 +27,11 @@
               input.string.optional.form-control id="date_started_trading_1i" type='text' name="form_answer[data_attributes][started_trading_year]" value="#{@form_answer.document["started_trading_year"]}"
             .clear
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
index 53b81cf884..757de1983b 100644
--- a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
@@ -1,5 +1,5 @@
 - unless @form_answer.promotion?
-  .form-group
+  .form-group[data-controller="element-focus"]
     .form-container
       label.form-label Description of goods/services
       .form-value
@@ -30,10 +30,10 @@
                           = "Goods/services #{index + 1}"
                         input.form-control.js-chart-count type="text" name="form_answer[data_attributes][trade_goods_and_services_explanations][#{index}][desc_short]" value="#{service["desc_short"]}" rows= 3 data-word-max = 15
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
index 2944064d93..2ecb79ebc5 100644
--- a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
@@ -1,6 +1,6 @@
 - unless @form_answer.promotion?
   - if user_can_edit(@form_answer, :organisation_head)
-    .form-group
+    .form-group[data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true, html: { "data-type" => "html", id: "organisation_head_form_admin_appraisal" } do |f|
@@ -61,11 +61,11 @@
                             label: "Email",
                             input_html: { class: "form-control" }
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
index fb328ae878..cebb0acd4f 100644
--- a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
@@ -2,7 +2,7 @@
 
 - unless @form_answer.promotion?
   - if user_can_edit(@form_answer, :organisation_type)
-    .form-group class="#{'form-edit' if @form_answer.organisation_type.blank?}"
+    .form-group[class="#{'form-edit' if @form_answer.organisation_type.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true, html: { "data-type" => "html", id: "organisation_type_form_admin_appraisal" } do |f|
@@ -27,11 +27,11 @@
                             input_html: { class: "form-control" },
                             include_blank: false
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
index 9a8893ec7b..782808bfb4 100644
--- a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
@@ -1,6 +1,6 @@
 - unless @form_answer.promotion?
   - if user_can_edit(@form_answer, :registration_number)
-    .form-group class="#{'form-edit' if @form_answer.registration_number.blank?}"
+    .form-group[class="#{'form-edit' if @form_answer.registration_number.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true,
@@ -22,11 +22,11 @@
                         label: false,
                         input_html: { class: "form-control" }
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_sic_form.html.slim b/app/views/admin/form_answers/company_details/_sic_form.html.slim
index 2b4df5ec79..d75f4078f2 100644
--- a/app/views/admin/form_answers/company_details/_sic_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_sic_form.html.slim
@@ -3,7 +3,7 @@
   - sic = @form_answer.sic_code_name
 
   - if user_can_edit(@form_answer, :sic_code)
-    .form-group.sic-code class="#{'form-edit' if @form_answer.sic_code.blank?}"
+    .form-group.sic-code[class="#{'form-edit' if @form_answer.sic_code.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, @form_answer],
                         remote: true,
                         authenticity_token: true,
@@ -29,10 +29,10 @@
                       include_blank: false,
                       label: false
           .form-actions.text-right
-            = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+            = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
             = f.submit "Save", class: "btn btn-primary form-save-link pull-right"
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
index 0b7b5547c7..2ef457ac37 100644
--- a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
@@ -2,7 +2,7 @@
 
 - if @form_answer.show_this_entry_relates_to_question?
   - if user_can_edit(@form_answer, :this_entry_relates_to)
-    .form-group class="#{'form-edit' if @form_answer.this_entry_relates_to.blank?}"
+    .form-group[class="#{'form-edit' if @form_answer.this_entry_relates_to.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true, html: { "data-type" => "html", id: "this_entry_relates_to_form_admin_appraisal" } do |f|
@@ -24,11 +24,11 @@
             = render "admin/form_answers/company_details/entry_relates_to_checkboxes", awards: ["development", "mobility"]
 
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/_website_form.html.slim b/app/views/admin/form_answers/company_details/_website_form.html.slim
index 2d899c3162..e91896bbac 100644
--- a/app/views/admin/form_answers/company_details/_website_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_website_form.html.slim
@@ -1,6 +1,6 @@
 - unless @form_answer.promotion?
   - if user_can_edit(@form_answer, :website)
-    .form-group class="#{'form-edit' if @form_answer.website_url.blank?}"
+    .form-group[class="#{'form-edit' if @form_answer.website_url.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true, html: { "data-type" => "html", id: "website_form_admin_appraisal" } do |f|
@@ -22,11 +22,11 @@
                         label: false,
                         input_html: { class: "form-control" }
             .form-actions.text-right
-              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+              = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
               = f.submit "Save", class: "btn btn-primary pull-right"
           .clear
 
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
           .clear
diff --git a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
index 84607b3a57..e9da4792e6 100644
--- a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
@@ -1,4 +1,4 @@
-.form-group.form-group-multiple class="#{'form-edit' if @form_answer.parent_company.blank?}"
+.form-group.form-group-multiple[class="#{'form-edit' if @form_answer.parent_company.blank?}" data-controller="element-focus"]
   = simple_form_for [namespace_name, resource],
                     remote: true,
                     authenticity_token: true, html: { "data-type" => "html" } do |f|
@@ -29,11 +29,11 @@
                       collection: country_collection
 
         .form-actions.text-right
-          = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+          = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
           = f.submit "Save", class: "btn btn-primary pull-right"
       .clear
 
-      = link_to "#", class: "form-edit-link pull-right"
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
       .clear
diff --git a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
index 28f8d7fb22..badc91610a 100644
--- a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
@@ -4,7 +4,7 @@
                   html: { "data-type" => "html", id: "previous_wins_form" } do |f|
 
   = hidden_field_tag :section, "previous_wins", id: "previous_wins_section_hidden_field"
-  .form-container
+  .form-container[data-controller="element-focus"]
     = render "admin/form_answers/company_details/previous_wins/show"
 
     .input.form-group.form-fields.form-block
@@ -34,11 +34,11 @@
 
       = link_to "+ Add another winnings", "#", class: "btn btn-default if-no-js-hide add-previous-winning"
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = f.submit "Save", class: "btn btn-primary pull-right"
 
 
-    = link_to "#", class: "form-edit-link pull-right"
+    = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
       span.glyphicon.glyphicon-pencil
       ' Edit
     .clear
diff --git a/app/views/admin/form_answers/financial_summary/_list.html.slim b/app/views/admin/form_answers/financial_summary/_list.html.slim
index af2fa19be4..40cc67f8c4 100644
--- a/app/views/admin/form_answers/financial_summary/_list.html.slim
+++ b/app/views/admin/form_answers/financial_summary/_list.html.slim
@@ -1,6 +1,6 @@
 - url = pundit_user.is_a?(Admin) ? update_financials_admin_form_answer_path(@form_answer) : update_financials_assessor_form_answer_path(@form_answer)
 
-.form-group
+.form-group[data-controller="element-focus"]
   = form_for @form_answer, url: url do |f|
     .table-overflow-container
       table.table.table-striped#financial-table
@@ -17,11 +17,11 @@
               = render "admin/form_answers/financial_summary/row", f: f, row: row
 
     - if policy(resource).update_financials?
-      = link_to "#", class: "form-edit-link pull-right"
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = button_tag "Save", class: "btn btn-primary form-save-button pull-right"
       .clear
 
diff --git a/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim b/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim
index 25e3f431ec..24f07136b7 100644
--- a/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim
+++ b/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim
@@ -1,4 +1,4 @@
-.form-group.palace-attendee-container class=("form-edit" if pa.errors.present? || defined?(@enable_edition))
+.form-group.palace-attendee-container[class=("form-edit" if pa.errors.present? || defined?(@enable_edition)) data-controller="element-focus"]
   .form-value
     .empty-message class="#{'visuallyhidden' if palace_invite.palace_attendees.exists?}"
       p.p-empty No attendees confirmed.
@@ -10,7 +10,7 @@
     - if palace_invite.palace_attendees.exists?
       ul.list-unstyled
         li.well
-          = link_to "#", class: "form-edit-link pull-right"
+          = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
             span.glyphicon.glyphicon-pencil
             ' Edit
 
@@ -44,7 +44,6 @@
               - else
                 ' -
 
-
   .input.form-group.form-fields.form-block.attendees-forms data-attendees-limit=palace_invite.attendees_limit
     / ### Business Award winner
     / Each winning business sends two representatives. If a business is successful in more than one business category they are allowed to send two reps for each winning category. The invitation is sent to the head of the winning unit.
diff --git a/app/views/admin/press_summaries/_contact_details_for_press_enquiries_before_2020.html.slim b/app/views/admin/press_summaries/_contact_details_for_press_enquiries_before_2020.html.slim
index f54f55ba5b..c9c7a82995 100644
--- a/app/views/admin/press_summaries/_contact_details_for_press_enquiries_before_2020.html.slim
+++ b/app/views/admin/press_summaries/_contact_details_for_press_enquiries_before_2020.html.slim
@@ -22,10 +22,10 @@
               input_html: { class: 'form-control' }
   .clear
 
-  = link_to "#", class: "form-edit-link pull-right" do
+  = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" } do
     span.glyphicon.glyphicon-pencil
     ' Edit
   .form-actions.text-right
-    = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+    = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
     = f.submit "Save", class: "btn btn-primary form-save-link pull-right"
   .clear
\ No newline at end of file
diff --git a/app/views/admin/press_summaries/_contact_details_for_press_enquiries_since_2020.html.slim b/app/views/admin/press_summaries/_contact_details_for_press_enquiries_since_2020.html.slim
index 5822679dcb..ad8ca55b72 100644
--- a/app/views/admin/press_summaries/_contact_details_for_press_enquiries_since_2020.html.slim
+++ b/app/views/admin/press_summaries/_contact_details_for_press_enquiries_since_2020.html.slim
@@ -49,10 +49,10 @@
                 input_html: { class: 'form-control' }
   .clear
 
-  = link_to "#", class: "form-edit-link pull-right" do
+  = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" } do
     span.glyphicon.glyphicon-pencil
     ' Edit
   .form-actions.text-right
-    = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+    = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
     = f.submit "Save", class: "btn btn-primary form-save-link pull-right"
   .clear
\ No newline at end of file
diff --git a/app/views/admin/press_summaries/_section.html.slim b/app/views/admin/press_summaries/_section.html.slim
index bde7f0ae65..88f81b842b 100644
--- a/app/views/admin/press_summaries/_section.html.slim
+++ b/app/views/admin/press_summaries/_section.html.slim
@@ -4,7 +4,7 @@
 = simple_form_for press_summary, url: url, remote: true, authenticity_token: true do |f|
   = f.input :body_update, as: :hidden, input_html: {value: true}
 
-  .form-group.press-summary-body-block
+  .form-group.press-summary-body-block[data-controller="element-focus"]
     label.form-label Body
     .js-hint-visible-on-edit
        | Please type, rather than copy from a word processor.
@@ -20,11 +20,11 @@
     .clear
 
     - if policy(press_summary).update?
-      = link_to "#", class: "form-edit-link pull-right" do
+      = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" } do
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide"
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
         = f.submit "Save", class: "btn btn-primary form-save-link pull-right"
       .clear
 
@@ -32,7 +32,7 @@
   = simple_form_for press_summary, url: url, remote: true, authenticity_token: true do |f|
     = f.input :contact_details_update, as: :hidden, input_html: {value: true}
 
-    .form-group
+    .form-group[data-controller="element-focus"]
       label.form-label Contact details for press enquiries
       
       - if form_answer.award_year.year >= 2020
diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 0a1925e3fa..68bd28a177 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -2,7 +2,7 @@
 - deadline = deadline.decorate if deadline.present?
 
 - if deadline.present?
-  .deadline id="deadline-#{deadline.id}"
+  .deadline[id="deadline-#{deadline.id}" data-controller="element-focus"]
     span.date-time-text
       => deadline.message
       span.trigger-at
@@ -18,11 +18,11 @@
                     input_html: { id: '' }
 
           .control-action
-            = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button"
-            input type="button" value="Save" class="btn btn-primary btn-submit" aria-label="Save #{I18n.t("deadline_buttons.#{kind}")}"
+            = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button", data: { element_focus_target: "dismiss" }
+            input[type="button" value="Save" class="btn btn-primary btn-submit" aria-label="Save #{I18n.t("deadline_buttons.#{kind}")}"]
         .clear
 
-    = link_to "Edit", "#", class: "edit-deadline if-no-js-hide", role: "button", aria: {label: "Edit #{I18n.t("deadline_buttons.#{kind}")}"}
+    = link_to "Edit", "#", class: "edit-deadline if-no-js-hide", role: "button", aria: {label: "Edit #{I18n.t("deadline_buttons.#{kind}")}"}, data: { element_focus_target: "reveal" }
 
     span.deadline-help
       - if deadline.help_message.present?
diff --git a/app/views/admin/settings/_email_notification.html.slim b/app/views/admin/settings/_email_notification.html.slim
index b4e8ea7067..e25f4b72a5 100644
--- a/app/views/admin/settings/_email_notification.html.slim
+++ b/app/views/admin/settings/_email_notification.html.slim
@@ -1,7 +1,7 @@
 - notifications = @email_notifications.select { |n| n.kind == kind }
 - notifications = EmailNotificationDecorator.decorate_collection(notifications)
 
-.panel-section id="email_notification_#{kind}"
+.panel-section[id="email_notification_#{kind}" data-controller="element-focus"]
   p
     = I18n.t("email_notification_headers.#{kind}")
 
@@ -17,7 +17,7 @@
   .email-example.well
     = MailRenderer.new.public_send(kind)
 
-  = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide", role: "button", aria: {label: "Schedule #{I18n.t("email_buttons.#{kind}")}"}
+  = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide", role: "button", aria: {label: "Schedule #{I18n.t("email_buttons.#{kind}")}"}, data: { element_focus_target: "reveal" }
 
   .notification-form
     = render "schedule_new", notification: @settings.email_notifications.build(kind: kind), kind: kind
diff --git a/app/views/admin/settings/_schedule_new.html.slim b/app/views/admin/settings/_schedule_new.html.slim
index d35078aad6..185a5cdf0a 100644
--- a/app/views/admin/settings/_schedule_new.html.slim
+++ b/app/views/admin/settings/_schedule_new.html.slim
@@ -13,6 +13,6 @@
                   input_html: { id: "" }
 
     .control-action
-      = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button"
+      = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button", data: { element_focus_target: "dismiss" }
       = f.submit "Save", class: "btn btn-primary btn-submit"
     .clear
diff --git a/app/views/assessor/form_answers/_bulk_assignment.html.slim b/app/views/assessor/form_answers/_bulk_assignment.html.slim
index d04f8915ed..78ffd2bee8 100644
--- a/app/views/assessor/form_answers/_bulk_assignment.html.slim
+++ b/app/views/assessor/form_answers/_bulk_assignment.html.slim
@@ -1,6 +1,6 @@
 - if show_bulk_assignment?
-  .if-no-js-hide
-    .btn.bulk-assign-assessors-link Bulk Assign Assessors
+  .if-no-js-hide[data-controller="element-focus"]
+    .btn.bulk-assign-assessors-link[data-element-focus-target="reveal"] Bulk Assign Assessors
 
     .bulk-assign-assessors-form
       .well
@@ -29,6 +29,6 @@
             = f.text_field :form_answer_ids, class: "if-js-hide visuallyhidden"
 
             .pull-right
-              = link_to "Cancel", "#", class: "btn btn-default if-no-js-hide bulk-assign-assessors-cancel-link"
+              = link_to "Cancel", "#", class: "btn btn-default if-no-js-hide bulk-assign-assessors-cancel-link", data: { element_focus_target: "dismiss" }
               = f.submit "Assign", class: "btn btn-primary"
             .clear

From 0d41fab0ded3336af74734381714a38e4da6eaac Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 18 Jul 2023 23:36:11 -0300
Subject: [PATCH 123/352] Focusable accordions

---
 app/views/admin/comments/_form.html.slim      |  2 +-
 .../_section_admin_comments.html.slim         |  4 ++--
 .../_section_company_details.html.slim        |  5 ++---
 .../_section_critical_comments.html.slim      |  4 ++--
 .../_section_draft_notes.html.slim            |  4 ++--
 .../_section_press_summary.html.slim          |  4 ++--
 .../users/_fields_user_details.html.slim      |  2 +-
 app/views/admin/users/_form.html.slim         | 20 +++++++++----------
 8 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/app/views/admin/comments/_form.html.slim b/app/views/admin/comments/_form.html.slim
index 492dacfb36..f56bb24bdc 100644
--- a/app/views/admin/comments/_form.html.slim
+++ b/app/views/admin/comments/_form.html.slim
@@ -2,7 +2,7 @@
   label
     ' Add a comment
   = f.hidden_field :section, id: "#{f.object.section}_section_hidden_field"
-  = f.text_area :body, id: "#{f.object.section}_comment_body", class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment"
+  = f.text_area :body, id: "#{f.object.section}_comment_body", autofocus: true, class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment"
   .comment-actions
     = f.check_box :flagged, id: "#{f.object.section}_flagged_hidden_checkbox"
     = link_to "#flag-comment", class: "link-flag-comment js-link-flag-comment"
diff --git a/app/views/admin/form_answers/_section_admin_comments.html.slim b/app/views/admin/form_answers/_section_admin_comments.html.slim
index 0b9caabda7..9bdd5a4639 100644
--- a/app/views/admin/form_answers/_section_admin_comments.html.slim
+++ b/app/views/admin/form_answers/_section_admin_comments.html.slim
@@ -1,7 +1,7 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus"]
   .panel-heading#admin-comments-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-application-info" href="#section-admin-comments" aria-expanded="true" aria-controls="section-admin-comments"
+      a data-toggle="collapse" data-parent="#panel-application-info" href="#section-admin-comments" aria-expanded="true" aria-controls="section-admin-comments" data-element-focus-target="reveal"
         ' Admin Comments
         span.comments-number
           - if @form_answer.comments.admin.any?
diff --git a/app/views/admin/form_answers/_section_company_details.html.slim b/app/views/admin/form_answers/_section_company_details.html.slim
index c27c760b5b..a28fcf51ae 100644
--- a/app/views/admin/form_answers/_section_company_details.html.slim
+++ b/app/views/admin/form_answers/_section_company_details.html.slim
@@ -1,13 +1,12 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus"]
   .panel-heading#company-details-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-application-info" href="#section-company-details" aria-expanded="true" aria-controls="section-company-details"
+      a data-toggle="collapse" data-parent="#panel-application-info" href="#section-company-details" aria-expanded="true" aria-controls="section-company-details" data-element-focus-target="reveal"
         = @form_answer.promotion? ? "Nominee Details" : "Company Details"
         - if resource.company_details_updated_at && resource.company_details_editable
           small
             = "Updated by: #{resource.company_details_editable.decorate.full_name} - #{format_date(resource.company_details_updated_at)}"
 
-
   #section-company-details.section-company-details.panel-collapse.collapse aria-labelledby="company-details-heading"
     .panel-body.company-details-forms
       = render "admin/form_answers/company_details/company_name_form"
diff --git a/app/views/admin/form_answers/_section_critical_comments.html.slim b/app/views/admin/form_answers/_section_critical_comments.html.slim
index cd0188dbcb..29ac1cf2fa 100644
--- a/app/views/admin/form_answers/_section_critical_comments.html.slim
+++ b/app/views/admin/form_answers/_section_critical_comments.html.slim
@@ -1,7 +1,7 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus"]
   .panel-heading#critical-comments-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-critical-comments" aria-expanded="true" aria-controls="section-critical-comments"
+      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-critical-comments" aria-expanded="true" aria-controls="section-critical-comments" data-element-focus-target="reveal"
         ' Critical Comments
         span.comments-number
           - if @form_answer.comments.critical.any?
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index fdf4431fff..b6e59ee202 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -1,9 +1,9 @@
 - @form_answer.draft_note || @form_answer.build_draft_note
 
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus"]
   .panel-heading#draft-notes-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-draft-notes" aria-expanded="true" aria-controls="section-draft-notes"
+      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-draft-notes" aria-expanded="true" aria-controls="section-draft-notes" data-element-focus-target="reveal"
         ' Draft Notes
         - if @form_answer.draft_note.decorate.try(:last_updated_by).present?
           small= @form_answer.draft_note.decorate.try(:last_updated_by)
diff --git a/app/views/admin/form_answers/_section_press_summary.html.slim b/app/views/admin/form_answers/_section_press_summary.html.slim
index ac2e04ca3b..167d95a6f9 100644
--- a/app/views/admin/form_answers/_section_press_summary.html.slim
+++ b/app/views/admin/form_answers/_section_press_summary.html.slim
@@ -1,7 +1,7 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus"]
   .panel-heading#press-summary-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-winners" href="#section-press-summary" aria-expanded="true" aria-controls="section-press-summary"
+      a data-toggle="collapse" data-parent="#panel-winners" href="#section-press-summary" aria-expanded="true" aria-controls="section-press-summary" data-element-focus-target="reveal"
         ' Press Book Notes
         small.updated-by
           - if @form_answer.press_summary_updated_by
diff --git a/app/views/admin/users/_fields_user_details.html.slim b/app/views/admin/users/_fields_user_details.html.slim
index fe631fe3d0..8503be2675 100644
--- a/app/views/admin/users/_fields_user_details.html.slim
+++ b/app/views/admin/users/_fields_user_details.html.slim
@@ -5,7 +5,7 @@
     .col-md-1.col-sm-2
       = f.input :title,
                 wrapper_html: { class: "form-group" },
-                input_html: { class: "form-control" },
+                input_html: { autofocus: true, class: "form-control" },
                 label: false
 
 .question-group
diff --git a/app/views/admin/users/_form.html.slim b/app/views/admin/users/_form.html.slim
index d2bde7535e..79b770eed4 100644
--- a/app/views/admin/users/_form.html.slim
+++ b/app/views/admin/users/_form.html.slim
@@ -1,47 +1,47 @@
 = simple_form_for [:admin, resource], html: { class: "qae-form" } do |f|
   .panel-group#user-form-panel-parent
-    .panel.panel-default
+    .panel.panel-default[data-controller="element-focus"]
       .panel-heading#user-details-heading
         h2.panel-title
-          a data-toggle="collapse" data-parent="#user-form-panel" href="#user-details" aria-expanded="true" aria-controls="user-details"
+          a data-toggle="collapse" data-parent="#user-form-panel" href="#user-details" aria-expanded="true" aria-controls="user-details" data-element-focus-target="reveal"
             = controller_name == "users" ? "Applicant" : controller_name.singularize.titleize
             '  Details
       #user-details.section-user-details.panel-collapse.collapse.in aria-labelledby="user-details-heading"
         .panel-body
           = render "fields_user_details", f: f
 
-    .panel.panel-default
+    .panel.panel-default[data-controller="element-focus"]
       .panel-heading id="organisation-details-header"
         h2.panel-title
-          a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#organisation-details" aria-expanded="false" aria-controls="organisation-details"
+          a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#organisation-details" aria-expanded="false" aria-controls="organisation-details" data-element-focus-target="reveal"
             ' Organisation Details
       #organisation-details.section-organisation-details.panel-collapse.collapse aria-labelledby="organisation-details-header"
         .panel-body
           = render "fields_organisation_details", f: f
 
-    .panel.panel-default
+    .panel.panel-default[data-controller="element-focus"]
       .panel-heading id="contact-preferences-header"
         h2.panel-title
-          a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#contact-preferences" aria-expanded="false" aria-controls="contact-preferences"
+          a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#contact-preferences" aria-expanded="false" aria-controls="contact-preferences" data-element-focus-target="reveal"
             ' Contact Preferences
       #contact-preferences.section-contact-preferences.panel-collapse.collapse aria-labelledby="contact-preferences-header"
         .panel-body
           = render "fields_contact_preferences", f: f
 
     - unless action_name == "new"
-      .panel.panel-default
+      .panel.panel-default[data-controller="element-focus"]
         .panel-heading id="section-collaborators-header"
           h2.panel-title
-            a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-collaborators" aria-expanded="false" aria-controls="section-collaborators"
+            a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-collaborators" aria-expanded="false" aria-controls="section-collaborators" data-element-focus-target="reveal"
               ' Collaborators
         #section-collaborators.section-collaborators.panel-collapse.collapse aria-labelledby="section-collaborators-header"
           .panel-body
             = render "fields_collaborators", f: f, resource: resource
 
-    .panel.panel-default
+    .panel.panel-default[data-controller="element-focus"]
       .panel-heading id="section-password-header"
         h2.panel-title
-          a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-password" aria-expanded="false" aria-controls="section-password"
+          a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-password" aria-expanded="false" aria-controls="section-password" data-element-focus-target="reveal"
             ' Password
       #section-password.section-password.panel-collapse.collapse aria-labelledby="section-password-header"
         .panel-body

From aa4c7057e9ec98adbaa88883b003353fa477debd Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 19 Jul 2023 08:42:39 +0100
Subject: [PATCH 124/352] fix deployment

---
 .github/workflows/ci.yml                 | 2 ++
 .github/workflows/deploy_development.yml | 1 +
 .github/workflows/deploy_production.yml  | 1 +
 3 files changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b771dfa164..bd1827bef2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -102,6 +102,7 @@ jobs:
           npm install -g yarn
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
+          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
@@ -142,6 +143,7 @@ jobs:
         run: |
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
+          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
diff --git a/.github/workflows/deploy_development.yml b/.github/workflows/deploy_development.yml
index 74bd31db81..8db60f1a9a 100644
--- a/.github/workflows/deploy_development.yml
+++ b/.github/workflows/deploy_development.yml
@@ -35,6 +35,7 @@ jobs:
         run: |
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
+          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index 044f20bf34..a750cf4679 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -36,6 +36,7 @@ jobs:
         run: |
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
+          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f

From 2527ddd4b3996d9e83653d60d3daaaf9882f1e70 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 19 Jul 2023 10:55:38 +0100
Subject: [PATCH 125/352] Fix focus on bulk assign link

---
 app/assets/stylesheets/admin/page-applications.scss        | 6 ++++++
 app/views/assessor/form_answers/_bulk_assignment.html.slim | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index d2a114b6e4..9598f9530f 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -599,6 +599,12 @@
     left: 0;
   }
 
+  &:hover {
+    color: #fff;
+    background-color: $govuk-light-blue;
+    border-color: #204d74
+  }
+
   .show-bulk-assign & {
     .js & {
       display: none;
diff --git a/app/views/assessor/form_answers/_bulk_assignment.html.slim b/app/views/assessor/form_answers/_bulk_assignment.html.slim
index d04f8915ed..841dc4e8a6 100644
--- a/app/views/assessor/form_answers/_bulk_assignment.html.slim
+++ b/app/views/assessor/form_answers/_bulk_assignment.html.slim
@@ -1,6 +1,6 @@
 - if show_bulk_assignment?
   .if-no-js-hide
-    .btn.bulk-assign-assessors-link Bulk Assign Assessors
+    a.btn.btn-primary.bulk-assign-assessors-link tabindex="0" Bulk Assign Assessors
 
     .bulk-assign-assessors-form
       .well

From bb5bdc58201a8a411692353e4bdda481e8885d78 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 19 Jul 2023 11:37:59 +0100
Subject: [PATCH 126/352] Change font size on word count

---
 app/assets/stylesheets/frontend/forms.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/frontend/forms.scss b/app/assets/stylesheets/frontend/forms.scss
index fc7729529f..2b27d1d302 100644
--- a/app/assets/stylesheets/frontend/forms.scss
+++ b/app/assets/stylesheets/frontend/forms.scss
@@ -1110,3 +1110,8 @@ fieldset.account-contact-preferences-other-ops {
 .js-fy-entries {
   margin-bottom: 30px
 }
+
+.cke_wordcount span {
+  font-size: 1.1875rem !important;
+  color: $grey-1 !important;
+}

From b1698d09da3dbd1c94169895e2a01246a7490a9f Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Wed, 19 Jul 2023 17:48:15 +0100
Subject: [PATCH 127/352] Remove fog gem as it is not needed

fog-aws should be enough via: https://github.com/fog/fog/issues/4034
---
 Gemfile      |   1 -
 Gemfile.lock | 163 +--------------------------------------------------
 2 files changed, 1 insertion(+), 163 deletions(-)

diff --git a/Gemfile b/Gemfile
index fd8011ace2..8bccf8c255 100644
--- a/Gemfile
+++ b/Gemfile
@@ -87,7 +87,6 @@ gem 'nokogiri'
 
 # Uploads
 gem 'carrierwave', '~> 1.3'
-gem 'fog', "1.42.1"
 gem "fog-aws"
 gem 'vigilion', '~> 1.0.4'
 gem 'vigilion-rails', '~> 2.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 25a1d07031..3ddbce59e4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,7 +10,6 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    CFPropertyList (2.3.6)
     actioncable (7.0.5)
       actionpack (= 7.0.5)
       activesupport (= 7.0.5)
@@ -85,9 +84,6 @@ GEM
     addressable (2.8.4)
       public_suffix (>= 2.0.2, < 6.0)
     afm (0.2.2)
-    aliyun-sdk (0.8.0)
-      nokogiri (~> 1.6)
-      rest-client (~> 2.0)
     amoeba (3.0.0)
       activerecord (>= 3.2.6)
     appsignal (3.3.10)
@@ -199,7 +195,6 @@ GEM
       activesupport (>= 5.0)
       request_store (>= 1.0)
       ruby2_keywords
-    dry-inflector (1.0.0)
     email_validator (2.2.4)
       activemodel
     enumerize (2.6.1)
@@ -242,161 +237,18 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     ffi (1.15.5)
-    fission (0.5.0)
-      CFPropertyList (~> 2.2)
-    fog (1.42.1)
-      fog-aliyun (>= 0.1.0)
-      fog-atmos
-      fog-aws (>= 0.6.0)
-      fog-brightbox (~> 0.4)
-      fog-cloudatcost (~> 0.1.0)
-      fog-core (~> 1.45)
-      fog-digitalocean (>= 0.3.0)
-      fog-dnsimple (~> 1.0)
-      fog-dynect (~> 0.0.2)
-      fog-ecloud (~> 0.1)
-      fog-google (<= 0.1.0)
-      fog-internet-archive
-      fog-joyent
-      fog-json
-      fog-local
-      fog-openstack
-      fog-ovirt
-      fog-powerdns (>= 0.1.1)
-      fog-profitbricks
-      fog-rackspace
-      fog-radosgw (>= 0.0.2)
-      fog-riakcs
-      fog-sakuracloud (>= 0.0.4)
-      fog-serverlove
-      fog-softlayer
-      fog-storm_on_demand
-      fog-terremark
-      fog-vmfusion
-      fog-voxel
-      fog-vsphere (>= 0.4.0)
-      fog-xenserver
-      fog-xml (~> 0.1.1)
-      ipaddress (~> 0.5)
-      json (~> 2.0)
-    fog-aliyun (0.4.0)
-      addressable (~> 2.8.0)
-      aliyun-sdk (~> 0.8.0)
-      fog-core
-      fog-json
-      ipaddress (~> 0.8)
-      xml-simple (~> 1.1)
-    fog-atmos (0.1.0)
-      fog-core
-      fog-xml
     fog-aws (2.0.1)
       fog-core (~> 1.38)
       fog-json (~> 1.0)
       fog-xml (~> 0.1)
       ipaddress (~> 0.8)
-    fog-brightbox (0.16.1)
-      dry-inflector
-      fog-core
-      fog-json
-      mime-types
-    fog-cloudatcost (0.1.2)
-      fog-core (~> 1.36)
-      fog-json (~> 1.0)
-      fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
     fog-core (1.45.0)
       builder
       excon (~> 0.58)
       formatador (~> 0.2)
-    fog-digitalocean (0.4.0)
-      fog-core
-      fog-json
-      fog-xml
-      ipaddress (>= 0.5)
-    fog-dnsimple (1.0.0)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
-    fog-dynect (0.0.3)
-      fog-core
-      fog-json
-      fog-xml
-    fog-ecloud (0.3.0)
-      fog-core
-      fog-xml
-    fog-google (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-internet-archive (0.0.2)
-      fog-core
-      fog-json
-      fog-xml
-    fog-joyent (0.0.1)
-      fog-core (~> 1.42)
-      fog-json (>= 1.0)
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
-    fog-local (0.8.0)
-      fog-core (>= 1.27, < 3.0)
-    fog-openstack (0.3.10)
-      fog-core (>= 1.45, <= 2.1.0)
-      fog-json (>= 1.0)
-      ipaddress (>= 0.8)
-    fog-ovirt (2.0.2)
-      activesupport
-      fog-core
-      fog-json
-      fog-xml
-      ovirt-engine-sdk (>= 4.3.1)
-    fog-powerdns (0.2.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-profitbricks (4.1.1)
-      fog-core (~> 1.42)
-      fog-json (~> 1.0)
-    fog-rackspace (0.1.6)
-      fog-core (>= 1.35)
-      fog-json (>= 1.0)
-      fog-xml (>= 0.1)
-      ipaddress (>= 0.8)
-    fog-radosgw (0.0.5)
-      fog-core (>= 1.21.0)
-      fog-json
-      fog-xml (>= 0.0.1)
-    fog-riakcs (0.1.0)
-      fog-core
-      fog-json
-      fog-xml
-    fog-sakuracloud (1.7.5)
-      fog-core
-      fog-json
-    fog-serverlove (0.1.2)
-      fog-core
-      fog-json
-    fog-softlayer (1.1.4)
-      fog-core
-      fog-json
-    fog-storm_on_demand (0.1.1)
-      fog-core
-      fog-json
-    fog-terremark (0.1.0)
-      fog-core
-      fog-xml
-    fog-vmfusion (0.1.0)
-      fission
-      fog-core
-    fog-voxel (0.1.0)
-      fog-core
-      fog-xml
-    fog-vsphere (3.6.0)
-      fog-core
-      rbvmomi2 (~> 3.0)
-    fog-xenserver (1.0.0)
-      fog-core
-      fog-xml
-      xmlrpc
     fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
@@ -517,10 +369,7 @@ GEM
       racc (~> 1.4)
     notifications-ruby-client (5.4.0)
       jwt (>= 1.5, < 3)
-    optimist (3.0.1)
     orm_adapter (0.5.0)
-    ovirt-engine-sdk (4.4.1)
-      json (>= 1, < 3)
     pagy (6.0.4)
     paper_trail (12.2.0)
       activerecord (>= 5.2)
@@ -635,11 +484,6 @@ GEM
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     rb-readline (0.5.5)
-    rbvmomi2 (3.6.0)
-      builder (~> 3.2)
-      json (~> 2.3)
-      nokogiri (~> 1.12, >= 1.12.5)
-      optimist (~> 3.0)
     redis (5.0.6)
       redis-client (>= 0.9.0)
     redis-actionpack (5.3.0)
@@ -827,17 +671,12 @@ GEM
       rack-proxy (>= 0.6.1)
       railties (>= 5.2)
       semantic_range (>= 2.3.0)
-    webrick (1.8.1)
     websocket (1.2.9)
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
     wicked (1.4.0)
       railties (>= 3.0.7)
-    xml-simple (1.1.9)
-      rexml
-    xmlrpc (0.3.2)
-      webrick
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.6.8)
@@ -845,6 +684,7 @@ GEM
 
 PLATFORMS
   arm64-darwin-21
+  arm64-darwin-22
   x86_64-darwin-21
   x86_64-linux
 
@@ -874,7 +714,6 @@ DEPENDENCIES
   email_validator
   enumerize
   factory_bot_rails
-  fog (= 1.42.1)
   fog-aws
   gon (>= 6.4.0)
   govuk-components

From b365a02f760c5d3dbe6f1ab171458fbb6aba80cd Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Wed, 19 Jul 2023 17:48:25 +0100
Subject: [PATCH 128/352] Add tools-version for asdf

---
 .tool-versions | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .tool-versions

diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000000..f2a971aa75
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+ruby 3.2.2

From 314e643565b7f657a409a604ceca3f9f6d6e43f7 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 20 Jul 2023 09:22:46 +0100
Subject: [PATCH 129/352] Adds focus indicator to select element

---
 app/assets/stylesheets/admin/base.scss | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 0c1f0c9f33..4060c26824 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -28,9 +28,9 @@ input[type=text], input[type=tel],
 input[type=email], input[type=password],
 input[type=checkbox], select {
   &:focus {
-    outline: 3px solid #ffdd00;
-    outline-offset: 0;
-    box-shadow: inset 0 0 0 2px;
+    outline: 3px solid #ffdd00 !important;
+    outline-offset: 0 !important;
+    box-shadow: inset 0 0 0 2px !important;
   }
 }
 

From bcaadf995fb3777fccb955449473d8c93c9126f5 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Thu, 20 Jul 2023 13:00:19 +0400
Subject: [PATCH 130/352] Remove ovirt-engine-sdk gem configs

---
 .github/workflows/ci.yml                 | 4 ----
 .github/workflows/deploy_development.yml | 1 -
 .github/workflows/deploy_production.yml  | 1 -
 Dockerfile                               | 1 -
 Dockerfile.local                         | 1 -
 5 files changed, 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd1827bef2..b845aafca3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -59,8 +59,6 @@ jobs:
           sudo apt-get -yqq install postgresql postgresql-client libpq-dev xvfb unzip libcurl4 libcurl3-gnutls libcurl4-openssl-dev
           gem install bundler
           gem update --system && gem update bundler
-          bundle config path vendor/bundle
-          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           yarn install
           bundle install --jobs 4 --retry 3
           RAILS_ENV=test bundle exec rake db:create db:migrate
@@ -102,7 +100,6 @@ jobs:
           npm install -g yarn
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
-          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
@@ -143,7 +140,6 @@ jobs:
         run: |
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
-          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
diff --git a/.github/workflows/deploy_development.yml b/.github/workflows/deploy_development.yml
index 8db60f1a9a..74bd31db81 100644
--- a/.github/workflows/deploy_development.yml
+++ b/.github/workflows/deploy_development.yml
@@ -35,7 +35,6 @@ jobs:
         run: |
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
-          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
diff --git a/.github/workflows/deploy_production.yml b/.github/workflows/deploy_production.yml
index a750cf4679..044f20bf34 100644
--- a/.github/workflows/deploy_production.yml
+++ b/.github/workflows/deploy_production.yml
@@ -36,7 +36,6 @@ jobs:
         run: |
           curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
           sudo dpkg -i cf-cli_amd64.deb
-          bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
           cf -v
           cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
           cf install-plugin blue-green-deploy -r CF-Community -f
diff --git a/Dockerfile b/Dockerfile
index c6415d8f78..fda07a158d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,5 +18,4 @@ ENV CURL_CONNECT_TIMEOUT=0 CURL_TIMEOUT=0 GEM_PATH="$HOME/vendor/bundle/ruby/${R
 COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 COPY . /app
-RUN bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
 RUN bundle install --without development test --jobs 4 && RAILS_ENV=production bundle exec rake assets:precompile
diff --git a/Dockerfile.local b/Dockerfile.local
index e2a4ce15b7..dda339b8f1 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -18,7 +18,6 @@ COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 RUN bundle config set --local path 'vendor/bundle'
 RUN bundle config set --local without 'development test'
-RUN bundle config build.ovirt-engine-sdk --with-cflags=-Drb_cData=rb_cObject
 RUN gem install bundler:2.4.8 && bundle install --jobs 4 --retry 3
 
 COPY . /app

From a84c26394616d1015b1e37ad7bc8a62f1cf40df1 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 20 Jul 2023 11:06:02 +0100
Subject: [PATCH 131/352] Add 'Appraisal view of application' to page title
 when logged in as admin/assessor/judge viewing an application

---
 app/views/layouts/application.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim
index fa45205556..0c12654f22 100644
--- a/app/views/layouts/application.html.slim
+++ b/app/views/layouts/application.html.slim
@@ -1,4 +1,4 @@
-title = content_for?(:title) ? yield(:title)  + " - King's Awards for Enterprise" : "King's Awards for Enterprise"
+title = content_for?(:title) ? "#{'Appraisal view of ' if admin_in_read_only_mode?}" + yield(:title)  + " - King's Awards for Enterprise" : "King's Awards for Enterprise"
 
 - content_for :head do
   = stylesheet_link_tag "application.css"

From 69e1dae4ac8e923f0234252554f7e81c14db1bfd Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Thu, 20 Jul 2023 14:18:30 +0400
Subject: [PATCH 132/352] Add matrix gem

---
 Gemfile      | 2 ++
 Gemfile.lock | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index 8bccf8c255..06b873d599 100644
--- a/Gemfile
+++ b/Gemfile
@@ -143,6 +143,8 @@ gem 'shog'
 
 gem 'rails-healthcheck'
 
+gem 'matrix'
+
 # Used to convert HTML to text, with the exception of whitelisted attributes.
 # This makes it easier for us to display HTML content within PDF documents.
 gem 'sanitize'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3ddbce59e4..4c14f90b23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -729,6 +729,7 @@ DEPENDENCIES
   listen
   lograge
   mail-notify (~> 1.0)
+  matrix
   nilify_blanks
   nokogiri
   paper_trail (~> 12.2.0)

From f9ea38dae8784938fb493007af52275f46a1134a Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Thu, 20 Jul 2023 13:29:33 +0100
Subject: [PATCH 133/352] Specify fog provider

---
 config/initializers/carrierwave.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/initializers/carrierwave.rb b/config/initializers/carrierwave.rb
index 52365da5ff..336df9d918 100644
--- a/config/initializers/carrierwave.rb
+++ b/config/initializers/carrierwave.rb
@@ -1,5 +1,6 @@
 CarrierWave.configure do |config|
   if Rails.env.production?
+    config.fog_provider = 'fog/aws' 
     config.fog_credentials = {
       provider: 'AWS',
       aws_access_key_id: ENV["AWS_ACCESS_KEY_ID"],

From 167b265d456003070472f11aae10c19c98f3d512 Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Thu, 20 Jul 2023 14:01:06 +0100
Subject: [PATCH 134/352] Fix asset compliation error

Alternativly we can switch to terser
---
 config/environments/production.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3952b6f3f2..977542c5e8 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -23,7 +23,8 @@
   config.public_file_server.enabled = true # ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(harmony: true)
+
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.

From 0efd729c89b4986bfe4c9039711810840dd8e4d9 Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Thu, 20 Jul 2023 15:22:31 +0100
Subject: [PATCH 135/352] Update Gemfile.lock

use version of bundler that cf uses
---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 4c14f90b23..f79c8ace02 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -793,4 +793,4 @@ RUBY VERSION
    ruby 3.2.2p53
 
 BUNDLED WITH
-   2.4.8
+   2.4.13

From 36ad2502534e8a24f0e10dc732e0fc4877296f76 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 20 Jul 2023 14:57:25 +0100
Subject: [PATCH 136/352] Use hidden field so elements can not be tabbed into

---
 app/views/assessor/form_answers/index.html.slim | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/app/views/assessor/form_answers/index.html.slim b/app/views/assessor/form_answers/index.html.slim
index 99b88c3776..80ef5bf70e 100644
--- a/app/views/assessor/form_answers/index.html.slim
+++ b/app/views/assessor/form_answers/index.html.slim
@@ -34,25 +34,19 @@ h1.admin-page-heading
 
 = simple_form_for @search, url: assessor_form_answers_path, method: :get, as: :search, html: { class: 'search-form', id: 'application_table_search_form' } do |f|
   = hidden_field_tag :award_type, category_picker.current_award_type, id: "award_type_application_table_search_form"
-  label for="year" class="visuallyhidden" aria-hidden="true"
-    ' Award year
-  = text_field_tag :year, @award_year.year, class: "visuallyhidden", aria: { hidden: true }
+  = hidden_field_tag :year, @award_year.year
 
   - # status filters need to be here because the filtering is done in the other form above, so in order not to break filtering, we need to duplicate it here
   = f.simple_fields_for [:filters, @search.filters] do |h|
-    = h.label :status, class: "visuallyhidden", for: "status_application_table_search_form", aria: { hidden: true }
     = h.input :status,
               collection: FormAnswerStatus::AssessorFilter.options,
               label: false,
-              input_html: { multiple: true, class: 'visuallyhidden', id: 'status_application_table_search_form' },
-              aria: { hidden: true }
+              input_html: { multiple: true, id: 'status_application_table_search_form', class: 'hide' }
 
-    = h.label :sub_status, class: "visuallyhidden", for: "sub_status_application_table_search_form", aria: { hidden: true }
     = h.input :sub_status,
               collection: FormAnswerStatus::AssessorFilter.sub_options(current_assessor),
               label: false,
-              input_html: { multiple: true, class: 'visuallyhidden', id: 'sub_status_application_table_search_form'},
-              aria: { hidden: true }
+              input_html: { multiple: true, id: 'sub_status_application_table_search_form', class: 'hide'}
 
   .row
     .col-xs-12
@@ -61,7 +55,6 @@ h1.admin-page-heading
           tr
             - if current_subject.categories_as_lead.include?(category_picker.current_award_type)
               th
-                span.visuallyhidden Select for bulk action
                 span.if-no-js-hide
                   = check_box_tag :check_all, "Check all", false, aria: { label: "Select all applications for bulk action" }
             th.sortable width="250"

From 8648fe92e8a7471c4030ca4de68f506c78b7c17c Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Fri, 21 Jul 2023 16:44:16 +0400
Subject: [PATCH 137/352] Move forms folder outside to fix autoload issue

---
 app/models/form_answer.rb                          | 14 +++++++-------
 config/application.rb                              |  1 +
 {app/forms => forms}/appraisal_form.rb             |  0
 .../award_years/v2018/enterprise_promotion.rb      |  0
 .../enterprise_promotion_step1.rb                  |  0
 .../enterprise_promotion_step2.rb                  |  0
 .../enterprise_promotion_step3.rb                  |  0
 .../enterprise_promotion_step4.rb                  |  0
 .../enterprise_promotion_step5.rb                  |  0
 .../enterprise_promotion_step6.rb                  |  0
 .../award_years/v2018/innovation.rb                |  0
 .../v2018/innovation/innovation_step1.rb           |  0
 .../v2018/innovation/innovation_step2.rb           |  0
 .../v2018/innovation/innovation_step3.rb           |  0
 .../v2018/innovation/innovation_step4.rb           |  0
 .../v2018/innovation/innovation_step5.rb           |  0
 .../v2018/innovation/innovation_step6.rb           |  0
 .../award_years/v2018/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2018/qae_forms.rb |  0
 .../award_years/v2018/social_mobility.rb           |  0
 .../v2018/social_mobility/social_mobility_step1.rb |  0
 .../v2018/social_mobility/social_mobility_step2.rb |  0
 .../v2018/social_mobility/social_mobility_step3.rb |  0
 .../v2018/social_mobility/social_mobility_step4.rb |  0
 .../v2018/social_mobility/social_mobility_step5.rb |  0
 .../v2018/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2018/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 .../sustainable_development_step6.rb               |  0
 .../award_years/v2019/innovation.rb                |  0
 .../v2019/innovation/innovation_step1.rb           |  0
 .../v2019/innovation/innovation_step2.rb           |  0
 .../v2019/innovation/innovation_step3.rb           |  0
 .../v2019/innovation/innovation_step4.rb           |  0
 .../v2019/innovation/innovation_step5.rb           |  0
 .../v2019/innovation/innovation_step6.rb           |  0
 .../award_years/v2019/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2019/qae_forms.rb |  0
 .../award_years/v2019/social_mobility.rb           |  0
 .../v2019/social_mobility/social_mobility_step1.rb |  0
 .../v2019/social_mobility/social_mobility_step2.rb |  0
 .../v2019/social_mobility/social_mobility_step3.rb |  0
 .../v2019/social_mobility/social_mobility_step4.rb |  0
 .../v2019/social_mobility/social_mobility_step5.rb |  0
 .../v2019/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2019/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 .../sustainable_development_step6.rb               |  0
 .../award_years/v2020/innovation.rb                |  0
 .../v2020/innovation/innovation_step1.rb           |  0
 .../v2020/innovation/innovation_step2.rb           |  0
 .../v2020/innovation/innovation_step3.rb           |  0
 .../v2020/innovation/innovation_step4.rb           |  0
 .../v2020/innovation/innovation_step5.rb           |  0
 .../v2020/innovation/innovation_step6.rb           |  0
 .../award_years/v2020/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2020/qae_forms.rb |  0
 .../award_years/v2020/social_mobility.rb           |  0
 .../v2020/social_mobility/social_mobility_step1.rb |  0
 .../v2020/social_mobility/social_mobility_step2.rb |  0
 .../v2020/social_mobility/social_mobility_step3.rb |  0
 .../v2020/social_mobility/social_mobility_step4.rb |  0
 .../v2020/social_mobility/social_mobility_step5.rb |  0
 .../v2020/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2020/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 .../award_years/v2021/innovation.rb                |  0
 .../v2021/innovation/innovation_step1.rb           |  0
 .../v2021/innovation/innovation_step2.rb           |  0
 .../v2021/innovation/innovation_step3.rb           |  0
 .../v2021/innovation/innovation_step4.rb           |  0
 .../v2021/innovation/innovation_step5.rb           |  0
 .../v2021/innovation/innovation_step6.rb           |  0
 .../award_years/v2021/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2021/qae_forms.rb |  0
 .../award_years/v2021/social_mobility.rb           |  0
 .../v2021/social_mobility/social_mobility_step1.rb |  0
 .../v2021/social_mobility/social_mobility_step2.rb |  0
 .../v2021/social_mobility/social_mobility_step3.rb |  0
 .../v2021/social_mobility/social_mobility_step4.rb |  0
 .../v2021/social_mobility/social_mobility_step5.rb |  0
 .../v2021/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2021/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 .../award_years/v2022/innovation.rb                |  0
 .../v2022/innovation/innovation_step1.rb           |  0
 .../v2022/innovation/innovation_step2.rb           |  0
 .../v2022/innovation/innovation_step3.rb           |  0
 .../v2022/innovation/innovation_step4.rb           |  0
 .../v2022/innovation/innovation_step5.rb           |  0
 .../v2022/innovation/innovation_step6.rb           |  0
 .../award_years/v2022/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2022/qae_forms.rb |  0
 .../award_years/v2022/social_mobility.rb           |  0
 .../v2022/social_mobility/social_mobility_step1.rb |  0
 .../v2022/social_mobility/social_mobility_step2.rb |  0
 .../v2022/social_mobility/social_mobility_step3.rb |  0
 .../v2022/social_mobility/social_mobility_step4.rb |  0
 .../v2022/social_mobility/social_mobility_step5.rb |  0
 .../v2022/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2022/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 .../award_years/v2023/innovation.rb                |  0
 .../v2023/innovation/innovation_step1.rb           |  0
 .../v2023/innovation/innovation_step2.rb           |  0
 .../v2023/innovation/innovation_step3.rb           |  0
 .../v2023/innovation/innovation_step4.rb           |  0
 .../v2023/innovation/innovation_step5.rb           |  0
 .../v2023/innovation/innovation_step6.rb           |  0
 .../award_years/v2023/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2023/qae_forms.rb |  0
 .../award_years/v2023/social_mobility.rb           |  0
 .../v2023/social_mobility/social_mobility_step1.rb |  0
 .../v2023/social_mobility/social_mobility_step2.rb |  0
 .../v2023/social_mobility/social_mobility_step3.rb |  0
 .../v2023/social_mobility/social_mobility_step4.rb |  0
 .../v2023/social_mobility/social_mobility_step5.rb |  0
 .../v2023/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2023/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 .../award_years/v2024/innovation.rb                |  0
 .../v2024/innovation/innovation_step1.rb           |  0
 .../v2024/innovation/innovation_step2.rb           |  0
 .../v2024/innovation/innovation_step3.rb           |  0
 .../v2024/innovation/innovation_step4.rb           |  0
 .../v2024/innovation/innovation_step5.rb           |  0
 .../v2024/innovation/innovation_step6.rb           |  0
 .../award_years/v2024/international_trade.rb       |  0
 .../international_trade_step1.rb                   |  0
 .../international_trade_step2.rb                   |  0
 .../international_trade_step3.rb                   |  0
 .../international_trade_step4.rb                   |  0
 .../international_trade_step5.rb                   |  0
 .../international_trade_step6.rb                   |  0
 .../forms => forms}/award_years/v2024/qae_forms.rb |  0
 .../award_years/v2024/social_mobility.rb           |  0
 .../v2024/social_mobility/social_mobility_step1.rb |  0
 .../v2024/social_mobility/social_mobility_step2.rb |  0
 .../v2024/social_mobility/social_mobility_step3.rb |  0
 .../v2024/social_mobility/social_mobility_step4.rb |  0
 .../v2024/social_mobility/social_mobility_step5.rb |  0
 .../v2024/social_mobility/social_mobility_step6.rb |  0
 .../award_years/v2024/sustainable_development.rb   |  0
 .../sustainable_development_step1.rb               |  0
 .../sustainable_development_step2.rb               |  0
 .../sustainable_development_step3.rb               |  0
 .../sustainable_development_step4.rb               |  0
 .../sustainable_development_step5.rb               |  0
 {app/forms => forms}/custom_email_form.rb          |  0
 .../declaration_of_responsibility_form.rb          |  0
 {app/forms => forms}/eligibility_form.rb           |  0
 {app/forms => forms}/feedback_form.rb              |  0
 {app/forms => forms}/palace_invite_form.rb         |  0
 {app/forms => forms}/qae_form_builder.rb           |  0
 .../qae_form_builder/about_section_question.rb     |  0
 .../qae_form_builder/address_question.rb           |  0
 .../qae_form_builder/award_holder_question.rb      |  0
 .../by_trade_goods_and_services_label_question.rb  |  0
 .../qae_form_builder/by_years_label_question.rb    |  0
 .../qae_form_builder/by_years_question.rb          |  0
 .../qae_form_builder/checkbox_seria_question.rb    |  0
 .../qae_form_builder/comment_question.rb           |  0
 .../qae_form_builder/confirm_question.rb           |  0
 .../qae_form_builder/contact_email_question.rb     |  0
 .../qae_form_builder/contact_question.rb           |  0
 .../qae_form_builder/country_question.rb           |  0
 .../qae_form_builder/date_question.rb              |  0
 .../qae_form_builder/dropdown_question.rb          |  0
 .../qae_form_builder/head_of_business_question.rb  |  0
 .../qae_form_builder/header_question.rb            |  0
 .../innovation_financial_year_date_question.rb     |  0
 .../qae_form_builder/matrix_question.rb            |  0
 ...bility_application_category_options_question.rb |  0
 ...pplication_category_options_question_builder.rb |  0
 ...lication_category_options_question_validator.rb |  0
 .../qae_form_builder/multi_question_decorator.rb   |  0
 .../qae_form_builder/multi_question_validator.rb   |  0
 .../qae_form_builder/number_question.rb            |  0
 .../one_option_by_years_label_question.rb          |  0
 .../one_option_by_years_question.rb                |  0
 .../options_business_name_changed_question.rb      |  0
 .../qae_form_builder/options_question.rb           |  0
 .../qae_form_builder/position_details_question.rb  |  0
 .../press_contact_details_question.rb              |  0
 .../qae_form_builder/previous_name_question.rb     |  0
 .../qae_form_builder/qae_decorator.rb              |  0
 {app/forms => forms}/qae_form_builder/qae_form.rb  |  0
 .../qae_form_builder/qae_form_decorator.rb         |  0
 .../queen_award_applications_question.rb           |  0
 .../queen_award_holder_question.rb                 |  0
 {app/forms => forms}/qae_form_builder/question.rb  |  0
 .../qae_form_builder/regions_question.rb           |  0
 .../qae_form_builder/sic_code_dropdown_question.rb |  0
 {app/forms => forms}/qae_form_builder/step.rb      |  0
 .../subsidiaries_associates_plants_question.rb     |  0
 .../qae_form_builder/supporters_question.rb        |  0
 .../qae_form_builder/text_question.rb              |  0
 .../qae_form_builder/textarea_question.rb          |  0
 .../trade_commercial_success_question.rb           |  0
 ..._most_recent_financial_year_options_question.rb |  0
 .../turnover_exports_calculation_question.rb       |  0
 .../qae_form_builder/upload_question.rb            |  0
 .../qae_form_builder/user_info_question.rb         |  0
 .../qae_form_builder/year_question.rb              |  0
 .../shortlisted_documents_review_form.rb           |  0
 265 files changed, 8 insertions(+), 7 deletions(-)
 rename {app/forms => forms}/appraisal_form.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2018/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2018/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2018/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2018/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2018/sustainable_development/sustainable_development_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2019/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2019/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2019/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2019/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2019/sustainable_development/sustainable_development_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2020/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2020/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2020/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2020/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2020/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2020/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2020/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2020/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2020/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2020/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2021/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2021/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2021/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2021/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2021/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2021/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2021/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2021/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2021/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2021/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2022/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2022/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2022/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2022/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2022/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2022/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2022/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2022/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2022/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2022/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2023/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2023/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2023/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2023/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2023/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2023/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2023/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2023/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2023/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2023/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation/innovation_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation/innovation_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation/innovation_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation/innovation_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation/innovation_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2024/innovation/innovation_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade/international_trade_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade/international_trade_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade/international_trade_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade/international_trade_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade/international_trade_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2024/international_trade/international_trade_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2024/qae_forms.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility/social_mobility_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility/social_mobility_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility/social_mobility_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility/social_mobility_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility/social_mobility_step5.rb (100%)
 rename {app/forms => forms}/award_years/v2024/social_mobility/social_mobility_step6.rb (100%)
 rename {app/forms => forms}/award_years/v2024/sustainable_development.rb (100%)
 rename {app/forms => forms}/award_years/v2024/sustainable_development/sustainable_development_step1.rb (100%)
 rename {app/forms => forms}/award_years/v2024/sustainable_development/sustainable_development_step2.rb (100%)
 rename {app/forms => forms}/award_years/v2024/sustainable_development/sustainable_development_step3.rb (100%)
 rename {app/forms => forms}/award_years/v2024/sustainable_development/sustainable_development_step4.rb (100%)
 rename {app/forms => forms}/award_years/v2024/sustainable_development/sustainable_development_step5.rb (100%)
 rename {app/forms => forms}/custom_email_form.rb (100%)
 rename {app/forms => forms}/declaration_of_responsibility_form.rb (100%)
 rename {app/forms => forms}/eligibility_form.rb (100%)
 rename {app/forms => forms}/feedback_form.rb (100%)
 rename {app/forms => forms}/palace_invite_form.rb (100%)
 rename {app/forms => forms}/qae_form_builder.rb (100%)
 rename {app/forms => forms}/qae_form_builder/about_section_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/address_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/award_holder_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/by_trade_goods_and_services_label_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/by_years_label_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/by_years_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/checkbox_seria_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/comment_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/confirm_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/contact_email_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/contact_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/country_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/date_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/dropdown_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/head_of_business_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/header_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/innovation_financial_year_date_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/matrix_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/mobility_application_category_options_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/mobility_application_category_options_question_builder.rb (100%)
 rename {app/forms => forms}/qae_form_builder/mobility_application_category_options_question_validator.rb (100%)
 rename {app/forms => forms}/qae_form_builder/multi_question_decorator.rb (100%)
 rename {app/forms => forms}/qae_form_builder/multi_question_validator.rb (100%)
 rename {app/forms => forms}/qae_form_builder/number_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/one_option_by_years_label_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/one_option_by_years_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/options_business_name_changed_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/options_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/position_details_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/press_contact_details_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/previous_name_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/qae_decorator.rb (100%)
 rename {app/forms => forms}/qae_form_builder/qae_form.rb (100%)
 rename {app/forms => forms}/qae_form_builder/qae_form_decorator.rb (100%)
 rename {app/forms => forms}/qae_form_builder/queen_award_applications_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/queen_award_holder_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/regions_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/sic_code_dropdown_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/step.rb (100%)
 rename {app/forms => forms}/qae_form_builder/subsidiaries_associates_plants_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/supporters_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/text_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/textarea_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/trade_commercial_success_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/trade_most_recent_financial_year_options_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/turnover_exports_calculation_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/upload_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/user_info_question.rb (100%)
 rename {app/forms => forms}/qae_form_builder/year_question.rb (100%)
 rename {app/forms => forms}/shortlisted_documents_review_form.rb (100%)

diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
index b8381ff2d2..2c2f7f5c50 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -1,10 +1,10 @@
-require_relative '../forms/award_years/v2018/qae_forms'
-require_relative '../forms/award_years/v2019/qae_forms'
-require_relative '../forms/award_years/v2020/qae_forms'
-require_relative '../forms/award_years/v2021/qae_forms'
-require_relative '../forms/award_years/v2022/qae_forms'
-require_relative '../forms/award_years/v2023/qae_forms'
-require_relative '../forms/award_years/v2024/qae_forms'
+require_relative '../../forms/award_years/v2018/qae_forms'
+require_relative '../../forms/award_years/v2019/qae_forms'
+require_relative '../../forms/award_years/v2020/qae_forms'
+require_relative '../../forms/award_years/v2021/qae_forms'
+require_relative '../../forms/award_years/v2022/qae_forms'
+require_relative '../../forms/award_years/v2023/qae_forms'
+require_relative '../../forms/award_years/v2024/qae_forms'
 
 class FormAnswer < ApplicationRecord
   include Statesman::Adapters::ActiveRecordQueries
diff --git a/config/application.rb b/config/application.rb
index 276e87bbdb..83eda38d24 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -49,6 +49,7 @@ class Application < Rails::Application
     config.eager_load = false
 
     config.autoload_once_paths << "#{root}/lib"
+    config.autoload_once_paths << "#{root}/forms"
     config.autoload_paths << "#{root}/lib"
     config.eager_load_paths << "#{root}/lib"
 
diff --git a/app/forms/appraisal_form.rb b/forms/appraisal_form.rb
similarity index 100%
rename from app/forms/appraisal_form.rb
rename to forms/appraisal_form.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion.rb b/forms/award_years/v2018/enterprise_promotion.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion.rb
rename to forms/award_years/v2018/enterprise_promotion.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb b/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb
rename to forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step1.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb b/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb
rename to forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step2.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb b/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb
rename to forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step3.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb b/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb
rename to forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step4.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb b/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb
rename to forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step5.rb
diff --git a/app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb b/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb
similarity index 100%
rename from app/forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb
rename to forms/award_years/v2018/enterprise_promotion/enterprise_promotion_step6.rb
diff --git a/app/forms/award_years/v2018/innovation.rb b/forms/award_years/v2018/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation.rb
rename to forms/award_years/v2018/innovation.rb
diff --git a/app/forms/award_years/v2018/innovation/innovation_step1.rb b/forms/award_years/v2018/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation/innovation_step1.rb
rename to forms/award_years/v2018/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2018/innovation/innovation_step2.rb b/forms/award_years/v2018/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation/innovation_step2.rb
rename to forms/award_years/v2018/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2018/innovation/innovation_step3.rb b/forms/award_years/v2018/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation/innovation_step3.rb
rename to forms/award_years/v2018/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2018/innovation/innovation_step4.rb b/forms/award_years/v2018/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation/innovation_step4.rb
rename to forms/award_years/v2018/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2018/innovation/innovation_step5.rb b/forms/award_years/v2018/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation/innovation_step5.rb
rename to forms/award_years/v2018/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2018/innovation/innovation_step6.rb b/forms/award_years/v2018/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2018/innovation/innovation_step6.rb
rename to forms/award_years/v2018/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2018/international_trade.rb b/forms/award_years/v2018/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade.rb
rename to forms/award_years/v2018/international_trade.rb
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step1.rb b/forms/award_years/v2018/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade/international_trade_step1.rb
rename to forms/award_years/v2018/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step2.rb b/forms/award_years/v2018/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade/international_trade_step2.rb
rename to forms/award_years/v2018/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step3.rb b/forms/award_years/v2018/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade/international_trade_step3.rb
rename to forms/award_years/v2018/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step4.rb b/forms/award_years/v2018/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade/international_trade_step4.rb
rename to forms/award_years/v2018/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step5.rb b/forms/award_years/v2018/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade/international_trade_step5.rb
rename to forms/award_years/v2018/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2018/international_trade/international_trade_step6.rb b/forms/award_years/v2018/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2018/international_trade/international_trade_step6.rb
rename to forms/award_years/v2018/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2018/qae_forms.rb b/forms/award_years/v2018/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2018/qae_forms.rb
rename to forms/award_years/v2018/qae_forms.rb
diff --git a/app/forms/award_years/v2018/social_mobility.rb b/forms/award_years/v2018/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility.rb
rename to forms/award_years/v2018/social_mobility.rb
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step1.rb b/forms/award_years/v2018/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2018/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step2.rb b/forms/award_years/v2018/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2018/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step3.rb b/forms/award_years/v2018/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2018/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step4.rb b/forms/award_years/v2018/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2018/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step5.rb b/forms/award_years/v2018/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2018/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2018/social_mobility/social_mobility_step6.rb b/forms/award_years/v2018/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2018/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2018/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2018/sustainable_development.rb b/forms/award_years/v2018/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development.rb
rename to forms/award_years/v2018/sustainable_development.rb
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2018/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2018/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2018/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2018/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2018/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb b/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb
similarity index 100%
rename from app/forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb
rename to forms/award_years/v2018/sustainable_development/sustainable_development_step6.rb
diff --git a/app/forms/award_years/v2019/innovation.rb b/forms/award_years/v2019/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation.rb
rename to forms/award_years/v2019/innovation.rb
diff --git a/app/forms/award_years/v2019/innovation/innovation_step1.rb b/forms/award_years/v2019/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation/innovation_step1.rb
rename to forms/award_years/v2019/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2019/innovation/innovation_step2.rb b/forms/award_years/v2019/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation/innovation_step2.rb
rename to forms/award_years/v2019/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2019/innovation/innovation_step3.rb b/forms/award_years/v2019/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation/innovation_step3.rb
rename to forms/award_years/v2019/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2019/innovation/innovation_step4.rb b/forms/award_years/v2019/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation/innovation_step4.rb
rename to forms/award_years/v2019/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2019/innovation/innovation_step5.rb b/forms/award_years/v2019/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation/innovation_step5.rb
rename to forms/award_years/v2019/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2019/innovation/innovation_step6.rb b/forms/award_years/v2019/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2019/innovation/innovation_step6.rb
rename to forms/award_years/v2019/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2019/international_trade.rb b/forms/award_years/v2019/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade.rb
rename to forms/award_years/v2019/international_trade.rb
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step1.rb b/forms/award_years/v2019/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade/international_trade_step1.rb
rename to forms/award_years/v2019/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step2.rb b/forms/award_years/v2019/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade/international_trade_step2.rb
rename to forms/award_years/v2019/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step3.rb b/forms/award_years/v2019/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade/international_trade_step3.rb
rename to forms/award_years/v2019/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step4.rb b/forms/award_years/v2019/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade/international_trade_step4.rb
rename to forms/award_years/v2019/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step5.rb b/forms/award_years/v2019/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade/international_trade_step5.rb
rename to forms/award_years/v2019/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2019/international_trade/international_trade_step6.rb b/forms/award_years/v2019/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2019/international_trade/international_trade_step6.rb
rename to forms/award_years/v2019/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2019/qae_forms.rb b/forms/award_years/v2019/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2019/qae_forms.rb
rename to forms/award_years/v2019/qae_forms.rb
diff --git a/app/forms/award_years/v2019/social_mobility.rb b/forms/award_years/v2019/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility.rb
rename to forms/award_years/v2019/social_mobility.rb
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step1.rb b/forms/award_years/v2019/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2019/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step2.rb b/forms/award_years/v2019/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2019/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step3.rb b/forms/award_years/v2019/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2019/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step4.rb b/forms/award_years/v2019/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2019/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step5.rb b/forms/award_years/v2019/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2019/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2019/social_mobility/social_mobility_step6.rb b/forms/award_years/v2019/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2019/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2019/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2019/sustainable_development.rb b/forms/award_years/v2019/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development.rb
rename to forms/award_years/v2019/sustainable_development.rb
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2019/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2019/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2019/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2019/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2019/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb b/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb
similarity index 100%
rename from app/forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb
rename to forms/award_years/v2019/sustainable_development/sustainable_development_step6.rb
diff --git a/app/forms/award_years/v2020/innovation.rb b/forms/award_years/v2020/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation.rb
rename to forms/award_years/v2020/innovation.rb
diff --git a/app/forms/award_years/v2020/innovation/innovation_step1.rb b/forms/award_years/v2020/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation/innovation_step1.rb
rename to forms/award_years/v2020/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2020/innovation/innovation_step2.rb b/forms/award_years/v2020/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation/innovation_step2.rb
rename to forms/award_years/v2020/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2020/innovation/innovation_step3.rb b/forms/award_years/v2020/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation/innovation_step3.rb
rename to forms/award_years/v2020/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2020/innovation/innovation_step4.rb b/forms/award_years/v2020/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation/innovation_step4.rb
rename to forms/award_years/v2020/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2020/innovation/innovation_step5.rb b/forms/award_years/v2020/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation/innovation_step5.rb
rename to forms/award_years/v2020/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2020/innovation/innovation_step6.rb b/forms/award_years/v2020/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2020/innovation/innovation_step6.rb
rename to forms/award_years/v2020/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2020/international_trade.rb b/forms/award_years/v2020/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade.rb
rename to forms/award_years/v2020/international_trade.rb
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step1.rb b/forms/award_years/v2020/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade/international_trade_step1.rb
rename to forms/award_years/v2020/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step2.rb b/forms/award_years/v2020/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade/international_trade_step2.rb
rename to forms/award_years/v2020/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step3.rb b/forms/award_years/v2020/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade/international_trade_step3.rb
rename to forms/award_years/v2020/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step4.rb b/forms/award_years/v2020/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade/international_trade_step4.rb
rename to forms/award_years/v2020/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step5.rb b/forms/award_years/v2020/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade/international_trade_step5.rb
rename to forms/award_years/v2020/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2020/international_trade/international_trade_step6.rb b/forms/award_years/v2020/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2020/international_trade/international_trade_step6.rb
rename to forms/award_years/v2020/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2020/qae_forms.rb b/forms/award_years/v2020/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2020/qae_forms.rb
rename to forms/award_years/v2020/qae_forms.rb
diff --git a/app/forms/award_years/v2020/social_mobility.rb b/forms/award_years/v2020/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility.rb
rename to forms/award_years/v2020/social_mobility.rb
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step1.rb b/forms/award_years/v2020/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2020/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step2.rb b/forms/award_years/v2020/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2020/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step3.rb b/forms/award_years/v2020/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2020/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step4.rb b/forms/award_years/v2020/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2020/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step5.rb b/forms/award_years/v2020/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2020/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2020/social_mobility/social_mobility_step6.rb b/forms/award_years/v2020/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2020/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2020/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2020/sustainable_development.rb b/forms/award_years/v2020/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2020/sustainable_development.rb
rename to forms/award_years/v2020/sustainable_development.rb
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2020/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2020/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2020/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2020/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2020/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/award_years/v2021/innovation.rb b/forms/award_years/v2021/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation.rb
rename to forms/award_years/v2021/innovation.rb
diff --git a/app/forms/award_years/v2021/innovation/innovation_step1.rb b/forms/award_years/v2021/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation/innovation_step1.rb
rename to forms/award_years/v2021/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2021/innovation/innovation_step2.rb b/forms/award_years/v2021/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation/innovation_step2.rb
rename to forms/award_years/v2021/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2021/innovation/innovation_step3.rb b/forms/award_years/v2021/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation/innovation_step3.rb
rename to forms/award_years/v2021/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2021/innovation/innovation_step4.rb b/forms/award_years/v2021/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation/innovation_step4.rb
rename to forms/award_years/v2021/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2021/innovation/innovation_step5.rb b/forms/award_years/v2021/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation/innovation_step5.rb
rename to forms/award_years/v2021/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2021/innovation/innovation_step6.rb b/forms/award_years/v2021/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2021/innovation/innovation_step6.rb
rename to forms/award_years/v2021/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2021/international_trade.rb b/forms/award_years/v2021/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade.rb
rename to forms/award_years/v2021/international_trade.rb
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step1.rb b/forms/award_years/v2021/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade/international_trade_step1.rb
rename to forms/award_years/v2021/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step2.rb b/forms/award_years/v2021/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade/international_trade_step2.rb
rename to forms/award_years/v2021/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step3.rb b/forms/award_years/v2021/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade/international_trade_step3.rb
rename to forms/award_years/v2021/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step4.rb b/forms/award_years/v2021/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade/international_trade_step4.rb
rename to forms/award_years/v2021/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step5.rb b/forms/award_years/v2021/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade/international_trade_step5.rb
rename to forms/award_years/v2021/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2021/international_trade/international_trade_step6.rb b/forms/award_years/v2021/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2021/international_trade/international_trade_step6.rb
rename to forms/award_years/v2021/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2021/qae_forms.rb b/forms/award_years/v2021/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2021/qae_forms.rb
rename to forms/award_years/v2021/qae_forms.rb
diff --git a/app/forms/award_years/v2021/social_mobility.rb b/forms/award_years/v2021/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility.rb
rename to forms/award_years/v2021/social_mobility.rb
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step1.rb b/forms/award_years/v2021/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2021/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step2.rb b/forms/award_years/v2021/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2021/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step3.rb b/forms/award_years/v2021/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2021/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step4.rb b/forms/award_years/v2021/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2021/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step5.rb b/forms/award_years/v2021/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2021/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2021/social_mobility/social_mobility_step6.rb b/forms/award_years/v2021/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2021/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2021/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2021/sustainable_development.rb b/forms/award_years/v2021/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2021/sustainable_development.rb
rename to forms/award_years/v2021/sustainable_development.rb
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2021/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2021/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2021/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2021/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2021/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/award_years/v2022/innovation.rb b/forms/award_years/v2022/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation.rb
rename to forms/award_years/v2022/innovation.rb
diff --git a/app/forms/award_years/v2022/innovation/innovation_step1.rb b/forms/award_years/v2022/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation/innovation_step1.rb
rename to forms/award_years/v2022/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2022/innovation/innovation_step2.rb b/forms/award_years/v2022/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation/innovation_step2.rb
rename to forms/award_years/v2022/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2022/innovation/innovation_step3.rb b/forms/award_years/v2022/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation/innovation_step3.rb
rename to forms/award_years/v2022/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2022/innovation/innovation_step4.rb b/forms/award_years/v2022/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation/innovation_step4.rb
rename to forms/award_years/v2022/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2022/innovation/innovation_step5.rb b/forms/award_years/v2022/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation/innovation_step5.rb
rename to forms/award_years/v2022/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2022/innovation/innovation_step6.rb b/forms/award_years/v2022/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2022/innovation/innovation_step6.rb
rename to forms/award_years/v2022/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2022/international_trade.rb b/forms/award_years/v2022/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade.rb
rename to forms/award_years/v2022/international_trade.rb
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step1.rb b/forms/award_years/v2022/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade/international_trade_step1.rb
rename to forms/award_years/v2022/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step2.rb b/forms/award_years/v2022/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade/international_trade_step2.rb
rename to forms/award_years/v2022/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step3.rb b/forms/award_years/v2022/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade/international_trade_step3.rb
rename to forms/award_years/v2022/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step4.rb b/forms/award_years/v2022/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade/international_trade_step4.rb
rename to forms/award_years/v2022/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step5.rb b/forms/award_years/v2022/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade/international_trade_step5.rb
rename to forms/award_years/v2022/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2022/international_trade/international_trade_step6.rb b/forms/award_years/v2022/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2022/international_trade/international_trade_step6.rb
rename to forms/award_years/v2022/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2022/qae_forms.rb b/forms/award_years/v2022/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2022/qae_forms.rb
rename to forms/award_years/v2022/qae_forms.rb
diff --git a/app/forms/award_years/v2022/social_mobility.rb b/forms/award_years/v2022/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility.rb
rename to forms/award_years/v2022/social_mobility.rb
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step1.rb b/forms/award_years/v2022/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2022/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step2.rb b/forms/award_years/v2022/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2022/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step3.rb b/forms/award_years/v2022/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2022/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step4.rb b/forms/award_years/v2022/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2022/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step5.rb b/forms/award_years/v2022/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2022/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2022/social_mobility/social_mobility_step6.rb b/forms/award_years/v2022/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2022/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2022/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2022/sustainable_development.rb b/forms/award_years/v2022/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2022/sustainable_development.rb
rename to forms/award_years/v2022/sustainable_development.rb
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2022/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2022/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2022/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2022/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2022/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/award_years/v2023/innovation.rb b/forms/award_years/v2023/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation.rb
rename to forms/award_years/v2023/innovation.rb
diff --git a/app/forms/award_years/v2023/innovation/innovation_step1.rb b/forms/award_years/v2023/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation/innovation_step1.rb
rename to forms/award_years/v2023/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2023/innovation/innovation_step2.rb b/forms/award_years/v2023/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation/innovation_step2.rb
rename to forms/award_years/v2023/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2023/innovation/innovation_step3.rb b/forms/award_years/v2023/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation/innovation_step3.rb
rename to forms/award_years/v2023/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2023/innovation/innovation_step4.rb b/forms/award_years/v2023/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation/innovation_step4.rb
rename to forms/award_years/v2023/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2023/innovation/innovation_step5.rb b/forms/award_years/v2023/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation/innovation_step5.rb
rename to forms/award_years/v2023/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2023/innovation/innovation_step6.rb b/forms/award_years/v2023/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2023/innovation/innovation_step6.rb
rename to forms/award_years/v2023/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2023/international_trade.rb b/forms/award_years/v2023/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade.rb
rename to forms/award_years/v2023/international_trade.rb
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step1.rb b/forms/award_years/v2023/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade/international_trade_step1.rb
rename to forms/award_years/v2023/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step2.rb b/forms/award_years/v2023/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade/international_trade_step2.rb
rename to forms/award_years/v2023/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step3.rb b/forms/award_years/v2023/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade/international_trade_step3.rb
rename to forms/award_years/v2023/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step4.rb b/forms/award_years/v2023/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade/international_trade_step4.rb
rename to forms/award_years/v2023/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step5.rb b/forms/award_years/v2023/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade/international_trade_step5.rb
rename to forms/award_years/v2023/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2023/international_trade/international_trade_step6.rb b/forms/award_years/v2023/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2023/international_trade/international_trade_step6.rb
rename to forms/award_years/v2023/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2023/qae_forms.rb b/forms/award_years/v2023/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2023/qae_forms.rb
rename to forms/award_years/v2023/qae_forms.rb
diff --git a/app/forms/award_years/v2023/social_mobility.rb b/forms/award_years/v2023/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility.rb
rename to forms/award_years/v2023/social_mobility.rb
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step1.rb b/forms/award_years/v2023/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2023/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step2.rb b/forms/award_years/v2023/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2023/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step3.rb b/forms/award_years/v2023/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2023/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step4.rb b/forms/award_years/v2023/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2023/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step5.rb b/forms/award_years/v2023/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2023/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2023/social_mobility/social_mobility_step6.rb b/forms/award_years/v2023/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2023/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2023/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2023/sustainable_development.rb b/forms/award_years/v2023/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2023/sustainable_development.rb
rename to forms/award_years/v2023/sustainable_development.rb
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2023/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2023/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2023/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2023/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2023/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/award_years/v2024/innovation.rb b/forms/award_years/v2024/innovation.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation.rb
rename to forms/award_years/v2024/innovation.rb
diff --git a/app/forms/award_years/v2024/innovation/innovation_step1.rb b/forms/award_years/v2024/innovation/innovation_step1.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation/innovation_step1.rb
rename to forms/award_years/v2024/innovation/innovation_step1.rb
diff --git a/app/forms/award_years/v2024/innovation/innovation_step2.rb b/forms/award_years/v2024/innovation/innovation_step2.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation/innovation_step2.rb
rename to forms/award_years/v2024/innovation/innovation_step2.rb
diff --git a/app/forms/award_years/v2024/innovation/innovation_step3.rb b/forms/award_years/v2024/innovation/innovation_step3.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation/innovation_step3.rb
rename to forms/award_years/v2024/innovation/innovation_step3.rb
diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation/innovation_step4.rb
rename to forms/award_years/v2024/innovation/innovation_step4.rb
diff --git a/app/forms/award_years/v2024/innovation/innovation_step5.rb b/forms/award_years/v2024/innovation/innovation_step5.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation/innovation_step5.rb
rename to forms/award_years/v2024/innovation/innovation_step5.rb
diff --git a/app/forms/award_years/v2024/innovation/innovation_step6.rb b/forms/award_years/v2024/innovation/innovation_step6.rb
similarity index 100%
rename from app/forms/award_years/v2024/innovation/innovation_step6.rb
rename to forms/award_years/v2024/innovation/innovation_step6.rb
diff --git a/app/forms/award_years/v2024/international_trade.rb b/forms/award_years/v2024/international_trade.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade.rb
rename to forms/award_years/v2024/international_trade.rb
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb b/forms/award_years/v2024/international_trade/international_trade_step1.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade/international_trade_step1.rb
rename to forms/award_years/v2024/international_trade/international_trade_step1.rb
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb b/forms/award_years/v2024/international_trade/international_trade_step2.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade/international_trade_step2.rb
rename to forms/award_years/v2024/international_trade/international_trade_step2.rb
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step3.rb b/forms/award_years/v2024/international_trade/international_trade_step3.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade/international_trade_step3.rb
rename to forms/award_years/v2024/international_trade/international_trade_step3.rb
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step4.rb b/forms/award_years/v2024/international_trade/international_trade_step4.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade/international_trade_step4.rb
rename to forms/award_years/v2024/international_trade/international_trade_step4.rb
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step5.rb b/forms/award_years/v2024/international_trade/international_trade_step5.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade/international_trade_step5.rb
rename to forms/award_years/v2024/international_trade/international_trade_step5.rb
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step6.rb b/forms/award_years/v2024/international_trade/international_trade_step6.rb
similarity index 100%
rename from app/forms/award_years/v2024/international_trade/international_trade_step6.rb
rename to forms/award_years/v2024/international_trade/international_trade_step6.rb
diff --git a/app/forms/award_years/v2024/qae_forms.rb b/forms/award_years/v2024/qae_forms.rb
similarity index 100%
rename from app/forms/award_years/v2024/qae_forms.rb
rename to forms/award_years/v2024/qae_forms.rb
diff --git a/app/forms/award_years/v2024/social_mobility.rb b/forms/award_years/v2024/social_mobility.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility.rb
rename to forms/award_years/v2024/social_mobility.rb
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb b/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
rename to forms/award_years/v2024/social_mobility/social_mobility_step1.rb
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb b/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
rename to forms/award_years/v2024/social_mobility/social_mobility_step2.rb
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb b/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
rename to forms/award_years/v2024/social_mobility/social_mobility_step3.rb
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step4.rb b/forms/award_years/v2024/social_mobility/social_mobility_step4.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility/social_mobility_step4.rb
rename to forms/award_years/v2024/social_mobility/social_mobility_step4.rb
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step5.rb b/forms/award_years/v2024/social_mobility/social_mobility_step5.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility/social_mobility_step5.rb
rename to forms/award_years/v2024/social_mobility/social_mobility_step5.rb
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step6.rb b/forms/award_years/v2024/social_mobility/social_mobility_step6.rb
similarity index 100%
rename from app/forms/award_years/v2024/social_mobility/social_mobility_step6.rb
rename to forms/award_years/v2024/social_mobility/social_mobility_step6.rb
diff --git a/app/forms/award_years/v2024/sustainable_development.rb b/forms/award_years/v2024/sustainable_development.rb
similarity index 100%
rename from app/forms/award_years/v2024/sustainable_development.rb
rename to forms/award_years/v2024/sustainable_development.rb
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
similarity index 100%
rename from app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
rename to forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
similarity index 100%
rename from app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
rename to forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
similarity index 100%
rename from app/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
rename to forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb
similarity index 100%
rename from app/forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb
rename to forms/award_years/v2024/sustainable_development/sustainable_development_step4.rb
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb
similarity index 100%
rename from app/forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb
rename to forms/award_years/v2024/sustainable_development/sustainable_development_step5.rb
diff --git a/app/forms/custom_email_form.rb b/forms/custom_email_form.rb
similarity index 100%
rename from app/forms/custom_email_form.rb
rename to forms/custom_email_form.rb
diff --git a/app/forms/declaration_of_responsibility_form.rb b/forms/declaration_of_responsibility_form.rb
similarity index 100%
rename from app/forms/declaration_of_responsibility_form.rb
rename to forms/declaration_of_responsibility_form.rb
diff --git a/app/forms/eligibility_form.rb b/forms/eligibility_form.rb
similarity index 100%
rename from app/forms/eligibility_form.rb
rename to forms/eligibility_form.rb
diff --git a/app/forms/feedback_form.rb b/forms/feedback_form.rb
similarity index 100%
rename from app/forms/feedback_form.rb
rename to forms/feedback_form.rb
diff --git a/app/forms/palace_invite_form.rb b/forms/palace_invite_form.rb
similarity index 100%
rename from app/forms/palace_invite_form.rb
rename to forms/palace_invite_form.rb
diff --git a/app/forms/qae_form_builder.rb b/forms/qae_form_builder.rb
similarity index 100%
rename from app/forms/qae_form_builder.rb
rename to forms/qae_form_builder.rb
diff --git a/app/forms/qae_form_builder/about_section_question.rb b/forms/qae_form_builder/about_section_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/about_section_question.rb
rename to forms/qae_form_builder/about_section_question.rb
diff --git a/app/forms/qae_form_builder/address_question.rb b/forms/qae_form_builder/address_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/address_question.rb
rename to forms/qae_form_builder/address_question.rb
diff --git a/app/forms/qae_form_builder/award_holder_question.rb b/forms/qae_form_builder/award_holder_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/award_holder_question.rb
rename to forms/qae_form_builder/award_holder_question.rb
diff --git a/app/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
rename to forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
diff --git a/app/forms/qae_form_builder/by_years_label_question.rb b/forms/qae_form_builder/by_years_label_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/by_years_label_question.rb
rename to forms/qae_form_builder/by_years_label_question.rb
diff --git a/app/forms/qae_form_builder/by_years_question.rb b/forms/qae_form_builder/by_years_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/by_years_question.rb
rename to forms/qae_form_builder/by_years_question.rb
diff --git a/app/forms/qae_form_builder/checkbox_seria_question.rb b/forms/qae_form_builder/checkbox_seria_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/checkbox_seria_question.rb
rename to forms/qae_form_builder/checkbox_seria_question.rb
diff --git a/app/forms/qae_form_builder/comment_question.rb b/forms/qae_form_builder/comment_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/comment_question.rb
rename to forms/qae_form_builder/comment_question.rb
diff --git a/app/forms/qae_form_builder/confirm_question.rb b/forms/qae_form_builder/confirm_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/confirm_question.rb
rename to forms/qae_form_builder/confirm_question.rb
diff --git a/app/forms/qae_form_builder/contact_email_question.rb b/forms/qae_form_builder/contact_email_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/contact_email_question.rb
rename to forms/qae_form_builder/contact_email_question.rb
diff --git a/app/forms/qae_form_builder/contact_question.rb b/forms/qae_form_builder/contact_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/contact_question.rb
rename to forms/qae_form_builder/contact_question.rb
diff --git a/app/forms/qae_form_builder/country_question.rb b/forms/qae_form_builder/country_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/country_question.rb
rename to forms/qae_form_builder/country_question.rb
diff --git a/app/forms/qae_form_builder/date_question.rb b/forms/qae_form_builder/date_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/date_question.rb
rename to forms/qae_form_builder/date_question.rb
diff --git a/app/forms/qae_form_builder/dropdown_question.rb b/forms/qae_form_builder/dropdown_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/dropdown_question.rb
rename to forms/qae_form_builder/dropdown_question.rb
diff --git a/app/forms/qae_form_builder/head_of_business_question.rb b/forms/qae_form_builder/head_of_business_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/head_of_business_question.rb
rename to forms/qae_form_builder/head_of_business_question.rb
diff --git a/app/forms/qae_form_builder/header_question.rb b/forms/qae_form_builder/header_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/header_question.rb
rename to forms/qae_form_builder/header_question.rb
diff --git a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb b/forms/qae_form_builder/innovation_financial_year_date_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/innovation_financial_year_date_question.rb
rename to forms/qae_form_builder/innovation_financial_year_date_question.rb
diff --git a/app/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/matrix_question.rb
rename to forms/qae_form_builder/matrix_question.rb
diff --git a/app/forms/qae_form_builder/mobility_application_category_options_question.rb b/forms/qae_form_builder/mobility_application_category_options_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/mobility_application_category_options_question.rb
rename to forms/qae_form_builder/mobility_application_category_options_question.rb
diff --git a/app/forms/qae_form_builder/mobility_application_category_options_question_builder.rb b/forms/qae_form_builder/mobility_application_category_options_question_builder.rb
similarity index 100%
rename from app/forms/qae_form_builder/mobility_application_category_options_question_builder.rb
rename to forms/qae_form_builder/mobility_application_category_options_question_builder.rb
diff --git a/app/forms/qae_form_builder/mobility_application_category_options_question_validator.rb b/forms/qae_form_builder/mobility_application_category_options_question_validator.rb
similarity index 100%
rename from app/forms/qae_form_builder/mobility_application_category_options_question_validator.rb
rename to forms/qae_form_builder/mobility_application_category_options_question_validator.rb
diff --git a/app/forms/qae_form_builder/multi_question_decorator.rb b/forms/qae_form_builder/multi_question_decorator.rb
similarity index 100%
rename from app/forms/qae_form_builder/multi_question_decorator.rb
rename to forms/qae_form_builder/multi_question_decorator.rb
diff --git a/app/forms/qae_form_builder/multi_question_validator.rb b/forms/qae_form_builder/multi_question_validator.rb
similarity index 100%
rename from app/forms/qae_form_builder/multi_question_validator.rb
rename to forms/qae_form_builder/multi_question_validator.rb
diff --git a/app/forms/qae_form_builder/number_question.rb b/forms/qae_form_builder/number_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/number_question.rb
rename to forms/qae_form_builder/number_question.rb
diff --git a/app/forms/qae_form_builder/one_option_by_years_label_question.rb b/forms/qae_form_builder/one_option_by_years_label_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/one_option_by_years_label_question.rb
rename to forms/qae_form_builder/one_option_by_years_label_question.rb
diff --git a/app/forms/qae_form_builder/one_option_by_years_question.rb b/forms/qae_form_builder/one_option_by_years_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/one_option_by_years_question.rb
rename to forms/qae_form_builder/one_option_by_years_question.rb
diff --git a/app/forms/qae_form_builder/options_business_name_changed_question.rb b/forms/qae_form_builder/options_business_name_changed_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/options_business_name_changed_question.rb
rename to forms/qae_form_builder/options_business_name_changed_question.rb
diff --git a/app/forms/qae_form_builder/options_question.rb b/forms/qae_form_builder/options_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/options_question.rb
rename to forms/qae_form_builder/options_question.rb
diff --git a/app/forms/qae_form_builder/position_details_question.rb b/forms/qae_form_builder/position_details_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/position_details_question.rb
rename to forms/qae_form_builder/position_details_question.rb
diff --git a/app/forms/qae_form_builder/press_contact_details_question.rb b/forms/qae_form_builder/press_contact_details_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/press_contact_details_question.rb
rename to forms/qae_form_builder/press_contact_details_question.rb
diff --git a/app/forms/qae_form_builder/previous_name_question.rb b/forms/qae_form_builder/previous_name_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/previous_name_question.rb
rename to forms/qae_form_builder/previous_name_question.rb
diff --git a/app/forms/qae_form_builder/qae_decorator.rb b/forms/qae_form_builder/qae_decorator.rb
similarity index 100%
rename from app/forms/qae_form_builder/qae_decorator.rb
rename to forms/qae_form_builder/qae_decorator.rb
diff --git a/app/forms/qae_form_builder/qae_form.rb b/forms/qae_form_builder/qae_form.rb
similarity index 100%
rename from app/forms/qae_form_builder/qae_form.rb
rename to forms/qae_form_builder/qae_form.rb
diff --git a/app/forms/qae_form_builder/qae_form_decorator.rb b/forms/qae_form_builder/qae_form_decorator.rb
similarity index 100%
rename from app/forms/qae_form_builder/qae_form_decorator.rb
rename to forms/qae_form_builder/qae_form_decorator.rb
diff --git a/app/forms/qae_form_builder/queen_award_applications_question.rb b/forms/qae_form_builder/queen_award_applications_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/queen_award_applications_question.rb
rename to forms/qae_form_builder/queen_award_applications_question.rb
diff --git a/app/forms/qae_form_builder/queen_award_holder_question.rb b/forms/qae_form_builder/queen_award_holder_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/queen_award_holder_question.rb
rename to forms/qae_form_builder/queen_award_holder_question.rb
diff --git a/app/forms/qae_form_builder/question.rb b/forms/qae_form_builder/question.rb
similarity index 100%
rename from app/forms/qae_form_builder/question.rb
rename to forms/qae_form_builder/question.rb
diff --git a/app/forms/qae_form_builder/regions_question.rb b/forms/qae_form_builder/regions_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/regions_question.rb
rename to forms/qae_form_builder/regions_question.rb
diff --git a/app/forms/qae_form_builder/sic_code_dropdown_question.rb b/forms/qae_form_builder/sic_code_dropdown_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/sic_code_dropdown_question.rb
rename to forms/qae_form_builder/sic_code_dropdown_question.rb
diff --git a/app/forms/qae_form_builder/step.rb b/forms/qae_form_builder/step.rb
similarity index 100%
rename from app/forms/qae_form_builder/step.rb
rename to forms/qae_form_builder/step.rb
diff --git a/app/forms/qae_form_builder/subsidiaries_associates_plants_question.rb b/forms/qae_form_builder/subsidiaries_associates_plants_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/subsidiaries_associates_plants_question.rb
rename to forms/qae_form_builder/subsidiaries_associates_plants_question.rb
diff --git a/app/forms/qae_form_builder/supporters_question.rb b/forms/qae_form_builder/supporters_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/supporters_question.rb
rename to forms/qae_form_builder/supporters_question.rb
diff --git a/app/forms/qae_form_builder/text_question.rb b/forms/qae_form_builder/text_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/text_question.rb
rename to forms/qae_form_builder/text_question.rb
diff --git a/app/forms/qae_form_builder/textarea_question.rb b/forms/qae_form_builder/textarea_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/textarea_question.rb
rename to forms/qae_form_builder/textarea_question.rb
diff --git a/app/forms/qae_form_builder/trade_commercial_success_question.rb b/forms/qae_form_builder/trade_commercial_success_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/trade_commercial_success_question.rb
rename to forms/qae_form_builder/trade_commercial_success_question.rb
diff --git a/app/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb b/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb
rename to forms/qae_form_builder/trade_most_recent_financial_year_options_question.rb
diff --git a/app/forms/qae_form_builder/turnover_exports_calculation_question.rb b/forms/qae_form_builder/turnover_exports_calculation_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/turnover_exports_calculation_question.rb
rename to forms/qae_form_builder/turnover_exports_calculation_question.rb
diff --git a/app/forms/qae_form_builder/upload_question.rb b/forms/qae_form_builder/upload_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/upload_question.rb
rename to forms/qae_form_builder/upload_question.rb
diff --git a/app/forms/qae_form_builder/user_info_question.rb b/forms/qae_form_builder/user_info_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/user_info_question.rb
rename to forms/qae_form_builder/user_info_question.rb
diff --git a/app/forms/qae_form_builder/year_question.rb b/forms/qae_form_builder/year_question.rb
similarity index 100%
rename from app/forms/qae_form_builder/year_question.rb
rename to forms/qae_form_builder/year_question.rb
diff --git a/app/forms/shortlisted_documents_review_form.rb b/forms/shortlisted_documents_review_form.rb
similarity index 100%
rename from app/forms/shortlisted_documents_review_form.rb
rename to forms/shortlisted_documents_review_form.rb

From faf8d5d56130bf13525d9e4f49e474a30d7cdc45 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 24 Jul 2023 08:36:26 +0100
Subject: [PATCH 138/352] Update rails

---
 Gemfile      |   2 +-
 Gemfile.lock | 180 ++++++++++++++++++++++++++-------------------------
 2 files changed, 92 insertions(+), 90 deletions(-)

diff --git a/Gemfile b/Gemfile
index 06b873d599..bdce10c4aa 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ git_source(:github) { |name| "https://github.com/#{name}.git" }
 
 ruby '~> 3.2.2'
 
-gem 'rails', '7.0.5'
+gem 'rails', '7.0.5.1'
 gem 'websocket-extensions', '~> 0.1.5'
 
 # SSL redirect
diff --git a/Gemfile.lock b/Gemfile.lock
index f79c8ace02..54b9eb3e4e 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,73 +10,73 @@ GEM
   remote: https://rubygems.org/
   specs:
     Ascii85 (1.1.0)
-    actioncable (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    actioncable (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.5)
-      actionpack (= 7.0.5)
-      activejob (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionmailbox (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activestorage (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.0.5)
-      actionpack (= 7.0.5)
-      actionview (= 7.0.5)
-      activejob (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionmailer (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      actionview (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.5)
-      actionview (= 7.0.5)
-      activesupport (= 7.0.5)
+    actionpack (7.0.5.1)
+      actionview (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.5)
-      actionpack (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+    actiontext (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activestorage (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.5)
-      activesupport (= 7.0.5)
+    actionview (7.0.5.1)
+      activesupport (= 7.0.5.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    active_hash (3.1.1)
+    active_hash (3.2.0)
       activesupport (>= 5.0.0)
-    activejob (7.0.5)
-      activesupport (= 7.0.5)
+    activejob (7.0.5.1)
+      activesupport (= 7.0.5.1)
       globalid (>= 0.3.6)
-    activemodel (7.0.5)
-      activesupport (= 7.0.5)
+    activemodel (7.0.5.1)
+      activesupport (= 7.0.5.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (7.0.5)
-      activemodel (= 7.0.5)
-      activesupport (= 7.0.5)
-    activestorage (7.0.5)
-      actionpack (= 7.0.5)
-      activejob (= 7.0.5)
-      activerecord (= 7.0.5)
-      activesupport (= 7.0.5)
+    activerecord (7.0.5.1)
+      activemodel (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
+    activestorage (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.5)
+    activesupport (7.0.5.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -86,7 +86,7 @@ GEM
     afm (0.2.2)
     amoeba (3.0.0)
       activerecord (>= 3.2.6)
-    appsignal (3.3.10)
+    appsignal (3.4.8)
       rack
     ast (2.4.2)
     authy (3.0.1)
@@ -97,7 +97,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    bcrypt (3.1.18)
+    bcrypt (3.1.19)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootscale (0.7.0)
@@ -139,9 +139,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    colorize (0.8.1)
+    colorize (1.1.0)
     concurrent-ruby (1.2.2)
-    connection_pool (2.4.0)
+    connection_pool (2.4.1)
     countries (2.1.4)
       i18n_data (~> 0.8.0)
       money (~> 6.9)
@@ -197,12 +197,12 @@ GEM
       ruby2_keywords
     email_validator (2.2.4)
       activemodel
-    enumerize (2.6.1)
+    enumerize (2.7.0)
       activesupport (>= 3.2)
     erubi (1.12.0)
     et-orbi (1.2.7)
       tzinfo
-    excon (0.99.0)
+    excon (0.100.0)
     execjs (2.8.1)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
@@ -237,22 +237,22 @@ GEM
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
     ffi (1.15.5)
-    fog-aws (2.0.1)
-      fog-core (~> 1.38)
-      fog-json (~> 1.0)
+    fog-aws (3.19.0)
+      fog-core (~> 2.1)
+      fog-json (~> 1.1)
       fog-xml (~> 0.1)
-      ipaddress (~> 0.8)
-    fog-core (1.45.0)
+    fog-core (2.3.0)
       builder
-      excon (~> 0.58)
-      formatador (~> 0.2)
+      excon (~> 0.71)
+      formatador (>= 0.2, < 2.0)
+      mime-types
     fog-json (1.2.0)
       fog-core
       multi_json (~> 1.10)
     fog-xml (0.1.4)
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
-    formatador (0.3.0)
+    formatador (1.1.0)
     fugit (1.8.1)
       et-orbi (~> 1, >= 1.2.7)
       raabro (~> 1.4)
@@ -263,14 +263,14 @@ GEM
       i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
-    govuk-components (4.0.0)
+    govuk-components (4.1.0)
       html-attributes-utils (~> 1.0.0, >= 1.0.0)
       pagy (~> 6.0)
-      view_component (~> 3.0.0)
+      view_component (~> 3.3.0)
     hashdiff (1.0.1)
     hashery (2.1.2)
     hashie (3.6.0)
-    html-attributes-utils (1.0.0)
+    html-attributes-utils (1.0.1)
       activesupport (>= 6.1.4.4)
     http-accept (1.7.0)
     http-cookie (1.0.5)
@@ -280,7 +280,6 @@ GEM
       concurrent-ruby (~> 1.0)
     i18n_data (0.8.0)
     ice_nine (0.11.2)
-    ipaddress (0.8.3)
     jbuilder (2.10.2)
       activesupport (>= 5.0.0)
     jquery-rails (4.4.0)
@@ -292,7 +291,7 @@ GEM
     js_cookie_rails (2.1.4)
       railties (>= 3.1)
     json (2.6.3)
-    jwt (2.7.0)
+    jwt (2.7.1)
     kaminari (1.2.2)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.2.2)
@@ -347,7 +346,7 @@ GEM
     multipart-post (2.3.0)
     mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    net-imap (0.3.4)
+    net-imap (0.3.6)
       date
       net-protocol
     net-pop (0.1.2)
@@ -361,11 +360,11 @@ GEM
       activerecord (>= 4.0.0)
       activesupport (>= 4.0.0)
     nio4r (2.5.9)
-    nokogiri (1.15.2-arm64-darwin)
+    nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-darwin)
+    nokogiri (1.15.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.15.2-x86_64-linux)
+    nokogiri (1.15.3-x86_64-linux)
       racc (~> 1.4)
     notifications-ruby-client (5.4.0)
       jwt (>= 1.5, < 3)
@@ -377,8 +376,9 @@ GEM
     paper_trail-association_tracking (2.2.1)
       paper_trail (>= 12.0)
     parallel (1.23.0)
-    parser (3.2.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
     pdf-core (0.9.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
@@ -412,7 +412,7 @@ GEM
     pry-byebug (3.10.1)
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     puma (6.3.0)
       nio4r (~> 2.0)
     pundit (0.3.0)
@@ -436,26 +436,27 @@ GEM
     rack-ssl-enforcer (0.2.9)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (7.0.5)
-      actioncable (= 7.0.5)
-      actionmailbox (= 7.0.5)
-      actionmailer (= 7.0.5)
-      actionpack (= 7.0.5)
-      actiontext (= 7.0.5)
-      actionview (= 7.0.5)
-      activejob (= 7.0.5)
-      activemodel (= 7.0.5)
-      activerecord (= 7.0.5)
-      activestorage (= 7.0.5)
-      activesupport (= 7.0.5)
+    rails (7.0.5.1)
+      actioncable (= 7.0.5.1)
+      actionmailbox (= 7.0.5.1)
+      actionmailer (= 7.0.5.1)
+      actionpack (= 7.0.5.1)
+      actiontext (= 7.0.5.1)
+      actionview (= 7.0.5.1)
+      activejob (= 7.0.5.1)
+      activemodel (= 7.0.5.1)
+      activerecord (= 7.0.5.1)
+      activestorage (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       bundler (>= 1.15.0)
-      railties (= 7.0.5)
+      railties (= 7.0.5.1)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-healthcheck (1.4.0)
       actionpack
@@ -471,9 +472,9 @@ GEM
       railties (> 3.1)
     rails_serve_static_assets (0.0.5)
     rails_stdout_logging (0.0.5)
-    railties (7.0.5)
-      actionpack (= 7.0.5)
-      activesupport (= 7.0.5)
+    railties (7.0.5.1)
+      actionpack (= 7.0.5.1)
+      activesupport (= 7.0.5.1)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -504,7 +505,7 @@ GEM
       redis-store (>= 1.2, < 2)
     redis-store (1.9.2)
       redis (>= 4, < 6)
-    regexp_parser (1.8.2)
+    regexp_parser (2.8.1)
     request_store (1.5.1)
       rack (>= 1.4)
     responders (3.1.0)
@@ -527,7 +528,7 @@ GEM
       rspec-support (~> 3.12.0)
     rspec-github (2.4.0)
       rspec-core (~> 3.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
     rspec-rails (6.0.3)
@@ -554,7 +555,7 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.28.1)
+    rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
     ruby-rc4 (0.1.5)
@@ -588,7 +589,7 @@ GEM
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       redis (>= 4.5.0)
-    sidekiq-cron (1.10.0)
+    sidekiq-cron (1.10.1)
       fugit (~> 1.8)
       globalid (>= 1.0.1)
       sidekiq (>= 6)
@@ -606,7 +607,7 @@ GEM
       rack (~> 2.2, >= 2.2.4)
       rack-protection (= 3.0.5)
       tilt (~> 2.0)
-    sixarm_ruby_unaccent (1.2.0)
+    sixarm_ruby_unaccent (1.2.2)
     slim (4.1.0)
       temple (>= 0.7.6, < 0.9)
       tilt (>= 2.0.6, < 2.1)
@@ -630,7 +631,7 @@ GEM
     thread_safe (0.3.6)
     tilt (2.0.11)
     timecop (0.9.6)
-    timeout (0.3.2)
+    timeout (0.4.0)
     ttfunk (1.7.0)
     turnip (4.2.0)
       cucumber-gherkin (~> 14.0)
@@ -644,7 +645,7 @@ GEM
     unf_ext (0.0.8.2)
     unicode-display_width (1.8.0)
     unicode_utils (1.4.0)
-    view_component (3.0.0)
+    view_component (3.3.0)
       activesupport (>= 5.2.0, < 8.0)
       concurrent-ruby (~> 1.0)
       method_source (~> 1.0)
@@ -686,6 +687,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   x86_64-darwin-21
+  x86_64-darwin-22
   x86_64-linux
 
 DEPENDENCIES
@@ -748,7 +750,7 @@ DEPENDENCIES
   rack-mini-profiler (>= 0.10.1)
   rack-protection (= 3.0.5)
   rack-ssl-enforcer
-  rails (= 7.0.5)
+  rails (= 7.0.5.1)
   rails-controller-testing
   rails-healthcheck
   rails-html-sanitizer (~> 1.4.4)

From 6d4f6095b32b7c4c5cb16d86e113004f7c2df0c8 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:06:14 -0300
Subject: [PATCH 139/352] JS: Add `form-flash` controller

---
 .../controllers/form_flash_controller.js      | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 app/javascript/controllers/form_flash_controller.js

diff --git a/app/javascript/controllers/form_flash_controller.js b/app/javascript/controllers/form_flash_controller.js
new file mode 100644
index 0000000000..064f78c1ac
--- /dev/null
+++ b/app/javascript/controllers/form_flash_controller.js
@@ -0,0 +1,67 @@
+export default class extends ApplicationController {
+  static values = {
+    error: String,
+    success: String,
+  };
+
+  connect() {
+    this.element.addEventListener('ajax:x:success', this.onSuccess);
+    this.element.addEventListener('ajax:x:error', this.onError);
+  }
+
+  disconnect() {
+    this.element.removeEventListener('ajax:x:success', this.onSuccess);
+    this.element.removeEventListener('ajax:x:error', this.onError);
+  }
+
+  success(event) {
+    return this.onSuccess(event);
+  }
+
+  error(event) {
+    return this.onError(event);
+  }
+
+  onSuccess = (event) => {
+    const msg = this.hasSuccessValue ? this.successValue : 'Success!';
+    const [alert, identifier] = this.createAlert('success', msg);
+
+    setTimeout(() => this.showAlert(alert, identifier), 50);
+  };
+
+  onError = (event) => {
+    const msg = this.hasErrorValue ? this.errorValue : 'An unknown error has occurred, please try again.';
+    const [alert, identifier] = this.createAlert('danger', msg);
+
+    setTimeout(() => this.showAlert(alert, identifier), 50);
+  };
+
+  createAlert = (type, message) => {
+    const id = 'alert__' + String(Math.random()).slice(2, -1);
+    const element = `
+      <div id='${id}' class='alert alert-${type}' data-controller='element-removal' role='alert' style='padding-top: 6px; padding-bottom: 6px; margin-bottom: 8px;'>
+        ${message}
+        <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close' style='font-size: 18px;'>
+          <span aria-hidden='true'>&times;</span>
+        </button>
+      </div>
+    `;
+
+    return [element, id];
+  };
+
+  showAlert = (alert, identifier) => {
+    const form = document.getElementById(this.element.id);
+    const container = form.parentNode;
+    const element =
+      container && (container.classList.contains('form-container') || container.classList.contains('form-group'))
+        ? container
+        : form;
+    element.insertAdjacentHTML('afterbegin', alert);
+    console.log('element', element);
+    setTimeout(() => {
+      const inserted = document.getElementById(identifier);
+      if (inserted) inserted.remove();
+    }, 4000);
+  };
+}

From 28e2001d190f2c3a7c4d2687a2ce31d097c9f928 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:07:44 -0300
Subject: [PATCH 140/352] Listen to `ajax` events & pass them further (due to
 `jquery_ujs`)

---
 .../javascripts/application-admin.js.coffee     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/application-admin.js.coffee b/app/assets/javascripts/application-admin.js.coffee
index 6011afb7b2..673022e3f7 100644
--- a/app/assets/javascripts/application-admin.js.coffee
+++ b/app/assets/javascripts/application-admin.js.coffee
@@ -26,7 +26,18 @@
 #= require clean-paste
 
 $(document).ready(() ->
-  $("html").removeClass("no-js").addClass("js")
-  ($ ".timepicker").timePicker()
-  ($ ".datepicker").datepicker({dateFormat: "dd/mm/yy"})
+  $('html').removeClass('no-js').addClass('js')
+  ($ '.timepicker').timePicker()
+  ($ '.datepicker').datepicker({dateFormat: 'dd/mm/yy'})
 )
+
+$(document).on 'ajax:success', 'form', (event, data, _status, _xhr) ->
+  fire(this, 'ajax:x:success', data)
+
+$(document).on 'ajax:error', 'form', (event, data, _status, _xhr) ->
+  fire(this, 'ajax:x:error', data)
+
+window.fire = (obj, name, data) ->
+  event = new CustomEvent(name, detail: data, bubbles: true, cancelable: true)
+  obj.dispatchEvent(event)
+  !event.defaultPrevented

From 2371dee8ddd2a82b69b6af8c06236d02c520b89b Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:08:50 -0300
Subject: [PATCH 141/352] Helper function for displaying generic flash messages
 when JS is disabled

---
 app/controllers/admin/base_controller.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 0fa7161e96..8ea7ef5bcb 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -20,6 +20,14 @@ def current_subject
     current_admin
   end
 
+  def render_flash_message_for(resource, message: nil)
+    if resource.errors.any?
+      flash[:error] = message || "An unknown error has occurred, please try again."
+    else
+      flash[:notice] = message || "Success!"
+    end
+  end
+
   private
 
   def user_not_authorized

From 608f863dd50df28e19c12a077010097bb2b52e16 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:09:39 -0300
Subject: [PATCH 142/352] Render generic flash message when comment is modified

---
 app/controllers/admin/comments_controller.rb | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb
index 1cf05c7515..938f5c908a 100644
--- a/app/controllers/admin/comments_controller.rb
+++ b/app/controllers/admin/comments_controller.rb
@@ -27,6 +27,7 @@ def create
             head :ok
           end
         else
+          render_flash_message_for(@comment)
           redirect_to admin_form_answer_path(form_answer)
         end
       end
@@ -38,7 +39,10 @@ def update
     log_event if resource.update(update_params)
 
     respond_to do |format|
-      format.html { redirect_to([namespace_name, form_answer]) }
+      format.html do 
+        render_flash_message_for(resource)
+        redirect_to([namespace_name, form_answer]) 
+      end
       format.js { head :ok }
     end
   end
@@ -49,8 +53,11 @@ def destroy
     log_event if resource.destroy
 
     respond_to do |format|
-      format.json{ render(json: :ok)}
-      format.html{ redirect_to admin_form_answer_path(form_answer)}
+      format.json { render(json: :ok)}
+      format.html do 
+        render_flash_message_for(resource)
+        redirect_to(admin_form_answer_path(form_answer))
+      end
     end
   end
 

From 0cb295eafbd5df3d9f6d04682f1cb4a97c8f6c01 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:10:12 -0300
Subject: [PATCH 143/352] Add `data-controller` attribute

---
 app/views/admin/feedbacks/_section.html.slim               | 2 +-
 app/views/admin/form_answers/_assessors_section.html.slim  | 4 ++--
 .../admin/form_answers/_section_admin_comments.html.slim   | 2 +-
 .../_section_appraisal_form_moderated.html.slim            | 2 +-
 .../form_answers/_section_appraisal_form_primary.html.slim | 2 +-
 .../_section_appraisal_form_secondary.html.slim            | 2 +-
 .../form_answers/_section_critical_comments.html.slim      | 2 +-
 .../admin/form_answers/_section_draft_notes.html.slim      | 2 +-
 .../form_answers/company_details/_address_form.html.slim   | 7 +++----
 .../company_details/_company_name_form.html.slim           | 2 +-
 .../company_details/_date_trading_form.html.slim           | 2 +-
 .../company_details/_goods_services_form.html.slim         | 2 +-
 .../company_details/_organisation_head_form.html.slim      | 2 +-
 .../company_details/_organisation_type_form.html.slim      | 2 +-
 .../company_details/_registration_number_form.html.slim    | 2 +-
 .../admin/form_answers/company_details/_sic_form.html.slim | 2 +-
 .../company_details/_this_entry_relates_to_form.html.slim  | 2 +-
 .../form_answers/company_details/_website_form.html.slim   | 2 +-
 .../company_details/parent_company/_form.html.slim         | 2 +-
 .../company_details/previous_wins/_form.html.slim          | 2 +-
 .../admin/form_answers/financial_summary/_list.html.slim   | 2 +-
 app/views/admin/press_summaries/_section.html.slim         | 4 ++--
 app/views/admin/settings/_deadline_form.html.slim          | 2 +-
 app/views/admin/users/_form.html.slim                      | 2 +-
 24 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/app/views/admin/feedbacks/_section.html.slim b/app/views/admin/feedbacks/_section.html.slim
index 067a9760f7..99d4844212 100644
--- a/app/views/admin/feedbacks/_section.html.slim
+++ b/app/views/admin/feedbacks/_section.html.slim
@@ -1,6 +1,6 @@
 - feedback = form_answer.feedback.present? ? form_answer.feedback : form_answer.build_feedback
 - url = feedback.persisted? ? polymorphic_url([namespace_name, form_answer, feedback]) : polymorphic_url([namespace_name, form_answer, :feedbacks])
-= simple_form_for feedback, url: url, remote: true, authenticity_token: true, html: { "data-type" => "json" } do |f|
+= simple_form_for feedback, url: url, remote: true, authenticity_token: true, html: { data: { type: "json", controller: "form-flash" } } do |f|
   - if !form_answer.promotion?
     = render "admin/feedbacks/overall_feedback_field", f: f, feedback: feedback
   - FeedbackForm.fields_for_award_type(form_answer.object).each do |feedback_field, feedback_field_value|
diff --git a/app/views/admin/form_answers/_assessors_section.html.slim b/app/views/admin/form_answers/_assessors_section.html.slim
index 3d478a6917..0ed796b5af 100644
--- a/app/views/admin/form_answers/_assessors_section.html.slim
+++ b/app/views/admin/form_answers/_assessors_section.html.slim
@@ -25,7 +25,7 @@
       - if policy(resource).assign_assessor?
         = form_for [namespace_name, resource.assessor_assignments.primary],
                    remote: true,
-                   html: { "data-type" => "json"},
+                   html: { data: { type: "json", controller: "form-flash" } },
                    authenticity_token: true do |form|
 
           .form-fields
@@ -59,7 +59,7 @@
       - if policy(resource).assign_assessor?
         = form_for [namespace_name, resource.assessor_assignments.secondary],
                    remote: true,
-                   html: { "data-type" => "json" },
+                   html: { data: { type: "json", controller: "form-flash" } },
                    authenticity_token: true do |form|
 
           .form-fields
diff --git a/app/views/admin/form_answers/_section_admin_comments.html.slim b/app/views/admin/form_answers/_section_admin_comments.html.slim
index 9bdd5a4639..998d41aac2 100644
--- a/app/views/admin/form_answers/_section_admin_comments.html.slim
+++ b/app/views/admin/form_answers/_section_admin_comments.html.slim
@@ -19,7 +19,7 @@
     .panel-body
       .comments-container data-comment-form=new_admin_form_answer_comment_path(@form_answer)
         - if !(defined? read_only)
-          = form_for([:admin, @form_answer, @form_answer.comments.new(section: "admin")], html: { id: "admin_comment_form" }) do |f|
+          = form_for([:admin, @form_answer, @form_answer.comments.new(section: "admin")], html: { id: "admin_comment_form", data: { controller: "form-flash" } }) do |f|
             = render('admin/comments/form', f: f)
           .comment-insert
         - if !(defined? read_only)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index b586e45740..9c84e2ff69 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -12,7 +12,7 @@
       = simple_form_for([namespace_name, moderated_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "json"}) do |f|
+                        html: { data: { type: "json", controller: "form-flash" } }) do |f|
 
         = render_section(resource, f)
         = hidden_field_tag :updated_section
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index 6662b3076a..8d2766819d 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -12,7 +12,7 @@
       = simple_form_for([namespace_name, primary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "json", id: "primary_appraisal_form" }) do |f|
+                        html: { data: { type: "json", controller: "form-flash" }, id: "primary_appraisal_form" }) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "primary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 6581f710b6..cd5f0b79f7 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -12,7 +12,7 @@
       = simple_form_for([namespace_name, secondary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "json", id: "secondary_appraisal_form"}) do |f|
+                        html: { data: { type: "json", controller: "form-flash" }, id: "secondary_appraisal_form"}) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "secondary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_critical_comments.html.slim b/app/views/admin/form_answers/_section_critical_comments.html.slim
index 29ac1cf2fa..8d8fe0e672 100644
--- a/app/views/admin/form_answers/_section_critical_comments.html.slim
+++ b/app/views/admin/form_answers/_section_critical_comments.html.slim
@@ -18,7 +18,7 @@
   #section-critical-comments.section-critical-comments.panel-collapse.collapse aria-labelledby="critical-comments-heading"
     .panel-body
       .comments-container.comment-assessor
-        = form_for([namespace_name, @form_answer, @form_answer.comments.new(section: "critical")]) do |f|
+        = form_for([namespace_name, @form_answer, @form_answer.comments.new(section: "critical")], html: { data: { controller: "form-flash" } }) do |f|
           = render("admin/comments/form", f: f)
         .comment-insert
         = render(collection: @form_answer.comments.critical, partial: "admin/form_answers/comment")
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index b6e59ee202..4c0c561305 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -12,7 +12,7 @@
       = simple_form_for([namespace_name, @form_answer, @form_answer.draft_note],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "json" }) do |f|
+                        html: { data: { type: "json",  controller: "form-flash" } }) do |f|
 
         .form-group[class="#{'form-edit' if f.object.content.blank?}" data-controller="element-focus"]
           .form-container
diff --git a/app/views/admin/form_answers/company_details/_address_form.html.slim b/app/views/admin/form_answers/company_details/_address_form.html.slim
index 1cf2516a96..eb2c110f2d 100644
--- a/app/views/admin/form_answers/company_details/_address_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_address_form.html.slim
@@ -30,10 +30,9 @@
             - if @form_answer.nominee_region.present?
               = @form_answer.nominee_region
 
-        - if user_can_edit(@form_answer, :address)
           = simple_form_for([namespace_name, resource],
                             remote: true,
-                            authenticity_token: true, html: { "data-type" => "html", id: "address_form_admin_appraisal" }) do |f|
+                            authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "address_form_admin_appraisal" }) do |f|
 
             = hidden_field_tag :section, "address"
             .input.form-group.form-fields.form-block
@@ -146,7 +145,7 @@
       - if resource.submitted_and_after_the_deadline? && CompanyDetailPolicy.new(pundit_user, resource).can_manage_address?
         = simple_form_for([namespace_name, resource],
                           remote: true,
-                          authenticity_token: true, html: { "data-type" => "html" }) do |f|
+                          authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "address_form_admin_appraisal" }) do |f|
 
           = hidden_field_tag :section, "address", id: "section_address_hidden_field"
           .input.form-group.form-fields.form-block
@@ -263,7 +262,7 @@
         - if resource.submitted_and_after_the_deadline? && CompanyDetailPolicy.new(pundit_user, resource).can_manage_address?
           = simple_form_for([namespace_name, resource],
                             remote: true,
-                            authenticity_token: true, html: { "data-type" => "html" }) do |f|
+                            authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "address_form_admin_appraisal" }) do |f|
             = hidden_field_tag :section, "address"
             .input.form-group.form-fields.form-block
               = f.simple_fields_for(:data) do |f|
diff --git a/app/views/admin/form_answers/company_details/_company_name_form.html.slim b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
index 591eb7ec5b..b87f11db5d 100644
--- a/app/views/admin/form_answers/company_details/_company_name_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
@@ -4,7 +4,7 @@
     = simple_form_for [namespace_name, @form_answer],
                       remote: true,
                       authenticity_token: true,
-                      html: { "data-type" => "html", class: "company-name-form", id: "company_name_form_admin_appraisal"} do |f|
+                      html: { data: { type: "html", controller: "form-flash" }, class: "company-name-form", id: "company_name_form_admin_appraisal"} do |f|
 
       = hidden_field_tag :section, "company_name", id: "section_company_name_hidden_field"
       .form-container
diff --git a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
index a530da21bb..159ce35741 100644
--- a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
@@ -3,7 +3,7 @@
     .form-group[data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html", id: "date_trading_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "date_trading_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "date_trading", id: "section_date_trading_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
index 757de1983b..e1f87ad264 100644
--- a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
@@ -15,7 +15,7 @@
                   p
                     = service["desc_short"]
       - if user_can_edit(@form_answer, :goods_services)
-        = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { "data-type" => "html", id: "goods_services_form_admin_appraisal" } do |f|
+        = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "goods_services_form_admin_appraisal" } do |f|
           = hidden_field_tag :section, "goods_services", id: "section_goods_services_hidden_field"
           .form-fields.form-block
             = f.simple_fields_for(:data) do |f|
diff --git a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
index 2ecb79ebc5..746fe5cf7e 100644
--- a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
@@ -3,7 +3,7 @@
     .form-group[data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html", id: "organisation_head_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "organisation_head_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "organisation_head", id: "section_organisation_head_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
index cebb0acd4f..ec78510eb7 100644
--- a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
@@ -5,7 +5,7 @@
     .form-group[class="#{'form-edit' if @form_answer.organisation_type.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html", id: "organisation_type_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "organisation_type_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "organisation_type", id: "section_organisation_type_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
index 782808bfb4..f704a2f8ec 100644
--- a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
@@ -4,7 +4,7 @@
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "html", class: "registration-number-form", id: "registration_number_form_admin_appraisal" } do |f|
+                        html: { data: { type: "html", controller: "form-flash" }, class: "registration-number-form", id: "registration_number_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "registration_number", id: "section_registration_number_hidden_field"
         .form-container
           label.form-label Company/charity registration number
diff --git a/app/views/admin/form_answers/company_details/_sic_form.html.slim b/app/views/admin/form_answers/company_details/_sic_form.html.slim
index d75f4078f2..518f98a392 100644
--- a/app/views/admin/form_answers/company_details/_sic_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_sic_form.html.slim
@@ -7,7 +7,7 @@
       = simple_form_for [namespace_name, @form_answer],
                         remote: true,
                         authenticity_token: true,
-                        html: { "data-type" => "html", id: "sic_code_form_admin_appraisal" } do |f|
+                        html: { data: { type: "html", controller: "form-flash" }, id: "sic_code_form_admin_appraisal" } do |f|
 
         = hidden_field_tag :section, "sic_code", id: "section_sic_code_hidden_field"
 
diff --git a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
index 2ef457ac37..ef73dc9d5a 100644
--- a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
@@ -5,7 +5,7 @@
     .form-group[class="#{'form-edit' if @form_answer.this_entry_relates_to.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html", id: "this_entry_relates_to_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "this_entry_relates_to_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "this_entry_relates_to", id: "section_this_entry_relates_to_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_website_form.html.slim b/app/views/admin/form_answers/company_details/_website_form.html.slim
index e91896bbac..466cf80df6 100644
--- a/app/views/admin/form_answers/company_details/_website_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_website_form.html.slim
@@ -3,7 +3,7 @@
     .form-group[class="#{'form-edit' if @form_answer.website_url.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { "data-type" => "html", id: "website_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "website_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "website", id: "section_website_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
index e9da4792e6..9d8d57b14b 100644
--- a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
@@ -1,7 +1,7 @@
 .form-group.form-group-multiple[class="#{'form-edit' if @form_answer.parent_company.blank?}" data-controller="element-focus"]
   = simple_form_for [namespace_name, resource],
                     remote: true,
-                    authenticity_token: true, html: { "data-type" => "html" } do |f|
+                    authenticity_token: true, html: { data: { type: "html", controller: "form-flash" } } do |f|
     = hidden_field_tag :section, "parent_company", id: "section_parent_company_hidden_field"
 
     .form-container
diff --git a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
index badc91610a..98e82267fe 100644
--- a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
@@ -1,7 +1,7 @@
 = simple_form_for [namespace_name, @form_answer],
                   remote: true,
                   authenticity_token: true,
-                  html: { "data-type" => "html", id: "previous_wins_form" } do |f|
+                  html: { data: { type: "html", controller: "form-flash" }, id: "previous_wins_form" } do |f|
 
   = hidden_field_tag :section, "previous_wins", id: "previous_wins_section_hidden_field"
   .form-container[data-controller="element-focus"]
diff --git a/app/views/admin/form_answers/financial_summary/_list.html.slim b/app/views/admin/form_answers/financial_summary/_list.html.slim
index 40cc67f8c4..4a757fb64d 100644
--- a/app/views/admin/form_answers/financial_summary/_list.html.slim
+++ b/app/views/admin/form_answers/financial_summary/_list.html.slim
@@ -1,7 +1,7 @@
 - url = pundit_user.is_a?(Admin) ? update_financials_admin_form_answer_path(@form_answer) : update_financials_assessor_form_answer_path(@form_answer)
 
 .form-group[data-controller="element-focus"]
-  = form_for @form_answer, url: url do |f|
+  = form_for @form_answer, url: url, html: { data: { controller: "form-flash" }, id: "form-admin-financial-summary" } do |f|
     .table-overflow-container
       table.table.table-striped#financial-table
         colgroup
diff --git a/app/views/admin/press_summaries/_section.html.slim b/app/views/admin/press_summaries/_section.html.slim
index 88f81b842b..f30ef8774c 100644
--- a/app/views/admin/press_summaries/_section.html.slim
+++ b/app/views/admin/press_summaries/_section.html.slim
@@ -1,7 +1,7 @@
 - press_summary = form_answer.press_summary || form_answer.build_press_summary
 - url = press_summary.persisted? ? polymorphic_url([namespace_name, form_answer, press_summary]) : polymorphic_url([namespace_name, form_answer, :press_summaries])
 
-= simple_form_for press_summary, url: url, remote: true, authenticity_token: true do |f|
+= simple_form_for press_summary, url: url, remote: true, authenticity_token: true, html: { data: { controller: "form-flash" } } do |f|
   = f.input :body_update, as: :hidden, input_html: {value: true}
 
   .form-group.press-summary-body-block[data-controller="element-focus"]
@@ -29,7 +29,7 @@
       .clear
 
 - if policy(press_summary).update?
-  = simple_form_for press_summary, url: url, remote: true, authenticity_token: true do |f|
+  = simple_form_for press_summary, url: url, remote: true, authenticity_token: true, html: { data: { controller: "form-flash" } } do |f|
     = f.input :contact_details_update, as: :hidden, input_html: {value: true}
 
     .form-group[data-controller="element-focus"]
diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 68bd28a177..6eefcd5a4f 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -8,7 +8,7 @@
       span.trigger-at
         = deadline.formatted_trigger_time
     .deadline-form.well
-      = simple_form_for deadline, url: admin_settings_deadline_path(deadline, year: params[:year]), remote: true, authenticity_token: true do |f|
+      = simple_form_for deadline, url: admin_settings_deadline_path(deadline, year: params[:year]), remote: true, authenticity_token: true, html: { data: { controller: "form-flash" } } do |f|
         .control-date
           label.control-label Set date and time
         .clear
diff --git a/app/views/admin/users/_form.html.slim b/app/views/admin/users/_form.html.slim
index 79b770eed4..cd52aaee39 100644
--- a/app/views/admin/users/_form.html.slim
+++ b/app/views/admin/users/_form.html.slim
@@ -1,4 +1,4 @@
-= simple_form_for [:admin, resource], html: { class: "qae-form" } do |f|
+= simple_form_for [:admin, resource], html: { class: "qae-form", data: { type: "json",  controller: "form-flash" } } do |f|
   .panel-group#user-form-panel-parent
     .panel.panel-default[data-controller="element-focus"]
       .panel-heading#user-details-heading

From 564359500a93a69e4ce22f423f2ab33c8efa4e01 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 25 Jul 2023 01:11:04 -0300
Subject: [PATCH 144/352] Update JS files to trigger `ajax:success` events
 manually

---
 app/assets/javascripts/admin/comments.js.coffee     |  5 +++--
 .../javascripts/admin/financial_data.js.coffee      | 13 ++++++-------
 app/assets/javascripts/admin/form_answers.js.coffee | 12 ++++++++----
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/admin/comments.js.coffee b/app/assets/javascripts/admin/comments.js.coffee
index da4d822504..cab48ec088 100644
--- a/app/assets/javascripts/admin/comments.js.coffee
+++ b/app/assets/javascripts/admin/comments.js.coffee
@@ -1,5 +1,5 @@
 ready = ->
-  $('body').on 'submit', '.new_comment', (e) ->
+  $(document).on 'submit', '.new_comment', (e) ->
     that = $(this)
     e.preventDefault()
     $.ajax
@@ -30,8 +30,9 @@ ready = ->
         else
           signatureWrapper.html("")
 
+        window.fire(that[0], 'ajax:x:success', data)
 
-  $('body').on 'submit', '.destroy-comment', (e) ->
+  $(document).on 'submit', '.destroy-comment', (e) ->
     e.preventDefault()
     $.ajax
       url: $(this).attr('action')
diff --git a/app/assets/javascripts/admin/financial_data.js.coffee b/app/assets/javascripts/admin/financial_data.js.coffee
index c548a5db00..96df615412 100644
--- a/app/assets/javascripts/admin/financial_data.js.coffee
+++ b/app/assets/javascripts/admin/financial_data.js.coffee
@@ -6,14 +6,13 @@ jQuery ->
     overallBenchmarksTable = ($ "#overall-financial-benchmarks")
     financialTable = ($ "#financial-table")
 
-    ($ "input", form).on "change keyup keydown paste", ->
-      timer ||= setTimeout(saveFinancials, 500 )
+    $("input", form).on "change keyup keydown paste", ->
+      timer ||= setTimeout(saveFinancials, 500)
 
     ($ "button", form).on "click", (event) ->
       do event.preventDefault
       $(this).closest(".form-group").removeClass("form-edit")
 
-
     updateExportsGrowth = (exports) ->
       exportsGrowth = ($ 'tr.exports-growth td.value', benchmarksTable)
       values = exports.map (i, td) ->
@@ -91,13 +90,13 @@ jQuery ->
       url = form.attr('action')
       formData = form.serialize()
       updateBenchmarks()
-
-      jqXHR = $.ajax({
+      $.ajax
         url: url
         data: formData
         type: 'POST'
-        dataType: 'js'
-      })
+        dataType: 'script'
+        success: (_data) ->
+          window.fire(form[0], 'ajax:x:success', null)
 
       ($ 'td.value', financialTable).each (i, td) ->
         input = ($ 'input', ($ td))
diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index a6ac29f4ca..c9ff0ff43f 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -434,8 +434,8 @@ editFormAnswerAutoUpdate = ->
   $(".sic-code .form-save-link").on "click", (e) ->
     e.preventDefault()
     e.stopPropagation()
-    that = $("#form_answer_sic_code")
-    form = $(".edit_form_answer")
+    input = $("#form_answer_sic_code")
+    form = $(e.target).closest('form')
     $.ajax
       action: form.attr("action")
       data: form.serialize()
@@ -443,15 +443,19 @@ editFormAnswerAutoUpdate = ->
       dataType: "json"
 
       success: (result) ->
-        formGroup = that.parents(".form-group")
+        formGroup = input.parents(".form-group")
         formGroup.removeClass("form-edit")
-        formGroup.find(".form-value p").text(that.find("option:selected").text())
+        console.log(formGroup, input)
+        formGroup.find(".form-value p").text(input.val())
         sicCodes = result["form_answer"]["sic_codes"]
         counter = 1
         for row in $(".sector-average-growth td")
           $(row).text(sicCodes[counter.toString()])
           counter += 1
         $(".avg-growth-legend").text(result["form_answer"]["legend"])
+
+        window.fire(form[0], 'ajax:x:success', null)
+
 bindRags =(klass) ->
   $(document).on "click", "#{klass} .btn-rag .dropdown-menu a", (e) ->
     e.preventDefault()

From 1ea19bea3dbc13a9e420973e14494345b0223006 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 00:37:45 -0300
Subject: [PATCH 145/352] JS: Rename & rework inline flash controller

---
 ...ntroller.js => inline_flash_controller.js} | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)
 rename app/javascript/controllers/{form_flash_controller.js => inline_flash_controller.js} (64%)

diff --git a/app/javascript/controllers/form_flash_controller.js b/app/javascript/controllers/inline_flash_controller.js
similarity index 64%
rename from app/javascript/controllers/form_flash_controller.js
rename to app/javascript/controllers/inline_flash_controller.js
index 064f78c1ac..481c3316e8 100644
--- a/app/javascript/controllers/form_flash_controller.js
+++ b/app/javascript/controllers/inline_flash_controller.js
@@ -1,17 +1,23 @@
 export default class extends ApplicationController {
+  static targets = ['form', 'link'];
+
   static values = {
     error: String,
     success: String,
   };
 
   connect() {
-    this.element.addEventListener('ajax:x:success', this.onSuccess);
-    this.element.addEventListener('ajax:x:error', this.onError);
+    this.formTargets.forEach((el) => {
+      el.addEventListener('ajax:x:success', this.onSuccess);
+      el.addEventListener('ajax:x:error', this.onError);
+    });
   }
 
   disconnect() {
-    this.element.removeEventListener('ajax:x:success', this.onSuccess);
-    this.element.removeEventListener('ajax:x:error', this.onError);
+    this.formTargets.forEach((el) => {
+      el.removeEventListener('ajax:x:success', this.onSuccess);
+      el.removeEventListener('ajax:x:error', this.onError);
+    });
   }
 
   success(event) {
@@ -26,14 +32,14 @@ export default class extends ApplicationController {
     const msg = this.hasSuccessValue ? this.successValue : 'Success!';
     const [alert, identifier] = this.createAlert('success', msg);
 
-    setTimeout(() => this.showAlert(alert, identifier), 50);
+    setTimeout(() => this.showAlert(alert, identifier), 1);
   };
 
   onError = (event) => {
     const msg = this.hasErrorValue ? this.errorValue : 'An unknown error has occurred, please try again.';
     const [alert, identifier] = this.createAlert('danger', msg);
 
-    setTimeout(() => this.showAlert(alert, identifier), 50);
+    setTimeout(() => this.showAlert(alert, identifier), 1);
   };
 
   createAlert = (type, message) => {
@@ -51,14 +57,11 @@ export default class extends ApplicationController {
   };
 
   showAlert = (alert, identifier) => {
-    const form = document.getElementById(this.element.id);
-    const container = form.parentNode;
-    const element =
-      container && (container.classList.contains('form-container') || container.classList.contains('form-group'))
-        ? container
-        : form;
-    element.insertAdjacentHTML('afterbegin', alert);
-    console.log('element', element);
+    const existing = this.element.querySelector('[id*=alert__]')
+    if (existing) existing.remove()
+
+    this.element.insertAdjacentHTML('afterbegin', alert);
+
     setTimeout(() => {
       const inserted = document.getElementById(identifier);
       if (inserted) inserted.remove();

From 444e579cc6caa3558c7a4e8a5435509fb928e370 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 00:38:14 -0300
Subject: [PATCH 146/352] Use controller w/ HTML element targets to display
 flash messages

---
 .../admin/audit_certificate/_form.html.slim   |  2 +-
 .../admin/email_notifications/create.js.erb   |  2 +
 .../admin/email_notifications/update.js.erb   |  2 +
 app/views/admin/feedbacks/_section.html.slim  |  2 +-
 .../figures_and_vat_returns/_form.html.slim   |  2 +-
 .../_form_answer_attachment.html.slim         |  2 +-
 .../form_answers/_assessors_section.html.slim |  8 ++--
 .../form_answers/_financials_review.html.slim |  6 ++-
 .../_section_admin_comments.html.slim         |  4 +-
 ...section_appraisal_form_moderated.html.slim |  6 +--
 .../_section_appraisal_form_primary.html.slim |  5 +--
 ...section_appraisal_form_secondary.html.slim |  5 +--
 .../_section_case_summary.html.slim           |  4 +-
 .../_section_company_details.html.slim        | 38 ++++++++++++-------
 .../_section_critical_comments.html.slim      |  4 +-
 .../form_answers/_section_documents.html.slim |  6 +--
 .../_section_draft_notes.html.slim            |  4 +-
 .../_section_palace_attendees.html.slim       |  2 +-
 .../form_answers/_submitted_view.html.slim    |  2 +-
 .../company_details/_address_form.html.slim   |  6 +--
 .../_company_name_form.html.slim              |  2 +-
 .../_date_trading_form.html.slim              |  2 +-
 .../_goods_services_form.html.slim            |  2 +-
 .../_organisation_head_form.html.slim         |  2 +-
 .../_organisation_type_form.html.slim         |  2 +-
 .../_registration_number_form.html.slim       |  2 +-
 .../company_details/_sic_form.html.slim       |  2 +-
 .../_this_entry_relates_to_form.html.slim     |  2 +-
 .../company_details/_website_form.html.slim   |  2 +-
 .../parent_company/_form.html.slim            |  2 +-
 .../previous_wins/_form.html.slim             |  2 +-
 .../financial_summary/_list.html.slim         |  2 +-
 .../_palace_invite_submit_form.html.slim      |  3 +-
 .../admin/press_summaries/_section.html.slim  |  4 +-
 .../admin/settings/_deadline_form.html.slim   |  4 +-
 .../settings/_email_notification.html.slim    | 11 +++---
 .../admin/settings/_notification.html.slim    |  2 +-
 .../admin/settings/_schedule_new.html.slim    |  2 +-
 app/views/admin/users/_form.html.slim         |  2 +-
 .../form_answers/_submitted_view.html.slim    |  2 +-
 40 files changed, 92 insertions(+), 74 deletions(-)

diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index 8bb91ff40f..fb1a48c3ae 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -3,7 +3,7 @@
 / whether file was saved or not
 .span
   = hidden_field_tag "valid", "false", id: "form-audit_certificate-valid"
-= form_for [namespace_name, form_answer, audit_certificate], html: { multipart: true } do |form|
+= form_for [namespace_name, form_answer, audit_certificate], html: { multipart: true, data: { inline_flash_target: "form" } } do |form|
   .well.js-attachment-form
     h3 Attach document
 
diff --git a/app/views/admin/email_notifications/create.js.erb b/app/views/admin/email_notifications/create.js.erb
index 867231a8c7..2a98249bb6 100644
--- a/app/views/admin/email_notifications/create.js.erb
+++ b/app/views/admin/email_notifications/create.js.erb
@@ -6,6 +6,8 @@ wrapper = $("#email_notification_" + "<%= @email_notification.kind %>");
 
   $(".new_email_notification .timepicker", wrapper).val(null);
   $(".new_email_notification .datepicker", wrapper).val(null);
+  window.fire($(".new_email_notification", wrapper)[0], 'ajax:x:success', null)
 <% else %>
   $(".notification-form input", wrapper).closest(".input").addClass("field-with-errors");
+  window.fire($(".new_email_notification", wrapper)[0], 'ajax:x:error', null)
 <% end %>
diff --git a/app/views/admin/email_notifications/update.js.erb b/app/views/admin/email_notifications/update.js.erb
index 3d103a7c7d..3d0c49cbf9 100644
--- a/app/views/admin/email_notifications/update.js.erb
+++ b/app/views/admin/email_notifications/update.js.erb
@@ -7,6 +7,8 @@ wrapper = $("#notification-" + "<%= @email_notification.id %>");
   $(".notification-edit-form input.datepicker", wrapper).val("<%= @email_notification.formatted_trigger_at_date %>");
   $(".notification-edit-form input.timepicker", wrapper).val("<%= @email_notification.formatted_trigger_at_time %>");
   $(".trigger-at", wrapper).html("<%= @email_notification.decorate.formatted_trigger_time %>");
+  window.fire($(".edit_email_notification", wrapper)[0], 'ajax:x:success', null)
 <% else %>
   $(".notification-edit-form input", wrapper).closest(".input").addClass("field-with-errors");
+  window.fire($(".edit_email_notification", wrapper)[0], 'ajax:x:error', null)
 <% end %>
diff --git a/app/views/admin/feedbacks/_section.html.slim b/app/views/admin/feedbacks/_section.html.slim
index 99d4844212..d27eab3393 100644
--- a/app/views/admin/feedbacks/_section.html.slim
+++ b/app/views/admin/feedbacks/_section.html.slim
@@ -1,6 +1,6 @@
 - feedback = form_answer.feedback.present? ? form_answer.feedback : form_answer.build_feedback
 - url = feedback.persisted? ? polymorphic_url([namespace_name, form_answer, feedback]) : polymorphic_url([namespace_name, form_answer, :feedbacks])
-= simple_form_for feedback, url: url, remote: true, authenticity_token: true, html: { data: { type: "json", controller: "form-flash" } } do |f|
+= simple_form_for feedback, url: url, remote: true, authenticity_token: true, html: { data: { type: "json", inline_flash_target: "form" } } do |f|
   - if !form_answer.promotion?
     = render "admin/feedbacks/overall_feedback_field", f: f, feedback: feedback
   - FeedbackForm.fields_for_award_type(form_answer.object).each do |feedback_field, feedback_field_value|
diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
index c8fcb55b53..4381b46350 100644
--- a/app/views/admin/figures_and_vat_returns/_form.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -3,7 +3,7 @@
 / whether file was saved or not
 .span
   = hidden_field_tag "valid", "false", id: "#{attachment.model_name.param_key}-valid"
-= form_for [namespace_name, form_answer, attachment], html: { multipart: true } do |form|
+= form_for [namespace_name, form_answer, attachment], html: { multipart: true, data: { inline_flash_target: "form" } } do |form|
   .well.js-attachment-form
     h3 Attach document
 
diff --git a/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim b/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim
index a0d8097442..7a2d2bfe20 100644
--- a/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim
+++ b/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim
@@ -4,7 +4,7 @@
     - if show_remove_form_answer_attachment?(form_answer_attachment)
       small.pull-right
         = form_for([namespace_name, form_answer_attachment.form_answer, form_answer_attachment],
-                   html: { method: :delete, style: "display:inline-block;"}) do |f|
+                   html: { data: { inline_flash_target: "form" }, method: :delete, style: "display: inline-block;" }) do |f|
 
           = f.submit 'Remove', class: 'if-js-hide'
 
diff --git a/app/views/admin/form_answers/_assessors_section.html.slim b/app/views/admin/form_answers/_assessors_section.html.slim
index 0ed796b5af..1308de427c 100644
--- a/app/views/admin/form_answers/_assessors_section.html.slim
+++ b/app/views/admin/form_answers/_assessors_section.html.slim
@@ -12,7 +12,7 @@
         = resource.lead_assessors
       .clear
 
-    li.form-group.primary-assessor-assignment[data-controller="element-focus"]
+    li.form-group.primary-assessor-assignment[data-controller="element-focus inline-flash"]
       label[for='assessor_assignment_primary_assessor_id']
         ' Primary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
@@ -25,7 +25,7 @@
       - if policy(resource).assign_assessor?
         = form_for [namespace_name, resource.assessor_assignments.primary],
                    remote: true,
-                   html: { data: { type: "json", controller: "form-flash" } },
+                   html: { data: { type: "json", inline_flash_target: "form" } },
                    authenticity_token: true do |form|
 
           .form-fields
@@ -46,7 +46,7 @@
           .errors-holder
       .clear
 
-    li.form-group.secondary-assessor-assignment[data-controller="element-focus"]
+    li.form-group.secondary-assessor-assignment[data-controller="element-focus inline-flash"]
       label[for='assessor_assignment_secondary_assessor_id']
         span.assessor-label Secondary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
@@ -59,7 +59,7 @@
       - if policy(resource).assign_assessor?
         = form_for [namespace_name, resource.assessor_assignments.secondary],
                    remote: true,
-                   html: { data: { type: "json", controller: "form-flash" } },
+                   html: { data: { type: "json", inline_flash_target: "form" } },
                    authenticity_token: true do |form|
 
           .form-fields
diff --git a/app/views/admin/form_answers/_financials_review.html.slim b/app/views/admin/form_answers/_financials_review.html.slim
index ea9317df0a..082ed2b1ac 100644
--- a/app/views/admin/form_answers/_financials_review.html.slim
+++ b/app/views/admin/form_answers/_financials_review.html.slim
@@ -6,7 +6,8 @@
     - if policy(review_audit_certificate).create?
       = simple_form_for([namespace_name, review_audit_certificate],
                         remote: true,
-                        authenticity_token: true) do |f|
+                        authenticity_token: true,
+                        html: { controller: "inline-flash", inline_flash_target: "form" }) do |f|
 
         = f.input :form_answer_id, as: :hidden
 
@@ -49,7 +50,8 @@
                         remote: true,
                         url: [namespace_name, :review_commercial_figures],
                         method: :post,
-                        authenticity_token: true) do |f|
+                        authenticity_token: true,
+                        html: { controller: "inline-flash", inline_flash_target: "form" }) do |f|
 
         = f.input :form_answer_id, as: :hidden
 
diff --git a/app/views/admin/form_answers/_section_admin_comments.html.slim b/app/views/admin/form_answers/_section_admin_comments.html.slim
index 998d41aac2..9882123168 100644
--- a/app/views/admin/form_answers/_section_admin_comments.html.slim
+++ b/app/views/admin/form_answers/_section_admin_comments.html.slim
@@ -17,9 +17,9 @@
 
   #section-admin-comments.section-admin-comments.panel-collapse.collapse aria-labelledby="admin-comments-heading"
     .panel-body
-      .comments-container data-comment-form=new_admin_form_answer_comment_path(@form_answer)
+      .comments-container[data-comment-form=new_admin_form_answer_comment_path(@form_answer) data-controller="inline-flash"]
         - if !(defined? read_only)
-          = form_for([:admin, @form_answer, @form_answer.comments.new(section: "admin")], html: { id: "admin_comment_form", data: { controller: "form-flash" } }) do |f|
+          = form_for([:admin, @form_answer, @form_answer.comments.new(section: "admin")], html: { id: "admin_comment_form", data: { inline_flash_target: "form" } }) do |f|
             = render('admin/comments/form', f: f)
           .comment-insert
         - if !(defined? read_only)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index 9c84e2ff69..e89cc2c724 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -7,12 +7,12 @@
           small
             = moderated_assessment.last_editor_info
 
-  #section-appraisal-form-moderated.section-appraisal-form.section-appraisal-form-moderated.panel-collapse.collapse aria-labelledby="appraisal-form-moderated-heading"
-    .panel-body
+  #section-appraisal-form-moderated.section-appraisal-form.section-appraisal-form-moderated.panel-collapse.collapse[aria-labelledby="appraisal-form-moderated-heading"]
+    .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, moderated_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", controller: "form-flash" } }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" } }) do |f|
 
         = render_section(resource, f)
         = hidden_field_tag :updated_section
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index 8d2766819d..3dcd6f6d6c 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -7,12 +7,11 @@
           small
             = primary_assessment.last_editor_info
   #section-appraisal-form-primary.section-appraisal-form.section-appraisal-form-primary.panel-collapse.collapse aria-labelledby="appraisal-form-primary-heading"
-    .panel-body
-
+    .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, primary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", controller: "form-flash" }, id: "primary_appraisal_form" }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" }, id: "primary_appraisal_form" }) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "primary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index cd5f0b79f7..3324b5a4af 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -7,12 +7,11 @@
           small
             = secondary_assessment.last_editor_info
   #section-appraisal-form-secondary.section-appraisal-form.section-appraisal-form-secondary.panel-collapse.collapse aria-labelledby="appraisal-form-secondary-heading"
-    .panel-body
-
+    .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, secondary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", controller: "form-flash" }, id: "secondary_appraisal_form"}) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" }, id: "secondary_appraisal_form"}) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "secondary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index bbf8477118..7b49187757 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -13,7 +13,7 @@
                 = "Updated by #{message_author_name(assessment.editable)} - #{format_date(assessment.updated_at)}"
       .panel-collapse.collapse aria-labelledby="case-summary-heading-#{assessment.position}" id="section-case-summary-#{assessment.position}" class="section-case-summary-#{assessment.position}"
 
-        .panel-body
+        .panel-body[data-controller="inline-flash"]
           /.alert.alert-glyphicon.alert-info
             span.glyphicon.glyphicon-info-sign
             p.todo-placeholder
@@ -23,7 +23,7 @@
           / For Primary Assessor
           / It becomes read-only for primary assessor after submission
 
-          = simple_form_for([namespace_name, assessment], remote: true, authenticity_token: true) do |f|
+          = simple_form_for([namespace_name, assessment], remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } }) do |f|
             = render partial: "admin/form_answers/appraisal_form_components/application_background_section",
               locals: { f: f}
             = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_company_details.html.slim b/app/views/admin/form_answers/_section_company_details.html.slim
index a28fcf51ae..fc8ce6b9b2 100644
--- a/app/views/admin/form_answers/_section_company_details.html.slim
+++ b/app/views/admin/form_answers/_section_company_details.html.slim
@@ -8,17 +8,29 @@
             = "Updated by: #{resource.company_details_editable.decorate.full_name} - #{format_date(resource.company_details_updated_at)}"
 
   #section-company-details.section-company-details.panel-collapse.collapse aria-labelledby="company-details-heading"
-    .panel-body.company-details-forms
-      = render "admin/form_answers/company_details/company_name_form"
-      = render "admin/form_answers/company_details/organisation_type_form"
-      = render "admin/form_answers/company_details/address_form"
-      = render "admin/form_answers/company_details/previous_wins_form"
-      = render "admin/form_answers/company_details/sic_form"
-      = render "admin/form_answers/company_details/this_entry_relates_to_form"
-      = render "admin/form_answers/company_details/goods_services_form"
-      = render "admin/form_answers/company_details/registration_number_form"
-      = render "admin/form_answers/company_details/date_trading_form"
-      = render "admin/form_answers/company_details/website_form"
-      = render "admin/form_answers/company_details/organisation_head_form"
-      = render "admin/form_answers/company_details/parent_company_form"
+    .panel-body.company-details-forms.space-y-3
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/company_name_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/organisation_type_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/address_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/previous_wins_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/sic_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/this_entry_relates_to_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/goods_services_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/registration_number_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/date_trading_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/website_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/organisation_head_form"
+      div[data-controller="inline-flash"]
+        = render "admin/form_answers/company_details/parent_company_form"
       = render "admin/form_answers/company_details/user_accounts"
diff --git a/app/views/admin/form_answers/_section_critical_comments.html.slim b/app/views/admin/form_answers/_section_critical_comments.html.slim
index 8d8fe0e672..bec666a414 100644
--- a/app/views/admin/form_answers/_section_critical_comments.html.slim
+++ b/app/views/admin/form_answers/_section_critical_comments.html.slim
@@ -16,9 +16,9 @@
               = "Updated by #{message_author_name(last_comment.author)} - #{l(last_comment.created_at, format: :date_at_time)}"
 
   #section-critical-comments.section-critical-comments.panel-collapse.collapse aria-labelledby="critical-comments-heading"
-    .panel-body
+    .panel-body[data-controller="inline-flash"]
       .comments-container.comment-assessor
-        = form_for([namespace_name, @form_answer, @form_answer.comments.new(section: "critical")], html: { data: { controller: "form-flash" } }) do |f|
+        = form_for([namespace_name, @form_answer, @form_answer.comments.new(section: "critical")], html: { data: { inline_flash_target: "form" } }) do |f|
           = render("admin/comments/form", f: f)
         .comment-insert
         = render(collection: @form_answer.comments.critical, partial: "admin/form_answers/comment")
diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index 35e7320c3a..0566b3289a 100644
--- a/app/views/admin/form_answers/_section_documents.html.slim
+++ b/app/views/admin/form_answers/_section_documents.html.slim
@@ -34,7 +34,7 @@
       - if @form_answer.audit_certificate.blank? && Settings.after_shortlisting_stage?
         .sidebar-section.no-margin-bottom.space-y-3
           - if @form_answer.requires_vocf?
-            #audit-certificate-form
+            #audit-certificate-form[data-controller="inline-flash"]
               - audit_certificate = @form_answer.build_audit_certificate
               = render "admin/audit_certificate/form", form_answer: @form_answer, audit_certificate: audit_certificate 
 
@@ -43,9 +43,9 @@
 
       = render(partial: "admin/figures_and_vat_returns/status", locals: { form_answer: @form_answer, figures_form: figures_form })
 
-      #vat-returns-section
+      #vat-returns-section[data-controller="inline-flash"]
         = render(partial: "admin/figures_and_vat_returns/vat_returns", locals: { form_answer: @form_answer, figures_form: figures_form })
-      #commercial-figures-section
+      #commercial-figures-section[data-controller="inline-flash"]
         = render(partial: "admin/figures_and_vat_returns/actual_figures", locals: { form_answer: @form_answer, figures_form: figures_form })
 
   / TODO Only appears for EP but for now we need to think more on it
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index 4c0c561305..51f72a7b15 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -8,11 +8,11 @@
         - if @form_answer.draft_note.decorate.try(:last_updated_by).present?
           small= @form_answer.draft_note.decorate.try(:last_updated_by)
   #section-draft-notes.section-draft-notes.panel-collapse.collapse aria-labelledby="draft-notes-heading"
-    .panel-body
+    .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, @form_answer, @form_answer.draft_note],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json",  controller: "form-flash" } }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" } }) do |f|
 
         .form-group[class="#{'form-edit' if f.object.content.blank?}" data-controller="element-focus"]
           .form-container
diff --git a/app/views/admin/form_answers/_section_palace_attendees.html.slim b/app/views/admin/form_answers/_section_palace_attendees.html.slim
index 18bfdce24d..3382705e97 100644
--- a/app/views/admin/form_answers/_section_palace_attendees.html.slim
+++ b/app/views/admin/form_answers/_section_palace_attendees.html.slim
@@ -14,5 +14,5 @@
         - palace_invite.prebuild_if_necessary.palace_attendees.each_with_index do |pa, index|
           = render(partial: "admin/form_answers/winners_components/palace_attendee", locals: { index: index, pa: pa, palace_invite: palace_invite })
 
-      #palace-invite-submit-form
+      #palace-invite-submit-form[data-controller="inline-flash"]
         = render "admin/form_answers/winners_components/palace_invite_submit_form", palace_invite: palace_invite
diff --git a/app/views/admin/form_answers/_submitted_view.html.slim b/app/views/admin/form_answers/_submitted_view.html.slim
index e20383b386..f2f618d21d 100644
--- a/app/views/admin/form_answers/_submitted_view.html.slim
+++ b/app/views/admin/form_answers/_submitted_view.html.slim
@@ -44,7 +44,7 @@
               small
                 = @form_answer.feedback_updated_by
       #section-feedback.section-application-info.panel-collapse.collapse aria-labelledby="feedback-heading"
-        .panel-body
+        .panel-body[data-controller="inline-flash"]
           = render "admin/feedbacks/section", form_answer: @form_answer
 
   - if show_winners_section?
diff --git a/app/views/admin/form_answers/company_details/_address_form.html.slim b/app/views/admin/form_answers/company_details/_address_form.html.slim
index eb2c110f2d..9307c79937 100644
--- a/app/views/admin/form_answers/company_details/_address_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_address_form.html.slim
@@ -32,7 +32,7 @@
 
           = simple_form_for([namespace_name, resource],
                             remote: true,
-                            authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "address_form_admin_appraisal" }) do |f|
+                            authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "address_form_admin_appraisal" }) do |f|
 
             = hidden_field_tag :section, "address"
             .input.form-group.form-fields.form-block
@@ -145,7 +145,7 @@
       - if resource.submitted_and_after_the_deadline? && CompanyDetailPolicy.new(pundit_user, resource).can_manage_address?
         = simple_form_for([namespace_name, resource],
                           remote: true,
-                          authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "address_form_admin_appraisal" }) do |f|
+                          authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "address_form_admin_appraisal" }) do |f|
 
           = hidden_field_tag :section, "address", id: "section_address_hidden_field"
           .input.form-group.form-fields.form-block
@@ -262,7 +262,7 @@
         - if resource.submitted_and_after_the_deadline? && CompanyDetailPolicy.new(pundit_user, resource).can_manage_address?
           = simple_form_for([namespace_name, resource],
                             remote: true,
-                            authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "address_form_admin_appraisal" }) do |f|
+                            authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "address_form_admin_appraisal" }) do |f|
             = hidden_field_tag :section, "address"
             .input.form-group.form-fields.form-block
               = f.simple_fields_for(:data) do |f|
diff --git a/app/views/admin/form_answers/company_details/_company_name_form.html.slim b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
index b87f11db5d..60a5d7f2dd 100644
--- a/app/views/admin/form_answers/company_details/_company_name_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_company_name_form.html.slim
@@ -4,7 +4,7 @@
     = simple_form_for [namespace_name, @form_answer],
                       remote: true,
                       authenticity_token: true,
-                      html: { data: { type: "html", controller: "form-flash" }, class: "company-name-form", id: "company_name_form_admin_appraisal"} do |f|
+                      html: { data: { type: "html", inline_flash_target: "form" }, class: "company-name-form", id: "company_name_form_admin_appraisal"} do |f|
 
       = hidden_field_tag :section, "company_name", id: "section_company_name_hidden_field"
       .form-container
diff --git a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
index 159ce35741..1dab343c11 100644
--- a/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_date_trading_form.html.slim
@@ -3,7 +3,7 @@
     .form-group[data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "date_trading_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "date_trading_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "date_trading", id: "section_date_trading_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
index e1f87ad264..620fce08e3 100644
--- a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
@@ -15,7 +15,7 @@
                   p
                     = service["desc_short"]
       - if user_can_edit(@form_answer, :goods_services)
-        = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "goods_services_form_admin_appraisal" } do |f|
+        = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "goods_services_form_admin_appraisal" } do |f|
           = hidden_field_tag :section, "goods_services", id: "section_goods_services_hidden_field"
           .form-fields.form-block
             = f.simple_fields_for(:data) do |f|
diff --git a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
index 746fe5cf7e..9772d1ea0a 100644
--- a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
@@ -3,7 +3,7 @@
     .form-group[data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "organisation_head_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "organisation_head_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "organisation_head", id: "section_organisation_head_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
index ec78510eb7..0b08fde0d3 100644
--- a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
@@ -5,7 +5,7 @@
     .form-group[class="#{'form-edit' if @form_answer.organisation_type.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "organisation_type_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "organisation_type_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "organisation_type", id: "section_organisation_type_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
index f704a2f8ec..a4a84b6bd4 100644
--- a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
@@ -4,7 +4,7 @@
       = simple_form_for [namespace_name, resource],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "html", controller: "form-flash" }, class: "registration-number-form", id: "registration_number_form_admin_appraisal" } do |f|
+                        html: { data: { type: "html", inline_flash_target: "form" }, class: "registration-number-form", id: "registration_number_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "registration_number", id: "section_registration_number_hidden_field"
         .form-container
           label.form-label Company/charity registration number
diff --git a/app/views/admin/form_answers/company_details/_sic_form.html.slim b/app/views/admin/form_answers/company_details/_sic_form.html.slim
index 518f98a392..574b8d205a 100644
--- a/app/views/admin/form_answers/company_details/_sic_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_sic_form.html.slim
@@ -7,7 +7,7 @@
       = simple_form_for [namespace_name, @form_answer],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "html", controller: "form-flash" }, id: "sic_code_form_admin_appraisal" } do |f|
+                        html: { data: { type: "html", inline_flash_target: "form" }, id: "sic_code_form_admin_appraisal" } do |f|
 
         = hidden_field_tag :section, "sic_code", id: "section_sic_code_hidden_field"
 
diff --git a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
index ef73dc9d5a..d0e07bc7f7 100644
--- a/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_this_entry_relates_to_form.html.slim
@@ -5,7 +5,7 @@
     .form-group[class="#{'form-edit' if @form_answer.this_entry_relates_to.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "this_entry_relates_to_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "this_entry_relates_to_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "this_entry_relates_to", id: "section_this_entry_relates_to_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/_website_form.html.slim b/app/views/admin/form_answers/company_details/_website_form.html.slim
index 466cf80df6..319abec8a4 100644
--- a/app/views/admin/form_answers/company_details/_website_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_website_form.html.slim
@@ -3,7 +3,7 @@
     .form-group[class="#{'form-edit' if @form_answer.website_url.blank?}" data-controller="element-focus"]
       = simple_form_for [namespace_name, resource],
                         remote: true,
-                        authenticity_token: true, html: { data: { type: "html", controller: "form-flash" }, id: "website_form_admin_appraisal" } do |f|
+                        authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "website_form_admin_appraisal" } do |f|
         = hidden_field_tag :section, "website", id: "section_website_hidden_field"
 
         .form-container
diff --git a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
index 9d8d57b14b..395e07de9f 100644
--- a/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/parent_company/_form.html.slim
@@ -1,7 +1,7 @@
 .form-group.form-group-multiple[class="#{'form-edit' if @form_answer.parent_company.blank?}" data-controller="element-focus"]
   = simple_form_for [namespace_name, resource],
                     remote: true,
-                    authenticity_token: true, html: { data: { type: "html", controller: "form-flash" } } do |f|
+                    authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" } } do |f|
     = hidden_field_tag :section, "parent_company", id: "section_parent_company_hidden_field"
 
     .form-container
diff --git a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
index 98e82267fe..66807bc69f 100644
--- a/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
+++ b/app/views/admin/form_answers/company_details/previous_wins/_form.html.slim
@@ -1,7 +1,7 @@
 = simple_form_for [namespace_name, @form_answer],
                   remote: true,
                   authenticity_token: true,
-                  html: { data: { type: "html", controller: "form-flash" }, id: "previous_wins_form" } do |f|
+                  html: { data: { type: "html", inline_flash_target: "form" }, id: "previous_wins_form" } do |f|
 
   = hidden_field_tag :section, "previous_wins", id: "previous_wins_section_hidden_field"
   .form-container[data-controller="element-focus"]
diff --git a/app/views/admin/form_answers/financial_summary/_list.html.slim b/app/views/admin/form_answers/financial_summary/_list.html.slim
index 4a757fb64d..31f01ddfac 100644
--- a/app/views/admin/form_answers/financial_summary/_list.html.slim
+++ b/app/views/admin/form_answers/financial_summary/_list.html.slim
@@ -1,7 +1,7 @@
 - url = pundit_user.is_a?(Admin) ? update_financials_admin_form_answer_path(@form_answer) : update_financials_assessor_form_answer_path(@form_answer)
 
 .form-group[data-controller="element-focus"]
-  = form_for @form_answer, url: url, html: { data: { controller: "form-flash" }, id: "form-admin-financial-summary" } do |f|
+  = form_for @form_answer, url: url, html: { data: { controller: "inline-flash", inline_flash_target: "form" }, id: "form-admin-financial-summary" } do |f|
     .table-overflow-container
       table.table.table-striped#financial-table
         colgroup
diff --git a/app/views/admin/form_answers/winners_components/_palace_invite_submit_form.html.slim b/app/views/admin/form_answers/winners_components/_palace_invite_submit_form.html.slim
index f9e1bafe40..e20c76188f 100644
--- a/app/views/admin/form_answers/winners_components/_palace_invite_submit_form.html.slim
+++ b/app/views/admin/form_answers/winners_components/_palace_invite_submit_form.html.slim
@@ -3,7 +3,8 @@
     = simple_form_for([:submit, namespace_name, palace_invite],
       remote: true,
       authenticity_token: true,
-      method: :post) do |f|
+      method: :post,
+      html: { data: { inline_flash_target: "form" } }) do |f|
 
       = f.submit "Submit", class: "btn btn-primary"
       .clear
diff --git a/app/views/admin/press_summaries/_section.html.slim b/app/views/admin/press_summaries/_section.html.slim
index f30ef8774c..f78f3a322a 100644
--- a/app/views/admin/press_summaries/_section.html.slim
+++ b/app/views/admin/press_summaries/_section.html.slim
@@ -1,7 +1,7 @@
 - press_summary = form_answer.press_summary || form_answer.build_press_summary
 - url = press_summary.persisted? ? polymorphic_url([namespace_name, form_answer, press_summary]) : polymorphic_url([namespace_name, form_answer, :press_summaries])
 
-= simple_form_for press_summary, url: url, remote: true, authenticity_token: true, html: { data: { controller: "form-flash" } } do |f|
+= simple_form_for press_summary, url: url, remote: true, authenticity_token: true, html: { data: { controller: "inline-flash", inline_flash_target: "form" } } do |f|
   = f.input :body_update, as: :hidden, input_html: {value: true}
 
   .form-group.press-summary-body-block[data-controller="element-focus"]
@@ -29,7 +29,7 @@
       .clear
 
 - if policy(press_summary).update?
-  = simple_form_for press_summary, url: url, remote: true, authenticity_token: true, html: { data: { controller: "form-flash" } } do |f|
+  = simple_form_for press_summary, url: url, remote: true, authenticity_token: true, html: { data: { controller: "inline-flash", inline_flash_target: "form" } } do |f|
     = f.input :contact_details_update, as: :hidden, input_html: {value: true}
 
     .form-group[data-controller="element-focus"]
diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 6eefcd5a4f..145f624ae3 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -2,13 +2,13 @@
 - deadline = deadline.decorate if deadline.present?
 
 - if deadline.present?
-  .deadline[id="deadline-#{deadline.id}" data-controller="element-focus"]
+  .deadline[id="deadline-#{deadline.id}" data-controller="element-focus inline-flash"]
     span.date-time-text
       => deadline.message
       span.trigger-at
         = deadline.formatted_trigger_time
     .deadline-form.well
-      = simple_form_for deadline, url: admin_settings_deadline_path(deadline, year: params[:year]), remote: true, authenticity_token: true, html: { data: { controller: "form-flash" } } do |f|
+      = simple_form_for deadline, url: admin_settings_deadline_path(deadline, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } } do |f|
         .control-date
           label.control-label Set date and time
         .clear
diff --git a/app/views/admin/settings/_email_notification.html.slim b/app/views/admin/settings/_email_notification.html.slim
index e25f4b72a5..4fac1ba1b7 100644
--- a/app/views/admin/settings/_email_notification.html.slim
+++ b/app/views/admin/settings/_email_notification.html.slim
@@ -19,9 +19,10 @@
 
   = link_to "+ Schedule new email", "#", class: "btn btn-default btn-add-schedule if-no-js-hide", role: "button", aria: {label: "Schedule #{I18n.t("email_buttons.#{kind}")}"}, data: { element_focus_target: "reveal" }
 
-  .notification-form
-    = render "schedule_new", notification: @settings.email_notifications.build(kind: kind), kind: kind
+  div[data-controller="inline-flash"]
+    .notification-form
+      = render "schedule_new", notification: @settings.email_notifications.build(kind: kind), kind: kind
 
-  ul.notifications
-    - notifications.each do |notification|
-      = render 'notification', notification: notification.decorate
+    ul.notifications
+      - notifications.each do |notification|
+        = render "notification", notification: notification.decorate
diff --git a/app/views/admin/settings/_notification.html.slim b/app/views/admin/settings/_notification.html.slim
index f2485fae98..29e98f9113 100644
--- a/app/views/admin/settings/_notification.html.slim
+++ b/app/views/admin/settings/_notification.html.slim
@@ -16,7 +16,7 @@ li id="notification-#{notification.id}"
           '  |
         = button_to "Delete", admin_settings_email_notification_path(notification), { onclick: "return confirm('Are you sure?')", method: :delete, remote: true }
     .notification-edit-form.well
-      = simple_form_for notification, url: admin_settings_email_notification_path(notification, year: params[:year]), remote: true, authenticity_token: true do |f|
+      = simple_form_for notification, url: admin_settings_email_notification_path(notification, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } } do |f|
         .control-date
           label.control-label Edit schedule
           = f.input :trigger_at,
diff --git a/app/views/admin/settings/_schedule_new.html.slim b/app/views/admin/settings/_schedule_new.html.slim
index 185a5cdf0a..75200c4c0c 100644
--- a/app/views/admin/settings/_schedule_new.html.slim
+++ b/app/views/admin/settings/_schedule_new.html.slim
@@ -3,7 +3,7 @@
 
 .well.question-group.notification-new-form
   h3 Schedule new email
-  = simple_form_for notification, url: admin_settings_email_notifications_path(year: params[:year]), remote: true, authenticity_token: true, html: { id: "new_email_notification_#{kind}" }  do |f|
+  = simple_form_for notification, url: admin_settings_email_notifications_path(year: params[:year]), remote: true, authenticity_token: true, html: { id: "new_email_notification_#{kind}", data: { inline_flash_target: "form" } }  do |f|
     = f.input :kind, as: :hidden, input_html: { id: "email_notification_kind_#{kind}" }
     .control-date
       .form-group
diff --git a/app/views/admin/users/_form.html.slim b/app/views/admin/users/_form.html.slim
index cd52aaee39..265768a63c 100644
--- a/app/views/admin/users/_form.html.slim
+++ b/app/views/admin/users/_form.html.slim
@@ -1,4 +1,4 @@
-= simple_form_for [:admin, resource], html: { class: "qae-form", data: { type: "json",  controller: "form-flash" } } do |f|
+= simple_form_for [:admin, resource], html: { class: "qae-form", data: { type: "json",  controller: "inline-flash", inline_flash_target: "form" } } do |f|
   .panel-group#user-form-panel-parent
     .panel.panel-default[data-controller="element-focus"]
       .panel-heading#user-details-heading
diff --git a/app/views/assessor/form_answers/_submitted_view.html.slim b/app/views/assessor/form_answers/_submitted_view.html.slim
index daad1b373a..aeab1be952 100644
--- a/app/views/assessor/form_answers/_submitted_view.html.slim
+++ b/app/views/assessor/form_answers/_submitted_view.html.slim
@@ -45,7 +45,7 @@
               small
                 = @form_answer.feedback_updated_by
       #section-feedback.section-application-info.panel-collapse.collapse aria-labelledby="feedback-heading"
-        .panel-body
+        .panel-body[data-controller="inline-flash"]
           = render "admin/feedbacks/section", form_answer: @form_answer
 
   - if show_winners_section?

From 0b855cdfd0b247bad260ca7c899656778f399828 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 00:52:00 -0300
Subject: [PATCH 147/352] Add non-JS flash messages

---
 app/controllers/admin/admins_controller.rb                 | 7 +++++++
 app/controllers/admin/assessors_controller.rb              | 7 +++++++
 app/controllers/admin/custom_emails_controller.rb          | 2 ++
 app/controllers/admin/judges_controller.rb                 | 7 +++++++
 app/controllers/admin/users_controller.rb                  | 5 +++++
 app/controllers/concerns/admin_shortlisted_docs_context.rb | 5 ++++-
 .../concerns/admin_shortlisted_docs_submission_context.rb  | 2 ++
 app/controllers/concerns/draft_notes_mixin.rb              | 2 ++
 8 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admin/admins_controller.rb b/app/controllers/admin/admins_controller.rb
index e5e008e537..65753238b2 100644
--- a/app/controllers/admin/admins_controller.rb
+++ b/app/controllers/admin/admins_controller.rb
@@ -19,6 +19,9 @@ def create
     authorize @resource, :create?
 
     @resource.save
+
+    render_flash_message_for(@resource)
+
     location = @resource.persisted? ? admin_admins_path : nil
     respond_with :admin, @resource, location: location
   end
@@ -32,6 +35,8 @@ def update
       @resource.update_without_password(resource_params)
     end
 
+    render_flash_message_for(@resource)
+    
     respond_with :admin, @resource, location: admin_admins_path
   end
 
@@ -39,6 +44,8 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
+    render_flash_message_for(@resource)
+    
     respond_with :admin, @resource, location: admin_admins_path
   end
 
diff --git a/app/controllers/admin/assessors_controller.rb b/app/controllers/admin/assessors_controller.rb
index 6074ee624b..f41faa68bd 100644
--- a/app/controllers/admin/assessors_controller.rb
+++ b/app/controllers/admin/assessors_controller.rb
@@ -20,6 +20,9 @@ def create
 
     @resource.save
     location = @resource.persisted? ? admin_assessors_path : nil
+
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: location
   end
 
@@ -32,6 +35,8 @@ def update
       @resource.update_without_password(resource_params)
     end
 
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: admin_assessors_path
   end
 
@@ -39,6 +44,8 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: admin_assessors_path
   end
 
diff --git a/app/controllers/admin/custom_emails_controller.rb b/app/controllers/admin/custom_emails_controller.rb
index bbe767e960..438461a966 100644
--- a/app/controllers/admin/custom_emails_controller.rb
+++ b/app/controllers/admin/custom_emails_controller.rb
@@ -15,8 +15,10 @@ def create
     @form = CustomEmailForm.new(custom_email_form_attributes)
     if @form.valid?
       CustomEmailWorker.perform_async(custom_email_form_attributes)
+      render_flash_message_for(@form)
       redirect_to admin_custom_email_path, notice: "Email was successfully scheduled"
     else
+      render_flash_message_for(@form)
       render :show
     end
   end
diff --git a/app/controllers/admin/judges_controller.rb b/app/controllers/admin/judges_controller.rb
index 147578b2dd..5ee3060f81 100644
--- a/app/controllers/admin/judges_controller.rb
+++ b/app/controllers/admin/judges_controller.rb
@@ -20,6 +20,9 @@ def create
 
     @resource.save
     location = @resource.persisted? ? admin_judges_path : nil
+
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: location
   end
 
@@ -32,6 +35,8 @@ def update
       @resource.update_without_password(resource_params)
     end
 
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: admin_judges_path
   end
 
@@ -39,6 +44,8 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: admin_judges_path
   end
 
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b5c22f5af0..89015ebc01 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -27,6 +27,9 @@ def create
 
     @resource.save
     location = @resource.persisted? ? admin_users_path : nil
+
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: location
   end
 
@@ -39,6 +42,8 @@ def update
       @resource.update_without_password(resource_params)
     end
 
+    render_flash_message_for(@resource)
+
     respond_with :admin, @resource, location: admin_users_path
   end
 
diff --git a/app/controllers/concerns/admin_shortlisted_docs_context.rb b/app/controllers/concerns/admin_shortlisted_docs_context.rb
index dd01eafc74..bc8a520f8a 100644
--- a/app/controllers/concerns/admin_shortlisted_docs_context.rb
+++ b/app/controllers/concerns/admin_shortlisted_docs_context.rb
@@ -18,6 +18,7 @@ def create
 
       respond_to do |format|
         format.html do
+          render_flash_message_for(attachment)
           redirect_to [namespace_name, form_answer]
         end
 
@@ -30,7 +31,8 @@ def create
     else
       respond_to do |format|
         format.html do
-          redirect_to [namespace_name, form_answer], alert: attachment.errors.full_messages.join(", ")
+          render_flash_message_for(attachment)
+          redirect_to [namespace_name, form_answer]
         end
 
         format.js do
@@ -55,6 +57,7 @@ def destroy
         if request.xhr? || request.format.js?
           head :ok
         else
+          render_flash_message_for(resource)
           redirect_to [namespace_name, form_answer]
         end
       end
diff --git a/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
index 70e2b1da58..e3ddf4706b 100644
--- a/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
+++ b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
@@ -6,6 +6,8 @@ def create
 
     respond_to do |format|
       format.html do
+        render_flash_message_for(resource)
+
         redirect_to [namespace_name, form_answer], alert: render_errors
       end
 
diff --git a/app/controllers/concerns/draft_notes_mixin.rb b/app/controllers/concerns/draft_notes_mixin.rb
index 3a9ac26044..ff7fcebe10 100644
--- a/app/controllers/concerns/draft_notes_mixin.rb
+++ b/app/controllers/concerns/draft_notes_mixin.rb
@@ -9,6 +9,7 @@ def create
 
     respond_to do |format|
       format.html do
+        render_flash_message_for(resource)
         redirect_to [namespace_name, form_answer]
       end
 
@@ -28,6 +29,7 @@ def update
 
     respond_to do |format|
       format.html do
+        render_flash_message_for(resource)
         redirect_to [namespace_name, form_answer]
       end
 

From 5df306d24089599d972293239bb6523feaa59ffd Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Thu, 27 Jul 2023 15:57:27 +0400
Subject: [PATCH 148/352] Change stack app to use Jammy Ubuntu version

---
 bin/deploy | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/deploy b/bin/deploy
index fe9029022f..2ef0598613 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -13,11 +13,11 @@ $SLACK_WEBHOOK
 export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.2"
 
 cf create-app-manifest "$CF_APP"-worker
-cf push -f "$CF_APP"-worker_manifest.yml -b $CF_BUILDPACK
+cf push -f "$CF_APP"-worker_manifest.yml -b $CF_BUILDPACK -s cflinuxfs4
 
 cf create-app-manifest $CF_APP
 
-CF_BUILDPACK=$CF_BUILDPACK ruby -ryaml -e 'm = YAML.load(STDIN); m["applications"].map{ |x| x["buildpack"] = ENV["CF_BUILDPACK"]; x.delete("buildpacks") }; puts YAML.dump(m)' \
+CF_BUILDPACK=$CF_BUILDPACK ruby -ryaml -e 'm = YAML.load(STDIN); m["applications"].map{ |x| x["buildpack"] = ENV["CF_BUILDPACK"]; x["stack"] = "cflinuxfs4"; x.delete("buildpacks") }; puts YAML.dump(m)' \
   < "$CF_APP"_manifest.yml \
   > "$CF_APP"_patched_manifest.yml
 

From 8433d257865fdaa7f4581c80e02f6cb3f25d5897 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:34:33 -0300
Subject: [PATCH 149/352] Fix JS validatons for numeric inputs

---
 .../frontend/form-validation.js.coffee        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 973b5ccb8b..215143df0d 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -389,6 +389,30 @@ window.FormValidation =
       if errors
         @addErrorClass(question)
 
+  validateNumberByYears: (question) ->
+    inputCellsCounter = 0
+
+    for subquestion in question.find("input")
+      subq = $(subquestion)
+      qParent = subq.closest(".js-fy-entries")
+      errContainer = subq.closest(".span-financial")
+
+      shownQuestion = true
+      for conditional in $(subquestion).parents('.js-conditional-question')
+        if !$(conditional).hasClass('show-question')
+          shownQuestion = false
+
+      if shownQuestion
+        inputCellsCounter += 1
+
+        if not subq.val() and question.hasClass("question-required")
+          @logThis(question, "validateNumberByYears", "This field is required")
+          @appendMessage(errContainer, "This field is required")
+          @addErrorClass(question)
+          continue
+        else if not subq.val()
+          continue
+
   validateMoneyByYears: (question) ->
     inputCellsCounter = 0
 
@@ -660,6 +684,10 @@ window.FormValidation =
     if question.hasClass("question-matrix")
       @validateMatrix(question, triggeringElement)
 
+    if question.hasClass("question-number-by-years")
+      # console.log "validateNumberByYears"
+      @validateNumberByYears(question)
+
     if question.hasClass("question-money-by-years")
       # console.log "validateMoneyByYears"
       @validateMoneyByYears(question)

From 1a8e1127c915b96524d422e7c55c55c7f91be05e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:37:17 -0300
Subject: [PATCH 150/352] Make innovation 6.X questions required

---
 forms/award_years/v2024/innovation/innovation_step4.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index 73935c2b50..cb7d6e43f9 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -316,6 +316,7 @@ def innovation_step4
         by_years :units_sold, "Number of innovative units or contracts sold (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.1"
+          required
           section :innovation_financials
           context %(
             <p>
@@ -334,6 +335,7 @@ def innovation_step4
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.2"
+          required
           section :innovation_financials
           type :money
           label ->(y) { "Financial year #{y}" }
@@ -347,6 +349,7 @@ def innovation_step4
         by_years :sales_exports, "Of which exports (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.3"
+          required
           section :innovation_financials
           context %(<p>Enter '0' if you had none.</p>)
           type :money
@@ -361,6 +364,7 @@ def innovation_step4
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.4"
+          required
           section :innovation_financials
           context %(<p>Enter '0' if you had none.</p>)
           type :money
@@ -383,6 +387,7 @@ def innovation_step4
         by_years :avg_unit_price, "Average unit selling price or contract value (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.6"
+          required
           section :innovation_financials
           context %(
             <p>
@@ -409,6 +414,7 @@ def innovation_step4
         by_years :avg_unit_cost_self, "Direct cost, to you, of a single unit or contract (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.8"
+          required
           section :innovation_financials
           context %(
             <p>If you haven't reached your latest year-end, use estimates to complete this question.</p>

From ffb16d91927f734362b31426fbc5d06366371606 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:38:01 -0300
Subject: [PATCH 151/352] Add more context to innovation 6.X questions

---
 forms/award_years/v2024/innovation/innovation_step4.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index cb7d6e43f9..3439e082e4 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -322,7 +322,8 @@ def innovation_step4
             <p>
               We recommend that you answer question C2.2 before proceeding with this and further questions, as this will automatically adjust the number of years you need to provide the figures for.
             </p>
-          )
+            <p>Enter '0' if you had none.</p>
+          ).squish
           type :number
           label ->(y) { "Financial year #{y}" }
 
@@ -337,6 +338,7 @@ def innovation_step4
           sub_ref "D 6.2"
           required
           section :innovation_financials
+          context %(<p>Enter '0' if you had none.</p>)
           type :money
           label ->(y) { "Financial year #{y}" }
 
@@ -393,7 +395,8 @@ def innovation_step4
             <p>
               If your innovation is a product, you must provide the unit price.
             </p>
-          )
+            <p>Enter '0' if you had none.</p>
+          ).squish
 
           type :money
           label ->(y) { "Financial year #{y}" }
@@ -418,7 +421,8 @@ def innovation_step4
           section :innovation_financials
           context %(
             <p>If you haven't reached your latest year-end, use estimates to complete this question.</p>
-          )
+            <p>Enter '0' if you had none.</p>
+          ).squish
           type :money
           label ->(y) { "Financial year #{y}" }
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}

From 4decf830fb8b436fed0f3fa326a12170c2030565 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:34:33 -0300
Subject: [PATCH 152/352] Fix JS validatons for numeric inputs

---
 .../frontend/form-validation.js.coffee        | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 973b5ccb8b..215143df0d 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -389,6 +389,30 @@ window.FormValidation =
       if errors
         @addErrorClass(question)
 
+  validateNumberByYears: (question) ->
+    inputCellsCounter = 0
+
+    for subquestion in question.find("input")
+      subq = $(subquestion)
+      qParent = subq.closest(".js-fy-entries")
+      errContainer = subq.closest(".span-financial")
+
+      shownQuestion = true
+      for conditional in $(subquestion).parents('.js-conditional-question')
+        if !$(conditional).hasClass('show-question')
+          shownQuestion = false
+
+      if shownQuestion
+        inputCellsCounter += 1
+
+        if not subq.val() and question.hasClass("question-required")
+          @logThis(question, "validateNumberByYears", "This field is required")
+          @appendMessage(errContainer, "This field is required")
+          @addErrorClass(question)
+          continue
+        else if not subq.val()
+          continue
+
   validateMoneyByYears: (question) ->
     inputCellsCounter = 0
 
@@ -660,6 +684,10 @@ window.FormValidation =
     if question.hasClass("question-matrix")
       @validateMatrix(question, triggeringElement)
 
+    if question.hasClass("question-number-by-years")
+      # console.log "validateNumberByYears"
+      @validateNumberByYears(question)
+
     if question.hasClass("question-money-by-years")
       # console.log "validateMoneyByYears"
       @validateMoneyByYears(question)

From 98bb98397313f6fe6be53d8f708e0f0248664508 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:37:17 -0300
Subject: [PATCH 153/352] Make innovation 6.X questions required

---
 app/forms/award_years/v2024/innovation/innovation_step4.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index 3245beda7e..4714307132 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -316,6 +316,7 @@ def innovation_step4
         by_years :units_sold, "Number of innovative units or contracts sold (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.1"
+          required
           section :innovation_financials
           context %(
             <p>
@@ -334,6 +335,7 @@ def innovation_step4
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.2"
+          required
           section :innovation_financials
           type :money
           label ->(y) { "Financial year #{y}" }
@@ -347,6 +349,7 @@ def innovation_step4
         by_years :sales_exports, "Of which exports (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.3"
+          required
           section :innovation_financials
           context %(<p>Enter '0' if you had none.</p>)
           type :money
@@ -361,6 +364,7 @@ def innovation_step4
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.4"
+          required
           section :innovation_financials
           context %(<p>Enter '0' if you had none.</p>)
           type :money
@@ -383,6 +387,7 @@ def innovation_step4
         by_years :avg_unit_price, "Average unit selling price or contract value (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.6"
+          required
           section :innovation_financials
           context %(
             <p>
@@ -409,6 +414,7 @@ def innovation_step4
         by_years :avg_unit_cost_self, "Direct cost, to you, of a single unit or contract (if applicable)." do
           classes "sub-question"
           sub_ref "D 6.8"
+          required
           section :innovation_financials
           context %(
             <p>If you haven't reached your latest year-end, use estimates to complete this question.</p>

From 8bd6efd07169d34768e7bc9d2af4537971be2003 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 17:38:01 -0300
Subject: [PATCH 154/352] Add more context to innovation 6.X questions

---
 .../award_years/v2024/innovation/innovation_step4.rb   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index 4714307132..8d2f93ba5e 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -322,7 +322,8 @@ def innovation_step4
             <p>
               We recommend that you answer question C2.2 before proceeding with this and further questions, as this will automatically adjust the number of years you need to provide the figures for.
             </p>
-          )
+            <p>Enter '0' if you had none.</p>
+          ).squish
           type :number
           label ->(y) { "Financial year #{y}" }
 
@@ -337,6 +338,7 @@ def innovation_step4
           sub_ref "D 6.2"
           required
           section :innovation_financials
+          context %(<p>Enter '0' if you had none.</p>)
           type :money
           label ->(y) { "Financial year #{y}" }
 
@@ -393,7 +395,8 @@ def innovation_step4
             <p>
               If your innovation is a product, you must provide the unit price.
             </p>
-          )
+            <p>Enter '0' if you had none.</p>
+          ).squish
 
           type :money
           label ->(y) { "Financial year #{y}" }
@@ -418,7 +421,8 @@ def innovation_step4
           section :innovation_financials
           context %(
             <p>If you haven't reached your latest year-end, use estimates to complete this question.</p>
-          )
+            <p>Enter '0' if you had none.</p>
+          ).squish
           type :money
           label ->(y) { "Financial year #{y}" }
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}

From 112c317b3c1faad1026733ce6bd0bda96da0e171 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 26 Jul 2023 11:20:56 +0100
Subject: [PATCH 155/352] Adds custom front end validation errors for
 innovation

---
 .../frontend/form-validation.js.coffee        | 116 +++++++++++++-----
 .../v2024/innovation/innovation_step1.rb      |   3 +-
 .../v2024/innovation/innovation_step2.rb      |   5 +-
 .../v2024/innovation/innovation_step3.rb      |   2 +-
 .../v2024/innovation/innovation_step4.rb      |   2 +
 app/forms/qae_form_builder.rb                 |   1 +
 .../qae_form_builder/address_question.rb      |  30 +----
 app/forms/qae_form_builder/question.rb        |   2 +
 .../qae_form_builder/sub_fields_question.rb   |  46 +++++++
 .../qae_form/_address_question.html.slim      |  36 +++++-
 .../_press_contact_details_question.html.slim |  52 ++++----
 ...ueen_award_applications_question.html.slim |  12 +-
 .../_queen_award_holder_question.html.slim    |   8 +-
 app/views/qae_form/_question.html.slim        |   8 +-
 .../qae_form/_sub_fields_question.html.slim   |  27 ++++
 app/views/qae_form/_text_question.html.slim   |  12 +-
 16 files changed, 257 insertions(+), 105 deletions(-)
 create mode 100644 app/forms/qae_form_builder/sub_fields_question.rb
 create mode 100644 app/views/qae_form/_sub_fields_question.html.slim

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 973b5ccb8b..8026278617 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -144,23 +144,63 @@ window.FormValidation =
     if subquestions.length
       for subquestion in subquestions
         if not @validateSingleQuestion($(subquestion))
-          @logThis(question, "validateRequiredQuestion", "This field is required")
-          @addErrorMessage($(subquestion), "This field is required")
+          # @logThis(question, "validateRequiredQuestion", "This field is required")
+          # console.log(subquestion.find("select").val())
+          @addSubfieldError(question, subquestion)
     else
       if not @validateSingleQuestion(question)
-        @logThis(question, "validateRequiredQuestion", "This field is required")
-        @addErrorMessage(question, "This field is required")
+        # @logThis(question, "validateRequiredQuestion", "This field is required")
+        @addQuestionError(question)
+
+  addSubfieldError: (question, subquestion) ->
+    questionRef = question.attr("data-question_ref")
+    input = $(subquestion).find('input,textarea,select').filter(':visible')
+    label = $("label[for='#{input.attr('id')}']").text()
+    incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
+
+    if question.hasClass('date-DDMMYYYY')
+      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format DD/MM/YYYY.")
+    else if question.hasClass('date-MMYYYY')
+      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format MM/YYYY.")
+    else if question.hasClass('date-YYYY')
+      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format YYYY.")
+    else if input.hasClass("autocomplete__input")
+      @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list.")
+    else
+      if question.find(".js-financial-year-latest").length
+        #avoid duplicate errors for financial year questions
+        return
+      else
+        @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
+
+  addQuestionError: (question) ->
+    questionRef = question.attr("data-question_ref")
+    incompleteMessage = "Question #{questionRef} is incomplete. It is required"
+    if @isOptionsQuestion(question)
+      @addErrorMessage(question, "#{incompleteMessage} and an option must be chosen from the following list.")
+    else if @isSelectQuestion(question)
+      @addErrorMessage(question, "#{incompleteMessage} and an option must be selected from the following dropdown list.")
+    else if @isTextishQuestion(question) && !question.hasClass("question-year")
+      @addErrorMessage(question, "#{incompleteMessage} and must be filled in.")
+    else if question.hasClass("question-year")
+      @addErrorMessage(question, "#{incompleteMessage} and must be filled in. Use the format YYYY.")
+    else if @isCheckboxQuestion(question)
+      if question.find("input[type='checkbox']").length > 1
+        @addErrorMessage(question, "#{incompleteMessage} and at least one option must be chosen from the following list.")
+      else
+        @addErrorMessage(question, "#{incompleteMessage} and confirmation must be given by ticking the checkbox.")
 
   validateMatchQuestion: (question) ->
     q = question.find(".match")
     matchName = q.data("match")
 
     if q.val() isnt $("input[name='#{matchName}']").val()
-      @logThis(question, "validateMatchQuestion", "Emails don't match")
+      # @logThis(question, "validateMatchQuestion", "Emails don't match")
       @addErrorMessage(question, "Emails don't match")
 
   validateMaxDate: (question) ->
     val = question.find("input[type='number']").val()
+    questionRef = question.attr("data-question_ref")
 
     questionYear = question.find(".js-date-input-year").val()
     questionMonth = question.find(".js-date-input-month").val()
@@ -174,12 +214,12 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not @toDate(questionDate).isValid()
-      @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Not a valid date")
+      # @logThis(question, "validateMaxDate", "Not a valid date")
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY.")
       return
 
     if diff > 0
-      @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
+      # @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
       @addErrorMessage(question, "Date cannot be after #{expDate}")
 
   validateDynamicMaxDate: (question) ->
@@ -208,12 +248,12 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not @toDate(questionDate).isValid()
-      @logThis(question, "validateMaxDate", "Not a valid date")
+      # @logThis(question, "validateMaxDate", "Not a valid date")
       @addErrorMessage(question, "Not a valid date")
       return
 
     if diff > 0
-      @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
+      # @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
       @addErrorMessage(question, "Date cannot be after #{expDate}")
 
   validateMinDate: (question) ->
@@ -231,12 +271,12 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not @toDate(questionDate).isValid()
-      @logThis(question, "validateMinDate", "Not a valid date")
+      # @logThis(question, "validateMinDate", "Not a valid date")
       @addErrorMessage(question, "Not a valid date")
       return
 
     if diff > 0
-      @logThis(question, "validateMinDate", "Date cannot be before #{expDate}")
+      # @logThis(question, "validateMinDate", "Date cannot be before #{expDate}")
       @addErrorMessage(question, "Date cannot be before #{expDate}")
 
   validateBetweenDate: (question) ->
@@ -291,6 +331,7 @@ window.FormValidation =
       @addErrorMessage(question, "Not a valid number")
 
   validateEmployeeMin: (question) ->
+    questionRef = question.attr("data-question_ref")
     for subquestion in question.find("input")
       shownQuestion = true
       for conditional in $(subquestion).parents('.js-conditional-question')
@@ -299,9 +340,10 @@ window.FormValidation =
 
       if shownQuestion
         subq = $(subquestion)
+        label = $("label[for='#{subq.attr('id')}']").text()
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateEmployeeMin", "This field is required")
-          @appendMessage(subq.closest(".span-financial"), "This field is required")
+          @appendMessage(subq.closest(".span-financial"), "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -374,6 +416,7 @@ window.FormValidation =
 
   validateCurrentAwards: (question) ->
     $(".govuk-error-message", question).empty()
+    questionRef = question.attr("data-question_ref")
 
     for subquestion in question.find(".list-add li")
       errors = false
@@ -382,7 +425,7 @@ window.FormValidation =
         if !$(input).val()
           fieldName = $(input).data("dependable-option-siffix")
           fieldName = fieldName[0].toUpperCase() + fieldName.slice(1)
-          fieldError = "#{fieldName} can't be blank. "
+          fieldError = "Question #{questionRef} is incomplete. #{fieldName} is required and an option must be selected from the following list. "
           @logThis(question, "validateCurrentAwards", fieldError)
           @appendMessage($(input).closest('.govuk-form-group'), fieldError)
           errors = true
@@ -402,6 +445,7 @@ window.FormValidation =
       subq = $(subquestion)
       qParent = subq.closest(".js-fy-entries")
       errContainer = subq.closest(".span-financial")
+      questionRef = question.attr("data-question_ref")
 
       shownQuestion = true
       for conditional in $(subquestion).parents('.js-conditional-question')
@@ -413,7 +457,8 @@ window.FormValidation =
 
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateMoneyByYears", "This field is required")
-          @appendMessage(errContainer, "This field is required")
+          label = $("label[for='#{subq.attr('id')}']").text()
+          @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -448,41 +493,54 @@ window.FormValidation =
     if !conditional
       return
     # end of conditional validation
+    questionRef = question.attr("data-question_ref")
 
     for subquestionBlock in question.find(".by-years-wrapper.show-question .govuk-date-input")
       subq = $(subquestionBlock)
       qParent = subq.closest(".js-fy-entries")
+      label = qParent.find(".js-year-default").text()
       errorsContainer = qParent.find(".govuk-error-message").html()
 
       day = subq.find("input.js-fy-day").val()
       month = subq.find("input.js-fy-month").val()
       year = subq.find("input.js-fy-year").val()
 
-      if (not day or not month or not year)
-        if question.hasClass("question-required") && errorsContainer.length < 1
+      if question.hasClass("question-required") && errorsContainer.length < 1
+        if (not day and not month and not year)
           @logThis(question, "validateDateByYears", "This field is required")
-          @appendMessage(qParent, "This field is required")
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Use the format DD/MM/YYYY.")
           @addErrorClass(question)
-      else
-        complexDateString = day + "/" + month + "/" + year
-        date = @toDate(complexDateString)
+        else if (not day)
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} day is required and must be filled in. Use the format DD.")
+        else if (not month)
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} month is required and must be filled in. Use the format MM.")
+        else if (not year)
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} year is required and must be filled in. Use the format YYYY.")
+        else
+          complexDateString = day + "/" + month + "/" + year
+          date = @toDate(complexDateString)
 
-        if not date.isValid()
-          @logThis(question, "validateDateByYears", "Not a valid date")
-          @appendMessage(qParent, "Not a valid date")
-          @addErrorClass(question)
+          if not date.isValid()
+            @logThis(question, "validateDateByYears", "Not a valid date")
+            @appendMessage(qParent, "Not a valid date")
+            @addErrorClass(question)
 
   validateInnovationFinancialDate: (question) ->
-
     val = question.find("input[type='number']").val()
-
+    questionRef = question.attr("data-question_ref")
     questionDay = parseInt(question.find(".innovation-day").val())
     questionMonth = parseInt(question.find(".innovation-month").val())
     questionDate = "#{questionDay}/#{questionMonth}/#{moment().format('Y')}"
 
-    if not @toDate(questionDate).isValid()
+    if (not questionDay and not questionMonth)
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. Year-end is required and must be filled in. Use the format DD/MM.")
+    else if not questionDay
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. Day is required and must be filled in. Use the format DD/MM.")
+    else if not questionMonth
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. Month is required and must be filled in. Use the format DD/MM.")
+    else if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Not a valid date")
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM.")
       return
 
   validateDiffBetweenDates: (question) ->
diff --git a/app/forms/award_years/v2024/innovation/innovation_step1.rb b/app/forms/award_years/v2024/innovation/innovation_step1.rb
index fb9c20f019..b9c3a992fa 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step1.rb
@@ -12,7 +12,8 @@ def innovation_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
+          required
           sub_ref "A 1.2"
           classes "sub-question"
           sub_fields([
diff --git a/app/forms/award_years/v2024/innovation/innovation_step2.rb b/app/forms/award_years/v2024/innovation/innovation_step2.rb
index 18399588dd..60dd428e1a 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step2.rb
@@ -115,7 +115,7 @@ def innovation_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context -> do
@@ -156,7 +156,8 @@ def innovation_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
+          required
           ref "B 7"
           context %(
             <p class='govuk-hint'><em>
diff --git a/app/forms/award_years/v2024/innovation/innovation_step3.rb b/app/forms/award_years/v2024/innovation/innovation_step3.rb
index 0329a8b673..e5de6a9086 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step3.rb
@@ -284,7 +284,7 @@ def innovation_step3
 
         date :innovation_was_launched_in_the_market, "Select the date when your innovation was launched in the market." do
           sub_section :innovation_timeline_header
-          classes "sub-question"
+          classes "sub-question date-DDMMYYYY"
           sub_ref "C 2.2"
           required
           context -> do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index 3245beda7e..dcd6bddbf5 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -9,6 +9,7 @@ def innovation_step4
 
         innovation_financial_year_date :financial_year_date, "Enter your financial year-end date." do
           ref "D 1"
+          classes "date-MMYYYY"
           required
           financial_date_pointer
         end
@@ -481,6 +482,7 @@ def innovation_step4
         end
 
         options :product_estimated_figures, "Are any of the figures used on this page estimates?" do
+          required
           ref "D 9"
           yes_no
           context %(
diff --git a/app/forms/qae_form_builder.rb b/app/forms/qae_form_builder.rb
index 3bfdb4b018..3c5474fc94 100644
--- a/app/forms/qae_form_builder.rb
+++ b/app/forms/qae_form_builder.rb
@@ -28,6 +28,7 @@
 require "qae_form_builder/position_details_question"
 require "qae_form_builder/previous_name_question"
 require "qae_form_builder/country_question"
+require "qae_form_builder/sub_fields_question"
 require "qae_form_builder/address_question"
 require "qae_form_builder/head_of_business_question"
 require "qae_form_builder/press_contact_details_question"
diff --git a/app/forms/qae_form_builder/address_question.rb b/app/forms/qae_form_builder/address_question.rb
index 71162b0b38..cab52cc487 100644
--- a/app/forms/qae_form_builder/address_question.rb
+++ b/app/forms/qae_form_builder/address_question.rb
@@ -1,27 +1,9 @@
 class QAEFormBuilder
-  class AddressQuestionValidator < QuestionValidator
+  class AddressQuestionValidator < SubFieldsQuestionValidator
     NO_VALIDATION_SUB_FIELDS = [:street, :county]
-    def errors
-      result = super
-
-      if question.required?
-        question.required_sub_fields.each do |sub_field|
-          suffix = sub_field.keys[0]
-          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
-            result[question.hash_key(suffix: suffix)] ||= ""
-            result[question.hash_key(suffix: suffix)] << " Can't be blank."
-          end
-        end
-      end
-
-      # need to add govuk-form-group--errors class
-      result[question.hash_key] ||= "" if result.any?
-
-      result
-    end
   end
 
-  class AddressQuestionDecorator < QuestionDecorator
+  class AddressQuestionDecorator < SubFieldsQuestionDecorator
     include RegionHelper
 
     def required_sub_fields
@@ -50,15 +32,11 @@ def rendering_sub_fields
     end
   end
 
-  class AddressQuestionBuilder < QuestionBuilder
+  class AddressQuestionBuilder < SubFieldsQuestionBuilder
     def countries(countries)
       @q.countries = countries
     end
 
-    def sub_fields(fields)
-      @q.sub_fields = fields
-    end
-
     def region_context(region_context)
       @q.region_context = region_context
     end
@@ -68,7 +46,7 @@ def county_context(county_context)
     end
   end
 
-  class AddressQuestion < Question
+  class AddressQuestion < SubFieldsQuestion
     attr_accessor :countries, :sub_fields, :region_context, :county_context
   end
 end
diff --git a/app/forms/qae_form_builder/question.rb b/app/forms/qae_form_builder/question.rb
index d28342944a..2bdb2f4721 100644
--- a/app/forms/qae_form_builder/question.rb
+++ b/app/forms/qae_form_builder/question.rb
@@ -3,6 +3,7 @@ class QuestionValidator
     # multifield questions that can not be simply validated
     SKIP_PRESENCE_VALIDATION_QUESTIONS = [
       "DateQuestion",
+      "SubFieldsQuestion",
       "AddressQuestion",
       "InnovationFinancialYearDateQuestion",
       "ByYearsQuestion",
@@ -127,6 +128,7 @@ def label_as_legend?
         "by_years_label_question",
         "matrix_question",
         "press_contact_details_question",
+        "sub_fields_question",
         "upload_question"
       ]
 
diff --git a/app/forms/qae_form_builder/sub_fields_question.rb b/app/forms/qae_form_builder/sub_fields_question.rb
new file mode 100644
index 0000000000..7efb213891
--- /dev/null
+++ b/app/forms/qae_form_builder/sub_fields_question.rb
@@ -0,0 +1,46 @@
+class QAEFormBuilder
+  class SubFieldsQuestionValidator < QuestionValidator
+    NO_VALIDATION_SUB_FIELDS = [:honours]
+    def errors
+      result = super
+
+      if question.required?
+        question.required_sub_fields.each do |sub_field|
+          suffix = sub_field.keys[0]
+          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
+            result[question.hash_key(suffix: suffix)] ||= ""
+            result[question.hash_key(suffix: suffix)] << " Can't be blank."
+          end
+        end
+      end
+
+      # need to add govuk-form-group--errors class
+      result[question.hash_key] ||= "" if result.any?
+
+      result
+    end
+  end
+
+  class SubFieldsQuestionDecorator < QuestionDecorator
+    def required_sub_fields
+      sub_fields
+    end
+
+    def rendering_sub_fields
+      required_sub_fields.map do |f|
+        [f.keys.first, f.values.first]
+      end
+    end
+  end
+
+  class SubFieldsQuestionBuilder < QuestionBuilder
+    def sub_fields fields
+      @q.sub_fields = fields
+    end
+  end
+
+  class SubFieldsQuestion < Question
+    attr_accessor :sub_fields
+  end
+
+end
diff --git a/app/views/qae_form/_address_question.html.slim b/app/views/qae_form/_address_question.html.slim
index 3044f08677..711cdb6dc2 100644
--- a/app/views/qae_form/_address_question.html.slim
+++ b/app/views/qae_form/_address_question.html.slim
@@ -14,7 +14,15 @@ div role="group" id="q_#{question.key}"
               | Error:
             = @form_answer.validator_errors[question.hash_key(suffix: "building")]
         span.govuk-error-message
-        input.govuk-input.govuk-input--width-10.js-trigger-autosave.required type="text" name=question.input_name(suffix: 'building') value=question.input_value(suffix: 'building') autocomplete="off"  id="q_#{question.key}_line_1" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_building" : nil )
+        input.govuk-input.govuk-input--width-10.js-trigger-autosave.required[
+          type="text"
+          name=question.input_name(suffix: 'building')
+          value=question.input_value(suffix: 'building')
+          autocomplete="off"
+          id="q_#{question.key}_line_1" *possible_read_only_ops
+          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_building" : nil )
+        ]
+
       .govuk-form-group.question-required
         label.govuk-label for="q_#{question.key}_line_2"
           ' Street
@@ -24,12 +32,20 @@ div role="group" id="q_#{question.key}"
               | Error:
             = @form_answer.validator_errors[question.hash_key(suffix: "street")]
         span.govuk-error-message
-        input.govuk-input.govuk-input--width-10.js-trigger-autosave type="text" name=question.input_name(suffix: 'street') value=question.input_value(suffix: 'street') autocomplete="off" id="q_#{question.key}_line_2" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_street" : nil )
+        input.govuk-input.govuk-input--width-10.js-trigger-autosave[
+          type="text"
+          name=question.input_name(suffix: 'street')
+          value=question.input_value(suffix: 'street')
+          autocomplete="off"
+          id="q_#{question.key}_line_2" *possible_read_only_ops
+          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_street" : nil )
+        ]
+
     - when :country
       .govuk-form-group.question-required
         label.govuk-label for="#{question.key}_country"
           ' Country
-        = country_select(question.step.form.form_name, "#{question.key}_country", {priority_countries: ["GB", "US"], selected: question.input_value(suffix: 'country')}, possible_read_only_ops.merge({name: question.input_name(suffix: 'country'), class: 'js-trigger-autosave required custom-select govuk-!-width-one-half', aria: {describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_country" : nil )}}))
+        = country_select(question.step.form.form_name, "#{question.key}_country", { priority_countries: ["GB", "US"], selected: question.input_value(suffix: 'country') }, possible_read_only_ops.merge({ name: question.input_name(suffix: 'country'), class: 'js-trigger-autosave required custom-select govuk-!-width-one-half', aria: {describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_country" : nil )}, data: {subfield: "Country"}}))
         - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
           span.govuk-error-message
             span.govuk-visually-hidden
@@ -40,7 +56,7 @@ div role="group" id="q_#{question.key}"
 
     - when :county
       .govuk-form-group.question-required
-        label.govuk-label id="#{question.key}_region_label" for="#{question.key}_county" aria-describedby="#{question.key}_county_hint"
+        label.govuk-label id="#{question.key}_region_label" for="form_#{question.key}_#{sub_field_key}" aria-describedby="#{question.key}_county_hint"
           ' County
         - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
           span.govuk-error-message
@@ -54,7 +70,7 @@ div role="group" id="q_#{question.key}"
           .question-context[id="#{question.key}_county_hint"]
             == question.county_context
 
-        = select_tag("#{question.key}_county", options_for_select(question.counties, question.input_value(suffix: "county")), possible_read_only_ops.merge({name: question.input_name(suffix: 'county'), class: "js-trigger-autosave required custom-select govuk-!-width-one-third", include_blank: true, aria: { label: "Select #{question.key}", describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_county" : nil )}}))
+        = select_tag(question.input_name(suffix: sub_field_key), options_for_select(question.counties, question.input_value(suffix: "county")), possible_read_only_ops.merge({ name: question.input_name(suffix: 'county'), class: "js-trigger-autosave required custom-select govuk-!-width-one-third", include_blank: true, aria: { label: "Select #{question.key}", describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_county" : nil )}}))
 
     - else
       .govuk-form-group.question-required
@@ -70,4 +86,12 @@ div role="group" id="q_#{question.key}"
 
         - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
         - klass <<(QAEFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
-        input.govuk-input.js-trigger-autosave class=klass type="text" id=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key) name=question.input_name(suffix: sub_field_key) autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
+        input.govuk-input.js-trigger-autosave[
+          class=klass
+          type="text"
+          id=question.input_name(suffix: sub_field_key)
+          value=question.input_value(suffix: sub_field_key)
+          name=question.input_name(suffix: sub_field_key)
+          autocomplete="off" *possible_read_only_ops
+          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
+        ]
diff --git a/app/views/qae_form/_press_contact_details_question.html.slim b/app/views/qae_form/_press_contact_details_question.html.slim
index 335faf4efc..995857a632 100644
--- a/app/views/qae_form/_press_contact_details_question.html.slim
+++ b/app/views/qae_form/_press_contact_details_question.html.slim
@@ -1,25 +1,27 @@
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'title')
-    ' Title
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.tiny type="text" name=question.input_name(suffix: 'title') value=question.input_value(suffix: 'title') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'title')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'first_name')
-    ' First name
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'first_name') value=question.input_value(suffix: 'first_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'first_name')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'last_name')
-    ' Last name
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'last_name') value=question.input_value(suffix: 'last_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'last_name')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'telephone')
-    ' Telephone
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="tel" pattern="[0-9]*" name=question.input_name(suffix: 'telephone') value=question.input_value(suffix: 'telephone') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'telephone')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'email')
-    ' Email address
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.large type="email" name=question.input_name(suffix: 'email') value=question.input_value(suffix: 'email') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'email')
+.govuk-form-group
+  div role="group" id="#{question.key}"
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'title')
+        ' Title
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.tiny type="text" name=question.input_name(suffix: 'title') value=question.input_value(suffix: 'title') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'title')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'first_name')
+        ' First name
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'first_name') value=question.input_value(suffix: 'first_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'first_name')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'last_name')
+        ' Last name
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'last_name') value=question.input_value(suffix: 'last_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'last_name')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'telephone')
+        ' Telephone
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="tel" pattern="[0-9]*" name=question.input_name(suffix: 'telephone') value=question.input_value(suffix: 'telephone') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'telephone')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'email')
+        ' Email address
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.large type="email" name=question.input_name(suffix: 'email') value=question.input_value(suffix: 'email') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'email')
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index dbc8837bbe..6009ef6ac2 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -41,7 +41,7 @@ div role="group" id="q_#{question.key}"
                 | Category
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" data-input-value="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][category]"
+                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" data-input-value="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][category]"
                   option value=""
                     ' Category
                   - question.categories.each do |category|
@@ -57,7 +57,7 @@ div role="group" id="q_#{question.key}"
                 | Year
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][year]" data-dependable-option-siffix="year" data-input-value="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][year]"
+                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][year]" data-dependable-option-siffix="year" data-input-value="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][year]"
                   option value=""
                     ' Year
                   - question.years.each do |year|
@@ -73,7 +73,7 @@ div role="group" id="q_#{question.key}"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" data-input-value="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][outcome]"
+                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" data-input-value="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][outcome]"
                   option value=""
                     ' Outcome (Won/Did not win)
                   - question.outcomes.each do |outcome|
@@ -96,7 +96,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][category]"
                 | Category
               span.govuk-error-message
-              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -107,7 +107,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][year]"
                 | Year
               span.govuk-error-message
-              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year
                 - question.years.each do |year|
@@ -118,7 +118,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][outcome]"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
-              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Outcome (Won/Did not win)
                 - question.outcomes.each do |outcome|
diff --git a/app/views/qae_form/_queen_award_holder_question.html.slim b/app/views/qae_form/_queen_award_holder_question.html.slim
index 608224502e..99181bfc39 100644
--- a/app/views/qae_form/_queen_award_holder_question.html.slim
+++ b/app/views/qae_form/_queen_award_holder_question.html.slim
@@ -38,7 +38,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
               label.govuk-form-label for="form[queen_award_holder_details][#{index}][category]"
                 | Category
               div.if-no-js-hide
-                select.inline.govuk-select.js-trigger-autosave name="form[queen_award_holder_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+                select.inline.custom-select.govuk-select.js-trigger-autosave name="form[queen_award_holder_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                   option value=""
                     ' Category
                   - question.categories.each do |category|
@@ -52,7 +52,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
               label.govuk-form-label name="form[queen_award_holder_details][#{index}][year]"
                 | Year Awarded
               span.if-no-js-hide
-                select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][#{index}][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+                select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][#{index}][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                   option value=""
                     ' Year Awarded
                   - question.years.each do |year|
@@ -72,7 +72,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
             .govuk-form-group
               label for="form[queen_award_holder_details][0][category]"
                 | Category
-              select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -83,7 +83,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
             .govuk-form-group
               label for="form[queen_award_holder_details][0][year]"
                 | Year Awarded
-              select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year Awarded
                 - question.years.each do |year|
diff --git a/app/views/qae_form/_question.html.slim b/app/views/qae_form/_question.html.slim
index 4ac4188f28..15bb9cea1c 100644
--- a/app/views/qae_form/_question.html.slim
+++ b/app/views/qae_form/_question.html.slim
@@ -1,3 +1,5 @@
+- ref = question.ref ? question.ref : question.sub_ref
+
 - if question.header
   h2.govuk-heading-l
     = question.header
@@ -7,10 +9,9 @@
   .govuk-form-group
     == question.context
 - elsif question.label_as_legend?
-  fieldset class=question.fieldset_classes data=question.fieldset_data_hash
+  fieldset class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
-        - ref = question.ref ? question.ref : question.sub_ref
         - if question.title != "" || question.show_ref_always.present?
           legend.govuk-fieldset__legend aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref
@@ -73,10 +74,9 @@
           = render "qae_form/conditional_hints/list", question: question
 
 - else
-  div class=question.fieldset_classes data=question.fieldset_data_hash
+  div class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
-        - ref = question.ref ? question.ref : question.sub_ref
         - if question.title != "" || question.show_ref_always.present?
           label.govuk-label for="q_#{question.key}" id="q_#{question.key}_label" aria-label="#{ref.to_s.gsub(' ', '-')}: #{question.title}" aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
new file mode 100644
index 0000000000..01d1831f1c
--- /dev/null
+++ b/app/views/qae_form/_sub_fields_question.html.slim
@@ -0,0 +1,27 @@
+div role="group" id="#{question.key}"
+  - question.rendering_sub_fields.each do |sub_field_block|
+    - sub_field_key = sub_field_block[0]
+    - sub_field_title = sub_field_block[1]
+
+    .govuk-form-group.question-required
+      label.govuk-label for=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key)
+        = sub_field_title
+      - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
+        span.govuk-error-message
+          span.govuk-visually-hidden
+            | Error:
+          =< @form_answer.validator_errors[question.hash_key(suffix: sub_field_key)]
+      span.govuk-error-message
+      .clear
+
+      - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
+      - klass <<(QAEFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+      input.govuk-input.js-trigger-autosave[
+        class=klass
+        type="text"
+        id=question.input_name(suffix: sub_field_key)
+        value=question.input_value(suffix: sub_field_key)
+        name=question.input_name(suffix: sub_field_key)
+        autocomplete="off" *possible_read_only_ops
+        aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
+      ]
diff --git a/app/views/qae_form/_text_question.html.slim b/app/views/qae_form/_text_question.html.slim
index 6b733cf49e..56bdaa66e5 100644
--- a/app/views/qae_form/_text_question.html.slim
+++ b/app/views/qae_form/_text_question.html.slim
@@ -1 +1,11 @@
-input class="govuk-input js-trigger-autosave #{question.style.present? ? question.style : 'govuk-input--width-10'}" type="#{question.type.present? ? question.type.to_s : 'text'}" pattern="#{'[0-9]*' if question.type == 'tel' || question.type == 'number'}" name=question.input_name value=question.input_value autocomplete="off" id="q_#{question.key}" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+input[
+  class="govuk-input js-trigger-autosave
+  #{question.style.present? ? question.style : 'govuk-input--width-10'}"
+  type="#{question.type.present? ? question.type.to_s : 'text'}"
+  pattern="#{'[0-9]*' if question.type == 'tel' || question.type == 'number'}"
+  name=question.input_name
+  value=question.input_value
+  autocomplete="off"
+  id="q_#{question.key}"*possible_read_only_ops
+  aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+]

From 494055a26845666f95fe60ab3eff1e994d90aa21 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 27 Jul 2023 22:58:54 +0100
Subject: [PATCH 156/352] Adds custom backend validation errors for innovation

---
 .../v2024/innovation/innovation_step2.rb            |  1 +
 .../v2024/innovation/innovation_step4.rb            |  1 -
 .../qae_form_builder/checkbox_seria_question.rb     | 10 +++++++++-
 app/forms/qae_form_builder/confirm_question.rb      | 13 +++++++++++++
 app/forms/qae_form_builder/date_question.rb         |  6 +++---
 .../innovation_financial_year_date_question.rb      |  2 +-
 .../qae_form_builder/multi_question_validator.rb    |  2 +-
 app/forms/qae_form_builder/options_question.rb      | 13 +++++++++++++
 app/forms/qae_form_builder/question.rb              |  2 +-
 .../qae_form_builder/sic_code_dropdown_question.rb  | 12 ++++++++++++
 app/forms/qae_form_builder/sub_fields_question.rb   |  2 +-
 app/forms/qae_form_builder/year_question.rb         |  7 +++++++
 12 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/app/forms/award_years/v2024/innovation/innovation_step2.rb b/app/forms/award_years/v2024/innovation/innovation_step2.rb
index 60dd428e1a..4405f6a87b 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step2.rb
@@ -279,6 +279,7 @@ def innovation_step2
         queen_award_applications :applied_for_queen_awards_details, " List the Queen's/King's awards you have applied for in the last 10 years." do
           classes "sub-question question-current-awards"
           sub_ref "B 12.1"
+          required
 
           conditional :applied_for_queen_awards, :yes
 
diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index dcd6bddbf5..f3086bafb3 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -9,7 +9,6 @@ def innovation_step4
 
         innovation_financial_year_date :financial_year_date, "Enter your financial year-end date." do
           ref "D 1"
-          classes "date-MMYYYY"
           required
           financial_date_pointer
         end
diff --git a/app/forms/qae_form_builder/checkbox_seria_question.rb b/app/forms/qae_form_builder/checkbox_seria_question.rb
index 05ce55ca17..c43a438565 100644
--- a/app/forms/qae_form_builder/checkbox_seria_question.rb
+++ b/app/forms/qae_form_builder/checkbox_seria_question.rb
@@ -1,7 +1,15 @@
 class QAEFormBuilder
   class CheckboxSeriaQuestionValidator < QuestionValidator
     def errors
-      result = super
+      result = {}
+
+      return {} if skip_base_validation?
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and at least one option must be chosen from the following list."
+        end
+      end
 
       if question.input_value && question.selection_limit
         if question.input_value.size > question.selection_limit
diff --git a/app/forms/qae_form_builder/confirm_question.rb b/app/forms/qae_form_builder/confirm_question.rb
index 7f87e11f06..1417657ca4 100644
--- a/app/forms/qae_form_builder/confirm_question.rb
+++ b/app/forms/qae_form_builder/confirm_question.rb
@@ -1,5 +1,18 @@
 class QAEFormBuilder
   class ConfirmQuestionValidator < QuestionValidator
+    def errors
+      result = {}
+
+      return {} if skip_base_validation?
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and confirmation must be given by ticking the checkbox."
+        end
+      end
+
+      result
+    end
   end
 
   class ConfirmQuestionBuilder < QuestionBuilder
diff --git a/app/forms/qae_form_builder/date_question.rb b/app/forms/qae_form_builder/date_question.rb
index f32058be0d..b0a56ca7bb 100644
--- a/app/forms/qae_form_builder/date_question.rb
+++ b/app/forms/qae_form_builder/date_question.rb
@@ -16,17 +16,17 @@ def errors
       if !date
         if question.required?
           result[question.hash_key] ||= ""
-          result[question.hash_key] << " Invalid date."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. It requires a date in the format DD/MM/YYYY."
         end
       else
         if date_min && date < date_min
           result[question.hash_key] ||= ""
-          result[question.hash_key] << " Date should be greater than #{date_min.strftime('%d/%m/%Y')}."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be after #{date_min.strftime('%d/%m/%Y')}."
         end
 
         if date_max && date > date_max
           result[question.hash_key] ||= ""
-          result[question.hash_key] << " Date should be less than #{date_max.strftime('%d/%m/%Y')}."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be before #{date_max.strftime('%d/%m/%Y')}."
         end
       end
 
diff --git a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
index 7c8ba036c1..698f370cd5 100644
--- a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
+++ b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
@@ -14,7 +14,7 @@ def errors
 
       if !date && question.required?
         result[question.hash_key] ||= ""
-        result[question.hash_key] << " Invalid date."
+        result[question.hash_key] << "#{question.ref || question.sub_ref} is incomplete. Year-end is required. Use the format MM/YYYY"
       end
 
       result
diff --git a/app/forms/qae_form_builder/multi_question_validator.rb b/app/forms/qae_form_builder/multi_question_validator.rb
index f0e59d9fd2..695da61256 100644
--- a/app/forms/qae_form_builder/multi_question_validator.rb
+++ b/app/forms/qae_form_builder/multi_question_validator.rb
@@ -7,7 +7,7 @@ def errors
         if !entity[attr].present?
           result[question.key] ||= {}
           result[question.key][index] ||= ""
-          result[question.key][index] << " #{attr.humanize.capitalize} can't be blank."
+          result[question.key][index] << "Question #{question.ref || question.sub_ref} is incomplete. #{attr.humanize} can't be blank."
         end
       end
     end
diff --git a/app/forms/qae_form_builder/options_question.rb b/app/forms/qae_form_builder/options_question.rb
index d3f4354923..7ad8b4634e 100644
--- a/app/forms/qae_form_builder/options_question.rb
+++ b/app/forms/qae_form_builder/options_question.rb
@@ -1,5 +1,18 @@
 class QAEFormBuilder
   class OptionsQuestionValidator < QuestionValidator
+    def errors
+      result = {}
+
+      return {} if skip_base_validation?
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and an option must be chosen from the following list."
+        end
+      end
+
+      result
+    end
   end
 
   QuestionAnswerOption = Struct.new(:value, :text)
diff --git a/app/forms/qae_form_builder/question.rb b/app/forms/qae_form_builder/question.rb
index 2bdb2f4721..0bff6308d6 100644
--- a/app/forms/qae_form_builder/question.rb
+++ b/app/forms/qae_form_builder/question.rb
@@ -33,7 +33,7 @@ def errors
 
       if question.required?
         if !question.input_value.present?
-          result[question.hash_key] = "Can't be blank."
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and must be filled in."
         end
       end
 
diff --git a/app/forms/qae_form_builder/sic_code_dropdown_question.rb b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
index e6824aab42..e054e0e1a4 100644
--- a/app/forms/qae_form_builder/sic_code_dropdown_question.rb
+++ b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
@@ -1,5 +1,17 @@
 class QAEFormBuilder
   class SicCodeDropdownQuestionValidator < QuestionValidator
+    def errors
+      result = super
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] ||= ""
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and an option must be selected from the following dropdown list."
+        end
+      end
+
+      result
+    end
   end
 
   class SicCodeDropdownQuestionBuilder < DropdownQuestionBuilder
diff --git a/app/forms/qae_form_builder/sub_fields_question.rb b/app/forms/qae_form_builder/sub_fields_question.rb
index 7efb213891..a79adcc6d4 100644
--- a/app/forms/qae_form_builder/sub_fields_question.rb
+++ b/app/forms/qae_form_builder/sub_fields_question.rb
@@ -9,7 +9,7 @@ def errors
           suffix = sub_field.keys[0]
           if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
             result[question.hash_key(suffix: suffix)] ||= ""
-            result[question.hash_key(suffix: suffix)] << " Can't be blank."
+            result[question.hash_key(suffix: suffix)] << "Question #{question.ref || question.sub_ref} is incomplete. #{suffix.to_s.humanize} is required and and must be filled in."
           end
         end
       end
diff --git a/app/forms/qae_form_builder/year_question.rb b/app/forms/qae_form_builder/year_question.rb
index b191777163..4b3ad4c108 100644
--- a/app/forms/qae_form_builder/year_question.rb
+++ b/app/forms/qae_form_builder/year_question.rb
@@ -3,6 +3,13 @@ class YearQuestionValidator < QuestionValidator
     def errors
       result = super
 
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] ||= ""
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and must be filled in. Use the format YYYY."
+        end
+      end
+
       year = question.input_value.to_i
 
       if year < question.min || year > question.max

From e52f73bf8879b8b64856ea594f0bb4f44bdf1852 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 28 Jul 2023 09:10:10 +0100
Subject: [PATCH 157/352] Adds custom front end validation errors for sd

---
 .../sustainable_development_step1.rb                     | 3 ++-
 .../sustainable_development_step2.rb                     | 5 +++--
 .../_queen_award_applications_question.html.slim         | 6 +++---
 app/views/qae_form/_sub_fields_question.html.slim        | 9 ++++++++-
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
index 5139046680..114d72cfdc 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
@@ -13,8 +13,9 @@ def development_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
+          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
index 95f31abe63..41d85e431f 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
@@ -116,7 +116,7 @@ def development_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context %(
@@ -154,8 +154,9 @@ def development_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
+          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index 6009ef6ac2..c6722ccf2b 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -96,7 +96,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][category]"
                 | Category
               span.govuk-error-message
-              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" id="form[applied_for_queen_awards_details][0][category]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -107,7 +107,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][year]"
                 | Year
               span.govuk-error-message
-              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key id="form[applied_for_queen_awards_details][0][year]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year
                 - question.years.each do |year|
@@ -118,7 +118,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][outcome]"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
-              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" id="form[applied_for_queen_awards_details][0][outcome]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Outcome (Won/Did not win)
                 - question.outcomes.each do |outcome|
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
index 01d1831f1c..7f6a8dde1d 100644
--- a/app/views/qae_form/_sub_fields_question.html.slim
+++ b/app/views/qae_form/_sub_fields_question.html.slim
@@ -14,7 +14,14 @@ div role="group" id="#{question.key}"
       span.govuk-error-message
       .clear
 
-      - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
+      - case sub_field_key
+      - when :email
+        - klass = 'large'
+      - when :title
+        - klass = 'tiny'
+      - else
+        - klass = 'govuk-input--width-10'
+
       - klass <<(QAEFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
       input.govuk-input.js-trigger-autosave[
         class=klass

From 4b1ffdc964753dbca7fa58558f1845284db3ef2d Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 28 Jul 2023 10:25:10 +0100
Subject: [PATCH 158/352] Adds custom front end validation errors for po

---
 .../v2024/social_mobility/social_mobility_step1.rb           | 3 ++-
 .../v2024/social_mobility/social_mobility_step2.rb           | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
index f1d2059cdc..9609c325a6 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
@@ -12,8 +12,9 @@ def mobility_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
+          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
index db722a4e0d..0bd7cc83fd 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
@@ -116,7 +116,7 @@ def mobility_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context %(
@@ -154,8 +154,9 @@ def mobility_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
+          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.

From ffe7bdf446c24191d52ec1ce9e9891b65ddfc232 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 28 Jul 2023 10:49:18 +0100
Subject: [PATCH 159/352] Adds custom front end validation errors for IT

---
 .../frontend/form-validation.js.coffee        | 19 +++++++++----------
 .../international_trade_step1.rb              |  3 ++-
 .../international_trade_step2.rb              |  5 +++--
 spec/decorators/form_answer_decorator_spec.rb |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 8026278617..9695846bde 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -144,12 +144,11 @@ window.FormValidation =
     if subquestions.length
       for subquestion in subquestions
         if not @validateSingleQuestion($(subquestion))
-          # @logThis(question, "validateRequiredQuestion", "This field is required")
-          # console.log(subquestion.find("select").val())
+          @logThis(question, "validateRequiredQuestion", "This field is required")
           @addSubfieldError(question, subquestion)
     else
       if not @validateSingleQuestion(question)
-        # @logThis(question, "validateRequiredQuestion", "This field is required")
+        @logThis(question, "validateRequiredQuestion", "This field is required")
         @addQuestionError(question)
 
   addSubfieldError: (question, subquestion) ->
@@ -195,7 +194,7 @@ window.FormValidation =
     matchName = q.data("match")
 
     if q.val() isnt $("input[name='#{matchName}']").val()
-      # @logThis(question, "validateMatchQuestion", "Emails don't match")
+      @logThis(question, "validateMatchQuestion", "Emails don't match")
       @addErrorMessage(question, "Emails don't match")
 
   validateMaxDate: (question) ->
@@ -214,12 +213,12 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not @toDate(questionDate).isValid()
-      # @logThis(question, "validateMaxDate", "Not a valid date")
+      @logThis(question, "validateMaxDate", "Not a valid date")
       @addErrorMessage(question, "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY.")
       return
 
     if diff > 0
-      # @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
+      @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
       @addErrorMessage(question, "Date cannot be after #{expDate}")
 
   validateDynamicMaxDate: (question) ->
@@ -248,12 +247,12 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not @toDate(questionDate).isValid()
-      # @logThis(question, "validateMaxDate", "Not a valid date")
+      @logThis(question, "validateMaxDate", "Not a valid date")
       @addErrorMessage(question, "Not a valid date")
       return
 
     if diff > 0
-      # @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
+      @logThis(question, "validateMaxDate", "Date cannot be after #{expDate}")
       @addErrorMessage(question, "Date cannot be after #{expDate}")
 
   validateMinDate: (question) ->
@@ -271,12 +270,12 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not @toDate(questionDate).isValid()
-      # @logThis(question, "validateMinDate", "Not a valid date")
+      @logThis(question, "validateMinDate", "Not a valid date")
       @addErrorMessage(question, "Not a valid date")
       return
 
     if diff > 0
-      # @logThis(question, "validateMinDate", "Date cannot be before #{expDate}")
+      @logThis(question, "validateMinDate", "Date cannot be before #{expDate}")
       @addErrorMessage(question, "Date cannot be before #{expDate}")
 
   validateBetweenDate: (question) ->
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
index df378d884d..38ee60c300 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
@@ -14,8 +14,9 @@ def trade_step1
           )
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
+          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
index 3a436b64bf..c6945269f1 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
@@ -118,7 +118,7 @@ def trade_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context %(
@@ -156,8 +156,9 @@ def trade_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
+          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/spec/decorators/form_answer_decorator_spec.rb b/spec/decorators/form_answer_decorator_spec.rb
index 599a446b20..af9e0666d7 100644
--- a/spec/decorators/form_answer_decorator_spec.rb
+++ b/spec/decorators/form_answer_decorator_spec.rb
@@ -92,7 +92,7 @@
   describe "#dashboard_status" do
     it "returns fill progress when application is not submitted" do
      form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SICCode.first.code })
-      expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...9%")
+      expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...8%")
     end
 
     it "warns that assessors are not assigned if assessment is in progress and assessors are not assigned yet for admin section" do

From 4a1c22713b431feb5f7befa54e5a7cf65c6d58a7 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 28 Jul 2023 13:49:44 +0100
Subject: [PATCH 160/352] Adds hints for subfield fields

---
 .../award_years/v2024/innovation/innovation_step1.rb     | 2 +-
 .../international_trade/international_trade_step1.rb     | 2 +-
 .../v2024/social_mobility/social_mobility_step1.rb       | 2 +-
 .../sustainable_development_step1.rb                     | 2 +-
 app/forms/qae_form_builder/sub_fields_question.rb        | 2 +-
 app/views/qae_form/_sub_fields_question.html.slim        | 9 +++++++--
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/forms/award_years/v2024/innovation/innovation_step1.rb b/app/forms/award_years/v2024/innovation/innovation_step1.rb
index b9c3a992fa..6e426508d0 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step1.rb
@@ -20,7 +20,7 @@ def innovation_step1
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
index 38ee60c300..1eec16e3c3 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
@@ -22,7 +22,7 @@ def trade_step1
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
index 9609c325a6..835cb18344 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
@@ -20,7 +20,7 @@ def mobility_step1
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
index 114d72cfdc..71da8439aa 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
@@ -21,7 +21,7 @@ def development_step1
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/qae_form_builder/sub_fields_question.rb b/app/forms/qae_form_builder/sub_fields_question.rb
index a79adcc6d4..3b1c6b7f87 100644
--- a/app/forms/qae_form_builder/sub_fields_question.rb
+++ b/app/forms/qae_form_builder/sub_fields_question.rb
@@ -28,7 +28,7 @@ def required_sub_fields
 
     def rendering_sub_fields
       required_sub_fields.map do |f|
-        [f.keys.first, f.values.first]
+        {key: f.keys.first, title: f.values.first, hint: f.try(:[], :hint)}
       end
     end
   end
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
index 7f6a8dde1d..7e08faf020 100644
--- a/app/views/qae_form/_sub_fields_question.html.slim
+++ b/app/views/qae_form/_sub_fields_question.html.slim
@@ -1,7 +1,8 @@
 div role="group" id="#{question.key}"
   - question.rendering_sub_fields.each do |sub_field_block|
-    - sub_field_key = sub_field_block[0]
-    - sub_field_title = sub_field_block[1]
+    - sub_field_key = sub_field_block[:key]
+    - sub_field_title = sub_field_block[:title]
+    - sub_field_hint = sub_field_block[:hint]
 
     .govuk-form-group.question-required
       label.govuk-label for=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key)
@@ -12,6 +13,9 @@ div role="group" id="#{question.key}"
             | Error:
           =< @form_answer.validator_errors[question.hash_key(suffix: sub_field_key)]
       span.govuk-error-message
+      - if sub_field_hint
+        span.govuk-hint
+          = sub_field_hint
       .clear
 
       - case sub_field_key
@@ -23,6 +27,7 @@ div role="group" id="#{question.key}"
         - klass = 'govuk-input--width-10'
 
       - klass <<(QAEFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+ 
       input.govuk-input.js-trigger-autosave[
         class=klass
         type="text"

From 92a545cb21975b19c56aa03df6f5f7abe5e4faf8 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 31 Jul 2023 13:42:49 +0100
Subject: [PATCH 161/352] Update headers in appraisal view

---
 forms/appraisal_form.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/forms/appraisal_form.rb b/forms/appraisal_form.rb
index 1d154c6a64..db13f8a834 100644
--- a/forms/appraisal_form.rb
+++ b/forms/appraisal_form.rb
@@ -111,7 +111,7 @@ class AppraisalForm
   CSR_RAG_OPTIONS_2024 = [
     ["Weak (0-15)", "negative"],
     ["Satisfactory (16-31)", "average"],
-    ["Exceptional (32-50)", "positive"]
+    ["Exceptional (32-40)", "positive"]
   ]
 
   STRENGTH_OPTIONS_2016 = [
@@ -541,7 +541,7 @@ def self.verdict_options_for(object, section)
     },
     corporate_social_responsibility: {
       type: :rag,
-      label: "Corporate social responsibility (section D):",
+      label: "Environmental, social and corporate governance (section E):",
       position: 3
     },
     verdict: {
@@ -788,7 +788,7 @@ def self.verdict_options_for(object, section)
     },
     corporate_social_responsibility: {
       type: :rag,
-      label: "Corporate social responsibility (section D):",
+      label: "Environmental, social and corporate governance (section E):",
       position: 3
     },
     verdict: {
@@ -1620,7 +1620,7 @@ def self.verdict_options_for(object, section)
     },
     corporate_social_responsibility: {
       type: :rag,
-      label: "Corporate social responsibility:",
+      label: "Environmental, social and corporate governance (section E):",
       position: 3
     },
     verdict: {

From ec3347a52f784b8e1b0222ccb50eda0e8e664cbc Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Mon, 31 Jul 2023 15:45:33 +0200
Subject: [PATCH 162/352] non js form step-by-step validation

---
 app/assets/javascripts/frontend/js_detector.js.coffee | 3 +++
 app/controllers/form_controller.rb                    | 6 +++++-
 app/models/form_answer.rb                             | 5 +++--
 app/validators/form_answer_validator.rb               | 5 ++++-
 app/views/qae_form/_step.html.slim                    | 1 +
 5 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 app/assets/javascripts/frontend/js_detector.js.coffee

diff --git a/app/assets/javascripts/frontend/js_detector.js.coffee b/app/assets/javascripts/frontend/js_detector.js.coffee
new file mode 100644
index 0000000000..b7334d196d
--- /dev/null
+++ b/app/assets/javascripts/frontend/js_detector.js.coffee
@@ -0,0 +1,3 @@
+jQuery ->
+  # if the user has javascript enabled, remove non js step value
+  $("#non_js_step_title").val("")
diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index a99fdf1788..38637f991e 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -110,7 +110,11 @@ def edit_form
   end
 
   def save
-    @form_answer.document = prepare_doc if params[:form].present?
+    if params[:form].present?
+      @form_answer.document = prepare_doc
+      @form_answer.current_non_js_step = params[:form][:current_non_js_step].presence
+    end
+
     @form = @form_answer.award_form.decorate(answers: HashWithIndifferentAccess.new(@form_answer.document))
 
     redirected = params[:next_action] == "redirect"
diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
index ad2b218b7c..afe2a88411 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -16,7 +16,7 @@ class FormAnswer < ApplicationRecord
 
   has_paper_trail
 
-  attr_accessor :current_step, :validator_errors, :steps_with_errors
+  attr_accessor :current_step, :validator_errors, :steps_with_errors, :current_non_js_step
 
   pg_search_scope :basic_search,
                   against: [
@@ -550,7 +550,8 @@ def set_user_info
   end
 
   def validate_answers
-    if submitted? && (current_step || (submitted_at_changed? && submitted_at_was.nil?))
+    if current_non_js_step.present? || (submitted? && (current_step || (submitted_at_changed? && submitted_at_was.nil?)))
+
       validator = FormAnswerValidator.new(self)
 
       unless validator.valid?
diff --git a/app/validators/form_answer_validator.rb b/app/validators/form_answer_validator.rb
index dac2d99e6a..ae9ade64a0 100644
--- a/app/validators/form_answer_validator.rb
+++ b/app/validators/form_answer_validator.rb
@@ -16,11 +16,14 @@ def valid?
 
     award_form.steps.each do |step|
       # if form was submitted before
+      # or it's a non-js form
       # we should validate current step
       # else if form was submitted just now
       # we should validate entire form
 
-      if step.title.parameterize == current_step || (form_answer.submitted_at_changed? && form_answer.submitted_at_was.nil?)
+      non_js_save = step.title.parameterize == form_answer.current_non_js_step && form_answer.submitted_at.nil?
+
+      if step.title.parameterize == current_step || non_js_save || (form_answer.submitted_at_changed? && form_answer.submitted_at_was.nil?)
         step.questions.each do |q|
           if (errors = q.validate).any?
             @errors.merge!(errors)
diff --git a/app/views/qae_form/_step.html.slim b/app/views/qae_form/_step.html.slim
index 48a05fc178..e9d2ed81b8 100644
--- a/app/views/qae_form/_step.html.slim
+++ b/app/views/qae_form/_step.html.slim
@@ -7,6 +7,7 @@
       = step.title
     - if step.context
       == step.context
+    input type="hidden" name="form[current_non_js_step]" value="#{step.title.parameterize}" id="non_js_step_title"
     = render partial: "qae_form/question", collection: step.questions, locals: { answers: answers, attachments: attachments }
     - if step.submit
       = render partial: "qae_form/step_submit", object: step.submit, as: 'submit'

From 1a0854f4059faf5cb5af15a0cab5b1729997c209 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 31 Jul 2023 16:32:02 +0100
Subject: [PATCH 163/352] use hide class instead of visuallyhidden

---
 .../frontend/password-strength-indicator.js          | 12 ++++++------
 app/views/admin/admins/_form.html.slim               |  4 ++--
 app/views/admin/assessors/_form.html.slim            |  4 ++--
 app/views/admin/judges/_form.html.slim               |  4 ++--
 app/views/admin/users/_fields_password.html.slim     |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/frontend/password-strength-indicator.js b/app/assets/javascripts/frontend/password-strength-indicator.js
index 0820d7812a..6448b0dfdf 100644
--- a/app/assets/javascripts/frontend/password-strength-indicator.js
+++ b/app/assets/javascripts/frontend/password-strength-indicator.js
@@ -138,7 +138,7 @@ $(function() {
 
         if (someProblem) {
           $('#password-guidance').removeClass("govuk-!-display-none");
-          $('#password-result-span').addClass("visuallyhidden")
+          $('#password-result-span').addClass("hide")
         } else {
           $('#password-guidance').addClass("govuk-!-display-none");
         }
@@ -148,10 +148,10 @@ $(function() {
 
         if ($passwordField.val().length == 0) {
           $passwordField.attr('aria-invalid', "true");
-          $('#password-result-span').addClass("visuallyhidden")
+          $('#password-result-span').addClass("hide")
         } else if ($.inArray('good-password', guidance) >= 0) {
           $passwordField.attr('aria-invalid', "false");
-          $('#password-result-span').removeClass("visuallyhidden")
+          $('#password-result-span').removeClass("hide")
         } else {
           $passwordField.attr('aria-invalid', "true");
         }
@@ -163,16 +163,16 @@ $(function() {
 
         if ($passwordConfirmationField.val().length == 0) {
           $passwordConfirmationField.attr('aria-invalid', "true");
-          $('#password-confirmation-result-span').addClass("visuallyhidden")
+          $('#password-confirmation-result-span').addClass("hide")
         } else if ($.inArray('confirmation-not-matching', guidance) >= 0) {
           $passwordConfirmationField.attr('aria-invalid', "true");
           indicator.parent().removeClass('confirmation-matching');
-          $('#password-confirmation-result-span').addClass("visuallyhidden")
+          $('#password-confirmation-result-span').addClass("hide")
         } else if ($.inArray('confirmation-matching', guidance) >= 0) {
           $passwordConfirmationField.attr('aria-invalid', "false");
           if($.inArray('good-password', guidance) >= 0) {
             indicator.parent().addClass('confirmation-matching');
-            $('#password-confirmation-result-span').removeClass("visuallyhidden")
+            $('#password-confirmation-result-span').removeClass("hide")
           }
         }
       }
diff --git a/app/views/admin/admins/_form.html.slim b/app/views/admin/admins/_form.html.slim
index e0df3f95a7..4e84f3c8f3 100644
--- a/app/views/admin/admins/_form.html.slim
+++ b/app/views/admin/admins/_form.html.slim
@@ -41,7 +41,7 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control', "data-min-password-length" => "10" },
                       label: false
-            span#password-result-span.input-group-addon.visuallyhidden
+            span#password-result-span.input-group-addon.hide
               i#password-result.glyphicon.glyphicon-ok
       .clear
 
@@ -57,7 +57,7 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-confirmation-result-span.input-group-addon.visuallyhidden
+            span#password-confirmation-result-span.input-group-addon.hide
               i#password-confirmation-result.glyphicon.glyphicon-ok
       .clear
 
diff --git a/app/views/admin/assessors/_form.html.slim b/app/views/admin/assessors/_form.html.slim
index 4ac14b5d9e..62a9ab399a 100644
--- a/app/views/admin/assessors/_form.html.slim
+++ b/app/views/admin/assessors/_form.html.slim
@@ -57,7 +57,7 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-result-span.input-group-addon.visuallyhidden
+            span#password-result-span.input-group-addon.hide
               i#password-result.glyphicon.glyphicon-ok
       .clear
 
@@ -73,7 +73,7 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-confirmation-result-span.input-group-addon.visuallyhidden
+            span#password-confirmation-result-span.input-group-addon.hide
               i#password-confirmation-result.glyphicon.glyphicon-ok
       .clear
 
diff --git a/app/views/admin/judges/_form.html.slim b/app/views/admin/judges/_form.html.slim
index d0d6c3cb8c..9f10a57bce 100644
--- a/app/views/admin/judges/_form.html.slim
+++ b/app/views/admin/judges/_form.html.slim
@@ -42,7 +42,7 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-result-span.input-group-addon.visuallyhidden
+            span#password-result-span.input-group-addon.hide
               i#password-result.glyphicon.glyphicon-ok
       .clear
 
@@ -55,7 +55,7 @@
                       wrapper_html: { class: 'form-group' },
                       input_html: { class: 'form-control' },
                       label: false
-            span#password-confirmation-result-span.input-group-addon.visuallyhidden
+            span#password-confirmation-result-span.input-group-addon.hide
               i#password-confirmation-result.glyphicon.glyphicon-ok
       .clear
 
diff --git a/app/views/admin/users/_fields_password.html.slim b/app/views/admin/users/_fields_password.html.slim
index d753cc0941..e9ce0f4213 100644
--- a/app/views/admin/users/_fields_password.html.slim
+++ b/app/views/admin/users/_fields_password.html.slim
@@ -33,7 +33,7 @@
                     wrapper_html: { class: "form-group" },
                     input_html: { class: "form-control password-strength-meter" },
                     label_html: { class: "visuallyhidden" }
-          span#password-result-span.input-group-addon.visuallyhidden
+          span#password-result-span.input-group-addon.hide
             i#password-result.glyphicon.glyphicon-ok
         span.hint = password_hint
 
@@ -49,5 +49,5 @@
                     wrapper_html: { class: "form-group" },
                     input_html: { class: "form-control" },
                     label_html: { class: "visuallyhidden" }
-          span#password-confirmation-result-span.input-group-addon.visuallyhidden
+          span#password-confirmation-result-span.input-group-addon.hide
             i#password-confirmation-result.glyphicon.glyphicon-ok

From 50ec2314c1926f83a4862aaab8ccfe108347ae5d Mon Sep 17 00:00:00 2001
From: Louis Kirkham <65811538+TheDancingClown@users.noreply.github.com>
Date: Mon, 31 Jul 2023 18:14:25 +0100
Subject: [PATCH 164/352] Revert "Adds accessible error messages"

---
 .../frontend/form-validation.js.coffee        | 97 ++++---------------
 .../v2024/innovation/innovation_step1.rb      |  5 +-
 .../v2024/innovation/innovation_step2.rb      |  6 +-
 .../v2024/innovation/innovation_step3.rb      |  2 +-
 .../v2024/innovation/innovation_step4.rb      |  1 -
 .../international_trade_step1.rb              |  5 +-
 .../international_trade_step2.rb              |  5 +-
 .../social_mobility/social_mobility_step1.rb  |  5 +-
 .../social_mobility/social_mobility_step2.rb  |  5 +-
 .../sustainable_development_step1.rb          |  5 +-
 .../sustainable_development_step2.rb          |  5 +-
 app/forms/qae_form_builder.rb                 |  1 -
 .../qae_form_builder/address_question.rb      | 30 +++++-
 .../checkbox_seria_question.rb                | 10 +-
 .../qae_form_builder/confirm_question.rb      | 13 ---
 app/forms/qae_form_builder/date_question.rb   |  6 +-
 ...innovation_financial_year_date_question.rb |  2 +-
 .../multi_question_validator.rb               |  2 +-
 .../qae_form_builder/options_question.rb      | 13 ---
 app/forms/qae_form_builder/question.rb        |  4 +-
 .../sic_code_dropdown_question.rb             | 12 ---
 .../qae_form_builder/sub_fields_question.rb   | 46 ---------
 app/forms/qae_form_builder/year_question.rb   |  7 --
 .../qae_form/_address_question.html.slim      | 36 ++-----
 .../_press_contact_details_question.html.slim | 52 +++++-----
 ...ueen_award_applications_question.html.slim | 12 +--
 .../_queen_award_holder_question.html.slim    |  8 +-
 app/views/qae_form/_question.html.slim        |  8 +-
 .../qae_form/_sub_fields_question.html.slim   | 39 --------
 app/views/qae_form/_text_question.html.slim   | 12 +--
 spec/decorators/form_answer_decorator_spec.rb |  2 +-
 31 files changed, 117 insertions(+), 339 deletions(-)
 delete mode 100644 app/forms/qae_form_builder/sub_fields_question.rb
 delete mode 100644 app/views/qae_form/_sub_fields_question.html.slim

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 9695846bde..973b5ccb8b 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -145,49 +145,11 @@ window.FormValidation =
       for subquestion in subquestions
         if not @validateSingleQuestion($(subquestion))
           @logThis(question, "validateRequiredQuestion", "This field is required")
-          @addSubfieldError(question, subquestion)
+          @addErrorMessage($(subquestion), "This field is required")
     else
       if not @validateSingleQuestion(question)
         @logThis(question, "validateRequiredQuestion", "This field is required")
-        @addQuestionError(question)
-
-  addSubfieldError: (question, subquestion) ->
-    questionRef = question.attr("data-question_ref")
-    input = $(subquestion).find('input,textarea,select').filter(':visible')
-    label = $("label[for='#{input.attr('id')}']").text()
-    incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
-
-    if question.hasClass('date-DDMMYYYY')
-      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format DD/MM/YYYY.")
-    else if question.hasClass('date-MMYYYY')
-      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format MM/YYYY.")
-    else if question.hasClass('date-YYYY')
-      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format YYYY.")
-    else if input.hasClass("autocomplete__input")
-      @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list.")
-    else
-      if question.find(".js-financial-year-latest").length
-        #avoid duplicate errors for financial year questions
-        return
-      else
-        @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
-
-  addQuestionError: (question) ->
-    questionRef = question.attr("data-question_ref")
-    incompleteMessage = "Question #{questionRef} is incomplete. It is required"
-    if @isOptionsQuestion(question)
-      @addErrorMessage(question, "#{incompleteMessage} and an option must be chosen from the following list.")
-    else if @isSelectQuestion(question)
-      @addErrorMessage(question, "#{incompleteMessage} and an option must be selected from the following dropdown list.")
-    else if @isTextishQuestion(question) && !question.hasClass("question-year")
-      @addErrorMessage(question, "#{incompleteMessage} and must be filled in.")
-    else if question.hasClass("question-year")
-      @addErrorMessage(question, "#{incompleteMessage} and must be filled in. Use the format YYYY.")
-    else if @isCheckboxQuestion(question)
-      if question.find("input[type='checkbox']").length > 1
-        @addErrorMessage(question, "#{incompleteMessage} and at least one option must be chosen from the following list.")
-      else
-        @addErrorMessage(question, "#{incompleteMessage} and confirmation must be given by ticking the checkbox.")
+        @addErrorMessage(question, "This field is required")
 
   validateMatchQuestion: (question) ->
     q = question.find(".match")
@@ -199,7 +161,6 @@ window.FormValidation =
 
   validateMaxDate: (question) ->
     val = question.find("input[type='number']").val()
-    questionRef = question.attr("data-question_ref")
 
     questionYear = question.find(".js-date-input-year").val()
     questionMonth = question.find(".js-date-input-month").val()
@@ -214,7 +175,7 @@ window.FormValidation =
 
     if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY.")
+      @addErrorMessage(question, "Not a valid date")
       return
 
     if diff > 0
@@ -330,7 +291,6 @@ window.FormValidation =
       @addErrorMessage(question, "Not a valid number")
 
   validateEmployeeMin: (question) ->
-    questionRef = question.attr("data-question_ref")
     for subquestion in question.find("input")
       shownQuestion = true
       for conditional in $(subquestion).parents('.js-conditional-question')
@@ -339,10 +299,9 @@ window.FormValidation =
 
       if shownQuestion
         subq = $(subquestion)
-        label = $("label[for='#{subq.attr('id')}']").text()
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateEmployeeMin", "This field is required")
-          @appendMessage(subq.closest(".span-financial"), "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
+          @appendMessage(subq.closest(".span-financial"), "This field is required")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -415,7 +374,6 @@ window.FormValidation =
 
   validateCurrentAwards: (question) ->
     $(".govuk-error-message", question).empty()
-    questionRef = question.attr("data-question_ref")
 
     for subquestion in question.find(".list-add li")
       errors = false
@@ -424,7 +382,7 @@ window.FormValidation =
         if !$(input).val()
           fieldName = $(input).data("dependable-option-siffix")
           fieldName = fieldName[0].toUpperCase() + fieldName.slice(1)
-          fieldError = "Question #{questionRef} is incomplete. #{fieldName} is required and an option must be selected from the following list. "
+          fieldError = "#{fieldName} can't be blank. "
           @logThis(question, "validateCurrentAwards", fieldError)
           @appendMessage($(input).closest('.govuk-form-group'), fieldError)
           errors = true
@@ -444,7 +402,6 @@ window.FormValidation =
       subq = $(subquestion)
       qParent = subq.closest(".js-fy-entries")
       errContainer = subq.closest(".span-financial")
-      questionRef = question.attr("data-question_ref")
 
       shownQuestion = true
       for conditional in $(subquestion).parents('.js-conditional-question')
@@ -456,8 +413,7 @@ window.FormValidation =
 
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateMoneyByYears", "This field is required")
-          label = $("label[for='#{subq.attr('id')}']").text()
-          @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
+          @appendMessage(errContainer, "This field is required")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -492,54 +448,41 @@ window.FormValidation =
     if !conditional
       return
     # end of conditional validation
-    questionRef = question.attr("data-question_ref")
 
     for subquestionBlock in question.find(".by-years-wrapper.show-question .govuk-date-input")
       subq = $(subquestionBlock)
       qParent = subq.closest(".js-fy-entries")
-      label = qParent.find(".js-year-default").text()
       errorsContainer = qParent.find(".govuk-error-message").html()
 
       day = subq.find("input.js-fy-day").val()
       month = subq.find("input.js-fy-month").val()
       year = subq.find("input.js-fy-year").val()
 
-      if question.hasClass("question-required") && errorsContainer.length < 1
-        if (not day and not month and not year)
+      if (not day or not month or not year)
+        if question.hasClass("question-required") && errorsContainer.length < 1
           @logThis(question, "validateDateByYears", "This field is required")
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Use the format DD/MM/YYYY.")
+          @appendMessage(qParent, "This field is required")
           @addErrorClass(question)
-        else if (not day)
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} day is required and must be filled in. Use the format DD.")
-        else if (not month)
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} month is required and must be filled in. Use the format MM.")
-        else if (not year)
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} year is required and must be filled in. Use the format YYYY.")
-        else
-          complexDateString = day + "/" + month + "/" + year
-          date = @toDate(complexDateString)
+      else
+        complexDateString = day + "/" + month + "/" + year
+        date = @toDate(complexDateString)
 
-          if not date.isValid()
-            @logThis(question, "validateDateByYears", "Not a valid date")
-            @appendMessage(qParent, "Not a valid date")
-            @addErrorClass(question)
+        if not date.isValid()
+          @logThis(question, "validateDateByYears", "Not a valid date")
+          @appendMessage(qParent, "Not a valid date")
+          @addErrorClass(question)
 
   validateInnovationFinancialDate: (question) ->
+
     val = question.find("input[type='number']").val()
-    questionRef = question.attr("data-question_ref")
+
     questionDay = parseInt(question.find(".innovation-day").val())
     questionMonth = parseInt(question.find(".innovation-month").val())
     questionDate = "#{questionDay}/#{questionMonth}/#{moment().format('Y')}"
 
-    if (not questionDay and not questionMonth)
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. Year-end is required and must be filled in. Use the format DD/MM.")
-    else if not questionDay
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. Day is required and must be filled in. Use the format DD/MM.")
-    else if not questionMonth
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. Month is required and must be filled in. Use the format DD/MM.")
-    else if not @toDate(questionDate).isValid()
+    if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM.")
+      @addErrorMessage(question, "Not a valid date")
       return
 
   validateDiffBetweenDates: (question) ->
diff --git a/app/forms/award_years/v2024/innovation/innovation_step1.rb b/app/forms/award_years/v2024/innovation/innovation_step1.rb
index 6e426508d0..fb9c20f019 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step1.rb
@@ -12,15 +12,14 @@ def innovation_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        sub_fields :head_of_business, "Details of the head of your organisation" do
-          required
+        head_of_business :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
+            { honours: "Personal Honours (optional)" },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/innovation/innovation_step2.rb b/app/forms/award_years/v2024/innovation/innovation_step2.rb
index 4405f6a87b..18399588dd 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step2.rb
@@ -115,7 +115,7 @@ def innovation_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading date-DDMMYYYY"
+          classes "js-started-trading"
           required
           ref "B 5"
           context -> do
@@ -156,8 +156,7 @@ def innovation_step2
           style "small"
         end
 
-        sub_fields :press_contact_details, "Contact details for press enquiries." do
-          required
+        press_contact_details :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
           context %(
             <p class='govuk-hint'><em>
@@ -279,7 +278,6 @@ def innovation_step2
         queen_award_applications :applied_for_queen_awards_details, " List the Queen's/King's awards you have applied for in the last 10 years." do
           classes "sub-question question-current-awards"
           sub_ref "B 12.1"
-          required
 
           conditional :applied_for_queen_awards, :yes
 
diff --git a/app/forms/award_years/v2024/innovation/innovation_step3.rb b/app/forms/award_years/v2024/innovation/innovation_step3.rb
index e5de6a9086..0329a8b673 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step3.rb
@@ -284,7 +284,7 @@ def innovation_step3
 
         date :innovation_was_launched_in_the_market, "Select the date when your innovation was launched in the market." do
           sub_section :innovation_timeline_header
-          classes "sub-question date-DDMMYYYY"
+          classes "sub-question"
           sub_ref "C 2.2"
           required
           context -> do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index f3086bafb3..3245beda7e 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -481,7 +481,6 @@ def innovation_step4
         end
 
         options :product_estimated_figures, "Are any of the figures used on this page estimates?" do
-          required
           ref "D 9"
           yes_no
           context %(
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
index 1eec16e3c3..df378d884d 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
@@ -14,15 +14,14 @@ def trade_step1
           )
         end
 
-        sub_fields :head_of_business, "Details of the head of your organisation" do
+        head_of_business :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
-          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
+            { honours: "Personal Honours (optional)" },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
index c6945269f1..3a436b64bf 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
@@ -118,7 +118,7 @@ def trade_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading date-DDMMYYYY"
+          classes "js-started-trading"
           required
           ref "B 5"
           context %(
@@ -156,9 +156,8 @@ def trade_step2
           style "small"
         end
 
-        sub_fields :press_contact_details, "Contact details for press enquiries." do
+        press_contact_details :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
-          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
index 835cb18344..f1d2059cdc 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
@@ -12,15 +12,14 @@ def mobility_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        sub_fields :head_of_business, "Details of the head of your organisation" do
+        head_of_business :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
-          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
+            { honours: "Personal Honours (optional)" },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
index 0bd7cc83fd..db722a4e0d 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
@@ -116,7 +116,7 @@ def mobility_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading date-DDMMYYYY"
+          classes "js-started-trading"
           required
           ref "B 5"
           context %(
@@ -154,9 +154,8 @@ def mobility_step2
           style "small"
         end
 
-        sub_fields :press_contact_details, "Contact details for press enquiries." do
+        press_contact_details :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
-          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
index 71da8439aa..5139046680 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
@@ -13,15 +13,14 @@ def development_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        sub_fields :head_of_business, "Details of the head of your organisation" do
+        head_of_business :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
-          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
+            { honours: "Personal Honours (optional)" },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
index 41d85e431f..95f31abe63 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
@@ -116,7 +116,7 @@ def development_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading date-DDMMYYYY"
+          classes "js-started-trading"
           required
           ref "B 5"
           context %(
@@ -154,9 +154,8 @@ def development_step2
           style "small"
         end
 
-        sub_fields :press_contact_details, "Contact details for press enquiries." do
+        press_contact_details :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
-          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/forms/qae_form_builder.rb b/app/forms/qae_form_builder.rb
index 3c5474fc94..3bfdb4b018 100644
--- a/app/forms/qae_form_builder.rb
+++ b/app/forms/qae_form_builder.rb
@@ -28,7 +28,6 @@
 require "qae_form_builder/position_details_question"
 require "qae_form_builder/previous_name_question"
 require "qae_form_builder/country_question"
-require "qae_form_builder/sub_fields_question"
 require "qae_form_builder/address_question"
 require "qae_form_builder/head_of_business_question"
 require "qae_form_builder/press_contact_details_question"
diff --git a/app/forms/qae_form_builder/address_question.rb b/app/forms/qae_form_builder/address_question.rb
index cab52cc487..71162b0b38 100644
--- a/app/forms/qae_form_builder/address_question.rb
+++ b/app/forms/qae_form_builder/address_question.rb
@@ -1,9 +1,27 @@
 class QAEFormBuilder
-  class AddressQuestionValidator < SubFieldsQuestionValidator
+  class AddressQuestionValidator < QuestionValidator
     NO_VALIDATION_SUB_FIELDS = [:street, :county]
+    def errors
+      result = super
+
+      if question.required?
+        question.required_sub_fields.each do |sub_field|
+          suffix = sub_field.keys[0]
+          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
+            result[question.hash_key(suffix: suffix)] ||= ""
+            result[question.hash_key(suffix: suffix)] << " Can't be blank."
+          end
+        end
+      end
+
+      # need to add govuk-form-group--errors class
+      result[question.hash_key] ||= "" if result.any?
+
+      result
+    end
   end
 
-  class AddressQuestionDecorator < SubFieldsQuestionDecorator
+  class AddressQuestionDecorator < QuestionDecorator
     include RegionHelper
 
     def required_sub_fields
@@ -32,11 +50,15 @@ def rendering_sub_fields
     end
   end
 
-  class AddressQuestionBuilder < SubFieldsQuestionBuilder
+  class AddressQuestionBuilder < QuestionBuilder
     def countries(countries)
       @q.countries = countries
     end
 
+    def sub_fields(fields)
+      @q.sub_fields = fields
+    end
+
     def region_context(region_context)
       @q.region_context = region_context
     end
@@ -46,7 +68,7 @@ def county_context(county_context)
     end
   end
 
-  class AddressQuestion < SubFieldsQuestion
+  class AddressQuestion < Question
     attr_accessor :countries, :sub_fields, :region_context, :county_context
   end
 end
diff --git a/app/forms/qae_form_builder/checkbox_seria_question.rb b/app/forms/qae_form_builder/checkbox_seria_question.rb
index c43a438565..05ce55ca17 100644
--- a/app/forms/qae_form_builder/checkbox_seria_question.rb
+++ b/app/forms/qae_form_builder/checkbox_seria_question.rb
@@ -1,15 +1,7 @@
 class QAEFormBuilder
   class CheckboxSeriaQuestionValidator < QuestionValidator
     def errors
-      result = {}
-
-      return {} if skip_base_validation?
-
-      if question.required?
-        if !question.input_value.present?
-          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and at least one option must be chosen from the following list."
-        end
-      end
+      result = super
 
       if question.input_value && question.selection_limit
         if question.input_value.size > question.selection_limit
diff --git a/app/forms/qae_form_builder/confirm_question.rb b/app/forms/qae_form_builder/confirm_question.rb
index 1417657ca4..7f87e11f06 100644
--- a/app/forms/qae_form_builder/confirm_question.rb
+++ b/app/forms/qae_form_builder/confirm_question.rb
@@ -1,18 +1,5 @@
 class QAEFormBuilder
   class ConfirmQuestionValidator < QuestionValidator
-    def errors
-      result = {}
-
-      return {} if skip_base_validation?
-
-      if question.required?
-        if !question.input_value.present?
-          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and confirmation must be given by ticking the checkbox."
-        end
-      end
-
-      result
-    end
   end
 
   class ConfirmQuestionBuilder < QuestionBuilder
diff --git a/app/forms/qae_form_builder/date_question.rb b/app/forms/qae_form_builder/date_question.rb
index b0a56ca7bb..f32058be0d 100644
--- a/app/forms/qae_form_builder/date_question.rb
+++ b/app/forms/qae_form_builder/date_question.rb
@@ -16,17 +16,17 @@ def errors
       if !date
         if question.required?
           result[question.hash_key] ||= ""
-          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. It requires a date in the format DD/MM/YYYY."
+          result[question.hash_key] << " Invalid date."
         end
       else
         if date_min && date < date_min
           result[question.hash_key] ||= ""
-          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be after #{date_min.strftime('%d/%m/%Y')}."
+          result[question.hash_key] << " Date should be greater than #{date_min.strftime('%d/%m/%Y')}."
         end
 
         if date_max && date > date_max
           result[question.hash_key] ||= ""
-          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be before #{date_max.strftime('%d/%m/%Y')}."
+          result[question.hash_key] << " Date should be less than #{date_max.strftime('%d/%m/%Y')}."
         end
       end
 
diff --git a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
index 698f370cd5..7c8ba036c1 100644
--- a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
+++ b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
@@ -14,7 +14,7 @@ def errors
 
       if !date && question.required?
         result[question.hash_key] ||= ""
-        result[question.hash_key] << "#{question.ref || question.sub_ref} is incomplete. Year-end is required. Use the format MM/YYYY"
+        result[question.hash_key] << " Invalid date."
       end
 
       result
diff --git a/app/forms/qae_form_builder/multi_question_validator.rb b/app/forms/qae_form_builder/multi_question_validator.rb
index 695da61256..f0e59d9fd2 100644
--- a/app/forms/qae_form_builder/multi_question_validator.rb
+++ b/app/forms/qae_form_builder/multi_question_validator.rb
@@ -7,7 +7,7 @@ def errors
         if !entity[attr].present?
           result[question.key] ||= {}
           result[question.key][index] ||= ""
-          result[question.key][index] << "Question #{question.ref || question.sub_ref} is incomplete. #{attr.humanize} can't be blank."
+          result[question.key][index] << " #{attr.humanize.capitalize} can't be blank."
         end
       end
     end
diff --git a/app/forms/qae_form_builder/options_question.rb b/app/forms/qae_form_builder/options_question.rb
index 7ad8b4634e..d3f4354923 100644
--- a/app/forms/qae_form_builder/options_question.rb
+++ b/app/forms/qae_form_builder/options_question.rb
@@ -1,18 +1,5 @@
 class QAEFormBuilder
   class OptionsQuestionValidator < QuestionValidator
-    def errors
-      result = {}
-
-      return {} if skip_base_validation?
-
-      if question.required?
-        if !question.input_value.present?
-          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and an option must be chosen from the following list."
-        end
-      end
-
-      result
-    end
   end
 
   QuestionAnswerOption = Struct.new(:value, :text)
diff --git a/app/forms/qae_form_builder/question.rb b/app/forms/qae_form_builder/question.rb
index 0bff6308d6..d28342944a 100644
--- a/app/forms/qae_form_builder/question.rb
+++ b/app/forms/qae_form_builder/question.rb
@@ -3,7 +3,6 @@ class QuestionValidator
     # multifield questions that can not be simply validated
     SKIP_PRESENCE_VALIDATION_QUESTIONS = [
       "DateQuestion",
-      "SubFieldsQuestion",
       "AddressQuestion",
       "InnovationFinancialYearDateQuestion",
       "ByYearsQuestion",
@@ -33,7 +32,7 @@ def errors
 
       if question.required?
         if !question.input_value.present?
-          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and must be filled in."
+          result[question.hash_key] = "Can't be blank."
         end
       end
 
@@ -128,7 +127,6 @@ def label_as_legend?
         "by_years_label_question",
         "matrix_question",
         "press_contact_details_question",
-        "sub_fields_question",
         "upload_question"
       ]
 
diff --git a/app/forms/qae_form_builder/sic_code_dropdown_question.rb b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
index e054e0e1a4..e6824aab42 100644
--- a/app/forms/qae_form_builder/sic_code_dropdown_question.rb
+++ b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
@@ -1,17 +1,5 @@
 class QAEFormBuilder
   class SicCodeDropdownQuestionValidator < QuestionValidator
-    def errors
-      result = super
-
-      if question.required?
-        if !question.input_value.present?
-          result[question.hash_key] ||= ""
-          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and an option must be selected from the following dropdown list."
-        end
-      end
-
-      result
-    end
   end
 
   class SicCodeDropdownQuestionBuilder < DropdownQuestionBuilder
diff --git a/app/forms/qae_form_builder/sub_fields_question.rb b/app/forms/qae_form_builder/sub_fields_question.rb
deleted file mode 100644
index 3b1c6b7f87..0000000000
--- a/app/forms/qae_form_builder/sub_fields_question.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-class QAEFormBuilder
-  class SubFieldsQuestionValidator < QuestionValidator
-    NO_VALIDATION_SUB_FIELDS = [:honours]
-    def errors
-      result = super
-
-      if question.required?
-        question.required_sub_fields.each do |sub_field|
-          suffix = sub_field.keys[0]
-          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
-            result[question.hash_key(suffix: suffix)] ||= ""
-            result[question.hash_key(suffix: suffix)] << "Question #{question.ref || question.sub_ref} is incomplete. #{suffix.to_s.humanize} is required and and must be filled in."
-          end
-        end
-      end
-
-      # need to add govuk-form-group--errors class
-      result[question.hash_key] ||= "" if result.any?
-
-      result
-    end
-  end
-
-  class SubFieldsQuestionDecorator < QuestionDecorator
-    def required_sub_fields
-      sub_fields
-    end
-
-    def rendering_sub_fields
-      required_sub_fields.map do |f|
-        {key: f.keys.first, title: f.values.first, hint: f.try(:[], :hint)}
-      end
-    end
-  end
-
-  class SubFieldsQuestionBuilder < QuestionBuilder
-    def sub_fields fields
-      @q.sub_fields = fields
-    end
-  end
-
-  class SubFieldsQuestion < Question
-    attr_accessor :sub_fields
-  end
-
-end
diff --git a/app/forms/qae_form_builder/year_question.rb b/app/forms/qae_form_builder/year_question.rb
index 4b3ad4c108..b191777163 100644
--- a/app/forms/qae_form_builder/year_question.rb
+++ b/app/forms/qae_form_builder/year_question.rb
@@ -3,13 +3,6 @@ class YearQuestionValidator < QuestionValidator
     def errors
       result = super
 
-      if question.required?
-        if !question.input_value.present?
-          result[question.hash_key] ||= ""
-          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and must be filled in. Use the format YYYY."
-        end
-      end
-
       year = question.input_value.to_i
 
       if year < question.min || year > question.max
diff --git a/app/views/qae_form/_address_question.html.slim b/app/views/qae_form/_address_question.html.slim
index 711cdb6dc2..3044f08677 100644
--- a/app/views/qae_form/_address_question.html.slim
+++ b/app/views/qae_form/_address_question.html.slim
@@ -14,15 +14,7 @@ div role="group" id="q_#{question.key}"
               | Error:
             = @form_answer.validator_errors[question.hash_key(suffix: "building")]
         span.govuk-error-message
-        input.govuk-input.govuk-input--width-10.js-trigger-autosave.required[
-          type="text"
-          name=question.input_name(suffix: 'building')
-          value=question.input_value(suffix: 'building')
-          autocomplete="off"
-          id="q_#{question.key}_line_1" *possible_read_only_ops
-          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_building" : nil )
-        ]
-
+        input.govuk-input.govuk-input--width-10.js-trigger-autosave.required type="text" name=question.input_name(suffix: 'building') value=question.input_value(suffix: 'building') autocomplete="off"  id="q_#{question.key}_line_1" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_building" : nil )
       .govuk-form-group.question-required
         label.govuk-label for="q_#{question.key}_line_2"
           ' Street
@@ -32,20 +24,12 @@ div role="group" id="q_#{question.key}"
               | Error:
             = @form_answer.validator_errors[question.hash_key(suffix: "street")]
         span.govuk-error-message
-        input.govuk-input.govuk-input--width-10.js-trigger-autosave[
-          type="text"
-          name=question.input_name(suffix: 'street')
-          value=question.input_value(suffix: 'street')
-          autocomplete="off"
-          id="q_#{question.key}_line_2" *possible_read_only_ops
-          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_street" : nil )
-        ]
-
+        input.govuk-input.govuk-input--width-10.js-trigger-autosave type="text" name=question.input_name(suffix: 'street') value=question.input_value(suffix: 'street') autocomplete="off" id="q_#{question.key}_line_2" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_street" : nil )
     - when :country
       .govuk-form-group.question-required
         label.govuk-label for="#{question.key}_country"
           ' Country
-        = country_select(question.step.form.form_name, "#{question.key}_country", { priority_countries: ["GB", "US"], selected: question.input_value(suffix: 'country') }, possible_read_only_ops.merge({ name: question.input_name(suffix: 'country'), class: 'js-trigger-autosave required custom-select govuk-!-width-one-half', aria: {describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_country" : nil )}, data: {subfield: "Country"}}))
+        = country_select(question.step.form.form_name, "#{question.key}_country", {priority_countries: ["GB", "US"], selected: question.input_value(suffix: 'country')}, possible_read_only_ops.merge({name: question.input_name(suffix: 'country'), class: 'js-trigger-autosave required custom-select govuk-!-width-one-half', aria: {describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_country" : nil )}}))
         - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
           span.govuk-error-message
             span.govuk-visually-hidden
@@ -56,7 +40,7 @@ div role="group" id="q_#{question.key}"
 
     - when :county
       .govuk-form-group.question-required
-        label.govuk-label id="#{question.key}_region_label" for="form_#{question.key}_#{sub_field_key}" aria-describedby="#{question.key}_county_hint"
+        label.govuk-label id="#{question.key}_region_label" for="#{question.key}_county" aria-describedby="#{question.key}_county_hint"
           ' County
         - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
           span.govuk-error-message
@@ -70,7 +54,7 @@ div role="group" id="q_#{question.key}"
           .question-context[id="#{question.key}_county_hint"]
             == question.county_context
 
-        = select_tag(question.input_name(suffix: sub_field_key), options_for_select(question.counties, question.input_value(suffix: "county")), possible_read_only_ops.merge({ name: question.input_name(suffix: 'county'), class: "js-trigger-autosave required custom-select govuk-!-width-one-third", include_blank: true, aria: { label: "Select #{question.key}", describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_county" : nil )}}))
+        = select_tag("#{question.key}_county", options_for_select(question.counties, question.input_value(suffix: "county")), possible_read_only_ops.merge({name: question.input_name(suffix: 'county'), class: "js-trigger-autosave required custom-select govuk-!-width-one-third", include_blank: true, aria: { label: "Select #{question.key}", describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_county" : nil )}}))
 
     - else
       .govuk-form-group.question-required
@@ -86,12 +70,4 @@ div role="group" id="q_#{question.key}"
 
         - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
         - klass <<(QAEFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
-        input.govuk-input.js-trigger-autosave[
-          class=klass
-          type="text"
-          id=question.input_name(suffix: sub_field_key)
-          value=question.input_value(suffix: sub_field_key)
-          name=question.input_name(suffix: sub_field_key)
-          autocomplete="off" *possible_read_only_ops
-          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
-        ]
+        input.govuk-input.js-trigger-autosave class=klass type="text" id=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key) name=question.input_name(suffix: sub_field_key) autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
diff --git a/app/views/qae_form/_press_contact_details_question.html.slim b/app/views/qae_form/_press_contact_details_question.html.slim
index 995857a632..335faf4efc 100644
--- a/app/views/qae_form/_press_contact_details_question.html.slim
+++ b/app/views/qae_form/_press_contact_details_question.html.slim
@@ -1,27 +1,25 @@
-.govuk-form-group
-  div role="group" id="#{question.key}"
-    .question-block.question-required
-      label.govuk-label for=question.input_name(suffix:'title')
-        ' Title
-      span.govuk-error-message
-      input.js-trigger-autosave.govuk-input.tiny type="text" name=question.input_name(suffix: 'title') value=question.input_value(suffix: 'title') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'title')
-    .question-block.question-required
-      label.govuk-label for=question.input_name(suffix:'first_name')
-        ' First name
-      span.govuk-error-message
-      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'first_name') value=question.input_value(suffix: 'first_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'first_name')
-    .question-block.question-required
-      label.govuk-label for=question.input_name(suffix:'last_name')
-        ' Last name
-      span.govuk-error-message
-      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'last_name') value=question.input_value(suffix: 'last_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'last_name')
-    .question-block.question-required
-      label.govuk-label for=question.input_name(suffix:'telephone')
-        ' Telephone
-      span.govuk-error-message
-      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="tel" pattern="[0-9]*" name=question.input_name(suffix: 'telephone') value=question.input_value(suffix: 'telephone') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'telephone')
-    .question-block.question-required
-      label.govuk-label for=question.input_name(suffix:'email')
-        ' Email address
-      span.govuk-error-message
-      input.js-trigger-autosave.govuk-input.large type="email" name=question.input_name(suffix: 'email') value=question.input_value(suffix: 'email') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'email')
+.govuk-form-group.question-block.question-required
+  label.govuk-label for=question.input_name(suffix:'title')
+    ' Title
+  span.govuk-error-message
+  input.js-trigger-autosave.govuk-input.tiny type="text" name=question.input_name(suffix: 'title') value=question.input_value(suffix: 'title') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'title')
+.govuk-form-group.question-block.question-required
+  label.govuk-label for=question.input_name(suffix:'first_name')
+    ' First name
+  span.govuk-error-message
+  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'first_name') value=question.input_value(suffix: 'first_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'first_name')
+.govuk-form-group.question-block.question-required
+  label.govuk-label for=question.input_name(suffix:'last_name')
+    ' Last name
+  span.govuk-error-message
+  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'last_name') value=question.input_value(suffix: 'last_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'last_name')
+.govuk-form-group.question-block.question-required
+  label.govuk-label for=question.input_name(suffix:'telephone')
+    ' Telephone
+  span.govuk-error-message
+  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="tel" pattern="[0-9]*" name=question.input_name(suffix: 'telephone') value=question.input_value(suffix: 'telephone') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'telephone')
+.govuk-form-group.question-block.question-required
+  label.govuk-label for=question.input_name(suffix:'email')
+    ' Email address
+  span.govuk-error-message
+  input.js-trigger-autosave.govuk-input.large type="email" name=question.input_name(suffix: 'email') value=question.input_value(suffix: 'email') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'email')
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index c6722ccf2b..dbc8837bbe 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -41,7 +41,7 @@ div role="group" id="q_#{question.key}"
                 | Category
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" data-input-value="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][category]"
+                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" data-input-value="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][category]"
                   option value=""
                     ' Category
                   - question.categories.each do |category|
@@ -57,7 +57,7 @@ div role="group" id="q_#{question.key}"
                 | Year
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][year]" data-dependable-option-siffix="year" data-input-value="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][year]"
+                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][year]" data-dependable-option-siffix="year" data-input-value="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][year]"
                   option value=""
                     ' Year
                   - question.years.each do |year|
@@ -73,7 +73,7 @@ div role="group" id="q_#{question.key}"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" data-input-value="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][outcome]"
+                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" data-input-value="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][outcome]"
                   option value=""
                     ' Outcome (Won/Did not win)
                   - question.outcomes.each do |outcome|
@@ -96,7 +96,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][category]"
                 | Category
               span.govuk-error-message
-              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" id="form[applied_for_queen_awards_details][0][category]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -107,7 +107,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][year]"
                 | Year
               span.govuk-error-message
-              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key id="form[applied_for_queen_awards_details][0][year]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year
                 - question.years.each do |year|
@@ -118,7 +118,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][outcome]"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
-              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" id="form[applied_for_queen_awards_details][0][outcome]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Outcome (Won/Did not win)
                 - question.outcomes.each do |outcome|
diff --git a/app/views/qae_form/_queen_award_holder_question.html.slim b/app/views/qae_form/_queen_award_holder_question.html.slim
index 99181bfc39..608224502e 100644
--- a/app/views/qae_form/_queen_award_holder_question.html.slim
+++ b/app/views/qae_form/_queen_award_holder_question.html.slim
@@ -38,7 +38,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
               label.govuk-form-label for="form[queen_award_holder_details][#{index}][category]"
                 | Category
               div.if-no-js-hide
-                select.inline.custom-select.govuk-select.js-trigger-autosave name="form[queen_award_holder_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+                select.inline.govuk-select.js-trigger-autosave name="form[queen_award_holder_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                   option value=""
                     ' Category
                   - question.categories.each do |category|
@@ -52,7 +52,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
               label.govuk-form-label name="form[queen_award_holder_details][#{index}][year]"
                 | Year Awarded
               span.if-no-js-hide
-                select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][#{index}][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+                select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][#{index}][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                   option value=""
                     ' Year Awarded
                   - question.years.each do |year|
@@ -72,7 +72,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
             .govuk-form-group
               label for="form[queen_award_holder_details][0][category]"
                 | Category
-              select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -83,7 +83,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
             .govuk-form-group
               label for="form[queen_award_holder_details][0][year]"
                 | Year Awarded
-              select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year Awarded
                 - question.years.each do |year|
diff --git a/app/views/qae_form/_question.html.slim b/app/views/qae_form/_question.html.slim
index 15bb9cea1c..4ac4188f28 100644
--- a/app/views/qae_form/_question.html.slim
+++ b/app/views/qae_form/_question.html.slim
@@ -1,5 +1,3 @@
-- ref = question.ref ? question.ref : question.sub_ref
-
 - if question.header
   h2.govuk-heading-l
     = question.header
@@ -9,9 +7,10 @@
   .govuk-form-group
     == question.context
 - elsif question.label_as_legend?
-  fieldset class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
+  fieldset class=question.fieldset_classes data=question.fieldset_data_hash
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
+        - ref = question.ref ? question.ref : question.sub_ref
         - if question.title != "" || question.show_ref_always.present?
           legend.govuk-fieldset__legend aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref
@@ -74,9 +73,10 @@
           = render "qae_form/conditional_hints/list", question: question
 
 - else
-  div class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
+  div class=question.fieldset_classes data=question.fieldset_data_hash
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
+        - ref = question.ref ? question.ref : question.sub_ref
         - if question.title != "" || question.show_ref_always.present?
           label.govuk-label for="q_#{question.key}" id="q_#{question.key}_label" aria-label="#{ref.to_s.gsub(' ', '-')}: #{question.title}" aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
deleted file mode 100644
index 7e08faf020..0000000000
--- a/app/views/qae_form/_sub_fields_question.html.slim
+++ /dev/null
@@ -1,39 +0,0 @@
-div role="group" id="#{question.key}"
-  - question.rendering_sub_fields.each do |sub_field_block|
-    - sub_field_key = sub_field_block[:key]
-    - sub_field_title = sub_field_block[:title]
-    - sub_field_hint = sub_field_block[:hint]
-
-    .govuk-form-group.question-required
-      label.govuk-label for=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key)
-        = sub_field_title
-      - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
-        span.govuk-error-message
-          span.govuk-visually-hidden
-            | Error:
-          =< @form_answer.validator_errors[question.hash_key(suffix: sub_field_key)]
-      span.govuk-error-message
-      - if sub_field_hint
-        span.govuk-hint
-          = sub_field_hint
-      .clear
-
-      - case sub_field_key
-      - when :email
-        - klass = 'large'
-      - when :title
-        - klass = 'tiny'
-      - else
-        - klass = 'govuk-input--width-10'
-
-      - klass <<(QAEFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
- 
-      input.govuk-input.js-trigger-autosave[
-        class=klass
-        type="text"
-        id=question.input_name(suffix: sub_field_key)
-        value=question.input_value(suffix: sub_field_key)
-        name=question.input_name(suffix: sub_field_key)
-        autocomplete="off" *possible_read_only_ops
-        aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
-      ]
diff --git a/app/views/qae_form/_text_question.html.slim b/app/views/qae_form/_text_question.html.slim
index 56bdaa66e5..6b733cf49e 100644
--- a/app/views/qae_form/_text_question.html.slim
+++ b/app/views/qae_form/_text_question.html.slim
@@ -1,11 +1 @@
-input[
-  class="govuk-input js-trigger-autosave
-  #{question.style.present? ? question.style : 'govuk-input--width-10'}"
-  type="#{question.type.present? ? question.type.to_s : 'text'}"
-  pattern="#{'[0-9]*' if question.type == 'tel' || question.type == 'number'}"
-  name=question.input_name
-  value=question.input_value
-  autocomplete="off"
-  id="q_#{question.key}"*possible_read_only_ops
-  aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
-]
+input class="govuk-input js-trigger-autosave #{question.style.present? ? question.style : 'govuk-input--width-10'}" type="#{question.type.present? ? question.type.to_s : 'text'}" pattern="#{'[0-9]*' if question.type == 'tel' || question.type == 'number'}" name=question.input_name value=question.input_value autocomplete="off" id="q_#{question.key}" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
diff --git a/spec/decorators/form_answer_decorator_spec.rb b/spec/decorators/form_answer_decorator_spec.rb
index af9e0666d7..599a446b20 100644
--- a/spec/decorators/form_answer_decorator_spec.rb
+++ b/spec/decorators/form_answer_decorator_spec.rb
@@ -92,7 +92,7 @@
   describe "#dashboard_status" do
     it "returns fill progress when application is not submitted" do
      form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SICCode.first.code })
-      expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...8%")
+      expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...9%")
     end
 
     it "warns that assessors are not assigned if assessment is in progress and assessors are not assigned yet for admin section" do

From 968a17a8459b3fdc911b8fca4cba9a6169ab3403 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 31 Jul 2023 16:27:29 +0100
Subject: [PATCH 165/352] adds download csv button for non-js admin reports

---
 .../admin/dashboard_reports_controller.rb     | 54 +++++++++++--------
 .../reports/dashboard/applications_report.rb  | 29 ++++++++++
 app/models/reports/dashboard/users_report.rb  | 26 +++++++++
 .../dashboard/_applications_report.html.slim  |  3 +-
 .../admin/dashboard/totals_by_day.html.slim   | 20 +++++--
 .../totals_by_day/_registrations.html.slim    |  4 +-
 .../admin/dashboard/totals_by_month.html.slim | 20 +++++--
 .../totals_by_month/_registrations.html.slim  |  2 +
 .../admin/dashboard/totals_by_week.html.slim  | 20 +++++--
 .../totals_by_week/_registrations.html.slim   |  4 +-
 10 files changed, 143 insertions(+), 39 deletions(-)

diff --git a/app/controllers/admin/dashboard_reports_controller.rb b/app/controllers/admin/dashboard_reports_controller.rb
index 432a3fcf0a..8e0133b1d2 100644
--- a/app/controllers/admin/dashboard_reports_controller.rb
+++ b/app/controllers/admin/dashboard_reports_controller.rb
@@ -10,44 +10,56 @@ class Admin::DashboardReportsController < Admin::BaseController
   # that represents the type of the application
 
   def all_applications
-    authorize :dashboard, :reports?
-
-    @report = Reports::Dashboard::ApplicationsReport.new(kind: params[:kind])
-    render partial: "admin/dashboard/totals_#{params[:kind]}/table_body"
+    render_or_download_report nil, params[:kind], params[:format]
   end
 
   def international_trade
-    authorize :dashboard, :reports?
-
-    @report = Reports::Dashboard::ApplicationsReport.new(kind: params[:kind], award_type: :trade)
-    render partial: "admin/dashboard/totals_#{params[:kind]}/table_body"
+    render_or_download_report :trade, params[:kind], params[:format]
   end
 
   def innovation
-    authorize :dashboard, :reports?
-
-    @report = Reports::Dashboard::ApplicationsReport.new(kind: params[:kind], award_type: :innovation)
-    render partial: "admin/dashboard/totals_#{params[:kind]}/table_body"
+    render_or_download_report :innovation, params[:kind], params[:format]
   end
 
   def social_mobility
-    authorize :dashboard, :reports?
-
-    @report = Reports::Dashboard::ApplicationsReport.new(kind: params[:kind], award_type: :mobility)
-    render partial: "admin/dashboard/totals_#{params[:kind]}/table_body"
+    render_or_download_report :mobility, params[:kind], params[:format]
   end
 
   def sustainable_development
-    authorize :dashboard, :reports?
-
-    @report = Reports::Dashboard::ApplicationsReport.new(kind: params[:kind], award_type: :development)
-    render partial: "admin/dashboard/totals_#{params[:kind]}/table_body"
+    render_or_download_report :development, params[:kind], params[:format]
   end
 
   def account_registrations
     authorize :dashboard, :reports?
 
     @report = Reports::Dashboard::UsersReport.new(kind: params[:kind])
-    render partial: "admin/dashboard/totals_#{params[:kind]}/users_table_body"
+
+    respond_to do |format|
+      format.csv do
+        send_data @report.as_csv, filename: @report.csv_filename
+      end
+
+      format.html do
+        render partial: "admin/dashboard/totals_#{params[:kind]}/users_table_body"
+      end
+    end
+  end
+
+  private
+
+  def render_or_download_report award_type, kind, format
+    authorize :dashboard, :reports?
+
+    @report = Reports::Dashboard::ApplicationsReport.new(kind: kind, award_type: award_type)
+
+    respond_to do |format|
+      format.csv do
+        send_data @report.as_csv, filename: @report.csv_filename
+      end
+
+      format.html do
+        render partial: "admin/dashboard/totals_#{kind}/table_body"
+      end
+    end
   end
 end
diff --git a/app/models/reports/dashboard/applications_report.rb b/app/models/reports/dashboard/applications_report.rb
index cf125bfc18..da9419facd 100644
--- a/app/models/reports/dashboard/applications_report.rb
+++ b/app/models/reports/dashboard/applications_report.rb
@@ -80,4 +80,33 @@ def generate_content(form_answers, date)
       ["&nbsp;".html_safe, "&nbsp;".html_safe]
     end
   end
+
+  def as_csv
+    CSV.generate do |csv|
+      headers = ["Year"]
+      case kind
+      when "by_month"
+        columns = ["By end of April", "By end of May", "By end of June", "By end of July", "By end of August", "Totals on deadline"]
+      when "by_week"
+        columns = ["6 weeks before deadline", "5 weeks before deadline", "4 weeks before deadline", "3 weeks before deadline", "2 weeks before deadline", "1 week before deadline", "Totals on deadline"]
+      when "by_day"
+        columns = ["6 days before deadline", "5 days before deadline", "4 days before deadline", "3 days before deadline", "2 days before deadline", "1 day before deadline", "Totals on deadline"]
+      end
+      csv << (headers + columns.map{|c| [c] << nil}).flatten
+      subheaders =[""]
+      columns.each{subheaders << ["In progress", "Submitted"]}
+      csv << subheaders.flatten
+      
+      stats.each do |row|
+        content = []
+        content << row.label
+        row.content.each{|c| content << (c == "&nbsp;" ? nil : c)}
+        csv << content
+      end
+    end
+  end
+
+  def csv_filename
+    "#{award_type || "all"}_applications_report_#{kind}.csv"
+  end
 end
diff --git a/app/models/reports/dashboard/users_report.rb b/app/models/reports/dashboard/users_report.rb
index ff116776e8..a732a26db5 100644
--- a/app/models/reports/dashboard/users_report.rb
+++ b/app/models/reports/dashboard/users_report.rb
@@ -69,4 +69,30 @@ def generate_content(users, date)
       "&nbsp;".html_safe
     end
   end
+
+  def as_csv
+    CSV.generate do |csv|
+      headers = ["Year"]
+      case kind
+      when "by_month"
+        columns = ["By end of April", "By end of May", "By end of June", "By end of July", "By end of August", "Totals on deadline"]
+      when "by_week"
+        columns = ["6 weeks before deadline", "5 weeks before deadline", "4 weeks before deadline", "3 weeks before deadline", "2 weeks before deadline", "1 week before deadline", "Totals on deadline"]
+      when "by_day"
+        columns = ["6 days before deadline", "5 days before deadline", "4 days before deadline", "3 days before deadline", "2 days before deadline", "1 day before deadline", "Totals on deadline"]
+      end
+      csv << (headers + columns).flatten
+      
+      stats.each do |row|
+        content = []
+        content << row.label
+        row.content.each{|c| content << (c == "&nbsp;" ? nil : c)}
+        csv << content
+      end
+    end
+  end
+
+  def csv_filename
+    "account_registrations_#{kind}.csv"
+  end
 end
diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index 44f48f55ae..ace74f7e4e 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -1,6 +1,7 @@
 .dashboard-table__wrapper.dashboard-report
-  button.btn.btn-primary.btn--load.update-report href=url aria-label="Load #{title} data"
+  button.btn.btn-primary.btn--load.update-report.if-no-js-hide href=url aria-label="Load #{title} data"
     | Load data
+  = link_to "Download data", url, class: "btn btn-primary btn--load update-report if-js-hide", aria: { label: "Download #{title} data" }
   button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
     | Updating data
 
diff --git a/app/views/admin/dashboard/totals_by_day.html.slim b/app/views/admin/dashboard/totals_by_day.html.slim
index ece3fcb8f4..0fabfcde60 100644
--- a/app/views/admin/dashboard/totals_by_day.html.slim
+++ b/app/views/admin/dashboard/totals_by_day.html.slim
@@ -9,15 +9,25 @@
     p.dashboard__subheading
       | Running totals compared to previous years
 
-  .dashboard__section
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: all_applications_admin_dashboard_reports_path(kind: "by_day"), title: "All applications", kind: "by_day"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: all_applications_admin_dashboard_reports_path(kind: "by_day", format: :csv), title: "All applications", kind: "by_day"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: international_trade_admin_dashboard_reports_path(kind: "by_day"), title: "International trade", kind: "by_day"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: international_trade_admin_dashboard_reports_path(kind: "by_day", format: :csv), title: "International trade", kind: "by_day"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: innovation_admin_dashboard_reports_path(kind: "by_day"), title: "Innovation", kind: "by_day"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: innovation_admin_dashboard_reports_path(kind: "by_day", format: :csv), title: "Innovation", kind: "by_day"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: social_mobility_admin_dashboard_reports_path(kind: "by_day"), title: "Social mobility", kind: "by_day"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: social_mobility_admin_dashboard_reports_path(kind: "by_day", format: :csv), title: "Social mobility", kind: "by_day"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: sustainable_development_admin_dashboard_reports_path(kind: "by_day"), title: "Sustainable development", kind: "by_day"
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: sustainable_development_admin_dashboard_reports_path(kind: "by_day", format: :csv), title: "Sustainable development", kind: "by_day"
   .dashboard__section
     = render "admin/dashboard/totals_by_day/registrations"
diff --git a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
index 3040fc8939..afa48f305d 100644
--- a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
@@ -1,6 +1,8 @@
 .dashboard-table__wrapper.dashboard-report
-  button.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_day") aria-label="Load data for new account registrations table"
+  button.btn.btn-primary.btn--load.update-report.if-no-js-hide href=account_registrations_admin_dashboard_reports_path(kind: "by_day") aria-label="Load data for new account registrations table"
     | Load data
+  = link_to "Download data", account_registrations_admin_dashboard_reports_path(kind: "by_day", format: :csv),
+    class: "btn btn-primary btn--load update-report if-js-hide", aria: { label: "Download registration totals by day" }
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
 
diff --git a/app/views/admin/dashboard/totals_by_month.html.slim b/app/views/admin/dashboard/totals_by_month.html.slim
index f2d2e509a6..5d7ac67ef3 100644
--- a/app/views/admin/dashboard/totals_by_month.html.slim
+++ b/app/views/admin/dashboard/totals_by_month.html.slim
@@ -9,15 +9,25 @@
     p.dashboard__subheading
       | Running totals compared to previous years
 
-  .dashboard__section
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: all_applications_admin_dashboard_reports_path(kind: "by_month"), title: "All applications", kind: "by_month"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: all_applications_admin_dashboard_reports_path(kind: "by_month", format: :csv), title: "All applications", kind: "by_month"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: international_trade_admin_dashboard_reports_path(kind: "by_month"), title: "International trade", kind: "by_month"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: international_trade_admin_dashboard_reports_path(kind: "by_month", format: :csv), title: "International trade", kind: "by_month"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: innovation_admin_dashboard_reports_path(kind: "by_month"), title: "Innovation", kind: "by_month"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: innovation_admin_dashboard_reports_path(kind: "by_month", format: :csv), title: "Innovation", kind: "by_month"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: social_mobility_admin_dashboard_reports_path(kind: "by_month"), title: "Social mobility", kind: "by_month"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: social_mobility_admin_dashboard_reports_path(kind: "by_month", format: :csv), title: "Social mobility", kind: "by_month"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: sustainable_development_admin_dashboard_reports_path(kind: "by_month"), title: "Sustainable development", kind: "by_month"
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: sustainable_development_admin_dashboard_reports_path(kind: "by_month", format: :csv), title: "Sustainable development", kind: "by_month"
   .dashboard__section
     = render "admin/dashboard/totals_by_month/registrations"
diff --git a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
index ed6d8d4da3..8aec255383 100644
--- a/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_month/_registrations.html.slim
@@ -1,6 +1,8 @@
 .dashboard-table__wrapper.dashboard-report
   button.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_month") aria-label="Load data for new account registrations table"
     | Load data
+  = link_to "Download data", account_registrations_admin_dashboard_reports_path(kind: "by_month", format: :csv),
+    class: "btn btn-primary btn--load update-report if-js-hide", aria: { label: "Download registration totals by month" }
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
 
diff --git a/app/views/admin/dashboard/totals_by_week.html.slim b/app/views/admin/dashboard/totals_by_week.html.slim
index 565b8ba4da..e8cbdc5983 100644
--- a/app/views/admin/dashboard/totals_by_week.html.slim
+++ b/app/views/admin/dashboard/totals_by_week.html.slim
@@ -9,15 +9,25 @@
     p.dashboard__subheading
       | Running totals compared to previous years
 
-  .dashboard__section
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: all_applications_admin_dashboard_reports_path(kind: "by_week"), title: "All applications", kind: "by_week"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: all_applications_admin_dashboard_reports_path(kind: "by_week", format: :csv), title: "All applications", kind: "by_week"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: international_trade_admin_dashboard_reports_path(kind: "by_week"), title: "International trade", kind: "by_week"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: international_trade_admin_dashboard_reports_path(kind: "by_week", format: :csv), title: "International trade", kind: "by_week"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: innovation_admin_dashboard_reports_path(kind: "by_week"), title: "Innovation", kind: "by_week"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: innovation_admin_dashboard_reports_path(kind: "by_week", format: :csv), title: "Innovation", kind: "by_week"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: social_mobility_admin_dashboard_reports_path(kind: "by_week"), title: "Social mobility", kind: "by_week"
-  .dashboard__section
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: social_mobility_admin_dashboard_reports_path(kind: "by_week", format: :csv), title: "Social mobility", kind: "by_week"
+  .dashboard__section.if-no-js-hide
     = render "admin/dashboard/applications_report", url: sustainable_development_admin_dashboard_reports_path(kind: "by_week"), title: "Sustainable development", kind: "by_week"
+  .dashboard__section.if-js-hide
+    = render "admin/dashboard/applications_report", url: sustainable_development_admin_dashboard_reports_path(kind: "by_week", format: :csv), title: "Sustainable development", kind: "by_week"
   .dashboard__section
     = render "admin/dashboard/totals_by_week/registrations"
diff --git a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
index cbb416c7ac..985c7edaef 100644
--- a/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_week/_registrations.html.slim
@@ -1,6 +1,8 @@
 .dashboard-table__wrapper.dashboard-report
-  button.btn.btn-primary.btn--load.update-report href=account_registrations_admin_dashboard_reports_path(kind: "by_week") aria-label="Load data for new account registrations table"
+  button.btn.btn-primary.btn--load.update-report.if-no-js-hide href=account_registrations_admin_dashboard_reports_path(kind: "by_week") aria-label="Load data for new account registrations table"
     | Load data
+  = link_to "Download data", account_registrations_admin_dashboard_reports_path(kind: "by_week", format: :csv),
+    class: "btn btn-primary btn--load update-report if-js-hide", aria: { label: "Download registration totals by week" }
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
 

From bee97b3f6e3f5f6a00b9e34b6fa9defc00153435 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 23:20:14 -0300
Subject: [PATCH 166/352] Make comment field required

---
 app/views/admin/comments/_form.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/comments/_form.html.slim b/app/views/admin/comments/_form.html.slim
index f56bb24bdc..a2c28adab8 100644
--- a/app/views/admin/comments/_form.html.slim
+++ b/app/views/admin/comments/_form.html.slim
@@ -2,7 +2,7 @@
   label
     ' Add a comment
   = f.hidden_field :section, id: "#{f.object.section}_section_hidden_field"
-  = f.text_area :body, id: "#{f.object.section}_comment_body", autofocus: true, class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment"
+  = f.text_area :body, id: "#{f.object.section}_comment_body", autofocus: true, class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment", required: true
   .comment-actions
     = f.check_box :flagged, id: "#{f.object.section}_flagged_hidden_checkbox"
     = link_to "#flag-comment", class: "link-flag-comment js-link-flag-comment"

From 0b32d640607c3d986ec02daeed9025457472d184 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 23:36:11 -0300
Subject: [PATCH 167/352] Correctly display info when no assessor is assigned
 to application

---
 app/assets/javascripts/admin/form_answers.js.coffee | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index c9ff0ff43f..73deb35a9f 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -102,8 +102,11 @@ ready = ->
     form.find(".errors-holder").text("")
     form.closest(".form-group").removeClass("form-edit")
     formValueBox = form.closest(".form-group").find(".edit-value")
-    formValue = form.find("select :selected").text()
-    formValueBox.text(formValue)
+    selected = form.find("select :selected")
+    if (selected.val() == "")
+      formValueBox.html("<span class='p-empty'>Not assigned</span>")
+    else
+      formValueBox.text(selected.text())
   $(".section-applicant-users form").on "ajax:error", (e, data, status, xhr) ->
     form = $(this)
     errors = ""

From c2df8364b2b0831694c8e6cfabd97d1f3332d755 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 27 Jul 2023 23:47:42 -0300
Subject: [PATCH 168/352] Display errors as alert banner when uploading files

---
 app/views/admin/audit_certificate/_form.html.slim       | 6 +++++-
 app/views/admin/figures_and_vat_returns/_form.html.slim | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index fb1a48c3ae..943f44582a 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -8,7 +8,11 @@
     h3 Attach document
 
     - if form.object.errors.any?
-      .errors = form.object.errors.full_messages.join(", ")
+      .errors
+        .alert.alert-danger[data-controller="element-removal" role="alert"']
+          = form.object.errors.full_messages.join(", ")
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]        
+            span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
       = form.file_field :attachment
diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
index 4381b46350..bd5fd0c884 100644
--- a/app/views/admin/figures_and_vat_returns/_form.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -8,7 +8,11 @@
     h3 Attach document
 
     - if form.object.errors.any?
-      .errors = form.object.errors.full_messages.join(", ")
+      .errors
+        .alert.alert-danger[data-controller="element-removal" role="alert"']
+          = form.object.errors.full_messages.join(", ")
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]        
+            span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
       = form.file_field :attachment

From 01dd2ebafc726d99176da0385216aa80c22780bb Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 01:26:18 -0300
Subject: [PATCH 169/352] Display error messages when submitting assessment

---
 app/controllers/concerns/assessment_submission_mixin.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/concerns/assessment_submission_mixin.rb b/app/controllers/concerns/assessment_submission_mixin.rb
index 9b26193309..4fa2ca2572 100644
--- a/app/controllers/concerns/assessment_submission_mixin.rb
+++ b/app/controllers/concerns/assessment_submission_mixin.rb
@@ -8,6 +8,7 @@ def create
     respond_to do |format|
       format.json { render(json_response) }
       format.html do
+        render_flash_message_for(resource, message: resource.errors.none? ? nil : resource.errors.full_messages.join(", "))
         redirect_to [namespace_name, resource.form_answer]
       end
     end

From f0d1d5d594a8a5b2afd32c1925dfe8f2d4f41e16 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 01:27:35 -0300
Subject: [PATCH 170/352] Add JS validation controller to check for required
 fields

---
 .../html5_form_validation_controller.js       | 67 +++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 app/javascript/controllers/html5_form_validation_controller.js

diff --git a/app/javascript/controllers/html5_form_validation_controller.js b/app/javascript/controllers/html5_form_validation_controller.js
new file mode 100644
index 0000000000..343a6a2543
--- /dev/null
+++ b/app/javascript/controllers/html5_form_validation_controller.js
@@ -0,0 +1,67 @@
+export default class extends ApplicationController {
+  static values = {
+    selectors: Array,
+  };
+
+  validate = (event) => {
+    let counter = 0;
+
+    this.filteredFields.forEach((field) => {
+      if (field && this.shouldValidateField(field)) {
+        field.required = true;
+
+        if (!field.checkValidity()) {
+          counter += 1;
+        }
+      }
+    });
+
+    if (counter > 0) {
+      event.preventDefault();
+      event.stopPropagation();
+    }
+
+    this.firstInvalidField && this.firstInvalidField.reportValidity();
+  };
+
+  discard = (event) => {
+    this.filteredFields.forEach((field) => {
+      field.removeAttribute('required');
+    });
+  };
+
+  shouldValidateField(field) {
+    return (
+      !field.disabled &&
+      field.type !== undefined &&
+      this.visible(field) &&
+      !['file', 'reset', 'submit', 'button'].includes(field.type)
+    );
+  }
+
+  visible(field) {
+    return (
+      !field.hidden && (!field.type || field.type != 'hidden') && (field.offsetWidth > 0 || field.offsetHeight > 0)
+    );
+  }
+
+  get filteredFields() {
+    return this.formFields.filter((f) => this.selectors.includes(f.tagName)).filter(this.visible);
+  }
+
+  get formFields() {
+    return Array.from(this.element.elements);
+  }
+
+  get selectors() {
+    if (this.hasSelectorsValue) {
+      return this.selectorsValue.map((selector) => selector.toUpperCase());
+    } else {
+      return [];
+    }
+  }
+
+  get firstInvalidField() {
+    return this.filteredFields.find((field) => !field.checkValidity());
+  }
+}

From ac44cd12f88929bab8e6d4d972d1e01f54ec9f00 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 01:29:26 -0300
Subject: [PATCH 171/352] Update partials to check for missing required (&
 visible) fields

---
 .../form_answers/_section_appraisal_form_moderated.html.slim  | 2 +-
 .../form_answers/_section_appraisal_form_primary.html.slim    | 2 +-
 .../form_answers/_section_appraisal_form_secondary.html.slim  | 2 +-
 app/views/admin/form_answers/_section_draft_notes.html.slim   | 3 ++-
 .../_application_background_section.html.slim                 | 2 +-
 .../appraisal_form_components/_non_rag_section.html.slim      | 4 ++--
 .../appraisal_form_components/_rag_section.html.slim          | 4 ++--
 .../appraisal_form_components/_verdict_section.html.slim      | 4 ++--
 8 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index e89cc2c724..4e34590b76 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -12,7 +12,7 @@
       = simple_form_for([namespace_name, moderated_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", inline_flash_target: "form" } }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["textarea"] } }) do |f|
 
         = render_section(resource, f)
         = hidden_field_tag :updated_section
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index 3dcd6f6d6c..12430e2f25 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -11,7 +11,7 @@
       = simple_form_for([namespace_name, primary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", inline_flash_target: "form" }, id: "primary_appraisal_form" }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form", html5_form_validation_selectors_value: ["textarea"], controller: "html5-form-validation" }, id: "primary_appraisal_form" }) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "primary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 3324b5a4af..27e6acd617 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -11,7 +11,7 @@
       = simple_form_for([namespace_name, secondary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", inline_flash_target: "form" }, id: "secondary_appraisal_form"}) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["textarea"] }, id: "secondary_appraisal_form"}) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "secondary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_draft_notes.html.slim b/app/views/admin/form_answers/_section_draft_notes.html.slim
index 51f72a7b15..ee9959e89d 100644
--- a/app/views/admin/form_answers/_section_draft_notes.html.slim
+++ b/app/views/admin/form_answers/_section_draft_notes.html.slim
@@ -26,7 +26,8 @@
                       wrapper_html: { class: "form-group" },
                       input_html: { class: "form-control", rows: 10, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-new-content" },
                       as: :text,
-                      label: false
+                      label: false,
+                      required: true
 
             = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
               span.glyphicon.glyphicon-pencil
diff --git a/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
index bda474ff6e..1b49d9e47d 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
@@ -23,5 +23,5 @@
       = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
-      = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide"
+      = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate" }
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
index 0f1d9dd39f..3a16109334 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
@@ -26,6 +26,6 @@
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
-        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", "data-updated-section" => section.desc
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
+        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate", updated_section: section.desc }
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
index dcd7d49081..6747cf3735 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
@@ -46,6 +46,6 @@
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
-        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", "data-updated-section" => section.desc
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
+        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate", updated_section: section.desc }
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
index 38a87c3333..c0102babf6 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
@@ -44,6 +44,6 @@
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
-        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", "data-updated-section" => section.desc
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
+        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate" }
       .clear

From d6341f11f3dcd9986185742a6aa354bac52c210a Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 01:34:04 -0300
Subject: [PATCH 172/352] Better errors for user creation/modification

---
 app/controllers/admin/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 89015ebc01..b42612ab40 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -28,7 +28,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_users_path : nil
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.full_messages.join(", "))
 
     respond_with :admin, @resource, location: location
   end
@@ -42,7 +42,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.full_messages.join(", "))
 
     respond_with :admin, @resource, location: admin_users_path
   end

From 7428390a7a872866c6fc8fa3ba4877c242c27ba5 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 01:55:15 -0300
Subject: [PATCH 173/352] Disallow scheduling if date is empty

---
 app/views/admin/settings/_deadline_form.html.slim | 9 +++++----
 app/views/admin/settings/_notification.html.slim  | 9 +++++----
 app/views/admin/settings/_schedule_new.html.slim  | 9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/views/admin/settings/_deadline_form.html.slim b/app/views/admin/settings/_deadline_form.html.slim
index 145f624ae3..770af295ca 100644
--- a/app/views/admin/settings/_deadline_form.html.slim
+++ b/app/views/admin/settings/_deadline_form.html.slim
@@ -8,18 +8,19 @@
       span.trigger-at
         = deadline.formatted_trigger_time
     .deadline-form.well
-      = simple_form_for deadline, url: admin_settings_deadline_path(deadline, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } } do |f|
+      = simple_form_for deadline, url: admin_settings_deadline_path(deadline, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["input"] } } do |f|
         .control-date
           label.control-label Set date and time
         .clear
         .deadline-form-wrapper
           = f.input :trigger_at,
                     as: :separated_date_time,
-                    input_html: { id: '' }
+                    input_html: { id: '' },
+                    required: true
 
           .control-action
-            = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button", data: { element_focus_target: "dismiss" }
-            input[type="button" value="Save" class="btn btn-primary btn-submit" aria-label="Save #{I18n.t("deadline_buttons.#{kind}")}"]
+            = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
+            input[type="button" value="Save" class="btn btn-primary btn-submit" aria-label="Save #{I18n.t("deadline_buttons.#{kind}")}" data-action="click->html5-form-validation#validate"]
         .clear
 
     = link_to "Edit", "#", class: "edit-deadline if-no-js-hide", role: "button", aria: {label: "Edit #{I18n.t("deadline_buttons.#{kind}")}"}, data: { element_focus_target: "reveal" }
diff --git a/app/views/admin/settings/_notification.html.slim b/app/views/admin/settings/_notification.html.slim
index 29e98f9113..b60ca7ba34 100644
--- a/app/views/admin/settings/_notification.html.slim
+++ b/app/views/admin/settings/_notification.html.slim
@@ -16,13 +16,14 @@ li id="notification-#{notification.id}"
           '  |
         = button_to "Delete", admin_settings_email_notification_path(notification), { onclick: "return confirm('Are you sure?')", method: :delete, remote: true }
     .notification-edit-form.well
-      = simple_form_for notification, url: admin_settings_email_notification_path(notification, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } } do |f|
+      = simple_form_for notification, url: admin_settings_email_notification_path(notification, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["input"] } } do |f|
         .control-date
           label.control-label Edit schedule
           = f.input :trigger_at,
                     as: :separated_date_time,
-                    input_html: { id: '' }
+                    input_html: { id: '' },
+                    required: true
         .control-action
-          = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide"
-          = f.submit "Save", class: "btn btn-primary btn-submit"
+          = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", data: { action: "click->html5-form-validation#discard" }
+          = f.submit "Save", class: "btn btn-primary btn-submit", data: { action: "click->html5-form-validation#validate" }
         .clear
diff --git a/app/views/admin/settings/_schedule_new.html.slim b/app/views/admin/settings/_schedule_new.html.slim
index 75200c4c0c..4384cf5a2f 100644
--- a/app/views/admin/settings/_schedule_new.html.slim
+++ b/app/views/admin/settings/_schedule_new.html.slim
@@ -3,16 +3,17 @@
 
 .well.question-group.notification-new-form
   h3 Schedule new email
-  = simple_form_for notification, url: admin_settings_email_notifications_path(year: params[:year]), remote: true, authenticity_token: true, html: { id: "new_email_notification_#{kind}", data: { inline_flash_target: "form" } }  do |f|
+  = simple_form_for notification, url: admin_settings_email_notifications_path(year: params[:year]), remote: true, authenticity_token: true, html: { id: "new_email_notification_#{kind}", data: { inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["input"] } }  do |f|
     = f.input :kind, as: :hidden, input_html: { id: "email_notification_kind_#{kind}" }
     .control-date
       .form-group
         label.control-label Send at
         = f.input :trigger_at,
                   as: :separated_date_time,
-                  input_html: { id: "" }
+                  input_html: { id: "" },
+                  required: true
 
     .control-action
-      = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button", data: { element_focus_target: "dismiss" }
-      = f.submit "Save", class: "btn btn-primary btn-submit"
+      = link_to "Cancel", "#", class: "btn btn-default btn-cancel if-no-js-hide", role: "button", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
+      = f.submit "Save", class: "btn btn-primary btn-submit", data: { action: "click->html5-form-validation#validate" }
     .clear

From c556d316e0f964121917e4d7c673fdf6266a55dc Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:35:15 -0300
Subject: [PATCH 174/352] JS: Add `scrollToElement` helper

---
 app/javascript/helpers/index.js         |  1 +
 app/javascript/helpers/scroll_helper.js | 15 +++++++++++++++
 package.json                            |  1 +
 yarn.lock                               |  5 +++++
 4 files changed, 22 insertions(+)
 create mode 100644 app/javascript/helpers/index.js
 create mode 100644 app/javascript/helpers/scroll_helper.js

diff --git a/app/javascript/helpers/index.js b/app/javascript/helpers/index.js
new file mode 100644
index 0000000000..11a65f5188
--- /dev/null
+++ b/app/javascript/helpers/index.js
@@ -0,0 +1 @@
+export { scrollToElement } from './scroll_helper';
diff --git a/app/javascript/helpers/scroll_helper.js b/app/javascript/helpers/scroll_helper.js
new file mode 100644
index 0000000000..3cf52fe552
--- /dev/null
+++ b/app/javascript/helpers/scroll_helper.js
@@ -0,0 +1,15 @@
+import smoothscroll from 'smoothscroll-polyfill';
+
+const smoothSupported = 'scrollBehavior' in document.documentElement.style;
+
+let smoothPolyfilled;
+async function polyfillSmooth() {
+  if (smoothPolyfilled) return;
+  smoothPolyfilled = true;
+  smoothscroll.polyfill();
+}
+
+export async function scrollToElement(element, { behavior = 'smooth', block = 'start', inline = 'nearest' } = {}) {
+  if (behavior === 'smooth' && !smoothSupported) await polyfillSmooth();
+  element.scrollIntoView({ behavior, block, inline });
+}
diff --git a/package.json b/package.json
index 269d5bc4f1..5c9f020d89 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,7 @@
     "node-sass": "^7.0.0",
     "sass": "^1.35.1",
     "sass-loader": "^12.1.0",
+    "smoothscroll-polyfill": "^0.4.4",
     "webpack": "^5.76.0",
     "webpack-cli": "^4.2.0",
     "yarn": "^1.22.19"
diff --git a/yarn.lock b/yarn.lock
index 0a16691d7f..67143f27c7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4474,6 +4474,11 @@ smart-buffer@^4.2.0:
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+smoothscroll-polyfill@^0.4.4:
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/smoothscroll-polyfill/-/smoothscroll-polyfill-0.4.4.tgz#3a259131dc6930e6ca80003e1cb03b603b69abf8"
+  integrity sha512-TK5ZA9U5RqCwMpfoMq/l1mrH0JAR7y7KRvOBx0n2869aLxch+gT9GhN3yUfjiw+d/DiF1mKo14+hd62JyMmoBg==
+
 sockjs@^0.3.24:
   version "0.3.24"
   resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"

From eb87826380f66cd5db64dc6775b74cb3167dd9bd Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:36:05 -0300
Subject: [PATCH 175/352] Stimulus controller to help with scrolling to invalid
 form elements

---
 .../controllers/element_scroll_controller.js  | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 app/javascript/controllers/element_scroll_controller.js

diff --git a/app/javascript/controllers/element_scroll_controller.js b/app/javascript/controllers/element_scroll_controller.js
new file mode 100644
index 0000000000..d905ccc574
--- /dev/null
+++ b/app/javascript/controllers/element_scroll_controller.js
@@ -0,0 +1,35 @@
+import { scrollToElement } from '../helpers'; // eslint-disable-line import/no-unresolved
+
+export default class extends ApplicationController {
+  static targets = ['accordion'];
+
+  connect() {
+    if (this.firstInvalidField) {
+      if (!this.visible(this.firstInvalidField)) {
+        const collapsible = this.accordionTargets.find((target) => {
+          return target.contains(this.firstInvalidField);
+        });
+        if (collapsible) $(collapsible).collapse('show');
+      }
+
+      setTimeout(() => {
+        this.firstInvalidField.focus();
+        scrollToElement(this.firstInvalidField);
+      }, 300);
+    }
+  }
+
+  // Private
+
+  visible(el) {
+    return !el.hidden && (!el.type || el.type != 'hidden') && (el.offsetWidth > 0 || el.offsetHeight > 0);
+  }
+
+  get formFields() {
+    return Array.from(this.element.elements);
+  }
+
+  get firstInvalidField() {
+    return this.formFields.find((field) => field.ariaInvalid == 'true');
+  }
+}

From c05d20c2dc60bde1f51c16fd83f6465b1ff75238 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 15:36:31 -0300
Subject: [PATCH 176/352] Update form to use Stimulus controller

---
 app/views/admin/users/_form.html.slim | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/admin/users/_form.html.slim b/app/views/admin/users/_form.html.slim
index 265768a63c..f2abb3aeb8 100644
--- a/app/views/admin/users/_form.html.slim
+++ b/app/views/admin/users/_form.html.slim
@@ -1,4 +1,4 @@
-= simple_form_for [:admin, resource], html: { class: "qae-form", data: { type: "json",  controller: "inline-flash", inline_flash_target: "form" } } do |f|
+= simple_form_for [:admin, resource], html: { class: "qae-form", data: { type: "json",  controller: "inline-flash element-scroll", inline_flash_target: "form" } } do |f|
   .panel-group#user-form-panel-parent
     .panel.panel-default[data-controller="element-focus"]
       .panel-heading#user-details-heading
@@ -6,7 +6,7 @@
           a data-toggle="collapse" data-parent="#user-form-panel" href="#user-details" aria-expanded="true" aria-controls="user-details" data-element-focus-target="reveal"
             = controller_name == "users" ? "Applicant" : controller_name.singularize.titleize
             '  Details
-      #user-details.section-user-details.panel-collapse.collapse.in aria-labelledby="user-details-heading"
+      #user-details.section-user-details.panel-collapse.collapse.in[aria-labelledby="user-details-heading" data-element-scroll-target="accordion"]
         .panel-body
           = render "fields_user_details", f: f
 
@@ -15,7 +15,7 @@
         h2.panel-title
           a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#organisation-details" aria-expanded="false" aria-controls="organisation-details" data-element-focus-target="reveal"
             ' Organisation Details
-      #organisation-details.section-organisation-details.panel-collapse.collapse aria-labelledby="organisation-details-header"
+      #organisation-details.section-organisation-details.panel-collapse.collapse[aria-labelledby="organisation-details-header" data-element-scroll-target="accordion"]
         .panel-body
           = render "fields_organisation_details", f: f
 
@@ -24,7 +24,7 @@
         h2.panel-title
           a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#contact-preferences" aria-expanded="false" aria-controls="contact-preferences" data-element-focus-target="reveal"
             ' Contact Preferences
-      #contact-preferences.section-contact-preferences.panel-collapse.collapse aria-labelledby="contact-preferences-header"
+      #contact-preferences.section-contact-preferences.panel-collapse.collapse[aria-labelledby="contact-preferences-header" data-element-scroll-target="accordion"]
         .panel-body
           = render "fields_contact_preferences", f: f
 
@@ -34,7 +34,7 @@
           h2.panel-title
             a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-collaborators" aria-expanded="false" aria-controls="section-collaborators" data-element-focus-target="reveal"
               ' Collaborators
-        #section-collaborators.section-collaborators.panel-collapse.collapse aria-labelledby="section-collaborators-header"
+        #section-collaborators.section-collaborators.panel-collapse.collapse[aria-labelledby="section-collaborators-header" data-element-scroll-target="accordion"]
           .panel-body
             = render "fields_collaborators", f: f, resource: resource
 
@@ -43,7 +43,7 @@
         h2.panel-title
           a.collapsed data-toggle="collapse" data-parent="#user-form-panel" href="#section-password" aria-expanded="false" aria-controls="section-password" data-element-focus-target="reveal"
             ' Password
-      #section-password.section-password.panel-collapse.collapse aria-labelledby="section-password-header"
+      #section-password.section-password.panel-collapse.collapse[aria-labelledby="section-password-header" data-element-scroll-target="accordion"]
         .panel-body
           = render "fields_password", f: f
 

From 4ad702cb7a5c2e1e18a361071bd7f5da8d11130e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 31 Jul 2023 19:19:28 -0300
Subject: [PATCH 177/352] Re-work displaying assessment errors

---
 .../javascripts/admin/form_answers.js.coffee  | 69 +++++++++++++++----
 .../concerns/assessment_submission_mixin.rb   |  2 +-
 app/services/assessment_submission_service.rb |  2 +-
 .../_section_case_summary.html.slim           |  2 +-
 .../_submit_appraisal_form.html.slim          |  4 +-
 5 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 73deb35a9f..db113cfc8e 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -323,23 +323,27 @@ ready = ->
     if (element)
       element.classList.add('form-edit')
 
-  $(".submit-assessment").on "ajax:error", (e, data, status, xhr) ->
+  $('.submit-assessment').on 'ajax:error', (e, data, status, xhr) ->
+    panel = this.closest('.panel-body')
     errors = data.responseJSON
-    $(this).addClass("field-with-errors")
-    $(this).closest(".panel-body").find("textarea").each ->
-      unless $(this).val().length
-        $(this).closest(".input").addClass("field-with-errors")
-    $(this).find(".feedback-holder").addClass("error")
-    $(this).find(".feedback-holder").html(errors.error.join("<br>"))
+
+    removeExistingErrorMessages(panel)
+
+    Object.entries(errors).forEach ([key, values]) ->
+      field = panel.querySelector("[name*='[#{key}]']")
+      if field and shouldValidateField(field)
+        showErrorForInvalidField(field, values)
+
   $(".submit-assessment").on "ajax:success", (e, data, status, xhr) ->
-    $(this).closest(".panel-body").find(".field-with-errors").removeClass("field-with-errors")
-    $(this).find(".feedback-holder").removeClass("error").addClass("alert alert-success")
+    panel = this.closest('.panel-body')
+    message = "Assessment submitted"
+    if panel.closest(".panel-collapse").classList.contains('section-case-summary')
+      message = "Case summary submitted"
+
+    removeExistingErrorMessages(panel)
+    container.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'success'))
 
-    successMessage = "Assessment submitted"
-    if $(this).closest(".panel-collapse").hasClass("section-case-summary")
-      successMessage = "Case summary submitted"
-    $(this).find(".feedback-holder").html(successMessage)
-    $(this).find("input:submit").remove()
+    $(this).find('input:submit').remove()
 
   $(document).on "click", ".form-save-link", (e) ->
     link = $(this)
@@ -417,6 +421,43 @@ ready = ->
     e.preventDefault()
     $(".bulk-assign-assessors-form").closest(".container").removeClass("show-bulk-assign")
 
+shouldValidateField = (field) ->
+  !field.disabled and field.type != undefined and ![
+    'file'
+    'reset'
+    'submit'
+    'button'
+  ].includes(field.type)
+
+showErrorForInvalidField = (field, values) ->
+  group = field.closest('.govuk-form-group')
+  if (group)
+    group.classList.add('field-with-errors')
+
+  container = field.closest('.form-container')
+
+  if container
+    values.forEach (message) ->
+      if (!container.querySelector('.alert'))
+        container.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'danger'))
+
+buildBannerHtml = (message, type) ->
+  id = "alert__#{String(Math.random()).slice(2, -1)}"
+  
+  "<div id='#{id}' class='alert alert-#{type}' data-controller='element-removal' role='alert' style='padding-top: 6px; padding-bottom: 6px; margin-bottom: 8px;'>
+    #{message}
+    <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close' style='font-size: 18px;'>
+      <span aria-hidden='true'>&times;</span>
+    </button>
+  </div>"
+
+removeExistingErrorMessages = (element) ->
+  element.querySelectorAll('.field-with-errors').forEach (banner) ->
+    banner.classList.remove('field-with-errors')
+
+  element.querySelectorAll('.alert').forEach (banner) ->
+    banner.remove()
+
 changeRagStatus = ->
   $(document).on "click", ".btn-rag .dropdown-menu a", (e) ->
     e.preventDefault()
diff --git a/app/controllers/concerns/assessment_submission_mixin.rb b/app/controllers/concerns/assessment_submission_mixin.rb
index 4fa2ca2572..a6e7bd4d50 100644
--- a/app/controllers/concerns/assessment_submission_mixin.rb
+++ b/app/controllers/concerns/assessment_submission_mixin.rb
@@ -36,7 +36,7 @@ def form_answer
 
   def json_response
     json = @service.as_json
-    resp = { json: json }
+    resp = { json: @service.errors }
     resp[:status] = :unprocessable_entity if json.present?
     resp
   end
diff --git a/app/services/assessment_submission_service.rb b/app/services/assessment_submission_service.rb
index 925c7cf431..76b3f61f76 100644
--- a/app/services/assessment_submission_service.rb
+++ b/app/services/assessment_submission_service.rb
@@ -47,7 +47,7 @@ def resubmit!
     end
   end
 
-  delegate :as_json, to: :resource
+  delegate :as_json, :errors, to: :resource
 
   private
 
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index 04fdcd52d6..195bf88dee 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -23,7 +23,7 @@
           / For Primary Assessor
           / It becomes read-only for primary assessor after submission
 
-          = simple_form_for([namespace_name, assessment], remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } }) do |f|
+          = simple_form_for([namespace_name, assessment], remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["textarea"] } }) do |f|
             = render partial: "admin/form_answers/appraisal_form_components/application_background_section",
               locals: { f: f}
             = render_section(resource, f)
diff --git a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
index 1d7fe998a3..efb9cdf2bb 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
@@ -1,7 +1,9 @@
 - if policy(assessment).can_be_submitted? || policy(assessment).can_be_re_submitted?
   = form_tag(url_for([namespace_name, :assessment_submissions]),
             authenticity_token: true,
-            class: "submit-assessment")
+            remote: true,
+            class: "submit-assessment",
+            "data-type" => "json")
 
     = hidden_field_tag :assessment_id, assessment.id, id: "#{assessment.position}_assessment_id_submit_appraisal_form_hidden_field"
 

From 6628b33ed12ca289ff11bd898ff859ddb73eaba7 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 1 Aug 2023 00:47:03 -0300
Subject: [PATCH 178/352] Reference error ID from invalid field

---
 .../javascripts/admin/form_answers.js.coffee      | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index db113cfc8e..4e681d9c7a 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -439,10 +439,12 @@ showErrorForInvalidField = (field, values) ->
   if container
     values.forEach (message) ->
       if (!container.querySelector('.alert'))
-        container.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'danger'))
+        id = "alert__#{String(Math.random()).slice(2, -1)}"
+        field.setAttribute('aria-errormessage', id)
+        container.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'danger', id))
 
-buildBannerHtml = (message, type) ->
-  id = "alert__#{String(Math.random()).slice(2, -1)}"
+buildBannerHtml = (message, type, identifier = null) ->
+  id = identifier || "alert__#{String(Math.random()).slice(2, -1)}"
   
   "<div id='#{id}' class='alert alert-#{type}' data-controller='element-removal' role='alert' style='padding-top: 6px; padding-bottom: 6px; margin-bottom: 8px;'>
     #{message}
@@ -452,8 +454,11 @@ buildBannerHtml = (message, type) ->
   </div>"
 
 removeExistingErrorMessages = (element) ->
-  element.querySelectorAll('.field-with-errors').forEach (banner) ->
-    banner.classList.remove('field-with-errors')
+  element.querySelectorAll('.field-with-errors').forEach (el) ->
+    el.classList.remove('field-with-errors')
+
+  element.querySelectorAll('[aria-errormessage]').forEach (el) ->
+    el.removeAttribute('aria-errormessage')
 
   element.querySelectorAll('.alert').forEach (banner) ->
     banner.remove()

From eaedce9b4d45a2f8a67276b2acc92444e809bf2c Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 1 Aug 2023 00:51:06 -0300
Subject: [PATCH 179/352] Add flash message helper to assessor base controller

---
 app/controllers/assessor/base_controller.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/controllers/assessor/base_controller.rb b/app/controllers/assessor/base_controller.rb
index e6f5d5607f..c1bfb15608 100644
--- a/app/controllers/assessor/base_controller.rb
+++ b/app/controllers/assessor/base_controller.rb
@@ -19,6 +19,14 @@ def current_subject
     current_assessor
   end
 
+  def render_flash_message_for(resource, message: nil)
+    if resource.errors.any?
+      flash[:error] = message || "An unknown error has occurred, please try again."
+    else
+      flash[:notice] = message || "Success!"
+    end
+  end
+
   private
 
   helper_method :namespace_name, :current_subject

From 2191c5f0834db5b59c147fc41efade6668441ec6 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 1 Aug 2023 12:22:20 +0100
Subject: [PATCH 180/352] adds styles for non-js dropdown

---
 .../stylesheets/admin/header-footer.scss      | 28 +++++++++++++++++--
 app/views/layouts/application-admin.html.slim | 21 ++++++++++++--
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 18fbd9abf2..147d83bd3e 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -99,7 +99,8 @@
       }
     }
 
-    .navbar-nav > li > a {
+    .navbar-nav > li > a,
+    .navbar-nav > li > details {
       padding-top: 24px;
       padding-bottom: 23px;
       color: $white-true;
@@ -115,6 +116,11 @@
       @include screen-sm-max {
         padding: 20px 15px;
       }
+
+      > .dropdown-menu {
+        display: block;
+        text-transform: none;
+      }
     }
   }
 
@@ -151,7 +157,7 @@
       margin-right: 0;
     }
 
-    > a {
+    > a, > details {
       .lte-ie8 & {
         display: block !important;
         padding-top: 26px !important;
@@ -167,6 +173,7 @@
       &:hover,
       &:focus {
         background-color: $header-hover;
+        cursor: pointer;
 
         @include is-ios {
           background-color: transparent;
@@ -180,6 +187,23 @@
       }
     }
 
+    > details {
+      padding: 0 10px;
+
+      &:focus-within {
+        background-color: $govuk-highlight-yellow !important;
+        color: $black !important;
+        outline: none !important;
+        border-bottom-color: $black !important;
+        border-bottom-width: 2px !important;
+        border-bottom-style: solid !important;
+
+        summary {
+          outline: none !important;
+        }
+      }
+    }
+
     &.active > a {
       background: transparent image-url("icon-arrow-admin-nav.png") no-repeat center bottom;
       background-size: 24px 12px;
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 25b0cbe50d..45aff482a5 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -79,8 +79,25 @@ html.no-js
                     = link_to "Data Export Log", admin_audit_logs_path
 
                 ul.nav.navbar-nav.navbar-right
-                  li.dropdown
-                    a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+                  li
+                    details.if-js-hide
+                      summary My Account
+                      ul.dropdown-menu
+                        li
+                          span
+                            strong = current_subject.decorate.full_name
+                            br
+                            small = current_subject.email
+                        li.divider
+                        - unless current_admin.authy_enabled
+                          li
+                            = link_to "Enable 2FA", admin_enable_authy_path
+                        li
+                          = link_to "Sign out",
+                              destroy_admin_session_path,
+                              method: :delete
+
+                    a.dropdown-toggle.if-no-js-hide href="#" data-toggle="dropdown" role="button" aria-expanded="false"
                       ' My account
                       span.caret
                     ul.dropdown-menu

From 8eda29dbc3993f30a3e6a2d75254834874c1061e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 1 Aug 2023 13:35:44 +0100
Subject: [PATCH 181/352] fix signout for non-js

---
 app/assets/stylesheets/admin/base.scss        |  6 ++--
 .../stylesheets/admin/header-footer.scss      | 31 +++++++++++++++++--
 app/views/layouts/application-admin.html.slim |  5 +--
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 4060c26824..605bd63ec3 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -14,7 +14,7 @@ a {
   }
 }
 
-.btn, button, a, [role=menuitem] {
+.btn, button, a, [role=menuitem], .button_to {
   &:focus, &:focus-within {
     background-color: $govuk-highlight-yellow !important;
     border-color: $govuk-highlight-yellow;
@@ -34,8 +34,8 @@ input[type=checkbox], select {
   }
 }
 
-.btn-primary {
-  &:focus {
+.btn-primary, .button_to {
+  &:focus, &:focus-within {
     border-bottom-color: $black !important;
     border-bottom-width: 2px !important;
     border-bottom-style: solid !important;
diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 147d83bd3e..78834a1a77 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -231,7 +231,8 @@
       z-index: 999999 !important;
     }
 
-    > li > span {
+    > li > span,
+    > li > .button_to {
       display: block;
       padding: 3px 20px;
       clear: both;
@@ -242,7 +243,8 @@
     }
 
     > li > a,
-    > li > span {
+    > li > span,
+    > li > .button_to {
       @include screen-sm-max {
         padding: 15px;
         padding-left: 35px;
@@ -256,7 +258,8 @@
       }
     }
 
-    > li > a {
+    > li > a,
+    > li > .button_to {
       &:hover,
       &:focus {
         @include screen-sm-max {
@@ -268,6 +271,28 @@
         }
       }
     }
+
+    .button_to {
+      display: inline;
+
+      input[type="submit"] {
+        background: none;
+        padding: 0;
+        border: none;
+        color: black;
+        text-decoration: underline;
+
+        .lte-ie7 & {
+          font-size: 16px;
+        }
+      }
+
+      &:hover {
+        background-color: $grey-lightest;
+      }
+    }
+
+
   }
 
   .open .dropdown-toggle {
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 45aff482a5..9b72f0065f 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -93,9 +93,10 @@ html.no-js
                           li
                             = link_to "Enable 2FA", admin_enable_authy_path
                         li
-                          = link_to "Sign out",
+                          = button_to "Sign out",
                               destroy_admin_session_path,
-                              method: :delete
+                              method: :delete,
+                              class: "btn btn-link as-link"
 
                     a.dropdown-toggle.if-no-js-hide href="#" data-toggle="dropdown" role="button" aria-expanded="false"
                       ' My account

From a787b9862417b149fda7ee1ed23bd862d981f491 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 1 Aug 2023 13:52:56 +0100
Subject: [PATCH 182/352] add non-js signout for assessor and judge

---
 .../stylesheets/admin/header-footer.scss      |  9 ++++++---
 app/views/layouts/application-admin.html.slim |  2 +-
 .../layouts/application-assessor.html.slim    | 19 +++++++++++++++++--
 app/views/layouts/application-judge.html.slim | 19 +++++++++++++++++--
 app/views/layouts/twofactor.html.slim         | 13 +++++++++++--
 5 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 78834a1a77..881b7ff646 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -240,16 +240,21 @@
       line-height: 1.42857143;
       color: #333333;
       white-space: nowrap;
+
+      @include screen-sm-max {
+        padding: 0;
+      }
     }
 
     > li > a,
     > li > span,
-    > li > .button_to {
+    > li > .button_to > input[type="submit"] {
       @include screen-sm-max {
         padding: 15px;
         padding-left: 35px;
         color: $white-true;
         text-transform: uppercase;
+        text-align: left;
       }
 
       .lte-ie8 & {
@@ -291,8 +296,6 @@
         background-color: $grey-lightest;
       }
     }
-
-
   }
 
   .open .dropdown-toggle {
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 9b72f0065f..74a781e61d 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -96,7 +96,7 @@ html.no-js
                           = button_to "Sign out",
                               destroy_admin_session_path,
                               method: :delete,
-                              class: "btn btn-link as-link"
+                              class: "btn as-link"
 
                     a.dropdown-toggle.if-no-js-hide href="#" data-toggle="dropdown" role="button" aria-expanded="false"
                       ' My account
diff --git a/app/views/layouts/application-assessor.html.slim b/app/views/layouts/application-assessor.html.slim
index 6323148a3b..b481ddca34 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -60,8 +60,23 @@ html.no-js
                       = link_to "Reports", assessor_reports_path(year: @award_year.year), role: "tab"
 
                 ul.nav.navbar-nav.navbar-right
-                  li.dropdown
-                    a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+                  li
+                    details.if-js-hide
+                      summary My Account
+                      ul.dropdown-menu
+                        li
+                          span
+                            strong = current_subject.decorate.full_name
+                            br
+                            small = current_subject.email
+                        li.divider
+                        li
+                          = button_to "Sign out",
+                              destroy_assessor_session_path,
+                              method: :delete,
+                              class: "btn as-link"
+
+                    a.dropdown-toggle.if-no-js-hide href="#" data-toggle="dropdown" role="button" aria-expanded="false"
                       ' My account
                       span.caret
                     ul.dropdown-menu
diff --git a/app/views/layouts/application-judge.html.slim b/app/views/layouts/application-judge.html.slim
index a1d45d573a..4cc69287f1 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -57,8 +57,23 @@ html.no-js
                     = link_to "Downloads", judge_case_summaries_path
 
                 ul.nav.navbar-nav.navbar-right role="navigation"
-                  li.dropdown
-                    a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+                  li
+                    details.if-js-hide
+                      summary My Account
+                      ul.dropdown-menu
+                        li
+                          span
+                            strong = current_subject.decorate.full_name
+                            br
+                            small = current_subject.email
+                        li.divider
+                        li
+                          = button_to "Sign out",
+                              destroy_judge_session_path,
+                              method: :delete,
+                              class: "btn as-link"
+
+                    a.dropdown-toggle.if-no-js-hide href="#" data-toggle="dropdown" role="button" aria-expanded="false"
                       ' My account
                       span.caret
                     ul.dropdown-menu
diff --git a/app/views/layouts/twofactor.html.slim b/app/views/layouts/twofactor.html.slim
index a0856ad4c2..6b26763156 100644
--- a/app/views/layouts/twofactor.html.slim
+++ b/app/views/layouts/twofactor.html.slim
@@ -48,8 +48,17 @@ html.no-js
               .navbar-collapse.collapse#nav-main-collapse
 
                 ul.nav.navbar-nav.navbar-right
-                  li.dropdown
-                    a.dropdown-toggle href="#" data-toggle="dropdown" role="button" aria-expanded="false"
+                  li
+                    details.if-js-hide
+                      summary My Account
+                      ul.dropdown-menu
+                        li
+                          = button_to "Sign out",
+                              destroy_admin_session_path,
+                              method: :delete,
+                              class: "btn btn-link as-link"
+
+                    a.dropdown-toggle.if-no-js-hide href="#" data-toggle="dropdown" role="button" aria-expanded="false"
                       ' My account
                       span.caret
                     ul.dropdown-menu

From 0014814c64739b1cfb0cfb29ea62d0b43cb921fd Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 1 Aug 2023 14:21:41 +0100
Subject: [PATCH 183/352] Add arrow to dropdown menu

---
 app/assets/stylesheets/admin/header-footer.scss  | 1 -
 app/views/layouts/application-admin.html.slim    | 6 ++++--
 app/views/layouts/application-assessor.html.slim | 4 +++-
 app/views/layouts/application-judge.html.slim    | 4 +++-
 app/views/layouts/twofactor.html.slim            | 4 +++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 881b7ff646..5eb5b0fb37 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -38,7 +38,6 @@
     }
   }
 
-
   .container {
     .lte-ie8 & {
       width: 90% !important;
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 74a781e61d..3fad9a5495 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -80,8 +80,10 @@ html.no-js
 
                 ul.nav.navbar-nav.navbar-right
                   li
-                    details.if-js-hide
-                      summary My Account
+                    details.if-js-hide.dropdown-toggle
+                      summary
+                        ' My Account
+                        span.caret
                       ul.dropdown-menu
                         li
                           span
diff --git a/app/views/layouts/application-assessor.html.slim b/app/views/layouts/application-assessor.html.slim
index b481ddca34..4a72b60887 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -62,7 +62,9 @@ html.no-js
                 ul.nav.navbar-nav.navbar-right
                   li
                     details.if-js-hide
-                      summary My Account
+                      summary
+                        ' My Account
+                        span.caret
                       ul.dropdown-menu
                         li
                           span
diff --git a/app/views/layouts/application-judge.html.slim b/app/views/layouts/application-judge.html.slim
index 4cc69287f1..90192b7d8c 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -59,7 +59,9 @@ html.no-js
                 ul.nav.navbar-nav.navbar-right role="navigation"
                   li
                     details.if-js-hide
-                      summary My Account
+                      summary
+                        ' My Account
+                        span.caret
                       ul.dropdown-menu
                         li
                           span
diff --git a/app/views/layouts/twofactor.html.slim b/app/views/layouts/twofactor.html.slim
index 6b26763156..8a33eba865 100644
--- a/app/views/layouts/twofactor.html.slim
+++ b/app/views/layouts/twofactor.html.slim
@@ -50,7 +50,9 @@ html.no-js
                 ul.nav.navbar-nav.navbar-right
                   li
                     details.if-js-hide
-                      summary My Account
+                      summary
+                        ' My Account
+                        span.caret
                       ul.dropdown-menu
                         li
                           = button_to "Sign out",

From be6fd8efd5e23d482b1d31c4d5cd9c98ca6b35b8 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 1 Aug 2023 08:32:20 -0300
Subject: [PATCH 184/352] Fix specs

---
 app/assets/javascripts/admin/form_answers.js.coffee        | 2 +-
 app/controllers/concerns/assessment_submission_mixin.rb    | 7 ++++++-
 .../_submit_appraisal_form.html.slim                       | 2 +-
 spec/features/assessor/appraisal_form_submission_spec.rb   | 6 ++++++
 spec/support/shared_contexts/appraisal_form_context.rb     | 6 ++++++
 5 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 4e681d9c7a..0b37b30d13 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -341,7 +341,7 @@ ready = ->
       message = "Case summary submitted"
 
     removeExistingErrorMessages(panel)
-    container.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'success'))
+    panel.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'success'))
 
     $(this).find('input:submit').remove()
 
diff --git a/app/controllers/concerns/assessment_submission_mixin.rb b/app/controllers/concerns/assessment_submission_mixin.rb
index a6e7bd4d50..86b97f58e1 100644
--- a/app/controllers/concerns/assessment_submission_mixin.rb
+++ b/app/controllers/concerns/assessment_submission_mixin.rb
@@ -8,7 +8,7 @@ def create
     respond_to do |format|
       format.json { render(json_response) }
       format.html do
-        render_flash_message_for(resource, message: resource.errors.none? ? nil : resource.errors.full_messages.join(", "))
+        render_flash_message_for(resource, message: flash_message)
         redirect_to [namespace_name, resource.form_answer]
       end
     end
@@ -34,6 +34,11 @@ def form_answer
 
   private
 
+  def flash_message
+    return nil if resource.errors.none?
+    resource.errors.full_messages.join(", ")
+  end
+
   def json_response
     json = @service.as_json
     resp = { json: @service.errors }
diff --git a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
index efb9cdf2bb..ecf4400712 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
@@ -3,7 +3,7 @@
             authenticity_token: true,
             remote: true,
             class: "submit-assessment",
-            "data-type" => "json")
+            data: { type: "json" })
 
     = hidden_field_tag :assessment_id, assessment.id, id: "#{assessment.position}_assessment_id_submit_appraisal_form_hidden_field"
 
diff --git a/spec/features/assessor/appraisal_form_submission_spec.rb b/spec/features/assessor/appraisal_form_submission_spec.rb
index 037943e4d8..7982cd175e 100644
--- a/spec/features/assessor/appraisal_form_submission_spec.rb
+++ b/spec/features/assessor/appraisal_form_submission_spec.rb
@@ -23,11 +23,17 @@
 
     it "submits the form" do
       allow_any_instance_of(AssessorAssignment).to receive(:valid?).and_return(true)
+      
       find("#appraisal-form-primary-heading .panel-title a").click
+      
       take_a_nap
+      
       within "#section-appraisal-form-primary" do
         click_button "Submit appraisal"
       end
+
+      visit assessor_form_answer_path form_answer
+      
       expect(form_answer.assessor_assignments.primary).to be_submitted
     end
   end
diff --git a/spec/support/shared_contexts/appraisal_form_context.rb b/spec/support/shared_contexts/appraisal_form_context.rb
index 3ac3f873df..732ceeb456 100644
--- a/spec/support/shared_contexts/appraisal_form_context.rb
+++ b/spec/support/shared_contexts/appraisal_form_context.rb
@@ -108,7 +108,11 @@ def assert_description_change(section_id, header_id)
       expect(page).to have_selector("textarea", count: 1)
       find("textarea").fill_in(with: text)
     end
+
+    all(".form-cancel-link").each(&:click)
+
     within parent_selector do
+      find(".form-edit-link").click
       find(".form-save-link").click
       wait_for_ajax
     end
@@ -135,6 +139,8 @@ def assert_multiple_description_change(section_id, header_id, prefix)
 
   within section_id do
     fill_in("#{prefix}_verdict", with: text2)
+    all(".form-cancel-link").each(&:click)
+    all(".form-edit-link").last.click
     all(".form-save-link").last.click
     wait_for_ajax
   end

From 96e5a22a27f4a6fba7c5b4d8e85fe52de19bd9d3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 1 Aug 2023 12:48:38 -0300
Subject: [PATCH 185/352] Fix issue with overlapping JS flash messages

---
 .../javascripts/admin/form_answers.js.coffee  | 39 ++++++++++++-------
 .../form_answers/_assessors_section.html.slim | 10 ++---
 2 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 0b37b30d13..d36bc6d886 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -98,22 +98,35 @@ ready = ->
     return
 
   $(".section-applicant-users form").on "ajax:success", (e, data, status, xhr) ->
-    form = $(this)
-    form.find(".errors-holder").text("")
-    form.closest(".form-group").removeClass("form-edit")
-    formValueBox = form.closest(".form-group").find(".edit-value")
-    selected = form.find("select :selected")
+    panel = this.closest(".form-group")
+
+    removeExistingErrorMessages(panel)
+
+    $(this).closest(".form-group").removeClass("form-edit")
+    formValueBox = $(this).closest(".form-group").find(".edit-value")
+    selected = $(this).find("select :selected")
+
+
     if (selected.val() == "")
       formValueBox.html("<span class='p-empty'>Not assigned</span>")
+      message = "Assessor has been unassigned"
     else
-      formValueBox.text(selected.text())
+      assessor = selected.text()
+      formValueBox.text(assessor)
+      message = "#{assessor} has been assigned"
+
+    panel.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'success'))
+
   $(".section-applicant-users form").on "ajax:error", (e, data, status, xhr) ->
-    form = $(this)
-    errors = ""
-    for k, error of data.responseJSON["errors"]
-      errors += error
+    errors = data.responseJSON['errors']
+    panel = this.closest('.form-group')
 
-    form.find(".errors-holder").text(errors)
+    removeExistingErrorMessages(panel)
+
+    Object.entries(errors).forEach ([key, values]) ->
+      field = panel.querySelector("[id$=#{key}]")
+      if field and shouldValidateField(field)
+        showErrorForInvalidField(field, values, '.form-group')
 
   $("#new_form_answer_attachment").on "fileuploadsubmit", (e, data) ->
     data.formData =
@@ -429,12 +442,12 @@ shouldValidateField = (field) ->
     'button'
   ].includes(field.type)
 
-showErrorForInvalidField = (field, values) ->
+showErrorForInvalidField = (field, values, containerSelector = '.form-container') ->
   group = field.closest('.govuk-form-group')
   if (group)
     group.classList.add('field-with-errors')
 
-  container = field.closest('.form-container')
+  container = field.closest(containerSelector)
 
   if container
     values.forEach (message) ->
diff --git a/app/views/admin/form_answers/_assessors_section.html.slim b/app/views/admin/form_answers/_assessors_section.html.slim
index 1308de427c..ed2666d945 100644
--- a/app/views/admin/form_answers/_assessors_section.html.slim
+++ b/app/views/admin/form_answers/_assessors_section.html.slim
@@ -12,7 +12,7 @@
         = resource.lead_assessors
       .clear
 
-    li.form-group.primary-assessor-assignment[data-controller="element-focus inline-flash"]
+    li.form-group.primary-assessor-assignment[data-controller="element-focus"]
       label[for='assessor_assignment_primary_assessor_id']
         ' Primary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
@@ -25,7 +25,7 @@
       - if policy(resource).assign_assessor?
         = form_for [namespace_name, resource.assessor_assignments.primary],
                    remote: true,
-                   html: { data: { type: "json", inline_flash_target: "form" } },
+                   html: { data: { type: "json" } },
                    authenticity_token: true do |form|
 
           .form-fields
@@ -43,10 +43,9 @@
             span.if-no-js-hide
               = link_to "Cancel", "#", class: "btn btn-default form-cancel-link", data: { element_focus_target: "dismiss" }
             = form.submit "Save", class: "btn btn-primary form-save-button"
-          .errors-holder
       .clear
 
-    li.form-group.secondary-assessor-assignment[data-controller="element-focus inline-flash"]
+    li.form-group.secondary-assessor-assignment[data-controller="element-focus"]
       label[for='assessor_assignment_secondary_assessor_id']
         span.assessor-label Secondary:
       .form-value class=("ellipsis edit-value" if policy(resource).assign_assessor?)
@@ -59,7 +58,7 @@
       - if policy(resource).assign_assessor?
         = form_for [namespace_name, resource.assessor_assignments.secondary],
                    remote: true,
-                   html: { data: { type: "json", inline_flash_target: "form" } },
+                   html: { data: { type: "json" } },
                    authenticity_token: true do |form|
 
           .form-fields
@@ -77,5 +76,4 @@
             span.if-no-js-hide
               = link_to "Cancel", "#", class: "btn btn-default form-cancel-link", data: { element_focus_target: "dismiss" }
             = form.submit "Save", class: "btn btn-primary form-save-button"
-          .errors-holder
       .clear

From 46506ac12a3cc68dc9222e3dee23ed3d82339d0a Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 1 Aug 2023 14:55:21 -0300
Subject: [PATCH 186/352] Move `after_action` to the concern

This fixes failing specs on production in which `after_action` callback seems to be executed after tables are truncated.
---
 app/controllers/admin/press_summaries_controller.rb    | 1 -
 app/controllers/assessor/press_summaries_controller.rb | 1 -
 app/controllers/concerns/press_summary_mixin.rb        | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/admin/press_summaries_controller.rb b/app/controllers/admin/press_summaries_controller.rb
index 014c034531..4c28971411 100644
--- a/app/controllers/admin/press_summaries_controller.rb
+++ b/app/controllers/admin/press_summaries_controller.rb
@@ -1,4 +1,3 @@
 class Admin::PressSummariesController < Admin::BaseController
-  after_action :log_event, only: [:create, :update, :submit, :signoff]
   include PressSummaryMixin
 end
diff --git a/app/controllers/assessor/press_summaries_controller.rb b/app/controllers/assessor/press_summaries_controller.rb
index b7cb8089a8..56a3f68807 100644
--- a/app/controllers/assessor/press_summaries_controller.rb
+++ b/app/controllers/assessor/press_summaries_controller.rb
@@ -1,4 +1,3 @@
 class Assessor::PressSummariesController < Assessor::BaseController
-  after_action :log_event, only: [:create, :update, :submit, :signoff]
   include PressSummaryMixin
 end
diff --git a/app/controllers/concerns/press_summary_mixin.rb b/app/controllers/concerns/press_summary_mixin.rb
index 291f9532b2..0f6ca9e83a 100644
--- a/app/controllers/concerns/press_summary_mixin.rb
+++ b/app/controllers/concerns/press_summary_mixin.rb
@@ -4,6 +4,7 @@ module PressSummaryMixin
   def self.included(base)
     base.before_action :load_form_answer
     base.before_action :load_press_summary, except: :create
+    base.after_action :log_event, only: [:create, :update, :submit, :signoff]
   end
 
   def create

From 56c7ae186ab9d67c3812a1c1be68074616e30e60 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 1 Aug 2023 14:55:21 -0300
Subject: [PATCH 187/352] Move `after_action` to the concern

This fixes failing specs on production in which `after_action` callback seems to be executed after tables are truncated.
---
 app/controllers/admin/press_summaries_controller.rb    | 1 -
 app/controllers/assessor/press_summaries_controller.rb | 1 -
 app/controllers/concerns/press_summary_mixin.rb        | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/controllers/admin/press_summaries_controller.rb b/app/controllers/admin/press_summaries_controller.rb
index 014c034531..4c28971411 100644
--- a/app/controllers/admin/press_summaries_controller.rb
+++ b/app/controllers/admin/press_summaries_controller.rb
@@ -1,4 +1,3 @@
 class Admin::PressSummariesController < Admin::BaseController
-  after_action :log_event, only: [:create, :update, :submit, :signoff]
   include PressSummaryMixin
 end
diff --git a/app/controllers/assessor/press_summaries_controller.rb b/app/controllers/assessor/press_summaries_controller.rb
index b7cb8089a8..56a3f68807 100644
--- a/app/controllers/assessor/press_summaries_controller.rb
+++ b/app/controllers/assessor/press_summaries_controller.rb
@@ -1,4 +1,3 @@
 class Assessor::PressSummariesController < Assessor::BaseController
-  after_action :log_event, only: [:create, :update, :submit, :signoff]
   include PressSummaryMixin
 end
diff --git a/app/controllers/concerns/press_summary_mixin.rb b/app/controllers/concerns/press_summary_mixin.rb
index 291f9532b2..0f6ca9e83a 100644
--- a/app/controllers/concerns/press_summary_mixin.rb
+++ b/app/controllers/concerns/press_summary_mixin.rb
@@ -4,6 +4,7 @@ module PressSummaryMixin
   def self.included(base)
     base.before_action :load_form_answer
     base.before_action :load_press_summary, except: :create
+    base.after_action :log_event, only: [:create, :update, :submit, :signoff]
   end
 
   def create

From 66f7043a79de0a1ad8e38313bf3be4b9b0dde073 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:54:02 +0100
Subject: [PATCH 188/352] Updates Added Commercial Figures mailer copy

---
 app/mailers/users/commercial_figures_mailer.rb            | 2 +-
 app/views/users/commercial_figures_mailer/notify.text.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mailers/users/commercial_figures_mailer.rb b/app/mailers/users/commercial_figures_mailer.rb
index a00cccaef2..9b32bfc494 100644
--- a/app/mailers/users/commercial_figures_mailer.rb
+++ b/app/mailers/users/commercial_figures_mailer.rb
@@ -3,7 +3,7 @@ def notify(form_answer_id, user_id)
     @form_answer = FormAnswer.find(form_answer_id).decorate
     @recipient = User.find(user_id).decorate
 
-    subject = "King's Awards for Enterprise: Latest financial information has been submitted"
+    subject = "King's Awards for Enterprise: Latest financial information has been submitted - Application ref #{@form_answer.urn}"
     send_mail_if_not_bounces ENV['GOV_UK_NOTIFY_API_TEMPLATE_ID'], to: @recipient.email, subject: subject_with_env_prefix(subject)
   end
 end
diff --git a/app/views/users/commercial_figures_mailer/notify.text.erb b/app/views/users/commercial_figures_mailer/notify.text.erb
index a74f84a90b..47a916be0f 100644
--- a/app/views/users/commercial_figures_mailer/notify.text.erb
+++ b/app/views/users/commercial_figures_mailer/notify.text.erb
@@ -1,6 +1,6 @@
 <%= "Dear #{@recipient.full_name}," %>
 
-Thank you for submitting the latest financial information.
+Thank you for submitting the latest financial information as requested for your King’s Award application <%= @form_answer.urn %>.
 
 Please do not make any public announcement of your shortlisted status as the assessment process is ongoing and reaching this stage is not a guarantee of success.
 

From 8b872ce616a9b80e5cbfd9f1e8d4d5cb620144d0 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 14:56:19 +0100
Subject: [PATCH 189/352] Updates Added Audit Certificate mailer copy

---
 app/mailers/users/audit_certificate_mailer.rb            | 2 +-
 app/views/users/audit_certificate_mailer/notify.text.erb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/mailers/users/audit_certificate_mailer.rb b/app/mailers/users/audit_certificate_mailer.rb
index 0a849ce37e..91d637c2ba 100644
--- a/app/mailers/users/audit_certificate_mailer.rb
+++ b/app/mailers/users/audit_certificate_mailer.rb
@@ -3,7 +3,7 @@ def notify(form_answer_id, user_id)
     @form_answer = FormAnswer.find(form_answer_id).decorate
     @recipient = User.find(user_id).decorate
 
-    subject = "King's Awards for Enterprise: Verification of Commercial Figures submitted"
+    subject = "King's Awards for Enterprise: Verification of Commercial Figures submitted - Application ref #{@form_answer.urn}"
     send_mail_if_not_bounces ENV['GOV_UK_NOTIFY_API_TEMPLATE_ID'], to: @recipient.email, subject: subject_with_env_prefix(subject)
   end
 end
diff --git a/app/views/users/audit_certificate_mailer/notify.text.erb b/app/views/users/audit_certificate_mailer/notify.text.erb
index a74f84a90b..47a916be0f 100644
--- a/app/views/users/audit_certificate_mailer/notify.text.erb
+++ b/app/views/users/audit_certificate_mailer/notify.text.erb
@@ -1,6 +1,6 @@
 <%= "Dear #{@recipient.full_name}," %>
 
-Thank you for submitting the latest financial information.
+Thank you for submitting the latest financial information as requested for your King’s Award application <%= @form_answer.urn %>.
 
 Please do not make any public announcement of your shortlisted status as the assessment process is ongoing and reaching this stage is not a guarantee of success.
 

From 65b111d8171f6ffe83a79d141b0ce643528d3496 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 15:57:13 +0100
Subject: [PATCH 190/352] Updates Reminder to submit mailer copy

---
 .../reminder_to_submit_mailer/notify.text.erb             | 6 +++---
 .../reminder_to_submit_mailer/preview/notify.html.slim    | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb b/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
index 41f310e728..7ca3967bd4 100644
--- a/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
+++ b/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
@@ -1,13 +1,13 @@
 Dear King’s Award applicant,
 
-We’re really happy to hear that you’ve started your application, so don’t forget to complete and submit it by <%= @deadline %>. After this point, you will lose your chance for your business to win this internationally-respected accolade. So act now!
+We’re really happy to hear that you’ve started your application. Please don’t forget to complete and submit it by <%= @deadline %>. After that date, you will lose your chance for your business to be awarded this internationally respected accolade. So act now!
 
-Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, these Awards are a unique way to recognise your achievements.
+Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or have a highly effective sustainable development programme, these Awards are a unique way to recognise your achievements.
 
 Visit the King’s Awards for Enterprise website to continue and submit your application via the link below:
 <%= edit_form_url(id: @form_answer.id) %>
 
-If you have already submitted your application, please ignore this message.
+If you have already submitted your application - for example for another category, or you have decided not to submit your application - please ignore this message.
 
 Thank you,
 
diff --git a/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim b/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
index b43ee707d0..5014eea2fb 100644
--- a/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
+++ b/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
@@ -2,12 +2,12 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   | Dear King’s Award applicant,
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | We’re really happy to hear that you’ve started your application, so don’t forget to complete and submit it by
+  | We’re really happy to hear that you’ve started your application. Please don’t forget to complete and submit it by
   =< @deadline
-  | . After this point, you will lose your chance for your business to win this internationally-respected accolade. So act now!
+  | . After that date, you will lose your chance for your business to be awarded this internationally respected accolade. So act now!
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, these Awards are a unique way to recognise your achievements.
+  | Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or have a highly effective sustainable development programme, these Awards are a unique way to recognise your achievements.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   | Visit the King’s Awards for Enterprise website to continue and submit your application via the link below:
@@ -16,7 +16,7 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   = link_to edit_form_url(id: @form_answer.id), edit_form_url(id: @form_answer.id)
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | If you have already submitted your application, please ignore this message.
+  | If you have already submitted your application - for example for another category, or you have decided not to submit your application - please ignore this message.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   | Thank you,

From 13ecfd157bff637e092067a7ab841e3d3edf43e5 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:00:14 +0100
Subject: [PATCH 191/352] Updates shortlisted mailers copy

---
 app/mailers/users/audit_certificate_request_mailer.rb    | 2 +-
 .../preview/notify.html.slim                             | 9 +++------
 .../users/audit_certificate_request_mailer_spec.rb       | 2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/mailers/users/audit_certificate_request_mailer.rb b/app/mailers/users/audit_certificate_request_mailer.rb
index 05dfbb41ff..69cbf3c9af 100644
--- a/app/mailers/users/audit_certificate_request_mailer.rb
+++ b/app/mailers/users/audit_certificate_request_mailer.rb
@@ -10,7 +10,7 @@ def notify(form_answer_id, user_id)
     @deadline_time = "midnight" if midnight?
     @deadline_time = "midday" if midday?
 
-    @subject = "King's Awards for Enterprise: Reminder to provide verification of commercial figures"
+    @subject = "King's Awards for Enterprise: Reminder to provide verification of commercial figures - Application ref #{@form_answer.urn}"
     send_mail_if_not_bounces ENV['GOV_UK_NOTIFY_API_TEMPLATE_ID'], to: @recipient.email, subject: subject_with_env_prefix(@subject)
   end
 
diff --git a/app/views/users/audit_certificate_request_mailer/preview/notify.html.slim b/app/views/users/audit_certificate_request_mailer/preview/notify.html.slim
index 30ada76f75..dfd3ed2797 100644
--- a/app/views/users/audit_certificate_request_mailer/preview/notify.html.slim
+++ b/app/views/users/audit_certificate_request_mailer/preview/notify.html.slim
@@ -36,19 +36,16 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | 3. If relevant, in the External Accountant's Report, provide actual figures to replace estimates submitted at the time of the application or make any other changes to the figures. If you make any revisions, you have to sign the Applicant's Management's Statement section in the report.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | 4. Once you make the revisions (if any), the accountant may perform their own relevant procedures and will return the completed External Accountant's Report to the applicant.
+  | 4. Once you make the revisions (if any), the accountant may perform their own relevant procedures and will return the completed External Accountant's Report.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | 5. Log in and upload the External Accountant's Report to the King’s Award online portal, “Verification of figures” page, by following the link below:<br/>
+  | 5. Log in and upload the External Accountant's Report to The King’s Award online portal, “Verification of figures” page, by following the link below:<br/>
   = link_to(users_form_answer_audit_certificate_url(@form_answer), users_form_answer_audit_certificate_url(@form_answer))
 
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 p style="font-size: 19px; line-height: 1.315789474; margin: 38px 0 38px 0;"
   | Yours sincerely,
   br
   br
   | Nichola Bruno
   br
-  | Head, The King’s Awards for Enterprise Office
+  | Head of The King’s Awards Office
diff --git a/spec/mailers/users/audit_certificate_request_mailer_spec.rb b/spec/mailers/users/audit_certificate_request_mailer_spec.rb
index 569e152e77..c2bc51c134 100644
--- a/spec/mailers/users/audit_certificate_request_mailer_spec.rb
+++ b/spec/mailers/users/audit_certificate_request_mailer_spec.rb
@@ -14,7 +14,7 @@
 
   let(:award_title) { form_answer.decorate.award_application_title }
   let(:subject) {
-    "King's Awards for Enterprise: Reminder to provide verification of commercial figures"
+    "King's Awards for Enterprise: Reminder to provide verification of commercial figures - Application ref #{form_answer.urn}"
   }
 
   before do

From 549a07ef6b53ce499daa56629e96a6126e7e8dc6 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:08:37 +0100
Subject: [PATCH 192/352] Updates Press Book Entry mailer copy

---
 app/views/users/winners_press_release/notify.html.slim | 7 +++++--
 app/views/users/winners_press_release/notify.text.slim | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/users/winners_press_release/notify.html.slim b/app/views/users/winners_press_release/notify.html.slim
index ac167d9a4c..306b20a6d5 100644
--- a/app/views/users/winners_press_release/notify.html.slim
+++ b/app/views/users/winners_press_release/notify.html.slim
@@ -2,16 +2,19 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   = "Dear #{@user.full_name},"
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' Your Press Book piece has been written by an assessor, and is ready for you to check over.
+  ' Your Press Book entry for application #{@form_answer.urn} has been written by an assessor, and is ready for you to check.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' Although you will not be able to edit the piece yourself, you can make comments that we will try to take into account.
+  ' Although you will not be able to edit the entry yourself, you can make comments in the dedicated space below the entry which we will try to take into account.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   ' The deadline for doing so is
   = @deadline
   ' .
 
+p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
+  ' Please use the link below to access the text.
+
   = link_to "Check your Press book piece.", users_form_answer_press_summary_url(@form_answer, token: @token)
 
 p style="font-weight: 700; font-size: 19px; line-height: 1.315789474; margin: 38px 0 38px 0;"
diff --git a/app/views/users/winners_press_release/notify.text.slim b/app/views/users/winners_press_release/notify.text.slim
index 0bc39845d9..89132bf1d7 100644
--- a/app/views/users/winners_press_release/notify.text.slim
+++ b/app/views/users/winners_press_release/notify.text.slim
@@ -1,13 +1,15 @@
 = "Dear #{@user.full_name},"
 
-' Your Press Book piece has been written by an assessor, and is ready for you to check over.
+' Your Press Book entry for application #{@form_answer.urn} has been written by an assessor, and is ready for you to check.
 
-' Although you will not be able to edit the piece yourself, you can make comments that we will try to take into account.
+' Although you will not be able to edit the entry yourself, you can make comments in the dedicated space below the entry which we will try to take into account.
 
 ' The deadline for doing so is
 = @deadline
 ' .
 
+' Please use the link below to access the text.
+
 = link_to "Check your Press book piece.", users_form_answer_press_summary_url(@form_answer, token: @token)
 
 ' Thank you,

From 14db0024324656aa36020d238da28e3718d4f489 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:13:04 +0100
Subject: [PATCH 193/352] Updates Shortlisted Reminder mailer copy

---
 app/mailers/users/shortlisted_reminder_mailer.rb           | 2 +-
 .../users/shortlisted_reminder_mailer/notify.text.erb      | 6 ++----
 .../shortlisted_reminder_mailer/preview/notify.html.slim   | 7 ++-----
 spec/mailers/users/shortlisted_reminder_mailer_spec.rb     | 2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/app/mailers/users/shortlisted_reminder_mailer.rb b/app/mailers/users/shortlisted_reminder_mailer.rb
index c07e0318e6..4357924e2c 100644
--- a/app/mailers/users/shortlisted_reminder_mailer.rb
+++ b/app/mailers/users/shortlisted_reminder_mailer.rb
@@ -10,7 +10,7 @@ def notify(form_answer_id, user_id)
     @deadline_time = "midnight" if midnight?
     @deadline_time = "midday" if midday?
 
-    @subject = "King's Awards for Enterprise: Reminder to provide latest financial statements & VAT returns"
+    @subject = "King's Awards for Enterprise: Reminder to provide latest financial statements & VAT returns - Application ref #{@form_answer.urn}"
     send_mail_if_not_bounces ENV['GOV_UK_NOTIFY_API_TEMPLATE_ID'], to: @recipient.email, subject: subject_with_env_prefix(@subject)
   end
 
diff --git a/app/views/users/shortlisted_reminder_mailer/notify.text.erb b/app/views/users/shortlisted_reminder_mailer/notify.text.erb
index b136997d48..8f4b8cd79e 100644
--- a/app/views/users/shortlisted_reminder_mailer/notify.text.erb
+++ b/app/views/users/shortlisted_reminder_mailer/notify.text.erb
@@ -4,7 +4,7 @@ We are emailing to remind you that you have until
 
 #<%= @deadline_time %> on <%= @deadline %>
 
-to provide the latest financial statements & VAT returns and, if applicable, an explanation of the variance between the estimates and the actuals by following the link below:
+to provide the latest financial statements & VAT returns and, if applicable, an explanation of the variance between the estimates and the actuals. Please do this by following the link below:
 
 <%= users_form_answer_figures_and_vat_returns_url(@form_answer) %>
 
@@ -21,9 +21,7 @@ If you do not submit the required latest financial information before the deadli
     a) any of the actual figures are worse by 10% or more. Please explain the reasons for the difference.
     b) the actuals include losses that you did not state on your application form. Please explain the reasons for the losses and how your business is financially viable.
 
-Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 Yours sincerely,
 
 Nichola Bruno
-Head, The King’s Awards for Enterprise Office
+Head of The King’s Awards Office
diff --git a/app/views/users/shortlisted_reminder_mailer/preview/notify.html.slim b/app/views/users/shortlisted_reminder_mailer/preview/notify.html.slim
index c311b60cf1..219674dac2 100644
--- a/app/views/users/shortlisted_reminder_mailer/preview/notify.html.slim
+++ b/app/views/users/shortlisted_reminder_mailer/preview/notify.html.slim
@@ -9,7 +9,7 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
     = "#{@deadline_time} on #{@deadline}"
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | to provide the latest financial statements & VAT returns and, if applicable, an explanation of the variance between the estimates and the actuals by following the link below:
+  | to provide the latest financial statements & VAT returns and, if applicable, an explanation of the variance between the estimates and the actuals. Please do this by following the link below:
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   = link_to(users_form_answer_figures_and_vat_returns_url(@form_answer), users_form_answer_figures_and_vat_returns_url(@form_answer))
@@ -40,13 +40,10 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   br
   | b) the actuals include losses that you did not state on your application form. Please explain the reasons for the losses and how your business is financially viable.
 
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | Yours sincerely,
   br
   br
   | Nichola Bruno
   br
-  | Head, The King’s Awards for Enterprise Office
+  | Head of The King’s Awards Office
diff --git a/spec/mailers/users/shortlisted_reminder_mailer_spec.rb b/spec/mailers/users/shortlisted_reminder_mailer_spec.rb
index db0be1367f..823fd38c31 100644
--- a/spec/mailers/users/shortlisted_reminder_mailer_spec.rb
+++ b/spec/mailers/users/shortlisted_reminder_mailer_spec.rb
@@ -14,7 +14,7 @@
 
   let(:award_title) { form_answer.decorate.award_application_title }
   let(:subject) do
-    "King's Awards for Enterprise: Reminder to provide latest financial statements & VAT returns"
+    "King's Awards for Enterprise: Reminder to provide latest financial statements & VAT returns - Application ref #{form_answer.urn}"
   end
 
   before do

From 89f423ed176baf07e9639d3d55d9d3839fb43c29 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 2 Aug 2023 16:18:36 +0100
Subject: [PATCH 194/352] Updates non-shortlisted mailer copy

---
 .../notify_non_shortlisted_mailer.rb               |  2 +-
 .../notify_non_shortlisted_mailer/notify.text.erb  | 11 ++++++-----
 .../preview/notify.html.slim                       | 14 +++++++-------
 .../notify_non_shortlisted_mailer_spec.rb          |  2 +-
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/mailers/account_mailers/notify_non_shortlisted_mailer.rb b/app/mailers/account_mailers/notify_non_shortlisted_mailer.rb
index b32ef27d04..f6d0a3e9b2 100644
--- a/app/mailers/account_mailers/notify_non_shortlisted_mailer.rb
+++ b/app/mailers/account_mailers/notify_non_shortlisted_mailer.rb
@@ -5,7 +5,7 @@ def notify(form_answer_id, collaborator_id)
     collaborator = User.find(collaborator_id)
 
     @current_year = @form_answer.award_year.year
-    @subject = "King's Awards for Enterprise: Thank you for applying"
+    @subject = "King's Awards for Enterprise: Thank you for applying - Application ref #{@form_answer.urn}"
 
     send_mail_if_not_bounces ENV['GOV_UK_NOTIFY_API_TEMPLATE_ID'], to: collaborator.email, subject: subject_with_env_prefix(@subject)
   end
diff --git a/app/views/account_mailers/notify_non_shortlisted_mailer/notify.text.erb b/app/views/account_mailers/notify_non_shortlisted_mailer/notify.text.erb
index cc728b4610..027ae987d1 100644
--- a/app/views/account_mailers/notify_non_shortlisted_mailer/notify.text.erb
+++ b/app/views/account_mailers/notify_non_shortlisted_mailer/notify.text.erb
@@ -1,14 +1,15 @@
 Dear <%= @user.decorate.full_name %>,
 
-Thank you for your application to the <%= @current_year %> King's Awards for Enterprise. I am sorry to inform you that you have not been shortlisted.
+Thank you for your application to the <%= @current_year %> King's Awards for Enterprise. I am sorry to inform you that you have not been shortlisted. I know that this will be disappointing news after the time you have spent preparing your application.
 
-This year we received many high quality applications and the competition was particularly strong.
+The Awards application process is naturally rigorous and comprehensive and we are aware that feedback is important. We will therefore write again in April <%= @current_year %> to provide feedback, which we hope you will find useful for any future applications.
 
-We are aware that the application process is comprehensive and that feedback is important. We will, therefore, write again in April <%= @current_year %> to provide feedback on your application, which we hope you will find useful for any future applications.
 
-#Please note that The King's Awards Office will not have any further information on the assessment of your application before April so will not be able to discuss anything related to your <%= @current_year %> application until then.
+Applicants who have not been successful have told us that the feedback has been helpful in strengthening their next application and that they have gone on to re-apply in a future round.
+
+#Please note that The King's Awards Office will not have any further information on the assessment of your application before April so will not be able to discuss anything related to your <%= @current_year %> application until feedback is shared.
 
 Thank you for taking the time to enter The King's Awards for Enterprise.
 
 Nichola Bruno
-Head, The King's Awards Office
+Head of The King's Awards Office
diff --git a/app/views/account_mailers/notify_non_shortlisted_mailer/preview/notify.html.slim b/app/views/account_mailers/notify_non_shortlisted_mailer/preview/notify.html.slim
index 253d61f076..0a0c3c928d 100644
--- a/app/views/account_mailers/notify_non_shortlisted_mailer/preview/notify.html.slim
+++ b/app/views/account_mailers/notify_non_shortlisted_mailer/preview/notify.html.slim
@@ -4,21 +4,21 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   ' Thank you for your application to the
   => @current_year
-  | King's Awards for Enterprise. I am sorry to inform you that you have not been shortlisted.
+  | King's Awards for Enterprise. I am sorry to inform you that you have not been shortlisted. I know that this will be disappointing news after the time you have spent preparing your application.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' This year we received many high quality applications and the competition was particularly strong.
+  ' The Awards application process is naturally rigorous and comprehensive and we are aware that feedback is important. We will therefore write again in April
+  => @current_year
+  | to provide feedback, which we hope you will find useful for any future applications.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' We are aware that the application process is comprehensive and that feedback is important. We will, therefore, write again in April
-  => @current_year
-  | to provide feedback on your application, which we hope you will find useful for any future applications.
+  ' Applicants who have not been successful have told us that the feedback has been helpful in strengthening their next application and that they have gone on to re-apply in a future round.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   strong
     ' Please note that The King's Awards Office will not have any further information on the assessment of your application before April so will not be able to discuss anything related to your
     => @current_year
-    | application until then.
+    | application until feedback is shared.
 
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
@@ -27,4 +27,4 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   br
   ' Nichola Bruno
   br
-  ' Head, The King's Awards Office
+  ' Head of The King's Awards Office
diff --git a/spec/mailers/account_mailers/notify_non_shortlisted_mailer_spec.rb b/spec/mailers/account_mailers/notify_non_shortlisted_mailer_spec.rb
index 40f1e67d54..9a1cd8cf89 100644
--- a/spec/mailers/account_mailers/notify_non_shortlisted_mailer_spec.rb
+++ b/spec/mailers/account_mailers/notify_non_shortlisted_mailer_spec.rb
@@ -8,7 +8,7 @@
 
   let(:award_title) { form_answer.decorate.award_application_title }
   let(:subject) do
-    "King's Awards for Enterprise: Thank you for applying"
+    "King's Awards for Enterprise: Thank you for applying - Application ref #{form_answer.urn}"
   end
 
   describe "#notify" do

From cb829f435221e6454726bd5d103d9465424a6979 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <65811538+TheDancingClown@users.noreply.github.com>
Date: Thu, 3 Aug 2023 08:15:16 +0100
Subject: [PATCH 195/352] Revert "Revert "Adds accessible error messages""

---
 .../frontend/form-validation.js.coffee        | 97 +++++++++++++++----
 .../v2024/innovation/innovation_step1.rb      |  5 +-
 .../v2024/innovation/innovation_step2.rb      |  6 +-
 .../v2024/innovation/innovation_step3.rb      |  2 +-
 .../v2024/innovation/innovation_step4.rb      |  1 +
 .../international_trade_step1.rb              |  5 +-
 .../international_trade_step2.rb              |  5 +-
 .../social_mobility/social_mobility_step1.rb  |  5 +-
 .../social_mobility/social_mobility_step2.rb  |  5 +-
 .../sustainable_development_step1.rb          |  5 +-
 .../sustainable_development_step2.rb          |  5 +-
 app/forms/qae_form_builder.rb                 |  1 +
 .../qae_form_builder/address_question.rb      | 30 +-----
 .../checkbox_seria_question.rb                | 10 +-
 .../qae_form_builder/confirm_question.rb      | 13 +++
 app/forms/qae_form_builder/date_question.rb   |  6 +-
 ...innovation_financial_year_date_question.rb |  2 +-
 .../multi_question_validator.rb               |  2 +-
 .../qae_form_builder/options_question.rb      | 13 +++
 app/forms/qae_form_builder/question.rb        |  4 +-
 .../sic_code_dropdown_question.rb             | 12 +++
 .../qae_form_builder/sub_fields_question.rb   | 46 +++++++++
 app/forms/qae_form_builder/year_question.rb   |  7 ++
 .../qae_form/_address_question.html.slim      | 36 +++++--
 .../_press_contact_details_question.html.slim | 52 +++++-----
 ...ueen_award_applications_question.html.slim | 12 +--
 .../_queen_award_holder_question.html.slim    |  8 +-
 app/views/qae_form/_question.html.slim        |  8 +-
 .../qae_form/_sub_fields_question.html.slim   | 39 ++++++++
 app/views/qae_form/_text_question.html.slim   | 12 ++-
 spec/decorators/form_answer_decorator_spec.rb |  2 +-
 31 files changed, 339 insertions(+), 117 deletions(-)
 create mode 100644 app/forms/qae_form_builder/sub_fields_question.rb
 create mode 100644 app/views/qae_form/_sub_fields_question.html.slim

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 973b5ccb8b..9695846bde 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -145,11 +145,49 @@ window.FormValidation =
       for subquestion in subquestions
         if not @validateSingleQuestion($(subquestion))
           @logThis(question, "validateRequiredQuestion", "This field is required")
-          @addErrorMessage($(subquestion), "This field is required")
+          @addSubfieldError(question, subquestion)
     else
       if not @validateSingleQuestion(question)
         @logThis(question, "validateRequiredQuestion", "This field is required")
-        @addErrorMessage(question, "This field is required")
+        @addQuestionError(question)
+
+  addSubfieldError: (question, subquestion) ->
+    questionRef = question.attr("data-question_ref")
+    input = $(subquestion).find('input,textarea,select').filter(':visible')
+    label = $("label[for='#{input.attr('id')}']").text()
+    incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
+
+    if question.hasClass('date-DDMMYYYY')
+      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format DD/MM/YYYY.")
+    else if question.hasClass('date-MMYYYY')
+      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format MM/YYYY.")
+    else if question.hasClass('date-YYYY')
+      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format YYYY.")
+    else if input.hasClass("autocomplete__input")
+      @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list.")
+    else
+      if question.find(".js-financial-year-latest").length
+        #avoid duplicate errors for financial year questions
+        return
+      else
+        @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
+
+  addQuestionError: (question) ->
+    questionRef = question.attr("data-question_ref")
+    incompleteMessage = "Question #{questionRef} is incomplete. It is required"
+    if @isOptionsQuestion(question)
+      @addErrorMessage(question, "#{incompleteMessage} and an option must be chosen from the following list.")
+    else if @isSelectQuestion(question)
+      @addErrorMessage(question, "#{incompleteMessage} and an option must be selected from the following dropdown list.")
+    else if @isTextishQuestion(question) && !question.hasClass("question-year")
+      @addErrorMessage(question, "#{incompleteMessage} and must be filled in.")
+    else if question.hasClass("question-year")
+      @addErrorMessage(question, "#{incompleteMessage} and must be filled in. Use the format YYYY.")
+    else if @isCheckboxQuestion(question)
+      if question.find("input[type='checkbox']").length > 1
+        @addErrorMessage(question, "#{incompleteMessage} and at least one option must be chosen from the following list.")
+      else
+        @addErrorMessage(question, "#{incompleteMessage} and confirmation must be given by ticking the checkbox.")
 
   validateMatchQuestion: (question) ->
     q = question.find(".match")
@@ -161,6 +199,7 @@ window.FormValidation =
 
   validateMaxDate: (question) ->
     val = question.find("input[type='number']").val()
+    questionRef = question.attr("data-question_ref")
 
     questionYear = question.find(".js-date-input-year").val()
     questionMonth = question.find(".js-date-input-month").val()
@@ -175,7 +214,7 @@ window.FormValidation =
 
     if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Not a valid date")
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY.")
       return
 
     if diff > 0
@@ -291,6 +330,7 @@ window.FormValidation =
       @addErrorMessage(question, "Not a valid number")
 
   validateEmployeeMin: (question) ->
+    questionRef = question.attr("data-question_ref")
     for subquestion in question.find("input")
       shownQuestion = true
       for conditional in $(subquestion).parents('.js-conditional-question')
@@ -299,9 +339,10 @@ window.FormValidation =
 
       if shownQuestion
         subq = $(subquestion)
+        label = $("label[for='#{subq.attr('id')}']").text()
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateEmployeeMin", "This field is required")
-          @appendMessage(subq.closest(".span-financial"), "This field is required")
+          @appendMessage(subq.closest(".span-financial"), "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -374,6 +415,7 @@ window.FormValidation =
 
   validateCurrentAwards: (question) ->
     $(".govuk-error-message", question).empty()
+    questionRef = question.attr("data-question_ref")
 
     for subquestion in question.find(".list-add li")
       errors = false
@@ -382,7 +424,7 @@ window.FormValidation =
         if !$(input).val()
           fieldName = $(input).data("dependable-option-siffix")
           fieldName = fieldName[0].toUpperCase() + fieldName.slice(1)
-          fieldError = "#{fieldName} can't be blank. "
+          fieldError = "Question #{questionRef} is incomplete. #{fieldName} is required and an option must be selected from the following list. "
           @logThis(question, "validateCurrentAwards", fieldError)
           @appendMessage($(input).closest('.govuk-form-group'), fieldError)
           errors = true
@@ -402,6 +444,7 @@ window.FormValidation =
       subq = $(subquestion)
       qParent = subq.closest(".js-fy-entries")
       errContainer = subq.closest(".span-financial")
+      questionRef = question.attr("data-question_ref")
 
       shownQuestion = true
       for conditional in $(subquestion).parents('.js-conditional-question')
@@ -413,7 +456,8 @@ window.FormValidation =
 
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateMoneyByYears", "This field is required")
-          @appendMessage(errContainer, "This field is required")
+          label = $("label[for='#{subq.attr('id')}']").text()
+          @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -448,41 +492,54 @@ window.FormValidation =
     if !conditional
       return
     # end of conditional validation
+    questionRef = question.attr("data-question_ref")
 
     for subquestionBlock in question.find(".by-years-wrapper.show-question .govuk-date-input")
       subq = $(subquestionBlock)
       qParent = subq.closest(".js-fy-entries")
+      label = qParent.find(".js-year-default").text()
       errorsContainer = qParent.find(".govuk-error-message").html()
 
       day = subq.find("input.js-fy-day").val()
       month = subq.find("input.js-fy-month").val()
       year = subq.find("input.js-fy-year").val()
 
-      if (not day or not month or not year)
-        if question.hasClass("question-required") && errorsContainer.length < 1
+      if question.hasClass("question-required") && errorsContainer.length < 1
+        if (not day and not month and not year)
           @logThis(question, "validateDateByYears", "This field is required")
-          @appendMessage(qParent, "This field is required")
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Use the format DD/MM/YYYY.")
           @addErrorClass(question)
-      else
-        complexDateString = day + "/" + month + "/" + year
-        date = @toDate(complexDateString)
+        else if (not day)
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} day is required and must be filled in. Use the format DD.")
+        else if (not month)
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} month is required and must be filled in. Use the format MM.")
+        else if (not year)
+          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} year is required and must be filled in. Use the format YYYY.")
+        else
+          complexDateString = day + "/" + month + "/" + year
+          date = @toDate(complexDateString)
 
-        if not date.isValid()
-          @logThis(question, "validateDateByYears", "Not a valid date")
-          @appendMessage(qParent, "Not a valid date")
-          @addErrorClass(question)
+          if not date.isValid()
+            @logThis(question, "validateDateByYears", "Not a valid date")
+            @appendMessage(qParent, "Not a valid date")
+            @addErrorClass(question)
 
   validateInnovationFinancialDate: (question) ->
-
     val = question.find("input[type='number']").val()
-
+    questionRef = question.attr("data-question_ref")
     questionDay = parseInt(question.find(".innovation-day").val())
     questionMonth = parseInt(question.find(".innovation-month").val())
     questionDate = "#{questionDay}/#{questionMonth}/#{moment().format('Y')}"
 
-    if not @toDate(questionDate).isValid()
+    if (not questionDay and not questionMonth)
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. Year-end is required and must be filled in. Use the format DD/MM.")
+    else if not questionDay
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. Day is required and must be filled in. Use the format DD/MM.")
+    else if not questionMonth
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. Month is required and must be filled in. Use the format DD/MM.")
+    else if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Not a valid date")
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM.")
       return
 
   validateDiffBetweenDates: (question) ->
diff --git a/app/forms/award_years/v2024/innovation/innovation_step1.rb b/app/forms/award_years/v2024/innovation/innovation_step1.rb
index fb9c20f019..6e426508d0 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step1.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step1.rb
@@ -12,14 +12,15 @@ def innovation_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
+          required
           sub_ref "A 1.2"
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/innovation/innovation_step2.rb b/app/forms/award_years/v2024/innovation/innovation_step2.rb
index 18399588dd..4405f6a87b 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step2.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step2.rb
@@ -115,7 +115,7 @@ def innovation_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context -> do
@@ -156,7 +156,8 @@ def innovation_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
+          required
           ref "B 7"
           context %(
             <p class='govuk-hint'><em>
@@ -278,6 +279,7 @@ def innovation_step2
         queen_award_applications :applied_for_queen_awards_details, " List the Queen's/King's awards you have applied for in the last 10 years." do
           classes "sub-question question-current-awards"
           sub_ref "B 12.1"
+          required
 
           conditional :applied_for_queen_awards, :yes
 
diff --git a/app/forms/award_years/v2024/innovation/innovation_step3.rb b/app/forms/award_years/v2024/innovation/innovation_step3.rb
index 0329a8b673..e5de6a9086 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step3.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step3.rb
@@ -284,7 +284,7 @@ def innovation_step3
 
         date :innovation_was_launched_in_the_market, "Select the date when your innovation was launched in the market." do
           sub_section :innovation_timeline_header
-          classes "sub-question"
+          classes "sub-question date-DDMMYYYY"
           sub_ref "C 2.2"
           required
           context -> do
diff --git a/app/forms/award_years/v2024/innovation/innovation_step4.rb b/app/forms/award_years/v2024/innovation/innovation_step4.rb
index 3245beda7e..f3086bafb3 100644
--- a/app/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/app/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -481,6 +481,7 @@ def innovation_step4
         end
 
         options :product_estimated_figures, "Are any of the figures used on this page estimates?" do
+          required
           ref "D 9"
           yes_no
           context %(
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
index df378d884d..1eec16e3c3 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step1.rb
@@ -14,14 +14,15 @@ def trade_step1
           )
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
+          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
index 3a436b64bf..c6945269f1 100644
--- a/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
+++ b/app/forms/award_years/v2024/international_trade/international_trade_step2.rb
@@ -118,7 +118,7 @@ def trade_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context %(
@@ -156,8 +156,9 @@ def trade_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
+          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
index f1d2059cdc..835cb18344 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step1.rb
@@ -12,14 +12,15 @@ def mobility_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
+          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
index db722a4e0d..0bd7cc83fd 100644
--- a/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
+++ b/app/forms/award_years/v2024/social_mobility/social_mobility_step2.rb
@@ -116,7 +116,7 @@ def mobility_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context %(
@@ -154,8 +154,9 @@ def mobility_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
+          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
index 5139046680..71da8439aa 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step1.rb
@@ -13,14 +13,15 @@ def development_step1
           text "I confirm that I have the consent of the head of my organisation to fill in and submit this entry form."
         end
 
-        head_of_business :head_of_business, "Details of the head of your organisation" do
+        sub_fields :head_of_business, "Details of the head of your organisation" do
           sub_ref "A 1.2"
+          required
           classes "sub-question"
           sub_fields([
             { title: "Title" },
             { first_name: "First name" },
             { last_name: "Last name" },
-            { honours: "Personal Honours (optional)" },
+            { honours: "Personal Honours (optional)", hint: "For example, Lieutenant (LVO), Member of the Most Excellent Order of the British Empire (MBE), Air Force Cross (AFC). Please do not include qualifications such as a master's degree or doctorate." },
             { job_title: "Job title or role in the organisation" },
             { email: "Email address" }
           ])
diff --git a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
index 95f31abe63..41d85e431f 100644
--- a/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
+++ b/app/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
@@ -116,7 +116,7 @@ def development_step2
         end
 
         date :started_trading, "Date started trading." do
-          classes "js-started-trading"
+          classes "js-started-trading date-DDMMYYYY"
           required
           ref "B 5"
           context %(
@@ -154,8 +154,9 @@ def development_step2
           style "small"
         end
 
-        press_contact_details :press_contact_details, "Contact details for press enquiries." do
+        sub_fields :press_contact_details, "Contact details for press enquiries." do
           ref "B 7"
+          required
           context %(
             <p class='govuk-hint'><em>
               If your application is successful, you may get contacted by the press.
diff --git a/app/forms/qae_form_builder.rb b/app/forms/qae_form_builder.rb
index 3bfdb4b018..3c5474fc94 100644
--- a/app/forms/qae_form_builder.rb
+++ b/app/forms/qae_form_builder.rb
@@ -28,6 +28,7 @@
 require "qae_form_builder/position_details_question"
 require "qae_form_builder/previous_name_question"
 require "qae_form_builder/country_question"
+require "qae_form_builder/sub_fields_question"
 require "qae_form_builder/address_question"
 require "qae_form_builder/head_of_business_question"
 require "qae_form_builder/press_contact_details_question"
diff --git a/app/forms/qae_form_builder/address_question.rb b/app/forms/qae_form_builder/address_question.rb
index 71162b0b38..cab52cc487 100644
--- a/app/forms/qae_form_builder/address_question.rb
+++ b/app/forms/qae_form_builder/address_question.rb
@@ -1,27 +1,9 @@
 class QAEFormBuilder
-  class AddressQuestionValidator < QuestionValidator
+  class AddressQuestionValidator < SubFieldsQuestionValidator
     NO_VALIDATION_SUB_FIELDS = [:street, :county]
-    def errors
-      result = super
-
-      if question.required?
-        question.required_sub_fields.each do |sub_field|
-          suffix = sub_field.keys[0]
-          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
-            result[question.hash_key(suffix: suffix)] ||= ""
-            result[question.hash_key(suffix: suffix)] << " Can't be blank."
-          end
-        end
-      end
-
-      # need to add govuk-form-group--errors class
-      result[question.hash_key] ||= "" if result.any?
-
-      result
-    end
   end
 
-  class AddressQuestionDecorator < QuestionDecorator
+  class AddressQuestionDecorator < SubFieldsQuestionDecorator
     include RegionHelper
 
     def required_sub_fields
@@ -50,15 +32,11 @@ def rendering_sub_fields
     end
   end
 
-  class AddressQuestionBuilder < QuestionBuilder
+  class AddressQuestionBuilder < SubFieldsQuestionBuilder
     def countries(countries)
       @q.countries = countries
     end
 
-    def sub_fields(fields)
-      @q.sub_fields = fields
-    end
-
     def region_context(region_context)
       @q.region_context = region_context
     end
@@ -68,7 +46,7 @@ def county_context(county_context)
     end
   end
 
-  class AddressQuestion < Question
+  class AddressQuestion < SubFieldsQuestion
     attr_accessor :countries, :sub_fields, :region_context, :county_context
   end
 end
diff --git a/app/forms/qae_form_builder/checkbox_seria_question.rb b/app/forms/qae_form_builder/checkbox_seria_question.rb
index 05ce55ca17..c43a438565 100644
--- a/app/forms/qae_form_builder/checkbox_seria_question.rb
+++ b/app/forms/qae_form_builder/checkbox_seria_question.rb
@@ -1,7 +1,15 @@
 class QAEFormBuilder
   class CheckboxSeriaQuestionValidator < QuestionValidator
     def errors
-      result = super
+      result = {}
+
+      return {} if skip_base_validation?
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and at least one option must be chosen from the following list."
+        end
+      end
 
       if question.input_value && question.selection_limit
         if question.input_value.size > question.selection_limit
diff --git a/app/forms/qae_form_builder/confirm_question.rb b/app/forms/qae_form_builder/confirm_question.rb
index 7f87e11f06..1417657ca4 100644
--- a/app/forms/qae_form_builder/confirm_question.rb
+++ b/app/forms/qae_form_builder/confirm_question.rb
@@ -1,5 +1,18 @@
 class QAEFormBuilder
   class ConfirmQuestionValidator < QuestionValidator
+    def errors
+      result = {}
+
+      return {} if skip_base_validation?
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and confirmation must be given by ticking the checkbox."
+        end
+      end
+
+      result
+    end
   end
 
   class ConfirmQuestionBuilder < QuestionBuilder
diff --git a/app/forms/qae_form_builder/date_question.rb b/app/forms/qae_form_builder/date_question.rb
index f32058be0d..b0a56ca7bb 100644
--- a/app/forms/qae_form_builder/date_question.rb
+++ b/app/forms/qae_form_builder/date_question.rb
@@ -16,17 +16,17 @@ def errors
       if !date
         if question.required?
           result[question.hash_key] ||= ""
-          result[question.hash_key] << " Invalid date."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. It requires a date in the format DD/MM/YYYY."
         end
       else
         if date_min && date < date_min
           result[question.hash_key] ||= ""
-          result[question.hash_key] << " Date should be greater than #{date_min.strftime('%d/%m/%Y')}."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be after #{date_min.strftime('%d/%m/%Y')}."
         end
 
         if date_max && date > date_max
           result[question.hash_key] ||= ""
-          result[question.hash_key] << " Date should be less than #{date_max.strftime('%d/%m/%Y')}."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be before #{date_max.strftime('%d/%m/%Y')}."
         end
       end
 
diff --git a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
index 7c8ba036c1..698f370cd5 100644
--- a/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
+++ b/app/forms/qae_form_builder/innovation_financial_year_date_question.rb
@@ -14,7 +14,7 @@ def errors
 
       if !date && question.required?
         result[question.hash_key] ||= ""
-        result[question.hash_key] << " Invalid date."
+        result[question.hash_key] << "#{question.ref || question.sub_ref} is incomplete. Year-end is required. Use the format MM/YYYY"
       end
 
       result
diff --git a/app/forms/qae_form_builder/multi_question_validator.rb b/app/forms/qae_form_builder/multi_question_validator.rb
index f0e59d9fd2..695da61256 100644
--- a/app/forms/qae_form_builder/multi_question_validator.rb
+++ b/app/forms/qae_form_builder/multi_question_validator.rb
@@ -7,7 +7,7 @@ def errors
         if !entity[attr].present?
           result[question.key] ||= {}
           result[question.key][index] ||= ""
-          result[question.key][index] << " #{attr.humanize.capitalize} can't be blank."
+          result[question.key][index] << "Question #{question.ref || question.sub_ref} is incomplete. #{attr.humanize} can't be blank."
         end
       end
     end
diff --git a/app/forms/qae_form_builder/options_question.rb b/app/forms/qae_form_builder/options_question.rb
index d3f4354923..7ad8b4634e 100644
--- a/app/forms/qae_form_builder/options_question.rb
+++ b/app/forms/qae_form_builder/options_question.rb
@@ -1,5 +1,18 @@
 class QAEFormBuilder
   class OptionsQuestionValidator < QuestionValidator
+    def errors
+      result = {}
+
+      return {} if skip_base_validation?
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and an option must be chosen from the following list."
+        end
+      end
+
+      result
+    end
   end
 
   QuestionAnswerOption = Struct.new(:value, :text)
diff --git a/app/forms/qae_form_builder/question.rb b/app/forms/qae_form_builder/question.rb
index d28342944a..0bff6308d6 100644
--- a/app/forms/qae_form_builder/question.rb
+++ b/app/forms/qae_form_builder/question.rb
@@ -3,6 +3,7 @@ class QuestionValidator
     # multifield questions that can not be simply validated
     SKIP_PRESENCE_VALIDATION_QUESTIONS = [
       "DateQuestion",
+      "SubFieldsQuestion",
       "AddressQuestion",
       "InnovationFinancialYearDateQuestion",
       "ByYearsQuestion",
@@ -32,7 +33,7 @@ def errors
 
       if question.required?
         if !question.input_value.present?
-          result[question.hash_key] = "Can't be blank."
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and must be filled in."
         end
       end
 
@@ -127,6 +128,7 @@ def label_as_legend?
         "by_years_label_question",
         "matrix_question",
         "press_contact_details_question",
+        "sub_fields_question",
         "upload_question"
       ]
 
diff --git a/app/forms/qae_form_builder/sic_code_dropdown_question.rb b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
index e6824aab42..e054e0e1a4 100644
--- a/app/forms/qae_form_builder/sic_code_dropdown_question.rb
+++ b/app/forms/qae_form_builder/sic_code_dropdown_question.rb
@@ -1,5 +1,17 @@
 class QAEFormBuilder
   class SicCodeDropdownQuestionValidator < QuestionValidator
+    def errors
+      result = super
+
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] ||= ""
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and an option must be selected from the following dropdown list."
+        end
+      end
+
+      result
+    end
   end
 
   class SicCodeDropdownQuestionBuilder < DropdownQuestionBuilder
diff --git a/app/forms/qae_form_builder/sub_fields_question.rb b/app/forms/qae_form_builder/sub_fields_question.rb
new file mode 100644
index 0000000000..3b1c6b7f87
--- /dev/null
+++ b/app/forms/qae_form_builder/sub_fields_question.rb
@@ -0,0 +1,46 @@
+class QAEFormBuilder
+  class SubFieldsQuestionValidator < QuestionValidator
+    NO_VALIDATION_SUB_FIELDS = [:honours]
+    def errors
+      result = super
+
+      if question.required?
+        question.required_sub_fields.each do |sub_field|
+          suffix = sub_field.keys[0]
+          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
+            result[question.hash_key(suffix: suffix)] ||= ""
+            result[question.hash_key(suffix: suffix)] << "Question #{question.ref || question.sub_ref} is incomplete. #{suffix.to_s.humanize} is required and and must be filled in."
+          end
+        end
+      end
+
+      # need to add govuk-form-group--errors class
+      result[question.hash_key] ||= "" if result.any?
+
+      result
+    end
+  end
+
+  class SubFieldsQuestionDecorator < QuestionDecorator
+    def required_sub_fields
+      sub_fields
+    end
+
+    def rendering_sub_fields
+      required_sub_fields.map do |f|
+        {key: f.keys.first, title: f.values.first, hint: f.try(:[], :hint)}
+      end
+    end
+  end
+
+  class SubFieldsQuestionBuilder < QuestionBuilder
+    def sub_fields fields
+      @q.sub_fields = fields
+    end
+  end
+
+  class SubFieldsQuestion < Question
+    attr_accessor :sub_fields
+  end
+
+end
diff --git a/app/forms/qae_form_builder/year_question.rb b/app/forms/qae_form_builder/year_question.rb
index b191777163..4b3ad4c108 100644
--- a/app/forms/qae_form_builder/year_question.rb
+++ b/app/forms/qae_form_builder/year_question.rb
@@ -3,6 +3,13 @@ class YearQuestionValidator < QuestionValidator
     def errors
       result = super
 
+      if question.required?
+        if !question.input_value.present?
+          result[question.hash_key] ||= ""
+          result[question.hash_key] = "Question #{question.ref || question.sub_ref} is incomplete. It is required and and must be filled in. Use the format YYYY."
+        end
+      end
+
       year = question.input_value.to_i
 
       if year < question.min || year > question.max
diff --git a/app/views/qae_form/_address_question.html.slim b/app/views/qae_form/_address_question.html.slim
index 3044f08677..711cdb6dc2 100644
--- a/app/views/qae_form/_address_question.html.slim
+++ b/app/views/qae_form/_address_question.html.slim
@@ -14,7 +14,15 @@ div role="group" id="q_#{question.key}"
               | Error:
             = @form_answer.validator_errors[question.hash_key(suffix: "building")]
         span.govuk-error-message
-        input.govuk-input.govuk-input--width-10.js-trigger-autosave.required type="text" name=question.input_name(suffix: 'building') value=question.input_value(suffix: 'building') autocomplete="off"  id="q_#{question.key}_line_1" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_building" : nil )
+        input.govuk-input.govuk-input--width-10.js-trigger-autosave.required[
+          type="text"
+          name=question.input_name(suffix: 'building')
+          value=question.input_value(suffix: 'building')
+          autocomplete="off"
+          id="q_#{question.key}_line_1" *possible_read_only_ops
+          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_building" : nil )
+        ]
+
       .govuk-form-group.question-required
         label.govuk-label for="q_#{question.key}_line_2"
           ' Street
@@ -24,12 +32,20 @@ div role="group" id="q_#{question.key}"
               | Error:
             = @form_answer.validator_errors[question.hash_key(suffix: "street")]
         span.govuk-error-message
-        input.govuk-input.govuk-input--width-10.js-trigger-autosave type="text" name=question.input_name(suffix: 'street') value=question.input_value(suffix: 'street') autocomplete="off" id="q_#{question.key}_line_2" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_street" : nil )
+        input.govuk-input.govuk-input--width-10.js-trigger-autosave[
+          type="text"
+          name=question.input_name(suffix: 'street')
+          value=question.input_value(suffix: 'street')
+          autocomplete="off"
+          id="q_#{question.key}_line_2" *possible_read_only_ops
+          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_street" : nil )
+        ]
+
     - when :country
       .govuk-form-group.question-required
         label.govuk-label for="#{question.key}_country"
           ' Country
-        = country_select(question.step.form.form_name, "#{question.key}_country", {priority_countries: ["GB", "US"], selected: question.input_value(suffix: 'country')}, possible_read_only_ops.merge({name: question.input_name(suffix: 'country'), class: 'js-trigger-autosave required custom-select govuk-!-width-one-half', aria: {describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_country" : nil )}}))
+        = country_select(question.step.form.form_name, "#{question.key}_country", { priority_countries: ["GB", "US"], selected: question.input_value(suffix: 'country') }, possible_read_only_ops.merge({ name: question.input_name(suffix: 'country'), class: 'js-trigger-autosave required custom-select govuk-!-width-one-half', aria: {describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_country" : nil )}, data: {subfield: "Country"}}))
         - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
           span.govuk-error-message
             span.govuk-visually-hidden
@@ -40,7 +56,7 @@ div role="group" id="q_#{question.key}"
 
     - when :county
       .govuk-form-group.question-required
-        label.govuk-label id="#{question.key}_region_label" for="#{question.key}_county" aria-describedby="#{question.key}_county_hint"
+        label.govuk-label id="#{question.key}_region_label" for="form_#{question.key}_#{sub_field_key}" aria-describedby="#{question.key}_county_hint"
           ' County
         - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
           span.govuk-error-message
@@ -54,7 +70,7 @@ div role="group" id="q_#{question.key}"
           .question-context[id="#{question.key}_county_hint"]
             == question.county_context
 
-        = select_tag("#{question.key}_county", options_for_select(question.counties, question.input_value(suffix: "county")), possible_read_only_ops.merge({name: question.input_name(suffix: 'county'), class: "js-trigger-autosave required custom-select govuk-!-width-one-third", include_blank: true, aria: { label: "Select #{question.key}", describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_county" : nil )}}))
+        = select_tag(question.input_name(suffix: sub_field_key), options_for_select(question.counties, question.input_value(suffix: "county")), possible_read_only_ops.merge({ name: question.input_name(suffix: 'county'), class: "js-trigger-autosave required custom-select govuk-!-width-one-third", include_blank: true, aria: { label: "Select #{question.key}", describedby:(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_county" : nil )}}))
 
     - else
       .govuk-form-group.question-required
@@ -70,4 +86,12 @@ div role="group" id="q_#{question.key}"
 
         - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
         - klass <<(QAEFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
-        input.govuk-input.js-trigger-autosave class=klass type="text" id=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key) name=question.input_name(suffix: sub_field_key) autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
+        input.govuk-input.js-trigger-autosave[
+          class=klass
+          type="text"
+          id=question.input_name(suffix: sub_field_key)
+          value=question.input_value(suffix: sub_field_key)
+          name=question.input_name(suffix: sub_field_key)
+          autocomplete="off" *possible_read_only_ops
+          aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
+        ]
diff --git a/app/views/qae_form/_press_contact_details_question.html.slim b/app/views/qae_form/_press_contact_details_question.html.slim
index 335faf4efc..995857a632 100644
--- a/app/views/qae_form/_press_contact_details_question.html.slim
+++ b/app/views/qae_form/_press_contact_details_question.html.slim
@@ -1,25 +1,27 @@
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'title')
-    ' Title
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.tiny type="text" name=question.input_name(suffix: 'title') value=question.input_value(suffix: 'title') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'title')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'first_name')
-    ' First name
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'first_name') value=question.input_value(suffix: 'first_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'first_name')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'last_name')
-    ' Last name
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'last_name') value=question.input_value(suffix: 'last_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'last_name')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'telephone')
-    ' Telephone
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="tel" pattern="[0-9]*" name=question.input_name(suffix: 'telephone') value=question.input_value(suffix: 'telephone') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'telephone')
-.govuk-form-group.question-block.question-required
-  label.govuk-label for=question.input_name(suffix:'email')
-    ' Email address
-  span.govuk-error-message
-  input.js-trigger-autosave.govuk-input.large type="email" name=question.input_name(suffix: 'email') value=question.input_value(suffix: 'email') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'email')
+.govuk-form-group
+  div role="group" id="#{question.key}"
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'title')
+        ' Title
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.tiny type="text" name=question.input_name(suffix: 'title') value=question.input_value(suffix: 'title') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'title')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'first_name')
+        ' First name
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'first_name') value=question.input_value(suffix: 'first_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'first_name')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'last_name')
+        ' Last name
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="text" name=question.input_name(suffix: 'last_name') value=question.input_value(suffix: 'last_name') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'last_name')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'telephone')
+        ' Telephone
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.govuk-input--width-10 type="tel" pattern="[0-9]*" name=question.input_name(suffix: 'telephone') value=question.input_value(suffix: 'telephone') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'telephone')
+    .question-block.question-required
+      label.govuk-label for=question.input_name(suffix:'email')
+        ' Email address
+      span.govuk-error-message
+      input.js-trigger-autosave.govuk-input.large type="email" name=question.input_name(suffix: 'email') value=question.input_value(suffix: 'email') autocomplete="off" *possible_read_only_ops id=question.input_name(suffix: 'email')
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index dbc8837bbe..c6722ccf2b 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -41,7 +41,7 @@ div role="group" id="q_#{question.key}"
                 | Category
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" data-input-value="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][category]"
+                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" data-input-value="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][category]"
                   option value=""
                     ' Category
                   - question.categories.each do |category|
@@ -57,7 +57,7 @@ div role="group" id="q_#{question.key}"
                 | Year
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][year]" data-dependable-option-siffix="year" data-input-value="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][year]"
+                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][year]" data-dependable-option-siffix="year" data-input-value="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][year]"
                   option value=""
                     ' Year
                   - question.years.each do |year|
@@ -73,7 +73,7 @@ div role="group" id="q_#{question.key}"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
               span.if-no-js-hide
-                select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" data-input-value="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][outcome]"
+                select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][#{index}][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" data-input-value="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops id="form[applied_for_queen_awards_details][#{index}][outcome]"
                   option value=""
                     ' Outcome (Won/Did not win)
                   - question.outcomes.each do |outcome|
@@ -96,7 +96,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][category]"
                 | Category
               span.govuk-error-message
-              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" id="form[applied_for_queen_awards_details][0][category]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -107,7 +107,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][year]"
                 | Year
               span.govuk-error-message
-              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key id="form[applied_for_queen_awards_details][0][year]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year
                 - question.years.each do |year|
@@ -118,7 +118,7 @@ div role="group" id="q_#{question.key}"
               label.govuk-label for="form[applied_for_queen_awards_details][0][outcome]"
                 | Outcome (Won/Did not win)
               span.govuk-error-message
-              select.govuk-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.js-trigger-autosave name="form[applied_for_queen_awards_details][0][outcome]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="outcome" id="form[applied_for_queen_awards_details][0][outcome]" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Outcome (Won/Did not win)
                 - question.outcomes.each do |outcome|
diff --git a/app/views/qae_form/_queen_award_holder_question.html.slim b/app/views/qae_form/_queen_award_holder_question.html.slim
index 608224502e..99181bfc39 100644
--- a/app/views/qae_form/_queen_award_holder_question.html.slim
+++ b/app/views/qae_form/_queen_award_holder_question.html.slim
@@ -38,7 +38,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
               label.govuk-form-label for="form[queen_award_holder_details][#{index}][category]"
                 | Category
               div.if-no-js-hide
-                select.inline.govuk-select.js-trigger-autosave name="form[queen_award_holder_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+                select.inline.custom-select.govuk-select.js-trigger-autosave name="form[queen_award_holder_details][#{index}][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                   option value=""
                     ' Category
                   - question.categories.each do |category|
@@ -52,7 +52,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
               label.govuk-form-label name="form[queen_award_holder_details][#{index}][year]"
                 | Year Awarded
               span.if-no-js-hide
-                select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][#{index}][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+                select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][#{index}][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                   option value=""
                     ' Year Awarded
                   - question.years.each do |year|
@@ -72,7 +72,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
             .govuk-form-group
               label for="form[queen_award_holder_details][0][category]"
                 | Category
-              select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][category]" data-dependable-values=dependable_values data-parent-option-dependable-key=question.key data-dependable-option-siffix="category" class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Category
                 - question.categories.each do |category|
@@ -83,7 +83,7 @@ div role="group" id="q_#{question.key}" aria-labelledby="q_#{question.key}_label
             .govuk-form-group
               label for="form[queen_award_holder_details][0][year]"
                 | Year Awarded
-              select.govuk-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
+              select.govuk-select.custom-select.inline.js-trigger-autosave name="form[queen_award_holder_details][0][year]" data-dependable-option-siffix="year" data-parent-option-dependable-key=question.key class=("js-options-with-dependent-child-select" if children_depends_on.present?) *possible_read_only_ops
                 option value=""
                   ' Year Awarded
                 - question.years.each do |year|
diff --git a/app/views/qae_form/_question.html.slim b/app/views/qae_form/_question.html.slim
index 4ac4188f28..15bb9cea1c 100644
--- a/app/views/qae_form/_question.html.slim
+++ b/app/views/qae_form/_question.html.slim
@@ -1,3 +1,5 @@
+- ref = question.ref ? question.ref : question.sub_ref
+
 - if question.header
   h2.govuk-heading-l
     = question.header
@@ -7,10 +9,9 @@
   .govuk-form-group
     == question.context
 - elsif question.label_as_legend?
-  fieldset class=question.fieldset_classes data=question.fieldset_data_hash
+  fieldset class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
-        - ref = question.ref ? question.ref : question.sub_ref
         - if question.title != "" || question.show_ref_always.present?
           legend.govuk-fieldset__legend aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref
@@ -73,10 +74,9 @@
           = render "qae_form/conditional_hints/list", question: question
 
 - else
-  div class=question.fieldset_classes data=question.fieldset_data_hash
+  div class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
-        - ref = question.ref ? question.ref : question.sub_ref
         - if question.title != "" || question.show_ref_always.present?
           label.govuk-label for="q_#{question.key}" id="q_#{question.key}_label" aria-label="#{ref.to_s.gsub(' ', '-')}: #{question.title}" aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
new file mode 100644
index 0000000000..7e08faf020
--- /dev/null
+++ b/app/views/qae_form/_sub_fields_question.html.slim
@@ -0,0 +1,39 @@
+div role="group" id="#{question.key}"
+  - question.rendering_sub_fields.each do |sub_field_block|
+    - sub_field_key = sub_field_block[:key]
+    - sub_field_title = sub_field_block[:title]
+    - sub_field_hint = sub_field_block[:hint]
+
+    .govuk-form-group.question-required
+      label.govuk-label for=question.input_name(suffix: sub_field_key) value=question.input_value(suffix: sub_field_key)
+        = sub_field_title
+      - if @form_answer.validator_errors&.dig(question.hash_key(suffix: sub_field_key))
+        span.govuk-error-message
+          span.govuk-visually-hidden
+            | Error:
+          =< @form_answer.validator_errors[question.hash_key(suffix: sub_field_key)]
+      span.govuk-error-message
+      - if sub_field_hint
+        span.govuk-hint
+          = sub_field_hint
+      .clear
+
+      - case sub_field_key
+      - when :email
+        - klass = 'large'
+      - when :title
+        - klass = 'tiny'
+      - else
+        - klass = 'govuk-input--width-10'
+
+      - klass <<(QAEFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+ 
+      input.govuk-input.js-trigger-autosave[
+        class=klass
+        type="text"
+        id=question.input_name(suffix: sub_field_key)
+        value=question.input_value(suffix: sub_field_key)
+        name=question.input_name(suffix: sub_field_key)
+        autocomplete="off" *possible_read_only_ops
+        aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{sub_field_key}" : nil )
+      ]
diff --git a/app/views/qae_form/_text_question.html.slim b/app/views/qae_form/_text_question.html.slim
index 6b733cf49e..56bdaa66e5 100644
--- a/app/views/qae_form/_text_question.html.slim
+++ b/app/views/qae_form/_text_question.html.slim
@@ -1 +1,11 @@
-input class="govuk-input js-trigger-autosave #{question.style.present? ? question.style : 'govuk-input--width-10'}" type="#{question.type.present? ? question.type.to_s : 'text'}" pattern="#{'[0-9]*' if question.type == 'tel' || question.type == 'number'}" name=question.input_name value=question.input_value autocomplete="off" id="q_#{question.key}" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+input[
+  class="govuk-input js-trigger-autosave
+  #{question.style.present? ? question.style : 'govuk-input--width-10'}"
+  type="#{question.type.present? ? question.type.to_s : 'text'}"
+  pattern="#{'[0-9]*' if question.type == 'tel' || question.type == 'number'}"
+  name=question.input_name
+  value=question.input_value
+  autocomplete="off"
+  id="q_#{question.key}"*possible_read_only_ops
+  aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+]
diff --git a/spec/decorators/form_answer_decorator_spec.rb b/spec/decorators/form_answer_decorator_spec.rb
index 599a446b20..af9e0666d7 100644
--- a/spec/decorators/form_answer_decorator_spec.rb
+++ b/spec/decorators/form_answer_decorator_spec.rb
@@ -92,7 +92,7 @@
   describe "#dashboard_status" do
     it "returns fill progress when application is not submitted" do
      form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SICCode.first.code })
-      expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...9%")
+      expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...8%")
     end
 
     it "warns that assessors are not assigned if assessment is in progress and assessors are not assigned yet for admin section" do

From f7c2d1d96939f899ce4dab80ef0299c7ba966c63 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 2 Aug 2023 17:12:12 +0100
Subject: [PATCH 196/352] Adds custom blank errors for admin user forms

---
 config/locales/en.yml                       | 12 +++++++++++-
 spec/features/account/collaborators_spec.rb |  2 +-
 spec/features/users/support_letters_spec.rb |  2 +-
 spec/models/assessor_assignment_spec.rb     |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93eb8956ad..300127caa8 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -60,8 +60,10 @@ en:
 
   activerecord:
     errors:
+      full_messages:
+        format: "{{message}}"
       messages:
-        blank: This field cannot be blank
+        blank: "%{attribute} is empty - it is a required field and must be filled in"
         accepted: Must be accepted
         taken: "This %{attribute} has already been taken"
         too_long: "%{attribute} is too long (maximum is %{count} characters)"
@@ -71,6 +73,10 @@ en:
       models:
         user:
           attributes:
+            email:
+              invalid: "Email is invalid - enter a valid email address"
+            role:
+              blank: "Account type is empty - it is a required field and an option should be selected from the following list"
             password:
               weak_password: Your new password must be more complex.
         admin:
@@ -81,6 +87,10 @@ en:
           attributes:
             password:
               weak_password: Your new password must be more complex.
+        assessor_assignment:
+          attributes:
+            position:
+              blank: "is empty - it is a required field and an option should be selected from the following list"
 
   time:
     formats:
diff --git a/spec/features/account/collaborators_spec.rb b/spec/features/account/collaborators_spec.rb
index 0acfbbb710..1702c0f3ce 100644
--- a/spec/features/account/collaborators_spec.rb
+++ b/spec/features/account/collaborators_spec.rb
@@ -101,7 +101,7 @@
             end
 
             within(".collaborator_email") do
-              expect_to_see "This field cannot be blank"
+              expect_to_see "Email is empty - it is a required field and must be filled in"
             end
           end
 
diff --git a/spec/features/users/support_letters_spec.rb b/spec/features/users/support_letters_spec.rb
index 6724eb62d3..9eafd66c13 100644
--- a/spec/features/users/support_letters_spec.rb
+++ b/spec/features/users/support_letters_spec.rb
@@ -66,7 +66,7 @@
           SupportLetter.count
         }
 
-        expect_to_see "This field cannot be blank"
+        expect_to_see "First name is empty - it is a required field and must be filled in"
       end
     end
 
diff --git a/spec/models/assessor_assignment_spec.rb b/spec/models/assessor_assignment_spec.rb
index c20a44a857..35e9fdac80 100644
--- a/spec/models/assessor_assignment_spec.rb
+++ b/spec/models/assessor_assignment_spec.rb
@@ -211,7 +211,7 @@
     it 'should return error' do
       assessor_assignment = build :assessor_assignment, position: nil, form_answer: form
       assessor_assignment.valid?
-      expect(assessor_assignment.as_json).to eq({ :error => ["Position This field cannot be blank"] })
+      expect(assessor_assignment.as_json).to eq({ :error => ["Position is empty - it is a required field and an option should be selected from the following list"] })
     end
 
     it 'should return empty json' do

From 196cfaec8d6f6bd051462a7e7b982b1ff80f98ac Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 3 Aug 2023 13:50:42 +0100
Subject: [PATCH 197/352] Specify chromedriver version

---
 .github/workflows/ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b845aafca3..6d77e83fb4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,6 +48,8 @@ jobs:
           node-version: "16"
       - run: npm install -g yarn
       - uses: nanasess/setup-chromedriver@master
+        with:
+            chromedriver-version: '114.0.5735.90'
       - name: Build and run tests
         env:
           DISPLAY_SOCIAL_MOBILITY_AWARD: true

From ff8f02e2c9a0ac0f41b8017452938cf4e62a4f94 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 4 Aug 2023 11:47:42 +0100
Subject: [PATCH 198/352] Updated submitted mailer copy

---
 app/mailers/users/submission_mailer.rb             | 2 +-
 app/views/users/submission_mailer/success.text.erb | 8 +++++---
 spec/mailers/users/submission_spec.rb              | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/mailers/users/submission_mailer.rb b/app/mailers/users/submission_mailer.rb
index 1b3506b9de..4238c9958d 100644
--- a/app/mailers/users/submission_mailer.rb
+++ b/app/mailers/users/submission_mailer.rb
@@ -5,7 +5,7 @@ def success(user_id, form_answer_id)
     @form_answer = FormAnswer.find(form_answer_id).decorate
     @form_owner = @form_answer.user.decorate
     @recipient = User.find(user_id).decorate
-    @subject = "[King's Awards for Enterprise] submission successfully created!"
+    @subject = "[King's Awards for Enterprise] Thank you for submitting your King’s Award Application! - Application ref #{@form_answer.urn}"
 
     send_mail_if_not_bounces ENV['GOV_UK_NOTIFY_API_TEMPLATE_ID'], to: @recipient.email, subject: subject_with_env_prefix(@subject)
   end
diff --git a/app/views/users/submission_mailer/success.text.erb b/app/views/users/submission_mailer/success.text.erb
index 06d2d2b01a..e0260ca548 100644
--- a/app/views/users/submission_mailer/success.text.erb
+++ b/app/views/users/submission_mailer/success.text.erb
@@ -2,15 +2,17 @@
 
 <%= "Dear #{@recipient.full_name}," %>
 
-Thank you for submitting your <%= app_alias %> for <%= @form_answer.promotion? ? "The King's Award for Enterprise Promotion" : "The King's Awards for Enterprise" %> <%= AwardYear.current.year %>.
+Thank you for submitting your <%= app_alias %> for <%= @form_answer.promotion? ? "The King's Award for Enterprise Promotion" : "The King's Awards for Enterprise" %> <%= AwardYear.current.year %> - <%= @form_answer.award_type_full_name %>.
 
 Your Unique Reference Number (URN) is
 #<%= @form_answer.urn %>
 
-You can view and download your submissions (and edit up until <%= remove_html_tags(application_deadline(:submission_end)) %>) by logging into your account:
+You can view and download your submission/s at any time by logging into your account:
 <%= dashboard_url %>
 
-To find out more on what happens next visit please review The King's Awards for Enterprise timeline information page:
+After the deadline, however, submissions cannot be edited or altered.
+
+To find out more on what happens next please visit The King's Awards for Enterprise page:
 <%= timeline_url %>
 
 If you have any further queries about the <%= app_alias %> process you can call us on 020 7215 6880 or email us kingsawards@beis.gov.uk.
diff --git a/spec/mailers/users/submission_spec.rb b/spec/mailers/users/submission_spec.rb
index 4b3b2a28d6..39d1dab8c7 100644
--- a/spec/mailers/users/submission_spec.rb
+++ b/spec/mailers/users/submission_spec.rb
@@ -9,7 +9,7 @@
   end
 
   let(:urn) { form_answer.urn }
-  let(:subject) { "submission successfully created!" }
+  let(:subject) { "Thank you for submitting your King’s Award Application! - Application ref #{form_answer.urn}" }
 
   before do
     form_answer

From bd0ffcad84144e39dda3ab65ab8fd12ee1da610e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 4 Aug 2023 14:29:54 +0100
Subject: [PATCH 199/352] Fix tests

---
 app/views/qae_form/_address_question.html.slim    | 2 +-
 app/views/qae_form/_sub_fields_question.html.slim | 4 ++--
 forms/qae_form_builder/address_question.rb        | 2 +-
 forms/qae_form_builder/sub_fields_question.rb     | 2 +-
 spec/decorators/form_answer_decorator_spec.rb     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/qae_form/_address_question.html.slim b/app/views/qae_form/_address_question.html.slim
index 711cdb6dc2..2310b35faf 100644
--- a/app/views/qae_form/_address_question.html.slim
+++ b/app/views/qae_form/_address_question.html.slim
@@ -85,7 +85,7 @@ div role="group" id="q_#{question.key}"
         .clear
 
         - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
-        - klass <<(QAEFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+        - klass <<(QaeFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
         input.govuk-input.js-trigger-autosave[
           class=klass
           type="text"
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
index 7e08faf020..420e8b07f6 100644
--- a/app/views/qae_form/_sub_fields_question.html.slim
+++ b/app/views/qae_form/_sub_fields_question.html.slim
@@ -26,8 +26,8 @@ div role="group" id="#{question.key}"
       - else
         - klass = 'govuk-input--width-10'
 
-      - klass <<(QAEFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
- 
+      - klass <<(QaeFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+
       input.govuk-input.js-trigger-autosave[
         class=klass
         type="text"
diff --git a/forms/qae_form_builder/address_question.rb b/forms/qae_form_builder/address_question.rb
index cab52cc487..4dc230e55f 100644
--- a/forms/qae_form_builder/address_question.rb
+++ b/forms/qae_form_builder/address_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class AddressQuestionValidator < SubFieldsQuestionValidator
     NO_VALIDATION_SUB_FIELDS = [:street, :county]
   end
diff --git a/forms/qae_form_builder/sub_fields_question.rb b/forms/qae_form_builder/sub_fields_question.rb
index 3b1c6b7f87..afbb0e39e6 100644
--- a/forms/qae_form_builder/sub_fields_question.rb
+++ b/forms/qae_form_builder/sub_fields_question.rb
@@ -1,4 +1,4 @@
-class QAEFormBuilder
+class QaeFormBuilder
   class SubFieldsQuestionValidator < QuestionValidator
     NO_VALIDATION_SUB_FIELDS = [:honours]
     def errors
diff --git a/spec/decorators/form_answer_decorator_spec.rb b/spec/decorators/form_answer_decorator_spec.rb
index 6e9c099800..4e718a6a40 100644
--- a/spec/decorators/form_answer_decorator_spec.rb
+++ b/spec/decorators/form_answer_decorator_spec.rb
@@ -91,7 +91,7 @@
 
   describe "#dashboard_status" do
     it "returns fill progress when application is not submitted" do
-     form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SICCode.first.code })
+     form_answer = create(:form_answer, :trade, state: "application_in_progress", document: { sic_code:  SicCode.first.code })
       expect(described_class.new(form_answer).dashboard_status).to eq("Application in progress...8%")
     end
 

From 4371dc50db6755f67401d32c119143560ecc8d27 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 7 Aug 2023 11:07:18 +0100
Subject: [PATCH 200/352] Upgrade bundler version ahead of buildpack upgrades

---
 .github/workflows/ci.yml | 2 +-
 Dockerfile.local         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6d77e83fb4..dcc470cb51 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
         env:
           DISPLAY_SOCIAL_MOBILITY_AWARD: true
           DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/qae_test"
-          BUNDLER_VERSION: 2.4.8
+          BUNDLER_VERSION: 2.4.16
           DOCKER_TLS_CERTDIR: ""
         run: |
           sudo apt update
diff --git a/Dockerfile.local b/Dockerfile.local
index dda339b8f1..fe451a9ec5 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -18,7 +18,7 @@ COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 RUN bundle config set --local path 'vendor/bundle'
 RUN bundle config set --local without 'development test'
-RUN gem install bundler:2.4.8 && bundle install --jobs 4 --retry 3
+RUN gem install bundler:2.4.16 && bundle install --jobs 4 --retry 3
 
 COPY . /app
 RUN yarn install

From ddde22fa63bef971c2d3e0a4f37fdde35d9b71fb Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 7 Aug 2023 14:55:26 +0100
Subject: [PATCH 201/352] Adds custom error for number of products question

---
 app/assets/javascripts/frontend/form-validation.js.coffee | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 04b189e0b9..b9df9fb845 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -433,6 +433,7 @@ window.FormValidation =
 
   validateNumberByYears: (question) ->
     inputCellsCounter = 0
+    questionRef = question.attr("data-question_ref")
 
     for subquestion in question.find("input")
       subq = $(subquestion)
@@ -446,10 +447,11 @@ window.FormValidation =
 
       if shownQuestion
         inputCellsCounter += 1
+        label = $("label[for='#{subq.attr('id')}']").text()
 
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateNumberByYears", "This field is required")
-          @appendMessage(errContainer, "This field is required")
+          @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
           @addErrorClass(question)
           continue
         else if not subq.val()

From 57b8a32fa5038c0d7aaf1b75465fb1e06f04e7a1 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 8 Aug 2023 13:43:42 +0100
Subject: [PATCH 202/352] qa tweaks to custom errors

---
 .../frontend/form-validation.js.coffee        | 25 ++++++++-----------
 .../_by_years_label_question.html.slim        |  2 +-
 .../qae_form/_by_years_question.html.slim     |  2 +-
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index b9df9fb845..8fe009fcf6 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -212,6 +212,10 @@ window.FormValidation =
     expDate = question.data("date-max")
     diff = @compareDateInDays(questionDate, expDate)
 
+    if not questionYear or not questionMonth or not questionDay
+      @logThis(question, "validateMaxDate", "This field is required")
+      @addErrorMessage(question, "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM/YYYY.")
+      return
     if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
       @addErrorMessage(question, "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY.")
@@ -342,7 +346,8 @@ window.FormValidation =
         label = $("label[for='#{subq.attr('id')}']").text()
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateEmployeeMin", "This field is required")
-          @appendMessage(subq.closest(".span-financial"), "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
+          # todo - this error is duplicated on employee question.
+          # @appendMessage(subq.closest(".span-financial"), "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -531,23 +536,17 @@ window.FormValidation =
       year = subq.find("input.js-fy-year").val()
 
       if question.hasClass("question-required") && errorsContainer.length < 1
-        if (not day and not month and not year)
+        if !(day and month and year)
           @logThis(question, "validateDateByYears", "This field is required")
           @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Use the format DD/MM/YYYY.")
           @addErrorClass(question)
-        else if (not day)
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} day is required and must be filled in. Use the format DD.")
-        else if (not month)
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} month is required and must be filled in. Use the format MM.")
-        else if (not year)
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} year is required and must be filled in. Use the format YYYY.")
         else
           complexDateString = day + "/" + month + "/" + year
           date = @toDate(complexDateString)
 
           if not date.isValid()
             @logThis(question, "validateDateByYears", "Not a valid date")
-            @appendMessage(qParent, "Not a valid date")
+            @appendMessage(qParent, "The date entered for question #{questionRef} #{label} is not valid. Use the format DD/MM/YYYY.")
             @addErrorClass(question)
 
   validateInnovationFinancialDate: (question) ->
@@ -557,15 +556,11 @@ window.FormValidation =
     questionMonth = parseInt(question.find(".innovation-month").val())
     questionDate = "#{questionDay}/#{questionMonth}/#{moment().format('Y')}"
 
-    if (not questionDay and not questionMonth)
+    if not (questionDay and questionMonth)
       @addErrorMessage(question, "Question #{questionRef} is incomplete. Year-end is required and must be filled in. Use the format DD/MM.")
-    else if not questionDay
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. Day is required and must be filled in. Use the format DD/MM.")
-    else if not questionMonth
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. Month is required and must be filled in. Use the format DD/MM.")
     else if not @toDate(questionDate).isValid()
       @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM.")
+      @addErrorMessage(question, "The date entered for #{questionRef} is not valid. Use the format DD/MM.")
       return
 
   validateDiffBetweenDates: (question) ->
diff --git a/app/views/qae_form/_by_years_label_question.html.slim b/app/views/qae_form/_by_years_label_question.html.slim
index b0b2eb1edf..b0744a2bb0 100644
--- a/app/views/qae_form/_by_years_label_question.html.slim
+++ b/app/views/qae_form/_by_years_label_question.html.slim
@@ -1,4 +1,4 @@
-div role="group" id="q_#{question.key}"
+  div role="group" id="q_#{question.key}"
   .js-financial-year-changed-dates
     - for c in question.by_year_conditions
       .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
diff --git a/app/views/qae_form/_by_years_question.html.slim b/app/views/qae_form/_by_years_question.html.slim
index ef8ea45751..6e14fb9503 100644
--- a/app/views/qae_form/_by_years_question.html.slim
+++ b/app/views/qae_form/_by_years_question.html.slim
@@ -15,7 +15,7 @@
                   = y
                   - if y == c.years
                     '  (most recent)
-                span.js-year-text.hide-if-empty
+            span.js-year-text.hide-if-empty.govuk-label
             span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
             span class="#{'govuk-input__wrapper' if question.type == :money}"
               - if question.type == :money

From 237335e3f6962089b1597d82066f6a5c909e6cb7 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 8 Aug 2023 14:23:34 +0100
Subject: [PATCH 203/352] Fix error border on radio questions

---
 app/views/qae_form/_question.html.slim                          | 2 +-
 config/initializers/simple_form.rb                              | 2 +-
 .../non_js_form_dynamic_lists/current_queens_awards_spec.rb     | 2 +-
 spec/features/non_js_form_dynamic_lists/subsidiaries_spec.rb    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/qae_form/_question.html.slim b/app/views/qae_form/_question.html.slim
index e8479a1b7b..20544612b5 100644
--- a/app/views/qae_form/_question.html.slim
+++ b/app/views/qae_form/_question.html.slim
@@ -9,7 +9,7 @@
   .govuk-form-group
     == question.context
 - elsif question.label_as_legend?
-  fieldset class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
+  div class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
     = condition_divs question do
       .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
         - if question.title != "" || question.show_ref_always.present?
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 9e9f44e1fa..37ac36a117 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -87,7 +87,7 @@
   end
 
   config.wrappers :radio_buttons, item_wrapper_class: 'govuk-radios__item', item_label_class: 'govuk-label govuk-radios__label', class: 'govuk-form-group', error_class: "govuk-form-group--error" do |b|
-    b.wrapper tag: :fieldset, class: 'govuk-fieldset' do |bb|
+    b.wrapper tag: :div, class: 'govuk-fieldset' do |bb|
       bb.use :html5
       bb.optional :readonly
 
diff --git a/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb b/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb
index 9b6d5427a7..fdb0b3728e 100644
--- a/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb
+++ b/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb
@@ -73,7 +73,7 @@
     end
 
     it "should allow to add another" do
-      within("fieldset[data-answer=applied_for_queen_awards_details-list-the-queen-s-king-s-awards-you-have-applied-for-in-the-last-10-years]") do
+      within("div[data-answer=applied_for_queen_awards_details-list-the-queen-s-king-s-awards-you-have-applied-for-in-the-last-10-years]") do
         click_link "+ Add award"
       end
       expect_to_see "Add Award"
diff --git a/spec/features/non_js_form_dynamic_lists/subsidiaries_spec.rb b/spec/features/non_js_form_dynamic_lists/subsidiaries_spec.rb
index 9c01cab046..a1a3bf0377 100644
--- a/spec/features/non_js_form_dynamic_lists/subsidiaries_spec.rb
+++ b/spec/features/non_js_form_dynamic_lists/subsidiaries_spec.rb
@@ -64,7 +64,7 @@
     end
 
     it "should allow to add another" do
-      within("fieldset[data-answer='trading_figures_add-for-each-of-the-uk-subsidiaries-included-in-this-application-enter-1-name-2-location-3-number-of-uk-employees-fte-full-time-equivalent-4-the-reason-why-you-are-including-them']") do
+      within("div[data-answer='trading_figures_add-for-each-of-the-uk-subsidiaries-included-in-this-application-enter-1-name-2-location-3-number-of-uk-employees-fte-full-time-equivalent-4-the-reason-why-you-are-including-them']") do
         first(".button-add").click
       end
       expect_to_see "Add subsidiary, associate or plant"

From 6bd7f6945e6a29d671467578b5a1315e6a4c5038 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 8 Aug 2023 19:47:24 +0100
Subject: [PATCH 204/352] Adds custom errors for current queens award

---
 app/value_objects/current_queens_award.rb                     | 4 +++-
 .../non_js_form_dynamic_lists/current_queens_awards_spec.rb   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/value_objects/current_queens_award.rb b/app/value_objects/current_queens_award.rb
index b8292f6a9b..d0dbcc0df4 100644
--- a/app/value_objects/current_queens_award.rb
+++ b/app/value_objects/current_queens_award.rb
@@ -6,7 +6,9 @@ class CurrentQueensAward
 
   attr_reader :categories, :years, :category, :year, :outcome, :outcomes
 
-  validates :category, :year, :outcome, presence: true
+  validates :category, presence: { message: "Category is required and an option must be selected from the following list" }
+  validates :year, presence: { message: "Year is required and an option must be selected from the following list" }
+  validates :outcome, presence: { message: "Outcome is required and an option must be selected from the following list"}
 
   validates :category, length: { maximum: 100 },
                        inclusion: {
diff --git a/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb b/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb
index fdb0b3728e..027e921847 100644
--- a/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb
+++ b/spec/features/non_js_form_dynamic_lists/current_queens_awards_spec.rb
@@ -85,7 +85,7 @@
       }
 
       %w(Category Year).each do |field_name|
-        expect_to_see "#{field_name}\ncan't be blank"
+        expect_to_see "#{field_name} is required and an option must be selected from the following list"
       end
 
       select new_award_category_name, from: "Category"

From 40eefc3bd459602d0b5aca7dd6f8398e18092a0f Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 8 Aug 2023 20:15:57 +0100
Subject: [PATCH 205/352] fix conditional hint

---
 forms/award_years/v2024/innovation/innovation_step4.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index 6cb26a632d..f31eda9e1c 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -63,7 +63,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
-          conditional :financial_year_date_changed, "yes"
+          conditional :financial_year_date_changed, :yes
         end
 
         textarea :adjustments_explanation, "Explain adjustments to figures." do
@@ -80,7 +80,7 @@ def innovation_step4
               Please explain what approach you will take to adjust the figures.
             </p>
           )
-          conditional :financial_year_date_changed, "yes"
+          conditional :financial_year_date_changed, :yes
         end
 
         textarea :financial_year_date_changed_explaination, "Explain why your year-end date changed." do

From 4fcdf4234c95ca4d2b52080567fd51c8b17d50b5 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 9 Aug 2023 08:17:21 +0100
Subject: [PATCH 206/352] Change errors for product question

---
 ..._by_trade_goods_and_services_fields.html.slim | 16 +++++++++++-----
 ...e_goods_and_services_label_question.html.slim |  9 ++++++---
 ...by_trade_goods_and_services_label_question.rb | 12 ++++++++----
 3 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim b/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
index 6f29593880..4b5070dcc2 100644
--- a/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
+++ b/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
@@ -1,19 +1,25 @@
+- errors = @form_answer.validator_errors
+
 li.js-add-example.js-list-item data-value=placement data-type="in_clause_collection"
   .govuk-form-group.trade-good-product.question-required
+    - if question_error = errors&.dig(question.key, placement)
+      span.govuk-error-message
+        = "Product #{placement} is incomplete."
     label.govuk-label for=question.input_name(suffix: "desc_short_#{placement}")
       = "Product or service description #{placement} (word limit: #{question.words_max}):"
-    - errors = @form_answer.validator_errors
-    - if errors && errors[question.key] && errors[question.key][index]
+
+    - if desc_error = errors&.dig(question.key, placement, "desc_short")
       span.govuk-error-message
-        = errors[question.key][index]
-    span.govuk-error-message
+        = desc_error
     textarea.govuk-textarea.js-trigger-autosave.js-char-count rows=question.rows data-word-max=question.words_max name="#{question.input_name}[#{index}][desc_short]" id=question.input_name(suffix: "desc_short_#{placement}") *possible_read_only_ops
       = item.present? ? item['desc_short'] : ''
 
   .govuk-form-group.trade-good-percentage.question-required
     label.govuk-label for=question.input_name(suffix: "total_overseas_trade_#{placement}")
       ' % of your total overseas trade the product/service represents:
-    span.govuk-error-message
+    - if percentage_error = errors&.dig(question.key, placement, "total_overseas_trade")
+      span.govuk-error-message
+        = "#{percentage_error} Use a number to represent the percentage of your total overseas trade."
     input.js-trigger-autosave.govuk-input.govuk-input--width-5 type="number" pattern="[0-9]*" min=question.min max=question.max name="#{question.input_name}[#{index}][total_overseas_trade]" value=(item.present? ? item['total_overseas_trade'] : '') autocomplete="off" id=question.input_name(suffix: "total_overseas_trade_#{placement}") *possible_read_only_ops
 
   = link_to "Remove", "#", class: "remove-link js-remove-link if-no-js-hide #{'visuallyhidden' if (count == 1)} #{'read_only' if admin_in_read_only_mode?}"
diff --git a/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim b/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim
index d2a9e1b5a5..039d5f6d9e 100644
--- a/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim
+++ b/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim
@@ -7,15 +7,18 @@
       - item = question.trade_goods_and_services[index]
       = render "qae_form/by_trade_goods_and_services_fields", placement: placement, item: item, index: index, question: question, count: question.trade_goods_and_services.count
 
+    / if no products saved render one empty product as default
     - if question.trade_goods_and_services.count < 1
       - index = 0, placement = 1, item = {}
       = render "qae_form/by_trade_goods_and_services_fields", placement: placement, item: item, index: index, question: question, count: 1
 
+    / if no javascript render remaining empty products up to the product limit
     noscript
       .list-add
-        - if question.trade_goods_and_services.count < question.product_limit
-          - (question.trade_goods_and_services.count+1..question.product_limit).each do |index|
-            - placement = index
+        - product_count = question.trade_goods_and_services.count == 0 ? 1 : question.trade_goods_and_services.count
+        - if product_count < question.product_limit
+          - (product_count...question.product_limit).each do |index|
+            - placement = question.trade_goods_and_services.count + index + 1
             - item = {}
             = render "qae_form/by_trade_goods_and_services_fields", placement: placement, item: item, index: index, question: question, count: 5
 
diff --git a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
index bc4ec55de4..1b5828487d 100644
--- a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
+++ b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -1,19 +1,23 @@
 class QaeFormBuilder
   class ByTradeGoodsAndServicesLabelQuestionValidator < QuestionValidator
     HUMANIZED_ATTRS = {
-      "desc_short" => "Description"
+      "desc_short" => "Description",
+      "total_overseas_trade" => "Trade percentage"
     }
 
     def errors
       result = super
 
       question.trade_goods_and_services.each_with_index do |entity, index|
-        if index + 1 <= question.answers["trade_goods_and_services_explanations"].length.to_i
+        product_number = index + 1
+
+        if product_number <= question.answers["trade_goods_and_services_explanations"].length.to_i
           question.required_sub_fields_list.each do |attr|
             if !entity[attr].present?
               result[question.key] ||= {}
-              result[question.key][index] ||= ""
-              result[question.key][index] << " #{humanize(attr)} can't be blank."
+              result[question.key][product_number] ||= {}
+              result[question.key][product_number][attr] ||= ""
+              result[question.key][product_number][attr] << "#{humanize(attr)} is required and must be filled in."
             end
           end
         end

From 9fb662602631937451724ae34e434d6c0f0f82e5 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 9 Aug 2023 14:19:47 +0100
Subject: [PATCH 207/352] Change validations for product question

---
 .../_by_trade_goods_and_services_fields.html.slim |  4 +++-
 .../by_trade_goods_and_services_label_question.rb | 15 +++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim b/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
index 4b5070dcc2..41fba14b03 100644
--- a/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
+++ b/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
@@ -11,7 +11,8 @@ li.js-add-example.js-list-item data-value=placement data-type="in_clause_collect
     - if desc_error = errors&.dig(question.key, placement, "desc_short")
       span.govuk-error-message
         = desc_error
-    textarea.govuk-textarea.js-trigger-autosave.js-char-count rows=question.rows data-word-max=question.words_max name="#{question.input_name}[#{index}][desc_short]" id=question.input_name(suffix: "desc_short_#{placement}") *possible_read_only_ops
+    span.govuk-error-message
+    textarea.govuk-textarea.js-trigger-autosave.js-char-count rows=question.rows data-word-max=question.words_max name="#{question.input_name}[#{placement}][desc_short]" id=question.input_name(suffix: "desc_short_#{placement}") *possible_read_only_ops
       = item.present? ? item['desc_short'] : ''
 
   .govuk-form-group.trade-good-percentage.question-required
@@ -20,6 +21,7 @@ li.js-add-example.js-list-item data-value=placement data-type="in_clause_collect
     - if percentage_error = errors&.dig(question.key, placement, "total_overseas_trade")
       span.govuk-error-message
         = "#{percentage_error} Use a number to represent the percentage of your total overseas trade."
+    span.govuk-error-message
     input.js-trigger-autosave.govuk-input.govuk-input--width-5 type="number" pattern="[0-9]*" min=question.min max=question.max name="#{question.input_name}[#{index}][total_overseas_trade]" value=(item.present? ? item['total_overseas_trade'] : '') autocomplete="off" id=question.input_name(suffix: "total_overseas_trade_#{placement}") *possible_read_only_ops
 
   = link_to "Remove", "#", class: "remove-link js-remove-link if-no-js-hide #{'visuallyhidden' if (count == 1)} #{'read_only' if admin_in_read_only_mode?}"
diff --git a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
index 1b5828487d..5a11855a04 100644
--- a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
+++ b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -12,12 +12,15 @@ def errors
         product_number = index + 1
 
         if product_number <= question.answers["trade_goods_and_services_explanations"].length.to_i
-          question.required_sub_fields_list.each do |attr|
-            if !entity[attr].present?
-              result[question.key] ||= {}
-              result[question.key][product_number] ||= {}
-              result[question.key][product_number][attr] ||= ""
-              result[question.key][product_number][attr] << "#{humanize(attr)} is required and must be filled in."
+          # only validate the first product or at least one field is filled in
+          if product_number == 1 || !entity.values.all?(&:blank?)
+            question.required_sub_fields_list.each do |attr|
+              if !entity[attr].present?
+                result[question.key] ||= {}
+                result[question.key][product_number] ||= {}
+                result[question.key][product_number][attr] ||= ""
+                result[question.key][product_number][attr] << "#{humanize(attr)} is required and must be filled in."
+              end
             end
           end
         end

From 872d4fe16bbcbf712b3c14e3f9256a0d3d2f23fe Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Wed, 9 Aug 2023 17:14:01 +0200
Subject: [PATCH 208/352] mrege fix

---
 .../v2021/international_trade/international_trade_step2.rb    | 4 ----
 .../v2021/international_trade/international_trade_step4.rb    | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/forms/award_years/v2021/international_trade/international_trade_step2.rb b/forms/award_years/v2021/international_trade/international_trade_step2.rb
index fdc057ceb2..d724016944 100644
--- a/forms/award_years/v2021/international_trade/international_trade_step2.rb
+++ b/forms/award_years/v2021/international_trade/international_trade_step2.rb
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-<<<<<<<< HEAD:forms/award_years/v2021/international_trade/international_trade_step2.rb
 class AwardYears::V2021::QaeForms
-========
-class AwardYears::V2020::QaeForms
->>>>>>>> origin/main:forms/award_years/v2020/international_trade/international_trade_step2.rb
   class << self
     def trade_step2
       @trade_step2 ||= proc do
diff --git a/forms/award_years/v2021/international_trade/international_trade_step4.rb b/forms/award_years/v2021/international_trade/international_trade_step4.rb
index 7d54eb54de..757271fb9c 100644
--- a/forms/award_years/v2021/international_trade/international_trade_step4.rb
+++ b/forms/award_years/v2021/international_trade/international_trade_step4.rb
@@ -1,9 +1,5 @@
 # -*- coding: utf-8 -*-
-<<<<<<<< HEAD:forms/award_years/v2021/international_trade/international_trade_step4.rb
 class AwardYears::V2021::QaeForms
-========
-class AwardYears::V2020::QaeForms
->>>>>>>> origin/main:forms/award_years/v2020/international_trade/international_trade_step4.rb
   class << self
     def trade_step4
       @trade_step4 ||= proc do

From 3a7c7544fd615e04e2cd2760a77791ca0a60f5d9 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 10 Aug 2023 09:19:26 +0100
Subject: [PATCH 209/352] Fix back end validations for product question

---
 ..._trade_goods_and_services_fields.html.slim | 10 +--
 ...oods_and_services_label_question.html.slim | 16 +++--
 .../_by_years_label_question.html.slim        | 66 +++++++++----------
 ...trade_goods_and_services_label_question.rb | 11 ++++
 4 files changed, 59 insertions(+), 44 deletions(-)

diff --git a/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim b/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
index 41fba14b03..4ef34f6dd0 100644
--- a/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
+++ b/app/views/qae_form/_by_trade_goods_and_services_fields.html.slim
@@ -1,27 +1,27 @@
 - errors = @form_answer.validator_errors
 
-li.js-add-example.js-list-item data-value=placement data-type="in_clause_collection"
+li.js-add-example.js-list-item data-value=index data-type="in_clause_collection"
   .govuk-form-group.trade-good-product.question-required
     - if question_error = errors&.dig(question.key, placement)
       span.govuk-error-message
         = "Product #{placement} is incomplete."
-    label.govuk-label for=question.input_name(suffix: "desc_short_#{placement}")
+    label.govuk-label for=question.input_name(suffix: "desc_short_#{index}")
       = "Product or service description #{placement} (word limit: #{question.words_max}):"
 
     - if desc_error = errors&.dig(question.key, placement, "desc_short")
       span.govuk-error-message
         = desc_error
     span.govuk-error-message
-    textarea.govuk-textarea.js-trigger-autosave.js-char-count rows=question.rows data-word-max=question.words_max name="#{question.input_name}[#{placement}][desc_short]" id=question.input_name(suffix: "desc_short_#{placement}") *possible_read_only_ops
+    textarea.govuk-textarea.js-trigger-autosave.js-char-count rows=question.rows data-word-max=question.words_max name="#{question.input_name}[#{index}][desc_short]" id=question.input_name(suffix: "desc_short_#{index}") *possible_read_only_ops
       = item.present? ? item['desc_short'] : ''
 
   .govuk-form-group.trade-good-percentage.question-required
-    label.govuk-label for=question.input_name(suffix: "total_overseas_trade_#{placement}")
+    label.govuk-label for=question.input_name(suffix: "total_overseas_trade_#{index}")
       ' % of your total overseas trade the product/service represents:
     - if percentage_error = errors&.dig(question.key, placement, "total_overseas_trade")
       span.govuk-error-message
         = "#{percentage_error} Use a number to represent the percentage of your total overseas trade."
     span.govuk-error-message
-    input.js-trigger-autosave.govuk-input.govuk-input--width-5 type="number" pattern="[0-9]*" min=question.min max=question.max name="#{question.input_name}[#{index}][total_overseas_trade]" value=(item.present? ? item['total_overseas_trade'] : '') autocomplete="off" id=question.input_name(suffix: "total_overseas_trade_#{placement}") *possible_read_only_ops
+    input.js-trigger-autosave.govuk-input.govuk-input--width-5 type="number" pattern="[0-9]*" min=question.min max=question.max name="#{question.input_name}[#{index}][total_overseas_trade]" value=(item.present? ? item['total_overseas_trade'] : '') autocomplete="off" id=question.input_name(suffix: "total_overseas_trade_#{index}") *possible_read_only_ops
 
   = link_to "Remove", "#", class: "remove-link js-remove-link if-no-js-hide #{'visuallyhidden' if (count == 1)} #{'read_only' if admin_in_read_only_mode?}"
diff --git a/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim b/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim
index 039d5f6d9e..76d216126d 100644
--- a/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim
+++ b/app/views/qae_form/_by_trade_goods_and_services_label_question.html.slim
@@ -1,7 +1,11 @@
 .js-by-trade-goods-and-services-amount role="group" id="q_#{question.key}"
+  - if total_percentage_error = @form_answer.validator_errors&.dig(question.key, :total_trade_percentage)
+    span.govuk-error-message
+      = total_percentage_error
   input name="#{question.input_name}[array]" value="true" type="hidden" *possible_read_only_ops
 
   ol.list-add.js-by-trade-goods-and-services-amount data-add-limit="#{question.product_limit}" data-need-to-clear-example=true data-default="1"
+    / render saved products
     - question.trade_goods_and_services.each_with_index do |product, index|
       - placement = index + 1
       - item = question.trade_goods_and_services[index]
@@ -12,15 +16,15 @@
       - index = 0, placement = 1, item = {}
       = render "qae_form/by_trade_goods_and_services_fields", placement: placement, item: item, index: index, question: question, count: 1
 
-    / if no javascript render remaining empty products up to the product limit
+    / if no javascript render empty products up to the product limit
     noscript
       .list-add
-        - product_count = question.trade_goods_and_services.count == 0 ? 1 : question.trade_goods_and_services.count
-        - if product_count < question.product_limit
-          - (product_count...question.product_limit).each do |index|
-            - placement = question.trade_goods_and_services.count + index + 1
+        - default_product_count = question.trade_goods_and_services.count < 1 ? 1 : question.trade_goods_and_services.count
+        - if default_product_count < question.product_limit
+          - (default_product_count...question.product_limit).each do |index|
+            - placement = default_product_count + index
             - item = {}
-            = render "qae_form/by_trade_goods_and_services_fields", placement: placement, item: item, index: index, question: question, count: 5
+            = render "qae_form/by_trade_goods_and_services_fields", placement: placement, item: item, index: index, question: question, count: question.product_limit
 
   .if-no-js-hide.govuk-button-group
     a.govuk-button.govuk-button--secondary.button-add.js-button-add class=("visuallyhidden" if question.trade_goods_and_services.count >= question.product_limit) href="#" aria-label="Add another product or service" data-entity="product" *possible_read_only_ops
diff --git a/app/views/qae_form/_by_years_label_question.html.slim b/app/views/qae_form/_by_years_label_question.html.slim
index b0744a2bb0..84c319649d 100644
--- a/app/views/qae_form/_by_years_label_question.html.slim
+++ b/app/views/qae_form/_by_years_label_question.html.slim
@@ -1,34 +1,34 @@
   div role="group" id="q_#{question.key}"
-  .js-financial-year-changed-dates
-    - for c in question.by_year_conditions
-      .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
-        .if-js-hide
-          label.govuk-label
-            strong
-              = "If you had growth in the last #{c.years} years"
-        .govuk-grid-row
-          - (1..c.years).each do |y|
-            .govuk-grid-column-one-half.js-fy-entries class="#{'fy-latest' if y == c.years}" role="group"
-              span.js-year-end.show-default data-year="#{y}of#{c.years}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
-                span.js-year-default class="govuk-body govuk-!-font-size-19 govuk-!-margin-bottom-0 govuk-!-margin-top-5"
-                  = question.format_label(y)
-                  - if y == c.years
-                    '  (most recent)
-              span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
-              .govuk-date-input
-                .govuk-date-input__item
-                  .govuk-form-group
-                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}day")
-                      ' Day
-                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-day type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}day") value=question.input_value(suffix: "#{y}of#{c.years}day") id=question.input_name(suffix: "#{y}of#{c.years}day") maxlength=2 autocomplete="off" *possible_read_only_ops
-                .govuk-date-input__item
-                  .govuk-form-group
-                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}month")
-                      ' Month
-                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-month type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}month") value=question.input_value(suffix: "#{y}of#{c.years}month") id=question.input_name(suffix: "#{y}of#{c.years}month") maxlength=2 autocomplete="off" *possible_read_only_ops
-                .govuk-date-input__item
-                  .govuk-form-group
-                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}year")
-                      ' Year
-                    input.govuk-input.govuk-date-input__input.govuk-input--width-4.js-trigger-autosave.js-fy-year type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}year") value=question.input_value(suffix: "#{y}of#{c.years}year") id=question.input_name(suffix: "#{y}of#{c.years}year") maxlength=4 autocomplete="off" *possible_read_only_ops
-        .clear
+    .js-financial-year-changed-dates
+      - for c in question.by_year_conditions
+        .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+          .if-js-hide
+            label.govuk-label
+              strong
+                = "If you had growth in the last #{c.years} years"
+          .govuk-grid-row
+            - (1..c.years).each do |y|
+              .govuk-grid-column-one-half.js-fy-entries class="#{'fy-latest' if y == c.years}" role="group"
+                span.js-year-end.show-default data-year="#{y}of#{c.years}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
+                  span.js-year-default class="govuk-body govuk-!-font-size-19 govuk-!-margin-bottom-0 govuk-!-margin-top-5"
+                    = question.format_label(y)
+                    - if y == c.years
+                      '  (most recent)
+                span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
+                .govuk-date-input
+                  .govuk-date-input__item
+                    .govuk-form-group
+                      label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}day")
+                        ' Day
+                      input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-day type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}day") value=question.input_value(suffix: "#{y}of#{c.years}day") id=question.input_name(suffix: "#{y}of#{c.years}day") maxlength=2 autocomplete="off" *possible_read_only_ops
+                  .govuk-date-input__item
+                    .govuk-form-group
+                      label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}month")
+                        ' Month
+                      input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-month type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}month") value=question.input_value(suffix: "#{y}of#{c.years}month") id=question.input_name(suffix: "#{y}of#{c.years}month") maxlength=2 autocomplete="off" *possible_read_only_ops
+                  .govuk-date-input__item
+                    .govuk-form-group
+                      label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}year")
+                        ' Year
+                      input.govuk-input.govuk-date-input__input.govuk-input--width-4.js-trigger-autosave.js-fy-year type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}year") value=question.input_value(suffix: "#{y}of#{c.years}year") id=question.input_name(suffix: "#{y}of#{c.years}year") maxlength=4 autocomplete="off" *possible_read_only_ops
+          .clear
diff --git a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
index 5a11855a04..d18da22e14 100644
--- a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
+++ b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -25,6 +25,17 @@ def errors
           end
         end
       end
+
+      total = 0
+      question.answers["trade_goods_and_services_explanations"].each do |product|
+        total += product["total_overseas_trade"].to_i
+      end
+      if total != 100
+        result[question.key] ||= {}
+        result[question.key][:total_trade_percentage] ||= ""
+        result[question.key][:total_trade_percentage] << "The total trade percentage does not equal 100%. Check that the totals entered add up to 100."
+      end
+
       result
     end
 

From 540ebe10e1cecca37473b1a05dc7fe09c82a0bc9 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 10 Aug 2023 10:55:33 +0100
Subject: [PATCH 210/352] fixes tests

---
 .../frontend/form-validation.js.coffee        |  2 +-
 .../_by_years_label_question.html.slim        | 68 +++++++++----------
 ...trade_goods_and_services_label_question.rb |  2 +-
 3 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 8fe009fcf6..a492b2e8c1 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -346,7 +346,7 @@ window.FormValidation =
         label = $("label[for='#{subq.attr('id')}']").text()
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateEmployeeMin", "This field is required")
-          # todo - this error is duplicated on employee question.
+          # his error is duplicated on employee question.
           # @appendMessage(subq.closest(".span-financial"), "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
           @addErrorClass(question)
           continue
diff --git a/app/views/qae_form/_by_years_label_question.html.slim b/app/views/qae_form/_by_years_label_question.html.slim
index 84c319649d..b0b2eb1edf 100644
--- a/app/views/qae_form/_by_years_label_question.html.slim
+++ b/app/views/qae_form/_by_years_label_question.html.slim
@@ -1,34 +1,34 @@
-  div role="group" id="q_#{question.key}"
-    .js-financial-year-changed-dates
-      - for c in question.by_year_conditions
-        .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
-          .if-js-hide
-            label.govuk-label
-              strong
-                = "If you had growth in the last #{c.years} years"
-          .govuk-grid-row
-            - (1..c.years).each do |y|
-              .govuk-grid-column-one-half.js-fy-entries class="#{'fy-latest' if y == c.years}" role="group"
-                span.js-year-end.show-default data-year="#{y}of#{c.years}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
-                  span.js-year-default class="govuk-body govuk-!-font-size-19 govuk-!-margin-bottom-0 govuk-!-margin-top-5"
-                    = question.format_label(y)
-                    - if y == c.years
-                      '  (most recent)
-                span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
-                .govuk-date-input
-                  .govuk-date-input__item
-                    .govuk-form-group
-                      label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}day")
-                        ' Day
-                      input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-day type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}day") value=question.input_value(suffix: "#{y}of#{c.years}day") id=question.input_name(suffix: "#{y}of#{c.years}day") maxlength=2 autocomplete="off" *possible_read_only_ops
-                  .govuk-date-input__item
-                    .govuk-form-group
-                      label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}month")
-                        ' Month
-                      input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-month type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}month") value=question.input_value(suffix: "#{y}of#{c.years}month") id=question.input_name(suffix: "#{y}of#{c.years}month") maxlength=2 autocomplete="off" *possible_read_only_ops
-                  .govuk-date-input__item
-                    .govuk-form-group
-                      label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}year")
-                        ' Year
-                      input.govuk-input.govuk-date-input__input.govuk-input--width-4.js-trigger-autosave.js-fy-year type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}year") value=question.input_value(suffix: "#{y}of#{c.years}year") id=question.input_name(suffix: "#{y}of#{c.years}year") maxlength=4 autocomplete="off" *possible_read_only_ops
-          .clear
+div role="group" id="q_#{question.key}"
+  .js-financial-year-changed-dates
+    - for c in question.by_year_conditions
+      .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+        .if-js-hide
+          label.govuk-label
+            strong
+              = "If you had growth in the last #{c.years} years"
+        .govuk-grid-row
+          - (1..c.years).each do |y|
+            .govuk-grid-column-one-half.js-fy-entries class="#{'fy-latest' if y == c.years}" role="group"
+              span.js-year-end.show-default data-year="#{y}of#{c.years}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
+                span.js-year-default class="govuk-body govuk-!-font-size-19 govuk-!-margin-bottom-0 govuk-!-margin-top-5"
+                  = question.format_label(y)
+                  - if y == c.years
+                    '  (most recent)
+              span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
+              .govuk-date-input
+                .govuk-date-input__item
+                  .govuk-form-group
+                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}day")
+                      ' Day
+                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-day type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}day") value=question.input_value(suffix: "#{y}of#{c.years}day") id=question.input_name(suffix: "#{y}of#{c.years}day") maxlength=2 autocomplete="off" *possible_read_only_ops
+                .govuk-date-input__item
+                  .govuk-form-group
+                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}month")
+                      ' Month
+                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-month type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}month") value=question.input_value(suffix: "#{y}of#{c.years}month") id=question.input_name(suffix: "#{y}of#{c.years}month") maxlength=2 autocomplete="off" *possible_read_only_ops
+                .govuk-date-input__item
+                  .govuk-form-group
+                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}year")
+                      ' Year
+                    input.govuk-input.govuk-date-input__input.govuk-input--width-4.js-trigger-autosave.js-fy-year type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}year") value=question.input_value(suffix: "#{y}of#{c.years}year") id=question.input_name(suffix: "#{y}of#{c.years}year") maxlength=4 autocomplete="off" *possible_read_only_ops
+        .clear
diff --git a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
index d18da22e14..3128251a78 100644
--- a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
+++ b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -27,7 +27,7 @@ def errors
       end
 
       total = 0
-      question.answers["trade_goods_and_services_explanations"].each do |product|
+      question.answers["trade_goods_and_services_explanations"]&.each do |product|
         total += product["total_overseas_trade"].to_i
       end
       if total != 100

From 2105eba61956c964c04c0d298beea3222f89a09f Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 10 Aug 2023 14:21:30 +0100
Subject: [PATCH 211/352] Add question ref to question logger

---
 app/assets/javascripts/frontend/form-validation.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index a492b2e8c1..bf23184b39 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -701,7 +701,7 @@ window.FormValidation =
   logThis: (question, validator, message) ->
     stepData = question.closest(".js-step-condition").data("step")
     stepTitle = $.trim($("a.js-step-link[data-step='#{stepData}']").text())
-    qRef = $.trim(question.find("h2 span.visuallyhidden").text())
+    qRef = question.attr("data-question_ref")
     qTitle = $.trim(question.find("h2").first().text())
 
     if typeof console != "undefined"

From 8384c93587dcf9984a4c2d1c7f0240ac7c24bd39 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 10 Aug 2023 14:55:52 +0100
Subject: [PATCH 212/352] Update error messages in logger

---
 .../frontend/form-validation.js.coffee        | 92 ++++++++++++-------
 1 file changed, 61 insertions(+), 31 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index bf23184b39..29e6e6ce13 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -144,11 +144,9 @@ window.FormValidation =
     if subquestions.length
       for subquestion in subquestions
         if not @validateSingleQuestion($(subquestion))
-          @logThis(question, "validateRequiredQuestion", "This field is required")
           @addSubfieldError(question, subquestion)
     else
       if not @validateSingleQuestion(question)
-        @logThis(question, "validateRequiredQuestion", "This field is required")
         @addQuestionError(question)
 
   addSubfieldError: (question, subquestion) ->
@@ -158,36 +156,58 @@ window.FormValidation =
     incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
 
     if question.hasClass('date-DDMMYYYY')
-      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format DD/MM/YYYY.")
+      errorMessage = "#{incompleteMessage} Use the format DD/MM/YYYY."
+      @logThis(question, "validateRequiredSubQuestion", errorMessage)
+      @addErrorMessage($(subquestion), errorMessage)
     else if question.hasClass('date-MMYYYY')
-      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format MM/YYYY.")
+      errorMessage = "#{incompleteMessage} Use the format MM/YYYY."
+      @logThis(question, "validateRequiredSubQuestion", errorMessage)
+      @addErrorMessage($(subquestion), errorMessage)
     else if question.hasClass('date-YYYY')
-      @addErrorMessage($(subquestion), "#{incompleteMessage} Use the format YYYY.")
+      errorMessage = "#{incompleteMessage} Use the format YYYY."
+      @logThis(question, "validateRequiredSubQuestion", errorMessage)
+      @addErrorMessage($(subquestion), errorMessage)
     else if input.hasClass("autocomplete__input")
-      @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list.")
+      errorMessage = "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list."
+      @logThis(question, "validateRequiredSubQuestion", errorMessage)
+      @addErrorMessage($(subquestion), errorMessage)
     else
       if question.find(".js-financial-year-latest").length
         #avoid duplicate errors for financial year questions
         return
       else
-        @addErrorMessage($(subquestion), "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
+        errorMessage = "Question #{questionRef} is incomplete. #{label} is required and must be filled in."
+        @logThis(question, "validateRequiredSubQuestion", errorMessage)
+        @addErrorMessage($(subquestion), errorMessage)
 
   addQuestionError: (question) ->
     questionRef = question.attr("data-question_ref")
     incompleteMessage = "Question #{questionRef} is incomplete. It is required"
     if @isOptionsQuestion(question)
-      @addErrorMessage(question, "#{incompleteMessage} and an option must be chosen from the following list.")
+      errorMessage = "#{incompleteMessage} and an option must be chosen from the following list."
+      @logThis(question, "validateRequiredRadioQuestion", errorMessage)
+      @addErrorMessage(question, errorMessage)
     else if @isSelectQuestion(question)
-      @addErrorMessage(question, "#{incompleteMessage} and an option must be selected from the following dropdown list.")
+      errorMessage = "#{incompleteMessage} and an option must be selected from the following dropdown list."
+      @logThis(question, "validateRequiredDropdownQuestion", errorMessage)
+      @addErrorMessage(question, errorMessage)
     else if @isTextishQuestion(question) && !question.hasClass("question-year")
-      @addErrorMessage(question, "#{incompleteMessage} and must be filled in.")
+      errorMessage = "#{incompleteMessage} and must be filled in."
+      @logThis(question, "validateRequiredTextQuestion", errorMessage)
+      @addErrorMessage(question, errorMessage)
     else if question.hasClass("question-year")
-      @addErrorMessage(question, "#{incompleteMessage} and must be filled in. Use the format YYYY.")
+      errorMessage = "#{incompleteMessage} and must be filled in. Use the format YYYY."
+      @logThis(question, "validateRequiredYearQuestion", errorMessage)
+      @addErrorMessage(question, errorMessage)
     else if @isCheckboxQuestion(question)
       if question.find("input[type='checkbox']").length > 1
-        @addErrorMessage(question, "#{incompleteMessage} and at least one option must be chosen from the following list.")
+        errorMessage = "#{incompleteMessage} and at least one option must be chosen from the following list."
+        @logThis(question, "validateRequiredCheckboxQuestion", errorMessage)
+        @addErrorMessage(question, errorMessage)
       else
-        @addErrorMessage(question, "#{incompleteMessage} and confirmation must be given by ticking the checkbox.")
+        errorMessage = "#{incompleteMessage} and confirmation must be given by ticking the checkbox."
+        @logThis(question, "validateRequiredConfirmQuestion", errorMessage)
+        @addErrorMessage(question, errorMessage)
 
   validateMatchQuestion: (question) ->
     q = question.find(".match")
@@ -213,12 +233,14 @@ window.FormValidation =
     diff = @compareDateInDays(questionDate, expDate)
 
     if not questionYear or not questionMonth or not questionDay
-      @logThis(question, "validateMaxDate", "This field is required")
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM/YYYY.")
+      errorMessage = "Question #{questionRef} is incomplete. It is required and must be filled in. Use the format DD/MM/YYYY."
+      @logThis(question, "validateMaxDate", errorMessage)
+      @addErrorMessage(question, errorMessage)
       return
     if not @toDate(questionDate).isValid()
-      @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY.")
+      errorMessage = "Question #{questionRef} is incomplete. The date entered is not valid. Use the format DD/MM/YYYY."
+      @logThis(question, "validateMaxDate", errorMessage)
+      @addErrorMessage(question, errorMessage)
       return
 
     if diff > 0
@@ -455,7 +477,7 @@ window.FormValidation =
         label = $("label[for='#{subq.attr('id')}']").text()
 
         if not subq.val() and question.hasClass("question-required")
-          @logThis(question, "validateNumberByYears", "This field is required")
+          @logThis(question, "validateNumberByYears", "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
           @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
           @addErrorClass(question)
           continue
@@ -486,9 +508,10 @@ window.FormValidation =
         inputCellsCounter += 1
 
         if not subq.val() and question.hasClass("question-required")
-          @logThis(question, "validateMoneyByYears", "This field is required")
           label = $("label[for='#{subq.attr('id')}']").text()
-          @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none.")
+          errorMessage = "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none."
+          @logThis(question, "validateMoneyByYears", errorMessage)
+          @appendMessage(errContainer, errorMessage)
           @addErrorClass(question)
           continue
         else if not subq.val()
@@ -537,16 +560,18 @@ window.FormValidation =
 
       if question.hasClass("question-required") && errorsContainer.length < 1
         if !(day and month and year)
-          @logThis(question, "validateDateByYears", "This field is required")
-          @appendMessage(qParent, "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Use the format DD/MM/YYYY.")
+          errorMessage = "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Use the format DD/MM/YYYY."
+          @logThis(question, "validateDateByYears", errorMessage)
+          @appendMessage(qParent, errorMessage)
           @addErrorClass(question)
         else
           complexDateString = day + "/" + month + "/" + year
           date = @toDate(complexDateString)
 
           if not date.isValid()
-            @logThis(question, "validateDateByYears", "Not a valid date")
-            @appendMessage(qParent, "The date entered for question #{questionRef} #{label} is not valid. Use the format DD/MM/YYYY.")
+            errorMessage = "The date entered for question #{questionRef} #{label} is not valid. Use the format DD/MM/YYYY."
+            @logThis(question, errorMessage)
+            @appendMessage(qParent, errorMessage)
             @addErrorClass(question)
 
   validateInnovationFinancialDate: (question) ->
@@ -557,10 +582,13 @@ window.FormValidation =
     questionDate = "#{questionDay}/#{questionMonth}/#{moment().format('Y')}"
 
     if not (questionDay and questionMonth)
-      @addErrorMessage(question, "Question #{questionRef} is incomplete. Year-end is required and must be filled in. Use the format DD/MM.")
+      errorMessage = "Question #{questionRef} is incomplete. Year-end is required and must be filled in. Use the format DD/MM."
+      @logThis(question, errorMessage)
+      @addErrorMessage(question, errorMessage)
     else if not @toDate(questionDate).isValid()
-      @logThis(question, "validateMaxDate", "Not a valid date")
-      @addErrorMessage(question, "The date entered for #{questionRef} is not valid. Use the format DD/MM.")
+      errorMessage = "The date entered for #{questionRef} is not valid. Use the format DD/MM."
+      @logThis(question, errorMessage)
+      @addErrorMessage(question, errorMessage)
       return
 
   validateDiffBetweenDates: (question) ->
@@ -596,8 +624,9 @@ window.FormValidation =
           err = true
 
     if err
-      @logThis(question, "validateDiffBetweenDates", "There is an error because financial year cannot be longer than 18 months, please double check your year end dates")
-      @appendMessage(question, "There is an error because financial year cannot be longer than 18 months, please double check your year end dates")
+      errorMessage = "There is an error because financial year cannot be longer than 18 months, please double check your year end dates"
+      @logThis(question, "validateDiffBetweenDates", errorMessage)
+      @appendMessage(question, errorMessage)
       @addErrorClass(question)
 
   validateDateStartEnd: (question) ->
@@ -683,8 +712,9 @@ window.FormValidation =
       else
         missingOverseasTradeValue = true
     if totalOverseasTradePercentage != 100
-      @logThis(question, "validateGoodsServicesPercentage", "% of your total overseas trade should add up to 100")
-      @appendMessage(question, "% of your total overseas trade should add up to 100")
+      errorMessage = "% of your total overseas trade should add up to 100"
+      @logThis(question, "validateGoodsServicesPercentage", errorMessage)
+      @appendMessage(question, errorMessage)
       @addErrorClass(question)
 
   validateSelectionLimit: (question) ->

From bc562c3ceda81919bc3cb0c3d16a3a82e7bc841a Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 10 Aug 2023 16:33:02 +0100
Subject: [PATCH 213/352] changes date validation message

---
 forms/qae_form_builder/date_question.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/qae_form_builder/date_question.rb b/forms/qae_form_builder/date_question.rb
index a3d837ed77..5ddaeb5580 100644
--- a/forms/qae_form_builder/date_question.rb
+++ b/forms/qae_form_builder/date_question.rb
@@ -16,7 +16,7 @@ def errors
       if !date
         if question.required?
           result[question.hash_key] ||= ""
-          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is incomplete. It requires a date in the format DD/MM/YYYY."
+          result[question.hash_key] << "Question #{question.ref || question.sub_ref} is invalid. It requires a date in the format DD/MM/YYYY."
         end
       else
         if date_min && date < date_min

From 59f956543f698168e82ae3887df10e89e7e67103 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 10 Aug 2023 16:10:17 +0100
Subject: [PATCH 214/352] Reverse changes to autocomplete label

---
 app/views/qae_form/_by_years_question.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/qae_form/_by_years_question.html.slim b/app/views/qae_form/_by_years_question.html.slim
index 6e14fb9503..ef8ea45751 100644
--- a/app/views/qae_form/_by_years_question.html.slim
+++ b/app/views/qae_form/_by_years_question.html.slim
@@ -15,7 +15,7 @@
                   = y
                   - if y == c.years
                     '  (most recent)
-            span.js-year-text.hide-if-empty.govuk-label
+                span.js-year-text.hide-if-empty
             span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
             span class="#{'govuk-input__wrapper' if question.type == :money}"
               - if question.type == :money

From 9fcda8eea1f4aaddc2328b724c663c97a5198768 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 11 Aug 2023 11:09:51 +0100
Subject: [PATCH 215/352] Add selector for help block

---
 .../custom_questions/won_international_trade_award.coffee       | 2 +-
 app/views/qae_form/_queen_award_applications_question.html.slim | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
index 6176fbce27..f6a4ea90a2 100644
--- a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
+++ b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
@@ -16,7 +16,7 @@ window.WonInternationalTradeAwardQuestion = init: ->
         conditionFulfilled = true
         return false
 
-    helpBlock = container.closest("fieldset").find(".question-block")
+    helpBlock = $("#help-block")
 
     if helpBlock
       if conditionFulfilled
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index c6722ccf2b..0e72501ef6 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -136,7 +136,7 @@ a.govuk-button.govuk-button--secondary.js-button-add.if-no-js-hide href="#" aria
                          "data-entity" => "award"
 
 
-.question-block style="display: none;"
+.question-block#help-block style="display: none;"
   .govuk-form-group
     p class="govuk-body govuk-!-font-weight-bold"
       | As you currently hold a King's Award for International Trade, you cannot apply for another Award. You may apply in future years but can only use one year's financial performance from your Award winning application.

From 6a9402987051930a632b64b6a4869eb8cbd3a703 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 11 Aug 2023 14:25:45 +0100
Subject: [PATCH 216/352] Adds a screen reader only div

---
 app/assets/javascripts/admin/dashboard.js.coffee         | 3 +++
 app/views/admin/audit_certificate/_form.html.slim        | 2 +-
 app/views/admin/dashboard/_applications_report.html.slim | 5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/dashboard.js.coffee b/app/assets/javascripts/admin/dashboard.js.coffee
index c2873378c8..03e9512a47 100644
--- a/app/assets/javascripts/admin/dashboard.js.coffee
+++ b/app/assets/javascripts/admin/dashboard.js.coffee
@@ -18,3 +18,6 @@ jQuery ->
     $("tbody", wrapper).load href, ->
       link.removeClass("hidden")
       $(".updating-data", wrapper).addClass("hidden")
+      # $(".dashboard-report .sr-only").empty()
+      srWrapper = wrapper.closest(".dashboard-report .sr-only")
+      srWrapper.text("Data updated")
diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index 943f44582a..8766a74328 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -11,7 +11,7 @@
       .errors
         .alert.alert-danger[data-controller="element-removal" role="alert"']
           = form.object.errors.full_messages.join(", ")
-          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]        
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
             span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index ace74f7e4e..d2af2b69c0 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -3,7 +3,10 @@
     | Load data
   = link_to "Download data", url, class: "btn btn-primary btn--load update-report if-js-hide", aria: { label: "Download #{title} data" }
   button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
-    | Updating data
+    Updating data
+
+  .sr-only role="status" aria-live="polite"
+    span
 
   table.dashboard-table.dashboard-table--small width="1000"
     caption

From f841f7476ea4ef2bfb37911ecce184375b02ec12 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 11 Aug 2023 14:26:26 +0100
Subject: [PATCH 217/352] Fix typo

---
 app/views/admin/audit_certificate/_form.html.slim       | 4 ++--
 app/views/admin/figures_and_vat_returns/_form.html.slim | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index 943f44582a..eae50fe6d8 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -9,9 +9,9 @@
 
     - if form.object.errors.any?
       .errors
-        .alert.alert-danger[data-controller="element-removal" role="alert"']
+        .alert.alert-danger[data-controller="element-removal" role="alert"]
           = form.object.errors.full_messages.join(", ")
-          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]        
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
             span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
index bd5fd0c884..7b2be8c2f8 100644
--- a/app/views/admin/figures_and_vat_returns/_form.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -9,9 +9,9 @@
 
     - if form.object.errors.any?
       .errors
-        .alert.alert-danger[data-controller="element-removal" role="alert"']
+        .alert.alert-danger[data-controller="element-removal" role="alert"]
           = form.object.errors.full_messages.join(", ")
-          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]        
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
             span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide

From 02789273e46ce4ebca05cef714f2f356dc47ed19 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 8 Aug 2023 09:08:56 +0100
Subject: [PATCH 218/352] Adds non-js validation for matrix cells

---
 app/views/qae_form/_matrix_question.html.slim            | 5 +++++
 .../v2024/social_mobility/social_mobility_step3.rb       | 1 +
 forms/qae_form_builder/matrix_question.rb                | 9 +++++----
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index 87df46c641..bfb0b96869 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -18,3 +18,8 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
                 = "#{y_heading.label} numbers for #{x_heading.label}"
               input.js-trigger-autosave.matrix-question-input.govuk-input type="number" data-required-row-parent=question.required_row_parent min="0" step="1" name=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") value=question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}") id=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
               span.govuk-error-message aria-live="polite"
+                - if @form_answer.validator_errors && @form_answer.validator_errors["#{question.hash_key}_#{x_heading.key}_#{y_heading.key}"].present?
+                  | Required
+                  span.govuk-visually-hidden id="error_for_#{question.key}"
+                    | Error:
+                  =< @form_answer.validator_errors[question.hash_key]
diff --git a/forms/award_years/v2024/social_mobility/social_mobility_step3.rb b/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
index a005b46379..b10f860ca5 100644
--- a/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
+++ b/forms/award_years/v2024/social_mobility/social_mobility_step3.rb
@@ -543,6 +543,7 @@ def mobility_step3
           classes "sub-question question-matrix"
           ref "C 5.2"
           required
+          required_rows :initiative_activities
           context %(
             <p>When answering this question, please refer to the guidance under C5.</p>
           )
diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index d9b788fd37..0a5435b3fd 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -2,15 +2,16 @@ class QaeFormBuilder
   class MatrixQuestionValidator < QuestionValidator
     def errors
       result = super
-
       if question.required?
         question.y_headings.each do |y_heading|
           question.x_headings.each do |x_heading|
             suffix = "#{x_heading.key}_#{y_heading.key}"
 
-            if !question.input_value(suffix: suffix).present? && question.required_rows.include?(y_heading.key)
-              result[question.hash_key(suffix: suffix)] ||= ""
-              result[question.hash_key(suffix: suffix)] << "Required"
+            if !question.input_value(suffix: suffix).present?
+              if (question.required_row_parent && question.required_rows.include?(y_heading.key)) || !question.required_row_parent
+                result[question.hash_key(suffix: suffix)] ||= ""
+                result[question.hash_key(suffix: suffix)] << "Required"
+              end
             end
           end
         end

From cea64511705454988712df1abcb4129977a97091 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 8 Aug 2023 17:32:32 +0100
Subject: [PATCH 219/352] Disables autocalculated cells

---
 app/views/qae_form/_matrix_question.html.slim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index bfb0b96869..14caa312df 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -8,15 +8,17 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
           = heading.label
   tbody
     - question.y_headings.each do |y_heading|
+      - disabled_row_input = y_heading.options[:row_class] == "auto-subtotals-row" || y_heading.options[:row_class] == "auto-totals-row" || y_heading.options[:row_class] == "auto-proportion-row"
       tr.govuk-table__row class="#{y_heading.options[:row_class] ? y_heading.options[:row_class] : ''}"
         td.govuk-table__header.row-heading scope="row"
           = y_heading.label
         - question.x_headings.each do |x_heading|
+          - disabled_col_input = x_heading.label == "Total (system calculated)"
           td.govuk-form-group.govuk-table__cell
             div
               label.visuallyhidden-on-desktop.govuk-label for=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}")
                 = "#{y_heading.label} numbers for #{x_heading.label}"
-              input.js-trigger-autosave.matrix-question-input.govuk-input type="number" data-required-row-parent=question.required_row_parent min="0" step="1" name=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") value=question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}") id=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+              input.js-trigger-autosave.matrix-question-input.govuk-input type="number" disabled=(disabled_row_input || disabled_col_input) data-required-row-parent=question.required_row_parent min="0" step="1" name=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") value=question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}") id=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
               span.govuk-error-message aria-live="polite"
                 - if @form_answer.validator_errors && @form_answer.validator_errors["#{question.hash_key}_#{x_heading.key}_#{y_heading.key}"].present?
                   | Required

From cc7dee284f3ceeca167e6c3d411481347d5c6932 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 9 Aug 2023 08:32:11 +0100
Subject: [PATCH 220/352] Update spec fixtures

---
 spec/fixtures/form_answer_mobility.json | 114 +++++++++++++++++++++++-
 1 file changed, 110 insertions(+), 4 deletions(-)

diff --git a/spec/fixtures/form_answer_mobility.json b/spec/fixtures/form_answer_mobility.json
index fba5d61f51..3fb8e2d27c 100644
--- a/spec/fixtures/form_answer_mobility.json
+++ b/spec/fixtures/form_answer_mobility.json
@@ -172,7 +172,9 @@
 "press_contact_details_email": "test@example.com",
 "company_estimates_use": "1",
 "application_category":"initiative",
-"initiative_activities":[{"type":"careers_advice"}, {"type":"fairer_recruitment"}, {"type":"skills_development"}],
+"initiative_activities":[{"type":"careers_advice"},
+{"type":"fairer_recruitment"},
+{"type":"skills_development"}],
 "initiative_desc_short":"short description.",
 "initiative_desc_medium":"medium description.",
 "initiative_motivations":"motivations go here.",
@@ -198,8 +200,8 @@
 "disadvantaged_groups_impact_employment_explained": "disadvantaged groups impact employment explained goes here",
 "disadvantaged_groups_numbers_explained": "disadvantaged groups numbers explained goes here",
 "initiative_qualitative_impact": "qualitative impact goes here",
-"how_did_you_hear_about_award": [{"type":"other"}, {"type": "another_website"}],
-"disadvantaged_participants_activity_type": "participants activity goes here",
+"how_did_you_hear_about_award": [{"type":"other"},
+{"type": "another_website"}],
 "initiative_evidence_exemplary": "evidence goes here",
 "disadvantaged_participants_in_group_year": "disadvantaged groups year goes here",
 "disadvantaged_groups_impact_employment": "impact on employment goes here",
@@ -207,6 +209,31 @@
 "disadvantaged_groups_opportunities_numbers": "other impact goes here",
 "organisation_exemplary_evidence": "organisation evidence goes here",
 "covid_impact": "covid impact goes here",
+"disadvantaged_participants_numbers_2019_total_disadvantaged": "0",
+"disadvantaged_participants_numbers_2020_total_disadvantaged": "0",
+"disadvantaged_participants_numbers_2021_total_disadvantaged": "0",
+"disadvantaged_participants_numbers_2022_total_disadvantaged": "0",
+"disadvantaged_participants_numbers_2023_total_disadvantaged": "0",
+"disadvantaged_participants_numbers_total_system_calculated_total_disadvantaged": "0",
+"disadvantaged_participants_numbers_2019_others": "0",
+"disadvantaged_participants_numbers_2020_others": "0",
+"disadvantaged_participants_numbers_2021_others": "0",
+"disadvantaged_participants_numbers_2022_others": "0",
+"disadvantaged_participants_numbers_2023_others": "0",
+"disadvantaged_participants_numbers_total_system_calculated_others": "0",
+"disadvantaged_participants_numbers_2019_calulated_total": "0",
+"disadvantaged_participants_numbers_2020_calulated_total": "0",
+"disadvantaged_participants_numbers_2021_calulated_total": "0",
+"disadvantaged_participants_numbers_2022_calulated_total": "0",
+"disadvantaged_participants_numbers_2023_calulated_total": "0",
+"disadvantaged_participants_numbers_total_system_calculated_calulated_total": "0",
+"disadvantaged_participants_numbers_2019_calculated_proportion": "0",
+"disadvantaged_participants_numbers_2020_calculated_proportion": "0",
+"disadvantaged_participants_numbers_2021_calculated_proportion": "0",
+"disadvantaged_participants_numbers_2022_calculated_proportion": "0",
+"disadvantaged_participants_numbers_2023_calculated_proportion": "0",
+"disadvantaged_participants_numbers_total_system_calculated_calculated_proportion": "0",
+"disadvantaged_participants_numbers": "",
 "disadvantaged_participants_activity_type_2019_careers_advice": "0",
 "disadvantaged_participants_activity_type_2020_careers_advice": "0",
 "disadvantaged_participants_activity_type_2021_careers_advice": "0",
@@ -588,4 +615,83 @@
 "head_of_bussines_title": "test",
 "head_job_title": "test",
 "head_email": "test",
-"agree_to_provide_actuals": "on"}
+"agree_to_provide_actuals": "on",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_ethnic": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_refugees": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_young_language": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_living_situation": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_people_low_incomes": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_lone_parents": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_free_meals": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_homeless_insecurely_housed": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_care_leavers": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_young_education": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_school_attainment": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_parents_qualification": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_mental_disability": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_recovered": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_domestic_violence": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_military_veterans": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_ex_offenders": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_families_prisoners": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_employment_jobs_retained_for_more_than_one_year_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_secured_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_completed_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_calculated_sub_total": "0",
+"disadvantaged_groups_impact_employment_jobs_retained_for_more_than_one_year_calculated_sub_total": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_secured_calculated_sub_total": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_completed_calculated_sub_total": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_others": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_calulated_total": "0",
+"disadvantaged_groups_impact_employment_jobs_retained_for_more_than_one_year_calulated_total": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_secured_calulated_total": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_completed_calulated_total": "0",
+"disadvantaged_groups_impact_employment_jobs_secured_during_the_support_or_within_a_year_after_support_ending_calculated_proportion": "0",
+"disadvantaged_groups_impact_employment_jobs_retained_for_more_than_one_year_calculated_proportion": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_secured_calculated_proportion": "0",
+"disadvantaged_groups_impact_employment_apprenticeships_completed_calculated_proportion": "0",
+"disadvantaged_groups_impact_employment": "",
+"disadvantaged_groups_impact_education_nvq_levels_1_3_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_education_nvq_level_4_and_above_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_education_gcses_a_levels_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_education_entrance_to_further_education_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_education_entrance_to_higher_education_other_disadvantaged_group": "0",
+"disadvantaged_groups_impact_education_nvq_levels_1_3_calculated_sub_total": "0",
+"disadvantaged_groups_impact_education_nvq_level_4_and_above_calculated_sub_total": "0",
+"disadvantaged_groups_impact_education_gcses_a_levels_calculated_sub_total": "0",
+"disadvantaged_groups_impact_education_entrance_to_further_education_calculated_sub_total": "0",
+"disadvantaged_groups_impact_education_entrance_to_higher_education_calculated_sub_total": "0",
+"disadvantaged_groups_impact_education_nvq_levels_1_3_calulated_total": "0",
+"disadvantaged_groups_impact_education_nvq_level_4_and_above_calulated_total": "0",
+"disadvantaged_groups_impact_education_gcses_a_levels_calulated_total": "0",
+"disadvantaged_groups_impact_education_entrance_to_further_education_calulated_total": "0",
+"disadvantaged_groups_impact_education_entrance_to_higher_education_calulated_total": "0",
+"disadvantaged_groups_impact_education_nvq_levels_1_3_calculated_proportion": "0",
+"disadvantaged_groups_impact_education_nvq_level_4_and_above_calculated_proportion": "0",
+"disadvantaged_groups_impact_education_gcses_a_levels_calculated_proportion": "0",
+"disadvantaged_groups_impact_education_entrance_to_further_education_calculated_proportion": "0",
+"disadvantaged_groups_impact_education_entrance_to_higher_education_calculated_proportion": "0",
+"disadvantaged_groups_impact_education": "",
+"disadvantaged_groups_opportunities_numbers_internships_other_disadvantaged_group": "0",
+"disadvantaged_groups_opportunities_numbers_payment_of_living_wage_other_disadvantaged_group": "0",
+"disadvantaged_groups_opportunities_numbers_businesses_started_other_disadvantaged_group": "0",
+"disadvantaged_groups_opportunities_numbers_housing_secured_other_disadvantaged_group": "0",
+"disadvantaged_groups_opportunities_numbers_other_other_disadvantaged_group": "0",
+"disadvantaged_groups_opportunities_numbers_internships_calculated_sub_total": "0",
+"disadvantaged_groups_opportunities_numbers_payment_of_living_wage_calculated_sub_total": "0",
+"disadvantaged_groups_opportunities_numbers_businesses_started_calculated_sub_total": "0",
+"disadvantaged_groups_opportunities_numbers_housing_secured_calculated_sub_total": "0",
+"disadvantaged_groups_opportunities_numbers_other_calculated_sub_total": "0",
+"disadvantaged_groups_opportunities_numbers_internships_calulated_total": "0",
+"disadvantaged_groups_opportunities_numbers_payment_of_living_wage_calulated_total": "0",
+"disadvantaged_groups_opportunities_numbers_businesses_started_calulated_total": "0",
+"disadvantaged_groups_opportunities_numbers_housing_secured_calulated_total": "0",
+"disadvantaged_groups_opportunities_numbers_other_calulated_total": "0",
+"disadvantaged_groups_opportunities_numbers_internships_calculated_proportion": "0",
+"disadvantaged_groups_opportunities_numbers_payment_of_living_wage_calculated_proportion": "0",
+"disadvantaged_groups_opportunities_numbers_businesses_started_calculated_proportion": "0",
+"disadvantaged_groups_opportunities_numbers_housing_secured_calculated_proportion": "0",
+"disadvantaged_groups_opportunities_numbers_other_calculated_proportion": "0",
+"disadvantaged_groups_opportunities_numbers": ""
+}

From 9391eefccb464d54f0e85579669cfa8e20700a61 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 11 Aug 2023 11:48:16 +0100
Subject: [PATCH 221/352] Calculate row totals

---
 app/views/qae_form/_matrix_question.html.slim | 25 ++++++++++++++++---
 forms/qae_form_builder/matrix_question.rb     | 23 +++++++++++++++++
 2 files changed, 45 insertions(+), 3 deletions(-)

diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index 14caa312df..af28427510 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -1,3 +1,4 @@
+- answers = question.answers
 table.matrix-question-table.govuk-table class="#{'auto-totals-column' if question.auto_totals_column} #{'auto-totals-row-table' if question.totals_label || question.subtotals_label}"
   thead.govuk-table__head
     tr.govuk-table__row
@@ -8,17 +9,35 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
           = heading.label
   tbody
     - question.y_headings.each do |y_heading|
-      - disabled_row_input = y_heading.options[:row_class] == "auto-subtotals-row" || y_heading.options[:row_class] == "auto-totals-row" || y_heading.options[:row_class] == "auto-proportion-row"
+      - disabled_row_input = ["auto-subtotals-row", "auto-totals-row", "auto-proportion-row"].find { |class_name| y_heading.options[:row_class]&.include?(class_name) }
       tr.govuk-table__row class="#{y_heading.options[:row_class] ? y_heading.options[:row_class] : ''}"
         td.govuk-table__header.row-heading scope="row"
           = y_heading.label
+
         - question.x_headings.each do |x_heading|
-          - disabled_col_input = x_heading.label == "Total (system calculated)"
+          - disabled_col_input = x_heading.label == "Total (system calculated)" ? "auto-totals-col" : nil
+          - disabled_input = disabled_row_input || disabled_col_input
+          - if disabled_input
+            - question.decorate.assign_autocalculated_value(question, answers, disabled_input, x_heading, y_heading)
+          - input_value = question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}")
+
           td.govuk-form-group.govuk-table__cell
             div
               label.visuallyhidden-on-desktop.govuk-label for=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}")
                 = "#{y_heading.label} numbers for #{x_heading.label}"
-              input.js-trigger-autosave.matrix-question-input.govuk-input type="number" disabled=(disabled_row_input || disabled_col_input) data-required-row-parent=question.required_row_parent min="0" step="1" name=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") value=question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}") id=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}") autocomplete="off" *possible_read_only_ops aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+              input.js-trigger-autosave.matrix-question-input.govuk-input [
+                type="number"
+                disabled=(disabled_row_input || disabled_col_input)
+                data-required-row-parent=question.required_row_parent
+                min="0"
+                step="1"
+                name=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}")
+                value=input_value
+                id=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}")
+                autocomplete="off"
+                *possible_read_only_ops
+                aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{question.key}" : nil )
+              ]
               span.govuk-error-message aria-live="polite"
                 - if @form_answer.validator_errors && @form_answer.validator_errors["#{question.hash_key}_#{x_heading.key}_#{y_heading.key}"].present?
                   | Required
diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index 0a5435b3fd..62ff42ed7c 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -34,6 +34,29 @@ def required?
 
       errors
     end
+
+    def calculate_value(question, answers)
+      row_totals = {}
+
+      question.y_headings.each do |y_heading|
+        row_totals[y_heading.key] ||= 0
+        question.x_headings.each do |x_heading|
+          cell_value = answers["#{question.key}_#{x_heading.key}_#{y_heading.key}"]
+          unless x_heading.key == "total_system_calculated"
+            row_totals[y_heading.key] += cell_value.to_i
+          end
+          answers["#{question.key}_total_system_calculated_#{y_heading.key}"] = row_totals[y_heading.key]
+        end
+      end
+
+      return row_totals
+    end
+
+    def assign_autocalculated_value(question, answers, disabled_input, x_heading, y_heading)
+      sums = {}
+
+      calculate_value(question, answers)
+    end
   end
 
   class MatrixValue

From 116d048ec4a940b6681a8a496d1090de6c69a74f Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Sat, 12 Aug 2023 12:34:33 +0100
Subject: [PATCH 222/352] Calculate column totals

---
 forms/qae_form_builder/matrix_question.rb | 29 +++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index 62ff42ed7c..afce6051f2 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -35,7 +35,7 @@ def required?
       errors
     end
 
-    def calculate_value(question, answers)
+    def calculate_row_total(question, answers)
       row_totals = {}
 
       question.y_headings.each do |y_heading|
@@ -52,10 +52,31 @@ def calculate_value(question, answers)
       return row_totals
     end
 
+    def calculate_col_total(question, answers)
+      col_totals = {}
+
+      question.x_headings.each do |x_heading|
+        col_totals[x_heading.key] ||= 0
+        question.y_headings.each do |y_heading|
+          cell_value = answers["#{question.key}_#{x_heading.key}_#{y_heading.key}"]
+          unless y_heading.key == "calculated_total" || y_heading.key == "calculated_proportion"
+            col_totals[x_heading.key] += cell_value.to_i
+          end
+          answers["#{question.key}_#{x_heading.key}_calculated_total"] = col_totals[x_heading.key]
+        end
+      end
+
+      return col_totals
+    end
+
     def assign_autocalculated_value(question, answers, disabled_input, x_heading, y_heading)
-      sums = {}
+      if disabled_input == "auto-totals-col"
+        calculate_row_total(question, answers)
+      end
 
-      calculate_value(question, answers)
+      if disabled_input == "auto-totals-row"
+        calculate_col_total(question, answers)
+      end
     end
   end
 
@@ -142,7 +163,7 @@ def y_headings headings
         y_heading "others", @q.others_label, {"row_class": "others-not-disadvantaged-row"}
       end
       if @q.totals_label
-        y_heading "calulated_total", @q.totals_label, {"row_class": "auto-totals-row"}
+        y_heading "calculated_total", @q.totals_label, {"row_class": "auto-totals-row"}
       end
       if @q.proportion_label
         y_heading "calculated_proportion", @q.proportion_label, {"row_class": "auto-proportion-row"}

From a2e630cc9406d08ba98611b3cc5565636e11f1d0 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Sat, 12 Aug 2023 13:09:27 +0100
Subject: [PATCH 223/352] Calculate column proportions

---
 app/views/qae_form/_matrix_question.html.slim |  2 +-
 forms/qae_form_builder/matrix_question.rb     | 39 +++++++++++--------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index af28427510..cf4905bf7c 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -18,7 +18,7 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
           - disabled_col_input = x_heading.label == "Total (system calculated)" ? "auto-totals-col" : nil
           - disabled_input = disabled_row_input || disabled_col_input
           - if disabled_input
-            - question.decorate.assign_autocalculated_value(question, answers, disabled_input, x_heading, y_heading)
+            - question.decorate.assign_autocalculated_value(question.key, question.x_headings, question.y_headings, answers, disabled_input, x_heading.key, y_heading.key)
           - input_value = question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}")
 
           td.govuk-form-group.govuk-table__cell
diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index afce6051f2..6a51fc7e55 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -35,47 +35,54 @@ def required?
       errors
     end
 
-    def calculate_row_total(question, answers)
+    def calculate_row_total(question_key, x_headings, y_headings, answers)
       row_totals = {}
 
-      question.y_headings.each do |y_heading|
+      y_headings.each do |y_heading|
         row_totals[y_heading.key] ||= 0
-        question.x_headings.each do |x_heading|
-          cell_value = answers["#{question.key}_#{x_heading.key}_#{y_heading.key}"]
+        x_headings.each do |x_heading|
+          cell_value = answers["#{question_key}_#{x_heading.key}_#{y_heading.key}"]
           unless x_heading.key == "total_system_calculated"
             row_totals[y_heading.key] += cell_value.to_i
           end
-          answers["#{question.key}_total_system_calculated_#{y_heading.key}"] = row_totals[y_heading.key]
+          answers["#{question_key}_total_system_calculated_#{y_heading.key}"] = row_totals[y_heading.key]
         end
       end
 
       return row_totals
     end
 
-    def calculate_col_total(question, answers)
+    def calculate_col_total(question_key, x_headings, y_headings, answers)
       col_totals = {}
 
-      question.x_headings.each do |x_heading|
+      x_headings.each do |x_heading|
         col_totals[x_heading.key] ||= 0
-        question.y_headings.each do |y_heading|
-          cell_value = answers["#{question.key}_#{x_heading.key}_#{y_heading.key}"]
+        y_headings.each do |y_heading|
+          cell_value = answers["#{question_key}_#{x_heading.key}_#{y_heading.key}"]
           unless y_heading.key == "calculated_total" || y_heading.key == "calculated_proportion"
             col_totals[x_heading.key] += cell_value.to_i
           end
-          answers["#{question.key}_#{x_heading.key}_calculated_total"] = col_totals[x_heading.key]
+          answers["#{question_key}_#{x_heading.key}_calculated_total"] = col_totals[x_heading.key]
         end
       end
 
       return col_totals
     end
 
-    def assign_autocalculated_value(question, answers, disabled_input, x_heading, y_heading)
-      if disabled_input == "auto-totals-col"
-        calculate_row_total(question, answers)
-      end
+    def calculate_proportion(question_key, answers, x_heading, y_heading)
+      disadvantaged = answers["#{question_key}_#{x_heading}_total_disadvantaged"].to_f
+      total = answers["#{question_key}_#{x_heading}_calculated_total"].to_f
+      proportion = (disadvantaged.to_f / total * 100).round(2)
+      answers["#{question_key}_#{x_heading}_calculated_proportion"] = proportion
+    end
 
-      if disabled_input == "auto-totals-row"
-        calculate_col_total(question, answers)
+    def assign_autocalculated_value(question_key, x_headings, y_headings, answers, disabled_input, x_heading, y_heading)
+      if disabled_input == "auto-totals-col"
+        calculate_row_total(question_key, x_headings, y_headings, answers)
+      elsif disabled_input == "auto-totals-row"
+        calculate_col_total(question_key, x_headings, y_headings, answers)
+      elsif disabled_input == "auto-proportion-row"
+        calculate_proportion(question_key, answers, x_heading, y_heading)
       end
     end
   end

From 59751905c9649123bf9c668a59fe62c466f43bc8 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 14 Aug 2023 06:33:56 +0100
Subject: [PATCH 224/352] Calculate columns subtotals

---
 forms/qae_form_builder/matrix_question.rb | 47 +++++++++++++++++------
 1 file changed, 36 insertions(+), 11 deletions(-)

diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index 6a51fc7e55..d5b01e880d 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -48,8 +48,6 @@ def calculate_row_total(question_key, x_headings, y_headings, answers)
           answers["#{question_key}_total_system_calculated_#{y_heading.key}"] = row_totals[y_heading.key]
         end
       end
-
-      return row_totals
     end
 
     def calculate_col_total(question_key, x_headings, y_headings, answers)
@@ -57,31 +55,58 @@ def calculate_col_total(question_key, x_headings, y_headings, answers)
 
       x_headings.each do |x_heading|
         col_totals[x_heading.key] ||= 0
+        if y_headings.any? { |heading| heading.key == "calculated_sub_total" }
+          subtotal = answers["#{question_key}_#{x_heading.key}_calculated_sub_total"].to_i
+          others = answers["#{question_key}_#{x_heading.key}_others"].to_i
+          total = subtotal + others
+          answers["#{question_key}_#{x_heading.key}_calculated_total"] = total
+        else
+          y_headings.each do |y_heading|
+            cell_value = answers["#{question_key}_#{x_heading.key}_#{y_heading.key}"]
+            unless y_heading.key == "calculated_total" || y_heading.key == "calculated_proportion"
+              col_totals[x_heading.key] += cell_value.to_i
+            end
+            answers["#{question_key}_#{x_heading.key}_calculated_total"] = col_totals[x_heading.key]
+          end
+        end
+      end
+    end
+
+    def calculate_col_subtotal(question_key, x_headings, y_headings, answers)
+      col_subtotals = {}
+
+      x_headings.each do |x_heading|
+        col_subtotals[x_heading.key] ||= 0
         y_headings.each do |y_heading|
           cell_value = answers["#{question_key}_#{x_heading.key}_#{y_heading.key}"]
-          unless y_heading.key == "calculated_total" || y_heading.key == "calculated_proportion"
-            col_totals[x_heading.key] += cell_value.to_i
+          unless %w(calculated_sub_total others calculated_total calculated_proportion).include?(y_heading.key)
+            col_subtotals[x_heading.key] += cell_value.to_i
           end
-          answers["#{question_key}_#{x_heading.key}_calculated_total"] = col_totals[x_heading.key]
+          answers["#{question_key}_#{x_heading.key}_calculated_sub_total"] = col_subtotals[x_heading.key]
         end
       end
-
-      return col_totals
     end
 
     def calculate_proportion(question_key, answers, x_heading, y_heading)
-      disadvantaged = answers["#{question_key}_#{x_heading}_total_disadvantaged"].to_f
+      if y_headings.any? { |heading| heading.key == "calculated_sub_total" }
+        disadvantaged = answers["#{question_key}_#{x_heading}_calculated_sub_total"].to_f
+      else
+        disadvantaged = answers["#{question_key}_#{x_heading}_total_disadvantaged"].to_f
+      end
       total = answers["#{question_key}_#{x_heading}_calculated_total"].to_f
       proportion = (disadvantaged.to_f / total * 100).round(2)
       answers["#{question_key}_#{x_heading}_calculated_proportion"] = proportion
     end
 
     def assign_autocalculated_value(question_key, x_headings, y_headings, answers, disabled_input, x_heading, y_heading)
-      if disabled_input == "auto-totals-col"
+      case disabled_input
+      when "auto-totals-col"
         calculate_row_total(question_key, x_headings, y_headings, answers)
-      elsif disabled_input == "auto-totals-row"
+      when "auto-totals-row"
         calculate_col_total(question_key, x_headings, y_headings, answers)
-      elsif disabled_input == "auto-proportion-row"
+      when "auto-subtotals-row"
+        calculate_col_subtotal(question_key, x_headings, y_headings, answers)
+      when "auto-proportion-row"
         calculate_proportion(question_key, answers, x_heading, y_heading)
       end
     end

From 46ea7827b6b1896d74818b179efab8e92e7838fb Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 14 Aug 2023 09:14:17 +0100
Subject: [PATCH 225/352] Exclude subtotal, total, proportion cells from
 required inputs

---
 forms/qae_form_builder/matrix_question.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index d5b01e880d..fe5e9c1f36 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -1,4 +1,5 @@
 class QaeFormBuilder
+  EXCLUDED_HEADINGS = %w(calculated_sub_total others calculated_total calculated_proportion).freeze
   class MatrixQuestionValidator < QuestionValidator
     def errors
       result = super
@@ -6,8 +7,7 @@ def errors
         question.y_headings.each do |y_heading|
           question.x_headings.each do |x_heading|
             suffix = "#{x_heading.key}_#{y_heading.key}"
-
-            if !question.input_value(suffix: suffix).present?
+            if !question.input_value(suffix: suffix).present? && !EXCLUDED_HEADINGS.any? { |excluded| question.input_name(suffix: suffix).include?(excluded) }
               if (question.required_row_parent && question.required_rows.include?(y_heading.key)) || !question.required_row_parent
                 result[question.hash_key(suffix: suffix)] ||= ""
                 result[question.hash_key(suffix: suffix)] << "Required"
@@ -79,7 +79,7 @@ def calculate_col_subtotal(question_key, x_headings, y_headings, answers)
         col_subtotals[x_heading.key] ||= 0
         y_headings.each do |y_heading|
           cell_value = answers["#{question_key}_#{x_heading.key}_#{y_heading.key}"]
-          unless %w(calculated_sub_total others calculated_total calculated_proportion).include?(y_heading.key)
+          unless EXCLUDED_HEADINGS.include?(y_heading.key)
             col_subtotals[x_heading.key] += cell_value.to_i
           end
           answers["#{question_key}_#{x_heading.key}_calculated_sub_total"] = col_subtotals[x_heading.key]

From 908ab0c5613334ed061dc16fab78f1fe3b538c53 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 14 Aug 2023 10:32:59 +0100
Subject: [PATCH 226/352] Remove 'Death of queen' references in mailers

---
 .../account_mailers/notify_shortlisted_mailer/notify.text.erb | 2 --
 .../notify_shortlisted_mailer/notify_po_sd.text.erb           | 2 --
 .../notify_po_sd_with_actual_figures.text.erb                 | 2 --
 .../notify_shortlisted_mailer/preview/notify.html.slim        | 3 ---
 .../notify_shortlisted_mailer/preview/notify_po_sd.html.slim  | 3 ---
 .../preview/notify_po_sd_with_actual_figures.html.slim        | 3 ---
 .../users/audit_certificate_request_mailer/notify.text.erb    | 4 +---
 7 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/app/views/account_mailers/notify_shortlisted_mailer/notify.text.erb b/app/views/account_mailers/notify_shortlisted_mailer/notify.text.erb
index d1f2b54b9d..f8374ec884 100644
--- a/app/views/account_mailers/notify_shortlisted_mailer/notify.text.erb
+++ b/app/views/account_mailers/notify_shortlisted_mailer/notify.text.erb
@@ -26,8 +26,6 @@ Please note:
 
 Furthermore, as stipulated in (Section F4 Confirmation of Entry) on the application, the King's Awards Office will undertake due diligence checks with a range of government departments, agencies and public bodies. If you require further information on this, please contact us.
 
-Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 Yours sincerely,
 
 Nichola Bruno
diff --git a/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd.text.erb b/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd.text.erb
index 4a2afe302b..44778c34fb 100644
--- a/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd.text.erb
+++ b/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd.text.erb
@@ -28,8 +28,6 @@ Please note:
 
 Furthermore, as stipulated in (Section F4 - Confirmation of Entry) on the application, the King's Awards Office will undertake due diligence checks with a range of government departments, agencies and public bodies. If you require further information on this, please contact us.
 
-Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 Yours sincerely,
 
 Nichola Bruno
diff --git a/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd_with_actual_figures.text.erb b/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd_with_actual_figures.text.erb
index 6c0f48d738..b640f7cccb 100644
--- a/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd_with_actual_figures.text.erb
+++ b/app/views/account_mailers/notify_shortlisted_mailer/notify_po_sd_with_actual_figures.text.erb
@@ -10,8 +10,6 @@ Please do not make any public announcement of your shortlisted status now or at
 
 Furthermore, as stipulated in (Section F4 - Confirmation of Entry) on the application, the King's Awards Office will undertake due diligence checks with a range of government departments, agencies and public bodies. If you require further information on this, please contact us.
 
-Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 Yours sincerely,
 
 Nichola Bruno
diff --git a/app/views/account_mailers/notify_shortlisted_mailer/preview/notify.html.slim b/app/views/account_mailers/notify_shortlisted_mailer/preview/notify.html.slim
index bac0cc0799..0204cb93df 100644
--- a/app/views/account_mailers/notify_shortlisted_mailer/preview/notify.html.slim
+++ b/app/views/account_mailers/notify_shortlisted_mailer/preview/notify.html.slim
@@ -46,9 +46,6 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | Furthermore, as stipulated in (Section F4 Confirmation of Entry) on the application, the King's Awards Office will undertake due diligence checks with a range of government departments, agencies and public bodies. If you require further information on this, please contact us.
 
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 p style="font-size: 19px; line-height: 1.315789474; margin: 38px 0 38px 0;"
   | Yours sincerely,
   br
diff --git a/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd.html.slim b/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd.html.slim
index bff35e8746..3ffc9623eb 100644
--- a/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd.html.slim
+++ b/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd.html.slim
@@ -49,9 +49,6 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | Furthermore, as stipulated in (Section F4 - Confirmation of Entry) on the application, the King's Awards Office will undertake due diligence checks with a range of government departments, agencies and public bodies. If you require further information on this, please contact us.
 
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | Yours sincerely,
   br
diff --git a/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd_with_actual_figures.html.slim b/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd_with_actual_figures.html.slim
index 2d0ab06ff2..ddd2c1ffaa 100644
--- a/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd_with_actual_figures.html.slim
+++ b/app/views/account_mailers/notify_shortlisted_mailer/preview/notify_po_sd_with_actual_figures.html.slim
@@ -16,9 +16,6 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | Furthermore, as stipulated in (Section F4 - Confirmation of Entry) on the application, the King's Awards Office will undertake due diligence checks with a range of government departments, agencies and public bodies. If you require further information on this, please contact us.
 
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  | Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
   | Yours sincerely,
   br
diff --git a/app/views/users/audit_certificate_request_mailer/notify.text.erb b/app/views/users/audit_certificate_request_mailer/notify.text.erb
index 48156a23f1..94f1b7130a 100644
--- a/app/views/users/audit_certificate_request_mailer/notify.text.erb
+++ b/app/views/users/audit_certificate_request_mailer/notify.text.erb
@@ -21,9 +21,7 @@ If you do not submit your External Accountant's Report before the deadline, we w
   5. Log in and upload the External Accountant's Report to the King’s Award online portal, “Verification of figures” page, by following the link below:
      <%= users_form_answer_audit_certificate_url(@form_answer) %>
 
-Please note, following the sad death of HM Queen Elizabeth II, His Majesty will be consulted on the future of the Awards, but no immediate decisions will be made.
-
 Yours sincerely,
 
 Nichola Bruno
-Head, The King’s Awards for Enterprise Office
+Head of The King’s Awards Office

From c5b7fad930a9aeed7a98feed1ba21d4fc90a173c Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 14 Aug 2023 10:35:58 +0100
Subject: [PATCH 227/352] Add aria-live span for data uploads

---
 app/assets/javascripts/admin/dashboard.js.coffee          | 8 +++++---
 app/views/admin/dashboard/_applications_report.html.slim  | 5 ++---
 .../dashboard/totals_by_day/_registrations.html.slim      | 2 ++
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/admin/dashboard.js.coffee b/app/assets/javascripts/admin/dashboard.js.coffee
index 03e9512a47..c23bcd0318 100644
--- a/app/assets/javascripts/admin/dashboard.js.coffee
+++ b/app/assets/javascripts/admin/dashboard.js.coffee
@@ -18,6 +18,8 @@ jQuery ->
     $("tbody", wrapper).load href, ->
       link.removeClass("hidden")
       $(".updating-data", wrapper).addClass("hidden")
-      # $(".dashboard-report .sr-only").empty()
-      srWrapper = wrapper.closest(".dashboard-report .sr-only")
-      srWrapper.text("Data updated")
+      if wrapper.find(".sr-only").text().length == 0
+        wrapper.find(".sr-only").text("Data loaded")
+      else
+        wrapper.find(".sr-only").empty()
+        wrapper.find(".sr-only").text("Data updated")
diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index d2af2b69c0..9b2592d2ee 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -3,10 +3,9 @@
     | Load data
   = link_to "Download data", url, class: "btn btn-primary btn--load update-report if-js-hide", aria: { label: "Download #{title} data" }
   button.btn.btn-primary.btn--loading.updating-data.hidden aria-label="Updating #{title} data"
-    Updating data
+    | Updating data
 
-  .sr-only role="status" aria-live="polite"
-    span
+  span.sr-only role="status" aria-live="polite" aria-relevant="all"
 
   table.dashboard-table.dashboard-table--small width="1000"
     caption
diff --git a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
index afa48f305d..b69b2e951d 100644
--- a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
@@ -6,6 +6,8 @@
   button.btn.btn-primary.btn--loading.updating-data.hidden
     | Updating data
 
+  span.sr-only role="status" aria-live="polite" aria-relevant="all"
+
   table.dashboard-table.dashboard-table--small width="1000"
     caption
       | New account registrations

From 301ab66aaf5291745d5347dbb2d323ffc21a4dec Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Mon, 14 Aug 2023 13:57:03 +0400
Subject: [PATCH 228/352] Add action_mailer default url to dev enviroment

---
 config/environments/development.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/environments/development.rb b/config/environments/development.rb
index 8500f459a8..0653204f85 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -43,6 +43,7 @@
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
+  config.action_mailer.default_url_options = { host: "localhost:3000" }  # Raises error for missing translations
 
   # Raise exceptions for disallowed deprecations.
   config.active_support.disallowed_deprecation = :raise

From 26b12cdc3f32daf09231c45ddf230e97c6db749b Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 14 Aug 2023 12:38:53 +0100
Subject: [PATCH 229/352] Additional AUTO_CALCULATED_HEADINGS constant that
 doesnt include 'others', these values should still be required but omitted
 from calculate_col_subtotal method

---
 forms/qae_form_builder/matrix_question.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/forms/qae_form_builder/matrix_question.rb b/forms/qae_form_builder/matrix_question.rb
index fe5e9c1f36..4020701c45 100644
--- a/forms/qae_form_builder/matrix_question.rb
+++ b/forms/qae_form_builder/matrix_question.rb
@@ -1,4 +1,5 @@
 class QaeFormBuilder
+  AUTO_CALCULATED_HEADINGS = %w(total_system_calculated calculated_total calculated_proportion calculated_sub_total).freeze
   EXCLUDED_HEADINGS = %w(calculated_sub_total others calculated_total calculated_proportion).freeze
   class MatrixQuestionValidator < QuestionValidator
     def errors
@@ -7,7 +8,7 @@ def errors
         question.y_headings.each do |y_heading|
           question.x_headings.each do |x_heading|
             suffix = "#{x_heading.key}_#{y_heading.key}"
-            if !question.input_value(suffix: suffix).present? && !EXCLUDED_HEADINGS.any? { |excluded| question.input_name(suffix: suffix).include?(excluded) }
+            if !question.input_value(suffix: suffix).present? && !AUTO_CALCULATED_HEADINGS.any? { |excluded| question.input_name(suffix: suffix).include?(excluded) }
               if (question.required_row_parent && question.required_rows.include?(y_heading.key)) || !question.required_row_parent
                 result[question.hash_key(suffix: suffix)] ||= ""
                 result[question.hash_key(suffix: suffix)] << "Required"

From ebcb77d00d7d72dec5f28a627a4a0783eb0744e1 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 14 Aug 2023 14:26:13 +0100
Subject: [PATCH 230/352] Add error border on matrix required cells

---
 app/views/qae_form/_matrix_question.html.slim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index cf4905bf7c..687e222195 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -21,8 +21,9 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
             - question.decorate.assign_autocalculated_value(question.key, question.x_headings, question.y_headings, answers, disabled_input, x_heading.key, y_heading.key)
           - input_value = question.input_value(suffix: "#{x_heading.key}_#{y_heading.key}")
 
-          td.govuk-form-group.govuk-table__cell
-            div
+          td.govuk-table__cell class="#{('govuk-form-group--error' if @form_answer.validator_errors && @form_answer.validator_errors["#{question.hash_key}_#{x_heading.key}_#{y_heading.key}"].present?)}"
+
+            div.govuk-form-group
               label.visuallyhidden-on-desktop.govuk-label for=question.input_name(suffix: "#{x_heading.key}_#{y_heading.key}")
                 = "#{y_heading.label} numbers for #{x_heading.label}"
               input.js-trigger-autosave.matrix-question-input.govuk-input [

From d4eb48887013381d3bc2622c6587b20b38fabcda Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Mon, 14 Aug 2023 18:55:56 +0400
Subject: [PATCH 231/352] Fix unsafe redirect

---
 app/controllers/assessor/reports_controller.rb        | 2 +-
 app/controllers/concerns/audit_certificate_context.rb | 2 +-
 app/controllers/users/form_answers_controller.rb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/assessor/reports_controller.rb b/app/controllers/assessor/reports_controller.rb
index d5cd7fa90c..3b68cae277 100644
--- a/app/controllers/assessor/reports_controller.rb
+++ b/app/controllers/assessor/reports_controller.rb
@@ -24,7 +24,7 @@ def show
                     type: "application/pdf",
                     disposition: 'attachment'
         else
-          redirect_to pdf.data
+          redirect_to pdf.data, allow_other_host: true
         end
       end
     end
diff --git a/app/controllers/concerns/audit_certificate_context.rb b/app/controllers/concerns/audit_certificate_context.rb
index ab858e2064..0166b50719 100644
--- a/app/controllers/concerns/audit_certificate_context.rb
+++ b/app/controllers/concerns/audit_certificate_context.rb
@@ -1,7 +1,7 @@
 module AuditCertificateContext
   def show
     authorize form_answer, :download_audit_certificate_pdf?
-    redirect_to resource.attachment_url
+    redirect_to resource.attachment_url, allow_other_host: true
   end
 
   def create
diff --git a/app/controllers/users/form_answers_controller.rb b/app/controllers/users/form_answers_controller.rb
index 1a704f9d99..8825a9b41f 100644
--- a/app/controllers/users/form_answers_controller.rb
+++ b/app/controllers/users/form_answers_controller.rb
@@ -71,7 +71,7 @@ def can_render_pdf_on_fly?
 
   def render_hard_copy_pdf
     if form_answer.pdf_version.present?
-      redirect_to form_answer.pdf_version.url
+      redirect_to form_answer.pdf_version.url, allow_other_host: true
     else
       if !admin_in_read_only_mode?
         redirect_to dashboard_path,

From 6a3c2140c2eff76a0eab6d3443bd684e851ca5f6 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 14 Aug 2023 20:06:41 +0100
Subject: [PATCH 232/352] Fixes errors on invalid dates

---
 .../innovation_financial_year_date_question.rb         | 10 ++++++++--
 forms/qae_form_builder/question.rb                     | 10 +++++++---
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/forms/qae_form_builder/innovation_financial_year_date_question.rb b/forms/qae_form_builder/innovation_financial_year_date_question.rb
index 54d9c7750d..f413a8817d 100644
--- a/forms/qae_form_builder/innovation_financial_year_date_question.rb
+++ b/forms/qae_form_builder/innovation_financial_year_date_question.rb
@@ -9,10 +9,16 @@ def errors
       end
 
       date << Date.today.year.to_s
+      day = question.input_value(suffix: "day")
+      month = question.input_value(suffix: "month")
 
-      date = Date.parse(date.join("/")) rescue nil
+      if day.blank? || month.blank?
+        date = nil
+      else
+        date = Date.parse(date.join("/")) rescue nil
+      end
 
-      if !date && question.required?
+      if question.required? && !date
         result[question.hash_key] ||= ""
         result[question.hash_key] << "#{question.ref || question.sub_ref} is incomplete. Year-end is required. Use the format MM/YYYY"
       end
diff --git a/forms/qae_form_builder/question.rb b/forms/qae_form_builder/question.rb
index 5fbc4a7448..a7ea8d8792 100644
--- a/forms/qae_form_builder/question.rb
+++ b/forms/qae_form_builder/question.rb
@@ -233,9 +233,13 @@ def visible?(fetched_answers=nil)
                        end
 
           if day.present? && month.present?
-            date = Date.new(2000, month.to_i, day.to_i)
-            from, to = condition.options.dig(:range)
-            date.between?(from, to)
+            date = Date.parse("#{day.to_i}/#{month.to_i}/2000") rescue nil
+            if date
+              from, to = condition.options.dig(:range)
+              date.between?(from, to)
+            else
+              false
+            end
           else
             false
           end

From 6c84e57d098c101310569df3b5024b3c22e71579 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 15 Aug 2023 09:06:25 +0100
Subject: [PATCH 233/352] add allow_other_host

---
 app/controllers/admin/reports_controller.rb        | 2 +-
 app/controllers/judge/case_summaries_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 3c32cae330..ac21e9a4a2 100644
--- a/app/controllers/admin/reports_controller.rb
+++ b/app/controllers/admin/reports_controller.rb
@@ -30,7 +30,7 @@ def show
                     type: "application/pdf",
                     disposition: 'attachment'
         else
-          redirect_to pdf.data
+          redirect_to pdf.data, allow_other_host: true
         end
       end
     end
diff --git a/app/controllers/judge/case_summaries_controller.rb b/app/controllers/judge/case_summaries_controller.rb
index 336b401586..c8debdf5d6 100644
--- a/app/controllers/judge/case_summaries_controller.rb
+++ b/app/controllers/judge/case_summaries_controller.rb
@@ -16,7 +16,7 @@ def download
                     type: "application/pdf",
                     disposition: 'attachment'
         else
-          redirect_to pdf.data
+          redirect_to pdf.data, allow_other_host: true
         end
       end
     end

From 09cdfaed07e9ce0024ac38e093ffdd07c43243eb Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Tue, 15 Aug 2023 12:38:33 +0400
Subject: [PATCH 234/352] Fix discrepancies between primary and secondary
 appraisals report

---
 ...etween_primary_and_secondary_appraisals.rb | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb b/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb
index 3686ec3618..0fe35c3191 100644
--- a/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb
+++ b/app/models/reports/discrepancies_between_primary_and_secondary_appraisals.rb
@@ -45,22 +45,22 @@ def initialize(year, award_type, current_subject=nil)
 
       raise "Access Denied!"
     end
-  end
 
-  def stream
-    scoped = @year.form_answers.order(:id)
-                               .joins(%Q{
+    @scope = @year.form_answers.order(:id)
+                  .joins(%Q{
                                  JOIN assessor_assignments primary_assignments ON primary_assignments.form_answer_id = form_answers.id
                                  JOIN assessor_assignments secondary_assignments ON secondary_assignments.form_answer_id = form_answers.id
                                })
-                               .where(primary_assignments: { position: AssessorAssignment.positions[:primary] })
-                               .where.not(primary_assignments: { position: nil })
-                               .where(secondary_assignments: { position: AssessorAssignment.positions[:secondary] })
-                               .where.not(secondary_assignments: { position: nil })
-                               .primary_and_secondary_appraisals_are_not_match
-                               .where(award_type: @award_type)
+                  .where(primary_assignments: { position: AssessorAssignment.positions[:primary] })
+                  .where.not(primary_assignments: { position: nil })
+                  .where(secondary_assignments: { position: AssessorAssignment.positions[:secondary] })
+                  .where.not(secondary_assignments: { position: nil })
+                  .primary_and_secondary_appraisals_are_not_match
+                  .where(award_type: @award_type)
+  end
 
-    prepare_stream(scoped)
+  def stream
+    prepare_stream(@scope)
   end
 
   private

From 582b3d9074cccc48e692cf87a4b07ccbf94b6ff6 Mon Sep 17 00:00:00 2001
From: Nickolay Loshkarev <nickolay.loshkarev@gmail.com>
Date: Mon, 14 Aug 2023 17:48:18 +0400
Subject: [PATCH 235/352] Financial summary table: fix save action

---
 app/assets/javascripts/admin/financial_data.js.coffee | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/financial_data.js.coffee b/app/assets/javascripts/admin/financial_data.js.coffee
index 96df615412..ee147ef995 100644
--- a/app/assets/javascripts/admin/financial_data.js.coffee
+++ b/app/assets/javascripts/admin/financial_data.js.coffee
@@ -6,13 +6,15 @@ jQuery ->
     overallBenchmarksTable = ($ "#overall-financial-benchmarks")
     financialTable = ($ "#financial-table")
 
-    $("input", form).on "change keyup keydown paste", ->
-      timer ||= setTimeout(saveFinancials, 500)
-
     ($ "button", form).on "click", (event) ->
       do event.preventDefault
       $(this).closest(".form-group").removeClass("form-edit")
 
+
+    ($ ".form-save-button", form).on "click", (event) ->
+      do event.preventDefault
+      saveFinancials()
+
     updateExportsGrowth = (exports) ->
       exportsGrowth = ($ 'tr.exports-growth td.value', benchmarksTable)
       values = exports.map (i, td) ->

From 7bfea54a58b23ad708038e20fb8c2bfe6e0d60b1 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 15 Aug 2023 11:25:30 +0100
Subject: [PATCH 236/352] Copy change

---
 .../sustainable_development/sustainable_development_step2.rb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
index 77ddb18584..9de7990b73 100644
--- a/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
+++ b/forms/award_years/v2024/sustainable_development/sustainable_development_step2.rb
@@ -271,7 +271,7 @@ def development_step2
           required
           context %(
             <p>
-              If two or more organisations made a significant contribution to the social mobility initiative, then you should make a joint entry.
+              If two or more organisations made a significant contribution to the sustainability initiative, then you should make a joint entry.
             </p>
             <p>
               Each organisation should submit separate entry forms and cross-reference them.

From 6ce79905f1e7a2975eb6a58960f894862a718751 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 15 Aug 2023 13:12:22 +0100
Subject: [PATCH 237/352] Change error message for year ends

---
 .../qae_form_builder/innovation_financial_year_date_question.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/qae_form_builder/innovation_financial_year_date_question.rb b/forms/qae_form_builder/innovation_financial_year_date_question.rb
index f413a8817d..aeff83b8f8 100644
--- a/forms/qae_form_builder/innovation_financial_year_date_question.rb
+++ b/forms/qae_form_builder/innovation_financial_year_date_question.rb
@@ -20,7 +20,7 @@ def errors
 
       if question.required? && !date
         result[question.hash_key] ||= ""
-        result[question.hash_key] << "#{question.ref || question.sub_ref} is incomplete. Year-end is required. Use the format MM/YYYY"
+        result[question.hash_key] << "#{question.ref || question.sub_ref} is invalid. Financial year-end is required. Use the format DD/MM"
       end
 
       result

From e74f7eb3e56a3373d3933eb0a9297b4f99608a06 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 02:07:52 +0200
Subject: [PATCH 238/352] FIX: Add server validations for `by_years` questions

---
 .../qae_form/_by_years_question.html.slim     | 33 ++++++++++++++++---
 forms/qae_form_builder/by_years_question.rb   | 16 +++++++++
 2 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/app/views/qae_form/_by_years_question.html.slim b/app/views/qae_form/_by_years_question.html.slim
index ef8ea45751..782b7ffec1 100644
--- a/app/views/qae_form/_by_years_question.html.slim
+++ b/app/views/qae_form/_by_years_question.html.slim
@@ -1,4 +1,6 @@
-.js-financial-conditional data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message id="q_#{question.key}" role="group"
+- has_errors = question.by_year_conditions.map { |c| (1..c.years).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of#{c.years}")).present? } }.flatten.compact_blank.present?
+
+.js-financial-conditional class=(" govuk-form-group--error" if has_errors) data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message id="q_#{question.key}" role="group"
   - for c in question.by_year_conditions
     .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
       .if-js-hide
@@ -7,9 +9,10 @@
             = "If you had growth in the last #{c.years} years"
       .govuk-grid-row
         - (1..c.years).each do |y|
+          - suffix = "#{y}of#{c.years}"
           .span-financial.govuk-grid-column-one-third
             label.govuk-label class="govuk-!-margin-bottom-0 govuk-!-margin-top-5" for=question.input_name(suffix: "#{y}of#{c.years}")
-              span.js-year-end.show-default data-year="#{y}of#{c.years}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
+              span.js-year-end.show-default data-year="#{suffix}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
                 span.js-year-default
                   ' Financial year
                   = y
@@ -17,11 +20,33 @@
                     '  (most recent)
                 span.js-year-text.hide-if-empty
             span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
+              - if @form_answer.validator_errors&.dig(question.hash_key(suffix: suffix))
+                span.govuk-visually-hidden
+                  | Error:
+                =< @form_answer.validator_errors[question.hash_key(suffix: suffix)]
             span class="#{'govuk-input__wrapper' if question.type == :money}"
               - if question.type == :money
                 .govuk-input__prefix £
-                input.govuk-input.gov-input--width-4.js-trigger-autosave.js-form-financial-data type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}") value=question.input_value(suffix: "#{y}of#{c.years}").to_s.delete(",") id=question.input_name(suffix: "#{y}of#{c.years}") autocomplete="off" *possible_read_only_ops
+                input.govuk-input.gov-input--width-4.js-trigger-autosave.js-form-financial-data [
+                  type="number"
+                  pattern="[0-9]*"
+                  name=question.input_name(suffix: suffix) 
+                  value=question.input_value(suffix: suffix).to_s.delete(",") 
+                  id=question.input_name(suffix: suffix)
+                  autocomplete="off"
+                  *possible_read_only_ops
+                  aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{suffix}" : nil )
+                ]
               - else
                 - type = "#{question.type || 'text'}"
-                input.govuk-input.gov-input--width-4.js-trigger-autosave.js-form-financial-data type="#{type}" pattern="#{'[0-9]*' if type == 'number'}" name=question.input_name(suffix: "#{y}of#{c.years}") value=question.input_value(suffix: "#{y}of#{c.years}").to_s.delete(",") id=question.input_name(suffix: "#{y}of#{c.years}") autocomplete="off" *possible_read_only_ops
+                input.govuk-input.gov-input--width-4.js-trigger-autosave.js-form-financial-data [
+                  type="#{type}"
+                  pattern="#{'[0-9]*' if type == 'number'}"
+                  name=question.input_name(suffix: suffix) 
+                  value=question.input_value(suffix: suffix).to_s.delete(",") 
+                  id=question.input_name(suffix: suffix) 
+                  autocomplete="off" 
+                  *possible_read_only_ops
+                  aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{suffix}" : nil )
+                ]
       .clear
diff --git a/forms/qae_form_builder/by_years_question.rb b/forms/qae_form_builder/by_years_question.rb
index 39333c0943..72c167fdd3 100644
--- a/forms/qae_form_builder/by_years_question.rb
+++ b/forms/qae_form_builder/by_years_question.rb
@@ -1,5 +1,21 @@
 class QaeFormBuilder
   class ByYearsQuestionValidator < QuestionValidator
+    def errors
+      result = super
+
+      return result unless question.visible?
+
+      if question.required?
+        question.active_fields.each.with_index(1) do |suffix, idx|
+          if !question.input_value(suffix: suffix).present?
+            result[question.hash_key(suffix: suffix)] ||= ""
+            result[question.hash_key(suffix: suffix)] << "Question #{question.ref || question.sub_ref} is incomplete. Financial year #{idx} is required and must be filled in."
+          end
+        end
+      end
+
+      result
+    end
   end
 
   class ByYearsQuestionDecorator < QuestionDecorator

From b07096926af2f295e4dc5f55e1e60d060e03a3a1 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 17:19:59 +0200
Subject: [PATCH 239/352] Validate `one_option_by_years` questions w/ already
 defined validations

---
 .../_one_option_by_years_question.html.slim     | 17 ++++++++++++-----
 .../one_option_by_years_question.rb             |  2 +-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/views/qae_form/_one_option_by_years_question.html.slim b/app/views/qae_form/_one_option_by_years_question.html.slim
index 65d18895e9..1cbf4903ce 100644
--- a/app/views/qae_form/_one_option_by_years_question.html.slim
+++ b/app/views/qae_form/_one_option_by_years_question.html.slim
@@ -1,4 +1,6 @@
-.js-financial-conditional data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message role="group" id="q_#{question.key}"
+- has_errors = (1..3).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of3")) }.present?
+
+.js-financial-conditional class=(" govuk-form-group--error" if has_errors) data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message role="group" id="q_#{question.key}"
   .by-years-wrapper
     .if-js-hide
       label.govuk-label
@@ -6,9 +8,10 @@
           = "If you had growth in the last 3 years"
     .govuk-grid-row
       - (1..3).each do |y|
+        - suffix = "#{y}of3"
         .span-financial.govuk-grid-column-one-third
-          label.govuk-label class="govuk-!-margin-bottom-0 govuk-!-margin-top-5" for=question.input_name(suffix: "#{y}of3")
-            span.js-year-end.show-default data-year="#{y}of3" data-year-diff="#{::Utils::Diff.calc(3, y)}"
+          label.govuk-label class="govuk-!-margin-bottom-0 govuk-!-margin-top-5" for=question.input_name(suffix: suffix)
+            span.js-year-end.show-default data-year=suffix data-year-diff="#{::Utils::Diff.calc(3, y)}"
               span.js-year-default
                 ' Financial year
                 = y
@@ -16,11 +19,15 @@
                   '  (most recent)
               span.js-year-text.hide-if-empty
           span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
+            - if @form_answer.validator_errors&.dig(question.hash_key(suffix: suffix))
+              span.govuk-visually-hidden
+                | Error:
+              =< @form_answer.validator_errors[question.hash_key(suffix: suffix)]
           span class="#{'govuk-input__wrapper' if question.type == :money}"
             - if question.type == :money
               .govuk-input__prefix £
-              input.govuk-input.govuk-input--width-4.js-trigger-autosave.js-form-financial-data.govuk-input type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of3") value=question.input_value(suffix: "#{y}of3").to_s.delete(",") id=question.input_name(suffix: "#{y}of3") autocomplete="off" *possible_read_only_ops
+              input.govuk-input.govuk-input--width-4.js-trigger-autosave.js-form-financial-data.govuk-input type="number" pattern="[0-9]*" name=question.input_name(suffix: suffix) value=question.input_value(suffix: suffix).to_s.delete(",") id=question.input_name(suffix: suffix) autocomplete="off" *possible_read_only_ops
             - else
               - type = "#{question.type || 'text'}"
-              input.govuk-input.govuk-input--width-4.js-trigger-autosave.js-form-financial-data.govuk-input type="#{type}" pattern="#{'[0-9]*' if type == 'number'}" name=question.input_name(suffix: "#{y}of3") value=question.input_value(suffix: "#{y}of3").to_s.delete(",") id=question.input_name(suffix: "#{y}of3") autocomplete="off" *possible_read_only_ops
+              input.govuk-input.govuk-input--width-4.js-trigger-autosave.js-form-financial-data.govuk-input type="#{type}" pattern="#{'[0-9]*' if type == 'number'}" name=question.input_name(suffix: suffix) value=question.input_value(suffix: suffix).to_s.delete(",") id=question.input_name(suffix: suffix) autocomplete="off" *possible_read_only_ops
     .clear
diff --git a/forms/qae_form_builder/one_option_by_years_question.rb b/forms/qae_form_builder/one_option_by_years_question.rb
index 11138e178c..1f57e5b8e4 100644
--- a/forms/qae_form_builder/one_option_by_years_question.rb
+++ b/forms/qae_form_builder/one_option_by_years_question.rb
@@ -1,5 +1,5 @@
 class QaeFormBuilder
-  class OneOptionByYearsQuestionValidator < QuestionValidator
+  class OneOptionByYearsQuestionValidator < ::QaeFormBuilder::ByYearsQuestionValidator
   end
 
   class OneOptionByYearsQuestionDecorator < QuestionDecorator

From 5821519e70c86838fb3eae1b21bb7a5c87a04cc4 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 17:21:37 +0200
Subject: [PATCH 240/352] Add more date validations  to `by_years` &
 `one_option_by_years` questions

---
 .../_by_years_label_question.html.slim        | 23 +++++++-----
 ...e_option_by_years_label_question.html.slim | 19 ++++++----
 .../by_years_label_question.rb                | 35 ++++++++++++++-----
 .../one_option_by_years_label_question.rb     |  2 +-
 4 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/app/views/qae_form/_by_years_label_question.html.slim b/app/views/qae_form/_by_years_label_question.html.slim
index b0b2eb1edf..a1557a5a48 100644
--- a/app/views/qae_form/_by_years_label_question.html.slim
+++ b/app/views/qae_form/_by_years_label_question.html.slim
@@ -1,34 +1,41 @@
+- has_errors = question.by_year_conditions.map { |c| (1..c.years).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of#{c.years}")).present? } }.flatten.compact_blank.present?
+
 div role="group" id="q_#{question.key}"
   .js-financial-year-changed-dates
     - for c in question.by_year_conditions
-      .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+      .js-conditional-question.by-years-wrapper class=(" govuk-form-group--error" if has_errors) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
         .if-js-hide
           label.govuk-label
             strong
               = "If you had growth in the last #{c.years} years"
         .govuk-grid-row
           - (1..c.years).each do |y|
+            - suffix = "#{y}of#{c.years}"
             .govuk-grid-column-one-half.js-fy-entries class="#{'fy-latest' if y == c.years}" role="group"
-              span.js-year-end.show-default data-year="#{y}of#{c.years}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
+              span.js-year-end.show-default data-year="#{suffix}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
                 span.js-year-default class="govuk-body govuk-!-font-size-19 govuk-!-margin-bottom-0 govuk-!-margin-top-5"
                   = question.format_label(y)
                   - if y == c.years
                     '  (most recent)
               span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
+                - if @form_answer.validator_errors&.dig(question.hash_key(suffix: suffix))
+                  span.govuk-visually-hidden
+                    | Error:
+                  =< @form_answer.validator_errors[question.hash_key(suffix: suffix)]
               .govuk-date-input
                 .govuk-date-input__item
                   .govuk-form-group
-                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}day")
+                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{suffix}day")
                       ' Day
-                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-day type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}day") value=question.input_value(suffix: "#{y}of#{c.years}day") id=question.input_name(suffix: "#{y}of#{c.years}day") maxlength=2 autocomplete="off" *possible_read_only_ops
+                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-day type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{suffix}day") value=question.input_value(suffix: "#{suffix}day") id=question.input_name(suffix: "#{suffix}day") maxlength=2 autocomplete="off" *possible_read_only_ops
                 .govuk-date-input__item
                   .govuk-form-group
-                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}month")
+                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{suffix}month")
                       ' Month
-                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-month type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}month") value=question.input_value(suffix: "#{y}of#{c.years}month") id=question.input_name(suffix: "#{y}of#{c.years}month") maxlength=2 autocomplete="off" *possible_read_only_ops
+                    input.govuk-input.govuk-date-input__input.govuk-input--width-2.js-trigger-autosave.js-fy-month type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{suffix}month") value=question.input_value(suffix: "#{suffix}month") id=question.input_name(suffix: "#{suffix}month") maxlength=2 autocomplete="off" *possible_read_only_ops
                 .govuk-date-input__item
                   .govuk-form-group
-                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of#{c.years}year")
+                    label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{suffix}year")
                       ' Year
-                    input.govuk-input.govuk-date-input__input.govuk-input--width-4.js-trigger-autosave.js-fy-year type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{y}of#{c.years}year") value=question.input_value(suffix: "#{y}of#{c.years}year") id=question.input_name(suffix: "#{y}of#{c.years}year") maxlength=4 autocomplete="off" *possible_read_only_ops
+                    input.govuk-input.govuk-date-input__input.govuk-input--width-4.js-trigger-autosave.js-fy-year type="number" pattern="[0-9]*" name=question.input_name(suffix: "#{suffix}year") value=question.input_value(suffix: "#{suffix}year") id=question.input_name(suffix: "#{suffix}year") maxlength=4 autocomplete="off" *possible_read_only_ops
         .clear
diff --git a/app/views/qae_form/_one_option_by_years_label_question.html.slim b/app/views/qae_form/_one_option_by_years_label_question.html.slim
index 9c8e488e91..b6e3b124f9 100644
--- a/app/views/qae_form/_one_option_by_years_label_question.html.slim
+++ b/app/views/qae_form/_one_option_by_years_label_question.html.slim
@@ -6,27 +6,32 @@
           = "If you had growth in the last 3 years"
     .govuk-grid-row
       - (1..3).each do |y|
+        - suffix = "#{y}of3"
         .govuk-grid-column-one-half.js-fy-entries.by-years-wrapper.show-question class="#{'fy-latest' if y == 3} govuk-!-margin-bottom-4"
-          span.js-year-end.show-default data-year="#{y}of3" data-year-diff="#{::Utils::Diff.calc(3, y)}"
+          span.js-year-end.show-default data-year="#{suffix}" data-year-diff="#{::Utils::Diff.calc(3, y)}"
             label.js-year-default.govuk-label class="govuk-!-margin-bottom-0 govuk-!-margin-top-5"
               = question.format_label(y)
               - if y == 3
                 '  (most recent)
           br
           span.govuk-error-message class="govuk-!-margin-bottom-0 govuk-!-margin-top-1"
+            - if @form_answer.validator_errors&.dig(question.hash_key(suffix: suffix))
+              span.govuk-visually-hidden
+                | Error:
+              =< @form_answer.validator_errors[question.hash_key(suffix: suffix)]
           .govuk-date-input
             .govuk-date-input__item
               .govuk-form-group
-                label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of3day")
+                label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{suffix}day")
                   ' Day
-                input.js-trigger-autosave.govuk-input.govuk-date-input__input.govuk-input--width-2.js-fy-day type="text" name=question.input_name(suffix: "#{y}of3day") value=question.input_value(suffix: "#{y}of3day") id=question.input_name(suffix: "#{y}of3day") maxlength=2 autocomplete="off" *possible_read_only_ops
+                input.js-trigger-autosave.govuk-input.govuk-date-input__input.govuk-input--width-2.js-fy-day type="text" name=question.input_name(suffix: "#{suffix}day") value=question.input_value(suffix: "#{suffix}day") id=question.input_name(suffix: "#{suffix}day") maxlength=2 autocomplete="off" *possible_read_only_ops
             .govuk-date-input__item
               .govuk-form-group
-                label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of3month")
+                label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{suffix}month")
                   ' Month
-                input.js-trigger-autosave.govuk-input.govuk-date-input__input.govuk-input--width-2.js-fy-month type="text" name=question.input_name(suffix: "#{y}of3month") value=question.input_value(suffix: "#{y}of3month") id=question.input_name(suffix: "#{y}of3month") maxlength=2 autocomplete="off" *possible_read_only_ops
+                input.js-trigger-autosave.govuk-input.govuk-date-input__input.govuk-input--width-2.js-fy-month type="text" name=question.input_name(suffix: "#{suffix}month") value=question.input_value(suffix: "#{suffix}month") id=question.input_name(suffix: "#{suffix}month") maxlength=2 autocomplete="off" *possible_read_only_ops
             .govuk-date-input__item
               .govuk-form-group
-                label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{y}of3year")
+                label.govuk-label.govuk-date-input__label for=question.input_name(suffix: "#{suffix}year")
                   ' Year
-                input.js-trigger-autosave.govuk-input.govuk-date-input__input.govuk-input--width-4.js-fy-year type="text" name=question.input_name(suffix: "#{y}of3year") value=question.input_value(suffix: "#{y}of3year") id=question.input_name(suffix: "#{y}of3year") maxlength=4 autocomplete="off" *possible_read_only_ops
+                input.js-trigger-autosave.govuk-input.govuk-date-input__input.govuk-input--width-4.js-fy-year type="text" name=question.input_name(suffix: "#{suffix}year") value=question.input_value(suffix: "#{suffix}year") id=question.input_name(suffix: "#{suffix}year") maxlength=4 autocomplete="off" *possible_read_only_ops
diff --git a/forms/qae_form_builder/by_years_label_question.rb b/forms/qae_form_builder/by_years_label_question.rb
index 72aa117ffb..8f57ea82de 100644
--- a/forms/qae_form_builder/by_years_label_question.rb
+++ b/forms/qae_form_builder/by_years_label_question.rb
@@ -7,20 +7,39 @@ def errors
 
       return result unless question.visible?
 
-      dates = question.active_fields.each_with_object([]) do |field, outer|
+      dates = question.active_fields.each_with_object(Hash[]) do |field, outer|
+                suffix = "#{question.key}_#{field}"
                 date = REQUIRED_SUB_FIELDS.each_with_object([]) do |sub, inner|
-                  key = "#{question.key}_#{field}#{sub}"
+                  key = "#{suffix}#{sub}"
                   inner << answers[key]
                 end.join("/")
 
-                date = ::Utils::Date.valid?(date) ? Date.parse(date) : nil
-
-                outer << date
+                outer[suffix] = ::Utils::Date.valid?(date) ? Date.parse(date) : nil
               end
+      
+      if question.required?
+        dates.each.with_index(1) do |(key, date), idx|
+          next if date.present?
+          result[key] ||= ""
+          result[key] << "Question #{question.ref || question.sub_ref} is incomplete. It is required and must be filled in. Use the format DD/MM/YYYY."
+        end
+      end
+
+      dates.each_cons(2) do |values|
+        beginning_key, beginning_date = values[0]
+        end_key, end_date = values[-1]
 
-      validatable = dates.each_cons(2).reject do |values|
-                      values.any?(&:nil?)
-                    end
+        next if beginning_date.nil? || end_date.nil?
+
+        if beginning_date > end_date
+          result[beginning_key] ||= ""
+          result[end_key] ||= ""
+          result[beginning_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be before #{end_date.strftime('%d/%m/%Y')}."
+          result[end_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be after #{beginning_date.strftime('%d/%m/%Y')}."
+        end
+      end
+              
+      validatable = dates.values.each_cons(2).reject { |values| values.any?(&:nil?) }
 
       return result if validatable.blank?
 
diff --git a/forms/qae_form_builder/one_option_by_years_label_question.rb b/forms/qae_form_builder/one_option_by_years_label_question.rb
index b51c5b1abd..b75f7aadeb 100644
--- a/forms/qae_form_builder/one_option_by_years_label_question.rb
+++ b/forms/qae_form_builder/one_option_by_years_label_question.rb
@@ -1,5 +1,5 @@
 class QaeFormBuilder
-  class OneOptionByYearsLabelQuestionValidator < QuestionValidator
+  class OneOptionByYearsLabelQuestionValidator < ::QaeFormBuilder::ByYearsLabelQuestionValidator
   end
 
   class OneOptionByYearsLabelQuestionBuilder < QuestionBuilder

From ac2d3c0562b5d3ee15e8309b1e34c30374bccc6f Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:18:22 +0200
Subject: [PATCH 241/352] Fix `active_fields` method for turnover calculation
 question

---
 ...culation_question_standart_block.html.slim |  5 ++-
 .../turnover_exports_calculation_question.rb  | 32 +++++++++++++++----
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim b/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim
index 3c5a7d6799..a74741878b 100644
--- a/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim
+++ b/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim
@@ -1,5 +1,8 @@
 - for c in question.by_year_conditions
-  .js-conditional-question data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+  - question_visible = question.fields_count == c.years
+  = question.fields_count
+
+  .js-conditional-question.turnover-exports-calculation-wrapper class=(class_names("show-question" => question_visible)) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
     .row
       - (1..c.years).each do |y|
         div class="span-financial span-4"
diff --git a/forms/qae_form_builder/turnover_exports_calculation_question.rb b/forms/qae_form_builder/turnover_exports_calculation_question.rb
index 2bf3f48b3e..d491b93344 100644
--- a/forms/qae_form_builder/turnover_exports_calculation_question.rb
+++ b/forms/qae_form_builder/turnover_exports_calculation_question.rb
@@ -12,20 +12,40 @@ def format_label y
     end
 
     def active_fields
+      (1..fields_count).map { |y| "#{y}of#{fields_count}" }
+    end
+
+    def fields_count
       if delegate_obj.one_option_financial_data_mode.present?
-        (1..3).map{|y| "#{y}of3"}
+        3
       else
         c = active_by_year_condition
-        return [] unless c
+        return nil unless c
 
-        (1..c.years).map{|y| "#{y}of#{c.years}"}
+        c.years
       end
     end
 
     def active_by_year_condition
-      delegate_obj.by_year_conditions.find {|c|
-        form[c.question_key].input_value == c.question_value
-      }
+      delegate_obj.by_year_conditions.find do |c|
+        if c.question_value.respond_to?(:call)
+          q = form[c.question_key]
+          if q.is_a?(QaeFormBuilder::DateQuestion) || q.is_a?(QaeFormBuilder::DateQuestionDecorator)
+            date = []
+            q.required_sub_fields.each do |sub|
+              date << q.input_value(suffix: sub.keys[0])
+            end
+
+            date = Date.parse(date.join("/")) rescue nil
+
+            c.question_value.(date)
+          else
+            c.question_value.(form[c.question_key].input_value)
+          end
+        else
+          form[c.question_key].input_value == c.question_value
+        end
+      end
     end
   end
 

From 1245daadd2b83d0a626ad8c929b812a8f3de919f Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:19:34 +0200
Subject: [PATCH 242/352] CSS styles for hiding non-JS fields

---
 app/assets/stylesheets/frontend/forms.scss | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/app/assets/stylesheets/frontend/forms.scss b/app/assets/stylesheets/frontend/forms.scss
index 2b27d1d302..f71d939a9f 100644
--- a/app/assets/stylesheets/frontend/forms.scss
+++ b/app/assets/stylesheets/frontend/forms.scss
@@ -626,6 +626,17 @@ input[type="file"] {
   display: inline;
 }
 
+.no-js {
+  div.by-years-wrapper,
+  div.turnover-exports-calculation-wrapper {
+    display: none;
+
+    &.show-question {
+      display: block;
+    }
+  }
+}
+
 .smart-answer .inner.step.current {
   margin-right: 0;
 

From 8ecdeaaed0320a697cf23a540dd18c3850e2cf59 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:20:52 +0200
Subject: [PATCH 243/352] `fields_count` to help display visible section when
 JS is disabled

---
 forms/qae_form_builder/by_years_label_question.rb     | 11 ++++++++---
 forms/qae_form_builder/by_years_question.rb           | 11 ++++++++---
 .../one_option_by_years_label_question.rb             |  4 ++++
 .../qae_form_builder/one_option_by_years_question.rb  |  4 ++++
 4 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/forms/qae_form_builder/by_years_label_question.rb b/forms/qae_form_builder/by_years_label_question.rb
index 8f57ea82de..8498d9d658 100644
--- a/forms/qae_form_builder/by_years_label_question.rb
+++ b/forms/qae_form_builder/by_years_label_question.rb
@@ -84,11 +84,16 @@ def has_drops?
     end
 
     def active_fields
+      return [] unless fields_count
+
+      (1..fields_count).map{|y| "#{y}of#{fields_count}"}
+    end
+
+    def fields_count
       c = active_by_year_condition
       c ||= default_by_year_condition
-      return [] unless c
-
-      (1..c.years).map{|y| "#{y}of#{c.years}"}
+      return nil unless c
+      c.years
     end
 
     def active_by_year_condition
diff --git a/forms/qae_form_builder/by_years_question.rb b/forms/qae_form_builder/by_years_question.rb
index 72c167fdd3..865e3c1c50 100644
--- a/forms/qae_form_builder/by_years_question.rb
+++ b/forms/qae_form_builder/by_years_question.rb
@@ -44,11 +44,16 @@ def has_drops?
     end
 
     def active_fields
+      return [] unless fields_count
+
+      (1..fields_count).map{|y| "#{y}of#{fields_count}"}
+    end
+
+    def fields_count
       c = active_by_year_condition
       c ||= default_by_year_condition
-      return [] unless c
-
-      (1..c.years).map{|y| "#{y}of#{c.years}"}
+      return nil unless c
+      c.years
     end
 
     def active_by_year_condition
diff --git a/forms/qae_form_builder/one_option_by_years_label_question.rb b/forms/qae_form_builder/one_option_by_years_label_question.rb
index b75f7aadeb..5075a4261c 100644
--- a/forms/qae_form_builder/one_option_by_years_label_question.rb
+++ b/forms/qae_form_builder/one_option_by_years_label_question.rb
@@ -41,6 +41,10 @@ def active_fields
       (1..3).map{|y| "#{y}of3"}
     end
 
+    def fields_count
+      3
+    end
+
     def active_by_year_condition
       delegate_obj.by_year_conditions.find {|c|
         form[c.question_key].input_value == c.question_value
diff --git a/forms/qae_form_builder/one_option_by_years_question.rb b/forms/qae_form_builder/one_option_by_years_question.rb
index 1f57e5b8e4..0a7787034b 100644
--- a/forms/qae_form_builder/one_option_by_years_question.rb
+++ b/forms/qae_form_builder/one_option_by_years_question.rb
@@ -31,6 +31,10 @@ def active_fields
       (1..3).map{|y| "#{y}of3"}
     end
 
+    def fields_count
+      3
+    end
+
     def active_by_year_condition
       delegate_obj.by_year_conditions.find {|c|
         form[c.question_key].input_value == c.question_value

From 4aa8a0b95be45c792e8d68877f5a6bc0f1ed492d Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:21:27 +0200
Subject: [PATCH 244/352] Update partials to hide irrelevant sections when JS
 is disabled

---
 app/views/qae_form/_by_years_label_question.html.slim      | 4 +++-
 app/views/qae_form/_by_years_question.html.slim            | 4 +++-
 app/views/qae_form/_one_option_by_years_question.html.slim | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/qae_form/_by_years_label_question.html.slim b/app/views/qae_form/_by_years_label_question.html.slim
index a1557a5a48..57fc252c68 100644
--- a/app/views/qae_form/_by_years_label_question.html.slim
+++ b/app/views/qae_form/_by_years_label_question.html.slim
@@ -3,7 +3,9 @@
 div role="group" id="q_#{question.key}"
   .js-financial-year-changed-dates
     - for c in question.by_year_conditions
-      .js-conditional-question.by-years-wrapper class=(" govuk-form-group--error" if has_errors) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+      - question_visible = question.fields_count == c.years
+  
+      .js-conditional-question.by-years-wrapper class=(class_names("govuk-form-group--error" => has_errors, "show-question" => question_visible)) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
         .if-js-hide
           label.govuk-label
             strong
diff --git a/app/views/qae_form/_by_years_question.html.slim b/app/views/qae_form/_by_years_question.html.slim
index 782b7ffec1..e097268a3a 100644
--- a/app/views/qae_form/_by_years_question.html.slim
+++ b/app/views/qae_form/_by_years_question.html.slim
@@ -2,7 +2,9 @@
 
 .js-financial-conditional class=(" govuk-form-group--error" if has_errors) data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message id="q_#{question.key}" role="group"
   - for c in question.by_year_conditions
-    .js-conditional-question.by-years-wrapper data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+    - question_visible = question.fields_count == c.years
+
+    .js-conditional-question.by-years-wrapper class=(class_names("show-question" => question_visible)) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
       .if-js-hide
         label.govuk-label
           strong
diff --git a/app/views/qae_form/_one_option_by_years_question.html.slim b/app/views/qae_form/_one_option_by_years_question.html.slim
index 1cbf4903ce..188027d77c 100644
--- a/app/views/qae_form/_one_option_by_years_question.html.slim
+++ b/app/views/qae_form/_one_option_by_years_question.html.slim
@@ -1,7 +1,7 @@
 - has_errors = (1..3).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of3")) }.present?
 
 .js-financial-conditional class=(" govuk-form-group--error" if has_errors) data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message role="group" id="q_#{question.key}"
-  .by-years-wrapper
+  .by-years-wrapper.show-question
     .if-js-hide
       label.govuk-label
         strong

From 5500dbe9264e1a3113ce8f2329051513e749535a Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 15 Aug 2023 22:30:39 +0200
Subject: [PATCH 245/352] JS: Fix message appending

---
 app/assets/javascripts/frontend/form-validation.js.coffee | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 29e6e6ce13..0192bfd965 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -29,7 +29,11 @@ window.FormValidation =
     @validates = false
 
   appendMessage: (container, message) ->
-    container.find(".govuk-error-message").first().append(message)
+    el = container.find(".govuk-error-message").first()
+    if el.text.length > 0
+      el.append(message)
+    else
+      el.append(" #{message}")
     @validates = false
 
   addAriaDescribedByToInput: (container, message) ->

From dc6dacdac337a48f1098ff619d08eeb73e5774e0 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:29:12 +0200
Subject: [PATCH 246/352] Update copy for some actions when JS is disabled

---
 app/views/qae_form/_queen_award_applications_question.html.slim | 2 +-
 .../shared/_non_js_dynamic_list_redirect_warning.html.slim      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index c6722ccf2b..0d1e947432 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -3,7 +3,7 @@
 
 .if-js-hide
   .application-notice.help-notice
-    p Since you've disabled Javascript, you need to save your answers before you click on the "Add award" or "Remove" buttons. To do this click "Save and continue" within the page footer, then press "Back" to return to this page.
+    p Since you've disabled Javascript, you need to save your answers before you click on the "Add award”,  "Remove" or “Edit” buttons. To do this click "Save and come back later” within the page footer, then return to the application from the dashboard.
 
     - if @form_answer.trade?
       p If you won the award in the previous 4 years you can only apply for an International Trade Award on an Outstanding Short-Term Growth basis, and you need to be able to demonstrate that your international trade has resulted in outstanding year-on-year growth in the last 3 years with no dips.
diff --git a/app/views/shared/_non_js_dynamic_list_redirect_warning.html.slim b/app/views/shared/_non_js_dynamic_list_redirect_warning.html.slim
index 41ed6ec2b2..ace1f73c7a 100644
--- a/app/views/shared/_non_js_dynamic_list_redirect_warning.html.slim
+++ b/app/views/shared/_non_js_dynamic_list_redirect_warning.html.slim
@@ -1,3 +1,3 @@
 .if-js-hide
   .application-notice.help-notice
-    p Since you've disabled Javascript, you need to save your answers before you click on the "#{add_message}" or "Remove" buttons. To do this click "Save and continue" within the page footer, then press "Back" to return to this page.
+    p Since you've disabled Javascript, you need to save your answers before you click on the "#{add_message}" or "Remove" buttons. To do this click "Save and come back later” within the page footer, then return to the application from the dashboard.

From cf0e3d219a773b45d122f4e8983228d4805b2b70 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Wed, 16 Aug 2023 14:52:22 +0200
Subject: [PATCH 247/352] When Admin marks post shortlisting docs as confirmed
 send emails to applicant and assessor

---
 .../admin_shortlisted_docs_submission_context.rb   | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
index e3ddf4706b..bd0bc7d84e 100644
--- a/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
+++ b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
@@ -2,7 +2,17 @@ module AdminShortlistedDocsSubmissionContext
   def create
     authorize resource, :submit?
 
-    resource.submitted? ? resource.uncomplete : resource.complete
+    if resource.submitted?
+      resource.uncomplete
+    else
+      if resource.complete
+        if form_answer.assessors.primary.present?
+          Assessors::GeneralMailer.vat_returns_submitted(form_answer.id).deliver_later!
+        end
+
+        Users::CommercialFiguresMailer.notify(form_answer.id, form_answer.account.owner_id).deliver_later!
+      end
+    end
 
     respond_to do |format|
       format.html do
@@ -29,7 +39,7 @@ def resource
     @resource ||= (form_answer.shortlisted_documents_wrapper || form_answer.build_shortlisted_documents_wrapper)
 
     return @resource if @resource.persisted?
-    
+
     @resource.save!
     @resource
   end

From 942ab1e5efb5fb8f3d876754fba7945ee497e2f5 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 16 Aug 2023 13:30:00 +0200
Subject: [PATCH 248/352] SPEC: Update fixtures to fix failing validations

---
 app/form_pointers/form_financial_pointer.rb   |   2 +-
 spec/features/users/award_winners_spec.rb     |   4 +-
 .../form_answers/past_applications_spec.rb    |   8 +-
 spec/fixtures/form_answer_development.json    |  54 +++++----
 spec/fixtures/form_answer_innovation.json     | 114 +++++++++---------
 spec/fixtures/form_answer_mobility.json       |   4 +-
 .../buckingham_palace_invite_mailer_spec.rb   |   6 +-
 spec/models/form_answer_spec.rb               |   4 +-
 8 files changed, 105 insertions(+), 91 deletions(-)

diff --git a/app/form_pointers/form_financial_pointer.rb b/app/form_pointers/form_financial_pointer.rb
index 7c172d668d..dea1a5a63e 100644
--- a/app/form_pointers/form_financial_pointer.rb
+++ b/app/form_pointers/form_financial_pointer.rb
@@ -131,7 +131,7 @@ def overall_growth_values
 
   def overall_growth
     res = overall_growth_values
-    res.last && res.first ? res.last[:value].to_i - res.first[:value].to_i : "-"
+    res && res.last && res.first ? res.last[:value].to_i - res.first[:value].to_i : "-"
   end
 
   def overall_growth_in_percents
diff --git a/spec/features/users/award_winners_spec.rb b/spec/features/users/award_winners_spec.rb
index 63f8ffa08a..8224abd5b4 100644
--- a/spec/features/users/award_winners_spec.rb
+++ b/spec/features/users/award_winners_spec.rb
@@ -8,11 +8,11 @@
   end
 
   let(:old_award_year) do
-    AwardYear.create!(year: 2015)
+    AwardYear.create!(year: 2016)
   end
 
   let(:current_award_year) do
-    AwardYear.create!(year: 2016)
+    AwardYear.create!(year: 2017)
   end
 
   let!(:current_year_mock) do
diff --git a/spec/features/users/form_answers/past_applications_spec.rb b/spec/features/users/form_answers/past_applications_spec.rb
index 662cd361bb..4040b41990 100644
--- a/spec/features/users/form_answers/past_applications_spec.rb
+++ b/spec/features/users/form_answers/past_applications_spec.rb
@@ -2,13 +2,13 @@
 include Warden::Test::Helpers
 
 describe "Past Applications", %q{
-As a Applicant
+As an Applicant
 I want to be able to see Past Applications for previous years
 So that I see
 } do
 
   let(:previous_year) do
-    1.year.ago
+    Date.new(2020, 4, 1)
   end
 
   let!(:previous_award_year) do
@@ -71,9 +71,7 @@
 
       it "should display past successful applications" do
         # save_and_open_page
-        expect(page).to have_selector(
-                            "div.dashboard-post-submission", count: 1
-                        )
+        expect(page).to have_selector("div.dashboard-post-submission", count: 1)
       end
     end
   end
diff --git a/spec/fixtures/form_answer_development.json b/spec/fixtures/form_answer_development.json
index f856996c8c..6efcd6399c 100644
--- a/spec/fixtures/form_answer_development.json
+++ b/spec/fixtures/form_answer_development.json
@@ -1,8 +1,9 @@
 {"head_of_business_email": "walter@example.com",
-"sales_1of2": "",
+"sales_1of3": "",
 "sales_1of5": "",
-"sales_2of2": "",
+"sales_2of3": "",
 "sales_2of5": "",
+"sales_3of3": "",
 "sales_3of5": "",
 "sales_4of5": "",
 "sales_5of5": "",
@@ -11,10 +12,11 @@
 "website_url": "example.com",
 "applying_for": "organisation",
 "company_name": "1231",
-"exports_1of2": "0",
+"exports_1of3": "0",
 "exports_1of5": "",
-"exports_2of2": "0",
+"exports_2of3": "0",
 "exports_2of5": "",
+"exports_3of3": "0",
 "exports_3of5": "",
 "exports_4of5": "",
 "exports_5of5": "",
@@ -22,26 +24,29 @@
 "grant_support": "no",
 "org_telephone": "1",
 "drops_in_sales": "",
-"employees_1of2": "10",
+"employees_1of3": "10",
 "employees_1of5": "",
-"employees_2of2": "20",
+"employees_2of3": "20",
 "employees_2of5": "",
+"employees_3of3": "20",
 "employees_3of5": "",
 "employees_4of5": "",
 "employees_5of5": "",
 "head_of_business_job_title": "Chief",
 "sic_code": "0111",
-"net_profit_1of2": "100000",
+"net_profit_1of3": "100000",
 "net_profit_1of5": "",
-"net_profit_2of2": "100000",
+"net_profit_2of3": "100000",
 "net_profit_2of5": "",
+"net_profit_3of3": "100000",
 "net_profit_3of5": "",
 "net_profit_4of5": "",
 "net_profit_5of5": "",
-"units_sold_1of2": "",
+"units_sold_1of3": "",
 "units_sold_1of5": "",
-"units_sold_2of2": "",
+"units_sold_2of3": "",
 "units_sold_2of5": "",
+"units_sold_3of3": "",
 "units_sold_3of5": "",
 "units_sold_4of5": "",
 "units_sold_5of5": "",
@@ -58,10 +63,11 @@
 "partners_relations": "1",
 "principal_business": "yes",
 "applied_for_queen_awards": "no",
-"sales_exports_1of2": "",
+"sales_exports_1of3": "",
 "sales_exports_1of5": "",
-"sales_exports_2of2": "",
+"sales_exports_2of3": "",
 "sales_exports_2of5": "",
+"sales_exports_3of3": "",
 "sales_exports_3of5": "",
 "sales_exports_4of5": "",
 "sales_exports_5of5": "",
@@ -77,18 +83,20 @@
 "vat_registration_number": "N/A",
 "social_contribution": "1",
 "started_trading_day": "01",
-"total_turnover_1of2": "100000",
+"total_turnover_1of3": "100000",
 "total_turnover_1of5": "",
-"total_turnover_2of2": "1000001",
+"total_turnover_2of3": "100001",
 "total_turnover_2of5": "",
+"total_turnover_3of3": "100002",
 "total_turnover_3of5": "",
 "total_turnover_4of5": "",
 "total_turnover_5of5": "",
 "another_org_licensed": "no",
-"sales_royalties_1of2": "",
+"sales_royalties_1of3": "",
 "sales_royalties_1of5": "",
-"sales_royalties_2of2": "",
+"sales_royalties_2of3": "",
 "sales_royalties_2of5": "",
+"sales_royalties_3of3": "",
 "sales_royalties_3of5": "",
 "sales_royalties_4of5": "",
 "sales_royalties_5of5": "",
@@ -99,10 +107,11 @@
 "impact_on_environment": "1",
 "product_estimates_use": "",
 "started_trading_month": "10",
-"total_net_assets_1of2": "100000",
+"total_net_assets_1of3": "100000",
 "total_net_assets_1of5": "",
-"total_net_assets_2of2": "100000",
+"total_net_assets_2of3": "100000",
 "total_net_assets_2of5": "",
+"total_net_assets_3of3": "100000",
 "total_net_assets_3of5": "",
 "total_net_assets_4of5": "",
 "total_net_assets_5of5": "",
@@ -111,10 +120,11 @@
 "parent_company_country": "GB",
 "previous_business_name": "",
 "organization_address_city": "1",
-"avg_unit_cost_self_1of2": "",
+"avg_unit_cost_self_1of3": "",
 "avg_unit_cost_self_1of5": "",
-"avg_unit_cost_self_2of2": "",
+"avg_unit_cost_self_2of3": "",
 "avg_unit_cost_self_2of5": "",
+"avg_unit_cost_self_3of3": "",
 "avg_unit_cost_self_3of5": "",
 "avg_unit_cost_self_4of5": "",
 "avg_unit_cost_self_5of5": "",
@@ -152,12 +162,12 @@
 "development_additional_comments": "1",
 "development_excluded_explanation": "1",
 "ultimate_control_company_country": "GB",
-"financial_year_changed_dates_1of2day": "",
+"financial_year_changed_dates_1of3day": "",
 "financial_year_changed_dates_1of5day": "",
 "financial_year_changed_dates_2of5day": "",
 "financial_year_changed_dates_3of5day": "",
 "financial_year_changed_dates_4of5day": "",
-"financial_year_changed_dates_1of2month": "",
+"financial_year_changed_dates_1of3month": "",
 "financial_year_changed_dates_1of5month": "",
 "financial_year_changed_dates_2of5month": "",
 "financial_year_changed_dates_3of5month": "",
diff --git a/spec/fixtures/form_answer_innovation.json b/spec/fixtures/form_answer_innovation.json
index 51b61657e1..f0e0242d16 100644
--- a/spec/fixtures/form_answer_innovation.json
+++ b/spec/fixtures/form_answer_innovation.json
@@ -1,48 +1,48 @@
 {"head_of_business_email": "kappar@example.com",
 "sales_1of2": "0",
-"sales_1of5": "",
+"sales_1of5": "0",
 "sales_2of2": "0",
-"sales_2of5": "",
-"sales_3of5": "",
-"sales_4of5": "",
-"sales_5of5": "",
+"sales_2of5": "0",
+"sales_3of5": "0",
+"sales_4of5": "0",
+"sales_5of5": "0",
 "roi_details": "1",
 "website_url": "www.example.com",
 "applying_for": "organisation",
 "company_name": "1231",
 "exports_1of2": "1000000",
-"exports_1of5": "",
+"exports_1of5": "1000000",
 "exports_2of2": "1000000",
-"exports_2of5": "",
-"exports_3of5": "",
-"exports_4of5": "",
-"exports_5of5": "",
+"exports_2of5": "1000000",
+"exports_3of5": "1000000",
+"exports_4of5": "1000000",
+"exports_5of5": "1000000",
 "org_telephone": "111",
 "drops_in_sales": "",
 "employees_1of2": "10",
-"employees_1of5": "",
+"employees_1of5": "10",
 "employees_2of2": "20",
-"employees_2of5": "",
-"employees_3of5": "",
-"employees_4of5": "",
-"employees_5of5": "",
+"employees_2of5": "20",
+"employees_3of5": "30",
+"employees_4of5": "40",
+"employees_5of5": "50",
 "head_of_business_job_title": "CEO",
 "has_parent_company": "yes",
 "sic_code": "0111",
 "net_profit_1of2": "1000000",
-"net_profit_1of5": "",
+"net_profit_1of5": "1000000",
 "net_profit_2of2": "2000000",
-"net_profit_2of5": "",
-"net_profit_3of5": "",
-"net_profit_4of5": "",
-"net_profit_5of5": "",
+"net_profit_2of5": "2000000",
+"net_profit_3of5": "3000000",
+"net_profit_4of5": "4000000",
+"net_profit_5of5": "5000000",
 "units_sold_1of2": "0",
-"units_sold_1of5": "",
+"units_sold_1of5": "0",
 "units_sold_2of2": "0",
-"units_sold_2of5": "",
-"units_sold_3of5": "",
-"units_sold_4of5": "",
-"units_sold_5of5": "",
+"units_sold_2of5": "0",
+"units_sold_3of5": "0",
+"units_sold_4of5": "0",
+"units_sold_5of5": "0",
 "other_awards_won": "no",
 "costs_change_desc": "0",
 "drops_in_turnover": "yes",
@@ -58,19 +58,19 @@
 "applied_for_queen_awards": "no",
 "queen_award_holder": "no",
 "sales_exports_1of2": "0",
-"sales_exports_1of5": "",
+"sales_exports_1of5": "0",
 "sales_exports_2of2": "0",
-"sales_exports_2of5": "",
-"sales_exports_3of5": "",
-"sales_exports_4of5": "",
-"sales_exports_5of5": "",
+"sales_exports_2of5": "0",
+"sales_exports_3of5": "0",
+"sales_exports_4of5": "0",
+"sales_exports_5of5": "0",
 "avg_unit_price_1of2": "0",
-"avg_unit_price_1of5": "",
+"avg_unit_price_1of5": "0",
 "avg_unit_price_2of2": "0",
-"avg_unit_price_2of5": "",
-"avg_unit_price_3of5": "",
-"avg_unit_price_4of5": "",
-"avg_unit_price_5of5": "",
+"avg_unit_price_2of5": "0",
+"avg_unit_price_3of5": "0",
+"avg_unit_price_4of5": "0",
+"avg_unit_price_5of5": "0",
 "avg_unit_price_desc": "0",
 "investments_details": "1",
 "organisation_type": "ltd",
@@ -78,20 +78,20 @@
 "vat_registration_number": "N/A",
 "started_trading_day": "01",
 "total_turnover_1of2": "1000000",
-"total_turnover_1of5": "",
+"total_turnover_1of5": "1000000",
 "total_turnover_2of2": "2000000",
-"total_turnover_2of5": "",
-"total_turnover_3of5": "",
-"total_turnover_4of5": "",
-"total_turnover_5of5": "",
+"total_turnover_2of5": "2000000",
+"total_turnover_3of5": "3000000",
+"total_turnover_4of5": "4000000",
+"total_turnover_5of5": "5000000",
 "innovation_desc_long": "1",
 "sales_royalties_1of2": "0",
-"sales_royalties_1of5": "",
+"sales_royalties_1of5": "0",
 "sales_royalties_2of2": "0",
-"sales_royalties_2of5": "",
-"sales_royalties_3of5": "",
-"sales_royalties_4of5": "",
-"sales_royalties_5of5": "",
+"sales_royalties_2of5": "0",
+"sales_royalties_3of5": "0",
+"sales_royalties_4of5": "0",
+"sales_royalties_5of5": "0",
 "innovation_developing_started_year": "2020",
 "started_trading_year": "2011",
 "innovation_desc_short": "test",
@@ -103,12 +103,12 @@
 "innovation_was_launched_in_the_market_month": "09",
 "innovation_was_launched_in_the_market_year": "2011",
 "total_net_assets_1of2": "1000000",
-"total_net_assets_1of5": "",
+"total_net_assets_1of5": "1000000",
 "total_net_assets_2of2": "3000000",
-"total_net_assets_2of5": "",
-"total_net_assets_3of5": "",
-"total_net_assets_4of5": "",
-"total_net_assets_5of5": "",
+"total_net_assets_2of5": "3000000",
+"total_net_assets_3of5": "5000000",
+"total_net_assets_4of5": "7000000",
+"total_net_assets_5of5": "9000000",
 "head_of_business_title": "mr",
 "innovation_competitors": "1",
 "innovation_performance": "01",
@@ -116,12 +116,12 @@
 "previous_business_name": "",
 "organization_address_city": "1",
 "avg_unit_cost_self_1of2": "0",
-"avg_unit_cost_self_1of5": "",
+"avg_unit_cost_self_1of5": "0",
 "avg_unit_cost_self_2of2": "0",
-"avg_unit_cost_self_2of5": "",
-"avg_unit_cost_self_3of5": "",
-"avg_unit_cost_self_4of5": "",
-"avg_unit_cost_self_5of5": "",
+"avg_unit_cost_self_2of5": "0",
+"avg_unit_cost_self_3of5": "0",
+"avg_unit_cost_self_4of5": "0",
+"avg_unit_cost_self_5of5": "0",
 "confirmation_of_consent": "on",
 "financial_year_date_day": "2",
 "innovation_contributors": "",
@@ -165,14 +165,18 @@
 "ultimate_control_company_country": "GB",
 "financial_year_changed_dates_1of2day": "",
 "financial_year_changed_dates_1of5day": "",
+"financial_year_changed_dates_2of2day": "",
 "financial_year_changed_dates_2of5day": "",
 "financial_year_changed_dates_3of5day": "",
 "financial_year_changed_dates_4of5day": "",
+"financial_year_changed_dates_5of5day": "",
 "financial_year_changed_dates_1of2month": "",
 "financial_year_changed_dates_1of5month": "",
 "financial_year_changed_dates_2of5month": "",
+"financial_year_changed_dates_2of2month": "",
 "financial_year_changed_dates_3of5month": "",
 "financial_year_changed_dates_4of5month": "",
+"financial_year_changed_dates_5of5month": "",
 "financial_year_date_changed_explaination": "",
 "agree_being_contacted_by_department_of_business": "on",
 "beyond_your_immediate_customers": "test",
diff --git a/spec/fixtures/form_answer_mobility.json b/spec/fixtures/form_answer_mobility.json
index 3fb8e2d27c..33445ad7c6 100644
--- a/spec/fixtures/form_answer_mobility.json
+++ b/spec/fixtures/form_answer_mobility.json
@@ -22,7 +22,7 @@
 "sic_code": "0111",
 "net_profit_1of3": "100000",
 "net_profit_2of3": "100000",
-"net_profit_2of3": "100000",
+"net_profit_3of3": "100000",
 "units_sold_1of3": "",
 "units_sold_2of3": "",
 "units_sold_3of3": "",
@@ -140,8 +140,8 @@
 "financial_year_changed_dates_2of3day": "",
 "financial_year_changed_dates_3of3day": "",
 "financial_year_changed_dates_1of3month": "",
-"financial_year_changed_dates_1of3month": "",
 "financial_year_changed_dates_2of3month": "",
+"financial_year_changed_dates_3of3month": "",
 "financial_year_date_changed_explaination": "",
 "external_contribute_to_sustainable_product": "no",
 "name_of_external_organization_or_individual": "Davos",
diff --git a/spec/mailers/account_mailers/buckingham_palace_invite_mailer_spec.rb b/spec/mailers/account_mailers/buckingham_palace_invite_mailer_spec.rb
index 3537c02cde..af75b37c0c 100644
--- a/spec/mailers/account_mailers/buckingham_palace_invite_mailer_spec.rb
+++ b/spec/mailers/account_mailers/buckingham_palace_invite_mailer_spec.rb
@@ -24,12 +24,14 @@
   end
 
   let!(:form_answer) do
-    fa = build(:form_answer, :awarded, :innovation, user: user, award_year: year)
+    fa = build(:form_answer, :awarded, :trade, user: user, award_year: year)
+
+    allow(fa).to receive(:valid?).and_return(true)
 
     # this field is no longer used in 2019 awards, but we're using closed award year here
     # can be simplified when 2020 awards kick in
     fa.document.merge!("queen_award_holder" => "no")
-    fa.save
+    fa.save!
 
     fa
   end
diff --git a/spec/models/form_answer_spec.rb b/spec/models/form_answer_spec.rb
index 848e9b0fe5..a428665858 100644
--- a/spec/models/form_answer_spec.rb
+++ b/spec/models/form_answer_spec.rb
@@ -142,13 +142,13 @@
       form_answer.document = form_answer.document.merge(started_trading_day: "2",
                                                         started_trading_month: 12,
                                                         started_trading_year: Date.current.year - 2,
-                                                        trade_commercial_success: "6 plus")
+                                                        trade_commercial_success: "3 to 5")
       expect(form_answer).to be_invalid
 
       form_answer.document = form_answer.document.merge(started_trading_day: "2",
                                                         started_trading_month: 12,
                                                         started_trading_year: Date.current.year - 7,
-                                                        trade_commercial_success: "6 plus")
+                                                        trade_commercial_success: "3 to 5")
       expect(form_answer).to be_valid
     end
 

From c80604c9af2a8953b490b295a98fd726ae3bdbc4 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 17 Aug 2023 11:17:48 +0100
Subject: [PATCH 249/352] Adds message for previous winners of trade within 5
 years

---
 .../won_international_trade_award.coffee      | 35 ++++++++++++-------
 ...ueen_award_applications_question.html.slim |  6 ++--
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
index f6a4ea90a2..f3a60cad15 100644
--- a/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
+++ b/app/assets/javascripts/frontend/custom_questions/won_international_trade_award.coffee
@@ -4,25 +4,36 @@ window.WonInternationalTradeAwardQuestion = init: ->
   do maybeDisplayAwardHelp = ->
     container = $("[data-container~=#{identifier}]")
 
-    conditionFulfilled = false
+    currentHolder = false
+    recentWinner = false
 
     rows = container.find("li")
 
     $.each rows, (_idx, row) ->
-      validations = $.map ["category", "year", "outcome"], (type) ->
+      validations = $.map ["category", "outcome"], (type) ->
         input = $(row).find("select[data-input-value~=#{type}]")
         input.val() == container.data("#{type}-value").toString()
       if (validations.every(Boolean))
-        conditionFulfilled = true
-        return false
-
-    helpBlock = $("#help-block")
-
-    if helpBlock
-      if conditionFulfilled
-        helpBlock.show()
-      else
-        helpBlock.hide()
+        yearInput = $(row).find("select[data-input-value~=year]")
+        if yearInput.val() == container.data("year-value").toString()
+          currentHolder = true
+          return false
+        else if yearInput.val() < container.data("year-value").toString() && yearInput.val() > (container.data("year-value")-5).toString()
+          recentWinner = true
+          return false
+
+    currentHolderHelpBlock = $(".help-block #current-holder")
+    recentWinnerHelpBlock = $(".help-block #recent-winner")
+
+    if currentHolder
+      currentHolderHelpBlock.removeClass("hide")
+      recentWinnerHelpBlock.addClass("hide")
+    else if recentWinner
+      recentWinnerHelpBlock.removeClass("hide")
+      currentHolderHelpBlock.addClass("hide")
+    else
+      currentHolderHelpBlock.addClass("hide")
+      recentWinnerHelpBlock.addClass("hide")
 
   $(document).on "change", "[data-container~=#{identifier}] select", ->
     maybeDisplayAwardHelp()
diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index 28f1dfdf51..2652bf49d6 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -136,7 +136,9 @@ a.govuk-button.govuk-button--secondary.js-button-add.if-no-js-hide href="#" aria
                          "data-entity" => "award"
 
 
-.question-block#help-block style="display: none;"
+.question-block.help-block
   .govuk-form-group
-    p class="govuk-body govuk-!-font-weight-bold"
+    p class="govuk-body govuk-!-font-weight-bold hide" id="current-holder"
       | As you currently hold a King's Award for International Trade, you cannot apply for another Award. You may apply in future years but can only use one year's financial performance from your Award winning application.
+    p class="govuk-body govuk-!-font-weight-bold hide" id="recent-winner"
+      | As you currently hold a King's Award in International Trade, you can only apply for the Outstanding Achievement Award (3 years).

From 752466f9113153330fe8eb31d9eb66b899a81a51 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Thu, 17 Aug 2023 12:39:11 +0200
Subject: [PATCH 250/352] create new policy for palace invite updates

---
 app/controllers/concerns/palace_attendees_mixin.rb | 8 ++++----
 app/controllers/concerns/palace_invites_mixin.rb   | 2 +-
 app/policies/palace_invite_policy.rb               | 6 ++++++
 3 files changed, 11 insertions(+), 5 deletions(-)
 create mode 100644 app/policies/palace_invite_policy.rb

diff --git a/app/controllers/concerns/palace_attendees_mixin.rb b/app/controllers/concerns/palace_attendees_mixin.rb
index 3d2ffafdda..fe60418078 100644
--- a/app/controllers/concerns/palace_attendees_mixin.rb
+++ b/app/controllers/concerns/palace_attendees_mixin.rb
@@ -3,13 +3,13 @@ def new
     invite = PalaceInvite.find(params[:palace_invite_id])
     @enable_edition = true
     @form_answer = invite.form_answer
-    authorize @form_answer, :update?
+    authorize invite, :update?
     palace_attendee = invite.palace_attendees.build
     render_attendee_form(palace_attendee, invite)
   end
 
   def create
-    authorize form_answer, :update?
+    authorize palace_invite, :update?
     limit = palace_invite.attendees_limit
     if palace_invite.palace_attendees.count < limit
       palace_attendee = palace_invite.palace_attendees.create(create_params)
@@ -21,7 +21,7 @@ def create
   end
 
   def update
-    authorize form_answer, :update?
+    authorize palace_invite, :update?
 
     palace_attendee = palace_invite.palace_attendees.find(params[:id])
     log_event if palace_attendee.update(create_params)
@@ -29,7 +29,7 @@ def update
   end
 
   def destroy
-    authorize form_answer, :update?
+    authorize palace_invite, :update?
     palace_attendee = palace_invite.palace_attendees.find(params[:id])
     log_event if palace_attendee.destroy
     respond_to do |format|
diff --git a/app/controllers/concerns/palace_invites_mixin.rb b/app/controllers/concerns/palace_invites_mixin.rb
index acd1d614ff..e462649242 100644
--- a/app/controllers/concerns/palace_invites_mixin.rb
+++ b/app/controllers/concerns/palace_invites_mixin.rb
@@ -1,7 +1,7 @@
 module PalaceInvitesMixin
   def submit
     @invite = PalaceInvite.find(params[:id])
-    authorize @invite.form_answer, :update?
+    authorize @invite, :update?
 
     @invite.submit!
 
diff --git a/app/policies/palace_invite_policy.rb b/app/policies/palace_invite_policy.rb
new file mode 100644
index 0000000000..5846e93ffd
--- /dev/null
+++ b/app/policies/palace_invite_policy.rb
@@ -0,0 +1,6 @@
+class PalaceInvitePolicy < ApplicationPolicy
+  def update?
+    admin? ||
+      subject.lead_or_assigned?(record.form_answer)
+  end
+end

From e5c7168bced53d95b465864d7801357abf6e974e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 17 Aug 2023 12:21:05 +0100
Subject: [PATCH 251/352] Avoid current_year_deadline method for
 buckingham_palace_reception_deadline, use current award year settings

---
 app/models/award_year.rb                          | 4 ++--
 app/views/palace_invites/edit.html.slim           | 4 ++--
 spec/features/users/expired_palace_invite_spec.rb | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/award_year.rb b/app/models/award_year.rb
index 98c1a974b4..2fbc868ef1 100644
--- a/app/models/award_year.rb
+++ b/app/models/award_year.rb
@@ -256,8 +256,8 @@ def current_year_deadline(title)
       res
     end
 
-    def buckingham_palace_reception_deadline
-      current_year_deadline("buckingham_palace_attendees_invite")
+    def buckingham_palace_reception_deadline(award_year)
+      award_year.settings.deadlines.where(kind: "buckingham_palace_attendees_invite").first
     end
 
     def buckingham_palace_reception_date
diff --git a/app/views/palace_invites/edit.html.slim b/app/views/palace_invites/edit.html.slim
index bbb35a8559..394bff3a94 100644
--- a/app/views/palace_invites/edit.html.slim
+++ b/app/views/palace_invites/edit.html.slim
@@ -1,5 +1,5 @@
 - title "Buckingham Palace Attendee"
-
+- award_year = @invite.form_answer.award_year
 div
   header.group.page-header.page-header-wider
     div
@@ -10,7 +10,7 @@ div
       .inner
         p.govuk-body
           ' On
-          =< AwardYear.buckingham_palace_reception_deadline.decorate.formatted_trigger_date("with_year")
+          =< AwardYear.buckingham_palace_reception_deadline(award_year).decorate.formatted_trigger_date("with_year")
           ' , in the early evening at a time to be confirmed, a Royal reception at Buckingham Palace will be held for organisations who have received this year's King's Award/s. Successful organisations can send one attendee per award won.
 
         br
diff --git a/spec/features/users/expired_palace_invite_spec.rb b/spec/features/users/expired_palace_invite_spec.rb
index 5c7f35bdec..65184ea12b 100644
--- a/spec/features/users/expired_palace_invite_spec.rb
+++ b/spec/features/users/expired_palace_invite_spec.rb
@@ -23,7 +23,7 @@
   }
 
   before do
-    AwardYear.buckingham_palace_reception_deadline.update_column(:trigger_at, Time.current.end_of_year)
+    AwardYear.buckingham_palace_reception_deadline(form_answer.award_year).update_column(:trigger_at, Time.current.end_of_year)
 
     expect(Settings).to receive(:buckingham_palace_invites_stage?)
                           .with(invite.form_answer.award_year.settings)
@@ -41,7 +41,7 @@
   end
 
   it "allows user to fill the form within due date" do
-    award_date = AwardYear.buckingham_palace_reception_deadline.decorate.formatted_trigger_date("with_year")
+    award_date = AwardYear.buckingham_palace_reception_deadline(form_answer.award_year).decorate.formatted_trigger_date("with_year")
     deadline.update_column(:trigger_at, Time.current + 1.day)
 
     visit edit_palace_invite_path(id: invite.token)

From c0c2c78b9aae0ba08052727566191fd8280f908c Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 17 Aug 2023 16:43:00 +0200
Subject: [PATCH 252/352] Remove forgotten log from being displayed in partial

---
 ...urnover_exports_calculation_question_standart_block.html.slim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim b/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim
index a74741878b..8bcf290098 100644
--- a/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim
+++ b/app/views/qae_form/_turnover_exports_calculation_question_standart_block.html.slim
@@ -1,6 +1,5 @@
 - for c in question.by_year_conditions
   - question_visible = question.fields_count == c.years
-  = question.fields_count
 
   .js-conditional-question.turnover-exports-calculation-wrapper class=(class_names("show-question" => question_visible)) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
     .row

From c535c8d741f8ab91bb9dcd3635d20efbac89f6e6 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 17 Aug 2023 16:52:45 +0200
Subject: [PATCH 253/352] When redirecting save the form regardless of the
 errors

---
 app/controllers/form_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 2ff1dd1afa..6ba94e30c2 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -148,7 +148,8 @@ def save
         end
 
         if redirected
-          redirect_to dashboard_url
+          @form_answer.save(validate: false)
+          redirect_to(dashboard_url)
         else
           if submitted && saved
             redirect_to submit_confirm_url(@form_answer)

From aaed14cd01d17b165fee9fab53a860b65735909f Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 17 Aug 2023 17:46:23 +0200
Subject: [PATCH 254/352] JS: Fix splitting the text extracted from multiple
 elements

---
 .../frontend/form-validation.js.coffee        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 0192bfd965..0b9fbcac77 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -36,6 +36,16 @@ window.FormValidation =
       el.append(" #{message}")
     @validates = false
 
+  extractText: (identifier) ->
+    text = $("label[for='#{identifier}'] > span > span").toArray().map((el) ->
+      $(el).text()
+    ).join(' ')
+
+    if (text.length == 0)
+      text = $("label[for='#{identifier}']").text()
+
+    text
+
   addAriaDescribedByToInput: (container, message) ->
     input = container.find('input,textarea,select').filter(':visible')
     input_id = input.attr('id')
@@ -156,7 +166,7 @@ window.FormValidation =
   addSubfieldError: (question, subquestion) ->
     questionRef = question.attr("data-question_ref")
     input = $(subquestion).find('input,textarea,select').filter(':visible')
-    label = $("label[for='#{input.attr('id')}']").text()
+    label = @extractText(input.attr('id'))
     incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
 
     if question.hasClass('date-DDMMYYYY')
@@ -369,7 +379,7 @@ window.FormValidation =
 
       if shownQuestion
         subq = $(subquestion)
-        label = $("label[for='#{subq.attr('id')}']").text()
+        label = @extractText(subq.attr('id'))
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateEmployeeMin", "This field is required")
           # his error is duplicated on employee question.
@@ -478,8 +488,7 @@ window.FormValidation =
 
       if shownQuestion
         inputCellsCounter += 1
-        label = $("label[for='#{subq.attr('id')}']").text()
-
+        label = @extractText(subq.attr('id'))
         if not subq.val() and question.hasClass("question-required")
           @logThis(question, "validateNumberByYears", "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
           @appendMessage(errContainer, "Question #{questionRef} is incomplete. #{label} is required and must be filled in.")
@@ -512,7 +521,7 @@ window.FormValidation =
         inputCellsCounter += 1
 
         if not subq.val() and question.hasClass("question-required")
-          label = $("label[for='#{subq.attr('id')}']").text()
+          label = @extractText(subq.attr('id'))
           errorMessage = "Question #{questionRef} is incomplete. #{label} is required and must be filled in. Enter '0' if none."
           @logThis(question, "validateMoneyByYears", errorMessage)
           @appendMessage(errContainer, errorMessage)

From 18f5f220421a1cad5489ef2b009b08d1e41d03c8 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 17 Aug 2023 21:35:42 +0200
Subject: [PATCH 255/352] Add validation for invalid date format

---
 .../by_years_label_question.rb                | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/forms/qae_form_builder/by_years_label_question.rb b/forms/qae_form_builder/by_years_label_question.rb
index 8498d9d658..1b241f95c0 100644
--- a/forms/qae_form_builder/by_years_label_question.rb
+++ b/forms/qae_form_builder/by_years_label_question.rb
@@ -9,37 +9,43 @@ def errors
 
       dates = question.active_fields.each_with_object(Hash[]) do |field, outer|
                 suffix = "#{question.key}_#{field}"
-                date = REQUIRED_SUB_FIELDS.each_with_object([]) do |sub, inner|
+                parts = REQUIRED_SUB_FIELDS.each_with_object([]) do |sub, inner|
                   key = "#{suffix}#{sub}"
                   inner << answers[key]
-                end.join("/")
-
-                outer[suffix] = ::Utils::Date.valid?(date) ? Date.parse(date) : nil
+                end
+
+                if parts.any?(&:blank?)
+                  outer[suffix] = :blank
+                else
+                  date = parts.join("/")
+                  outer[suffix] = ::Utils::Date.valid?(date) ? Date.parse(date) : :invalid
+                end
               end
       
-      if question.required?
-        dates.each.with_index(1) do |(key, date), idx|
-          next if date.present?
-          result[key] ||= ""
-          result[key] << "Question #{question.ref || question.sub_ref} is incomplete. It is required and must be filled in. Use the format DD/MM/YYYY."
-        end
+      required = question.required?        
+
+      dates.each.with_index(1) do |(key, value), idx|
+        next unless value == :invalid || value == :blank
+        result[key] ||= ""
+        result[key] << "Question #{question.ref || question.sub_ref} is incomplete. It is required and must be filled in. Use the format DD/MM/YYYY." if (value == :blank && required)
+        result[key] << "The date entered for Question #{question.ref || question.sub_ref} is not valid. Use the format DD/MM/YYYY." if (value == :invalid)
       end
 
       dates.each_cons(2) do |values|
         beginning_key, beginning_date = values[0]
         end_key, end_date = values[-1]
 
-        next if beginning_date.nil? || end_date.nil?
+        next if [beginning_date, end_date].any? { |v| v.nil? || v.in?(%i[invalid blank]) }
 
         if beginning_date > end_date
           result[beginning_key] ||= ""
           result[end_key] ||= ""
-          result[beginning_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be before #{end_date.strftime('%d/%m/%Y')}."
-          result[end_key] << "Question #{question.ref || question.sub_ref} is incomplete. Date should be after #{beginning_date.strftime('%d/%m/%Y')}."
+          result[beginning_key] << "The date entered for Question #{question.ref || question.sub_ref} should be before #{end_date.strftime('%d/%m/%Y')}."
+          result[end_key] << "The date entered for Question #{question.ref || question.sub_ref} should be after #{beginning_date.strftime('%d/%m/%Y')}."
         end
       end
               
-      validatable = dates.values.each_cons(2).reject { |values| values.any?(&:nil?) }
+      validatable = dates.values.each_cons(2).reject { |values| values.any? { |v| v.nil? || v.in?(%i[invalid blank]) } }
 
       return result if validatable.blank?
 

From 92dc391e138b71c3de5274ed58b9d67629c27a00 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 17 Aug 2023 22:07:12 +0200
Subject: [PATCH 256/352] Fix display of red stripe when section has errors

---
 app/views/qae_form/_by_years_label_question.html.slim | 4 +---
 app/views/qae_form/_by_years_question.html.slim       | 4 +---
 app/views/qae_form/_question.html.slim                | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/views/qae_form/_by_years_label_question.html.slim b/app/views/qae_form/_by_years_label_question.html.slim
index 57fc252c68..c7410e4447 100644
--- a/app/views/qae_form/_by_years_label_question.html.slim
+++ b/app/views/qae_form/_by_years_label_question.html.slim
@@ -1,11 +1,9 @@
-- has_errors = question.by_year_conditions.map { |c| (1..c.years).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of#{c.years}")).present? } }.flatten.compact_blank.present?
-
 div role="group" id="q_#{question.key}"
   .js-financial-year-changed-dates
     - for c in question.by_year_conditions
       - question_visible = question.fields_count == c.years
   
-      .js-conditional-question.by-years-wrapper class=(class_names("govuk-form-group--error" => has_errors, "show-question" => question_visible)) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
+      .js-conditional-question.by-years-wrapper class=(class_names("show-question" => question_visible)) data=(c.question_value.respond_to?(:call) ? c.options.dig(:data).merge(question: question.step.form[c.question_key].parameterized_title) : {question: question.step.form[c.question_key].parameterized_title, value: c.question_value})
         .if-js-hide
           label.govuk-label
             strong
diff --git a/app/views/qae_form/_by_years_question.html.slim b/app/views/qae_form/_by_years_question.html.slim
index e097268a3a..a558438df6 100644
--- a/app/views/qae_form/_by_years_question.html.slim
+++ b/app/views/qae_form/_by_years_question.html.slim
@@ -1,6 +1,4 @@
-- has_errors = question.by_year_conditions.map { |c| (1..c.years).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of#{c.years}")).present? } }.flatten.compact_blank.present?
-
-.js-financial-conditional class=(" govuk-form-group--error" if has_errors) data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message id="q_#{question.key}" role="group"
+.js-financial-conditional data-first-year-min-value=question.first_year_min_value data-first-year-min-validation-message=question.first_year_validation_message id="q_#{question.key}" role="group"
   - for c in question.by_year_conditions
     - question_visible = question.fields_count == c.years
 
diff --git a/app/views/qae_form/_question.html.slim b/app/views/qae_form/_question.html.slim
index 20544612b5..b7428c77e9 100644
--- a/app/views/qae_form/_question.html.slim
+++ b/app/views/qae_form/_question.html.slim
@@ -11,7 +11,7 @@
 - elsif question.label_as_legend?
   div class=question.fieldset_classes data=question.fieldset_data_hash data-question_ref="#{ref}"
     = condition_divs question do
-      .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && @form_answer.validator_errors[question.hash_key])
+      .govuk-form-group class=(" govuk-form-group--error" if @form_answer.validator_errors && ((question.delegate_obj.respond_to?(:by_year_conditions) && question.delegate_obj.by_year_conditions.map { |c| (1..c.years).any? { |y| @form_answer.validator_errors&.dig(question.hash_key(suffix: "#{y}of#{c.years}")).present? } }.flatten.compact_blank.present?) || @form_answer.validator_errors[question.hash_key]))
         - if question.title != "" || question.show_ref_always.present?
           legend.govuk-fieldset__legend aria-describedby=("hint_for_#{question.key}" if question.context || question.form_hint)
             - if question.ref || question.sub_ref

From 53fff1a09d8b0c3b05ae0cff33fef7074d082cfc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 18 Aug 2023 22:13:23 +0000
Subject: [PATCH 257/352] Bump puma from 6.3.0 to 6.3.1

Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      | 2 +-
 Gemfile.lock | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index bdce10c4aa..86de2568f1 100644
--- a/Gemfile
+++ b/Gemfile
@@ -125,7 +125,7 @@ gem 'nilify_blanks'
 gem 'curb', '0.9.10'
 
 # Web server
-gem 'puma', '~> 6.3.0'
+gem 'puma', '~> 6.3.1'
 
 # Performance & Error reporting
 gem 'appsignal'
diff --git a/Gemfile.lock b/Gemfile.lock
index 34c9293b32..bc2062b406 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -413,7 +413,7 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     public_suffix (5.0.3)
-    puma (6.3.0)
+    puma (6.3.1)
       nio4r (~> 2.0)
     pundit (0.3.0)
       activesupport (>= 3.0.0)
@@ -684,7 +684,6 @@ GEM
     zxcvbn (0.1.9)
 
 PLATFORMS
-  ruby
   arm64-darwin-21
   arm64-darwin-22
   x86_64-darwin-21
@@ -744,7 +743,7 @@ DEPENDENCIES
   prawn
   prawn-table
   pry-byebug
-  puma (~> 6.3.0)
+  puma (~> 6.3.1)
   pundit (~> 0.3)
   pusher (= 0.15.2)
   rack-cors (~> 1.0)

From 61a29df7f7cbb61bc690557dbc1e0cbd0f701632 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 16 Aug 2023 13:44:15 +0100
Subject: [PATCH 258/352] Changes px to rem

---
 app/assets/stylesheets/admin/_pxToRem.scss    |   3 +
 app/assets/stylesheets/admin/_toRem.scss      |   6 +
 app/assets/stylesheets/admin/_toggle.scss     |   8 +-
 app/assets/stylesheets/admin/base.scss        | 461 +++++++++---------
 .../stylesheets/admin/date-time-picker.scss   |  83 ++--
 app/assets/stylesheets/admin/forms.scss       |   8 +-
 .../stylesheets/admin/header-footer.scss      |  81 +--
 app/assets/stylesheets/admin/layout.scss      |  22 +-
 .../stylesheets/admin/page-applications.scss  | 165 +++----
 .../stylesheets/admin/page-custom-emails.scss |   6 +-
 .../stylesheets/admin/page-dashboard.scss     |  70 ++-
 .../stylesheets/admin/page-feedback.scss      |   4 +-
 .../stylesheets/admin/page-settings.scss      |  50 +-
 app/assets/stylesheets/admin/page-users.scss  |  24 +-
 14 files changed, 508 insertions(+), 483 deletions(-)
 create mode 100644 app/assets/stylesheets/admin/_pxToRem.scss
 create mode 100644 app/assets/stylesheets/admin/_toRem.scss

diff --git a/app/assets/stylesheets/admin/_pxToRem.scss b/app/assets/stylesheets/admin/_pxToRem.scss
new file mode 100644
index 0000000000..b5983bee0b
--- /dev/null
+++ b/app/assets/stylesheets/admin/_pxToRem.scss
@@ -0,0 +1,3 @@
+@function pxToRem($value) {
+  @return $value * 0.0625rem;
+}
diff --git a/app/assets/stylesheets/admin/_toRem.scss b/app/assets/stylesheets/admin/_toRem.scss
new file mode 100644
index 0000000000..f648f1ab68
--- /dev/null
+++ b/app/assets/stylesheets/admin/_toRem.scss
@@ -0,0 +1,6 @@
+@use "sass:math";
+
+@function toRem($value) {
+  $remValue: math.div($value, 16) * 1rem;
+  @return $remValue;
+}
diff --git a/app/assets/stylesheets/admin/_toggle.scss b/app/assets/stylesheets/admin/_toggle.scss
index 4dfcd1812b..8cc3bf5172 100644
--- a/app/assets/stylesheets/admin/_toggle.scss
+++ b/app/assets/stylesheets/admin/_toggle.scss
@@ -1,3 +1,5 @@
+@import "pxToRem";
+
 .hide {
   display: none !important;
 }
@@ -17,12 +19,12 @@
 .rm {
   border: 0;
   clip: rect(0, 0, 0, 0);
-  height: 1px;
-  margin: -1px;
+  height: pxToRem(1);
+  margin: pxToRem(1);
   overflow: hidden;
   padding: 0;
   position: absolute;
-  width: 1px;
+  width: pxToRem(1);
   z-index: -1;
 }
 
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 605bd63ec3..e334a4ce8c 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -1,4 +1,5 @@
 @import "mixins";
+@import "pxToRem";
 
 // Basic
 a {
@@ -9,7 +10,7 @@ a {
     outline: none !important;
     text-decoration: none !important;
     border-bottom-color: $black !important;
-    border-bottom-width: 2px !important;
+    border-bottom-width: pxToRem(2) !important;
     border-bottom-style: solid !important;
   }
 }
@@ -28,16 +29,16 @@ input[type=text], input[type=tel],
 input[type=email], input[type=password],
 input[type=checkbox], select {
   &:focus {
-    outline: 3px solid #ffdd00 !important;
+    outline: pxToRem(3) solid #ffdd00 !important;
     outline-offset: 0 !important;
-    box-shadow: inset 0 0 0 2px !important;
+    box-shadow: inset 0 0 0 pxToRem(2) !important;
   }
 }
 
 .btn-primary, .button_to {
   &:focus, &:focus-within {
     border-bottom-color: $black !important;
-    border-bottom-width: 2px !important;
+    border-bottom-width: pxToRem(2) !important;
     border-bottom-style: solid !important;
   }
 }
@@ -78,11 +79,11 @@ span {
 
 select,
 select.form-control {
-  padding-right: 20px;
+  padding-right: pxToRem(20);
   background-image: image-url("icon-arrow-select.png");
   background-repeat: no-repeat;
   background-position: right center;
-  background-size: 13px 14px;
+  background-size: pxToRem(13) pxToRem(14);
   -moz-appearance: none;
   -webkit-appearance: none;
 
@@ -127,7 +128,7 @@ h4 {
 }
 
 table .ellipsis {
-  max-width: 175px;
+  max-width: pxToRem(175);
 }
 
 .admin-page-heading {
@@ -162,7 +163,7 @@ table .ellipsis {
   }
 
   .glyphicon:first-child {
-    margin-right: 5px;
+    margin-right: pxToRem(5);
   }
 }
 
@@ -216,28 +217,28 @@ table .ellipsis {
 }
 
 .btn-confirm-submit {
-  font-size: 17px;
+  font-size: pxToRem(17);
 }
 
 .alert {
-  padding-top: 10px;
-  padding-bottom: 10px;
+  padding-top: pxToRem(10);
+  padding-bottom: pxToRem(10);
   border-radius: 0;
 }
 
 .alert-glyphicon {
   position: relative;
-  padding-left: 40px;
+  padding-left: pxToRem(40);
 
   .glyphicon {
     position: absolute;
-    top: 15px;
-    left: 15px;
+    top: pxToRem(15);
+    left: pxToRem(15);
   }
 }
 
 .panel-body .alert {
-  margin-bottom: 30px;
+  margin-bottom: pxToRem(30);
 }
 
 .page-header {
@@ -246,7 +247,7 @@ table .ellipsis {
 
   h1 {
     margin-top: 0;
-    font-size: 30px;
+    font-size: pxToRem(30);
   }
 }
 
@@ -260,7 +261,7 @@ table .ellipsis {
   }
 
   .pull-right a {
-    margin-left: 20px;
+    margin-left: pxToRem(20);
   }
 
   .apps-navigation {
@@ -279,21 +280,21 @@ table .ellipsis {
 
   .table {
     width: 99.5%;
-    margin-left: 1px;
+    margin-left: pxToRem(1);
   }
 
   .not-eligible {
-    border-right: 2px solid $black;
-    width: 75px;
+    border-right: pxToRem(2) solid $black;
+    width: pxToRem(75);
   }
 
   .table-total {
-    width: 80px;
+    width: pxToRem(80);
   }
 
   .apps-in-proggress {
     td {
-      width: 70px;
+      width: pxToRem(70);
     }
   }
 }
@@ -301,7 +302,7 @@ table .ellipsis {
 .table {
   &.table-striped tbody {
     .lte-ie8 & {
-      border: 2px solid $black-true;
+      border: pxToRem(2) solid $black-true;
       border-collapse: initial !important;
     }
   }
@@ -330,7 +331,7 @@ table .ellipsis {
     }
 
     td {
-      padding-top: 10px;
+      padding-top: pxToRem(10);
     }
 
     .td-assessment-submitted {
@@ -352,10 +353,10 @@ table .ellipsis {
   }
 
   .ellipsis {
-    max-width: 350px;
+    max-width: pxToRem(350);
 
     @include screen-md-max {
-      max-width: 250px;
+      max-width: pxToRem(250);
     }
   }
 }
@@ -377,7 +378,7 @@ table .ellipsis {
 }
 
 .question-group h2, h3 {
-  font-size: 18px;
+  font-size: pxToRem(18);
   font-weight: bold;
   line-height: 1.5;
 
@@ -411,7 +412,7 @@ table .ellipsis {
 .field-with-errors {
   .error {
     display: block;
-    margin-bottom: 5px;
+    margin-bottom: pxToRem(5);
     color: $error-colour;
 
     @include screen-md-min {
@@ -425,14 +426,14 @@ table .ellipsis {
   }
 
   .feedback-holder {
-    margin-bottom: 15px;
+    margin-bottom: pxToRem(15);
   }
 }
 
 .govuk-form-group--error {
   .govuk-error-message {
     display: block;
-    margin-bottom: 5px;
+    margin-bottom: pxToRem(5);
     color: $error-colour;
 
     @include screen-md-min {
@@ -446,7 +447,7 @@ table .ellipsis {
   }
 
   .feedback-holder {
-    margin-bottom: 15px;
+    margin-bottom: pxToRem(15);
   }
 }
 
@@ -454,7 +455,7 @@ table .ellipsis {
   display: block;
 
   .form-group {
-    margin-right: 36px;
+    margin-right: pxToRem(36);
   }
 
   .form-control {
@@ -464,7 +465,7 @@ table .ellipsis {
     &,
     &:first-child,
     &:last-child {
-      border-radius: 4px;
+      border-radius: pxToRem(4);
     }
   }
 
@@ -473,16 +474,16 @@ table .ellipsis {
     position: absolute;
     right: 0;
     bottom: 0;
-    width: 40px;
+    width: pxToRem(40);
     height: 2.4em;
-    border-left: 1px solid $grey-light;
+    border-left: pxToRem(1) solid $grey-light;
     line-height: 1.5;
     z-index: 2;
 
     .lte-ie7 & {
-      top: 1px !important;
+      top: pxToRem(1) !important;
       padding: 0 !important;
-      padding-top: 6px !important;
+      padding-top: pxToRem(6) !important;
     }
 
     .glyphicon {
@@ -514,14 +515,14 @@ table .ellipsis {
 }
 
 .form-actions {
-  margin-top: 30px;
+  margin-top: pxToRem(30);
 
   .show-sidebar & {
     margin-top: 0;
   }
 
   .btn {
-    margin-right: 15px;
+    margin-right: pxToRem(15);
 
     &:last-child {
       margin-right: 0;
@@ -536,23 +537,23 @@ table .ellipsis {
 .selectable {
   display: block;
   position: relative;
-  margin-top: 10px;
-  margin-bottom: 10px;
-  padding: 15px 20px;
+  margin-top: pxToRem(10);
+  margin-bottom: pxToRem(10);
+  padding: pxToRem(15) pxToRem(20);
   float: none;
   clear: left;
-  border: 1px solid $selectable;
-  border-radius: 4px;
+  border: pxToRem(1) solid $selectable;
+  border-radius: pxToRem(4);
   background-color: $white-true;
   cursor: pointer;
 
   .checkbox & {
-    padding-left: 35px;
+    padding-left: pxToRem(35);
   }
 }
 
 label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
-  margin-left: 10px;
+  margin-left: pxToRem(10);
 }
 
 // Fix boolean inputs
@@ -563,12 +564,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   &.control-label {
-    padding-left: 20px;
+    padding-left: pxToRem(20);
   }
 
   input.boolean {
     position: absolute;
-    top: 14px;
+    top: pxToRem(14);
     left: 1em;
   }
 
@@ -579,17 +580,17 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   &.field-with-errors .checkbox {
-    left: 20px;
+    left: pxToRem(20);
   }
 
   &.selectable-group {
     .selectable {
-      padding-left: 40px;
+      padding-left: pxToRem(40);
     }
 
     .checkbox {
-      top: 15px;
-      left: 15px;
+      top: pxToRem(15);
+      left: pxToRem(15);
       margin-top: 0;
     }
   }
@@ -597,16 +598,16 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .hint {
   display: block;
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin-top: pxToRem(10);
+  margin-bottom: pxToRem(10);
   color: $grey-dark;
-  font-size: 14px;
+  font-size: pxToRem(14);
 }
 
 .password-meter {
   max-width: none;
-  margin-top: 5px;
-  margin-right: -80px;
+  margin-top: pxToRem(5);
+  margin-right: pxToRem(-80);
 
   @include screen-sm-max {
     margin-right: 0;
@@ -636,11 +637,11 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   .glyphicon {
-    margin-right: 5px;
+    margin-right: pxToRem(5);
   }
 
   li {
-    margin-bottom: 10px;
+    margin-bottom: pxToRem(10);
     @extend .clearfix;
 
     &:last-child {
@@ -649,13 +650,13 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
     .action-title {
       display: block;
-      margin-right: 110px;
+      margin-right: pxToRem(110);
       white-space: nowrap;
       overflow: hidden;
       text-overflow: ellipsis;
 
       .lte-ie8 & {
-        max-width: 200px;
+        max-width: pxToRem(200);
         margin-right: 0;
         float: left;
       }
@@ -674,7 +675,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   overflow: hidden;
 
   .lte-ie8 & {
-    max-height: 25px;
+    max-height: pxToRem(25);
   }
 
   input[type="file"] {
@@ -685,7 +686,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     left: auto;
     width: 100%;
     cursor: pointer;
-    font-size: 200px;
+    font-size: pxToRem(200);
     opacity: 0;
     -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
     filter: alpha(opacity=0);
@@ -699,7 +700,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 // Alerts
 .alert-container {
-  margin-bottom: 30px;
+  margin-bottom: pxToRem(30);
   z-index: 10001;
 
   @include screen-sm-min {
@@ -707,18 +708,18 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   @include screen-md-min {
-    max-width: 970px;
+    max-width: pxToRem(970);
   }
 
   @include screen-lg-min {
-    max-width: 1170px;
+    max-width: pxToRem(1170);
   }
 
   .alert {
     margin: 0;
 
     .lte-ie7 & {
-      max-width: 1170px;
+      max-width: pxToRem(1170);
       text-align: left;
     }
   }
@@ -734,8 +735,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .icon-unflagged,
 .icon-check {
   display: inline-block;
-  width: 30px;
-  height: 30px;
+  width: pxToRem(30);
+  height: pxToRem(30);
   text-align: left;
   text-indent: -9999px;
   background-repeat: no-repeat;
@@ -748,12 +749,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .icon-comment {
   position: relative;
-  width: 25px;
-  height: 18px;
-  top: 3px;
+  width: pxToRem(25);
+  height: pxToRem(18);
+  top: pxToRem(3);
   background-image: image-url("icon-comment-sm.png");
   background-position: left top;
-  background-size: 20px 18px;
+  background-size: pxToRem(20) pxToRem(18);
 
   @include is-retina {
     background-image: image-url("icon-comment-sm@2.png");
@@ -761,28 +762,28 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
   .comment-count {
     position: absolute;
-    top: -6px;
-    left: 23px;
+    top: pxToRem(-6);
+    left: pxToRem(23);
     color: $black;
-    font-size: 10px;
+    font-size: pxToRem(10);
     font-weight: bold;
     text-indent: 0;
   }
 }
 
 .icon-comment-wrapper + .icon-flagged {
-  margin-left: 10px;
+  margin-left: pxToRem(10);
   display: inline-block;
 }
 
 .icon-flagged {
   position: relative;
-  width: 25px;
-  height: 18px;
-  top: 3px;
+  width: pxToRem(25);
+  height: pxToRem(18);
+  top: pxToRem(3);
   background-image: image-url("icon-flag-sm.png");
   background-position: left top;
-  background-size: 12px 15px;
+  background-size: pxToRem(12) pxToRem(15);
 
   @include is-retina {
     background-image: image-url("icon-flag-sm@2.png");
@@ -798,10 +799,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
   .flag-count {
     position: absolute;
-    top: -6px;
-    left: 13px;
+    top: pxToRem(-6);
+    left: pxToRem(13);
     color: $black;
-    font-size: 10px;
+    font-size: pxToRem(10);
     font-weight: bold;
     text-indent: 0;
   }
@@ -810,7 +811,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .icon-unflagged {
   background-image: image-url("icon-flag-sm-grey.png");
   background-position: left top;
-  background-size: 12px 15px;
+  background-size: pxToRem(12) pxToRem(15);
 
   @include is-retina {
     background-image: image-url("icon-flag-sm-grey@2.png");
@@ -819,12 +820,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .icon-check {
   position: relative;
-  width: 20px;
-  height: 20px;
-  top: -6px;
+  width: pxToRem(20);
+  height: pxToRem(20);
+  top: pxToRem(-6);
   background-image: image-url("icon-check.png");
   background-position: center center;
-  background-size: 20px 14px;
+  background-size: pxToRem(20) pxToRem(14);
   vertical-align: -webkit-baseline-middle;
 
   @include is-retina {
@@ -837,12 +838,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .icon-view {
-  width: 18px;
-  min-height: 16px;
+  width: pxToRem(18);
+  min-height: pxToRem(16);
   background-image: image-url("icon-computer-sm.png");
   background-repeat: no-repeat;
   background-position: center center;
-  background-size: 18px 16px;
+  background-size: pxToRem(18) pxToRem(16);
   text-align: left;
   text-indent: -9999px;
   opacity: 0.8;
@@ -863,12 +864,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
   .btn & {
     position: relative;
-    top: 2px;
-    width: 20px;
-    height: 16px;
-    margin-right: 5px;
+    top: pxToRem(2);
+    width: pxToRem(20);
+    height: pxToRem(16);
+    margin-right: pxToRem(5);
     background-image: image-url("icon-computer-sm.png");
-    background-size: 18px 16px;
+    background-size: pxToRem(18) pxToRem(16);
     opacity: 1;
 
     @include is-retina {
@@ -888,13 +889,13 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   position: relative !important;
 
   .lte-ie8 & {
-    width: 350px;
+    width: pxToRem(350);
     overflow: hidden;
   }
 
   .form_answers-index-page & {
     @include screen-sm-max {
-      margin-top: 15px;
+      margin-top: pxToRem(15);
     }
   }
 
@@ -902,7 +903,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     position: relative;
 
     .lte-ie8 & {
-      width: 350px;
+      width: pxToRem(350);
     }
 
     .lte-ie7 & {
@@ -912,8 +913,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
   [type="search"],
   input.form-control {
-    padding-right: 40px;
-    font-size: 16px;
+    padding-right: pxToRem(40);
+    font-size: pxToRem(16);
     font-style: italic;
     position: relative;
     z-index: 10;
@@ -924,7 +925,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     top: 0;
     right: 0;
     bottom: 0;
-    width: 30px;
+    width: pxToRem(30);
     margin: 0;
     padding: 0;
     border: none;
@@ -932,7 +933,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     background-image: image-url("icon-search.png");
     background-repeat: no-repeat;
     background-position: center center;
-    background-size: 15px 21px;
+    background-size: pxToRem(15) pxToRem(21);
     text-align: left !important;
     text-indent: -9999px;
     white-space: nowrap;
@@ -955,10 +956,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 // Sortable Tables
 .sortable {
   a {
-    padding-right: 16px;
+    padding-right: pxToRem(16);
     background-repeat: no-repeat;
     background-position: right center;
-    background-size: 10px 6px;
+    background-size: pxToRem(10) pxToRem(6);
     color: $black;
     background-image: image-url("icon-arrow-sort-down-grey.png");
     text-decoration: none;
@@ -1009,13 +1010,13 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 // Filterable Dropdowns
 .filter {
   .dropdown-toggle {
-    padding: 4px 10px;
+    padding: pxToRem(4) pxToRem(10);
     color: $grey-dark;
     font-size: inherit;
 
     .lte-ie7 & {
       position: relative;
-      border-bottom: 1px solid $grey-light;
+      border-bottom: pxToRem(1) solid $grey-light;
       zoom: 1;
     }
 
@@ -1029,7 +1030,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
 
     .caret {
-      margin-left: 5px;
+      margin-left: pxToRem(5);
     }
   }
 
@@ -1038,11 +1039,11 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
       margin: 0;
 
       &.divider {
-        margin: 5px 0;
+        margin: pxToRem(5) 0;
 
         .lte-ie7 & {
           width: 100%;
-          height: 1px;
+          height: pxToRem(1);
           background: $grey-light;
         }
       }
@@ -1059,15 +1060,15 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
 
     input {
-      margin-top: 11px;
-      margin-left: 10px;
+      margin-top: pxToRem(11);
+      margin-left: pxToRem(10);
     }
 
     .label-contents {
       display: block;
       position: relative;
-      padding: 7px 10px;
-      padding-left: 30px;
+      padding: pxToRem(7) pxToRem(10);
+      padding-left: pxToRem(30);
       z-index: 1;
     }
 
@@ -1080,8 +1081,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 // Sidebar
 .show-main-content,
 .show-sidebar-container {
-  padding-right: 15px;
-  padding-left: 15px;
+  padding-right: pxToRem(15);
+  padding-left: pxToRem(15);
   float: left;
 }
 
@@ -1103,12 +1104,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .show-sidebar {
   position: relative;
-  padding: 15px;
+  padding: pxToRem(15);
   background: $white-true;
   zoom: 1;
 
   @include screen-md-max {
-    margin-bottom: 30px;
+    margin-bottom: pxToRem(30);
   }
 
   h1,
@@ -1119,45 +1120,45 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
 
     .glyphicon {
-      margin-right: 5px;
+      margin-right: pxToRem(5);
     }
   }
 
   h1 {
-    font-size: 32px;
+    font-size: pxToRem(32);
 
     @include screen-md-max {
-      font-size: 24px;
+      font-size: pxToRem(24);
     }
   }
 
   h2 {
-    margin-bottom: 20px;
-    font-size: 16px;
+    margin-bottom: pxToRem(20);
+    font-size: pxToRem(16);
     font-weight: bold;
     text-transform: uppercase;
 
     @include screen-md-max {
-      font-size: 15px;
+      font-size: pxToRem(15);
     }
 
     .pull-right {
       @include screen-md-max {
         display: inline-block;
         width: 100%;
-        margin-top: 10px;
+        margin-top: pxToRem(10);
         float: none !important;
       }
     }
   }
 
   h3 {
-    margin-bottom: 20px;
-    font-size: 16px;
+    margin-bottom: pxToRem(20);
+    font-size: pxToRem(16);
     font-weight: bold;
 
     @include screen-md-max {
-      font-size: 15px;
+      font-size: pxToRem(15);
     }
   }
 
@@ -1165,16 +1166,16 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     display: block;
     margin-top: 0.25em;
     color: $grey-dark;
-    font-size: 14px;
+    font-size: pxToRem(14);
     text-transform: none;
   }
 
   .well {
     margin: 0;
-    padding: 20px 0;
+    padding: pxToRem(20) 0;
     background: transparent;
     border: none;
-    border-bottom: 1px solid $grey;
+    border-bottom: pxToRem(1) solid $grey;
     border-radius: 0;
     box-shadow: none;
 
@@ -1189,8 +1190,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
     .well {
       padding: 19px;
-      border: 1px solid $grey;
-      border-radius: 4px;
+      border: pxToRem(1) solid $grey;
+      border-radius: pxToRem(4);
     }
   }
 
@@ -1200,12 +1201,12 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
 
     .form-cancel-link:last-child {
-      margin-right: 15px;
+      margin-right: pxToRem(15);
     }
   }
 
   .sidebar-section {
-    margin-bottom: 45px;
+    margin-bottom: pxToRem(45);
 
     &:last-child {
       margin-bottom: 0;
@@ -1224,7 +1225,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .comment {
   position: relative;
-  margin-bottom: 15px;
+  margin-bottom: pxToRem(15);
 
   &:first-child {
     padding-top: 0;
@@ -1233,11 +1234,11 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .comment-header {
-  margin-bottom: 5px;
+  margin-bottom: pxToRem(5);
 
   h3 {
     margin: 0;
-    font-size: 16px;
+    font-size: pxToRem(16);
     font-weight: bold;
     line-height: 1.5;
   }
@@ -1245,22 +1246,22 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .comment-action {
   display: block;
-  margin-top: 10px;
+  margin-top: pxToRem(10);
   color: $grey-dark;
-  font-size: 14px;
+  font-size: pxToRem(14);
 
   .divider {
-    margin: 0 8px;
+    margin: 0 pxToRem(8);
   }
 }
 
 .link-flag-comment {
-  margin-left: 3px;
-  padding-left: 17px;
+  margin-left: pxToRem(3);
+  padding-left: pxToRem(17);
   background-image: image-url("icon-flag-sm-grey.png");
   background-repeat: no-repeat;
   background-position: left center;
-  background-size: 12px 15px;
+  background-size: pxToRem(12) pxToRem(15);
 
   @include is-retina {
     background-image: image-url("icon-flag-sm-grey@2.png");
@@ -1310,8 +1311,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .link-delete-comment {
   display: inline-block;
   position: relative;
-  padding-right: 15px;
-  font-size: 14px;
+  padding-right: pxToRem(15);
+  font-size: pxToRem(14);
   font-weight: normal;
 
   .show-delete-comment & {
@@ -1322,13 +1323,13 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     position: absolute;
     top: 50%;
     right: 0;
-    width: 10px;
-    height: 10px;
-    margin-top: -5px;
+    width: pxToRem(10);
+    height: pxToRem(10);
+    margin-top: pxToRem(-5);
     background-image: image-url("icon-close-comment.png");
     background-repeat: no-repeat;
     background-position: right;
-    background-size: 10px 10px;
+    background-size: pxToRem(10) pxToRem(10);
 
     @include is-retina {
       background-image: image-url("icon-close-comment@2.png");
@@ -1364,20 +1365,20 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     width: 100%;
     top: 50%;
     left: 0;
-    margin-top: -36px;
+    margin-top: pxToRem(-36);
   }
 }
 
 .comment-insert {
-  margin-top: 15px;
+  margin-top: pxToRem(15);
 }
 
 .comment-actions {
-  margin-top: 10px;
+  margin-top: pxToRem(10);
 
   .link-flag-comment {
     display: inline-block;
-    margin-top: 5px;
+    margin-top: pxToRem(5);
   }
 
   input[type="checkbox"] {
@@ -1408,10 +1409,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   tbody {
-    border: 2px solid $black;
+    border: pxToRem(2) solid $black;
 
     > tr > th {
-      border-right: 2px solid $black;
+      border-right: pxToRem(2) solid $black;
     }
   }
 
@@ -1437,7 +1438,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   &:focus-within {
     background-color: $govuk-highlight-yellow;
     border-bottom-color: $black !important;
-    border-bottom-width: 2px !important;
+    border-bottom-width: pxToRem(2) !important;
     border-bottom-style: solid !important;
   }
 }
@@ -1445,15 +1446,15 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .panel-title {
   font-weight: bold;
   text-transform: uppercase;
-  font-size: 16px;
+  font-size: pxToRem(16);
   line-height: 1.1 !important;
 
   > a {
-    padding-left: 25px;
+    padding-left: pxToRem(25);
     background-image: image-url("icon-arrow-collapse-down.png");
     background-repeat: no-repeat;
     background-position: 0 0.4em;
-    background-size: 12px 8px;
+    background-size: pxToRem(12) pxToRem(8);
     text-decoration: none;
 
     &:focus {
@@ -1484,18 +1485,18 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   small {
     display: inline-block;
     width: 100%;
-    margin-top: 10px;
-    padding-left: 25px;
+    margin-top: pxToRem(10);
+    padding-left: pxToRem(25);
     color: $grey-dark;
-    font-size: 14px;
+    font-size: pxToRem(14);
     font-style: italic;
     text-transform: none;
 
     @include screen-md-max {
       display: inline-block;
       width: 100%;
-      margin-top: 10px;
-      padding-left: 25px;
+      margin-top: pxToRem(10);
+      padding-left: pxToRem(25);
       float: none !important;
     }
 
@@ -1558,8 +1559,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .form-label-rag {
   display: block;
   position: relative;
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin-top: pxToRem(10);
+  margin-bottom: pxToRem(10);
 
   @include screen-xs-max {
     margin-top: 0;
@@ -1582,7 +1583,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .btn-rag {
   position: absolute;
   right: 0;
-  top: -5px;
+  top: pxToRem(-5);
 
   @include screen-xs-max {
     display: block;
@@ -1606,23 +1607,23 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     position: absolute;
     top: 50%;
     right: 0;
-    width: 20px;
-    height: 20px;
-    margin-top: -10px;
-    background-size: 20px 20px;
+    width: pxToRem(20);
+    height: pxToRem(20);
+    margin-top: pxToRem(-10);
+    background-size: pxToRem(20) pxToRem(20);
     text-align: left;
     text-indent: -9999px;
   }
 
   &.rag-editable .icon-rag {
-    right: 15px;
+    right: pxToRem(15);
   }
 
   .caret {
     position: absolute;
     top: 50%;
     right: 0;
-    margin-top: -2px;
+    margin-top: pxToRem(-2);
   }
 
   .dropdown-toggle,
@@ -1632,7 +1633,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   .dropdown-toggle {
-    padding-right: 25px;
+    padding-right: pxToRem(25);
     padding-left: 0;
 
     @include screen-xs-max {
@@ -1653,7 +1654,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   &.rag-editable .dropdown-toggle {
-    padding-right: 40px;
+    padding-right: pxToRem(40);
   }
 
   .dropdown-menu {
@@ -1670,9 +1671,9 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
 
     a {
-      padding-top: 6px;
-      padding-bottom: 6px;
-      padding-left: 37px;
+      padding-top: pxToRem(6);
+      padding-bottom: pxToRem(6);
+      padding-left: pxToRem(37);
 
       @include screen-xs-max {
         white-space: normal;
@@ -1680,7 +1681,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
 
     .icon-rag {
-      left: 12px;
+      left: pxToRem(12);
     }
   }
 
@@ -1796,7 +1797,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
     .form-control {
       @include screen-sm-max {
-        margin-bottom: 10px;
+        margin-bottom: pxToRem(10);
       }
     }
   }
@@ -1806,7 +1807,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
     @include screen-sm-max {
       margin-top: 0;
-      margin-bottom: 10px;
+      margin-bottom: pxToRem(10);
     }
   }
 }
@@ -1816,7 +1817,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     background: none;
     border: none;
     display: block;
-    padding: 3px 20px;
+    padding: pxToRem(3) pxToRem(20);
     clear: both;
     font-weight: normal;
     line-height: 1.42857143;
@@ -1835,7 +1836,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .page-header-nav .btn-link.pull-left,
 .search-form h2 .btn-link {
-  margin-right: 30px;
+  margin-right: pxToRem(30);
   padding-right: 0;
   padding-left: 0;
 }
@@ -1859,10 +1860,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-paperclip {
-  width: 16px;
-  height: 16px;
+  width: pxToRem(16);
+  height: pxToRem(16);
   background-image: image-url("icon-attach.png");
-  background-size: 16px 16px;
+  background-size: pxToRem(16) pxToRem(16);
 
   @include is-retina {
     background-image: image-url("icon-attach@2.png");
@@ -1870,10 +1871,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-pencil {
-  width: 15px;
-  height: 13px;
+  width: pxToRem(15);
+  height: pxToRem(13);
   background-image: image-url("icon-edit-black.png");
-  background-size: 15px 13px;
+  background-size: pxToRem(15) pxToRem(13);
 
   @include is-retina {
     background-image: image-url("icon-edit-black@2.png");
@@ -1881,10 +1882,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-file {
-  width: 12px;
-  height: 16px;
+  width: pxToRem(12);
+  height: pxToRem(16);
   background-image: image-url("icon-file.png");
-  background-size: 12px 16px;
+  background-size: pxToRem(12) pxToRem(16);
 
   @include is-retina {
     background-image: image-url("icon-file@2.png");
@@ -1892,10 +1893,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-info-sign {
-  width: 15px;
-  height: 15px;
+  width: pxToRem(15);
+  height: pxToRem(15);
   background-image: image-url("icon-info.png");
-  background-size: 15px 15px;
+  background-size: pxToRem(15) pxToRem(15);
 
   @include is-retina {
     background-image: image-url("icon-info@2.png");
@@ -1903,10 +1904,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-download-alt {
-  width: 15px;
-  height: 16px;
+  width: pxToRem(15);
+  height: pxToRem(16);
   background-image: image-url("icon-download.png");
-  background-size: 15px 16px;
+  background-size: pxToRem(15) pxToRem(16);
 
   &.black {
     background-image: image-url("icon-download-black.png");
@@ -1922,10 +1923,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-user {
-  width: 14px;
-  height: 14px;
+  width: pxToRem(14);
+  height: pxToRem(14);
   background-image: image-url("icon-user.png");
-  background-size: 14px 14px;
+  background-size: pxToRem(14) pxToRem(14);
 
   @include is-retina {
     background-image: image-url("icon-user@2.png");
@@ -1933,10 +1934,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-ok {
-  width: 15px;
-  height: 12px;
+  width: pxToRem(15);
+  height: pxToRem(12);
   background-image: image-url("icon-valid.png");
-  background-size: 15px 12px;
+  background-size: pxToRem(15) pxToRem(12);
 
   @include is-retina {
     background-image: image-url("icon-valid@2.png");
@@ -1961,10 +1962,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .glyphicon-remove {
-  width: 11px;
-  height: 11px;
+  width: pxToRem(11);
+  height: pxToRem(11);
   background-image: image-url("icon-invalid.png");
-  background-size: 11px 11px;
+  background-size: pxToRem(11) pxToRem(11);
 
   @include is-retina {
     background-image: image-url("icon-invalid@2.png");
@@ -1999,8 +2000,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   }
 
   .award-year-dropdown {
-    max-width: 142px;
-    margin-left: 120px;
+    max-width: pxToRem(142);
+    margin-left: pxToRem(120);
   }
 
   &.award-year--vertical {
@@ -2023,9 +2024,9 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
       right: 0;
       bottom: 0;
       left: auto;
-      padding-right: 10px;
-      padding-left: 10px;
-      border-left: 1px solid $less-black;
+      padding-right: pxToRem(10);
+      padding-left: pxToRem(10);
+      border-left: pxToRem(1) solid $less-black;
       background: $black-header;
 
       .caret {
@@ -2047,8 +2048,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   .btn:active .caret-container {
     outline: 0;
     background-image: none;
-    -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
-    box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+    -webkit-box-shadow: inset 0 pxToRem(3) pxToRem(5) rgba(0, 0, 0, 0.125);
+    box-shadow: inset 0 pxToRem(3) pxToRem(5) rgba(0, 0, 0, 0.125);
   }
 
   .dropdown-menu {
@@ -2057,16 +2058,16 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     z-index: 2000;
 
     > li > a {
-      padding-left: 12px;
+      padding-left: pxToRem(12);
     }
   }
 }
 
 .glyphicon-star,
 .glyphicon-star-empty {
-  width: 16px;
-  height: 15px;
-  background-size: 16px 15px;
+  width: pxToRem(16);
+  height: pxToRem(15);
+  background-size: pxToRem(16) pxToRem(15);
 }
 
 .glyphicon-star {
@@ -2093,7 +2094,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
 .char-space {
   display: inline-block;
-  width: 160px;
+  width: pxToRem(160);
   height: 1em;
 }
 
@@ -2106,13 +2107,13 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .char-text-limit {
-  font-size: 14px;
+  font-size: pxToRem(14);
   margin-top: 0.5em;
   margin-bottom: 0.2em;
   text-align: right;
 }
 .char-text {
-  font-size: 14px;
+  font-size: pxToRem(14);
   margin-top: 0.2em;
   text-align: right;
 
@@ -2122,8 +2123,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 }
 
 .nav-subnav {
-  margin-bottom: 15px;
-  border-bottom: 4px solid $black-header;
+  margin-bottom: pxToRem(15);
+  border-bottom: pxToRem(4) solid $black-header;
 
   ul {
     margin: 0;
@@ -2147,8 +2148,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 
   a {
     display: block;
-    padding: 10px 15px;
-    padding-bottom: 15px;
+    padding: pxToRem(10) pxToRem(15);
+    padding-bottom: pxToRem(15);
     float: left;
     color: $black;
     text-align: center;
@@ -2156,8 +2157,8 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     text-transform: uppercase;
 
     @include screen-md-max {
-      padding: 8px 10px;
-      padding-bottom: 15px;
+      padding: pxToRem(8) pxToRem(10);
+      padding-bottom: pxToRem(15);
     }
 
     @include screen-sm-max {
@@ -2168,7 +2169,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   .active a {
     background: transparent image-url("icon-arrow-admin-subnav.png") no-repeat
       center 110%;
-    background-size: 24px 12px;
+    background-size: pxToRem(24) pxToRem(12);
     color: $blue-link-colour;
 
     @include is-retina {
diff --git a/app/assets/stylesheets/admin/date-time-picker.scss b/app/assets/stylesheets/admin/date-time-picker.scss
index b21e5dc513..81b86709f0 100644
--- a/app/assets/stylesheets/admin/date-time-picker.scss
+++ b/app/assets/stylesheets/admin/date-time-picker.scss
@@ -1,15 +1,16 @@
+@import "pxToRem";
 // Date/time Picker Inputs
 .datepicker,
 .timepicker {
   display: inline-block;
-  padding-left: 35px;
+  padding-left: pxToRem(35);
   background-repeat: no-repeat;
-  background-position: 7px 7px;
-  background-size: 18px 18px;
+  background-position: pxToRem(7) pxToRem(7);
+  background-size: pxToRem(18) pxToRem(18);
 }
 
 .datepicker {
-  width: 135px;
+  width: pxToRem(135);
   background-image: image-url("icon-date-picker.png");
 
   @include is-retina {
@@ -21,13 +22,13 @@
   }
 
   .lte-ie7 & {
-    width: 80px !important;
+    width: pxToRem(80) !important;
   }
 }
 
 .timepicker {
-  width: 95px;
-  margin-left: 10px;
+  width: pxToRem(95);
+  margin-left: pxToRem(10);
   background-image: image-url("icon-time-picker.png");
 
   @include is-retina {
@@ -36,7 +37,7 @@
 
   @include screen-sm-max {
     width: 100%;
-    margin-top: 10px;
+    margin-top: pxToRem(10);
     margin-left: 0;
   }
 
@@ -49,26 +50,26 @@
 .time-picker {
   display: none;
   position: absolute;
-  min-width: 95px;
-  max-height: 200px;
-  margin: 2px 0 0;
-  padding: 5px 0;
+  min-width: pxToRem(95);
+  max-height: pxToRem(200);
+  margin: pxToRem(2) 0 0;
+  padding: pxToRem(5) 0;
   float: left;
-  border: 1px solid $grey-light;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 4px;
+  border: pxToRem(1) solid $grey-light;
+  border: pxToRem(1) solid rgba(0, 0, 0, 0.15);
+  border-radius: pxToRem(4);
   background-color: $white-true;
-  font-size: 14px;
+  font-size: pxToRem(14);
   list-style: none;
   text-align: left;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow: 0 pxToRem(6) pxToRem(12) rgba(0, 0, 0, 0.175);
   overflow: auto;
   z-index: 99;
   background-clip: padding-box;
 
   li {
     display: block;
-    padding: 3px 20px;
+    padding: pxToRem(3) pxToRem(20);
     clear: both;
     cursor: pointer;
     color: $black;
@@ -99,18 +100,18 @@ body .ui-datepicker {
   top: 100%;
   left: 0;
   width: auto;
-  min-width: 160px;
-  margin: 2px 0 0;
-  padding: 4px;
+  min-width: pxToRem(160);
+  margin: pxToRem(2) 0 0;
+  padding: pxToRem(4);
   float: left;
-  border: 1px solid $grey-light;
-  border: 1px solid rgba(0, 0, 0, 0.15);
-  border-radius: 4px;
+  border: pxToRem(1) solid $grey-light;
+  border: pxToRem(1) solid rgba(0, 0, 0, 0.15);
+  border-radius: pxToRem(4);
   background-color: $white-true;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 14px;
+  font-size: pxToRem(14);
   list-style: none;
-  box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175);
+  box-shadow: 0 pxToRem(6) pxToRem(12) rgba(0, 0, 0, 0.175);
   z-index: 1000;
   background-clip: padding-box;
 
@@ -121,39 +122,39 @@ body .ui-datepicker {
 
   .ui-datepicker-prev,
   .ui-datepicker-next {
-    width: 30px;
-    height: 30px;
+    width: pxToRem(30);
+    height: pxToRem(30);
     border: none;
-    border-radius: 4px;
+    border-radius: pxToRem(4);
     text-align: center;
 
     &:hover {
-      top: 2px;
+      top: pxToRem(2);
       border: none;
       background: $grey-lightest;
     }
   }
 
   .ui-datepicker-prev:hover {
-    left: 2px;
+    left: pxToRem(2);
   }
 
   .ui-datepicker-next:hover {
-    right: 2px;
+    right: pxToRem(2);
   }
 
   .ui-datepicker-title {
-    width: 145px;
-    height: 30px;
-    margin: 0 35px;
+    width: pxToRem(145);
+    height: pxToRem(30);
+    margin: 0 pxToRem(35);
     border: none;
-    border-radius: 4px;
+    border-radius: pxToRem(4);
     text-align: center;
   }
 
   .ui-datepicker-calendar {
     .lte-ie7 & {
-      width: 200px !important;
+      width: pxToRem(200) !important;
     }
   }
 
@@ -163,11 +164,11 @@ body .ui-datepicker {
 
   th,
   td a {
-    width: 30px;
-    height: 30px;
-    padding: 5px;
+    width: pxToRem(30);
+    height: pxToRem(30);
+    padding: pxToRem(5);
     border: none;
-    border-radius: 4px;
+    border-radius: pxToRem(4);
     text-align: center;
   }
 
diff --git a/app/assets/stylesheets/admin/forms.scss b/app/assets/stylesheets/admin/forms.scss
index cdc5037979..bbd1437cf3 100644
--- a/app/assets/stylesheets/admin/forms.scss
+++ b/app/assets/stylesheets/admin/forms.scss
@@ -1,15 +1,17 @@
+@import "pxToRem";
+
 .selectable-group {
   input[type='checkbox'],
   input[type='radio'] {
     margin-left: 0;
-    top: 15px;
-    left: 15px;
+    top: pxToRem(15);
+    left: pxToRem(15);
     z-index: 999;
   }
 }
 
 .has-royal-family-connections-wrapper {
-  padding-left: 20px;
+  padding-left: pxToRem(20);
 }
 
 input.form-control, select.form-control,
diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 5eb5b0fb37..4b1b341586 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -1,4 +1,5 @@
 @import "mixins";
+@import "pxToRem";
 
 #site-header {
   -webkit-font-smoothing: antialiased;
@@ -6,35 +7,35 @@
   *z-index: 1000;
 
   @include screen-lg-max {
-    font-size: 14px;
+    font-size: pxToRem(14);
   }
 
   @include screen-md-max {
-    font-size: 13px;
+    font-size: pxToRem(13);
   }
 
   @include screen-sm-max {
-    font-size: 14px;
+    font-size: pxToRem(14);
   }
 
   .lte-ie8 & {
     background: $black-header;
     clear: both;
-    height: 70px;
-    margin-bottom: 40px !important;
+    height: pxToRem(70);
+    margin-bottom: pxToRem(40) !important;
   }
 
   .caret {
-    margin-left: 5px;
-    border-top-width: 7px;
-    border-right-width: 6px;
-    border-left-width: 6px;
+    margin-left: pxToRem(5);
+    border-top-width: pxToRem(7);
+    border-right-width: pxToRem(6);
+    border-left-width: pxToRem(6);
 
     @include screen-md-max {
-      margin-left: 3px;
-      border-top-width: 5px;
-      border-right-width: 4px;
-      border-left-width: 4px;
+      margin-left: pxToRem(3);
+      border-top-width: pxToRem(5);
+      border-right-width: pxToRem(4);
+      border-left-width: pxToRem(4);
     }
   }
 
@@ -52,8 +53,8 @@
   }
 
   .navbar-toggle {
-    margin-top: 16px;
-    margin-bottom: 16px;
+    margin-top: pxToRem(16);
+    margin-bottom: pxToRem(16);
 
     .icon-bar {
       background-color: $white-true;
@@ -67,7 +68,7 @@
   .navbar-collapse {
     .lte-ie8 & {
       display: block !important;
-      margin-left: 50px;
+      margin-left: pxToRem(50);
     }
 
     &.collapse {
@@ -79,13 +80,13 @@
   }
 
   .navbar {
-    margin-bottom: 40px;
+    margin-bottom: pxToRem(40);
     border: none;
     border-radius: 0;
     background: $black-header;
 
     .lte-ie7 & {
-      height: 81px !important;
+      height: pxToRem(81) !important;
       z-index: 100001 !important;
     }
 
@@ -100,20 +101,20 @@
 
     .navbar-nav > li > a,
     .navbar-nav > li > details {
-      padding-top: 24px;
-      padding-bottom: 23px;
+      padding-top: pxToRem(24);
+      padding-bottom: pxToRem(23);
       color: $white-true;
       text-transform: uppercase;
       background: transparent;
       text-decoration: none;
 
       @include screen-md-max {
-        padding-right: 8px;
-        padding-left: 8px;
+        padding-right: pxToRem(8);
+        padding-left: pxToRem(8);
       }
 
       @include screen-sm-max {
-        padding: 20px 15px;
+        padding: pxToRem(20) pxToRem(15);
       }
 
       > .dropdown-menu {
@@ -127,7 +128,7 @@
     .lte-ie8 & {
       float: left !important;
       position: relative;
-      top: -10px;
+      top: pxToRem(-10);
     }
 
     &.navbar-right {
@@ -138,7 +139,7 @@
   }
 
   .nav > li {
-    margin: 0 10px;
+    margin: 0 pxToRem(10);
 
     @include screen-lg-max {
       margin: 0;
@@ -159,14 +160,14 @@
     > a, > details {
       .lte-ie8 & {
         display: block !important;
-        padding-top: 26px !important;
-        padding-bottom: 26px !important;
+        padding-top: pxToRem(26) !important;
+        padding-bottom: pxToRem(26) !important;
         color: $white-true !important;
       }
 
       .lte-ie7 & {
-        padding-top: 30px !important;
-        padding-bottom: 30px !important;
+        padding-top: pxToRem(30) !important;
+        padding-bottom: pxToRem(30) !important;
       }
 
       &:hover,
@@ -187,14 +188,14 @@
     }
 
     > details {
-      padding: 0 10px;
+      padding: 0 pxToRem(10);
 
       &:focus-within {
         background-color: $govuk-highlight-yellow !important;
         color: $black !important;
         outline: none !important;
         border-bottom-color: $black !important;
-        border-bottom-width: 2px !important;
+        border-bottom-width: pxToRem(2) !important;
         border-bottom-style: solid !important;
 
         summary {
@@ -205,7 +206,7 @@
 
     &.active > a {
       background: transparent image-url("icon-arrow-admin-nav.png") no-repeat center bottom;
-      background-size: 24px 12px;
+      background-size: pxToRem(24) pxToRem(12);
 
       @include is-retina {
         background-image: image-url("icon-arrow-admin-nav@2.png");
@@ -233,7 +234,7 @@
     > li > span,
     > li > .button_to {
       display: block;
-      padding: 3px 20px;
+      padding: pxToRem(3) pxToRem(20);
       clear: both;
       font-weight: normal;
       line-height: 1.42857143;
@@ -249,15 +250,15 @@
     > li > span,
     > li > .button_to > input[type="submit"] {
       @include screen-sm-max {
-        padding: 15px;
-        padding-left: 35px;
+        padding: pxToRem(15);
+        padding-left: pxToRem(35);
         color: $white-true;
         text-transform: uppercase;
         text-align: left;
       }
 
       .lte-ie8 & {
-        padding: 7px 10px !important;
+        padding: pxToRem(7) pxToRem(10) !important;
         color: $black !important;
       }
     }
@@ -287,7 +288,7 @@
         text-decoration: underline;
 
         .lte-ie7 & {
-          font-size: 16px;
+          font-size: pxToRem(16);
         }
       }
 
@@ -305,11 +306,11 @@
 
   // moving down here seems to make it work
   .navbar-brand {
-    padding: 14px;
+    padding: pxToRem(14);
     height: 100%;
     img {
-      width: 28px;
-      height: 33px;
+      width: pxToRem(28);
+      height: pxToRem(33);
     }
   }
 }
diff --git a/app/assets/stylesheets/admin/layout.scss b/app/assets/stylesheets/admin/layout.scss
index b492a89f2e..b6c00a6148 100644
--- a/app/assets/stylesheets/admin/layout.scss
+++ b/app/assets/stylesheets/admin/layout.scss
@@ -1,6 +1,8 @@
 @import "mixins";
-$footer-height: 60px;
-$footer-height-sm: 30px;
+@import "pxToRem";
+
+$footer-height: pxToRem(60);
+$footer-height-sm: pxToRem(30);
 
 html,
 body,
@@ -56,7 +58,7 @@ body {
   font-weight: bold;
   color: #fff;
   position: relative;
-  top: -40px;
+  top: pxToRem(-40);
 }
 
 .dev-banner {
@@ -69,7 +71,7 @@ body {
 
 .admin-assessor-js-status-banner {
   position: relative;
-  top: -40px;
+  top: pxToRem(-40);
   padding: 0.5em;
   text-align: center;
   background-color: #fff2d3;
@@ -78,15 +80,15 @@ body {
 
 .container {
   .lte-ie8 & {
-    max-width: 1170px;
+    max-width: pxToRem(1170);
   }
 }
 
 .row {
   .lte-ie8 & {
     display: block;
-    margin-right: -15px;
-    margin-left: -15px;
+    margin-right: pxToRem(-15);
+    margin-left: pxToRem(-15);
     clear: both;
   }
 
@@ -111,9 +113,9 @@ body {
   .lte-ie8 & {
     float: left;
     position: relative;
-    min-height: 1px;
-    padding-right: 15px;
-    padding-left: 15px;
+    min-height: pxToRem(1);
+    padding-right: pxToRem(15);
+    padding-left: pxToRem(15);
   }
 
   .lte-ie7 & {
diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 9598f9530f..587ac2c7b1 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -1,17 +1,18 @@
 @import "mixins";
+@import "pxToRem";
 
 .panel-subtitle-small {
-  margin-bottom: 5px;
+  margin-bottom: pxToRem(5);
 }
 
 .applications-filter {
-  margin-bottom: 20px;
+  margin-bottom: pxToRem(20);
 
   .applications-filter__label, .search-input__label {
     display: block;
     text-transform: uppercase;
-    padding-right: 10px;
-    padding-top: 7px;
+    padding-right: pxToRem(10);
+    padding-top: pxToRem(7);
 
     @include screen-md-max {
       text-align: left;
@@ -19,14 +20,14 @@
 
     @include screen-sm-max {
       min-width: 0;
-      padding-right: 20px;
+      padding-right: pxToRem(20);
     }
   }
 
   .dropdown {
     position: relative;
     display: inline-block;
-    padding-right: 28px;
+    padding-right: pxToRem(28);
     width: 100%;
     vertical-align: bottom;
 
@@ -35,7 +36,7 @@
       overflow: hidden;
       max-width: 100%;
       text-overflow: ellipsis;
-      line-height: 19px;
+      line-height: pxToRem(19);
     }
 
     .caret-container {
@@ -44,9 +45,9 @@
       right: 0;
       bottom: 0;
       left: auto;
-      padding-right: 10px;
-      padding-left: 10px;
-      border-left: 1px solid #262626;
+      padding-right: pxToRem(10);
+      padding-left: pxToRem(10);
+      border-left: pxToRem(1) solid #262626;
       background: #1c1c1b;
 
       .caret {
@@ -56,22 +57,22 @@
     }
 
     .dropdown-menu {
-      min-width: 250px;
+      min-width: pxToRem(250);
       border-color: #666666;
 
       li.checkbox,
       li.apply {
-        padding: 0 10px;
+        padding: 0 pxToRem(10);
       }
     }
   }
 }
 
 .search-text {
-  margin-bottom: 30px;
-  padding: 10px 15px;
+  margin-bottom: pxToRem(30);
+  padding: pxToRem(10) pxToRem(15);
   background-color: $grey-lighter;
-  font-size: 18px;
+  font-size: pxToRem(18);
   font-style: italic;
 
   p {
@@ -86,8 +87,8 @@
 .applications-table,
 .admin-table {
   > tbody > tr > td {
-    padding-top: 13px;
-    padding-bottom: 12px;
+    padding-top: pxToRem(13);
+    padding-bottom: pxToRem(12);
     a:not(.link-edit-user) {
       color: $blue-link-colour;
     }
@@ -99,7 +100,7 @@
   }
 
   > tbody > tr:first-child > td {
-    padding-top: 16px;
+    padding-top: pxToRem(16);
   }
 }
 
@@ -124,9 +125,9 @@
 }
 
 .nav-tabs.submitted-tabs {
-  margin-bottom: 20px;
+  margin-bottom: pxToRem(20);
   border-bottom: none;
-  font-size: 11px;
+  font-size: pxToRem(11);
 
   .no-js & {
     display: none;
@@ -135,18 +136,18 @@
   > li {
     > a {
       margin: 0;
-      margin-left: 5px;
+      margin-left: pxToRem(5);
 
       &,
       &:focus {
-        padding: 3px 10px;
-        border: 2px solid $grey-tab;
-        border-radius: 100px;
+        padding: pxToRem(3) pxToRem(10);
+        border: pxToRem(2) solid $grey-tab;
+        border-radius: pxToRem(100);
         color: $grey-tab;
       }
 
       &:hover {
-        border: 2px solid $grey-tab-hover;
+        border: pxToRem(2) solid $grey-tab-hover;
         background: transparent;
         color: $grey-tab-hover;
       }
@@ -157,12 +158,12 @@
       position: absolute;
       bottom: 0;
       left: 50%;
-      width: 8px;
-      height: 4px;
-      margin-bottom: -6px;
-      margin-left: -4px;
+      width: pxToRem(8);
+      height: pxToRem(4);
+      margin-bottom: pxToRem(-6);
+      margin-left: pxToRem(-4);
       background-image: image-url("icon-arrow-tab.png");
-      background-size: 8px 4px;
+      background-size: pxToRem(8) pxToRem(4);
 
       @include is-retina {
         background-image: image-url("icon-arrow-tab@2.png");
@@ -175,7 +176,7 @@
       &,
       &:hover,
       &:focus {
-        border: 2px solid #666;
+        border: pxToRem(2) solid #666;
         color: #666;
       }
     }
@@ -188,7 +189,7 @@
 
 .no-js .tab-content > .tab-pane {
   display: block;
-  margin-bottom: 30px;
+  margin-bottom: pxToRem(30);
   visibility: visible;
 
   &:last-child {
@@ -198,7 +199,7 @@
 
 .tab-header {
   display: none;
-  margin-bottom: 15px;
+  margin-bottom: pxToRem(15);
 
   .no-js & {
     display: block;
@@ -207,12 +208,12 @@
 
 .label-small {
   display: block;
-  font-size: 14px;
+  font-size: pxToRem(14);
   text-align: left;
 }
 
 .good-services-list li {
-  margin-bottom: 20px;
+  margin-bottom: pxToRem(20);
 
   &:last-child {
     margin-bottom: 0;
@@ -223,19 +224,19 @@
   display: none;
   color: gray;
   font-style: italic;
-  font-size: 14px;
-  margin-bottom: 10px;
+  font-size: pxToRem(14);
+  margin-bottom: pxToRem(10);
 }
 
 .inline-form-view {
-  margin-top: 15px;
+  margin-top: pxToRem(15);
 
   .form-control {
-    margin-bottom: 5px;
+    margin-bottom: pxToRem(5);
   }
 
   .form-group .row {
-    margin-bottom: 10px;
+    margin-bottom: pxToRem(10);
   }
 
   .no-js & {
@@ -256,7 +257,7 @@
 
     .control-label {
       display: block;
-      font-size: 14px;
+      font-size: pxToRem(14);
       text-align: left;
     }
 
@@ -264,17 +265,17 @@
     .form-fields,
     .char-count {
       display: none;
-      min-width: 100px;
+      min-width: pxToRem(100);
     }
 
     .form-control-day,
     .form-control-month,
     .form-control-year {
-      margin-right: 10px;
+      margin-right: pxToRem(10);
       float: left;
 
       .form-control {
-        width: 50px;
+        width: pxToRem(50);
         text-align: center;
       }
     }
@@ -282,13 +283,13 @@
     .form-control-day,
     .form-control-month {
       .form-control {
-        min-width: 50px;
+        min-width: pxToRem(50);
       }
     }
 
     .form-control-year {
       .form-control {
-        min-width: 70px;
+        min-width: pxToRem(70);
       }
     }
 
@@ -325,7 +326,7 @@
 }
 
 .form-container {
-  padding: 10px;
+  padding: pxToRem(10);
   background: $grey-lighter;
 
   .char-count.char-max-shift {
@@ -334,7 +335,7 @@
 }
 
 .form-group-multiple-parent {
-  margin-bottom: 15px;
+  margin-bottom: pxToRem(15);
 
   &:last-child {
     margin-bottom: 0;
@@ -362,25 +363,25 @@
 }
 
 .form-edit-link {
-  margin-top: 10px;
+  margin-top: pxToRem(10);
   color: $black;
-  font-size: 16px;
+  font-size: pxToRem(16);
 
   .glyphicon {
-    margin-right: 5px;
-    font-size: 12px;
+    margin-right: pxToRem(5);
+    font-size: pxToRem(12);
   }
 }
 
 .show-sidebar {
   .form-save-button,
   .form-save-link {
-    margin-top: 10px;
+    margin-top: pxToRem(10);
   }
 
   ul.other-applications-list {
     li {
-      margin-bottom: 20px;
+      margin-bottom: pxToRem(20);
     }
   }
 }
@@ -393,22 +394,22 @@
 
   h2 {
     margin-top: 0;
-    margin-bottom: 10px;
-    font-size: 24px;
+    margin-bottom: pxToRem(10);
+    font-size: pxToRem(24);
     font-weight: normal;
     text-transform: none;
   }
 
   p {
-    font-size: 18px;
+    font-size: pxToRem(18);
 
     @include screen-md-max {
-      font-size: 16px;
+      font-size: pxToRem(16);
     }
   }
 
   .btn {
-    margin-top: 20px;
+    margin-top: pxToRem(20);
   }
 }
 
@@ -416,35 +417,35 @@
 
   h2,
   p {
-    margin-bottom: 5px;
+    margin-bottom: pxToRem(5);
   }
 
   p {
-    font-size: 15px;
+    font-size: pxToRem(15);
 
     &.p-lg {
-      font-size: 20px;
+      font-size: pxToRem(20);
     }
   }
 
   .btn-group {
     display: block;
-    margin-bottom: 5px;
+    margin-bottom: pxToRem(5);
   }
 
   .dropdown-toggle {
     display: inline-block;
     padding: 0;
-    padding-right: 20px;
+    padding-right: pxToRem(20);
     float: none;
     color: $black;
-    font-size: 20px;
+    font-size: pxToRem(20);
     text-align: left;
     text-decoration: none;
     background-image: image-url("icon-arrow-admin-dropdown-down.png");
     background-repeat: no-repeat;
     background-position: right center;
-    background-size: 12px 9px;
+    background-size: pxToRem(12) pxToRem(9);
 
     @include is-retina {
       background-image: image-url("icon-arrow-admin-dropdown-down@2.png");
@@ -497,7 +498,7 @@
 
   li {
     position: relative;
-    margin-bottom: 20px;
+    margin-bottom: pxToRem(20);
     clear: both;
 
     &:last-child {
@@ -507,7 +508,7 @@
 
   label {
     display: block;
-    font-size: 14px;
+    font-size: pxToRem(14);
     font-weight: bold;
     text-transform: uppercase;
   }
@@ -522,7 +523,7 @@
 
     @include screen-md-max {
       width: auto;
-      margin-left: 120px;
+      margin-left: pxToRem(120);
     }
   }
 
@@ -539,15 +540,15 @@
     top: 0;
     right: 0;
     margin-top: 0;
-    font-size: 14px;
+    font-size: pxToRem(14);
 
     .lte-ie7 & {
-      margin-top: -20px;
+      margin-top: pxToRem(-20);
     }
   }
 
   .form-save-button {
-    margin-bottom: 10px;
+    margin-bottom: pxToRem(10);
     float: right;
     clear: both;
   }
@@ -560,7 +561,7 @@
 }
 
 .centered {
-  padding-left: 25px;
+  padding-left: pxToRem(25);
 }
 
 .audit-cert-no-change-val,
@@ -585,13 +586,13 @@
 }
 
 .form-group .list-attendees li .row {
-  margin-bottom: 20px;
+  margin-bottom: pxToRem(20);
 }
 
 .bulk-assign-assessors-link {
   position: relative;
-  left: -9999px;
-  margin-top: 10px;
+  left: pxToRem(-9999);
+  margin-top: pxToRem(10);
   background-color: $blue-link-colour;
   color: white;
 
@@ -613,9 +614,9 @@
 }
 
 .bulk-assign-assessors-form {
-  max-width: 755px;
-  margin-top: 25px;
-  margin-bottom: 10px;
+  max-width: pxToRem(755);
+  margin-top: pxToRem(25);
+  margin-bottom: pxToRem(10);
 
   .js & {
     display: none;
@@ -628,7 +629,7 @@
   }
 
   h2 {
-    font-size: 18px;
+    font-size: pxToRem(18);
     font-weight: bold;
     line-height: 1.5;
   }
@@ -642,7 +643,7 @@
   }
 
   .btn {
-    margin-left: 10px;
+    margin-left: pxToRem(10);
   }
 
   .well {
@@ -672,7 +673,7 @@
   zoom: 1;
 
   .form-group {
-    margin-top: 15px;
+    margin-top: pxToRem(15);
 
     .form-control {
       display: block;
diff --git a/app/assets/stylesheets/admin/page-custom-emails.scss b/app/assets/stylesheets/admin/page-custom-emails.scss
index 0e534cae6f..20363b445a 100644
--- a/app/assets/stylesheets/admin/page-custom-emails.scss
+++ b/app/assets/stylesheets/admin/page-custom-emails.scss
@@ -1,3 +1,5 @@
+@import "pxToRem";
+
 .email-send-to,
 .email-send-subject {
   h3 {
@@ -6,11 +8,11 @@
 }
 
 .email-send-to {
-  margin-top: 40px;
+  margin-top: pxToRem(40);
 }
 
 .email-send-subject {
-  margin-top: 20px;
+  margin-top: pxToRem(20);
 }
 
 .email-send-to-help {
diff --git a/app/assets/stylesheets/admin/page-dashboard.scss b/app/assets/stylesheets/admin/page-dashboard.scss
index 5b3ac884eb..15e681dc49 100644
--- a/app/assets/stylesheets/admin/page-dashboard.scss
+++ b/app/assets/stylesheets/admin/page-dashboard.scss
@@ -1,6 +1,4 @@
-.dashboard {
-
-}
+@import "pxToRem";
 
 .download-link {
   display: inline-block;
@@ -11,8 +9,8 @@
   &:before {
     content: " ";
     display: block;
-    width: 18px;
-    height: 16px;
+    width: pxToRem(18);
+    height: pxToRem(16);
     background-image: image-url("icon_download.svg");
     background-repeat: no-repeat;
     background-size: 100% auto;
@@ -20,7 +18,7 @@
 
     position: absolute;
     left: 0;
-    top: 2px;
+    top: pxToRem(2);
   }
 }
 
@@ -32,11 +30,11 @@
     .award-year-label {
       text-transform: none !important;
       display: block;
-      margin-bottom: 10px;
+      margin-bottom: pxToRem(10);
       position: static;
       font-weight: normal;
       margin-top: 0;
-      font-size: 18px;
+      font-size: pxToRem(18);
     }
 
     .award-year-dropdown {
@@ -48,7 +46,7 @@
     margin-top: 2em;
     color: $blue-link-colour;
 
-    @media (min-width: 992px) {
+    @media (min-width: pxToRem(992)) {
       margin-top: 0;
       position: absolute !important;
       top: 1.5em;
@@ -75,7 +73,7 @@
 
 .dashboard__section {
   padding: 2em 0;
-  border-top: 2px solid #ccc;
+  border-top: pxToRem(2) solid #ccc;
   position: relative;
 
 }
@@ -89,8 +87,8 @@
       content: " ";
       display: block;
       position: absolute;
-      top: 9px;
-      left: 10px;
+      top: pxToRem(9);
+      left: pxToRem(10);
       background-size: 1em auto;
       background-repeat: no-repeat;
       background-position: center;
@@ -98,7 +96,7 @@
       height: 1em;
     }
 
-    @media (min-width: 768px) {
+    @media (min-width: pxToRem(768)) {
       position: absolute;
       right: 0;
       top: 3em;
@@ -135,7 +133,7 @@
         background-size: 1.15em auto;
         width: 1.2em;
         height: 1.5em;
-        top: 7px;
+        top: pxToRem(7);
       }
 
       &:focus:before {
@@ -171,22 +169,22 @@
       position: relative;
       font-weight: bold;
 
-      @media (min-width: 768px) {
-        padding-right: 200px;
+      @media (min-width: pxToRem(768)) {
+        padding-right: pxToRem(200);
       }
 
       &:before {
         content: " ";
         display: block;
-        width: 23px;
-        height: 23px;
+        width: pxToRem(23);
+        height: pxToRem(23);
         background-image: image-url("icon_warning.svg");
         background-size: 100% auto;
         background-position: center;
         background-repeat: no-repeat;
         position: absolute;
         left: 0;
-        top: -1px;
+        top: pxToRem(-1);
       }
     }
   }
@@ -203,7 +201,7 @@
     }
 
     &.border-right {
-      border-right: 2px solid black;
+      border-right: pxToRem(2) solid black;
     }
   }
 
@@ -222,7 +220,7 @@
   tbody {
     th {
       padding: 0.5em 1em;
-      border-right: 2px solid black;
+      border-right: pxToRem(2) solid black;
       font-weight: normal;
     }
     td {
@@ -238,11 +236,11 @@
 }
 
 .dashboard-table--small {
-  font-size: 14px;
+  font-size: pxToRem(14);
 
   th {
-    font-size: 12px;
-    padding: 1em 3px !important;
+    font-size: pxToRem(12);
+    padding: 1em pxToRem(3) !important;
   }
 
   td {
@@ -250,12 +248,12 @@
   }
 
   thead tr:first-of-type th {
-    padding-top: 2px !important;
+    padding-top: pxToRem(2) !important;
   }
 }
 
 .dashboard-table__wrapper {
-  @media (max-width: 1199px) {
+  @media (max-width: pxToRem(1199)) {
     overflow-x: scroll;
   }
 }
@@ -268,7 +266,7 @@
 
   .downloads-page__section {
     h2 {
-      font-size: 24px;
+      font-size: pxToRem(24);
       font-weight: bold;
       color: black;
     }
@@ -282,13 +280,13 @@
     li {
       padding: 1.2em 0 1.2em 1.5em;
       position: relative;
-      border-bottom: 1px solid #ccc;
+      border-bottom: pxToRem(1) solid #ccc;
 
       &:before {
         content: " ";
         display: block;
-        width: 11px;
-        height: 20px;
+        width: pxToRem(11);
+        height: pxToRem(20);
         background-image: image-url("icon_file.svg");
         background-repeat: no-repeat;
         background-size: 100% auto;
@@ -304,7 +302,7 @@
         margin-top: 1.5em;
         color: $blue-link-colour;
 
-        @media (min-width: 992px) {
+        @media (min-width: pxToRem(992)) {
           margin-top: 0;
           position: absolute;
           top: 1.2em;
@@ -316,19 +314,19 @@
         color: black;
         font-size: 1.11111em;
 
-        @media (min-width: 992px) {
-          margin-right: 200px;
+        @media (min-width: pxToRem(992)) {
+          margin-right: pxToRem(200);
         }
       }
 
       .download-item__description {
         font-size: 1.11111em;
-        max-width: 700px;
+        max-width: pxToRem(700);
         margin-bottom: 0;
         color: $grey-panel-dark;
 
-        @media (min-width: 992px) {
-          margin-right: 200px;
+        @media (min-width: pxToRem(992)) {
+          margin-right: pxToRem(200);
         }
       }
     }
diff --git a/app/assets/stylesheets/admin/page-feedback.scss b/app/assets/stylesheets/admin/page-feedback.scss
index ef510af404..e53e687d87 100644
--- a/app/assets/stylesheets/admin/page-feedback.scss
+++ b/app/assets/stylesheets/admin/page-feedback.scss
@@ -1,10 +1,12 @@
+@import "pxToRem";
+
 .feedback-stars {
   white-space: nowrap;
 }
 
 .feedback-description,
 .feedback-table .read-more-container {
-  font-size: 14px;
+  font-size: pxToRem(14);
 }
 
 .read-more-container {
diff --git a/app/assets/stylesheets/admin/page-settings.scss b/app/assets/stylesheets/admin/page-settings.scss
index 9d24b6e12f..12781189fb 100644
--- a/app/assets/stylesheets/admin/page-settings.scss
+++ b/app/assets/stylesheets/admin/page-settings.scss
@@ -1,10 +1,12 @@
+@import "pxToRem";
+
 .settings-page {
   .panel-body ul {
     margin: 0;
     padding-left: 1.25em;
 
     li {
-      margin-bottom: 10px;
+      margin-bottom: pxToRem(10);
 
       &:last-child {
         margin-bottom: 0;
@@ -13,8 +15,8 @@
   }
 
   .panel-section {
-    padding: 15px 0;
-    border-bottom: 1px solid $grey;
+    padding: pxToRem(15) 0;
+    border-bottom: pxToRem(1) solid $grey;
 
     &:first-child {
       padding-top: 0;
@@ -33,7 +35,7 @@
     @include screen-sm-max {
       display: inline;
       width: auto;
-      margin-right: 10px;
+      margin-right: pxToRem(10);
     }
   }
 
@@ -42,13 +44,13 @@
   }
 
   .edit-deadline {
-    margin-right: 10px;
+    margin-right: pxToRem(10);
     color: $blue-link-colour;
     text-decoration: underline;
   }
 
   .email-notification-help {
-    margin-left: 10px;
+    margin-left: pxToRem(10);
   }
 
   .deadline-help, .email-notification-help {
@@ -58,10 +60,10 @@
 
     .help-message {
       position: absolute;
-      top: -13px;
+      top: pxToRem(-13);
       left: 0;
-      width: 15px;
-      height: 15px;
+      width: pxToRem(15);
+      height: pxToRem(15);
       display: inline-block;
 
       &:hover .help-message-text {
@@ -71,21 +73,21 @@
       .help-message-text {
         position: absolute;
         z-index: 1;
-        top: -5px;
+        top: pxToRem(-5);
         left: 105%;
         visibility: hidden;
         background-color: #fff;
         text-align: center;
-        padding: 5px;
-        width: 300px;
-        border: 1px solid #ccc;
-        border-radius: 6px;
+        padding: pxToRem(5);
+        width: pxToRem(300);
+        border: pxToRem(1) solid #ccc;
+        border-radius: pxToRem(6);
       }
     }
   }
 
   .btn-add-schedule {
-    margin: 20px 0;
+    margin: pxToRem(20) 0;
   }
 
   .link-email-example {
@@ -95,8 +97,8 @@
 
   .well {
     display: block;
-    max-width: 440px;
-    margin: 20px 0;
+    max-width: pxToRem(440);
+    margin: pxToRem(20) 0;
     background-color: $white-true;
     box-shadow: none;
 
@@ -126,7 +128,7 @@
     }
 
     .control-date {
-      margin-right: 20px;
+      margin-right: pxToRem(20);
 
       @include screen-sm-max {
         margin-right: 0;
@@ -138,7 +140,7 @@
     }
 
     .control-hint {
-      margin-bottom: 10px;
+      margin-bottom: pxToRem(10);
       display: inline-block;
     }
 
@@ -156,7 +158,7 @@
       }
 
       &:first-child {
-        margin-right: 10px;
+        margin-right: pxToRem(10);
 
         @include screen-sm-max {
           margin-right: 0;
@@ -166,14 +168,14 @@
 
     .btn-submit {
       @include screen-sm-max {
-        margin-bottom: 45px;
+        margin-bottom: pxToRem(45);
       }
     }
 
     .btn-cancel {
       @include screen-sm-max {
         position: absolute;
-        top: 45px;
+        top: pxToRem(45);
       }
     }
   }
@@ -204,14 +206,14 @@
         border: none;
 
         .lte-ie7 & {
-          font-size: 16px;
+          font-size: pxToRem(16);
         }
       }
     }
   }
 
   .deadline-form-wrapper {
-    @media (min-width: 768px) {
+    @media (min-width: pxToRem(768)) {
       &:after {
         clear: both;
         content: " ";
diff --git a/app/assets/stylesheets/admin/page-users.scss b/app/assets/stylesheets/admin/page-users.scss
index cac748aa09..12da9e6c8c 100644
--- a/app/assets/stylesheets/admin/page-users.scss
+++ b/app/assets/stylesheets/admin/page-users.scss
@@ -1,3 +1,5 @@
+@import "pxToRem";
+
 .form-collaborator {
   .well {
     display: none;
@@ -34,11 +36,11 @@
 }
 
 .js-admin-search-collaborators-error-box {
-  margin-bottom: 10px;
+  margin-bottom: pxToRem(10);
 }
 
 .js-admin-search-collaborators-results-box {
-  margin-bottom: 20px;
+  margin-bottom: pxToRem(20);
 }
 
 .cant_add_to_collaborators_message {
@@ -46,26 +48,26 @@
 }
 
 .admin-user-debounce-api-check-block {
-  padding-left: 25px;
-  font-size: 14px;
+  padding-left: pxToRem(25);
+  font-size: pxToRem(14);
 
   .heading-message {
-    margin-bottom: 5px; 
+    margin-bottom: pxToRem(5);
     display: inline-block;
   }
 
   img {
-    width: 20px;
-    height: 20px;
-    margin-right: 10px;
+    width: pxToRem(20);
+    height: pxToRem(20);
+    margin-right: pxToRem(10);
   }
 
   .next-run-info {
-    margin-top: 7px;
+    margin-top: pxToRem(7);
     display: inline-block;
   }
 
   a {
-    margin-top: 7px;
+    margin-top: pxToRem(7);
   }
-}
\ No newline at end of file
+}

From a84c0926aa0f1ffd970b879c442b79617944ac1a Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 21 Aug 2023 10:36:44 +0100
Subject: [PATCH 259/352] Updates bootstrap-sass

---
 Gemfile      |  2 +-
 Gemfile.lock | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index bdce10c4aa..e110ad5129 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'paper_trail-association_tracking'
 # Assets & Templates
 gem 'sprockets', '~> 3.7.2'
 gem 'sprockets-rails', '>= 2.0.0'
-gem 'sassc-rails', '~> 2.0.0'
+gem 'sassc-rails', '~> 2.1.2'
 gem 'slim-rails', '~> 3.2.0'
 gem 'coffee-rails', '5.0'
 gem 'jquery-rails', '4.4.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 34c9293b32..24a953112a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -339,6 +339,7 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2023.0218.1)
     mini_mime (1.1.2)
+    mini_portile2 (2.8.4)
     minitest (5.18.1)
     money (6.16.0)
       i18n (>= 0.6.4, <= 2)
@@ -360,6 +361,9 @@ GEM
       activerecord (>= 4.0.0)
       activesupport (>= 4.0.0)
     nio4r (2.5.9)
+    nokogiri (1.15.3)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.15.3-arm64-darwin)
       racc (~> 1.4)
     nokogiri (1.15.3-x86_64-darwin)
@@ -569,7 +573,7 @@ GEM
       nokogiri (>= 1.12.0)
     sassc (2.4.0)
       ffi (~> 1.9)
-    sassc-rails (2.0.0)
+    sassc-rails (2.1.2)
       railties (>= 4.0.0)
       sassc (>= 2.0)
       sprockets (> 3.0)
@@ -684,9 +688,9 @@ GEM
     zxcvbn (0.1.9)
 
 PLATFORMS
-  ruby
   arm64-darwin-21
   arm64-darwin-22
+  ruby
   x86_64-darwin-21
   x86_64-darwin-22
   x86_64-linux
@@ -769,7 +773,7 @@ DEPENDENCIES
   rubocop (~> 0.52)
   rubyXL (~> 3.4)
   sanitize
-  sassc-rails (~> 2.0.0)
+  sassc-rails (~> 2.1.2)
   selenium-webdriver
   shog
   shoulda-matchers

From f832a3e0fdec0e2f4fd6eab6f35552cf8054cc1b Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 21 Aug 2023 10:50:35 +0100
Subject: [PATCH 260/352] Places radio buttons on press summary page within a
 fieldset

---
 app/views/users/press_summaries/show.html.slim | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/views/users/press_summaries/show.html.slim b/app/views/users/press_summaries/show.html.slim
index f348d0fce2..da460630b9 100644
--- a/app/views/users/press_summaries/show.html.slim
+++ b/app/views/users/press_summaries/show.html.slim
@@ -30,10 +30,13 @@ div
           .question-block.sub-question.js-press-comment-correct
             ul.errors-container
             .clear
-            .question-group
-              = f.input :correct, as: :radio_buttons, label: 'Do you have any comments on the Press Book Notes or organisation details?', item_wrapper_class: 'govuk-radios__item', wrapper_class: 'govuk-radios govuk-radios--inline', label_html: { class: 'govuk-label--s govuk-!-font-weight-regular' }
-              span.clear
-
+            .govuk-form-group.question-group
+              fieldset.govuk-fieldset
+                legend.govuk-fieldset__legend
+                  | Do you have any comments on the Press Book Notes or organisation details?
+                .govuk-error-message
+                = f.input :correct, label: false, as: :radio_buttons, item_wrapper_class: 'govuk-radios__item', wrapper_class: 'govuk-radios govuk-radios--inline', label_html: { class: 'govuk-label--s govuk-!-font-weight-regular' }
+                span.clear
           br
 
           .question-block.regular-question.js-press-comment-feeback

From 8bd2ca9f60582eddd7761416296afd922ee2e2fd Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 21 Aug 2023 11:36:09 +0100
Subject: [PATCH 261/352] Toggle textarea visibility depending on radio button
 answer

---
 app/assets/javascripts/application.js.coffee   | 6 ++++++
 app/views/users/press_summaries/show.html.slim | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 7835f2cd1a..e3fca07dde 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -262,6 +262,12 @@ jQuery ->
   $(".js-conditional-drop-answer input").change () ->
     dropConditionalQuestion($(this))
 
+  $('[name="press_summary[correct]"]').on 'change', ->
+    if ($(this).val() == 'true')
+      $("#press-summary-comment-textarea-container").removeClass("if-js-hide")
+    else
+      $("#press-summary-comment-textarea-container").addClass("if-js-hide")
+
   # Get the latest financial year date from input
   updateYearEndInput = () ->
     fy_latest_changed_input = $(".js-financial-year-changed-dates .fy-latest .govuk-date-input")
diff --git a/app/views/users/press_summaries/show.html.slim b/app/views/users/press_summaries/show.html.slim
index da460630b9..43e4d24d7f 100644
--- a/app/views/users/press_summaries/show.html.slim
+++ b/app/views/users/press_summaries/show.html.slim
@@ -39,7 +39,7 @@ div
                 span.clear
           br
 
-          .question-block.regular-question.js-press-comment-feeback
+          .question-block.regular-question.js-press-comment-feeback.if-js-hide#press-summary-comment-textarea-container
             .question-group
               = f.input :comment, as: :text, label: "How are the Press Book Notes and/or organisation details factually incorrect", input_html: { class: "js-char-count", rows: "5", data: { word_max: "300" } }
               .clear

From f0baa8a43c3b4f88ce0e42c00305b0092393a7b2 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 21 Aug 2023 11:38:46 +0100
Subject: [PATCH 262/352] Correct copy

---
 app/views/users/press_summaries/show.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/press_summaries/show.html.slim b/app/views/users/press_summaries/show.html.slim
index 43e4d24d7f..dd4da03aaa 100644
--- a/app/views/users/press_summaries/show.html.slim
+++ b/app/views/users/press_summaries/show.html.slim
@@ -41,7 +41,7 @@ div
 
           .question-block.regular-question.js-press-comment-feeback.if-js-hide#press-summary-comment-textarea-container
             .question-group
-              = f.input :comment, as: :text, label: "How are the Press Book Notes and/or organisation details factually incorrect", input_html: { class: "js-char-count", rows: "5", data: { word_max: "300" } }
+              = f.input :comment, as: :text, label: "How are the Press Book Notes and/or organisation details factually incorrect?", input_html: { class: "js-char-count", rows: "5", data: { word_max: "300" } }
               .clear
 
           br

From bbb52658e72f278b618251259b6d12ffbf84c35e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 22 Aug 2023 09:56:50 +0100
Subject: [PATCH 263/352] Styling changes to accommodate very large font size

---
 app/assets/stylesheets/admin/base.scss         |  5 +++++
 .../stylesheets/admin/bootstrap-overrides.scss | 18 ++++++++++++++++++
 .../stylesheets/admin/header-footer.scss       |  2 +-
 .../stylesheets/admin/page-applications.scss   |  7 +++----
 .../stylesheets/admin/page-dashboard.scss      |  5 -----
 app/assets/stylesheets/application-admin.scss  |  1 +
 .../_vertical_admin_award_year.html.slim       |  2 +-
 7 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 app/assets/stylesheets/admin/bootstrap-overrides.scss

diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index e334a4ce8c..9ced5274b9 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -2002,6 +2002,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
   .award-year-dropdown {
     max-width: pxToRem(142);
     margin-left: pxToRem(120);
+    margin: 0 !important;
   }
 
   &.award-year--vertical {
@@ -2130,6 +2131,10 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     margin: 0;
     padding: 0;
     list-style: none;
+    display: flex;
+    @include screen-sm-max {
+      display: block;
+    }
   }
 
   li {
diff --git a/app/assets/stylesheets/admin/bootstrap-overrides.scss b/app/assets/stylesheets/admin/bootstrap-overrides.scss
new file mode 100644
index 0000000000..472b85c36b
--- /dev/null
+++ b/app/assets/stylesheets/admin/bootstrap-overrides.scss
@@ -0,0 +1,18 @@
+html { font-size: 100% }
+body { font-size: inherit !important; }
+
+.btn {
+  font-size: 1rem;
+}
+
+.form-control {
+  font-size: 1rem
+}
+
+.dropdown-menu {
+  font-size: 1rem;
+}
+
+.navbar-nav {
+  display: flex;
+}
diff --git a/app/assets/stylesheets/admin/header-footer.scss b/app/assets/stylesheets/admin/header-footer.scss
index 4b1b341586..1f5c0ee7a8 100644
--- a/app/assets/stylesheets/admin/header-footer.scss
+++ b/app/assets/stylesheets/admin/header-footer.scss
@@ -139,7 +139,7 @@
   }
 
   .nav > li {
-    margin: 0 pxToRem(10);
+    margin: 0 10px;
 
     @include screen-lg-max {
       margin: 0;
diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 587ac2c7b1..79a82acbdf 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -461,12 +461,11 @@
   }
 
   .state-container {
-    position: relative;
+    display: flex;
+    justify-content: space-between;
 
     h2 {
-      position: absolute;
-      top: 0.4em;
-      left: 0;
+      margin-top: 0.35rem;
 
       @include screen-lg-max {
         position: static;
diff --git a/app/assets/stylesheets/admin/page-dashboard.scss b/app/assets/stylesheets/admin/page-dashboard.scss
index 15e681dc49..3c6a65a869 100644
--- a/app/assets/stylesheets/admin/page-dashboard.scss
+++ b/app/assets/stylesheets/admin/page-dashboard.scss
@@ -36,10 +36,6 @@
       margin-top: 0;
       font-size: pxToRem(18);
     }
-
-    .award-year-dropdown {
-      margin: 0 !important;
-    }
   }
 
   .download-link {
@@ -144,7 +140,6 @@
 }
 
 .dashboard-table {
-  table-layout: fixed;
   overflow-x: scroll;
   border-collapse: collapse;
 
diff --git a/app/assets/stylesheets/application-admin.scss b/app/assets/stylesheets/application-admin.scss
index e7ce220125..557769c28d 100644
--- a/app/assets/stylesheets/application-admin.scss
+++ b/app/assets/stylesheets/application-admin.scss
@@ -15,6 +15,7 @@ $button-colour: #00823b;
 @import "frontend/password_guidance";
 @import "frontend/status";
 
+@import "admin/bootstrap-overrides";
 @import "admin/variables";
 @import "admin/toggle";
 @import "admin/layout";
diff --git a/app/views/layouts/_vertical_admin_award_year.html.slim b/app/views/layouts/_vertical_admin_award_year.html.slim
index 453df072ef..c41a679eb8 100644
--- a/app/views/layouts/_vertical_admin_award_year.html.slim
+++ b/app/views/layouts/_vertical_admin_award_year.html.slim
@@ -1,4 +1,4 @@
-.col-lg-2.col-md-3.col-sm-4.award-year-z-index.applications-filter
+.col-md-3.col-sm-4.award-year-z-index.applications-filter
   label.applications-filter__label
     ' Award year
   .dropdown

From d1f2e595796c52e8d784e36672885169f45000e7 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Tue, 22 Aug 2023 14:39:55 +0200
Subject: [PATCH 264/352] fix validation error for palace invite update

---
 app/controllers/concerns/palace_attendees_mixin.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controllers/concerns/palace_attendees_mixin.rb b/app/controllers/concerns/palace_attendees_mixin.rb
index fe60418078..7ed8d9fe42 100644
--- a/app/controllers/concerns/palace_attendees_mixin.rb
+++ b/app/controllers/concerns/palace_attendees_mixin.rb
@@ -9,6 +9,8 @@ def new
   end
 
   def create
+    form_answer
+
     authorize palace_invite, :update?
     limit = palace_invite.attendees_limit
     if palace_invite.palace_attendees.count < limit
@@ -21,6 +23,8 @@ def create
   end
 
   def update
+    form_answer
+
     authorize palace_invite, :update?
 
     palace_attendee = palace_invite.palace_attendees.find(params[:id])

From b5b7341984450679a2094717626eda2e7be50d3e Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Tue, 22 Aug 2023 15:39:03 +0200
Subject: [PATCH 265/352] remove obsolete copy from code

mailer for this was removed in https://github.com/bitzesty/qae/pull/775
but the copy was never removed
---
 .../winners_press_release/notify.html.slim    | 24 -------------------
 .../winners_press_release/notify.text.slim    | 17 -------------
 2 files changed, 41 deletions(-)
 delete mode 100644 app/views/users/winners_press_release/notify.html.slim
 delete mode 100644 app/views/users/winners_press_release/notify.text.slim

diff --git a/app/views/users/winners_press_release/notify.html.slim b/app/views/users/winners_press_release/notify.html.slim
deleted file mode 100644
index 306b20a6d5..0000000000
--- a/app/views/users/winners_press_release/notify.html.slim
+++ /dev/null
@@ -1,24 +0,0 @@
-p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  = "Dear #{@user.full_name},"
-
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' Your Press Book entry for application #{@form_answer.urn} has been written by an assessor, and is ready for you to check.
-
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' Although you will not be able to edit the entry yourself, you can make comments in the dedicated space below the entry which we will try to take into account.
-
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' The deadline for doing so is
-  = @deadline
-  ' .
-
-p style="font-size: 19px; line-height: 1.315789474; margin: 0 0 30px 0;"
-  ' Please use the link below to access the text.
-
-  = link_to "Check your Press book piece.", users_form_answer_press_summary_url(@form_answer, token: @token)
-
-p style="font-weight: 700; font-size: 19px; line-height: 1.315789474; margin: 38px 0 38px 0;"
-  ' Thank you,
-  br
-  br
-  ' The King's Awards Office
diff --git a/app/views/users/winners_press_release/notify.text.slim b/app/views/users/winners_press_release/notify.text.slim
deleted file mode 100644
index 89132bf1d7..0000000000
--- a/app/views/users/winners_press_release/notify.text.slim
+++ /dev/null
@@ -1,17 +0,0 @@
-= "Dear #{@user.full_name},"
-
-' Your Press Book entry for application #{@form_answer.urn} has been written by an assessor, and is ready for you to check.
-
-' Although you will not be able to edit the entry yourself, you can make comments in the dedicated space below the entry which we will try to take into account.
-
-' The deadline for doing so is
-= @deadline
-' .
-
-' Please use the link below to access the text.
-
-= link_to "Check your Press book piece.", users_form_answer_press_summary_url(@form_answer, token: @token)
-
-' Thank you,
-
-' The King's Awards Office

From 6a81d7624e0ab33312f5bc9aea3cc635d1b3a054 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 22 Aug 2023 18:20:47 +0100
Subject: [PATCH 266/352] Check press summary radio button value on page load,
 not only on radio button change event

---
 app/assets/javascripts/application.js.coffee | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index e3fca07dde..55cb07845f 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -262,12 +262,19 @@ jQuery ->
   $(".js-conditional-drop-answer input").change () ->
     dropConditionalQuestion($(this))
 
-  $('[name="press_summary[correct]"]').on 'change', ->
-    if ($(this).val() == 'true')
+  togglePressSummaryTextarea= () ->
+    if $('[name="press_summary[correct]"]:checked').val() == "true"
       $("#press-summary-comment-textarea-container").removeClass("if-js-hide")
     else
       $("#press-summary-comment-textarea-container").addClass("if-js-hide")
 
+    $('[name="press_summary[correct]"]').on 'change', ->
+      if $(this).val() is 'true'
+        $("#press-summary-comment-textarea-container").removeClass("if-js-hide")
+      else
+        $("#press-summary-comment-textarea-container").addClass("if-js-hide")
+  togglePressSummaryTextarea()
+
   # Get the latest financial year date from input
   updateYearEndInput = () ->
     fy_latest_changed_input = $(".js-financial-year-changed-dates .fy-latest .govuk-date-input")

From 9c3731d493429753d5357a1e8bb4c8e9552f83e4 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 22 Aug 2023 18:39:50 +0100
Subject: [PATCH 267/352] Update buildpack version

---
 bin/deploy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/deploy b/bin/deploy
index 2ef0598613..1a14218749 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -10,7 +10,7 @@ curl -X POST \
 $SLACK_WEBHOOK
 
 # Pin ruby buildpack
-export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.2"
+export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.3"
 
 cf create-app-manifest "$CF_APP"-worker
 cf push -f "$CF_APP"-worker_manifest.yml -b $CF_BUILDPACK -s cflinuxfs4

From 1bed4844b5f8962f044edf6e391376df36c5fc25 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 23 Aug 2023 10:26:07 +0100
Subject: [PATCH 268/352] Use bool for disabled attr

---
 app/views/qae_form/_matrix_question.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index 687e222195..3c115aa2c9 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -28,7 +28,7 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
                 = "#{y_heading.label} numbers for #{x_heading.label}"
               input.js-trigger-autosave.matrix-question-input.govuk-input [
                 type="number"
-                disabled=(disabled_row_input || disabled_col_input)
+                disabled=disabled_input.present?
                 data-required-row-parent=question.required_row_parent
                 min="0"
                 step="1"

From b02b8229b2474e857cf08a4be7b8fed2f514186d Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:36:30 +0200
Subject: [PATCH 269/352] Fix scrolling to error hidden within collapsed
 accordion

---
 .../controllers/element_scroll_controller.js       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/javascript/controllers/element_scroll_controller.js b/app/javascript/controllers/element_scroll_controller.js
index d905ccc574..d79c3ef832 100644
--- a/app/javascript/controllers/element_scroll_controller.js
+++ b/app/javascript/controllers/element_scroll_controller.js
@@ -5,14 +5,14 @@ export default class extends ApplicationController {
 
   connect() {
     if (this.firstInvalidField) {
-      if (!this.visible(this.firstInvalidField)) {
-        const collapsible = this.accordionTargets.find((target) => {
-          return target.contains(this.firstInvalidField);
-        });
-        if (collapsible) $(collapsible).collapse('show');
-      }
-
       setTimeout(() => {
+        if (!this.visible(this.firstInvalidField)) {
+          const collapsible = this.accordionTargets.find((target) => {
+            return target.contains(this.firstInvalidField);
+          });
+          if (collapsible) $(collapsible).collapse('show');
+        }
+
         this.firstInvalidField.focus();
         scrollToElement(this.firstInvalidField);
       }, 300);

From 6e268796d781e31935f5099eb7b9b948d7c22b26 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:37:07 +0200
Subject: [PATCH 270/352] Concat error strings with `<br />`

---
 app/controllers/admin/users_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b42612ab40..b9813110ea 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -28,7 +28,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_users_path : nil
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.full_messages.join(", "))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -42,7 +42,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.full_messages.join(", "))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: admin_users_path
   end

From b59d89574ee5e5a493f4716314603401d019bc16 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 14:58:51 +0200
Subject: [PATCH 271/352] Increase timeout for displaying flash messages

---
 app/javascript/controllers/inline_flash_controller.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/javascript/controllers/inline_flash_controller.js b/app/javascript/controllers/inline_flash_controller.js
index 481c3316e8..4b4b4fe436 100644
--- a/app/javascript/controllers/inline_flash_controller.js
+++ b/app/javascript/controllers/inline_flash_controller.js
@@ -32,14 +32,14 @@ export default class extends ApplicationController {
     const msg = this.hasSuccessValue ? this.successValue : 'Success!';
     const [alert, identifier] = this.createAlert('success', msg);
 
-    setTimeout(() => this.showAlert(alert, identifier), 1);
+    setTimeout(() => this.showAlert(alert, identifier), 10);
   };
 
   onError = (event) => {
     const msg = this.hasErrorValue ? this.errorValue : 'An unknown error has occurred, please try again.';
     const [alert, identifier] = this.createAlert('danger', msg);
 
-    setTimeout(() => this.showAlert(alert, identifier), 1);
+    setTimeout(() => this.showAlert(alert, identifier), 10);
   };
 
   createAlert = (type, message) => {
@@ -57,8 +57,8 @@ export default class extends ApplicationController {
   };
 
   showAlert = (alert, identifier) => {
-    const existing = this.element.querySelector('[id*=alert__]')
-    if (existing) existing.remove()
+    const existing = this.element.querySelector('[id*=alert__]');
+    if (existing) existing.remove();
 
     this.element.insertAdjacentHTML('afterbegin', alert);
 

From 6418d7fcad93a4fa35dfefe436ed54faf4dcd418 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 15:01:36 +0200
Subject: [PATCH 272/352] Display flash message when notification is removed

---
 app/views/admin/email_notifications/destroy.js.erb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/admin/email_notifications/destroy.js.erb b/app/views/admin/email_notifications/destroy.js.erb
index b1cf4effd4..bef895013f 100644
--- a/app/views/admin/email_notifications/destroy.js.erb
+++ b/app/views/admin/email_notifications/destroy.js.erb
@@ -1,2 +1,3 @@
 wrapper = $("#notification-" + "<%= @email_notification.id %>");
+window.fire($(".edit_email_notification", wrapper)[0], 'ajax:x:success', null)
 wrapper.remove()

From 75eda652803a8291f24f93f8e60ea6816a4a1168 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 16:55:00 +0200
Subject: [PATCH 273/352] Fix displaying flash message when palace attendee is
 added/updated/removed

---
 app/assets/javascripts/admin/form_answers.js.coffee   | 11 +++++++++++
 .../winners_components/_palace_attendee.html.slim     |  2 +-
 .../_palace_attendee_form.html.slim                   |  4 ++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index d36bc6d886..7b99240343 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -544,6 +544,11 @@ handleWinnersForm = ->
   $(document).on "ajax:success", attendeeFormHolder, (e, data, status, xhr) ->
     $(this).closest(attendeeFormHolder).replaceWith(data)
 
+    setTimeout (->
+      replaced = document.querySelector("##{e.target.id}")
+      window.fire(replaced, 'ajax:x:success', null)
+    ), 50
+
   $(document).on "click", ".remove-palace-attendee", (e) ->
     e.preventDefault()
     $(this).closest("form").submit()
@@ -552,6 +557,12 @@ handleWinnersForm = ->
   $(document).on "ajax:success", removeAttendeeForm, (e, data, status, xhr) ->
     $(this).closest(attendeeFormHolder).remove()
     $(".attendees-forms").closest(".form-group").find(".empty-message").removeClass("visuallyhidden")
+
+    setTimeout (->
+      removed = document.querySelector("##{e.target.id}")
+      window.fire(removed, 'ajax:x:success', null)
+    ), 50
+
   $(document).on "click", ".add-another-attendee", (e) ->
     e.preventDefault()
     that = $(this)
diff --git a/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim b/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim
index 24f07136b7..df16ad6128 100644
--- a/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim
+++ b/app/views/admin/form_answers/winners_components/_palace_attendee.html.slim
@@ -1,4 +1,4 @@
-.form-group.palace-attendee-container[class=("form-edit" if pa.errors.present? || defined?(@enable_edition)) data-controller="element-focus"]
+.form-group.palace-attendee-container[class=("form-edit" if pa.errors.present? || defined?(@enable_edition)) data-controller="inline-flash element-focus"]
   .form-value
     .empty-message class="#{'visuallyhidden' if palace_invite.palace_attendees.exists?}"
       p.p-empty No attendees confirmed.
diff --git a/app/views/admin/form_answers/winners_components/_palace_attendee_form.html.slim b/app/views/admin/form_answers/winners_components/_palace_attendee_form.html.slim
index d73d9814cc..1bbf66cf40 100644
--- a/app/views/admin/form_answers/winners_components/_palace_attendee_form.html.slim
+++ b/app/views/admin/form_answers/winners_components/_palace_attendee_form.html.slim
@@ -2,12 +2,12 @@ ul.list-add.list-attendees class=('if-js-hide' if palace_attendee.new_record? &&
   li.well
     .pull-right
       - unless palace_attendee.new_record?
-        = simple_form_for([namespace_name, palace_attendee], remote: true, authenticity_token: true, method: :delete, html: { class: "remove-palace-attendee-form" }) do |f|
+        = simple_form_for([namespace_name, palace_attendee], remote: true, authenticity_token: true, method: :delete, html: { class: "remove-palace-attendee-form", data: { inline_flash_target: "form" } }) do |f|
           = f.input :palace_invite_id, as: :hidden
           = f.submit "Remove", class: "if-js-hide"
           = link_to "Remove", "", class: "remove-palace-attendee if-no-js-hide", data: {confirm: "Are you sure?"}
 
-    = simple_form_for([namespace_name, palace_attendee], remote: true, authenticity_token: true, html: { class: "palace-attendee-form" }) do |f|
+    = simple_form_for([namespace_name, palace_attendee], remote: true, authenticity_token: true, html: { class: "palace-attendee-form", data: { inline_flash_target: "form" } }) do |f|
       = f.input :palace_invite_id, as: :hidden
       .row
         .col-md-2

From ab760b39159c731926d03efd75445fb63c257aa7 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 22:54:52 +0200
Subject: [PATCH 274/352] Fix displaying of flash message when financial review
 is submitted

---
 .../javascripts/admin/form_answers.js.coffee    | 17 ++---------------
 .../form_answers/_financials_review.html.slim   |  2 +-
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 7b99240343..42a125e5c6 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -54,21 +54,6 @@ ready = ->
     else
       $('#commercial-figures-attachment-form').addClass('visuallyhidden')
 
-  $("#new_review_audit_certificate").on "ajax:success", (e, data, status, xhr) ->
-    $(this).find(".form-group").removeClass("form-edit")
-    $(this).find(".form-edit-link").remove()
-    $(".save-review-audit").remove()
-    area = $(".audit-cert-description textarea")
-    unless area.val()
-      $(this).find(".form-value").html($("<p>No change necessary</p>"))
-    else
-      div = "<div><label>Changes made</label><p class='control-label'>#{area.val()}</p></div>"
-      $(this).find(".form-value").html(div)
-
-  $("#new_review_audit_certificate").on "click", ".save-review-audit", (e) ->
-    e.preventDefault()
-    $("#new_review_audit_certificate").submit()
-
   $(".edit-review-audit").on "click", (e) ->
     $(".save-review-audit").show()
 
@@ -647,6 +632,8 @@ handleReviewAuditCertificate = ->
     else
       div = "<div><label>Changes made</label><p class='control-label'>#{area.val()}</p></div>"
       $(this).find(".form-value").html(div)
+    window.fire(e.target, 'ajax:x:success', null)
+
   $("#new_review_audit_certificate").on "click", ".save-review-audit", (e) ->
     e.preventDefault()
     $("#new_review_audit_certificate").submit()
diff --git a/app/views/admin/form_answers/_financials_review.html.slim b/app/views/admin/form_answers/_financials_review.html.slim
index 082ed2b1ac..af85daba9c 100644
--- a/app/views/admin/form_answers/_financials_review.html.slim
+++ b/app/views/admin/form_answers/_financials_review.html.slim
@@ -7,7 +7,7 @@
       = simple_form_for([namespace_name, review_audit_certificate],
                         remote: true,
                         authenticity_token: true,
-                        html: { controller: "inline-flash", inline_flash_target: "form" }) do |f|
+                        html: { data: { controller: "inline-flash", inline_flash_target: "form" } }) do |f|
 
         = f.input :form_answer_id, as: :hidden
 

From 21eae870ac79299b34693575beba068053ff5bbb Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 21 Aug 2023 23:27:58 +0200
Subject: [PATCH 275/352] Flash message when unsubmitting/unlocking appraisal

---
 app/controllers/concerns/assessment_submission_mixin.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/concerns/assessment_submission_mixin.rb b/app/controllers/concerns/assessment_submission_mixin.rb
index 86b97f58e1..28ec46ffb6 100644
--- a/app/controllers/concerns/assessment_submission_mixin.rb
+++ b/app/controllers/concerns/assessment_submission_mixin.rb
@@ -19,6 +19,7 @@ def unlock
     resource.update_column(:locked_at, nil)
     log_event
 
+    render_flash_message_for(resource, message: flash_message)
     redirect_to [namespace_name, resource.form_answer]
   end
 

From b42ee5d44b8aba3d72a9dfe984629dab712775bd Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 12:34:57 +0200
Subject: [PATCH 276/352] Fix displaying of error messages when removing
 comments

---
 app/assets/javascripts/admin/comments.js.coffee | 3 ++-
 app/views/admin/form_answers/_comment.html.slim | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/admin/comments.js.coffee b/app/assets/javascripts/admin/comments.js.coffee
index cab48ec088..1bdc9a03b1 100644
--- a/app/assets/javascripts/admin/comments.js.coffee
+++ b/app/assets/javascripts/admin/comments.js.coffee
@@ -56,8 +56,9 @@ ready = ->
         else
           signatureWrapper.html("")
 
-        $(@).parents('.comment').remove()
+        window.fire(@, 'ajax:x:success', null)
 
+        $(@).parents('.comment').remove()
 
   toggleFlagged()
   deleteCommentAlert()
diff --git a/app/views/admin/form_answers/_comment.html.slim b/app/views/admin/form_answers/_comment.html.slim
index d5ab863bb2..8e65a832ca 100644
--- a/app/views/admin/form_answers/_comment.html.slim
+++ b/app/views/admin/form_answers/_comment.html.slim
@@ -6,7 +6,7 @@
         p Delete this comment?
         .btn-actions
         = form_for [namespace_name, @form_answer, comment],
-                   html: { method: :delete, class: "destroy-comment"} do |f|
+                   html: { method: :delete, class: "destroy-comment", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |f|
 
             = f.submit 'Yes', class: "btn btn-danger link-delete-comment-confirm"
             ' &nbsp;
@@ -25,7 +25,7 @@
 
         - if comment.author?(current_subject)
           = form_for [namespace_name, @form_answer, comment],
-                     html: { method: :delete, class: "destroy-comment"} do |f|
+                     html: { method: :delete, class: "destroy-comment", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |f|
 
             = f.submit 'Delete', class: "btn btn-danger link-delete-comment-confirm"
 

From 13535f85de0a474fd65fed1e4b9eed6e1157ffbe Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:07:39 +0200
Subject: [PATCH 277/352] Fix flash messages when attaching files as an admin

---
 .../javascripts/admin/form_answers.js.coffee  | 25 ++++++++----
 .../admin/audit_certificate/_form.html.slim   |  2 +-
 .../_actual_figures.html.slim                 | 19 ++++-----
 .../_vat_returns.html.slim                    | 19 ++++-----
 .../form_answer_attachments/_form.html.slim   |  7 +++-
 .../_form_answer_attachment.html.slim         |  2 +-
 .../form_answers/_section_documents.html.slim | 40 ++++++++++---------
 ..._application_and_supporting_docs.html.slim |  2 +-
 8 files changed, 66 insertions(+), 50 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index 42a125e5c6..df3d75bd94 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -139,15 +139,17 @@ ready = ->
           result = $($.parseHTML(result))
           $("#commercial-figures-buffer").append(result.text())
 
+          form = document.querySelector('#commercial-figures-attachment-form form')
+
           if $("#commercial-figures-file-valid", $("#commercial-figures-buffer")).length
             $("#commercial-figures-section").html(result.text())
             moveAttachDocumentButton()
           else
-            form = $("#commercial-figures-attachment-form form")
-            section = form.closest("#commercial-figures-section")
+            section = $(form).closest("#commercial-figures-section")
             section.find(".document-list .p-empty").addClass("visuallyhidden")
             section.find(".document-list ul").append(result.text())
 
+          window.fire(form, 'ajax:x:success', null)
           toggleCommercialFiguresButtonVisibility()
           $("#commercial-figures-buffer").empty()
 
@@ -185,16 +187,18 @@ ready = ->
           result = $($.parseHTML(result))
           $("#vat-returns-buffer").append(result.text())
 
+          form = document.querySelector('#vat-returns-attachment-form form')
+
           if $("#vat-returns-file-valid", $("#vat-returns-buffer")).length
             $("#application-attachment-form").html(result.text())
             moveAttachDocumentButton()
             initializeFileUpload()
           else
-            form = $("#vat-returns-attachment-form form")
-            section = form.closest("#vat-returns-section")
+            section = $(form).closest("#vat-returns-section")
             section.find(".document-list .p-empty").addClass("visuallyhidden")
             section.find(".document-list ul").append(result.text())
 
+          window.fire(form, 'ajax:x:success', null)
           $("#vat-returns-buffer").empty()
 
   $("#vat-returns-attachment-form form").on "fileuploadsubmit", (e, data) ->
@@ -245,19 +249,21 @@ ready = ->
           result = $($.parseHTML(result))
           $("#attachment-buffer").append(result.text())
 
+          form = document.querySelector('#new_form_answer_attachment')
+
           if $("#form-answer-attachment-valid", $("#attachment-buffer")).length
             $("#application-attachment-form").html(result.text())
             moveAttachDocumentButton()
             initializeFileUpload()
           else
-            form = $("#new_form_answer_attachment")
-            sidebarSection = form.closest(".sidebar-section")
+            sidebarSection = $(form).closest(".sidebar-section")
             sidebarSection.find(".document-list .p-empty").addClass("visuallyhidden")
             sidebarSection.find(".document-list ul").append(result.text())
             sidebarSection.removeClass("show-attachment-form")
             $("#form_answer_attachment_title").val(null)
             $("#form_answer_attachment_restricted_to_admin").prop("checked", false)
 
+          window.fire(form, 'ajax:x:success', null)
           $("#attachment-buffer").empty()
 
   if $("html").hasClass("lte-ie7")
@@ -280,16 +286,18 @@ ready = ->
           result = $($.parseHTML(result))
           $("#audit-certificate-buffer").append(result.text())
 
+          form = document.querySelector('#new_audit_certificate')
+
           if $("#form-audit_certificate-valid", $("#audit-certificate-buffer")).length
             $("#audit-certificate-form").html(result.text())
             moveAttachDocumentButton()
             initializeFileUpload()
           else
-            form = $("#new_audit_certificate")
-            sidebarSection = form.closest(".sidebar-section")
+            sidebarSection = $(form).closest(".sidebar-section")
             sidebarSection.find(".document-list").html(result.text())
             sidebarSection.removeClass("show-attachment-form")
 
+          window.fire(form, 'ajax:x:success', null)
           $("#audit-certificate-buffer").empty()
 
     moveAttachDocumentButton()
@@ -311,6 +319,7 @@ ready = ->
     $.ajax
       url: form.attr('action'),
       type: 'DELETE'
+    window.fire(form[0], 'ajax:x:success', null)
     form.parents('.form_answer_attachment').remove()
     if $('.form_answer_attachment').length == 0
       sidebarSection.find(".document-list .p-empty").removeClass("visuallyhidden")
diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index eae50fe6d8..e71fc1f1a5 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -3,7 +3,7 @@
 / whether file was saved or not
 .span
   = hidden_field_tag "valid", "false", id: "form-audit_certificate-valid"
-= form_for [namespace_name, form_answer, audit_certificate], html: { multipart: true, data: { inline_flash_target: "form" } } do |form|
+= form_for [namespace_name, form_answer, audit_certificate], html: { multipart: true, data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |form|
   .well.js-attachment-form
     h3 Attach document
 
diff --git a/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim b/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim
index 016c534b59..ac1058961e 100644
--- a/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_actual_figures.html.slim
@@ -1,13 +1,14 @@
 label
   | Variance explanation document
 
-.document-list.space-y-3
-  p.p-empty class="#{'visuallyhidden' if figures_form.commercial_figures_file.present?}"
-    ' No document has been attached.
-  ul.list-unstyled.list-actions
-    - if figures_form.commercial_figures_file.present?
-      = render(partial: "admin/figures_and_vat_returns/file", collection: Array.wrap(figures_form.commercial_figures_file), as: :attachment)
-  .clear
+div[data-controller="inline-flash"]
+  .document-list.space-y-3
+    p.p-empty class="#{'visuallyhidden' if figures_form.commercial_figures_file.present?}"
+      ' No document has been attached.
+    ul.list-unstyled.list-actions
+      - if figures_form.commercial_figures_file.present?
+        = render(partial: "admin/figures_and_vat_returns/file", collection: Array.wrap(figures_form.commercial_figures_file), as: :attachment)
+    .clear
 
-#commercial-figures-attachment-form
-  = render("admin/figures_and_vat_returns/form", form_answer: form_answer, attachment: figures_form.commercial_figures_file || figures_form.build_commercial_figures_file)
+  #commercial-figures-attachment-form
+    = render("admin/figures_and_vat_returns/form", form_answer: form_answer, attachment: figures_form.commercial_figures_file || figures_form.build_commercial_figures_file)
diff --git a/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim b/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim
index 8d9aeb4530..9d2e27bc5f 100644
--- a/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_vat_returns.html.slim
@@ -1,13 +1,14 @@
 label
   | Latest financial statements and VAT returns
 
-.document-list.space-y-3
-  p.p-empty class="#{'visuallyhidden' if figures_form.vat_returns_files.any?}"
-    ' No documents have been attached.
-  ul.list-unstyled.list-actions
-    - if figures_form.vat_returns_files.any?
-      = render(partial: "admin/figures_and_vat_returns/file", collection: figures_form.vat_returns_files, as: :attachment)
-  .clear
+div[data-controller="inline-flash"]
+  .document-list.space-y-3
+    p.p-empty class="#{'visuallyhidden' if figures_form.vat_returns_files.any?}"
+      ' No documents have been attached.
+    ul.list-unstyled.list-actions
+      - if figures_form.vat_returns_files.any?
+        = render(partial: "admin/figures_and_vat_returns/file", collection: figures_form.vat_returns_files, as: :attachment)
+    .clear
 
-#vat-returns-attachment-form
-  = render("admin/figures_and_vat_returns/form", form_answer: form_answer, attachment: figures_form.vat_returns_files.build)
+  #vat-returns-attachment-form
+    = render("admin/figures_and_vat_returns/form", form_answer: form_answer, attachment: figures_form.vat_returns_files.build)
diff --git a/app/views/admin/form_answer_attachments/_form.html.slim b/app/views/admin/form_answer_attachments/_form.html.slim
index 14127c8da8..6fab5582eb 100644
--- a/app/views/admin/form_answer_attachments/_form.html.slim
+++ b/app/views/admin/form_answer_attachments/_form.html.slim
@@ -3,12 +3,15 @@
 / whether file was saved or not
 .span
   = hidden_field_tag "valid", "false", id: "form-answer-attachment-valid"
-= form_for [namespace_name, form_answer, form_answer_attachment], html: { multipart: true } do |form|
+= form_for [namespace_name, form_answer, form_answer_attachment], html: { multipart: true, data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |form|
   .well.js-attachment-form
     h3 Attach document
 
     - if form.object.errors.any?
-      .errors = form.object.errors.full_messages.join(", ")
+      .alert.alert-danger[data-controller="element-removal" role="alert"]
+        = form.object.errors.full_messages.join(", ")
+        button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
+          span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
       = form.file_field :file
diff --git a/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim b/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim
index 7a2d2bfe20..99356008b0 100644
--- a/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim
+++ b/app/views/admin/form_answer_attachments/_form_answer_attachment.html.slim
@@ -4,7 +4,7 @@
     - if show_remove_form_answer_attachment?(form_answer_attachment)
       small.pull-right
         = form_for([namespace_name, form_answer_attachment.form_answer, form_answer_attachment],
-                   html: { data: { inline_flash_target: "form" }, method: :delete, style: "display: inline-block;" }) do |f|
+                   html: { data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" }, method: :delete, style: "display: inline-block;" }) do |f|
 
           = f.submit 'Remove', class: 'if-js-hide'
 
diff --git a/app/views/admin/form_answers/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index 30017bb462..f25fbebc59 100644
--- a/app/views/admin/form_answers/_section_documents.html.slim
+++ b/app/views/admin/form_answers/_section_documents.html.slim
@@ -27,16 +27,17 @@
       ' Post Shortlisting Docs
 
     - if @form_answer.requires_vocf?
-      .document-list.space-y-2
-        = render(partial: "admin/form_answers/docs/status", locals: { form_answer: @form_answer })
-        = render "admin/form_answers/docs/post_shortlisting_docs", resource: resource
+      div[data-controller="inline-flash"]
+        .document-list.space-y-2
+          = render(partial: "admin/form_answers/docs/status", locals: { form_answer: @form_answer })
+          = render "admin/form_answers/docs/post_shortlisting_docs", resource: resource
 
-      - if @form_answer.audit_certificate.blank? && Settings.after_shortlisting_stage?
-        .sidebar-section.no-margin-bottom.space-y-3
-          - if @form_answer.requires_vocf?
-            #audit-certificate-form[data-controller="inline-flash"]
-              - audit_certificate = @form_answer.build_audit_certificate
-              = render "admin/audit_certificate/form", form_answer: @form_answer, audit_certificate: audit_certificate 
+        - if @form_answer.audit_certificate.blank? && Settings.after_shortlisting_stage?
+          .sidebar-section.no-margin-bottom.space-y-3
+            - if @form_answer.requires_vocf?
+              #audit-certificate-form[data-controller="inline-flash"]
+                - audit_certificate = @form_answer.build_audit_certificate
+                = render "admin/audit_certificate/form", form_answer: @form_answer, audit_certificate: audit_certificate 
 
     - elsif @form_answer.provided_estimates? 
       - figures_form = @form_answer.shortlisted_documents_wrapper || @form_answer.build_shortlisted_documents_wrapper
@@ -57,16 +58,17 @@
   .sidebar-section
     h2
       ' Other Docs
-    .document-list
-      p.p-empty class="#{'visuallyhidden' if @form_answer.form_answer_attachments.any?}"
-        ' No documents have been attached.
-      ul.list-unstyled.list-actions
-        - if @form_answer.form_answer_attachments.uploaded_not_by_user.any?
-          = render(partial: "admin/form_answer_attachments/form_answer_attachment", collection: @form_answer.form_answer_attachments.uploaded_not_by_user.visible_for(current_subject))
-      .clear
-      br
-    #application-attachment-form
-      = render "admin/form_answer_attachments/form", form_answer: @form_answer, form_answer_attachment: @form_answer.form_answer_attachments.build
+    div[data-controller="inline-flash"]
+      .document-list
+        p.p-empty class="#{'visuallyhidden' if @form_answer.form_answer_attachments.any?}"
+          ' No documents have been attached.
+        ul.list-unstyled.list-actions
+          - if @form_answer.form_answer_attachments.uploaded_not_by_user.any?
+            = render(partial: "admin/form_answer_attachments/form_answer_attachment", collection: @form_answer.form_answer_attachments.uploaded_not_by_user.visible_for(current_subject))
+        .clear
+        br
+      #application-attachment-form
+        = render "admin/form_answer_attachments/form", form_answer: @form_answer, form_answer_attachment: @form_answer.form_answer_attachments.build
 
 
 #audit-certificate-buffer
diff --git a/app/views/admin/form_answers/docs/_application_and_supporting_docs.html.slim b/app/views/admin/form_answers/docs/_application_and_supporting_docs.html.slim
index 7699b79839..d7eb6c2b92 100644
--- a/app/views/admin/form_answers/docs/_application_and_supporting_docs.html.slim
+++ b/app/views/admin/form_answers/docs/_application_and_supporting_docs.html.slim
@@ -1,4 +1,4 @@
-.document-list
+.document-list[data-controller="inline-flash"]
   - if @form_answer.form_answer_attachments.uploaded_by_user.any? || @form_answer.support_letters.any?
 
     ul.list-unstyled.list-actions

From fc6293626331e5767649911fefb48710e814bfca Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:24:19 +0200
Subject: [PATCH 278/352] CSS: Fix overlapping link when flash message is
 displayed

---
 app/assets/stylesheets/admin/page-applications.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 79a82acbdf..5932778653 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -557,6 +557,10 @@
       display: inline;
     }
   }
+  
+  .alert ~ form > .form-edit-link {
+    top: pxToRem(40);
+  }
 }
 
 .centered {

From 615ff9c9954c492a28ee4da01c060b44ce96f607 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 15:43:03 +0200
Subject: [PATCH 279/352] Persist flash message only on current page

---
 app/controllers/admin/base_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 8ea7ef5bcb..df5ed2dd5b 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -22,9 +22,9 @@ def current_subject
 
   def render_flash_message_for(resource, message: nil)
     if resource.errors.any?
-      flash[:error] = message || "An unknown error has occurred, please try again."
+      flash.now[:error] = message || "An unknown error has occurred, please try again."
     else
-      flash[:notice] = message || "Success!"
+      flash.now[:notice] = message || "Success!"
     end
   end
 

From 48f2d8f8d14211d9f286787c7cc6a42005bc9b73 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 17:52:13 +0200
Subject: [PATCH 280/352] Accordion focus upon expansion

---
 ...section_appraisal_form_moderated.html.slim |  4 ++--
 .../_section_appraisal_form_primary.html.slim |  4 ++--
 ...section_appraisal_form_secondary.html.slim |  4 ++--
 .../_section_case_summary.html.slim           |  4 ++--
 .../_section_company_details.html.slim        |  2 +-
 .../form_answers/_submitted_view.html.slim    | 20 +++++++++----------
 .../form_answers/_submitted_view.html.slim    | 16 +++++++--------
 7 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index 4e34590b76..10ec5ff562 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -1,7 +1,7 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
   .panel-heading#appraisal-form-moderated-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-moderated" aria-expanded="true" aria-controls="section-appraisal-form-moderated"
+      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-moderated" aria-expanded="true" aria-controls="section-appraisal-form-moderated" data-element-focus-target="reveal"
         ' Appraisal Form (Moderated)
         - if moderated_assessment.last_editor_info.present?
           small
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index 12430e2f25..b4d22bab1c 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -1,7 +1,7 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
   .panel-heading#appraisal-form-primary-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-primary" aria-expanded="true" aria-controls="section-appraisal-form-primary"
+      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-primary" aria-expanded="true" aria-controls="section-appraisal-form-primary" data-element-focus-target="reveal"
         ' Appraisal Form (Primary)
         - if primary_assessment.last_editor_info.present?
           small
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 27e6acd617..6148facba7 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -1,7 +1,7 @@
-.panel.panel-default
+.panel.panel-default[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
   .panel-heading#appraisal-form-secondary-heading
     h3.panel-title
-      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-secondary" aria-expanded="true" aria-controls="section-appraisal-form-secondary"
+      a data-toggle="collapse" data-parent="#panel-assessment" href="#section-appraisal-form-secondary" aria-expanded="true" aria-controls="section-appraisal-form-secondary" data-element-focus-target="reveal"
         ' Appraisal Form (Secondary)
         - if secondary_assessment.last_editor_info.present?
           small
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index 195bf88dee..e73ea6eecd 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -1,10 +1,10 @@
 - if visible_case_summaries(current_subject, resource)
   - visible_case_summaries(current_subject, resource).each do |assessment_obj|
     - assessment = assessment_obj.assessment
-    .panel.panel-parent.panel-default
+    .panel.panel-parent.panel-default[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
       .panel-heading id="case-summary-heading-#{assessment.position}"
         h3.panel-title
-          a data-toggle="collapse" href="#section-case-summary-#{assessment.position}" aria-expanded="true" aria-controls="section-case-summary-#{assessment.position}"
+          a data-toggle="collapse" href="#section-case-summary-#{assessment.position}" aria-expanded="true" aria-controls="section-case-summary-#{assessment.position}" data-element-focus-target="reveal"
             ' Case Summary (for recommended or reserved applications only)
             small.panel-subtitle-small
               | This will be presented to the panel members and is used when making the final decision
diff --git a/app/views/admin/form_answers/_section_company_details.html.slim b/app/views/admin/form_answers/_section_company_details.html.slim
index fc8ce6b9b2..ba8074c09a 100644
--- a/app/views/admin/form_answers/_section_company_details.html.slim
+++ b/app/views/admin/form_answers/_section_company_details.html.slim
@@ -1,4 +1,4 @@
-.panel.panel-default[data-controller="element-focus"]
+.panel.panel-default[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
   .panel-heading#company-details-heading
     h3.panel-title
       a data-toggle="collapse" data-parent="#panel-application-info" href="#section-company-details" aria-expanded="true" aria-controls="section-company-details" data-element-focus-target="reveal"
diff --git a/app/views/admin/form_answers/_submitted_view.html.slim b/app/views/admin/form_answers/_submitted_view.html.slim
index f2f618d21d..56fda0ce76 100644
--- a/app/views/admin/form_answers/_submitted_view.html.slim
+++ b/app/views/admin/form_answers/_submitted_view.html.slim
@@ -1,10 +1,10 @@
 - title "Admin: Application #{@form_answer.urn.presence}"
 
 .panel-group#submitted-application-parent-parent
-  .panel.panel-default.panel-parent
+  .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
     .panel-heading#application-info-heading
       h2.panel-title
-        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info"
+        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info" data-element-focus-target="reveal"
           ' Application info
     #section-application-info.section-application-info.panel-collapse.collapse.in aria-labelledby="application-info-heading"
       .panel-body
@@ -13,10 +13,10 @@
           = render "section_company_details"
           = render "section_financial_summary"
 
-  .panel.panel-default.panel-parent
+  .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
     .panel-heading#assessment-heading
       h2.panel-title
-        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment"
+        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment" data-element-focus-target="reveal"
           ' Assessment
     #section-assessment.section-application-info.panel-collapse.collapse.in aria-labelledby="assessment-heading"
       .panel-body
@@ -31,10 +31,10 @@
     = render "section_case_summary"
 
   - if show_feedback_section?
-    .panel.panel-default.panel-parent
+    .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
       .panel-heading#feedback-heading
         h2.panel-title
-          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback"
+          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback" data-element-focus-target="reveal"
             ' Feedback (for not recommended applications only)
             small.panel-subtitle-small
               | This will be sent  to the applicants to help improve their business and/or future award applications
@@ -48,10 +48,10 @@
           = render "admin/feedbacks/section", form_answer: @form_answer
 
   - if show_winners_section?
-    .panel.panel-default.panel-parent
+    .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
       .panel-heading#winners-heading
         h2.panel-title
-          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners"
+          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners" data-element-focus-target="reveal"
             ' Recipients
       #section-winners.section-application-info.panel-collapse.collapse.in aria-labelledby="winners-heading"
         .panel-body
@@ -61,10 +61,10 @@
             - if show_palace_attendees_subsection?
               = render "section_palace_attendees"
 
-  .panel.panel-default.panel-parent
+  .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
     .panel-heading#logs-heading
       h2.panel-title
-        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-logs" aria-expanded="true" aria-controls="section-logs"
+        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-logs" aria-expanded="true" aria-controls="section-logs" data-element-focus-target="reveal"
           ' Application Audit Log
     #section-logs.section-application-info.panel-collapse.collapse aria-labelledby="logs-heading"
       .panel-body
diff --git a/app/views/assessor/form_answers/_submitted_view.html.slim b/app/views/assessor/form_answers/_submitted_view.html.slim
index aeab1be952..5558e72290 100644
--- a/app/views/assessor/form_answers/_submitted_view.html.slim
+++ b/app/views/assessor/form_answers/_submitted_view.html.slim
@@ -1,8 +1,8 @@
 .panel-group#submitted-application-parent
-  .panel.panel-default.panel-parent
+  .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
     .panel-heading#application-info-heading
       h2.panel-title
-        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info"
+        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-application-info" aria-expanded="true" aria-controls="section-application-info" data-element-focus-target="reveal"
           ' Application info
     #section-application-info.section-application-info.panel-collapse.collapse.in aria-labelledby="application-info-heading"
       .panel-body
@@ -11,10 +11,10 @@
           = render "admin/form_answers/section_company_details"
           = render "admin/form_answers/section_financial_summary"
 
-  .panel.panel-default.panel-parent
+  .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
     .panel-heading#assessment-heading
       h2.panel-title
-        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment"
+        a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-assessment" aria-expanded="true" aria-controls="section-assessment" data-element-focus-target="reveal"
           ' Assessment
     #section-assessment.section-application-info.panel-collapse.collapse.in aria-labelledby="assessment-heading"
       .panel-body
@@ -32,10 +32,10 @@
     = render "admin/form_answers/section_case_summary"
 
   - if show_feedback_section?
-    .panel.panel-default.panel-parent
+    .panel.panel-default.panel-parent[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
       .panel-heading#feedback-heading
         h2.panel-title
-          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback"
+          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-feedback" aria-expanded="true" aria-controls="section-feedback" data-element-focus-target="reveal"
             ' Feedback (for not recommended applications only)
             small.panel-subtitle-small
               | This will be sent  to the applicants to help improve their business and/or future award applications
@@ -50,9 +50,9 @@
 
   - if show_winners_section?
     .panel.panel-default.panel-parent
-      .panel-heading#winners-heading
+      .panel-heading#winners-heading[data-controller="element-focus" data-element-focus-selector-value="input:not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), [href='#']"]
         h2.panel-title
-          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners"
+          a data-toggle="collapse" data-parent="#submitted-application-parent" href="#section-winners" aria-expanded="true" aria-controls="section-winners" data-element-focus-target="reveal"
             ' Recipients
       #section-winners.section-application-info.panel-collapse.collapse.in aria-labelledby="winners-heading"
         .panel-body

From f6fdce30d5455b291424ed6390bbb8d98ca74863 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 22:46:32 +0200
Subject: [PATCH 281/352] Maybe `autofocus` first button

---
 app/views/layouts/application-admin.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 3fad9a5495..e9b8c796a7 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -38,7 +38,7 @@ html.no-js
   body#admin-layout data-autosave-token="#{current_admin.try(:autosave_token)}" class="admin-layout #{controller_name}-page #{action_name}-page #{controller_name}-#{action_name}-page #{yield :page_class} #{'layout-dev' if Rails.env.development?}"
     #site-wrapper
       #site-wrapper-margin
-        a href="#main-container" class="btn btn-lg skip-main-content" onclick="document.getElementById('main-container').focus()" role="button"
+        a href="#main-container" autofocus="true" class="btn btn-lg skip-main-content" onclick="document.getElementById('main-container').focus()" role="button"
           | Skip to main content
         #site-header.clearfix
           .navbar.clearfix role="navigation"

From c76277db022b375d52ca462c8a4a4f0507d01050 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 22 Aug 2023 23:23:28 +0200
Subject: [PATCH 282/352] Display help block only for trade applications

---
 .../_queen_award_applications_question.html.slim       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/qae_form/_queen_award_applications_question.html.slim b/app/views/qae_form/_queen_award_applications_question.html.slim
index 2652bf49d6..8cc1ccf034 100644
--- a/app/views/qae_form/_queen_award_applications_question.html.slim
+++ b/app/views/qae_form/_queen_award_applications_question.html.slim
@@ -138,7 +138,9 @@ a.govuk-button.govuk-button--secondary.js-button-add.if-no-js-hide href="#" aria
 
 .question-block.help-block
   .govuk-form-group
-    p class="govuk-body govuk-!-font-weight-bold hide" id="current-holder"
-      | As you currently hold a King's Award for International Trade, you cannot apply for another Award. You may apply in future years but can only use one year's financial performance from your Award winning application.
-    p class="govuk-body govuk-!-font-weight-bold hide" id="recent-winner"
-      | As you currently hold a King's Award in International Trade, you can only apply for the Outstanding Achievement Award (3 years).
+    - if @form_answer.trade?
+      p[class="govuk-body govuk-!-font-weight-bold hide" id="current-holder"] 
+        | As you currently hold a King's Award for International Trade, you cannot apply for another Award. You may apply in future years but can only use one year's financial performance from your Award winning application.
+
+      p[class="govuk-body govuk-!-font-weight-bold hide" id="recent-winner"] 
+        | As you currently hold a King's Award in International Trade, you can only apply for the Outstanding Achievement Award (3 years).

From 58c095b02fec244f6c9ad77530a3fb99bb677b76 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 23 Aug 2023 11:56:24 +0200
Subject: [PATCH 283/352] Remove inline styles in favour of stylesheet

---
 app/assets/javascripts/admin/form_answers.js.coffee     | 2 +-
 app/assets/stylesheets/admin/base.scss                  | 4 ++++
 app/javascript/controllers/inline_flash_controller.js   | 2 +-
 app/views/admin/audit_certificate/_form.html.slim       | 2 +-
 app/views/admin/figures_and_vat_returns/_form.html.slim | 2 +-
 app/views/admin/form_answer_attachments/_form.html.slim | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index df3d75bd94..fd06660e63 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -455,7 +455,7 @@ buildBannerHtml = (message, type, identifier = null) ->
   
   "<div id='#{id}' class='alert alert-#{type}' data-controller='element-removal' role='alert' style='padding-top: 6px; padding-bottom: 6px; margin-bottom: 8px;'>
     #{message}
-    <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close' style='font-size: 18px;'>
+    <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close'>
       <span aria-hidden='true'>&times;</span>
     </button>
   </div>"
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 9ced5274b9..64e6cfeb79 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -2210,3 +2210,7 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
 .space-y-3 > :not([hidden]) ~ :not([hidden]) {
   margin-top: 1.5rem;
 }
+
+.alert button.close {
+  font-size: pxToRem(18);
+}
\ No newline at end of file
diff --git a/app/javascript/controllers/inline_flash_controller.js b/app/javascript/controllers/inline_flash_controller.js
index 4b4b4fe436..127dd8f400 100644
--- a/app/javascript/controllers/inline_flash_controller.js
+++ b/app/javascript/controllers/inline_flash_controller.js
@@ -47,7 +47,7 @@ export default class extends ApplicationController {
     const element = `
       <div id='${id}' class='alert alert-${type}' data-controller='element-removal' role='alert' style='padding-top: 6px; padding-bottom: 6px; margin-bottom: 8px;'>
         ${message}
-        <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close' style='font-size: 18px;'>
+        <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close'>
           <span aria-hidden='true'>&times;</span>
         </button>
       </div>
diff --git a/app/views/admin/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index e71fc1f1a5..dbb14c45c7 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -11,7 +11,7 @@
       .errors
         .alert.alert-danger[data-controller="element-removal" role="alert"]
           = form.object.errors.full_messages.join(", ")
-          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close"]
             span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
diff --git a/app/views/admin/figures_and_vat_returns/_form.html.slim b/app/views/admin/figures_and_vat_returns/_form.html.slim
index 7b2be8c2f8..8a5f591c9b 100644
--- a/app/views/admin/figures_and_vat_returns/_form.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_form.html.slim
@@ -11,7 +11,7 @@
       .errors
         .alert.alert-danger[data-controller="element-removal" role="alert"]
           = form.object.errors.full_messages.join(", ")
-          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
+          button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close"]
             span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
diff --git a/app/views/admin/form_answer_attachments/_form.html.slim b/app/views/admin/form_answer_attachments/_form.html.slim
index 6fab5582eb..64113045fe 100644
--- a/app/views/admin/form_answer_attachments/_form.html.slim
+++ b/app/views/admin/form_answer_attachments/_form.html.slim
@@ -10,7 +10,7 @@
     - if form.object.errors.any?
       .alert.alert-danger[data-controller="element-removal" role="alert"]
         = form.object.errors.full_messages.join(", ")
-        button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close" style="font-size: 18px;"]
+        button[type="button" class="close" data-action="click->element-removal#remove" aria-label="Close"]
           span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide

From b2daa0d9798c7ac975077839e955050bac20f4b1 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 23 Aug 2023 14:53:10 +0200
Subject: [PATCH 284/352] Use `readonly` for disabled attributes so the values
 can persist

---
 app/javascript/packs/application.scss         | 9 +++++++++
 app/views/qae_form/_matrix_question.html.slim | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/javascript/packs/application.scss b/app/javascript/packs/application.scss
index 54a1824993..349d89ccda 100644
--- a/app/javascript/packs/application.scss
+++ b/app/javascript/packs/application.scss
@@ -28,6 +28,15 @@ body.js-enabled {
   margin: 0 !important;
 }
 
+.govuk-form-group {
+  input[readonly],
+  textarea[readonly] {
+    background-color: rgba(0, 0, 0, 0.03);
+    color: rgb(84, 84, 84);
+    cursor: not-allowed;
+  }
+}
+
 .pagination {
   @supports (flex-wrap: wrap) {
     margin-bottom: 3rem;
diff --git a/app/views/qae_form/_matrix_question.html.slim b/app/views/qae_form/_matrix_question.html.slim
index 3c115aa2c9..9ffb704b13 100644
--- a/app/views/qae_form/_matrix_question.html.slim
+++ b/app/views/qae_form/_matrix_question.html.slim
@@ -28,7 +28,7 @@ table.matrix-question-table.govuk-table class="#{'auto-totals-column' if questio
                 = "#{y_heading.label} numbers for #{x_heading.label}"
               input.js-trigger-autosave.matrix-question-input.govuk-input [
                 type="number"
-                disabled=disabled_input.present?
+                readonly=disabled_input.present?
                 data-required-row-parent=question.required_row_parent
                 min="0"
                 step="1"

From 79ae890445a62b88114360355f98d27f856629d6 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 23 Aug 2023 17:26:18 +0200
Subject: [PATCH 285/352] Update `selenium-webdriver` from `4.10.0` to `4.11.0`

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 24a953112a..a29d21d464 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -520,7 +520,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    rexml (3.2.5)
+    rexml (3.2.6)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
@@ -579,7 +579,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    selenium-webdriver (4.10.0)
+    selenium-webdriver (4.11.0)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)

From 398fbdfb315b5926727c0fb8a19c714bd37080e4 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 24 Aug 2023 14:01:29 +0200
Subject: [PATCH 286/352] Better error message + focus and scroll to field
 [assessor, admin, judge]

---
 app/controllers/admin/admins_controller.rb    | 6 +++---
 app/controllers/admin/assessors_controller.rb | 6 +++---
 app/controllers/admin/judges_controller.rb    | 6 +++---
 app/views/admin/admins/_form.html.slim        | 2 +-
 app/views/admin/assessors/_form.html.slim     | 2 +-
 app/views/admin/judges/_form.html.slim        | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/controllers/admin/admins_controller.rb b/app/controllers/admin/admins_controller.rb
index 65753238b2..c93bc20e20 100644
--- a/app/controllers/admin/admins_controller.rb
+++ b/app/controllers/admin/admins_controller.rb
@@ -20,7 +20,7 @@ def create
 
     @resource.save
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     location = @resource.persisted? ? admin_admins_path : nil
     respond_with :admin, @resource, location: location
@@ -35,7 +35,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
     
     respond_with :admin, @resource, location: admin_admins_path
   end
@@ -44,7 +44,7 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
     
     respond_with :admin, @resource, location: admin_admins_path
   end
diff --git a/app/controllers/admin/assessors_controller.rb b/app/controllers/admin/assessors_controller.rb
index f41faa68bd..c44ea782bb 100644
--- a/app/controllers/admin/assessors_controller.rb
+++ b/app/controllers/admin/assessors_controller.rb
@@ -21,7 +21,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_assessors_path : nil
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -35,7 +35,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: admin_assessors_path
   end
@@ -44,7 +44,7 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: admin_assessors_path
   end
diff --git a/app/controllers/admin/judges_controller.rb b/app/controllers/admin/judges_controller.rb
index 5ee3060f81..ebbc59a5b6 100644
--- a/app/controllers/admin/judges_controller.rb
+++ b/app/controllers/admin/judges_controller.rb
@@ -21,7 +21,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_judges_path : nil
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -35,7 +35,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: admin_judges_path
   end
@@ -44,7 +44,7 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
-    render_flash_message_for(@resource)
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: admin_judges_path
   end
diff --git a/app/views/admin/admins/_form.html.slim b/app/views/admin/admins/_form.html.slim
index 4e84f3c8f3..d714f5004c 100644
--- a/app/views/admin/admins/_form.html.slim
+++ b/app/views/admin/admins/_form.html.slim
@@ -1,6 +1,6 @@
 .js-admin-strict-password-form
 
-= simple_form_for [:admin, resource], html: { class: 'qae-form' } do |f|
+= simple_form_for [:admin, resource], html: { class: 'qae-form', data: { type: "json",  controller: "inline-flash element-scroll", inline_flash_target: "form" } } do |f|
   .row.question-group
     .col-lg-2.col-md-3.col-sm-4
       h3 = f.label :first_name, class: "form-label"
diff --git a/app/views/admin/assessors/_form.html.slim b/app/views/admin/assessors/_form.html.slim
index 62a9ab399a..4af2e46ced 100644
--- a/app/views/admin/assessors/_form.html.slim
+++ b/app/views/admin/assessors/_form.html.slim
@@ -1,4 +1,4 @@
-= simple_form_for [:admin, resource], as: :assessor, url: resource.persisted? ? admin_assessor_path(resource) : admin_assessors_path, html: { class: 'qae-form' } do |f|
+= simple_form_for [:admin, resource], as: :assessor, url: resource.persisted? ? admin_assessor_path(resource) : admin_assessors_path, html: { class: 'qae-form', data: { controller: "inline-flash element-scroll", inline_flash_target: "form" } } do |f|
   .row.question-group
     .col-lg-2.col-md-3.col-sm-4
       h2 = f.label :first_name, class: "form-label"
diff --git a/app/views/admin/judges/_form.html.slim b/app/views/admin/judges/_form.html.slim
index 9f10a57bce..e188f7d6bd 100644
--- a/app/views/admin/judges/_form.html.slim
+++ b/app/views/admin/judges/_form.html.slim
@@ -1,4 +1,4 @@
-= simple_form_for [:admin, resource], as: :judge, url: resource.persisted? ? admin_judge_path(resource) : admin_judges_path, html: { class: 'qae-form' } do |f|
+= simple_form_for [:admin, resource], as: :judge, url: resource.persisted? ? admin_judge_path(resource) : admin_judges_path, html: { class: 'qae-form', data: { type: "json",  controller: "inline-flash element-scroll", inline_flash_target: "form" } } do |f|
   .row.question-group
     .col-lg-2.col-md-3.col-sm-4
       h3 = f.label :first_name, class: "form-label"

From 374e3e016a2caf14a06f1e246d9e2c6bab22a010 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 24 Aug 2023 14:07:10 +0200
Subject: [PATCH 287/352] Bulk assign assessors button as `button` element

---
 app/views/assessor/form_answers/_bulk_assignment.html.slim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/assessor/form_answers/_bulk_assignment.html.slim b/app/views/assessor/form_answers/_bulk_assignment.html.slim
index 78ffd2bee8..8c1b852c3e 100644
--- a/app/views/assessor/form_answers/_bulk_assignment.html.slim
+++ b/app/views/assessor/form_answers/_bulk_assignment.html.slim
@@ -1,6 +1,7 @@
 - if show_bulk_assignment?
   .if-no-js-hide[data-controller="element-focus"]
-    .btn.bulk-assign-assessors-link[data-element-focus-target="reveal"] Bulk Assign Assessors
+    button.btn.bulk-assign-assessors-link[data-element-focus-target="reveal" type="button"] 
+      | Bulk Assign Assessors
 
     .bulk-assign-assessors-form
       .well

From 6ae082cdf583a7864552d81a41de2fbe857f3682 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Wed, 23 Aug 2023 10:20:03 +0100
Subject: [PATCH 288/352] Adds timeout warning popup

---
 .../javascripts/admin/timeout_popup.js.coffee | 33 +++++++++++++++++++
 .../admin/session_checks_controller.rb        | 12 +++++++
 .../assessor/session_checks_controller.rb     | 12 +++++++
 .../concerns/session_status_check_mixin.rb    | 19 +++++++++++
 .../judge/session_checks_controller.rb        | 12 +++++++
 app/views/layouts/application-admin.html.slim |  1 +
 .../layouts/application-assessor.html.slim    |  2 ++
 app/views/layouts/application-judge.html.slim |  1 +
 .../shared/_timeout_warning_popup.html.slim   | 25 ++++++++++++++
 config/routes.rb                              |  7 ++++
 10 files changed, 124 insertions(+)
 create mode 100644 app/assets/javascripts/admin/timeout_popup.js.coffee
 create mode 100644 app/views/shared/_timeout_warning_popup.html.slim

diff --git a/app/assets/javascripts/admin/timeout_popup.js.coffee b/app/assets/javascripts/admin/timeout_popup.js.coffee
new file mode 100644
index 0000000000..26cac23ce8
--- /dev/null
+++ b/app/assets/javascripts/admin/timeout_popup.js.coffee
@@ -0,0 +1,33 @@
+$(window).load ->
+  prefix = '/' + window.namespace
+  hasDisplayedWarning = false
+
+  $(document).on 'click', '.extend-session', (e) ->
+    e.preventDefault()
+    $('.js-session-timeout-warning-popup').modal 'hide'
+    $.post prefix + '/session_checks/extend.json?__t=' + window.lastRequestAt, ->
+      $('.js-session-timeout-warning-popup').modal 'hide'
+      hasDisplayedWarning = false
+
+  if window.timeoutTime and window.timeoutTime > 0
+    checkInterval = setInterval((->
+      $.ajax
+        url: prefix + '/session_checks.json'
+        type: 'GET'
+        success: (data) ->
+          remaining = Math.round(window.timeoutTime / 60000 - (data.elapsed))
+          $('.js-session-timeout-warning-popup .time-target').html ' ' + remaining + ' '
+          if remaining < 5 and !hasDisplayedWarning
+            hasDisplayedWarning = true
+            $('.js-session-timeout-warning-popup').modal
+              backdrop: 'static'
+              keyboard: true
+        complete: (response) ->
+          if response.status == 401
+            clearInterval checkInterval
+            $('.js-session-timeout-warning-popup').modal 'hide'
+            $('.js-session-timeout-popup').modal
+              backdrop: 'static'
+              keyboard: false
+        dataType: 'json'
+    ), 10 * 1000)
diff --git a/app/controllers/admin/session_checks_controller.rb b/app/controllers/admin/session_checks_controller.rb
index 0a0510a677..5ba9cc8679 100644
--- a/app/controllers/admin/session_checks_controller.rb
+++ b/app/controllers/admin/session_checks_controller.rb
@@ -1,6 +1,18 @@
 class Admin::SessionChecksController < ActionController::Base
   include SessionStatusCheckMixin
 
+  def show
+    if session_is_valid?
+      render json: { elapsed: elapsed }, status: :ok
+    else
+      head :unauthorized
+    end
+  end
+
+  def extend
+    super
+  end
+
   private
 
   def namespace
diff --git a/app/controllers/assessor/session_checks_controller.rb b/app/controllers/assessor/session_checks_controller.rb
index fe2f0f3824..9f56f9fc43 100644
--- a/app/controllers/assessor/session_checks_controller.rb
+++ b/app/controllers/assessor/session_checks_controller.rb
@@ -1,6 +1,18 @@
 class Assessor::SessionChecksController < ActionController::Base
   include SessionStatusCheckMixin
 
+  def show
+    if session_is_valid?
+      render json: { elapsed: elapsed }, status: :ok
+    else
+      head :unauthorized
+    end
+  end
+
+  def extend
+    super
+  end
+
   private
 
   def namespace
diff --git a/app/controllers/concerns/session_status_check_mixin.rb b/app/controllers/concerns/session_status_check_mixin.rb
index 88ed65014e..b0c63e07c0 100644
--- a/app/controllers/concerns/session_status_check_mixin.rb
+++ b/app/controllers/concerns/session_status_check_mixin.rb
@@ -19,6 +19,10 @@ def show
     end
   end
 
+  def extend
+    render json: { elapsed: elapsed }, status: :ok
+  end
+
   private
 
   def skip_timeout
@@ -34,4 +38,19 @@ def session_is_valid?
       judge_signed_in?
     end
   end
+
+  def now
+    Time.now.in_time_zone("UTC")
+  end
+
+  def elapsed
+    session = if namespace == ADMIN_NAMESPACE
+        admin_session
+      elsif namespace == ASSESSOR_NAMESPACE
+        assessor_session
+      elsif namespace == JUDGE_NAMESPACE
+        judge_session
+    end
+    (now - (session["last_request_at"] || params['__t'].to_i)).to_i / 1.minutes
+  end
 end
diff --git a/app/controllers/judge/session_checks_controller.rb b/app/controllers/judge/session_checks_controller.rb
index 946c195271..ad9a5b962c 100644
--- a/app/controllers/judge/session_checks_controller.rb
+++ b/app/controllers/judge/session_checks_controller.rb
@@ -1,6 +1,18 @@
 class Judge::SessionChecksController < ActionController::Base
   include SessionStatusCheckMixin
 
+  def show
+    if session_is_valid?
+      render json: { elapsed: elapsed }, status: :ok
+    else
+      head :unauthorized
+    end
+  end
+
+  def extend
+    super
+  end
+
   private
 
   def namespace
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index e9b8c796a7..02e3994181 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -119,6 +119,7 @@ html.no-js
                                   method: :delete
           = render "shared/dev_or_staging_banner"
           = render "shared/non_js_banner"
+          = render "shared/timeout_warning_popup"
 
         #main-container role="main"
           .container
diff --git a/app/views/layouts/application-assessor.html.slim b/app/views/layouts/application-assessor.html.slim
index 4a72b60887..574560295b 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -94,6 +94,8 @@ html.no-js
                                   method: :delete
           = render "shared/dev_or_staging_banner"
           = render "shared/non_js_banner"
+          = render "shared/timeout_warning_popup"
+
 
         #main-container role="main"
           .container
diff --git a/app/views/layouts/application-judge.html.slim b/app/views/layouts/application-judge.html.slim
index 90192b7d8c..147da60767 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -91,6 +91,7 @@ html.no-js
                                   method: :delete
           = render "shared/dev_or_staging_banner"
           = render "shared/non_js_banner"
+          = render "shared/timeout_warning_popup"
 
         #main-container role="main"
           .container
diff --git a/app/views/shared/_timeout_warning_popup.html.slim b/app/views/shared/_timeout_warning_popup.html.slim
new file mode 100644
index 0000000000..5190b71f20
--- /dev/null
+++ b/app/views/shared/_timeout_warning_popup.html.slim
@@ -0,0 +1,25 @@
+.modal.fade.js-session-timeout-warning-popup tabindex="-1" role="dialog" aria-live="polite"
+  .modal-dialog.modal-md-important role="document"
+    .modal-content
+      .modal-body
+        button type="button" class="close" data-dismiss="modal" aria-label="Close"
+          span aria-hidden="true"
+            | &times;
+
+        h4
+          | Session Expiration Warning
+
+        p
+          | In
+          span.time-target
+          = "minutes you will be automatically logged out because of prolonged inactivity (#{distance_of_time_in_words(Time.now, Time.now + current_subject.timeout_in, only: [:minutes, :hours])}), to keep your data safe."
+        br
+        .clearfix
+          button.btn.btn-primary.extend-session.pull-right
+            | Extend Session
+          = link_to "Log Out", destroy_user_session_url, method: :delete, class: "btn btn-primary-outline pull-left"
+
+javascript:
+    window.namespace = "#{namespace_name}";
+    window.timeoutTime = #{current_subject && current_subject.remember_created_at.blank? ? current_subject.timeout_in.to_i * 1000 : 0};
+    window.lastRequestAt = #{Time.zone.now.to_i}
diff --git a/config/routes.rb b/config/routes.rb
index f013dfbe94..aeb3833522 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -214,6 +214,7 @@
 
     scope format: true, constraints: { format: 'json' } do
       resource :session_checks, only: [:show]
+      post 'session_checks/extend' => 'session_checks#extend'
     end
   end
 
@@ -334,6 +335,7 @@
 
     scope format: true, constraints: { format: 'json' } do
       resource :session_checks, only: [:show]
+      post 'session_checks/extend' => 'session_checks#extend'
     end
   end
 
@@ -350,5 +352,10 @@
     resources :case_summaries, only: :index do
       get :download, on: :collection
     end
+
+    scope format: true, constraints: { format: 'json' } do
+      resource :session_checks, only: [:show]
+      post 'session_checks/extend' => 'session_checks#extend'
+    end
   end
 end

From 05f4842cad0a7a77f7ad05b114cc7b48965bfa69 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 24 Aug 2023 14:21:00 +0100
Subject: [PATCH 289/352] Increases user timeout to 20 hours

---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2c65404673..54fdda4b19 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -161,7 +161,7 @@ def new_member?
   end
 
   def timeout_in
-    60.minutes
+    1200.minutes
   end
 
   def check_email_on_bounces!

From 8c645f6ab6b446a58d93c1d5ad39305074b65b3a Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 24 Aug 2023 17:08:44 +0200
Subject: [PATCH 290/352] Revert adding `autofocus` to skip button

---
 app/views/layouts/application-admin.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index e9b8c796a7..3fad9a5495 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -38,7 +38,7 @@ html.no-js
   body#admin-layout data-autosave-token="#{current_admin.try(:autosave_token)}" class="admin-layout #{controller_name}-page #{action_name}-page #{controller_name}-#{action_name}-page #{yield :page_class} #{'layout-dev' if Rails.env.development?}"
     #site-wrapper
       #site-wrapper-margin
-        a href="#main-container" autofocus="true" class="btn btn-lg skip-main-content" onclick="document.getElementById('main-container').focus()" role="button"
+        a href="#main-container" class="btn btn-lg skip-main-content" onclick="document.getElementById('main-container').focus()" role="button"
           | Skip to main content
         #site-header.clearfix
           .navbar.clearfix role="navigation"

From 95ce315a0264fefa15805db5f49e5e87b8478c49 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 24 Aug 2023 17:39:45 +0200
Subject: [PATCH 291/352] Bump chromedriver version in CI

---
 .github/workflows/ci.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dcc470cb51..7e2bd01778 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ jobs:
     services:
       db:
         image: postgres:12-alpine
-        ports: ["5432:5432"]
+        ports: ['5432:5432']
         env:
           POSTGRES_DB: qae_test
           POSTGRES_USER: postgres
@@ -18,7 +18,7 @@ jobs:
           --health-retries 5
       redis:
         image: redis
-        ports: ["6379:6379"]
+        ports: ['6379:6379']
         options: --entrypoint redis-server
 
     steps:
@@ -45,17 +45,17 @@ jobs:
           ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: "16"
+          node-version: '16'
       - run: npm install -g yarn
       - uses: nanasess/setup-chromedriver@master
         with:
-            chromedriver-version: '114.0.5735.90'
+          chromedriver-version: '116.0.5845.9600'
       - name: Build and run tests
         env:
           DISPLAY_SOCIAL_MOBILITY_AWARD: true
-          DATABASE_URL: "postgresql://postgres:postgres@localhost:5432/qae_test"
+          DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/qae_test'
           BUNDLER_VERSION: 2.4.16
-          DOCKER_TLS_CERTDIR: ""
+          DOCKER_TLS_CERTDIR: ''
         run: |
           sudo apt update
           sudo apt-get -yqq install postgresql postgresql-client libpq-dev xvfb unzip libcurl4 libcurl3-gnutls libcurl4-openssl-dev
@@ -85,12 +85,12 @@ jobs:
           ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: "16"
-      - name: "Deploy dev"
+          node-version: '16'
+      - name: 'Deploy dev'
         env:
           name: dev
-          url: "https://dev.queens-awards-enterprise.service.gov.uk/"
-          CF_ENDPOINT: "api.london.cloud.service.gov.uk"
+          url: 'https://dev.queens-awards-enterprise.service.gov.uk/'
+          CF_ENDPOINT: 'api.london.cloud.service.gov.uk'
           CF_SPACE: dev
           CF_APP: qae-dev
           CF_USER: ${{ secrets.CF_USER }}
@@ -126,12 +126,12 @@ jobs:
           ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: "16"
-      - name: "Deploy staging"
+          node-version: '16'
+      - name: 'Deploy staging'
         env:
           name: staging
-          url: "https://staging.queens-awards-enterprise.service.gov.uk/"
-          CF_ENDPOINT: "api.london.cloud.service.gov.uk"
+          url: 'https://staging.queens-awards-enterprise.service.gov.uk/'
+          CF_ENDPOINT: 'api.london.cloud.service.gov.uk'
           CF_SPACE: staging
           CF_APP: qae-staging
           CF_USER: ${{ secrets.CF_USER }}

From 79b3737bbb6a5b32718c4f48ef9991a689616ce3 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 25 Aug 2023 10:40:51 +0100
Subject: [PATCH 292/352] Use noon and midnight for deadline time if 12

---
 app/mailers/account_mailers/reminder_to_submit_mailer.rb | 4 +++-
 app/renderers/mail_renderer.rb                           | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/mailers/account_mailers/reminder_to_submit_mailer.rb b/app/mailers/account_mailers/reminder_to_submit_mailer.rb
index f46a38a775..879ccb0833 100644
--- a/app/mailers/account_mailers/reminder_to_submit_mailer.rb
+++ b/app/mailers/account_mailers/reminder_to_submit_mailer.rb
@@ -4,7 +4,9 @@ def notify(form_answer_id, collaborator_id)
     @user = @form_answer.user
 
     submission_deadline = Settings.current_submission_deadline
-    @deadline = submission_deadline.strftime("%l%P on %A %d %B %Y")
+    deadline_time = formatted_deadline_time(submission_deadline)
+    deadline_date = submission_deadline.trigger_at.strftime("%A %d %B %Y")
+    @deadline = "#{deadline_time} on #{deadline_date}"
 
     ordinal = submission_deadline.trigger_at.day.ordinal
     subject_deadline = submission_deadline.strftime("%e#{ordinal} %B")
diff --git a/app/renderers/mail_renderer.rb b/app/renderers/mail_renderer.rb
index 82124f6139..6b855cc527 100644
--- a/app/renderers/mail_renderer.rb
+++ b/app/renderers/mail_renderer.rb
@@ -92,7 +92,8 @@ def reminder_to_submit
 
     assigns[:user] = dummy_user("Jon", "Doe", "Jane's Company")
     assigns[:form_answer] = form_answer
-    assigns[:deadline] = deadline_str("submission_end", "%I%P on %A %d %B %Y")
+    deadline_time = deadline_time("submission_end")
+    assigns[:deadline] = deadline_str("submission_end", "#{deadline_time} on %A %d %B %Y")
 
     render(assigns, "account_mailers/reminder_to_submit_mailer/preview/notify")
   end

From 82ca6ebf5c8c9ebfbcb7b5ef3d8c45dd76ca3a3e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Fri, 25 Aug 2023 13:59:49 +0100
Subject: [PATCH 293/352] Copy changes to reminder to submit mailer

---
 .../reminder_to_submit_mailer/notify.text.erb  | 14 +++++++++-----
 .../preview/notify.html.slim                   | 18 ++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb b/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
index 7ca3967bd4..3206d9cfe3 100644
--- a/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
+++ b/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
@@ -1,13 +1,17 @@
-Dear King’s Award applicant,
+Dear King's Award applicant,
 
-We’re really happy to hear that you’ve started your application. Please don’t forget to complete and submit it by <%= @deadline %>. After that date, you will lose your chance for your business to be awarded this internationally respected accolade. So act now!
+We're really happy to hear that you've started your application, so please don't forget to complete and submit it by <%= @deadline %>.
 
-Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or have a highly effective sustainable development programme, these Awards are a unique way to recognise your achievements.
+Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, receiving a King's Award is a unique way to gain recognition for your achievements.
 
-Visit the King’s Awards for Enterprise website to continue and submit your application via the link below:
+If you miss the deadline, you will lose the chance for your business to receive this internationally-respected accolade. So act now!
+
+If you have any queries, please contact us at kingsawards@beis.gov.uk or via the Helpline on 020 7 215 6880.
+
+Visit the King's Awards for Enterprise website to continue and submit your application via the link below:
 <%= edit_form_url(id: @form_answer.id) %>
 
-If you have already submitted your application - for example for another category, or you have decided not to submit your application - please ignore this message.
+If you have already submitted your application - for example, for another category, or you have decided not to submit your application - please ignore this message, and thank you for your interest in The King's Awards.
 
 Thank you,
 
diff --git a/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim b/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
index 5014eea2fb..e715fdd4f4 100644
--- a/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
+++ b/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
@@ -1,22 +1,28 @@
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | Dear King’s Award applicant,
+  | Dear King's Award applicant,
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | We’re really happy to hear that you’ve started your application. Please don’t forget to complete and submit it by
+  | We're really happy to hear that you've started your application, so please don't forget to complete and submit it by
   =< @deadline
-  | . After that date, you will lose your chance for your business to be awarded this internationally respected accolade. So act now!
+  | .
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or have a highly effective sustainable development programme, these Awards are a unique way to recognise your achievements.
+  | Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, receiving a King's Award is a unique way to gain recognition for your achievements.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | Visit the King’s Awards for Enterprise website to continue and submit your application via the link below:
+  | If you miss the deadline, you will lose your chance for your business to receive this internationally-respected accolade. So act now!
+
+p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
+  | If you have any queries, please contact us at kingsawards@beis.gov.uk or via the Helpline on 020 7 215 6880.
+
+p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
+  | Visit the King's Awards for Enterprise website to continue and submit your application via the link below:
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   = link_to edit_form_url(id: @form_answer.id), edit_form_url(id: @form_answer.id)
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
-  | If you have already submitted your application - for example for another category, or you have decided not to submit your application - please ignore this message.
+  | If you have already submitted your application - for example, for another category, or you have decided not to submit your application - please ignore this message, and thank you for your interest in The King's Awards.
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   | Thank you,

From fa20d5d76582fb5c915add8ddfa4099add88a71e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:28:27 +0200
Subject: [PATCH 294/352] Fix user error messages and only display uniq ones

---
 app/controllers/admin/users_controller.rb  | 4 ++--
 app/validators/advanced_email_validator.rb | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b9813110ea..8be749cde0 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -28,7 +28,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_users_path : nil
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.uniq.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -42,7 +42,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.uniq.flatten.join("<br />"))
 
     respond_with :admin, @resource, location: admin_users_path
   end
diff --git a/app/validators/advanced_email_validator.rb b/app/validators/advanced_email_validator.rb
index fef46dec3e..eda403dc98 100644
--- a/app/validators/advanced_email_validator.rb
+++ b/app/validators/advanced_email_validator.rb
@@ -24,12 +24,12 @@ def has_mx_records(domain)
   end
 
   def set_error(record)
-    record.errors.add(:email, "is not a valid address")
+    record.errors.add(:email, :invalid)
   end
 
   def maybe_set_error(record, message)
     yield.tap do |value|
-      record.errors.add(:email, message) if value
+      record.errors.add(:email, message: message) if value
     end
   end
 

From 48be2d5149b28618796d10a74f69115d6dbf0fe3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:29:02 +0200
Subject: [PATCH 295/352] Fix notification flash messages when editing/deleting

---
 app/views/admin/settings/_notification.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/settings/_notification.html.slim b/app/views/admin/settings/_notification.html.slim
index b60ca7ba34..60ab8eb71b 100644
--- a/app/views/admin/settings/_notification.html.slim
+++ b/app/views/admin/settings/_notification.html.slim
@@ -14,9 +14,9 @@ li id="notification-#{notification.id}"
       - if policy(notification).destroy?
         span.if-no-js-hide
           '  |
-        = button_to "Delete", admin_settings_email_notification_path(notification), { onclick: "return confirm('Are you sure?')", method: :delete, remote: true }
+        = button_to "Delete", admin_settings_email_notification_path(notification), { onclick: "return confirm('Are you sure?')", method: :delete, remote: true, data: { action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error", inline_flash_target: "form" } }
     .notification-edit-form.well
-      = simple_form_for notification, url: admin_settings_email_notification_path(notification, year: params[:year]), remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["input"] } } do |f|
+      = simple_form_for notification, url: admin_settings_email_notification_path(notification, year: params[:year]), remote: true, authenticity_token: true, html: { data: { action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error", inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["input"] } } do |f|
         .control-date
           label.control-label Edit schedule
           = f.input :trigger_at,

From cd1732dca60297d08014e9d502303ff4d3465ca3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:42:44 +0200
Subject: [PATCH 296/352] Remove `autofocus` from textarea attributes to
 prevent focus on initial render

---
 app/views/admin/comments/_form.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/comments/_form.html.slim b/app/views/admin/comments/_form.html.slim
index a2c28adab8..8019516dfb 100644
--- a/app/views/admin/comments/_form.html.slim
+++ b/app/views/admin/comments/_form.html.slim
@@ -2,7 +2,7 @@
   label
     ' Add a comment
   = f.hidden_field :section, id: "#{f.object.section}_section_hidden_field"
-  = f.text_area :body, id: "#{f.object.section}_comment_body", autofocus: true, class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment", required: true
+  = f.text_area :body, id: "#{f.object.section}_comment_body", class: 'form-control', rows: 4, "data-behavior" => "autosave", "data-autosave-key" => "#{@form_answer.id}-#{f.object.section}-new-comment", required: true
   .comment-actions
     = f.check_box :flagged, id: "#{f.object.section}_flagged_hidden_checkbox"
     = link_to "#flag-comment", class: "link-flag-comment js-link-flag-comment"

From 401e24388751fbd2424fc34b591f988fa739dd1e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 25 Aug 2023 15:58:58 +0200
Subject: [PATCH 297/352] Fix overlapping elements when adding assessor

---
 app/assets/stylesheets/admin/page-applications.scss | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/admin/page-applications.scss b/app/assets/stylesheets/admin/page-applications.scss
index 5932778653..1553e5ac51 100644
--- a/app/assets/stylesheets/admin/page-applications.scss
+++ b/app/assets/stylesheets/admin/page-applications.scss
@@ -559,7 +559,10 @@
   }
   
   .alert ~ form > .form-edit-link {
-    top: pxToRem(40);
+    display: flex;
+    float: right;
+    margin-top: pxToRem(-54);
+    position: relative;
   }
 }
 

From 3f90807dde808b24167d1e058644ab955bb9cc9e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 28 Aug 2023 11:51:33 +0200
Subject: [PATCH 298/352] Handle primary/secondary assessors not being assigned

---
 app/services/assessment_submission_service.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/services/assessment_submission_service.rb b/app/services/assessment_submission_service.rb
index 76b3f61f76..c2dd1b691e 100644
--- a/app/services/assessment_submission_service.rb
+++ b/app/services/assessment_submission_service.rb
@@ -156,11 +156,11 @@ def check_if_there_are_any_discrepancies_between_primary_and_secondary_appraisal
 
       res = {
         discrepancies: discrepancies,
-        primary_assessor_name: primary_assessor.full_name,
-        primary_assessor_email: primary_assessor.email,
+        primary_assessor_name: primary_assessor&.full_name,
+        primary_assessor_email: primary_assessor&.email,
         primary_assessor_submitted_at: format_date(primary_assessment.submitted_at),
-        secondary_assessor_name: secondary_assessor.full_name,
-        secondary_assessor_email: secondary_assessor.email,
+        secondary_assessor_name: secondary_assessor&.full_name,
+        secondary_assessor_email: secondary_assessor&.email,
         secondary_assessor_submitted_at: format_date(secondary_assessment.submitted_at)
       }
 

From 7799cb3045bc811875983569b93435b88db3b406 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 28 Aug 2023 12:13:07 +0200
Subject: [PATCH 299/352] Submit form via `HTML` and fix rendering flash
 messages when submitting appraisals

---
 app/controllers/admin/base_controller.rb                      | 2 +-
 app/controllers/assessor/base_controller.rb                   | 2 +-
 app/controllers/concerns/assessment_submission_mixin.rb       | 2 +-
 .../_case_summary_submit_block.html.slim                      | 3 ---
 app/views/layouts/application-assessor.html.slim              | 4 ++++
 app/views/layouts/application-judge.html.slim                 | 4 ++++
 6 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index df5ed2dd5b..43d10a6c43 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -24,7 +24,7 @@ def render_flash_message_for(resource, message: nil)
     if resource.errors.any?
       flash.now[:error] = message || "An unknown error has occurred, please try again."
     else
-      flash.now[:notice] = message || "Success!"
+      flash[:notice] = message || "Success!"
     end
   end
 
diff --git a/app/controllers/assessor/base_controller.rb b/app/controllers/assessor/base_controller.rb
index c1bfb15608..1fd0b17dea 100644
--- a/app/controllers/assessor/base_controller.rb
+++ b/app/controllers/assessor/base_controller.rb
@@ -21,7 +21,7 @@ def current_subject
 
   def render_flash_message_for(resource, message: nil)
     if resource.errors.any?
-      flash[:error] = message || "An unknown error has occurred, please try again."
+      flash.now[:error] = message || "An unknown error has occurred, please try again."
     else
       flash[:notice] = message || "Success!"
     end
diff --git a/app/controllers/concerns/assessment_submission_mixin.rb b/app/controllers/concerns/assessment_submission_mixin.rb
index 28ec46ffb6..3f4bf3380e 100644
--- a/app/controllers/concerns/assessment_submission_mixin.rb
+++ b/app/controllers/concerns/assessment_submission_mixin.rb
@@ -37,7 +37,7 @@ def form_answer
 
   def flash_message
     return nil if resource.errors.none?
-    resource.errors.full_messages.join(", ")
+    resource.errors.full_messages.join("<br />")
   end
 
   def json_response
diff --git a/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim b/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim
index 377907f0cc..6b2fd07d75 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim
@@ -10,9 +10,7 @@
     .clear
 
 - elsif assessment.submitted?
-
   - if policy(assessment).can_unlock?
-
     - unlock_url = namespace_name == :admin ? unlock_admin_assessment_submission_url(assessment) : unlock_assessor_assessment_submission_url(assessment)
 
     = form_tag unlock_url, method: :patch do
@@ -29,6 +27,5 @@
       ' Case Summary Submitted
 
 - elsif !assessment.submitted?
-
   .feedback-holder.alert.alert-info
     ' Case Summary is not submitted yet!
diff --git a/app/views/layouts/application-assessor.html.slim b/app/views/layouts/application-assessor.html.slim
index 4a72b60887..17bdd82f97 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -105,6 +105,10 @@ html.no-js
               .alert-container
                 .alert.alert-danger
                   == alert
+            - unless flash[:error].blank?
+              .alert-container
+                .alert.alert-danger
+                  == flash[:error]
 
             = yield
 
diff --git a/app/views/layouts/application-judge.html.slim b/app/views/layouts/application-judge.html.slim
index 90192b7d8c..a2f673ee9d 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -102,6 +102,10 @@ html.no-js
               .alert-container
                 .alert.alert-danger
                   == alert
+            - unless flash[:error].blank?
+              .alert-container
+                .alert.alert-danger
+                  == flash[:error]
 
             = yield
 

From 123db2f6afd7debcb051bcf1d6f854fe14a97c0f Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 28 Aug 2023 14:34:38 +0200
Subject: [PATCH 300/352] FIX: Fix FY input fields for companies older 100
 years

---
 app/models/settings.rb                        |  6 +++++
 .../v2024/innovation/innovation_step4.rb      | 26 +++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/models/settings.rb b/app/models/settings.rb
index 0fea05affb..61fd108cf0 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -1,6 +1,8 @@
 class Settings < ApplicationRecord
   self.table_name = "settings"
 
+  COMPANIES_HOUSE_REGISTERING_SINCE = 1844
+
   has_many :deadlines, dependent: :destroy
   has_many :email_notifications, dependent: :destroy
 
@@ -165,6 +167,10 @@ def submission_deadline_title
       formatted_datetime = current_submission_deadline.strftime("%d %b %Y at %H:%M%P")
       "Submission deadline: #{formatted_datetime}"
     end
+
+    def min_started_trading
+      (Date.current.year - (Date.new(COMPANIES_HOUSE_REGISTERING_SINCE).year))
+    end
   end
 
   def winners_email_notification
diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index f31eda9e1c..418aacb789 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -62,7 +62,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :yes
         end
 
@@ -115,7 +115,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :true
 
           employees_question
@@ -138,7 +138,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -154,7 +154,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -168,7 +168,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
           turnover :total_turnover
@@ -185,7 +185,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           context %(
             <p>
               Use a minus symbol to record any losses.
@@ -209,7 +209,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -330,7 +330,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
@@ -345,7 +345,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_exports, "Of which exports (if applicable)." do
@@ -360,7 +360,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
@@ -375,7 +375,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :drops_in_sales, "Explain any drop in sales or the number of units sold (if applicable)." do
@@ -403,7 +403,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :avg_unit_price_desc, "Explain your unit selling prices or contract values, highlighting any changes over the above periods (if applicable)." do
@@ -428,7 +428,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :costs_change_desc, "Explain your direct unit or contract costs, highlighting any changes over the above periods (if applicable)." do

From bd955fb98af5d93b17477231b79bf3ea1e624fe6 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 28 Aug 2023 14:34:38 +0200
Subject: [PATCH 301/352] FIX: Fix FY input fields for companies older 100
 years

---
 app/models/settings.rb                        |  6 +++++
 .../v2024/innovation/innovation_step4.rb      | 26 +++++++++----------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/models/settings.rb b/app/models/settings.rb
index 0fea05affb..61fd108cf0 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -1,6 +1,8 @@
 class Settings < ApplicationRecord
   self.table_name = "settings"
 
+  COMPANIES_HOUSE_REGISTERING_SINCE = 1844
+
   has_many :deadlines, dependent: :destroy
   has_many :email_notifications, dependent: :destroy
 
@@ -165,6 +167,10 @@ def submission_deadline_title
       formatted_datetime = current_submission_deadline.strftime("%d %b %Y at %H:%M%P")
       "Submission deadline: #{formatted_datetime}"
     end
+
+    def min_started_trading
+      (Date.current.year - (Date.new(COMPANIES_HOUSE_REGISTERING_SINCE).year))
+    end
   end
 
   def winners_email_notification
diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index f31eda9e1c..418aacb789 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -62,7 +62,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :yes
         end
 
@@ -115,7 +115,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :true
 
           employees_question
@@ -138,7 +138,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -154,7 +154,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -168,7 +168,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
           turnover :total_turnover
@@ -185,7 +185,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           context %(
             <p>
               Use a minus symbol to record any losses.
@@ -209,7 +209,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -330,7 +330,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
@@ -345,7 +345,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_exports, "Of which exports (if applicable)." do
@@ -360,7 +360,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
@@ -375,7 +375,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :drops_in_sales, "Explain any drop in sales or the number of units sold (if applicable)." do
@@ -403,7 +403,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :avg_unit_price_desc, "Explain your unit selling prices or contract values, highlighting any changes over the above periods (if applicable)." do
@@ -428,7 +428,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 99, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :costs_change_desc, "Explain your direct unit or contract costs, highlighting any changes over the above periods (if applicable)." do

From 8d667aa442678b20b09004250947cb703b7686fe Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 29 Aug 2023 09:47:49 +0100
Subject: [PATCH 302/352] Add pluralise condition to timeout javascript

---
 app/assets/javascripts/admin/timeout_popup.js.coffee | 5 ++++-
 app/views/shared/_timeout_warning_popup.html.slim    | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/timeout_popup.js.coffee b/app/assets/javascripts/admin/timeout_popup.js.coffee
index 26cac23ce8..9e63aba6df 100644
--- a/app/assets/javascripts/admin/timeout_popup.js.coffee
+++ b/app/assets/javascripts/admin/timeout_popup.js.coffee
@@ -16,7 +16,10 @@ $(window).load ->
         type: 'GET'
         success: (data) ->
           remaining = Math.round(window.timeoutTime / 60000 - (data.elapsed))
-          $('.js-session-timeout-warning-popup .time-target').html ' ' + remaining + ' '
+          if remaining == 1
+            $('.js-session-timeout-warning-popup .time-target').html ' ' + remaining + ' minute'
+          else
+            $('.js-session-timeout-warning-popup .time-target').html ' ' + remaining + ' minutes'
           if remaining < 5 and !hasDisplayedWarning
             hasDisplayedWarning = true
             $('.js-session-timeout-warning-popup').modal
diff --git a/app/views/shared/_timeout_warning_popup.html.slim b/app/views/shared/_timeout_warning_popup.html.slim
index 5190b71f20..9846711cbc 100644
--- a/app/views/shared/_timeout_warning_popup.html.slim
+++ b/app/views/shared/_timeout_warning_popup.html.slim
@@ -12,7 +12,7 @@
         p
           | In
           span.time-target
-          = "minutes you will be automatically logged out because of prolonged inactivity (#{distance_of_time_in_words(Time.now, Time.now + current_subject.timeout_in, only: [:minutes, :hours])}), to keep your data safe."
+          =< "you will be automatically logged out because of prolonged inactivity (#{distance_of_time_in_words(Time.now, Time.now + current_subject.timeout_in, only: [:minutes, :hours])}), to keep your data safe."
         br
         .clearfix
           button.btn.btn-primary.extend-session.pull-right
@@ -23,3 +23,4 @@ javascript:
     window.namespace = "#{namespace_name}";
     window.timeoutTime = #{current_subject && current_subject.remember_created_at.blank? ? current_subject.timeout_in.to_i * 1000 : 0};
     window.lastRequestAt = #{Time.zone.now.to_i}
+    window.timeoutTime = 1

From 1f3c2137250b681ca439f9936f701c0a08bc9d52 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 29 Aug 2023 09:55:06 +0100
Subject: [PATCH 303/352] Add timeout as env variable

---
 .env.example                                      | 5 +++--
 app/models/user.rb                                | 2 +-
 app/views/shared/_timeout_warning_popup.html.slim | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.env.example b/.env.example
index 5796d781c5..9eab453cfa 100644
--- a/.env.example
+++ b/.env.example
@@ -14,7 +14,7 @@ SENDGRID_USERNAME=test_smtp_username
 SENDGRID_PASSWORD=test_smtp_password
 AWS_ACCESS_KEY_ID=xxx
 AWS_SECRET_ACCESS_KEY=xxx
-AWS_REGION=xxx                          
+AWS_REGION=xxx
 AWS_S3_BUCKET_NAME=xxx
 DISPLAY_SOCIAL_MOBILITY_AWARD=true
 PUSHER_SOCKET_HOST=localhost
@@ -24,4 +24,5 @@ PUSHER_APP_KEY=app_key
 PUSHER_SECRET=secret
 DEBOUNCE_API_KEY=test
 GOV_UK_NOTIFY_API_KEY=key
-GOV_UK_NOTIFY_API_TEMPLATE_ID=id
\ No newline at end of file
+GOV_UK_NOTIFY_API_TEMPLATE_ID=id
+SESSION_TIMEOUT=1
diff --git a/app/models/user.rb b/app/models/user.rb
index 54fdda4b19..9ecaca4491 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -161,7 +161,7 @@ def new_member?
   end
 
   def timeout_in
-    1200.minutes
+    (ENV["SESSION_TIMEOUT"] || 20).to_f.hours
   end
 
   def check_email_on_bounces!
diff --git a/app/views/shared/_timeout_warning_popup.html.slim b/app/views/shared/_timeout_warning_popup.html.slim
index 9846711cbc..5c4bc2db9b 100644
--- a/app/views/shared/_timeout_warning_popup.html.slim
+++ b/app/views/shared/_timeout_warning_popup.html.slim
@@ -23,4 +23,3 @@ javascript:
     window.namespace = "#{namespace_name}";
     window.timeoutTime = #{current_subject && current_subject.remember_created_at.blank? ? current_subject.timeout_in.to_i * 1000 : 0};
     window.lastRequestAt = #{Time.zone.now.to_i}
-    window.timeoutTime = 1

From 11963850460e69182920fcd2af7b88ade33cd79d Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 29 Aug 2023 11:05:51 +0100
Subject: [PATCH 304/352] Copy changes

---
 app/views/shared/_timeout_warning_popup.html.slim | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/shared/_timeout_warning_popup.html.slim b/app/views/shared/_timeout_warning_popup.html.slim
index 5c4bc2db9b..d27d655ad2 100644
--- a/app/views/shared/_timeout_warning_popup.html.slim
+++ b/app/views/shared/_timeout_warning_popup.html.slim
@@ -7,17 +7,18 @@
             | &times;
 
         h4
-          | Session Expiration Warning
+          | Your session will end soon
 
         p
-          | In
+          | For your security, we will sign you out of this service in
           span.time-target
-          =< "you will be automatically logged out because of prolonged inactivity (#{distance_of_time_in_words(Time.now, Time.now + current_subject.timeout_in, only: [:minutes, :hours])}), to keep your data safe."
+          = ". The information you haven't saved might be deleted."
         br
         .clearfix
-          button.btn.btn-primary.extend-session.pull-right
-            | Extend Session
-          = link_to "Log Out", destroy_user_session_url, method: :delete, class: "btn btn-primary-outline pull-left"
+          button.btn.btn-primary.btn-md.extend-session
+            | Stay signed in
+          ' &nbsp;
+          = link_to "Sign out", destroy_user_session_url, method: :delete, class: "btn btn-default btn-md"
 
 javascript:
     window.namespace = "#{namespace_name}";

From 5eaf8d7c5e192d87de5326bf2c9dd09606300732 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 29 Aug 2023 13:49:21 +0100
Subject: [PATCH 305/352] Correct makers' to maker's

---
 .../sustainable_development/sustainable_development_step3.rb    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb b/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
index c5e2c0256c..c5117548f2 100644
--- a/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
+++ b/forms/award_years/v2024/sustainable_development/sustainable_development_step3.rb
@@ -174,7 +174,7 @@ def development_step3
           words_max 200
         end
 
-        textarea :describe_the_senior_decision_makers_commitment_to_sustainability, "What is the senior decision makers' commitment to the future sustainable growth of the organisation?" do
+        textarea :describe_the_senior_decision_makers_commitment_to_sustainability, "What is the senior decision maker's commitment to the future sustainable growth of the organisation?" do
           classes "word-max-strict sub-question"
           ref "C 3.3"
           required

From ed4f886e34845e2aad4da64da5e8091b1d17ca9d Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 29 Aug 2023 14:12:34 +0100
Subject: [PATCH 306/352] timeline copy changes

---
 app/controllers/form_controller.rb   |  1 +
 app/views/qae_form/confirm.html.slim | 36 +++++++++++++---------------
 2 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/app/controllers/form_controller.rb b/app/controllers/form_controller.rb
index 6ba94e30c2..c66c73e99c 100644
--- a/app/controllers/form_controller.rb
+++ b/app/controllers/form_controller.rb
@@ -190,6 +190,7 @@ def save
   end
 
   def submit_confirm
+    @year = @form_answer.award_year.year
     render template: "qae_form/confirm"
   end
 
diff --git a/app/views/qae_form/confirm.html.slim b/app/views/qae_form/confirm.html.slim
index 971cc28257..a482525a41 100644
--- a/app/views/qae_form/confirm.html.slim
+++ b/app/views/qae_form/confirm.html.slim
@@ -64,39 +64,35 @@ h1.govuk-heading-xl Confirmation of submission
         p.govuk-body All winning individuals and their nominators attend Buckingham Palace reception hosted by His Majesty The King.
 
       - else
+        h3.govuk-heading-m 12 September #{@year - 1}
 
-        / V1: version before july 30 2019
-        / h3 November
+        p.govuk-body Application period closes
 
-        / p We will contact to let you know if you've been shortlisted.
+        h3.govuk-heading-m October #{@year - 1}
 
-        / p If you are shortlisted you will need to get your commercial figures verified by an independent accountant and supply them to us by 18th of November (please note, audited accounts are not required).
+        p.govuk-body Shortlisted organisations notified
 
-        / h3 March
-        / p Winning organisations are informed.
+        h3.govuk-heading-m November #{@year - 1}
 
-        / - if notification_date
-        /   h3 = month
-        /   p All unsuccessful applicants will receive feedback on their applications (including where the entry failed to meet the standards required, and how it could be improved).
-        /   p #{notification_date} – winners are announced publicly.
+        p.govuk-body Shortlisted organisations for international trade and innovation categories are asked to provide verified commercial figures (you may be charged for this by your accountant)
 
-        / h3 July
-        / p Two representatives of the winning organisations attend Buckingham Palace reception hosted by His Majesty The King.
+        h3.govuk-heading-m March #{@year}
 
-        / V2: version since july 30 2019
-        h3.govuk-heading-m November
+        p.govuk-body Successful organisations notified
 
-        p.govuk-body We will contact you to let you know if you've been shortlisted.
+        h3.govuk-heading-m March #{@year}
 
-        p.govuk-body If you are shortlisted you will need to get your commercial figures verified by an external accountant and supply them to us by mid-November (please note, audited accounts are not required).
+        p.govuk-body Unsuccessful organisations receive feedback on their applications
 
-        h3.govuk-heading-m March
+        h3.govuk-heading-m May #{@year}
 
-        p.govuk-body Winning organisations are informed.
+        p.govuk-body
+          | Successful organisations officially announced in the
+          =< link_to "London Gazette", "https://www.thegazette.co.uk/all-notices/content/101145", class: 'govuk-link'
 
-        h3.govuk-heading-m June
+        h3.govuk-heading-m Summer #{@year}
 
-        p.govuk-body Representatives of the winning organisations attend a Royal reception.
+        p.govuk-body Royal reception held for award recipients
       br
 
       p.govuk-body

From 818aa547c61ecd8e1726cdfaeb5bd1628aa2173f Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 29 Aug 2023 14:13:43 +0100
Subject: [PATCH 307/352] Update submission mailer copy

---
 app/views/users/submission_mailer/success.text.erb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/users/submission_mailer/success.text.erb b/app/views/users/submission_mailer/success.text.erb
index e0260ca548..0c6049600b 100644
--- a/app/views/users/submission_mailer/success.text.erb
+++ b/app/views/users/submission_mailer/success.text.erb
@@ -12,10 +12,12 @@ You can view and download your submission/s at any time by logging into your acc
 
 After the deadline, however, submissions cannot be edited or altered.
 
-To find out more on what happens next please visit The King's Awards for Enterprise page:
+To find out what happens next with your application, please see The King's Awards for Enterprise timeline:
 <%= timeline_url %>
 
-If you have any further queries about the <%= app_alias %> process you can call us on 020 7215 6880 or email us kingsawards@beis.gov.uk.
+If you have any further queries about the <%= app_alias %> process you can call us on 020 7215 6880 or email us at kingsawards@beis.gov.uk.
+
+Our email address will be changing nearer the end of September. Please continue to use the current address, and we will send reminders in plenty of time to make sure contact is not lost.
 
 Kind regards,
 

From a287f9c37620bf240193b751c04c0f130d897115 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 29 Aug 2023 14:55:24 +0100
Subject: [PATCH 308/352] Copy change to non-js conditional help

---
 forms/qae_form_builder/question.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/qae_form_builder/question.rb b/forms/qae_form_builder/question.rb
index a7ea8d8792..df1cd70ffa 100644
--- a/forms/qae_form_builder/question.rb
+++ b/forms/qae_form_builder/question.rb
@@ -389,7 +389,7 @@ def generate_hint(option_name, dependencies)
         # Nothing
       else
         # Normal behavior
-        "If #{option_name}, please answer the questions #{dependencies.to_sentence}"
+        "If you answered #{option_name}, please answer question/s #{dependencies.to_sentence}"
       end
     end
   end

From 2d13d6e880014bd5a1add9ef81bf7a132081d674 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 29 Aug 2023 16:01:04 +0100
Subject: [PATCH 309/352] Fornat deadline time to use midnight and noon

---
 app/models/settings.rb                                    | 2 +-
 app/pdf_generators/qae_pdf_forms/general/draw_elements.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/settings.rb b/app/models/settings.rb
index 61fd108cf0..fa0a5c8a8e 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -164,7 +164,7 @@ def not_awarded_deadline
     end
 
     def submission_deadline_title
-      formatted_datetime = current_submission_deadline.strftime("%d %b %Y at %H:%M%P")
+      formatted_datetime = current_submission_deadline.decorate.formatted_trigger_time(false)
       "Submission deadline: #{formatted_datetime}"
     end
 
diff --git a/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb b/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb
index 6d505264ff..dbc1d4fb5c 100644
--- a/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb
+++ b/app/pdf_generators/qae_pdf_forms/general/draw_elements.rb
@@ -121,8 +121,8 @@ def render_guidance_block
     render_text("The application process:", size: 14, style: :bold)
 
     bullet = "\u2000\u2000\u2000\u2022"
-    deadline = Settings.current_submission_deadline.trigger_at
-    deadline = deadline.try(:strftime, "%d %b %Y at %H:%M%P") || "-"
+    deadline = Settings.current_submission_deadline
+    deadline = deadline.decorate.formatted_trigger_time
 
     block_1 = %(1. Complete the online eligibility questionnaire before you start preparing the answers
       #{bullet} This is to ensure that your organisation meets the key eligibility criteria for an award.

From 6a1d442f60e4a66f25d24ccbf6f764954d869f10 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 29 Aug 2023 17:57:41 +0100
Subject: [PATCH 310/352] Make deadline bold in reminder_to_submit mailer

---
 .../account_mailers/reminder_to_submit_mailer/notify.text.erb | 4 +++-
 .../reminder_to_submit_mailer/preview/notify.html.slim        | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb b/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
index 3206d9cfe3..5fc505a256 100644
--- a/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
+++ b/app/views/account_mailers/reminder_to_submit_mailer/notify.text.erb
@@ -1,6 +1,8 @@
 Dear King's Award applicant,
 
-We're really happy to hear that you've started your application, so please don't forget to complete and submit it by <%= @deadline %>.
+We're really happy to hear that you've started your application, so please don't forget to complete and submit it by
+
+#<%= @deadline %>
 
 Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, receiving a King's Award is a unique way to gain recognition for your achievements.
 
diff --git a/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim b/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
index e715fdd4f4..6a197f2822 100644
--- a/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
+++ b/app/views/account_mailers/reminder_to_submit_mailer/preview/notify.html.slim
@@ -3,8 +3,8 @@ p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   | We're really happy to hear that you've started your application, so please don't forget to complete and submit it by
+p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0; font-weight:bold"
   =< @deadline
-  | .
 
 p style="font-size: 19px; line-height: 1.315789474; margin: 30px 0 30px 0;"
   | Whether you excel in international trade, have a great innovative product or service, or have an impressive social mobility initiative or sustainable development programme, receiving a King's Award is a unique way to gain recognition for your achievements.

From 80ae8c0417a5491a2ebeea3b9c23f758ac4dcc53 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 28 Aug 2023 16:42:27 +0200
Subject: [PATCH 311/352] Flash message when file is removed

---
 app/assets/javascripts/admin/form_answers.js.coffee    | 10 ++++++++++
 .../admin/figures_and_vat_returns/_file.html.slim      |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index fd06660e63..a17ab2224c 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -166,6 +166,11 @@ ready = ->
     $.ajax
       url: form.attr('action'),
       type: 'DELETE'
+      success: (_) ->
+        window.fire(form[0], 'ajax:x:success', null)
+      error: (_) ->
+        window.fire(form[0], 'ajax:x:error', null)
+
     form.parents('.commercial-figures-file').remove()
     if $('.commercial-figures-file').length == 0
       section.find(".document-list .p-empty").removeClass("visuallyhidden")
@@ -214,6 +219,11 @@ ready = ->
     $.ajax
       url: form.attr('action'),
       type: 'DELETE'
+      success: (_) ->
+        window.fire(form[0], 'ajax:x:success', null)
+      error: (_) ->
+        window.fire(form[0], 'ajax:x:error', null)
+
     form.parents('.vat-returns-file').remove()
     if $('.vat-returns-file').length == 0
       section.find(".document-list .p-empty").removeClass("visuallyhidden")
diff --git a/app/views/admin/figures_and_vat_returns/_file.html.slim b/app/views/admin/figures_and_vat_returns/_file.html.slim
index 573d9f6d8d..ddf1b1a8f1 100644
--- a/app/views/admin/figures_and_vat_returns/_file.html.slim
+++ b/app/views/admin/figures_and_vat_returns/_file.html.slim
@@ -3,7 +3,7 @@
     - if show_shortlisted_document?(attachment)
       small.pull-right
         = form_for([namespace_name, attachment.form_answer, attachment],
-                    html: { class: "#{attachment.model_name.param_key.dasherize}-destroyer", method: :delete, style: "display:inline-block;" }) do |f|
+                    html: { class: "#{attachment.model_name.param_key.dasherize}-destroyer", method: :delete, style: "display:inline-block;", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } }) do |f|
 
           = f.submit 'Remove', class: 'if-js-hide'
 

From 6b2a591d8f155250c390ad7938f54562c25ebcf2 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 29 Aug 2023 23:14:09 +0200
Subject: [PATCH 312/352] Re-work appraisal form submissions

---
 .../javascripts/admin/form_answers.js.coffee  |  34 +---
 app/assets/stylesheets/admin/base.scss        |   5 +
 .../controllers/appraisal_form_controller.js  | 190 ++++++++++++++++++
 app/models/assessor_assignment.rb             |  27 ++-
 ...section_appraisal_form_moderated.html.slim |   4 +-
 .../_section_appraisal_form_primary.html.slim |   4 +-
 ...section_appraisal_form_secondary.html.slim |   4 +-
 .../_section_case_summary.html.slim           |  13 +-
 .../_application_background_section.html.slim |   2 +-
 .../_case_summary_submit_block.html.slim      |  15 +-
 .../_non_rag_section.html.slim                |   4 +-
 .../_rag_section.html.slim                    |   4 +-
 .../_submit_appraisal_form.html.slim          |  15 +-
 .../_verdict_section.html.slim                |   4 +-
 14 files changed, 268 insertions(+), 57 deletions(-)
 create mode 100644 app/javascript/controllers/appraisal_form_controller.js

diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index a17ab2224c..3dcd60f04f 100644
--- a/app/assets/javascripts/admin/form_answers.js.coffee
+++ b/app/assets/javascripts/admin/form_answers.js.coffee
@@ -340,29 +340,7 @@ ready = ->
     if (element)
       element.classList.add('form-edit')
 
-  $('.submit-assessment').on 'ajax:error', (e, data, status, xhr) ->
-    panel = this.closest('.panel-body')
-    errors = data.responseJSON
-
-    removeExistingErrorMessages(panel)
-
-    Object.entries(errors).forEach ([key, values]) ->
-      field = panel.querySelector("[name*='[#{key}]']")
-      if field and shouldValidateField(field)
-        showErrorForInvalidField(field, values)
-
-  $(".submit-assessment").on "ajax:success", (e, data, status, xhr) ->
-    panel = this.closest('.panel-body')
-    message = "Assessment submitted"
-    if panel.closest(".panel-collapse").classList.contains('section-case-summary')
-      message = "Case summary submitted"
-
-    removeExistingErrorMessages(panel)
-    panel.insertAdjacentHTML('afterbegin', buildBannerHtml(message, 'success'))
-
-    $(this).find('input:submit').remove()
-
-  $(document).on "click", ".form-save-link", (e) ->
+  $(document).on "click", ".form-save-link:not(.js-form-save-link)", (e) ->
     link = $(this)
     e.preventDefault()
     formGroup = link.closest(".form-group")
@@ -397,11 +375,11 @@ ready = ->
             input.val(updatedSection)
         form.submit()
     else
-       if area.first().val().length
-         formGroup.find(".form-value p:first").html(area.first().val().replace(/\n/g, '<br />'))
-       if area.last().val().length
-         formGroup.find(".form-value p:last").html(area.last().val().replace(/\n/g, '<br />'))
-       form.submit()
+      if area.first().val().length
+        formGroup.find(".form-value p:first").html(area.first().val().replace(/\n/g, '<br />'))
+      if area.last().val().length
+        formGroup.find(".form-value p:last").html(area.last().val().replace(/\n/g, '<br />'))
+      form.submit()
 
   $("#new_review_audit_certificate input[type='radio']").on "change", ->
     area = $(".audit-cert-description")
diff --git a/app/assets/stylesheets/admin/base.scss b/app/assets/stylesheets/admin/base.scss
index 64e6cfeb79..d010bb8bc3 100644
--- a/app/assets/stylesheets/admin/base.scss
+++ b/app/assets/stylesheets/admin/base.scss
@@ -1685,6 +1685,11 @@ label.govuk-label.govuk-checkboxes__label.boolean.optional.govuk-label {
     }
   }
 
+  .rag-error {
+    background-color: #f2dede;
+    color: #a94442 !important;
+  }
+
   .rag-blank {
     &,
     a,
diff --git a/app/javascript/controllers/appraisal_form_controller.js b/app/javascript/controllers/appraisal_form_controller.js
new file mode 100644
index 0000000000..bf8b97fb17
--- /dev/null
+++ b/app/javascript/controllers/appraisal_form_controller.js
@@ -0,0 +1,190 @@
+export default class extends ApplicationController {
+  static values = {
+    success: String,
+  };
+
+  connect() {}
+
+  success(event) {
+    return this.handleSuccess(event);
+  }
+
+  error(event) {
+    return this.handleError(event);
+  }
+
+  handleSuccess = ({ target }) => {
+    const panel = target.closest('.panel-body');
+
+    this.resetErrors(panel);
+
+    const message = this.hasSuccessValue ? this.successValue : 'Success!';
+    const [alert, identifier] = this.createAlert('success', message);
+
+    panel.insertAdjacentHTML('afterbegin', alert);
+
+    const template = this.element.querySelector('[data-role=template]');
+
+    if ('content' in template) {
+      const replacement = template.content.cloneNode(true);
+      target.replaceWith(replacement.firstChild);
+    } else {
+      target.remove();
+    }
+  };
+
+  handleError = (event) => {
+    const {
+      target,
+      detail: { responseJSON: errors },
+    } = event;
+    const panel = target.closest('.panel-body');
+
+    this.resetErrors(panel);
+
+    Object.entries(errors).forEach(([key, values]) => {
+      const field = panel.querySelector(`[name*='[${key}]']`);
+      const container = field.closest('.form-container');
+
+      if (field && this.shouldValidateField(field)) {
+        this.showFieldErrors(field, values);
+      }
+
+      if (key && key.endsWith('_rate')) {
+        const button = container.querySelector('label button');
+        if (button) button.classList.add('rag-error');
+      } else {
+        if (!this.visible(field)) {
+          const target = container.querySelector('.form-edit-link');
+          if (target) $(target).trigger('click');
+        }
+      }
+    });
+  };
+
+  stash = (event) => {
+    event.preventDefault();
+    event.stopPropagation();
+
+    const { target: button } = event;
+    const wrapper = button.closest('.form-group');
+    const form = wrapper.closest('form');
+    const textarea = Array.from(wrapper.querySelectorAll('textarea')).filter(this.visible);
+
+    if (textarea.length > 1) {
+      for (let idx = 0; idx < textarea.length; idx++) {
+        LS.removeItem(textarea[idx].dataset.autosaveKey);
+      }
+    } else {
+      LS.removeItem(textarea[0].dataset.autosaveKey);
+    }
+
+    wrapper.classList.remove('form-edit');
+
+    if (Array.from(wrapper.querySelectorAll('.form-value p[data-for]')).length > 0) {
+      console.log(1);
+      Array.from(wrapper.querySelectorAll('.form-value p[data-for]')).forEach((el) => {
+        let identifier = el.dataset.for;
+        let element = document.querySelector(`#${identifier}`);
+
+        if (element) el.innerHTML = element.value;
+      });
+
+      return form.submit();
+    } else if (textarea.length === 1) {
+      let _textarea = textarea[0];
+
+      if (_textarea.value.length) {
+        const panel = event.target.closest('.panel-body');
+        const value = _textarea.value.replace(/\n/g, '<br />');
+        const updatedValue = button.dataset.updatedSection;
+
+        wrapper.querySelector('.form-value p').innerHTML = value;
+
+        panel.querySelector('.field-with-errors')?.classList?.remove('field-with-errors');
+        panel.querySelector('.feedback-holder')?.classList?.remove('error');
+        panel.querySelector('.btn-rag > button')?.classList?.remove('rag-error');
+
+        Array.from(wrapper.querySelectorAll('textarea')).forEach((el) => {
+          if (el.value && el.value.length) {
+            return el.closest('.input')?.classList?.remove('field-with-errors');
+          }
+        });
+
+        if (updatedValue) {
+          const input = form.querySelector("input[name='updated_section']");
+
+          if (input) {
+            input.value = updatedValue;
+          }
+        }
+
+        return form.submit();
+      }
+    } else {
+      if (textarea[0] && textarea[0].value.length) {
+        const value = textarea[0].value.replace(/\n/g, '<br />');
+        Array.from(wrapper.querySelectorAll('.form-value p'))[0].innerHTML = value;
+      }
+
+      if (textarea[-1] && textarea[-1].value.length) {
+        const value = textarea[-1].value.replace(/\n/g, '<br />');
+        Array.from(wrapper.querySelectorAll('.form-value p'))[-1].innerHTML = value;
+      }
+
+      return form.submit();
+    }
+  };
+
+  resetErrors(element) {
+    element.querySelectorAll('.field-with-errors').forEach((el) => el.classList.remove('field-with-errors'));
+    element.querySelectorAll('.rag-error').forEach((el) => el.classList.remove('rag-error'));
+    element.querySelectorAll('[aria-errormessage]').forEach((el) => el.removeAttribute('aria-errormessage'));
+    element.querySelectorAll('.alert').forEach((el) => el.remove());
+  }
+
+  shouldValidateField(field) {
+    return !field.disabled && field.type !== void 0 && !['file', 'reset', 'submit', 'button'].includes(field.type);
+  }
+
+  showFieldErrors(field, errors, selector) {
+    if (selector == null) {
+      selector = '.form-container';
+    }
+
+    const container = field.closest(selector);
+    const group = field.closest('.govuk-form-group');
+
+    if (group) {
+      group.classList.add('field-with-errors');
+    }
+
+    if (container) {
+      return errors.forEach((message) => {
+        const [alert, identifier] = this.createAlert('danger', message);
+        field.setAttribute('aria-errormessage', identifier);
+        return container.insertAdjacentHTML('afterbegin', alert);
+      });
+    }
+  }
+
+  createAlert = (type, message) => {
+    const id = 'alert__' + String(Math.random()).slice(2, -1);
+    const element = `
+      <div id='${id}' class='alert alert-${type}' data-controller='element-removal' role='alert' style='padding-top: 6px; padding-bottom: 6px; margin-bottom: 8px;'>
+        ${message}
+        <button type='button' class='close' data-action='click->element-removal#remove' aria-label='Close'>
+          <span aria-hidden='true'>&times;</span>
+        </button>
+      </div>
+    `;
+
+    return [element, id];
+  };
+
+  visible(field) {
+    return (
+      !field.hidden && (!field.type || field.type != 'hidden') && (field.offsetWidth > 0 || field.offsetHeight > 0)
+    );
+  }
+}
diff --git a/app/models/assessor_assignment.rb b/app/models/assessor_assignment.rb
index ec510d91f3..185c384caa 100644
--- a/app/models/assessor_assignment.rb
+++ b/app/models/assessor_assignment.rb
@@ -152,7 +152,13 @@ def not_submitted_or_not_locked?
   def award_specific_attributes
     struct.diff(form_answer, moderated?).each do |att|
       if public_send(att).present?
-        errors.add(att, "cannot be present for this Award Type")
+        message = if att.ends_with?("_rate")
+          "RAG rating for '#{section_name(att)}' cannot be present for this Award Type"
+        else
+          "An appraisal comment for '#{section_name(att)}' cannot be present for this Award Type"
+        end
+
+        errors.add(att, message: message)
       end
     end
   end
@@ -162,7 +168,13 @@ def mandatory_fields_for_submitted
 
     struct.meths_for_award_type(form_answer, moderated?).each do |meth|
       if public_send(meth).blank?
-        errors.add(meth, "cannot be blank for submitted assessment")
+        message = if meth.ends_with?("_rate")
+          "RAG rating is required for '#{section_name(meth)}'. Select an option from the dropdown list."
+        else
+          "An appraisal comment is required for '#{section_name(meth)}' and must be filled in."
+        end
+
+        errors.add(meth, message: message)
       end
     end
   end
@@ -174,7 +186,8 @@ def validate_rate(rate_type)
       c = "#{rate_type.upcase}_ALLOWED_VALUES"
       if val && !struct.const_get(c).include?(val)
         sect_name = struct.rate(section)
-        errors.add(sect_name, "#{rate_type} field has not permitted value")
+        message = "#{rate_type} field for '#{section_name(section)}' has not permitted value."
+        errors.add(sect_name, message: message)
       end
     end
   end
@@ -183,6 +196,14 @@ def section_rate(section)
     public_send(struct.rate(section))
   end
 
+  def section_name(key)
+    @_sections ||= struct.struct(form_answer).to_h
+    section_key = key.to_s.gsub(/_desc$/, "").gsub(/_rate$/, "")
+    if section = @_sections.dig(section_key.to_sym)
+      section[:label].gsub(/:$/, "")
+    end
+  end
+
   def struct
     AppraisalForm
   end
diff --git a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
index 10ec5ff562..00d8ad5059 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_moderated.html.slim
@@ -7,12 +7,12 @@
           small
             = moderated_assessment.last_editor_info
 
-  #section-appraisal-form-moderated.section-appraisal-form.section-appraisal-form-moderated.panel-collapse.collapse[aria-labelledby="appraisal-form-moderated-heading"]
+  #section-appraisal-form-moderated.section-appraisal-form.section-appraisal-form-moderated.panel-collapse.collapse[aria-labelledby="appraisal-form-moderated-heading" data-controller="appraisal-form" data-appraisal-form-success-value="Appraisal form (moderated) has been submitted"]
     .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, moderated_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["textarea"] } }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" } }) do |f|
 
         = render_section(resource, f)
         = hidden_field_tag :updated_section
diff --git a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
index b4d22bab1c..b6708f1dcf 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_primary.html.slim
@@ -6,12 +6,12 @@
         - if primary_assessment.last_editor_info.present?
           small
             = primary_assessment.last_editor_info
-  #section-appraisal-form-primary.section-appraisal-form.section-appraisal-form-primary.panel-collapse.collapse aria-labelledby="appraisal-form-primary-heading"
+  #section-appraisal-form-primary.section-appraisal-form.section-appraisal-form-primary.panel-collapse.collapse[aria-labelledby="appraisal-form-primary-heading" data-controller="appraisal-form" data-appraisal-form-success-value="Appraisal form (primary) has been submitted"]
     .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, primary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", inline_flash_target: "form", html5_form_validation_selectors_value: ["textarea"], controller: "html5-form-validation" }, id: "primary_appraisal_form" }) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" }, id: "primary_appraisal_form" }) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "primary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
index 6148facba7..c76ed0d291 100644
--- a/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
+++ b/app/views/admin/form_answers/_section_appraisal_form_secondary.html.slim
@@ -6,12 +6,12 @@
         - if secondary_assessment.last_editor_info.present?
           small
             = secondary_assessment.last_editor_info
-  #section-appraisal-form-secondary.section-appraisal-form.section-appraisal-form-secondary.panel-collapse.collapse aria-labelledby="appraisal-form-secondary-heading"
+  #section-appraisal-form-secondary.section-appraisal-form.section-appraisal-form-secondary.panel-collapse.collapse[aria-labelledby="appraisal-form-secondary-heading" data-controller="appraisal-form" data-appraisal-form-success-value="Appraisal form (secondary) has been submitted"]
     .panel-body[data-controller="inline-flash"]
       = simple_form_for([namespace_name, secondary_assessment],
                         remote: true,
                         authenticity_token: true,
-                        html: { data: { type: "json", inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["textarea"] }, id: "secondary_appraisal_form"}) do |f|
+                        html: { data: { type: "json", inline_flash_target: "form" }, id: "secondary_appraisal_form"}) do |f|
 
         = hidden_field_tag :updated_section, nil, id: "secondary_updated_section_hidden_field"
         = render_section(resource, f)
diff --git a/app/views/admin/form_answers/_section_case_summary.html.slim b/app/views/admin/form_answers/_section_case_summary.html.slim
index e73ea6eecd..0077f5aaf4 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -11,19 +11,10 @@
             - if assessment.editable.present?
               small
                 = "Updated by #{message_author_name(assessment.editable)} - #{format_date(assessment.updated_at)}"
-      .panel-collapse.collapse aria-labelledby="case-summary-heading-#{assessment.position}" id="section-case-summary-#{assessment.position}" class="section-case-summary-#{assessment.position}"
+      .panel-collapse.collapse[aria-labelledby="case-summary-heading-#{assessment.position}" id="section-case-summary-#{assessment.position}" class="section-case-summary-#{assessment.position}" data-controller="appraisal-form" data-appraisal-form-success-value="Case summary has been submitted"]
 
         .panel-body[data-controller="inline-flash"]
-          /.alert.alert-glyphicon.alert-info
-            span.glyphicon.glyphicon-info-sign
-            p.todo-placeholder
-              ' Some instructions on how to use this or what this section is about. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor. Duis mollis, est non commodo luctus.
-
-          / Only show if Moderated Appraisal is submitted
-          / For Primary Assessor
-          / It becomes read-only for primary assessor after submission
-
-          = simple_form_for([namespace_name, assessment], remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form", controller: "html5-form-validation", html5_form_validation_selectors_value: ["textarea"] } }) do |f|
+          = simple_form_for([namespace_name, assessment], remote: true, authenticity_token: true, html: { data: { inline_flash_target: "form" } }) do |f|
             = render partial: "admin/form_answers/appraisal_form_components/application_background_section",
               locals: { f: f}
             = render_section(resource, f)
diff --git a/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
index 1b49d9e47d..70ef64e0dc 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_application_background_section.html.slim
@@ -23,5 +23,5 @@
       = link_to "#", class: "form-edit-link pull-right", data: { element_focus_target: "reveal" }
         span.glyphicon.glyphicon-pencil
         ' Edit
-      = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate" }
+      = link_to "Save", "#", class: "btn btn-primary form-save-link js-form-save-link pull-right if-no-js-hide", data: { action: "click->appraisal-form#stash" }
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim b/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim
index 6b2fd07d75..4952e8d9b3 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_case_summary_submit_block.html.slim
@@ -1,6 +1,6 @@
 - if policy(assessment).can_be_submitted? || policy(assessment).can_be_re_submitted?
 
-  = form_tag(url_for([namespace_name, :assessment_submissions]), remote: true, authenticity_token: true, class: "submit-assessment", "data-type" => "json")
+  = form_tag(url_for([namespace_name, :assessment_submissions]), remote: true, authenticity_token: true, class: "submit-assessment", data: { action: "ajax:x:success->appraisal-form#success ajax:x:error->appraisal-form#error", type: "json" })
     = hidden_field_tag :assessment_id, assessment.id
 
     .feedback-holder
@@ -9,6 +9,19 @@
       = submit_tag submit_case_summary_title(assessment), class: "btn btn-primary btn-confirm-submit"
     .clear
 
+    template[data-role='template']
+      - if policy(assessment).admin_or_lead?
+        - unlock_url = namespace_name == :admin ? unlock_admin_assessment_submission_url(assessment) : unlock_assessor_assessment_submission_url(assessment)
+
+        = form_tag unlock_url, method: :patch do
+          = hidden_field_tag :assessment_id, assessment.id
+          .feedback-holder.alert.alert-success
+            ' Case Summary Submitted
+
+            .pull-right
+              = submit_tag "Unlock", class: "btn btn-primary"
+            .clear
+
 - elsif assessment.submitted?
   - if policy(assessment).can_unlock?
     - unlock_url = namespace_name == :admin ? unlock_admin_assessment_submission_url(assessment) : unlock_assessor_assessment_submission_url(assessment)
diff --git a/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
index 3a16109334..b41eb85b86 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_non_rag_section.html.slim
@@ -26,6 +26,6 @@
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
-        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate", updated_section: section.desc }
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
+        = link_to "Save", "#", class: "btn btn-primary form-save-link js-form-save-link pull-right if-no-js-hide", data: { updated_section: section.desc, action: "click->appraisal-form#stash" }
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
index 6747cf3735..0af8748211 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_rag_section.html.slim
@@ -46,6 +46,6 @@
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
-        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate", updated_section: section.desc }
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
+        = link_to "Save", "#", class: "btn btn-primary form-save-link js-form-save-link pull-right if-no-js-hide", data: { updated_section: section.desc, action: "click->appraisal-form#stash" }
       .clear
diff --git a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
index ecf4400712..afd2f9ee3f 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_submit_appraisal_form.html.slim
@@ -3,7 +3,7 @@
             authenticity_token: true,
             remote: true,
             class: "submit-assessment",
-            data: { type: "json" })
+            data: { action: "ajax:x:success->appraisal-form#success ajax:x:error->appraisal-form#error", type: "json" })
 
     = hidden_field_tag :assessment_id, assessment.id, id: "#{assessment.position}_assessment_id_submit_appraisal_form_hidden_field"
 
@@ -13,6 +13,19 @@
       = submit_tag (assessment.submitted? ? "Re-submit appraisal" : "Submit appraisal"), class: "btn btn-primary btn-confirm-submit"
     .clear
 
+    template[data-role='template']
+      - if policy(assessment).admin_or_lead?
+        - unlock_url = namespace_name == :admin ? unlock_admin_assessment_submission_url(assessment) : unlock_assessor_assessment_submission_url(assessment)
+
+        = form_tag unlock_url, method: :patch do
+          = hidden_field_tag :assessment_id, assessment.id, id: "#{assessment.position}_assessment_id_unlock_appraisal_form_hidden_field"
+          .feedback-holder.alert.alert-success
+            ' Assessment submitted
+
+            .pull-right
+              = submit_tag "Unsubmit", class: "btn btn-primary"
+            .clear
+
 - elsif assessment.submitted?
 
   - if policy(assessment).can_unlock?
diff --git a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
index c0102babf6..4eacdcbd27 100644
--- a/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
+++ b/app/views/admin/form_answers/appraisal_form_components/_verdict_section.html.slim
@@ -44,6 +44,6 @@
         span.glyphicon.glyphicon-pencil
         ' Edit
       .form-actions.text-right
-        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss", action: "click->html5-form-validation#discard" }
-        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide", data: { action: "click->html5-form-validation#validate" }
+        = link_to "Cancel", "#", class: "btn btn-default form-cancel-link if-no-js-hide", data: { element_focus_target: "dismiss" }
+        = link_to "Save", "#", class: "btn btn-primary form-save-link pull-right if-no-js-hide"
       .clear

From 1158eced7d0562ab0aea3156375b1ed0773f24e3 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 30 Aug 2023 15:57:14 +0200
Subject: [PATCH 313/352] Fix duplication of validation messages

---
 app/controllers/admin/admins_controller.rb    |   6 +-
 app/controllers/admin/assessors_controller.rb |   6 +-
 app/controllers/admin/judges_controller.rb    |   6 +-
 app/controllers/admin/users_controller.rb     |   4 +-
 config/locales/en.yml                         | 266 +++++++++---------
 5 files changed, 148 insertions(+), 140 deletions(-)

diff --git a/app/controllers/admin/admins_controller.rb b/app/controllers/admin/admins_controller.rb
index c93bc20e20..d33e054896 100644
--- a/app/controllers/admin/admins_controller.rb
+++ b/app/controllers/admin/admins_controller.rb
@@ -20,7 +20,7 @@ def create
 
     @resource.save
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     location = @resource.persisted? ? admin_admins_path : nil
     respond_with :admin, @resource, location: location
@@ -35,7 +35,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
     
     respond_with :admin, @resource, location: admin_admins_path
   end
@@ -44,7 +44,7 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
     
     respond_with :admin, @resource, location: admin_admins_path
   end
diff --git a/app/controllers/admin/assessors_controller.rb b/app/controllers/admin/assessors_controller.rb
index c44ea782bb..7408e8cb02 100644
--- a/app/controllers/admin/assessors_controller.rb
+++ b/app/controllers/admin/assessors_controller.rb
@@ -21,7 +21,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_assessors_path : nil
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -35,7 +35,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: admin_assessors_path
   end
@@ -44,7 +44,7 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: admin_assessors_path
   end
diff --git a/app/controllers/admin/judges_controller.rb b/app/controllers/admin/judges_controller.rb
index ebbc59a5b6..3f174d28f2 100644
--- a/app/controllers/admin/judges_controller.rb
+++ b/app/controllers/admin/judges_controller.rb
@@ -21,7 +21,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_judges_path : nil
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -35,7 +35,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: admin_judges_path
   end
@@ -44,7 +44,7 @@ def destroy
     authorize @resource, :destroy?
     @resource.soft_delete!
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: admin_judges_path
   end
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 8be749cde0..da90ff36af 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -28,7 +28,7 @@ def create
     @resource.save
     location = @resource.persisted? ? admin_users_path : nil
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.uniq.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: location
   end
@@ -42,7 +42,7 @@ def update
       @resource.update_without_password(resource_params)
     end
 
-    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.uniq.flatten.join("<br />"))
+    render_flash_message_for(@resource, message: @resource.errors.none? ? nil : @resource.errors.messages.values.flatten.uniq.join("<br />"))
 
     respond_with :admin, @resource, location: admin_users_path
   end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 300127caa8..5ba8af1973 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -22,8 +22,8 @@ en:
         all_users: All applicants
     eligibility/basic:
       organization_kind:
-        business: "Business (for example, companies, partnerships, social enterprises)"
-        charity: "Not-for-profit (for example, charities, foundations, associations)"
+        business: 'Business (for example, companies, partnerships, social enterprises)'
+        charity: 'Not-for-profit (for example, charities, foundations, associations)'
       kind:
         application: Apply for an organisation award
         nomination: Nominate an individual
@@ -35,13 +35,13 @@ en:
         i_dont_know: "I don't know"
     eligibility/innovation:
       innovative_product:
-        skip: "Skip Innovation eligibility"
+        skip: 'Skip Innovation eligibility'
     eligibility/development:
       sustainable_development:
-        skip: "Skip Sustainable Development eligibility"
+        skip: 'Skip Sustainable Development eligibility'
     eligibility/trade:
       sales_above_100_000_pounds:
-        skip: "Skip International Trade eligibility"
+        skip: 'Skip International Trade eligibility'
       qae_for_trade_award_year:
         before_2010: Prior to 2010
         before_2011: Prior to 2011
@@ -61,48 +61,56 @@ en:
   activerecord:
     errors:
       full_messages:
-        format: "{{message}}"
+        format: '{{message}}'
       messages:
-        blank: "%{attribute} is empty - it is a required field and must be filled in"
+        blank: '%{attribute} is empty - it is a required field and must be filled in'
         accepted: Must be accepted
-        taken: "This %{attribute} has already been taken"
-        too_long: "%{attribute} is too long (maximum is %{count} characters)"
-        too_short: "%{attribute} is too short (minimum is %{count} characters)"
+        taken: 'This %{attribute} has already been taken'
+        too_long: '%{attribute} is too long (maximum is %{count} characters)'
+        too_short: '%{attribute} is too short (minimum is %{count} characters)'
         confirmation: "%{attribute} doesn't match."
-        not_a_number: "Please enter a number."
+        not_a_number: 'Please enter a number.'
       models:
         user:
           attributes:
             email:
-              invalid: "Email is invalid - enter a valid email address"
+              invalid: 'Email is invalid - enter a valid email address'
             role:
-              blank: "Account type is empty - it is a required field and an option should be selected from the following list"
+              blank: 'Account type is empty - it is a required field and an option should be selected from the following list'
             password:
               weak_password: Your new password must be more complex.
         admin:
           attributes:
+            email:
+              invalid: 'Email is invalid - enter a valid email address'
             password:
               weak_password: Your new password must be more complex.
         assessor:
           attributes:
+            email:
+              invalid: 'Email is invalid - enter a valid email address'
             password:
               weak_password: Your new password must be more complex.
+        judge:
+          attributes:
+            email:
+              invalid: 'Email is invalid - enter a valid email address'
         assessor_assignment:
           attributes:
             position:
-              blank: "is empty - it is a required field and an option should be selected from the following list"
+              blank: 'is empty - it is a required field and an option should be selected from the following list'
 
   time:
     formats:
-      date_at_time: "%d/%m/%Y at %-l:%M%P"
-      govuk_time: "%-I:%M%P"
-      govuk_date_short: "%-I:%M%P, %-e %b %Y"
-      govuk_date: "%-I:%M%P, %-e %B %Y"
+      date_at_time: '%d/%m/%Y at %-l:%M%P'
+      govuk_time: '%-I:%M%P'
+      govuk_date_short: '%-I:%M%P, %-e %b %Y'
+      govuk_date: '%-I:%M%P, %-e %B %Y'
 
   date:
     formats:
-      govuk_date_short: "%-e %b %Y"
-      govuk_date: "%-e %B %Y"
+      govuk_date_short: '%-e %b %Y'
+      govuk_date: '%-e %B %Y'
 
   admin:
     form_answers:
@@ -129,16 +137,16 @@ en:
         uk_sales_row:
           uk_sales: Of which UK sales (£)
         benchmarks:
-          growth_overseas_earnings: "% Growth overseas earnings"
-          sales_exported: "% Sales exported"
-          average_growth_for: "% Sector average growth"
-          growth_in_total_turnover: "% Growth in total turnover"
+          growth_overseas_earnings: '% Growth overseas earnings'
+          sales_exported: '% Sales exported'
+          average_growth_for: '% Sector average growth'
+          growth_in_total_turnover: '% Growth in total turnover'
 
   errors:
     messages:
-      wrong_size: "is the wrong size (should be %{file_size})"
-      size_too_small: "is too small (should be at least %{file_size})"
-      size_too_big: "is too big (should be at most %{file_size})"
+      wrong_size: 'is the wrong size (should be %{file_size})'
+      size_too_small: 'is too small (should be at least %{file_size})'
+      size_too_big: 'is too big (should be at most %{file_size})'
 
   deadline_messages:
     award_year_switch: Award year opens on
@@ -156,51 +164,51 @@ en:
     audit_certificates: Additional Financials documents due by
 
   deadline_buttons:
-    award_year_switch: "award year opening date"
-    innovation_submission_start: "Innovation submission period start date"
-    trade_submission_start: "International Trade submission period start date"
-    development_submission_start: "Sustainable Development submission period start date"
-    mobility_submission_start: "Promoting Opportunity submission period start date"
-    submission_end: "submission period end date"
-    audit_certificates: "additional financial documents due by date"
-    buckingham_palace_attendees_details: "end of embargo date"
-    buckingham_palace_media_information: "media information presentation date"
-    buckingham_palace_confirm_press_book_notes: "deadline for recipients to finalise the press release"
-    buckingham_palace_reception_attendee_information_due_by: "deadline for recipients to finalise palace attendees"
-    buckingham_palace_attendees_invite: "palace reception date"
+    award_year_switch: 'award year opening date'
+    innovation_submission_start: 'Innovation submission period start date'
+    trade_submission_start: 'International Trade submission period start date'
+    development_submission_start: 'Sustainable Development submission period start date'
+    mobility_submission_start: 'Promoting Opportunity submission period start date'
+    submission_end: 'submission period end date'
+    audit_certificates: 'additional financial documents due by date'
+    buckingham_palace_attendees_details: 'end of embargo date'
+    buckingham_palace_media_information: 'media information presentation date'
+    buckingham_palace_confirm_press_book_notes: 'deadline for recipients to finalise the press release'
+    buckingham_palace_reception_attendee_information_due_by: 'deadline for recipients to finalise palace attendees'
+    buckingham_palace_attendees_invite: 'palace reception date'
 
   email_buttons:
-    award_year_open_notifier: "new award year open notification"
-    innovation_submission_started_notification: "Innovation applications open notification"
-    trade_submission_started_notification: "International Trade applications open notification"
-    development_submission_started_notification: "Sustainable Development applications open notification"
-    mobility_submission_started_notification: "Promoting Opportunites applications open notification"
-    reminder_to_submit: "reminder to submit applications notification"
-    shortlisted_notifier: "shortlisted notification for Innovation and International Trade applications"
-    shortlisted_po_sd_notifier: "shortlisted notification for Sustainable Development and Promoting Opportunities applications with estimated figures"
-    shortlisted_po_sd_with_actual_figures_notifier: "shortlisted notification for sustainable development and promoting opportunities applications with actual figures"
-    shortlisted_audit_certificate_reminder: "reminder notification for Innovation and International Trade applications to supply Verification of Commercial Figures"
-    shortlisted_po_sd_reminder: "reminder notification for Sustainable Development and Promoting Opportunities applications to supply financial statements"
-    not_shortlisted_notifier: "notification to unsuccessful applicants"
-    winners_notification: "notification to successful applicants"
-    winners_head_of_organisation_notification: "notification to head of successful applications"
-    buckingham_palace_invite: "palace invite notification"
-    unsuccessful_notification: "notification to unsuccessful applicants"
+    award_year_open_notifier: 'new award year open notification'
+    innovation_submission_started_notification: 'Innovation applications open notification'
+    trade_submission_started_notification: 'International Trade applications open notification'
+    development_submission_started_notification: 'Sustainable Development applications open notification'
+    mobility_submission_started_notification: 'Promoting Opportunites applications open notification'
+    reminder_to_submit: 'reminder to submit applications notification'
+    shortlisted_notifier: 'shortlisted notification for Innovation and International Trade applications'
+    shortlisted_po_sd_notifier: 'shortlisted notification for Sustainable Development and Promoting Opportunities applications with estimated figures'
+    shortlisted_po_sd_with_actual_figures_notifier: 'shortlisted notification for sustainable development and promoting opportunities applications with actual figures'
+    shortlisted_audit_certificate_reminder: 'reminder notification for Innovation and International Trade applications to supply Verification of Commercial Figures'
+    shortlisted_po_sd_reminder: 'reminder notification for Sustainable Development and Promoting Opportunities applications to supply financial statements'
+    not_shortlisted_notifier: 'notification to unsuccessful applicants'
+    winners_notification: 'notification to successful applicants'
+    winners_head_of_organisation_notification: 'notification to head of successful applications'
+    buckingham_palace_invite: 'palace invite notification'
+    unsuccessful_notification: 'notification to unsuccessful applicants'
 
   deadline_help_messages:
-    award_year_switch: "This date marks the start of the new award year, and will update the website accordingly. Users will not yet be able to start any applications"
-    submission_start: "This date is when the applications for the current award year become available."
-    innovation_submission_start: "This date is when the applications for the Innovation award of the current award year become available."
-    trade_submission_start: "This date is when the applications for the International Trade award of the current award year become available."
-    development_submission_start: "This date is when the applications for the Sustainable Development award of the current award year become available."
-    mobility_submission_start: "This date is when the applications for the Promoting Opportunity award of the current award year become available."
-    submission_end: "Applicants will no longer be able to edit or submit their applications after this date. This date will be pulled into the Reminder to submit the applications email."
-    buckingham_palace_attendees_details: "This date marks the end of the the embargo preventing recipients publicly announcing their success. This date will be pulled into the email notifying all winning business applicants of their success, and the email to the heads of organisations."
-    buckingham_palace_media_information: "KAO will provide the press book information to the media on this date. This date will be pulled into the email notifying all winning business applicants of their success, and the email to the heads of organisations."
-    buckingham_palace_confirm_press_book_notes: "Recipients will not be able to make comments or changes to their press release after this date. This date will be pulled into the email notifying all winning business applicants of their success, and the email to the heads of organisations."
-    buckingham_palace_reception_attendee_information_due_by: "Recipients will not be able to submit attendees details after this date. This date will be pulled into the Buckingham Palace Invite email - to heads of winning organisations only."
-    buckingham_palace_attendees_invite: "This date will be pulled into the email notifying all winning business applicants of their success, the email to the heads of organisations and the Buckingham Palace Invite email."
-    audit_certificates: "Shortlisted applicants will have up until this date to submit their Verification of Commercial Figures. This date will be pulled into the email notifying shortlisted applicants of their success, and the reminder to submit Verification of Commercial Figures email."
+    award_year_switch: 'This date marks the start of the new award year, and will update the website accordingly. Users will not yet be able to start any applications'
+    submission_start: 'This date is when the applications for the current award year become available.'
+    innovation_submission_start: 'This date is when the applications for the Innovation award of the current award year become available.'
+    trade_submission_start: 'This date is when the applications for the International Trade award of the current award year become available.'
+    development_submission_start: 'This date is when the applications for the Sustainable Development award of the current award year become available.'
+    mobility_submission_start: 'This date is when the applications for the Promoting Opportunity award of the current award year become available.'
+    submission_end: 'Applicants will no longer be able to edit or submit their applications after this date. This date will be pulled into the Reminder to submit the applications email.'
+    buckingham_palace_attendees_details: 'This date marks the end of the the embargo preventing recipients publicly announcing their success. This date will be pulled into the email notifying all winning business applicants of their success, and the email to the heads of organisations.'
+    buckingham_palace_media_information: 'KAO will provide the press book information to the media on this date. This date will be pulled into the email notifying all winning business applicants of their success, and the email to the heads of organisations.'
+    buckingham_palace_confirm_press_book_notes: 'Recipients will not be able to make comments or changes to their press release after this date. This date will be pulled into the email notifying all winning business applicants of their success, and the email to the heads of organisations.'
+    buckingham_palace_reception_attendee_information_due_by: 'Recipients will not be able to submit attendees details after this date. This date will be pulled into the Buckingham Palace Invite email - to heads of winning organisations only.'
+    buckingham_palace_attendees_invite: 'This date will be pulled into the email notifying all winning business applicants of their success, the email to the heads of organisations and the Buckingham Palace Invite email.'
+    audit_certificates: 'Shortlisted applicants will have up until this date to submit their Verification of Commercial Figures. This date will be pulled into the email notifying shortlisted applicants of their success, and the reminder to submit Verification of Commercial Figures email.'
 
   email_notification_help_messages:
     award_year_open_notifier: "This email will be sent to all users who have ticked that they want to receive opening notification for at least one award type in account's 'Contact Preferences' section."
@@ -208,32 +216,32 @@ en:
     trade_submission_started_notification: "This email will be sent to all users who have ticked that they want to receive opening notification for International Trade award in account's 'Contact Preferences' section."
     development_submission_started_notification: "This email will be sent to all users who have ticked that they want to receive opening notification for Sustainable Development award in account's 'Contact Preferences' section."
     mobility_submission_started_notification: "This email will be sent to all users who have ticked that they want to receive opening notification for Promoting Opportunity award in account's 'Contact Preferences' section."
-    shortlisted_notifier: "Shortlisted stage start (shortlisted/unsuccessful applications are displayed on the homepage)"
-    winners_notification: "Recipients stage start (winning applications are displayed on the homepage and allows users to update their Press Book entry)"
-    unsuccessful_notification: "Unsuccessful stage start (Unsuccessful applications are displayed on the homepage)"
-    buckingham_palace_invite: "Palace invites stage start (allows users to add their Palace invite details on the homepage)"
+    shortlisted_notifier: 'Shortlisted stage start (shortlisted/unsuccessful applications are displayed on the homepage)'
+    winners_notification: 'Recipients stage start (winning applications are displayed on the homepage and allows users to update their Press Book entry)'
+    unsuccessful_notification: 'Unsuccessful stage start (Unsuccessful applications are displayed on the homepage)'
+    buckingham_palace_invite: 'Palace invites stage start (allows users to add their Palace invite details on the homepage)'
 
   email_notification_headers:
-    award_year_open_notifier: "Notify users that the applications for the new Award year are open"
-    innovation_submission_started_notification: "Notify users that the applications for King’s Awards for Innovation are now open"
-    trade_submission_started_notification: "Notify users that the applications for King’s Awards for International Trade are now open"
-    development_submission_started_notification: "Notify users that the applications for King’s Awards for Sustainable Development are now open"
-    mobility_submission_started_notification: "Notify users that the applications for King’s Awards for Promoting Opportunity are now open"
-    submission_started_notification: "Notify users that applications for the new Award year are open"
+    award_year_open_notifier: 'Notify users that the applications for the new Award year are open'
+    innovation_submission_started_notification: 'Notify users that the applications for King’s Awards for Innovation are now open'
+    trade_submission_started_notification: 'Notify users that the applications for King’s Awards for International Trade are now open'
+    development_submission_started_notification: 'Notify users that the applications for King’s Awards for Sustainable Development are now open'
+    mobility_submission_started_notification: 'Notify users that the applications for King’s Awards for Promoting Opportunity are now open'
+    submission_started_notification: 'Notify users that applications for the new Award year are open'
     reminder_to_submit: Reminder to submit the applications (to all those who have started but not yet submitted applications).
-    ep_reminder_support_letters: "ENTERPRISE PROMOTION : Reminder to follow up supporter letters (to all those who have started EP applications, but have fewer than 2 support letters submitted)."
-    winners_notification: "RECIPIENTS : Email notifying all winning business applicants of their success & requesting their confirmation of their Press Book entry."
+    ep_reminder_support_letters: 'ENTERPRISE PROMOTION : Reminder to follow up supporter letters (to all those who have started EP applications, but have fewer than 2 support letters submitted).'
+    winners_notification: 'RECIPIENTS : Email notifying all winning business applicants of their success & requesting their confirmation of their Press Book entry.'
     winners_reminder_to_submit: "RECIPIENTS: Reminder to submit *palace reception attendee details* (for winning applicants who haven't submitted yet)."
     winners_head_of_organisation_notification: "RECIPIENTS : Success email to the 'Head of Organisation' of the Business categories Recipient."
-    buckingham_palace_invite: "RECIPIENTS : Buckingham Palace Invite - to heads of winning organisations only."
-    unsuccessful_notification: "UNSUCCESSFUL: Email notification to unsuccessful Business categories Registered Account holder."
-    unsuccessful_ep_notification: "UNSUCCESSFUL: Email notification of unsuccessful QAEP nominations."
+    buckingham_palace_invite: 'RECIPIENTS : Buckingham Palace Invite - to heads of winning organisations only.'
+    unsuccessful_notification: 'UNSUCCESSFUL: Email notification to unsuccessful Business categories Registered Account holder.'
+    unsuccessful_ep_notification: 'UNSUCCESSFUL: Email notification of unsuccessful QAEP nominations.'
     shortlisted_notifier: "SHORTLISTED - INNOVATION & IT: Email notifying shortlisted applicants of their success, including Verification of Commercial Figures (External Accountant's Report) instructions."
-    shortlisted_po_sd_notifier: "SHORTLISTED - PO & SD: Email notifying shortlisted applicants of their success - to those who provided estimated figures (asking for the latest financial statements & VAT returns submission instructions)."
-    shortlisted_po_sd_with_actual_figures_notifier: "SHORTLISTED - PO & SD: Email notifying shortlisted applicants of their success - to those who provided actual figures."
+    shortlisted_po_sd_notifier: 'SHORTLISTED - PO & SD: Email notifying shortlisted applicants of their success - to those who provided estimated figures (asking for the latest financial statements & VAT returns submission instructions).'
+    shortlisted_po_sd_with_actual_figures_notifier: 'SHORTLISTED - PO & SD: Email notifying shortlisted applicants of their success - to those who provided actual figures.'
     shortlisted_audit_certificate_reminder: "SHORTLISTED REMINDER - INNOVATION & IT: Reminder for to submit Verification of Commercial Figures (External Accountant's Report) for shortlisted applicants who have not yet done so."
-    shortlisted_po_sd_reminder: "SHORTLISTED REMINDER - PO & SD: Reminder to submit the latest financial statements & VAT returns for shortlisted applicants who have not yet done so."
-    not_shortlisted_notifier: "NOT SHORTLISTED : Email notifying unsuccessful applicants."
+    shortlisted_po_sd_reminder: 'SHORTLISTED REMINDER - PO & SD: Reminder to submit the latest financial statements & VAT returns for shortlisted applicants who have not yet done so.'
+    not_shortlisted_notifier: 'NOT SHORTLISTED : Email notifying unsuccessful applicants.'
 
   custom_login_messages:
     we_just_sent_you_confirmation_email: We have just sent you an email asking to confirm your account.
@@ -243,24 +251,24 @@ en:
     have_no_account: "If you don't have an account, please go to"
     forgot_password: "If you've forgotten your password, request"
     not_confirmed: "You haven't confirmed your account"
-    when_you_had_created_account: "When you created your account, we sent you an email asking to confirm it."
+    when_you_had_created_account: 'When you created your account, we sent you an email asking to confirm it.'
     not_received_confirmation_email: "If you haven't received it,"
 
   days:
     one: 1 day
-    other: "%{count} days"
+    other: '%{count} days'
 
   pdf_texts:
     innovation:
       years_question_additional_context: "If you have selected 'Outstanding Commercial Performance: innovation has improved commercial performance over two years' in C1, you will only need to provide information for the last two years."
     trade:
-      years_question_additional_context: "If you have selected “Outstanding Short-Term Growth” in D1, you will only need to provide information for the last three years."
+      years_question_additional_context: 'If you have selected “Outstanding Short-Term Growth” in D1, you will only need to provide information for the last three years.'
       queen_awards_question_additional_context: |
         If you won the award in the previous 4 years you can only apply for an International Trade Award on an Outstanding Short-Term Growth basis, and you need to be able to demonstrate that your international trade has resulted in outstanding year-on-year growth in the last 3 years with no dips.
 
         If you won the award in the last year, unfortunately, you cannot apply for the International Trade Award this year. If your international trade continues to result in outstanding year-on-year growth, you can apply again in 2024 for an award to be given in 2025 (on Outstanding Short-Term Growth over a 3 years basis), providing you include two new years of trading results in your application.
     development:
-      years_question_additional_context: "If you have selected “Outstanding Sustainable Development: sustainable development has improved commercial performance over two years” in C1, you will only need to provide information for the last two years."
+      years_question_additional_context: 'If you have selected “Outstanding Sustainable Development: sustainable development has improved commercial performance over two years” in C1, you will only need to provide information for the last two years.'
 
   audit_logs:
     action_types:
@@ -272,47 +280,47 @@ en:
       feedbacks: Feedbacks
       case_summaries: Case summaries
       download_form_answer: Application PDF
-      admin_comment_create: "added an admin comment"
-      admin_comment_destroy: "deleted an admin comment"
-      critical_comment_create: "added a critical comment"
-      critical_comment_destroy: "deleted a critical comment"
-      form_answer_attachment_create: "added an attachment"
-      form_answer_attachment_destroy: "deleted an attachment"
-      primary_appraisal_update: "updated the primary appraisal form"
-      secondary_appraisal_update: "updated the secondary appraisal form"
-      moderated_appraisal_update: "updated the moderated appraisal form"
-      case_summary_update: "updated the case summary"
-      feedback_create: "added feedback"
-      feedback_update: "updated feedback"
-      feedback_submit: "submitted feedback"
-      feedback_unsubmit: "unlocked feedback"
-      primary_appraisal_submit: "submitted primary appraisal"
-      primary_appraisal_unsubmit: "unsubmitted primary appraisal"
-      secondary_appraisal_submit: "submitted secondary appraisal"
-      secondary_appraisal_unsubmit: "unsubmitted secondary appraisal"
-      moderated_appraisal_submit: "submitted moderated appraisal"
-      moderated_appraisal_unsubmit: "unsubmitted moderated appraisal"
-      case_summary_submit: "submitted case summary"
-      case_summary_unsubmit: "unlocked case summary"
+      admin_comment_create: 'added an admin comment'
+      admin_comment_destroy: 'deleted an admin comment'
+      critical_comment_create: 'added a critical comment'
+      critical_comment_destroy: 'deleted a critical comment'
+      form_answer_attachment_create: 'added an attachment'
+      form_answer_attachment_destroy: 'deleted an attachment'
+      primary_appraisal_update: 'updated the primary appraisal form'
+      secondary_appraisal_update: 'updated the secondary appraisal form'
+      moderated_appraisal_update: 'updated the moderated appraisal form'
+      case_summary_update: 'updated the case summary'
+      feedback_create: 'added feedback'
+      feedback_update: 'updated feedback'
+      feedback_submit: 'submitted feedback'
+      feedback_unsubmit: 'unlocked feedback'
+      primary_appraisal_submit: 'submitted primary appraisal'
+      primary_appraisal_unsubmit: 'unsubmitted primary appraisal'
+      secondary_appraisal_submit: 'submitted secondary appraisal'
+      secondary_appraisal_unsubmit: 'unsubmitted secondary appraisal'
+      moderated_appraisal_submit: 'submitted moderated appraisal'
+      moderated_appraisal_unsubmit: 'unsubmitted moderated appraisal'
+      case_summary_submit: 'submitted case summary'
+      case_summary_unsubmit: 'unlocked case summary'
       audit_certificate_downloaded: "downloaded External Accountant's Report form"
       audit_certificate_uploaded: "uploaded External Accountant's Report form"
       audit_certificate_destroyed: "removed External Accountant's Report form"
-      actual_figures_file_uploaded: "uploaded actual figures"
-      actual_figures_file_destroyed: "removed actual figures"
-      commercial_figures_file_uploaded: "uploaded Variance explanation document"
-      commercial_figures_file_destroyed: "removed Variance explanation document"
-      vat_returns_file_uploaded: "uploaded VAT returns"
-      vat_returns_file_destroyed: "removed VAT returns"
-      palace_attendee_update: "updated Buckingham Palace attendee details"
-      palace_attendee_submit: "confirmed Buckingham Palace attendee details"
-      palace_attendee_create: "added a new Buckingham Palace attendee"
-      palace_attendee_destroy: "deleted a Buckingham Palace attendee"
-      press_summary_update: "updated press book notes"
-      press_summary_submit: "submitted press book notes"
-      press_summary_signoff: "signed off press release"
-      press_summary_create: "created the press book notes"
-      application_create: "created the award application"
-      application_update: "updated the award application"
+      actual_figures_file_uploaded: 'uploaded actual figures'
+      actual_figures_file_destroyed: 'removed actual figures'
+      commercial_figures_file_uploaded: 'uploaded Variance explanation document'
+      commercial_figures_file_destroyed: 'removed Variance explanation document'
+      vat_returns_file_uploaded: 'uploaded VAT returns'
+      vat_returns_file_destroyed: 'removed VAT returns'
+      palace_attendee_update: 'updated Buckingham Palace attendee details'
+      palace_attendee_submit: 'confirmed Buckingham Palace attendee details'
+      palace_attendee_create: 'added a new Buckingham Palace attendee'
+      palace_attendee_destroy: 'deleted a Buckingham Palace attendee'
+      press_summary_update: 'updated press book notes'
+      press_summary_submit: 'submitted press book notes'
+      press_summary_signoff: 'signed off press release'
+      press_summary_create: 'created the press book notes'
+      application_create: 'created the award application'
+      application_update: 'updated the award application'
 
   form_answers:
     state:

From b95f85b7d60614eac9c716048938657412bcbf23 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 30 Aug 2023 17:01:04 +0200
Subject: [PATCH 314/352] Submit form w/ jQuery

---
 app/javascript/controllers/appraisal_form_controller.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/javascript/controllers/appraisal_form_controller.js b/app/javascript/controllers/appraisal_form_controller.js
index bf8b97fb17..de87ee13cb 100644
--- a/app/javascript/controllers/appraisal_form_controller.js
+++ b/app/javascript/controllers/appraisal_form_controller.js
@@ -90,7 +90,7 @@ export default class extends ApplicationController {
         if (element) el.innerHTML = element.value;
       });
 
-      return form.submit();
+      return $(form).submit();
     } else if (textarea.length === 1) {
       let _textarea = textarea[0];
 
@@ -119,7 +119,7 @@ export default class extends ApplicationController {
           }
         }
 
-        return form.submit();
+        return $(form).submit();
       }
     } else {
       if (textarea[0] && textarea[0].value.length) {
@@ -132,7 +132,7 @@ export default class extends ApplicationController {
         Array.from(wrapper.querySelectorAll('.form-value p'))[-1].innerHTML = value;
       }
 
-      return form.submit();
+      return $(form).submit();
     }
   };
 

From 17d0e717bda48612265b01246151cdbff2570939 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Wed, 30 Aug 2023 17:26:50 +0200
Subject: [PATCH 315/352] Scroll to first invalid element

---
 .../controllers/appraisal_form_controller.js  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/app/javascript/controllers/appraisal_form_controller.js b/app/javascript/controllers/appraisal_form_controller.js
index de87ee13cb..82082b63ac 100644
--- a/app/javascript/controllers/appraisal_form_controller.js
+++ b/app/javascript/controllers/appraisal_form_controller.js
@@ -1,3 +1,5 @@
+import { scrollToElement } from '../helpers';
+
 export default class extends ApplicationController {
   static values = {
     success: String,
@@ -39,11 +41,15 @@ export default class extends ApplicationController {
       detail: { responseJSON: errors },
     } = event;
     const panel = target.closest('.panel-body');
+    let form;
 
     this.resetErrors(panel);
 
     Object.entries(errors).forEach(([key, values]) => {
       const field = panel.querySelector(`[name*='[${key}]']`);
+      if (!form) {
+        form = field.closest('form');
+      }
       const container = field.closest('.form-container');
 
       if (field && this.shouldValidateField(field)) {
@@ -60,6 +66,19 @@ export default class extends ApplicationController {
         }
       }
     });
+
+    const firstInvalidField = Array.from(form.elements).find((field) => field.ariaInvalid == 'true');
+
+    if (this.visible(firstInvalidField)) {
+      scrollToElement(firstInvalidField);
+      firstInvalidField.focus();
+    } else {
+      const altTarget = firstInvalidField.closest('.form-container').querySelector('label button');
+      if (altTarget) {
+        scrollToElement(altTarget);
+        altTarget.focus();
+      }
+    }
   };
 
   stash = (event) => {
@@ -140,6 +159,7 @@ export default class extends ApplicationController {
     element.querySelectorAll('.field-with-errors').forEach((el) => el.classList.remove('field-with-errors'));
     element.querySelectorAll('.rag-error').forEach((el) => el.classList.remove('rag-error'));
     element.querySelectorAll('[aria-errormessage]').forEach((el) => el.removeAttribute('aria-errormessage'));
+    element.querySelectorAll('[aria-invalid]').forEach((el) => el.removeAttribute('aria-invalid'));
     element.querySelectorAll('.alert').forEach((el) => el.remove());
   }
 
@@ -163,6 +183,7 @@ export default class extends ApplicationController {
       return errors.forEach((message) => {
         const [alert, identifier] = this.createAlert('danger', message);
         field.setAttribute('aria-errormessage', identifier);
+        field.setAttribute('aria-invalid', true);
         return container.insertAdjacentHTML('afterbegin', alert);
       });
     }

From c0fa949aa223ddbcf52cc4a332f8eced653a6f76 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 30 Aug 2023 14:24:28 +0100
Subject: [PATCH 316/352] Fix level headings for judges

---
 app/views/judge/case_summaries/index.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/judge/case_summaries/index.html.slim b/app/views/judge/case_summaries/index.html.slim
index 35553156c3..c0247edc89 100644
--- a/app/views/judge/case_summaries/index.html.slim
+++ b/app/views/judge/case_summaries/index.html.slim
@@ -5,7 +5,7 @@
 
 .downloads-page
   .downloads-page__section
-    h3
+    h2
       ' Case Summaries
     ul.download-list
       - FormAnswer::AWARD_TYPE_FULL_NAMES.select { |key, value| current_judge.assigned_award_types.include?(key) }.each do |key, value|

From 1e4166ae2b04c91263fb43cc1b982b3f765294c1 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Wed, 30 Aug 2023 17:39:35 +0100
Subject: [PATCH 317/352] Add span with description of flags for accessibility
 purposes

---
 app/helpers/form_answer_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/form_answer_helper.rb b/app/helpers/form_answer_helper.rb
index c5195cccf6..7bbfe8b12f 100644
--- a/app/helpers/form_answer_helper.rb
+++ b/app/helpers/form_answer_helper.rb
@@ -37,7 +37,8 @@ def application_flags(fa, subject = nil)
 
     if comments_count > 0
       content_tag :span, class: "icon-flagged #{flag_type}" do
-        content_tag :span, class: "flag-count" do
+        "#{current_user_class} flags: ".html_safe +
+        content_tag(:span, class: "flag-count") do
           comments_count.to_s
         end
       end

From 15a04aaefd6cbf0975ab8f28a374455664bf90e4 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 31 Aug 2023 13:02:38 +0100
Subject: [PATCH 318/352] Correct list items in previos applications section

---
 .../form_answers/_previous_applications_section.html.slim      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/_previous_applications_section.html.slim b/app/views/admin/form_answers/_previous_applications_section.html.slim
index 997af30f89..172ab2fc22 100644
--- a/app/views/admin/form_answers/_previous_applications_section.html.slim
+++ b/app/views/admin/form_answers/_previous_applications_section.html.slim
@@ -10,4 +10,5 @@
           - else
             = application.award_type_and_year
     - else
-      ' None
+      li
+        ' None

From fc1b666764343e4022d5a12ee22fe554d076db85 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 31 Aug 2023 14:13:57 +0100
Subject: [PATCH 319/352] Direct users to prod env in banner - temp fix

---
 app/views/shared/_dev_or_staging_banner.html.slim | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/shared/_dev_or_staging_banner.html.slim b/app/views/shared/_dev_or_staging_banner.html.slim
index a4f3c78929..825436c76a 100644
--- a/app/views/shared/_dev_or_staging_banner.html.slim
+++ b/app/views/shared/_dev_or_staging_banner.html.slim
@@ -1,4 +1,5 @@
 - if display_banner?
   div[class="#{subdomain_from_request}-banner"]
+    ' This is the  
     => subdomain_from_request.titleize
-    ' environment
+    ' environment, please visit our <a href="https://www.kings-awards-enterprise.service.gov.uk/dashboard">production environment</a>

From b8748c2fa4f4bb34658fc3671b166d0d909d912c Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:39:22 +0200
Subject: [PATCH 320/352] Fix `accessible-autocomplete` initialization

---
 app/assets/javascripts/application.js.coffee  |  4 +-
 .../javascripts/frontend/custom_selects.js    | 42 +++++++++++++++----
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 55cb07845f..2017e3a77c 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -1150,7 +1150,6 @@ jQuery ->
           if li_size + 1 >= add_limit_attr
             question.find(".js-button-add").addClass("visuallyhidden")
 
-
         if can_add
           add_eg = add_eg.replace(/((\w+|_)\[(\w+|_)\]\[)(\d+)\]/g, "$1#{li_size}]")
           add_eg = add_eg.replace(/((\w+|_)\[(\w+|_)\]\[)(\{index\})\]/g, "$1#{li_size}]")
@@ -1182,6 +1181,9 @@ jQuery ->
             textareas.removeCharcountElements()
             textareas.charcount()
 
+          if (selectFields = question.find(".list-add > li:last .custom-select")).length
+            selectFields.siblings().remove()
+
           # remove the default reached class to allow removing again
           questionAddDefaultReached(question.find(".list-add"))
           window.FormValidation.validateStep()
diff --git a/app/assets/javascripts/frontend/custom_selects.js b/app/assets/javascripts/frontend/custom_selects.js
index 7d2ed2f4e8..7eaf5fb2de 100644
--- a/app/assets/javascripts/frontend/custom_selects.js
+++ b/app/assets/javascripts/frontend/custom_selects.js
@@ -1,17 +1,43 @@
-$(document).ready(function() {
-  $(".custom-select").each(function() {
+$(document).ready(function () {
+  $('.custom-select').each(function () {
     var field = $(this)[0];
 
-    if ($(this).is(":disabled") || $(this).is("[readonly]")) {
+    if ($(this).is(':disabled') || $(this).is('[readonly]')) {
       return;
     }
 
     accessibleAutocomplete.enhanceSelectElement({
       selectElement: field,
-      showAllValues: true, 
-      dropdownArrow: function() {
+      showAllValues: true,
+      dropdownArrow: () => {
         return "<span class='autocomplete__arrow'></span>";
-      }
-    })
+      },
+    });
   });
-});
\ No newline at end of file
+
+  const observer = new MutationObserver((mutations) => {
+    return mutations.forEach((mutation) => {
+      return mutation.addedNodes.forEach((node) => {
+        if (node instanceof HTMLElement) {
+          const elements = node.querySelectorAll('select.custom-select');
+          if (elements.length > 0) {
+            Array.from(elements).forEach((element) => {
+              accessibleAutocomplete.enhanceSelectElement({
+                selectElement: element,
+                showAllValues: true,
+                dropdownArrow: () => {
+                  return "<span class='autocomplete__arrow'></span>";
+                },
+              });
+            });
+          }
+        }
+      });
+    });
+  });
+
+  observer.observe(document.body, {
+    subtree: true,
+    childList: true,
+  });
+});

From 07f92d0c7e981ea9c239efe04010cfa70d3be772 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:40:21 +0200
Subject: [PATCH 321/352] Try to initialize without observer

---
 app/assets/javascripts/application.js.coffee  | 11 ++++++++
 .../javascripts/frontend/custom_selects.js    | 26 -------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index 2017e3a77c..f987605a84 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -1184,6 +1184,17 @@ jQuery ->
           if (selectFields = question.find(".list-add > li:last .custom-select")).length
             selectFields.siblings().remove()
 
+            selectFields.each ->
+              field = $(this)[0]
+              if $(this).is(':disabled') or $(this).is('[readonly]')
+                return
+
+              accessibleAutocomplete.enhanceSelectElement
+                selectElement: field
+                showAllValues: true
+                dropdownArrow: ->
+                  '<span class=\'autocomplete__arrow\'></span>'
+
           # remove the default reached class to allow removing again
           questionAddDefaultReached(question.find(".list-add"))
           window.FormValidation.validateStep()
diff --git a/app/assets/javascripts/frontend/custom_selects.js b/app/assets/javascripts/frontend/custom_selects.js
index 7eaf5fb2de..11aba6b88d 100644
--- a/app/assets/javascripts/frontend/custom_selects.js
+++ b/app/assets/javascripts/frontend/custom_selects.js
@@ -14,30 +14,4 @@ $(document).ready(function () {
       },
     });
   });
-
-  const observer = new MutationObserver((mutations) => {
-    return mutations.forEach((mutation) => {
-      return mutation.addedNodes.forEach((node) => {
-        if (node instanceof HTMLElement) {
-          const elements = node.querySelectorAll('select.custom-select');
-          if (elements.length > 0) {
-            Array.from(elements).forEach((element) => {
-              accessibleAutocomplete.enhanceSelectElement({
-                selectElement: element,
-                showAllValues: true,
-                dropdownArrow: () => {
-                  return "<span class='autocomplete__arrow'></span>";
-                },
-              });
-            });
-          }
-        }
-      });
-    });
-  });
-
-  observer.observe(document.body, {
-    subtree: true,
-    childList: true,
-  });
 });

From 9f7c371c83b683e1df9c3a8a0d66a37ffdd85a7d Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 31 Aug 2023 15:48:21 +0100
Subject: [PATCH 322/352] Add visuallyhidden label to form input for 'Attach
 document'

---
 app/views/admin/form_answer_attachments/_form.html.slim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/admin/form_answer_attachments/_form.html.slim b/app/views/admin/form_answer_attachments/_form.html.slim
index 64113045fe..04b8c19082 100644
--- a/app/views/admin/form_answer_attachments/_form.html.slim
+++ b/app/views/admin/form_answer_attachments/_form.html.slim
@@ -14,6 +14,7 @@
           span[aria-hidden="true"] &times;
 
     .attachment-link.if-js-hide
+      = form.label :file, "Attach document", class: "visuallyhidden"
       = form.file_field :file
 
     .form-group

From 4eb57749de5d6797a29ca461483b0a432f5793a4 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 31 Aug 2023 16:26:03 +0100
Subject: [PATCH 323/352] Add unique id to flag checkbox

---
 app/views/admin/form_answers/_comment.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/form_answers/_comment.html.slim b/app/views/admin/form_answers/_comment.html.slim
index 8e65a832ca..200a00f406 100644
--- a/app/views/admin/form_answers/_comment.html.slim
+++ b/app/views/admin/form_answers/_comment.html.slim
@@ -37,7 +37,7 @@
              authenticity_token: true) do |f|
 
     label.if-js-hide Flag
-    = f.check_box :flagged, class: "flag-comment-checkbox if-js-hide"
+    = f.check_box :flagged, class: "flag-comment-checkbox if-js-hide", id: "flag-comment-#{comment.id}"
     .comment-action
       = l comment.created_at, format: :date_at_time
       span.divider •

From 8f69d0e9a30bea4aa588d3aa5c1a6528a2074f21 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 1 Sep 2023 00:22:04 +0200
Subject: [PATCH 324/352] Remove the error from whole block when validation
 passes

---
 app/assets/javascripts/frontend/form-validation.js.coffee | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index 0b9fbcac77..a8dae48d2f 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -16,6 +16,7 @@ window.FormValidation =
       container.closest("td").find(".govuk-error-message").empty()
     else
       container.closest(".question-block").find(".govuk-error-message").empty()
+    container.closest(".question-block").removeClass("govuk-form-group--error")
     container.closest(".govuk-form-group--error").removeClass("govuk-form-group--error")
 
   clearAriaDescribedby: (container) ->

From 745c406e689f4335805cd36974071c2fdf5806a8 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 1 Sep 2023 00:22:34 +0200
Subject: [PATCH 325/352] JS: Validate only form fields

---
 .../frontend/form-validation.js.coffee        | 51 ++++++++++---------
 1 file changed, 26 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index a8dae48d2f..be19d2711a 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -167,33 +167,34 @@ window.FormValidation =
   addSubfieldError: (question, subquestion) ->
     questionRef = question.attr("data-question_ref")
     input = $(subquestion).find('input,textarea,select').filter(':visible')
-    label = @extractText(input.attr('id'))
-    incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
-
-    if question.hasClass('date-DDMMYYYY')
-      errorMessage = "#{incompleteMessage} Use the format DD/MM/YYYY."
-      @logThis(question, "validateRequiredSubQuestion", errorMessage)
-      @addErrorMessage($(subquestion), errorMessage)
-    else if question.hasClass('date-MMYYYY')
-      errorMessage = "#{incompleteMessage} Use the format MM/YYYY."
-      @logThis(question, "validateRequiredSubQuestion", errorMessage)
-      @addErrorMessage($(subquestion), errorMessage)
-    else if question.hasClass('date-YYYY')
-      errorMessage = "#{incompleteMessage} Use the format YYYY."
-      @logThis(question, "validateRequiredSubQuestion", errorMessage)
-      @addErrorMessage($(subquestion), errorMessage)
-    else if input.hasClass("autocomplete__input")
-      errorMessage = "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list."
-      @logThis(question, "validateRequiredSubQuestion", errorMessage)
-      @addErrorMessage($(subquestion), errorMessage)
-    else
-      if question.find(".js-financial-year-latest").length
-        #avoid duplicate errors for financial year questions
-        return
-      else
-        errorMessage = "Question #{questionRef} is incomplete. #{label} is required and must be filled in."
+    if input.length
+      label = @extractText(input.attr('id'))
+      incompleteMessage = "Question #{questionRef} is incomplete. It is required and must be filled in."
+
+      if question.hasClass('date-DDMMYYYY')
+        errorMessage = "#{incompleteMessage} Use the format DD/MM/YYYY."
         @logThis(question, "validateRequiredSubQuestion", errorMessage)
         @addErrorMessage($(subquestion), errorMessage)
+      else if question.hasClass('date-MMYYYY')
+        errorMessage = "#{incompleteMessage} Use the format MM/YYYY."
+        @logThis(question, "validateRequiredSubQuestion", errorMessage)
+        @addErrorMessage($(subquestion), errorMessage)
+      else if question.hasClass('date-YYYY')
+        errorMessage = "#{incompleteMessage} Use the format YYYY."
+        @logThis(question, "validateRequiredSubQuestion", errorMessage)
+        @addErrorMessage($(subquestion), errorMessage)
+      else if input.hasClass("autocomplete__input")
+        errorMessage = "Question #{questionRef} is incomplete. #{label} is required and an option must be selected from the following dropdown list."
+        @logThis(question, "validateRequiredSubQuestion", errorMessage)
+        @addErrorMessage($(subquestion), errorMessage)
+      else
+        if question.find(".js-financial-year-latest").length
+          #avoid duplicate errors for financial year questions
+          return
+        else
+          errorMessage = "Question #{questionRef} is incomplete. #{label} is required and must be filled in."
+          @logThis(question, "validateRequiredSubQuestion", errorMessage)
+          @addErrorMessage($(subquestion), errorMessage)
 
   addQuestionError: (question) ->
     questionRef = question.attr("data-question_ref")

From cdfc00ed1f0a9941edfebda1cb7a653ff6a0ca2a Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:18:27 +0100
Subject: [PATCH 326/352] Adds unique ids to destroy-comments forms

---
 app/views/admin/form_answers/_comment.html.slim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/form_answers/_comment.html.slim b/app/views/admin/form_answers/_comment.html.slim
index 200a00f406..1549cab696 100644
--- a/app/views/admin/form_answers/_comment.html.slim
+++ b/app/views/admin/form_answers/_comment.html.slim
@@ -6,7 +6,7 @@
         p Delete this comment?
         .btn-actions
         = form_for [namespace_name, @form_answer, comment],
-                   html: { method: :delete, class: "destroy-comment", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |f|
+                   html: { method: :delete, class: "destroy-comment", id: "overlay-destroy-comment", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |f|
 
             = f.submit 'Yes', class: "btn btn-danger link-delete-comment-confirm"
             ' &nbsp;
@@ -25,7 +25,7 @@
 
         - if comment.author?(current_subject)
           = form_for [namespace_name, @form_answer, comment],
-                     html: { method: :delete, class: "destroy-comment", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |f|
+                     html: { method: :delete, class: "destroy-comment", id: "destroy-comment", data: { inline_flash_target: "form", action: "ajax:x:success->inline-flash#success ajax:x:error->inline-flash#error" } } do |f|
 
             = f.submit 'Delete', class: "btn btn-danger link-delete-comment-confirm"
 

From 7dc9f4c129b79e27b9ab63ca827d9110cce65a60 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Fri, 1 Sep 2023 12:20:04 +0100
Subject: [PATCH 327/352] Removes hidden fields from simple_fields_for

---
 .../form_answers/company_details/_goods_services_form.html.slim | 2 +-
 .../company_details/_organisation_head_form.html.slim           | 2 +-
 .../company_details/_organisation_type_form.html.slim           | 2 +-
 .../company_details/_registration_number_form.html.slim         | 2 +-
 .../admin/form_answers/company_details/_website_form.html.slim  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
index 620fce08e3..1351b47037 100644
--- a/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_goods_services_form.html.slim
@@ -18,7 +18,7 @@
         = simple_form_for [namespace_name, resource], remote: true, authenticity_token: true, html: { data: { type: "html", inline_flash_target: "form" }, id: "goods_services_form_admin_appraisal" } do |f|
           = hidden_field_tag :section, "goods_services", id: "section_goods_services_hidden_field"
           .form-fields.form-block
-            = f.simple_fields_for(:data) do |f|
+            = f.simple_fields_for :data, include_id: false do |f|
               - if !@form_answer.trade?
                 = f.input @form_answer.goods_and_services_key, as: :text, label: false, input_html: { class: "form-control js-char-count", rows: 3, "data-word-max" => 15 }
               - elsif @form_answer.document["trade_goods_and_services_explanations"].present?
diff --git a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
index 9772d1ea0a..c8df35163e 100644
--- a/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_head_form.html.slim
@@ -25,7 +25,7 @@
               - if @form_answer.head_of_business_email.present?
                 = @form_answer.head_of_business_email
           .form-fields.form-block
-            = f.simple_fields_for(:data) do |f|
+            = f.simple_fields_for :data, include_id: false do |f|
               .row
                 .col-md-2
                   = f.input :head_of_business_title,
diff --git a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
index 0b08fde0d3..8a98a53213 100644
--- a/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_organisation_type_form.html.slim
@@ -20,7 +20,7 @@
           .form-fields.form-block
             .row
               .col-xs-6.col-md-6
-                = f.simple_fields_for(:data) do |f|
+                = f.simple_fields_for :data, include_id: false do |f|
                   = f.input :organisation_type,
                             collection: AppraisalFormHelper::COMPANY_ORGANISATION_TYPES,
                             label: false,
diff --git a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
index a4a84b6bd4..2d28b1ac0f 100644
--- a/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_registration_number_form.html.slim
@@ -16,7 +16,7 @@
               - else
                 em.text-muted No company/charity registration number added yet.
           .form-fields.form-block
-            = f.simple_fields_for(:data) do |f|
+            = f.simple_fields_for :data, include_id: false do |f|
               = f.input :registration_number,
                         as: :string,
                         label: false,
diff --git a/app/views/admin/form_answers/company_details/_website_form.html.slim b/app/views/admin/form_answers/company_details/_website_form.html.slim
index 319abec8a4..271dc91dd6 100644
--- a/app/views/admin/form_answers/company_details/_website_form.html.slim
+++ b/app/views/admin/form_answers/company_details/_website_form.html.slim
@@ -16,7 +16,7 @@
               - else
                 em.text-muted No website added.
           .form-fields.form-block
-            = f.simple_fields_for(:data) do |f|
+            = f.simple_fields_for :data, include_id: false do |f|
               = f.input :website_url,
                         as: :string,
                         label: false,

From 15e2401986f64cc27ea2a634acce575a10d07f3e Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 4 Sep 2023 08:36:45 +0100
Subject: [PATCH 328/352] Adds wrexham to region list

---
 app/helpers/region_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/region_helper.rb b/app/helpers/region_helper.rb
index 9ba510bc0c..3634b87b50 100644
--- a/app/helpers/region_helper.rb
+++ b/app/helpers/region_helper.rb
@@ -96,7 +96,8 @@ module RegionHelper
     "West Sussex": "South East",
     "West Yorkshire": "Yorkshire & The Humber",
     "Wiltshire": "South West",
-    "Worcestershire": "West Midlands"
+    "Worcestershire": "West Midlands",
+    "Wrexham": "Wales"
   }
 
   def counties

From 779abd737735054b4a096656ece3fc7e9a676a9e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Mon, 4 Sep 2023 16:51:36 +0100
Subject: [PATCH 329/352] Testing - seeing if narrowing width of column affects
 pdf export

---
 app/pdf_generators/case_summary_pdfs/general/data_pointer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb b/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
index 1ec837efb9..46fc7a7c62 100644
--- a/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
+++ b/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
@@ -247,7 +247,7 @@ def column_widths
     when 2
       first_row_width = 607
     when 3
-      first_row_width = 527
+      first_row_width = 500
     when 5
       first_row_width = 367
     when 6

From 401142f9f9608cfcb0583b56edc30b6d1465704c Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 4 Sep 2023 16:21:58 +0100
Subject: [PATCH 330/352] Removed questions that dont count from filled total

---
 app/models/form_answer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
index 370d7d40b0..03f7651563 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -516,7 +516,7 @@ def set_progress
 
     progress_hash = HashWithIndifferentAccess.new(document || {}).except(*questions_that_dont_count)
     form = award_form.decorate(answers: progress_hash)
-    self.fill_progress = form.required_visible_questions_filled.to_f / (form.required_visible_questions_total - questions_that_dont_count.count)
+    self.fill_progress = (form.required_visible_questions_filled - questions_that_dont_count.count).to_f / (form.required_visible_questions_total - questions_that_dont_count.count)
 
     unless new_record?
       progress = (form_answer_progress || build_form_answer_progress)

From 0f9489a43a939ca5aa241612d9ac9bcee16af0fb Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 5 Sep 2023 10:34:55 +0100
Subject: [PATCH 331/352] include all questions in section progress

---
 app/models/form_answer.rb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
index 03f7651563..94dc3ca464 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -514,11 +514,15 @@ def set_progress
       end
     end
 
+    ## questions that don't count are excluded to show 0% progress for applications not started
     progress_hash = HashWithIndifferentAccess.new(document || {}).except(*questions_that_dont_count)
     form = award_form.decorate(answers: progress_hash)
-    self.fill_progress = (form.required_visible_questions_filled - questions_that_dont_count.count).to_f / (form.required_visible_questions_total - questions_that_dont_count.count)
+    self.fill_progress = form.required_visible_questions_filled.to_f / (form.required_visible_questions_total - questions_that_dont_count.count)
 
     unless new_record?
+      ## section progress should include questions that don't count
+      progress_hash = HashWithIndifferentAccess.new(document || {})
+      form = award_form.decorate(answers: progress_hash)
       progress = (form_answer_progress || build_form_answer_progress)
       progress.assign_sections(form)
       progress.save

From 5935a21564d9d8aed66dab8f0644dd9c6a1c6cd4 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 5 Sep 2023 10:45:22 +0100
Subject: [PATCH 332/352] exclude non validation fields from required sub
 fields

---
 app/views/qae_form/_address_question.html.slim    |  2 +-
 app/views/qae_form/_sub_fields_question.html.slim |  2 +-
 forms/qae_form_builder/address_question.rb        |  8 +++++---
 forms/qae_form_builder/sub_fields_question.rb     | 11 +++++++----
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/views/qae_form/_address_question.html.slim b/app/views/qae_form/_address_question.html.slim
index 2310b35faf..cc83dcd3d0 100644
--- a/app/views/qae_form/_address_question.html.slim
+++ b/app/views/qae_form/_address_question.html.slim
@@ -85,7 +85,7 @@ div role="group" id="q_#{question.key}"
         .clear
 
         - klass = "#{sub_field_title.parameterize == 'postcode' ? 'govuk-input--width-10' : 'govuk-input--width-20'}"
-        - klass <<(QaeFormBuilder::AddressQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+        - klass <<(QaeFormBuilder::AddressQuestionDecorator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
         input.govuk-input.js-trigger-autosave[
           class=klass
           type="text"
diff --git a/app/views/qae_form/_sub_fields_question.html.slim b/app/views/qae_form/_sub_fields_question.html.slim
index 420e8b07f6..6a76ce3f08 100644
--- a/app/views/qae_form/_sub_fields_question.html.slim
+++ b/app/views/qae_form/_sub_fields_question.html.slim
@@ -26,7 +26,7 @@ div role="group" id="#{question.key}"
       - else
         - klass = 'govuk-input--width-10'
 
-      - klass <<(QaeFormBuilder::SubFieldsQuestionValidator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
+      - klass <<(QaeFormBuilder::SubFieldsQuestionDecorator::NO_VALIDATION_SUB_FIELDS.exclude?(sub_field_key) ? " required" : " not-required")
 
       input.govuk-input.js-trigger-autosave[
         class=klass
diff --git a/forms/qae_form_builder/address_question.rb b/forms/qae_form_builder/address_question.rb
index 4dc230e55f..dc7396d9cb 100644
--- a/forms/qae_form_builder/address_question.rb
+++ b/forms/qae_form_builder/address_question.rb
@@ -1,14 +1,16 @@
 class QaeFormBuilder
   class AddressQuestionValidator < SubFieldsQuestionValidator
-    NO_VALIDATION_SUB_FIELDS = [:street, :county]
   end
 
   class AddressQuestionDecorator < SubFieldsQuestionDecorator
     include RegionHelper
+    NO_VALIDATION_SUB_FIELDS = [:street, :county]
 
     def required_sub_fields
       if sub_fields.present?
-        sub_fields
+        sub_fields.select do |f|
+          NO_VALIDATION_SUB_FIELDS.exclude?(f.keys.first)
+        end
       else
         [
           { building: "Building" },
@@ -24,7 +26,7 @@ def rendering_sub_fields
       # We are rejecting :street, because :building and :street
       # are rendering together in same block
       # and the :building is the first one
-      required_sub_fields.reject do |f|
+      sub_fields.reject do |f|
         f.keys.include?(:street)
       end.map do |f|
         [f.keys.first, f.values.first]
diff --git a/forms/qae_form_builder/sub_fields_question.rb b/forms/qae_form_builder/sub_fields_question.rb
index afbb0e39e6..fdacbcc203 100644
--- a/forms/qae_form_builder/sub_fields_question.rb
+++ b/forms/qae_form_builder/sub_fields_question.rb
@@ -1,13 +1,12 @@
 class QaeFormBuilder
   class SubFieldsQuestionValidator < QuestionValidator
-    NO_VALIDATION_SUB_FIELDS = [:honours]
     def errors
       result = super
 
       if question.required?
         question.required_sub_fields.each do |sub_field|
           suffix = sub_field.keys[0]
-          if !question.input_value(suffix: suffix).present? && NO_VALIDATION_SUB_FIELDS.exclude?(suffix)
+          if !question.input_value(suffix: suffix).present?
             result[question.hash_key(suffix: suffix)] ||= ""
             result[question.hash_key(suffix: suffix)] << "Question #{question.ref || question.sub_ref} is incomplete. #{suffix.to_s.humanize} is required and and must be filled in."
           end
@@ -22,12 +21,16 @@ def errors
   end
 
   class SubFieldsQuestionDecorator < QuestionDecorator
+    NO_VALIDATION_SUB_FIELDS = [:honours]
+
     def required_sub_fields
-      sub_fields
+      sub_fields.select do |f|
+        NO_VALIDATION_SUB_FIELDS.exclude?(f.keys.first)
+      end
     end
 
     def rendering_sub_fields
-      required_sub_fields.map do |f|
+      sub_fields.map do |f|
         {key: f.keys.first, title: f.values.first, hint: f.try(:[], :hint)}
       end
     end

From c7f12f45bb6571b50231ed3c346dbd468b26e19e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 5 Sep 2023 11:06:24 +0100
Subject: [PATCH 333/352] Upgrades bundler and nodejs versions ahead of
 buildpack updates

---
 .github/workflows/ci.yml | 2 +-
 .tool-versions           | 1 +
 Dockerfile.local         | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e2bd01778..8db9f826ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
         env:
           DISPLAY_SOCIAL_MOBILITY_AWARD: true
           DATABASE_URL: 'postgresql://postgres:postgres@localhost:5432/qae_test'
-          BUNDLER_VERSION: 2.4.16
+          BUNDLER_VERSION: 2.4.19
           DOCKER_TLS_CERTDIR: ''
         run: |
           sudo apt update
diff --git a/.tool-versions b/.tool-versions
index f2a971aa75..29d3872ecb 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1 +1,2 @@
 ruby 3.2.2
+nodejs 18.17.1
diff --git a/Dockerfile.local b/Dockerfile.local
index fe451a9ec5..c26f559c9f 100644
--- a/Dockerfile.local
+++ b/Dockerfile.local
@@ -18,7 +18,7 @@ COPY Gemfile /app/Gemfile
 COPY Gemfile.lock /app/Gemfile.lock
 RUN bundle config set --local path 'vendor/bundle'
 RUN bundle config set --local without 'development test'
-RUN gem install bundler:2.4.16 && bundle install --jobs 4 --retry 3
+RUN gem install bundler:2.4.19 && bundle install --jobs 4 --retry 3
 
 COPY . /app
 RUN yarn install

From 00f805481b6c76bf3b9d198f565e69c6b8a69ec6 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Tue, 5 Sep 2023 12:33:40 +0100
Subject: [PATCH 334/352] Removed queen_award_holder from questions that dont
 count

---
 app/models/form_answer.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/models/form_answer.rb b/app/models/form_answer.rb
index 94dc3ca464..51d63765b8 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -507,11 +507,7 @@ def set_progress
     if award_type == "promotion"
       questions_that_dont_count = []
     else
-      questions_that_dont_count = if award_year.year <= 2019
-        [:company_name]
-      else
-        [:company_name, :queen_award_holder]
-      end
+      questions_that_dont_count = [:company_name]
     end
 
     ## questions that don't count are excluded to show 0% progress for applications not started

From 244d483f206876d04d45849967f6563369e11c7e Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Tue, 5 Sep 2023 13:42:54 +0100
Subject: [PATCH 335/352] Revert "Testing - seeing if narrowing width of column
 affects pdf export"

---
 app/pdf_generators/case_summary_pdfs/general/data_pointer.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb b/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
index 46fc7a7c62..1ec837efb9 100644
--- a/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
+++ b/app/pdf_generators/case_summary_pdfs/general/data_pointer.rb
@@ -247,7 +247,7 @@ def column_widths
     when 2
       first_row_width = 607
     when 3
-      first_row_width = 500
+      first_row_width = 527
     when 5
       first_row_width = 367
     when 6

From f77b7fd803ef1ebc6d997648b565b384669a226e Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Tue, 5 Sep 2023 16:19:16 +0200
Subject: [PATCH 336/352] Try to fix fetching form answers for case summary
 report

---
 app/pdf_generators/case_summary_pdfs/base.rb | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/pdf_generators/case_summary_pdfs/base.rb b/app/pdf_generators/case_summary_pdfs/base.rb
index 290ee8b01d..ca160e1bc2 100644
--- a/app/pdf_generators/case_summary_pdfs/base.rb
+++ b/app/pdf_generators/case_summary_pdfs/base.rb
@@ -24,10 +24,10 @@ def add_page_numbers
   end
 
   def all_mode
-    set_form_answers
+    @_form_answers = set_form_answers
 
-    if form_answers.present?
-      form_answers.each_with_index do |form_answer, index|
+    if @_form_answers.present?
+      @_form_answers.each_with_index do |form_answer, index|
         start_new_page if index.to_i != 0
         render_item(form_answer)
       end
@@ -54,7 +54,11 @@ def set_form_answers
       scope = scope.where("form_answers.document #>> '{trade_commercial_success}' = '#{years_mode}'")
     end
 
-    @form_answers = scope
+    puts "*"*100
+    puts scope.count
+    puts "*"*100
+
+    scope
   end
 
   def render_item(form_answer)

From 2b32fb6d2a611dc418179715468d729acadb14a9 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 7 Sep 2023 12:16:46 +0200
Subject: [PATCH 337/352] Move threshold for company business start to 1000
 years

---
 .../v2024/innovation/innovation_step4.rb      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index 418aacb789..ca10e1b2ba 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -62,7 +62,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :yes
         end
 
@@ -115,7 +115,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :true
 
           employees_question
@@ -138,7 +138,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -154,7 +154,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -168,7 +168,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
           turnover :total_turnover
@@ -185,7 +185,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           context %(
             <p>
               Use a minus symbol to record any losses.
@@ -209,7 +209,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -330,7 +330,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
@@ -345,7 +345,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_exports, "Of which exports (if applicable)." do
@@ -360,7 +360,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
@@ -375,7 +375,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :drops_in_sales, "Explain any drop in sales or the number of units sold (if applicable)." do
@@ -403,7 +403,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :avg_unit_price_desc, "Explain your unit selling prices or contract values, highlighting any changes over the above periods (if applicable)." do
@@ -428,7 +428,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, Settings.min_started_trading, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :costs_change_desc, "Explain your direct unit or contract costs, highlighting any changes over the above periods (if applicable)." do

From 10917ef16f9b800511a4e014fd5b90a05a25d44f Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 7 Sep 2023 12:31:32 +0200
Subject: [PATCH 338/352] Update threshold everywhere

---
 .../v2024/innovation/innovation_step4.rb      | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index ca10e1b2ba..f639775f9b 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -62,7 +62,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :yes
         end
 
@@ -115,7 +115,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :true
 
           employees_question
@@ -138,7 +138,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -154,7 +154,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -168,7 +168,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
           turnover :total_turnover
@@ -185,7 +185,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           context %(
             <p>
               Use a minus symbol to record any losses.
@@ -209,7 +209,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -330,7 +330,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
@@ -345,7 +345,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_exports, "Of which exports (if applicable)." do
@@ -360,7 +360,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
@@ -375,7 +375,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :drops_in_sales, "Explain any drop in sales or the number of units sold (if applicable)." do
@@ -403,7 +403,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :avg_unit_price_desc, "Explain your unit selling prices or contract values, highlighting any changes over the above periods (if applicable)." do
@@ -428,7 +428,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 99)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :costs_change_desc, "Explain your direct unit or contract costs, highlighting any changes over the above periods (if applicable)." do

From 8d3a90d9189f6df126a4ae8f538ce4692ae7ce26 Mon Sep 17 00:00:00 2001
From: DaniBitZesty <84323332+DaniBitZesty@users.noreply.github.com>
Date: Thu, 7 Sep 2023 12:16:41 +0100
Subject: [PATCH 339/352] Accomodate NaN values in proportion calculations

---
 app/assets/javascripts/application.js.coffee | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index f987605a84..ec4c101cf0 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -472,6 +472,9 @@ jQuery ->
     referenceValue = parseFloat(referenceCell?.value) or 0
     if type == 'disadvantaged'
       proportionInput?.value = ((referenceValue / colSums[cell.cellIndex]) * 100).toFixed(2)
+      if isNaN(parseFloat(proportionInput?.value))
+        proportionInput?.value = "0"
+
     else if type == 'others'
       proportionInput?.value = ( colSums[cell.cellIndex] / (colSums[cell.cellIndex] + referenceValue) * 100).toFixed(2)
 

From 6659aaa60dc1ad5c78fee7b0e6aaa7fd2c76bee2 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 7 Sep 2023 18:04:28 +0200
Subject: [PATCH 340/352] Add GH action to deploy to staging

---
 .github/workflows/deploy_staging.yml | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 .github/workflows/deploy_staging.yml

diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
new file mode 100644
index 0000000000..94fb403155
--- /dev/null
+++ b/.github/workflows/deploy_staging.yml
@@ -0,0 +1,42 @@
+name: 'Staging deployment'
+on: [workflow_dispatch]
+jobs:
+  deploy_staging:
+    if: github.ref == 'refs/heads/staging'
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 1
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 2.7.7
+      - uses: actions/setup-node@v2-beta
+        with:
+          node-version: '16'
+      - name: 'Deploy staging'
+        env:
+          name: staging
+          url: 'https://staging.queens-awards-enterprise.service.gov.uk/'
+          CF_ENDPOINT: 'api.london.cloud.service.gov.uk'
+          CF_SPACE: staging
+          CF_APP: qae-staging
+          CF_USER: ${{ secrets.CF_USER }}
+          CF_PASSWORD: ${{ secrets.CF_PASSWORD }}
+          CF_ORG: ${{ secrets.CF_ORG }}
+          SLACK_CHANNEL: ${{ secrets.SLACK_CHANNEL }}
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        run: |
+          curl -v -L -o cf-cli_amd64.deb 'https://cli.run.pivotal.io/stable?release=debian64&source=github'
+          sudo dpkg -i cf-cli_amd64.deb
+          cf -v
+          cf add-plugin-repo CF-Community https://plugins.cloudfoundry.org
+          cf install-plugin blue-green-deploy -r CF-Community -f
+          ./bin/deploy

From be39f8a0178c3dca8aefbbdb94609adbfc851706 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Thu, 7 Sep 2023 18:56:26 +0200
Subject: [PATCH 341/352] Use proportional fix everywhere

---
 app/assets/javascripts/application.js.coffee | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee
index ec4c101cf0..f65a9efb36 100644
--- a/app/assets/javascripts/application.js.coffee
+++ b/app/assets/javascripts/application.js.coffee
@@ -472,11 +472,12 @@ jQuery ->
     referenceValue = parseFloat(referenceCell?.value) or 0
     if type == 'disadvantaged'
       proportionInput?.value = ((referenceValue / colSums[cell.cellIndex]) * 100).toFixed(2)
-      if isNaN(parseFloat(proportionInput?.value))
-        proportionInput?.value = "0"
 
     else if type == 'others'
       proportionInput?.value = ( colSums[cell.cellIndex] / (colSums[cell.cellIndex] + referenceValue) * 100).toFixed(2)
+    
+    if isNaN(parseFloat(proportionInput?.value))
+      proportionInput?.value = "0"
 
   calculateRowsToExcludeFromBottom = (table, className) ->
     rows = table.querySelectorAll('tr');

From 6bcd6f7d3e3411a9f895914f04ec8d880f9f6ade Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Fri, 8 Sep 2023 13:14:24 +0100
Subject: [PATCH 342/352] Setup appsignal releases setup via git sha

---
 bin/deploy | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/deploy b/bin/deploy
index 1a14218749..e876416551 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -13,6 +13,7 @@ $SLACK_WEBHOOK
 export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.3"
 
 cf create-app-manifest "$CF_APP"-worker
+cf set-env "$CF_APP"-worker RELEASE $GITHUB_REF
 cf push -f "$CF_APP"-worker_manifest.yml -b $CF_BUILDPACK -s cflinuxfs4
 
 cf create-app-manifest $CF_APP
@@ -21,6 +22,7 @@ CF_BUILDPACK=$CF_BUILDPACK ruby -ryaml -e 'm = YAML.load(STDIN); m["applications
   < "$CF_APP"_manifest.yml \
   > "$CF_APP"_patched_manifest.yml
 
+cf set-env $CF_APP RELEASE $GITHUB_REF
 cf bgd $CF_APP -f "$CF_APP"_patched_manifest.yml --delete-old-apps
 
 curl -X POST \

From a5cacc1b16fb933f2a27b040f71647191ce4db34 Mon Sep 17 00:00:00 2001
From: Vasili Kachalko <amarant.st@gmail.com>
Date: Fri, 8 Sep 2023 14:48:58 +0200
Subject: [PATCH 343/352] reduce CPU load with date comparissons

---
 app/services/utils/date.rb                    |  3 ++-
 .../v2024/innovation/innovation_step4.rb      | 26 +++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/services/utils/date.rb b/app/services/utils/date.rb
index 1f9ab479cd..7461ce751d 100644
--- a/app/services/utils/date.rb
+++ b/app/services/utils/date.rb
@@ -10,8 +10,9 @@ def self.within_range?(value, range)
         when ::Date, ::DateTime then value.to_date
         when ::String then ::Date.parse(value)
       end
+      min, max = range.minmax
 
-      return date.in?(range)
+      return date >= min && date <= max
     rescue
       false
     end
diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index f639775f9b..69f65358d0 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -62,7 +62,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :yes
         end
 
@@ -115,7 +115,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           conditional :financial_year_date_changed, :true
 
           employees_question
@@ -138,7 +138,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -154,7 +154,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -168,7 +168,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
           turnover :total_turnover
@@ -185,7 +185,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
           context %(
             <p>
               Use a minus symbol to record any losses.
@@ -209,7 +209,7 @@ def innovation_step4
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :started_trading, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
 
           conditional :financial_year_date_changed, :true
         end
@@ -330,7 +330,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales, "Sales of your innovative product/service (if applicable)." do
@@ -345,7 +345,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_exports, "Of which exports (if applicable)." do
@@ -360,7 +360,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         by_years :sales_royalties, "Of which royalties or licences (if applicable)." do
@@ -375,7 +375,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :drops_in_sales, "Explain any drop in sales or the number of units sold (if applicable)." do
@@ -403,7 +403,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :avg_unit_price_desc, "Explain your unit selling prices or contract values, highlighting any changes over the above periods (if applicable)." do
@@ -428,7 +428,7 @@ def innovation_step4
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(2, 3)) }, 2, data: {value: AwardYear.start_trading_between(2, 3, minmax: true, format: true), type: :range, identifier: "2 to 3"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(3, 4)) }, 3, data: {value: AwardYear.start_trading_between(3, 4, minmax: true, format: true), type: :range, identifier: "3 to 4"}
           by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(4, 5)) }, 4, data: {value: AwardYear.start_trading_between(4, 5, minmax: true, format: true), type: :range, identifier: "4 to 5"}
-          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 1000)) }, 5, data: {value: AwardYear.start_trading_between(5, 1000, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
+          by_year_condition :innovation_was_launched_in_the_market, ->(v) { Utils::Date.within_range?(v, AwardYear.start_trading_between(5, 250)) }, 5, data: {value: AwardYear.start_trading_between(5, 250, minmax: true, format: true), type: :range, identifier: "5 plus", default: true}, default: true
         end
 
         textarea :costs_change_desc, "Explain your direct unit or contract costs, highlighting any changes over the above periods (if applicable)." do

From 1fc7437e21fdf596be04b6cc3e0c2b1daf929b64 Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Fri, 8 Sep 2023 17:17:54 +0100
Subject: [PATCH 344/352] Add appsignal to puma

---
 config/puma.rb | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/config/puma.rb b/config/puma.rb
index e29d3459d2..fd524e79ed 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -4,6 +4,7 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
+plugin :appsignal
 
 workers Integer(ENV.fetch("WEB_CONCURRENCY") { 2 })
 threads_count = ENV.fetch("MAX_THREADS") { 5 }
@@ -24,19 +25,3 @@
   # See: https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server#on-worker-boot
   ActiveRecord::Base.establish_connection
 end
-
-# Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
-# the concurrency of the application would be max `threads` * `workers`.
-# Workers do not work on JRuby or Windows (both of which do not support
-# processes).
-#
-# workers ENV.fetch("WEB_CONCURRENCY") { 2 }
-
-# Use the `preload_app!` method when specifying a `workers` number.
-# This directive tells Puma to first boot the application and load code
-# before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory.
-
-# Allow puma to be restarted by `rails restart` command.
-# plugin :tmp_restart

From 899754020f1849eea22eef65d091b0f71a759fb2 Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Fri, 8 Sep 2023 17:31:25 +0100
Subject: [PATCH 345/352] Update the env variable to use short github hash

---
 bin/deploy | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/bin/deploy b/bin/deploy
index e876416551..5f4c51be57 100755
--- a/bin/deploy
+++ b/bin/deploy
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -e
 
+git_hash=$(git rev-parse --short "$GITHUB_SHA")
+
 # Check CF connectivity
 cf login -a $CF_ENDPOINT -u $CF_USER -p "$CF_PASSWORD" -o $CF_ORG -s $CF_SPACE
 cf a
@@ -13,7 +15,7 @@ $SLACK_WEBHOOK
 export CF_BUILDPACK="https://github.com/cloudfoundry/ruby-buildpack.git#v1.10.3"
 
 cf create-app-manifest "$CF_APP"-worker
-cf set-env "$CF_APP"-worker RELEASE $GITHUB_REF
+cf set-env "$CF_APP"-worker RELEASE $git_hash
 cf push -f "$CF_APP"-worker_manifest.yml -b $CF_BUILDPACK -s cflinuxfs4
 
 cf create-app-manifest $CF_APP
@@ -22,7 +24,7 @@ CF_BUILDPACK=$CF_BUILDPACK ruby -ryaml -e 'm = YAML.load(STDIN); m["applications
   < "$CF_APP"_manifest.yml \
   > "$CF_APP"_patched_manifest.yml
 
-cf set-env $CF_APP RELEASE $GITHUB_REF
+cf set-env $CF_APP RELEASE $git_hash
 cf bgd $CF_APP -f "$CF_APP"_patched_manifest.yml --delete-old-apps
 
 curl -X POST \

From cd1022f1b36e59174782a7e293b7dfb3b3cc4129 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 11 Sep 2023 11:26:54 +0100
Subject: [PATCH 346/352] Fix float issue

---
 app/assets/javascripts/frontend/form-validation.js.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index be19d2711a..b21579d239 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -726,7 +726,7 @@ window.FormValidation =
         totalOverseasTradePercentage += parseFloat($(this).val())
       else
         missingOverseasTradeValue = true
-    if totalOverseasTradePercentage != 100
+    if totalOverseasTradePercentage.toFixed(2) != (100).toFixed(2)
       errorMessage = "% of your total overseas trade should add up to 100"
       @logThis(question, "validateGoodsServicesPercentage", errorMessage)
       @appendMessage(question, errorMessage)

From 46df8fd3f6c39ffd6a9962671357d8fdb01bbda9 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 11 Sep 2023 11:47:57 +0100
Subject: [PATCH 347/352] Allow decimals in percentage validation

---
 .../by_trade_goods_and_services_label_question.rb               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
index 3128251a78..ab97504b27 100644
--- a/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
+++ b/forms/qae_form_builder/by_trade_goods_and_services_label_question.rb
@@ -28,7 +28,7 @@ def errors
 
       total = 0
       question.answers["trade_goods_and_services_explanations"]&.each do |product|
-        total += product["total_overseas_trade"].to_i
+        total += product["total_overseas_trade"].to_f.round(2)
       end
       if total != 100
         result[question.key] ||= {}

From 3ca8698806bf5d5fea81455fed3a2b52d3078ad9 Mon Sep 17 00:00:00 2001
From: Matthew Ford <matt@bitzesty.com>
Date: Mon, 11 Sep 2023 13:11:13 +0100
Subject: [PATCH 348/352] Ensure that we clean up tmp files for pdf generation

---
 .../hard_copy_generators/base.rb              | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/app/pdf_generators/hard_copy_generators/base.rb b/app/pdf_generators/hard_copy_generators/base.rb
index 2081bd33c3..af700a72a8 100644
--- a/app/pdf_generators/hard_copy_generators/base.rb
+++ b/app/pdf_generators/hard_copy_generators/base.rb
@@ -18,19 +18,21 @@ def initialize(form_answer, use_latest_version=false)
   def run
     # Create a tempfile
     @tmpfile = Tempfile.new([tempfile_name, '.pdf'])
-
-    # set to binary mode to avoid UTF-8 conversion errors
-    tmpfile.binmode
-
-    # Use render to write the file contents
-    tmpfile.write pdf.render
-
-    # Upload the tempfile with your Carrierwave uploader
-    attach_generated_file!
-
-    # Close the tempfile and delete it
-    tmpfile.close
-    tmpfile.unlink
+  
+    begin
+      # set to binary mode to avoid UTF-8 conversion errors
+      tmpfile.binmode
+  
+      # Use render to write the file contents
+      tmpfile.write pdf.render
+  
+      # Upload the tempfile with your Carrierwave uploader
+      attach_generated_file!
+    ensure
+      # Close the tempfile and delete it
+      tmpfile.close
+      tmpfile.unlink if tmpfile
+    end
   end
 
   private

From d9261e330979707778a6114e8387e26861fafa3c Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Mon, 11 Sep 2023 15:31:24 +0100
Subject: [PATCH 349/352] Use dynamic submission date in deadline

---
 app/views/qae_form/confirm.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/qae_form/confirm.html.slim b/app/views/qae_form/confirm.html.slim
index a482525a41..25f171476e 100644
--- a/app/views/qae_form/confirm.html.slim
+++ b/app/views/qae_form/confirm.html.slim
@@ -64,7 +64,7 @@ h1.govuk-heading-xl Confirmation of submission
         p.govuk-body All winning individuals and their nominators attend Buckingham Palace reception hosted by His Majesty The King.
 
       - else
-        h3.govuk-heading-m 12 September #{@year - 1}
+        h3.govuk-heading-m #{submission_deadline.trigger_at.strftime("%d %B %Y")}
 
         p.govuk-body Application period closes
 

From 2789c766c3e1a28badf57049231986f75e2ea136 Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Mon, 11 Sep 2023 22:16:17 +0200
Subject: [PATCH 350/352] For Innovation award only validate the 2 most recent
 years

---
 .../frontend/form-validation.js.coffee        |  2 +-
 .../qae_form/_by_years_question.html.slim     |  4 ++++
 .../v2024/innovation/innovation_step4.rb      |  2 ++
 forms/qae_form_builder/by_years_question.rb   | 21 ++++++++++++++++++-
 .../one_option_by_years_question.rb           |  7 ++++++-
 5 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/frontend/form-validation.js.coffee b/app/assets/javascripts/frontend/form-validation.js.coffee
index b21579d239..0ef3b4aa2c 100644
--- a/app/assets/javascripts/frontend/form-validation.js.coffee
+++ b/app/assets/javascripts/frontend/form-validation.js.coffee
@@ -398,7 +398,7 @@ window.FormValidation =
         else
           subqList = subq.closest(".row").find(".span-financial")
           subqIndex = subqList.index(subq.closest(".span-financial"))
-          employeeLimit = 2
+          employeeLimit = parseInt(subq.attr('min') || 2)
 
           if parseInt(subq.val()) < employeeLimit
             @logThis(question, "validateEmployeeMin", "Minimum of #{employeeLimit} employees")
diff --git a/app/views/qae_form/_by_years_question.html.slim b/app/views/qae_form/_by_years_question.html.slim
index a558438df6..6c037a462d 100644
--- a/app/views/qae_form/_by_years_question.html.slim
+++ b/app/views/qae_form/_by_years_question.html.slim
@@ -8,8 +8,10 @@
           strong
             = "If you had growth in the last #{c.years} years"
       .govuk-grid-row
+        - validatable_years = question.validatable_years_position.present? && (1..c.years).to_a[*question.validatable_years_position]
         - (1..c.years).each do |y|
           - suffix = "#{y}of#{c.years}"
+          - minmax_ops = validatable_years ? { min: (y.in?(validatable_years) ? 2 : 0) } : {}
           .span-financial.govuk-grid-column-one-third
             label.govuk-label class="govuk-!-margin-bottom-0 govuk-!-margin-top-5" for=question.input_name(suffix: "#{y}of#{c.years}")
               span.js-year-end.show-default data-year="#{suffix}" data-year-diff="#{::Utils::Diff.calc(c.years, y)}"
@@ -35,6 +37,7 @@
                   id=question.input_name(suffix: suffix)
                   autocomplete="off"
                   *possible_read_only_ops
+                  *minmax_ops
                   aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{suffix}" : nil )
                 ]
               - else
@@ -47,6 +50,7 @@
                   id=question.input_name(suffix: suffix) 
                   autocomplete="off" 
                   *possible_read_only_ops
+                  *minmax_ops
                   aria-describedby=(@form_answer.validator_errors && @form_answer.validator_errors[question.hash_key] ? "error_for_#{suffix}" : nil )
                 ]
       .clear
diff --git a/forms/award_years/v2024/innovation/innovation_step4.rb b/forms/award_years/v2024/innovation/innovation_step4.rb
index 69f65358d0..9f90369870 100644
--- a/forms/award_years/v2024/innovation/innovation_step4.rb
+++ b/forms/award_years/v2024/innovation/innovation_step4.rb
@@ -119,6 +119,8 @@ def innovation_step4
           conditional :financial_year_date_changed, :true
 
           employees_question
+
+          validatable_years_position [-2..-1] # validate only last 2 years for employee min. threshold
         end
 
         about_section :company_financials, "Company Financials" do
diff --git a/forms/qae_form_builder/by_years_question.rb b/forms/qae_form_builder/by_years_question.rb
index 865e3c1c50..b9b13d2a54 100644
--- a/forms/qae_form_builder/by_years_question.rb
+++ b/forms/qae_form_builder/by_years_question.rb
@@ -14,6 +14,20 @@ def errors
         end
       end
 
+      if question.fields_count && question.validatable_years_position.present?
+        validatable_years = (1..question.fields_count).to_a[*question.validatable_years_position]
+
+        question.active_fields.each.with_index(1) do |suffix, idx|
+          value = question.input_value(suffix: suffix)
+          threshold = idx.in?(validatable_years) ? 2 : 0
+
+          if value.present? && value.to_i < threshold
+            result[question.hash_key(suffix: suffix)] ||= ""
+            result[question.hash_key(suffix: suffix)] << result[question.hash_key(suffix: suffix)] << "Question #{question.ref || question.sub_ref} is invalid. Required minimum is #{threshold} employees."
+          end
+        end
+      end
+
       result
     end
   end
@@ -107,6 +121,10 @@ def first_year_min_value(min_value, validation_message)
       @q.first_year_min_value = min_value
       @q.first_year_validation_message = validation_message
     end
+
+    def validatable_years_position(values)
+      @q.validatable_years_position = values
+    end
   end
 
   class ByYearsCondition
@@ -125,7 +143,8 @@ class ByYearsQuestion < Question
                   :label,
                   :employees_question,
                   :first_year_min_value,
-                  :first_year_validation_message
+                  :first_year_validation_message,
+                  :validatable_years_position
 
     def after_create
       @by_year_conditions = []
diff --git a/forms/qae_form_builder/one_option_by_years_question.rb b/forms/qae_form_builder/one_option_by_years_question.rb
index 0a7787034b..7ff8c7bef0 100644
--- a/forms/qae_form_builder/one_option_by_years_question.rb
+++ b/forms/qae_form_builder/one_option_by_years_question.rb
@@ -59,6 +59,10 @@ def first_year_min_value(min_value, validation_message)
       @q.first_year_min_value = min_value
       @q.first_year_validation_message = validation_message
     end
+
+    def validatable_years_position(values)
+      @q.validatable_years_position = values
+    end
   end
 
   class OneOptionByYearsCondition
@@ -76,7 +80,8 @@ class OneOptionByYearsQuestion < Question
                   :label,
                   :employees_question,
                   :first_year_min_value,
-                  :first_year_validation_message
+                  :first_year_validation_message,
+                  :validatable_years_position
 
   end
 end

From 768f014b13d631d4a2e2ab1861be457f0afd6a51 Mon Sep 17 00:00:00 2001
From: Louis Kirkham <louis.kirkham@bitzesty.com>
Date: Thu, 14 Sep 2023 16:14:45 +0100
Subject: [PATCH 351/352] adds aria label to email notifications

---
 app/views/admin/settings/_email_notification.html.slim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/settings/_email_notification.html.slim b/app/views/admin/settings/_email_notification.html.slim
index 4fac1ba1b7..3f74339f08 100644
--- a/app/views/admin/settings/_email_notification.html.slim
+++ b/app/views/admin/settings/_email_notification.html.slim
@@ -7,7 +7,7 @@
 
     span.email-notification-help
       - if (help_message = t("email_notification_help_messages.#{kind}", default: "")).present?
-        span.glyphicon-info-sign.help-message
+        span.glyphicon-info-sign.help-message role="tooltip" aria-label=help_message
           span.help-message-text
             = help_message
 

From 91240be582860f8da0458cd3f5b9126007b348ca Mon Sep 17 00:00:00 2001
From: Lubos Hricak <Lubosky@users.noreply.github.com>
Date: Fri, 15 Sep 2023 14:03:04 +0200
Subject: [PATCH 352/352] Bump Ruby version to `3.2.2` when deploying to
 staging

---
 .github/workflows/deploy_staging.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
index 94fb403155..e9eb9b1eda 100644
--- a/.github/workflows/deploy_staging.yml
+++ b/.github/workflows/deploy_staging.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7.7
+          ruby-version: 3.2.2
       - uses: actions/setup-node@v2-beta
         with:
           node-version: '16'