diff --git a/.env.example b/.env.example
index 5796d781c..9eab453cf 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/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eea4c6fee..8db9f826c 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'
@@ -54,14 +54,13 @@ 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.19
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
gem install bundler
gem update --system && gem update bundler
- bundle config path vendor/bundle
yarn install
bundle install --jobs 4 --retry 3
RAILS_ENV=test bundle exec rake db:create db:migrate
@@ -83,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'
@@ -124,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 08eef44d0..74bd31db8 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 6b52c737e..044f20bf3 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/.github/workflows/deploy_staging.yml b/.github/workflows/deploy_staging.yml
index 94fb40315..e9eb9b1ed 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'
diff --git a/.ruby-version b/.ruby-version
index 1f7da99d4..be94e6f53 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.7.7
+3.2.2
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 000000000..29d3872ec
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+ruby 3.2.2
+nodejs 18.17.1
diff --git a/Dockerfile.local b/Dockerfile.local
index 7578b7fc8..c26f559c9 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,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.19 && bundle install --jobs 4 --retry 3
COPY . /app
RUN yarn install
diff --git a/Gemfile b/Gemfile
index 61fe26583..1b99ba0a8 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.1'
gem 'websocket-extensions', '~> 0.1.5'
# SSL redirect
@@ -14,12 +14,13 @@ 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
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'
@@ -29,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'
@@ -37,7 +38,6 @@ gem 'rails_autolink'
# Decorators & Exposing named methods
gem 'draper', '~> 4.0'
gem 'decent_exposure'
-gem 'decent_decoration'
gem 'hashie', '~> 3.5'
@@ -48,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'
@@ -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'
@@ -126,7 +125,7 @@ gem 'nilify_blanks'
gem 'curb', '0.9.10'
# Web server
-gem 'puma', '~> 4.3.12'
+gem 'puma', '~> 6.3.1'
# Performance & Error reporting
gem 'appsignal'
@@ -144,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'
@@ -179,7 +180,7 @@ end
group :test do
gem 'factory_bot_rails'
- gem 'capybara', '3.33'
+ gem 'capybara', '~> 3.39.0'
gem 'poltergeist'
gem 'database_cleaner-active_record'
gem 'launchy'
@@ -189,6 +190,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 1c637713a..1191e9fde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -10,81 +10,83 @@ GEM
remote: https://rubygems.org/
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.1)
+ actionpack (= 7.0.5.1)
+ activesupport (= 7.0.5.1)
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.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)
- 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.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 (6.1.7.3)
- actionview (= 6.1.7.3)
- activesupport (= 6.1.7.3)
- rack (~> 2.0, >= 2.0.9)
+ 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 (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.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 (6.1.7.3)
- activesupport (= 6.1.7.3)
+ 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 (6.1.7.3)
- activesupport (= 6.1.7.3)
+ activejob (7.0.5.1)
+ activesupport (= 7.0.5.1)
globalid (>= 0.3.6)
- activemodel (6.1.7.3)
- activesupport (= 6.1.7.3)
+ 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 (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.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 (6.1.7.3)
+ activesupport (7.0.5.1)
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)
- aliyun-sdk (0.8.0)
- nokogiri (~> 1.6)
- rest-client (~> 2.0)
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)
@@ -95,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)
@@ -105,13 +107,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)
@@ -136,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)
@@ -161,8 +164,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)
@@ -194,15 +195,14 @@ 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)
+ 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,165 +237,22 @@ 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-aws (3.19.0)
+ fog-core (~> 2.1)
+ fog-json (~> 1.1)
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)
+ fog-core (2.3.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)
+ excon (~> 0.71)
+ formatador (>= 0.2, < 2.0)
+ mime-types
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)
- formatador (0.3.0)
+ formatador (1.1.0)
fugit (1.8.1)
et-orbi (~> 1, >= 1.2.7)
raabro (~> 1.4)
@@ -406,24 +263,23 @@ 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)
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)
- ipaddress (0.8.3)
jbuilder (2.10.2)
activesupport (>= 5.0.0)
jquery-rails (4.4.0)
@@ -434,8 +290,8 @@ GEM
railties (>= 3.2.16)
js_cookie_rails (2.1.4)
railties (>= 3.1)
- json (2.3.0)
- jwt (2.7.0)
+ json (2.6.3)
+ jwt (2.7.1)
kaminari (1.2.2)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.2.2)
@@ -460,9 +316,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
@@ -476,21 +332,22 @@ 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)
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)
+ mini_portile2 (2.8.4)
+ minitest (5.18.1)
money (6.16.0)
i18n (>= 0.6.4, <= 2)
multi_json (1.15.0)
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)
@@ -504,26 +361,28 @@ GEM
activerecord (>= 4.0.0)
activesupport (>= 4.0.0)
nio4r (2.5.9)
- nokogiri (1.14.3)
- mini_portile2 (~> 2.8.0)
+ nokogiri (1.15.3)
+ mini_portile2 (~> 2.8.2)
racc (~> 1.4)
- nokogiri (1.14.3-x86_64-darwin)
+ nokogiri (1.15.3-arm64-darwin)
racc (~> 1.4)
- nokogiri (1.14.3-x86_64-linux)
+ nokogiri (1.15.3-x86_64-darwin)
+ racc (~> 1.4)
+ nokogiri (1.15.3-x86_64-linux)
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 (10.3.1)
- activerecord (>= 4.2)
+ paper_trail (12.2.0)
+ activerecord (>= 5.2)
request_store (~> 1.1)
+ 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)
@@ -557,8 +416,8 @@ GEM
pry-byebug (3.10.1)
byebug (~> 11.0)
pry (>= 0.13, < 0.15)
- public_suffix (5.0.1)
- puma (4.3.12)
+ public_suffix (5.0.3)
+ puma (6.3.1)
nio4r (~> 2.0)
pundit (0.3.0)
activesupport (>= 3.0.0)
@@ -568,7 +427,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)
@@ -581,27 +440,27 @@ 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.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 (= 6.1.7.3)
- sprockets-rails (>= 2.0.0)
+ 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
@@ -617,23 +476,19 @@ 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.1)
+ actionpack (= 7.0.5.1)
+ activesupport (= 7.0.5.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
+ zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rb-fsevent (0.11.2)
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)
@@ -654,7 +509,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)
@@ -665,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)
@@ -677,10 +532,10 @@ 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.2)
+ rspec-rails (6.0.3)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
@@ -691,7 +546,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)
@@ -704,7 +559,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)
@@ -713,18 +568,18 @@ 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)
ffi (~> 1.9)
- sassc-rails (2.0.0)
+ sassc-rails (2.1.2)
railties (>= 4.0.0)
sassc (>= 2.0)
sprockets (> 3.0)
sprockets-rails
tilt
- selenium-webdriver (4.9.0)
+ selenium-webdriver (4.11.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
@@ -738,7 +593,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)
@@ -756,7 +611,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)
@@ -776,11 +631,11 @@ 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)
- timeout (0.3.2)
+ timeout (0.4.0)
ttfunk (1.7.0)
turnip (4.2.0)
cucumber-gherkin (~> 14.0)
@@ -794,7 +649,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)
@@ -812,34 +667,32 @@ 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
- webpacker (6.0.0.beta.7)
+ hashdiff (>= 0.4.0, < 2.0.0)
+ webpacker (6.0.0.rc.6)
activesupport (>= 5.2)
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)
zxcvbn (0.1.9)
PLATFORMS
+ arm64-darwin-21
+ arm64-darwin-22
ruby
x86_64-darwin-21
+ x86_64-darwin-22
x86_64-linux
DEPENDENCIES
@@ -850,7 +703,7 @@ DEPENDENCIES
bootscale
bootstrap-sass (~> 3.4)
browser (= 2.4.0)
- capybara (= 3.33)
+ capybara (~> 3.39.0)
carrierwave (~> 1.3)
ckeditor
codeclimate_circle_ci_coverage
@@ -858,7 +711,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)
@@ -869,7 +721,6 @@ DEPENDENCIES
email_validator
enumerize
factory_bot_rails
- fog (= 1.42.1)
fog-aws
gon (>= 6.4.0)
govuk-components
@@ -878,16 +729,18 @@ 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
listen
lograge
mail-notify (~> 1.0)
+ matrix
nilify_blanks
nokogiri
- paper_trail (~> 10.3)
+ paper_trail (~> 12.2.0)
+ paper_trail-association_tracking
pdf-inspector
pg
pg_search (~> 2.3.3)
@@ -895,14 +748,14 @@ DEPENDENCIES
prawn
prawn-table
pry-byebug
- puma (~> 4.3.12)
+ puma (~> 6.3.1)
pundit (~> 0.3)
pusher (= 0.15.2)
rack-cors (~> 1.0)
rack-mini-profiler (>= 0.10.1)
rack-protection (= 3.0.5)
rack-ssl-enforcer
- rails (= 6.1.7.3)
+ rails (= 7.0.5.1)
rails-controller-testing
rails-healthcheck
rails-html-sanitizer (~> 1.4.4)
@@ -920,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
@@ -938,13 +791,13 @@ DEPENDENCIES
vigilion (~> 1.0.4)
vigilion-rails (~> 2.2.0)
virtus
- webmock (= 3.5.0)
- webpacker (= 6.0.0.beta.7)
+ webmock (= 3.18.1)
+ 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.8
+ 2.4.13
diff --git a/README.md b/README.md
index 097ee3c9a..79578d481 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
diff --git a/app/assets/images/favicon.ico b/app/assets/images/favicon.ico
new file mode 100644
index 000000000..31485ebf0
Binary files /dev/null and b/app/assets/images/favicon.ico differ
diff --git a/app/assets/images/icon_load_black.svg b/app/assets/images/icon_load_black.svg
new file mode 100644
index 000000000..b8d1ed74b
--- /dev/null
+++ b/app/assets/images/icon_load_black.svg
@@ -0,0 +1,24 @@
+
+
diff --git a/app/assets/images/icon_loading_black.svg b/app/assets/images/icon_loading_black.svg
new file mode 100644
index 000000000..aa07c1174
--- /dev/null
+++ b/app/assets/images/icon_loading_black.svg
@@ -0,0 +1 @@
+
diff --git a/app/assets/images/icon_update_black.svg b/app/assets/images/icon_update_black.svg
new file mode 100644
index 000000000..73824e58c
--- /dev/null
+++ b/app/assets/images/icon_update_black.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/app/assets/javascripts/admin/applications-filter.js.coffee b/app/assets/javascripts/admin/applications-filter.js.coffee
index df455e626..5547609c7 100644
--- a/app/assets/javascripts/admin/applications-filter.js.coffee
+++ b/app/assets/javascripts/admin/applications-filter.js.coffee
@@ -1,6 +1,49 @@
ready = ->
filterApplicationsDropdowns()
+ # processing arrow keys in admin dropdowns
+ $(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
+ 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()
+
+ if next_element.hasClass("divider")
+ next_element = next_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()
+
+ if prev_element.hasClass("divider")
+ prev_element = prev_element.prev()
+
+ $("input", prev_element).focus()
+
filterApplicationsDropdowns = () ->
# Change the checked value on dropbox and the filtered text
$(".applications-filter .dropdown-menu").each () ->
@@ -29,6 +72,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()
diff --git a/app/assets/javascripts/admin/comments.js.coffee b/app/assets/javascripts/admin/comments.js.coffee
index cab48ec08..1bdc9a03b 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/assets/javascripts/admin/dashboard.js.coffee b/app/assets/javascripts/admin/dashboard.js.coffee
index c2873378c..c23bcd031 100644
--- a/app/assets/javascripts/admin/dashboard.js.coffee
+++ b/app/assets/javascripts/admin/dashboard.js.coffee
@@ -18,3 +18,8 @@ jQuery ->
$("tbody", wrapper).load href, ->
link.removeClass("hidden")
$(".updating-data", wrapper).addClass("hidden")
+ 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/assets/javascripts/admin/financial_data.js.coffee b/app/assets/javascripts/admin/financial_data.js.coffee
index 96df61541..ee147ef99 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) ->
diff --git a/app/assets/javascripts/admin/form_answers.js.coffee b/app/assets/javascripts/admin/form_answers.js.coffee
index d36bc6d88..3dcd60f04 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($("No change necessary
"))
- else
- div = "#{area.val()}
'))
- if area.last().val().length
- formGroup.find(".form-value p:last").html(area.last().val().replace(/\n/g, '
'))
- form.submit()
+ if area.first().val().length
+ formGroup.find(".form-value p:first").html(area.first().val().replace(/\n/g, '
'))
+ if area.last().val().length
+ formGroup.find(".form-value p:last").html(area.last().val().replace(/\n/g, '
'))
+ form.submit()
$("#new_review_audit_certificate input[type='radio']").on "change", ->
area = $(".audit-cert-description")
@@ -461,7 +443,7 @@ buildBannerHtml = (message, type, identifier = null) ->
"
#{message}
-
"
@@ -544,6 +526,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 +539,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)
@@ -636,6 +629,8 @@ handleReviewAuditCertificate = ->
else
div = "#{area.val()}
"))
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.uniq.join("
"))
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.uniq.join("
"))
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 f41faa68b..7408e8cb0 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.uniq.join("
"))
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.uniq.join("
"))
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.uniq.join("
"))
respond_with :admin, @resource, location: admin_assessors_path
end
diff --git a/app/controllers/admin/base_controller.rb b/app/controllers/admin/base_controller.rb
index 8ea7ef5bc..43d10a6c4 100644
--- a/app/controllers/admin/base_controller.rb
+++ b/app/controllers/admin/base_controller.rb
@@ -22,7 +22,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/admin/custom_emails_controller.rb b/app/controllers/admin/custom_emails_controller.rb
index 438461a96..49e1be858 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!
render_flash_message_for(@form)
redirect_to admin_custom_email_path, notice: "Email was successfully scheduled"
else
diff --git a/app/controllers/admin/dashboard_reports_controller.rb b/app/controllers/admin/dashboard_reports_controller.rb
index 432a3fcf0..8e0133b1d 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/controllers/admin/judges_controller.rb b/app/controllers/admin/judges_controller.rb
index 5ee3060f8..3f174d28f 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.uniq.join("
"))
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.uniq.join("
"))
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.uniq.join("
"))
respond_with :admin, @resource, location: admin_judges_path
end
diff --git a/app/controllers/admin/reports_controller.rb b/app/controllers/admin/reports_controller.rb
index 3c32cae33..ac21e9a4a 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/admin/session_checks_controller.rb b/app/controllers/admin/session_checks_controller.rb
index 0a0510a67..5ba9cc867 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/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index b42612ab4..da90ff36a 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.uniq.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, 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.uniq.join("
"))
respond_with :admin, @resource, location: admin_users_path
end
diff --git a/app/controllers/assessor/base_controller.rb b/app/controllers/assessor/base_controller.rb
index c1bfb1560..1fd0b17de 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/assessor/reports_controller.rb b/app/controllers/assessor/reports_controller.rb
index d5cd7fa90..3b68cae27 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/assessor/session_checks_controller.rb b/app/controllers/assessor/session_checks_controller.rb
index fe2f0f382..9f56f9fc4 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/admin_shortlisted_docs_submission_context.rb b/app/controllers/concerns/admin_shortlisted_docs_submission_context.rb
index e3ddf4706..bd0bc7d84 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
diff --git a/app/controllers/concerns/assessment_submission_mixin.rb b/app/controllers/concerns/assessment_submission_mixin.rb
index 86b97f58e..3f4bf3380 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
@@ -36,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("
")
end
def json_response
diff --git a/app/controllers/concerns/audit_certificate_context.rb b/app/controllers/concerns/audit_certificate_context.rb
index ab858e206..0166b5071 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/concerns/palace_attendees_mixin.rb b/app/controllers/concerns/palace_attendees_mixin.rb
index 3d2ffafdd..7ed8d9fe4 100644
--- a/app/controllers/concerns/palace_attendees_mixin.rb
+++ b/app/controllers/concerns/palace_attendees_mixin.rb
@@ -3,13 +3,15 @@ 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?
+ form_answer
+
+ 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 +23,9 @@ def create
end
def update
- authorize form_answer, :update?
+ form_answer
+
+ authorize palace_invite, :update?
palace_attendee = palace_invite.palace_attendees.find(params[:id])
log_event if palace_attendee.update(create_params)
@@ -29,7 +33,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 acd1d614f..e46264924 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/controllers/concerns/session_status_check_mixin.rb b/app/controllers/concerns/session_status_check_mixin.rb
index 88ed65014..b0c63e07c 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/case_summaries_controller.rb b/app/controllers/judge/case_summaries_controller.rb
index 336b40158..c8debdf5d 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
diff --git a/app/controllers/judge/session_checks_controller.rb b/app/controllers/judge/session_checks_controller.rb
index 946c19527..ad9a5b962 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/controllers/users/form_answers_controller.rb b/app/controllers/users/form_answers_controller.rb
index 1a704f9d9..8825a9b41 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,
diff --git a/app/helpers/form_answer_helper.rb b/app/helpers/form_answer_helper.rb
index c5195cccf..7bbfe8b12 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
diff --git a/app/helpers/winners_awards_helper.rb b/app/helpers/winners_awards_helper.rb
index 4c1bd031e..1baad0e05 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
diff --git a/app/javascript/controllers/appraisal_form_controller.js b/app/javascript/controllers/appraisal_form_controller.js
new file mode 100644
index 000000000..82082b63a
--- /dev/null
+++ b/app/javascript/controllers/appraisal_form_controller.js
@@ -0,0 +1,211 @@
+import { scrollToElement } from '../helpers';
+
+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');
+ 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)) {
+ 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');
+ }
+ }
+ });
+
+ 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) => {
+ 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, '
');
+ 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, '
');
+ 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, '
');
+ 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('[aria-invalid]').forEach((el) => el.removeAttribute('aria-invalid'));
+ 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);
+ field.setAttribute('aria-invalid', true);
+ return container.insertAdjacentHTML('afterbegin', alert);
+ });
+ }
+ }
+
+ createAlert = (type, message) => {
+ const id = 'alert__' + String(Math.random()).slice(2, -1);
+ const element = `
+
+ ${message}
+
+
+ `;
+
+ return [element, id];
+ };
+
+ visible(field) {
+ return (
+ !field.hidden && (!field.type || field.type != 'hidden') && (field.offsetWidth > 0 || field.offsetHeight > 0)
+ );
+ }
+}
diff --git a/app/javascript/controllers/element_scroll_controller.js b/app/javascript/controllers/element_scroll_controller.js
index d905ccc57..d79c3ef83 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);
diff --git a/app/javascript/controllers/inline_flash_controller.js b/app/javascript/controllers/inline_flash_controller.js
index 481c3316e..127dd8f40 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) => {
@@ -47,7 +47,7 @@ export default class extends ApplicationController {
const element = `
${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);
diff --git a/app/models/account.rb b/app/models/account.rb
index 8e3efbc74..f97d35e10 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 f8495bf82..6cb3e49c9 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 5952da3a9..185c384ca 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
@@ -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/models/audit_log.rb b/app/models/audit_log.rb
index 8d4da014a..5874ff467 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/award_year.rb b/app/models/award_year.rb
index 98c1a974b..2fbc868ef 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/models/case_summary_hard_copy_pdf.rb b/app/models/case_summary_hard_copy_pdf.rb
index 9bdaae6aa..9f9e3c03c 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 641f20a33..74bfbb6b4 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 641fe786e..255f3f0b4 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 2f444bc7f..0e4c81aeb 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 337294792..8b69b02e2 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 e5c8f8eef..c26e7c59d 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 260443cfb..01594bb6d 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 a353f8cae..85962561e 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 962ae406c..75088f18c 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 bed274f16..1b518f5f3 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 6c5e55e2c..f3db0d1b7 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 61359773a..51d63765b 100644
--- a/app/models/form_answer.rb
+++ b/app/models/form_answer.rb
@@ -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
diff --git a/app/models/form_answer_attachment.rb b/app/models/form_answer_attachment.rb
index fd4c4eb3c..6fdc27ef2 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 7d2d0b592..0327009eb 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 c62212972..f08891410 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 d30a36d0c..9f2f170b3 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 ed426eb90..5304ef1aa 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 1a7ddbd21..896d127b6 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/dashboard/applications_report.rb b/app/models/reports/dashboard/applications_report.rb
index cf125bfc1..da9419fac 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)
[" ".html_safe, " ".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 == " " ? 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 ff116776e..a732a26db 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)
" ".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 == " " ? nil : c)}
+ csv << content
+ end
+ end
+ end
+
+ def csv_filename
+ "account_registrations_#{kind}.csv"
+ end
end
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 3686ec361..0fe35c319 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
diff --git a/app/models/settings.rb b/app/models/settings.rb
index e5d6d8ae0..fa0a5c8a8 100644
--- a/app/models/settings.rb
+++ b/app/models/settings.rb
@@ -6,7 +6,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 dfa451c06..89cee9aee 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 8c7e2bc24..b0d78d59e 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 c3640ba45..81c6f2eb1 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 c8984b14a..068289c0e 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 ef27ff22a..b117a164e 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
@@ -161,7 +161,7 @@ def new_member?
end
def timeout_in
- 24.hours
+ ENV.fetch("SESSION_TIMEOUT", 24).to_i.hours
end
def check_email_on_bounces!
diff --git a/app/models/vat_returns_file.rb b/app/models/vat_returns_file.rb
index 27f81a131..dc7570503 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/base.rb b/app/pdf_generators/case_summary_pdfs/base.rb
index 290ee8b01..ca160e1bc 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)
diff --git a/app/pdf_generators/hard_copy_generators/base.rb b/app/pdf_generators/hard_copy_generators/base.rb
index 2081bd33c..af700a72a 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
diff --git a/app/policies/palace_invite_policy.rb b/app/policies/palace_invite_policy.rb
new file mode 100644
index 000000000..5846e93ff
--- /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
diff --git a/app/services/assessment_submission_service.rb b/app/services/assessment_submission_service.rb
index 76b3f61f7..c2dd1b691 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)
}
diff --git a/app/validators/advanced_email_validator.rb b/app/validators/advanced_email_validator.rb
index fef46dec3..eda403dc9 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
diff --git a/app/validators/company_registration_number_validator.rb b/app/validators/company_registration_number_validator.rb
index 21c582083..1f155421e 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/app/validators/file_size_validator.rb b/app/validators/file_size_validator.rb
index a2f729339..fad3ec6d3 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/app/views/admin/admins/_form.html.slim b/app/views/admin/admins/_form.html.slim
index 15ec8cd34..d714f5004 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"
@@ -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.hide
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.hide
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 2a1b556d3..4af2e46ce 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"
@@ -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.hide
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.hide
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/audit_certificate/_form.html.slim b/app/views/admin/audit_certificate/_form.html.slim
index 943f44582..dbb14c45c 100644
--- a/app/views/admin/audit_certificate/_form.html.slim
+++ b/app/views/admin/audit_certificate/_form.html.slim
@@ -3,15 +3,15 @@
/ 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
- 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"]
span[aria-hidden="true"] ×
.attachment-link.if-js-hide
diff --git a/app/views/admin/comments/_form.html.slim b/app/views/admin/comments/_form.html.slim
index a2c28adab..8019516df 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"
diff --git a/app/views/admin/dashboard/_applications_report.html.slim b/app/views/admin/dashboard/_applications_report.html.slim
index 44f48f55a..9b2592d2e 100644
--- a/app/views/admin/dashboard/_applications_report.html.slim
+++ b/app/views/admin/dashboard/_applications_report.html.slim
@@ -1,9 +1,12 @@
.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
+ span.sr-only role="status" aria-live="polite" aria-relevant="all"
+
table.dashboard-table.dashboard-table--small width="1000"
caption
= title
diff --git a/app/views/admin/dashboard/totals_by_day.html.slim b/app/views/admin/dashboard/totals_by_day.html.slim
index ece3fcb8f..0fabfcde6 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 3040fc893..b69b2e951 100644
--- a/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
+++ b/app/views/admin/dashboard/totals_by_day/_registrations.html.slim
@@ -1,9 +1,13 @@
.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
+ span.sr-only role="status" aria-live="polite" aria-relevant="all"
+
table.dashboard-table.dashboard-table--small width="1000"
caption
| New account registrations
diff --git a/app/views/admin/dashboard/totals_by_month.html.slim b/app/views/admin/dashboard/totals_by_month.html.slim
index f2d2e509a..5d7ac67ef 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 ed6d8d4da..8aec25538 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 565b8ba4d..e8cbdc598 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 cbb416c7a..985c7edae 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
diff --git a/app/views/admin/email_notifications/destroy.js.erb b/app/views/admin/email_notifications/destroy.js.erb
index b1cf4effd..bef895013 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()
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 016c534b5..ac1058961 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/_file.html.slim b/app/views/admin/figures_and_vat_returns/_file.html.slim
index 573d9f6d8..ddf1b1a8f 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'
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 7b2be8c2f..8a5f591c9 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"] ×
.attachment-link.if-js-hide
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 8d9aeb453..9d2e27bc5 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 14127c8da..04b8c1908 100644
--- a/app/views/admin/form_answer_attachments/_form.html.slim
+++ b/app/views/admin/form_answer_attachments/_form.html.slim
@@ -3,14 +3,18 @@
/ 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"]
+ span[aria-hidden="true"] ×
.attachment-link.if-js-hide
+ = form.label :file, "Attach document", class: "visuallyhidden"
= form.file_field :file
.form-group
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 7a2d2bfe2..99356008b 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/_comment.html.slim b/app/views/admin/form_answers/_comment.html.slim
index d5ab863bb..1549cab69 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", 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"
'
@@ -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", 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"
@@ -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 •
diff --git a/app/views/admin/form_answers/_financials_review.html.slim b/app/views/admin/form_answers/_financials_review.html.slim
index 082ed2b1a..af85daba9 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
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 997af30f8..172ab2fc2 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
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 4e34590b7..00d8ad505 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,18 +1,18 @@
-.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
= 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 12430e2f2..b6708f1dc 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,17 +1,17 @@
-.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
= 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 27e6acd61..c76ed0d29 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,17 +1,17 @@
-.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
= 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 7bc5b8538..0077f5aaf 100644
--- a/app/views/admin/form_answers/_section_case_summary.html.slim
+++ b/app/views/admin/form_answers/_section_case_summary.html.slim
@@ -1,29 +1,20 @@
- 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[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
- 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/_section_company_details.html.slim b/app/views/admin/form_answers/_section_company_details.html.slim
index fc8ce6b9b..ba8074c09 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/_section_documents.html.slim b/app/views/admin/form_answers/_section_documents.html.slim
index 30017bb46..f25fbebc5 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/_submitted_view.html.slim b/app/views/admin/form_answers/_submitted_view.html.slim
index f2f618d21..56fda0ce7 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/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 1b49d9e47..70ef64e0d 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 377907f0c..4952e8d9b 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,10 +9,21 @@
= submit_tag submit_case_summary_title(assessment), class: "btn btn-primary btn-confirm-submit"
.clear
-- elsif assessment.submitted?
+ 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)
- - if policy(assessment).can_unlock?
+ = 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)
= form_tag unlock_url, method: :patch do
@@ -29,6 +40,5 @@
' Case Summary Submitted
- elsif !assessment.submitted?
-
.feedback-holder.alert.alert-info
' Case Summary is not submitted yet!
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 3a1610933..b41eb85b8 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 6747cf373..0af874821 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 ecf440071..afd2f9ee3 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 c0102babf..4eacdcbd2 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
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 620fce08e..1351b4703 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 9772d1ea0..c8df35163 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 0b08fde0d..8a98a5321 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 a4a84b6bd..2d28b1ac0 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 319abec8a..271dc91dd 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,
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 7699b7983..d7eb6c2b9 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
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 24f07136b..df16ad612 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 d73d9814c..1bbf66cf4 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
diff --git a/app/views/admin/judges/_form.html.slim b/app/views/admin/judges/_form.html.slim
index 63a29d781..e188f7d6b 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"
@@ -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.hide
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.hide
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/settings/_email_notification.html.slim b/app/views/admin/settings/_email_notification.html.slim
index 4fac1ba1b..3f74339f0 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
diff --git a/app/views/admin/settings/_notification.html.slim b/app/views/admin/settings/_notification.html.slim
index b60ca7ba3..60ab8eb71 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,
diff --git a/app/views/admin/users/_fields_password.html.slim b/app/views/admin/users/_fields_password.html.slim
index 02de52d9a..e9ce0f421 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.hide
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.hide
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
diff --git a/app/views/assessor/form_answers/_bulk_assignment.html.slim b/app/views/assessor/form_answers/_bulk_assignment.html.slim
index 78ffd2bee..8c1b852c3 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
diff --git a/app/views/assessor/form_answers/_submitted_view.html.slim b/app/views/assessor/form_answers/_submitted_view.html.slim
index aeab1be95..5558e7229 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
diff --git a/app/views/assessor/form_answers/index.html.slim b/app/views/assessor/form_answers/index.html.slim
index 99b88c377..80ef5bf70 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"
diff --git a/app/views/judge/case_summaries/index.html.slim b/app/views/judge/case_summaries/index.html.slim
index 35553156c..c0247edc8 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|
diff --git a/app/views/layouts/_vertical_admin_award_year.html.slim b/app/views/layouts/_vertical_admin_award_year.html.slim
index 453df072e..c41a679eb 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
diff --git a/app/views/layouts/application-admin.html.slim b/app/views/layouts/application-admin.html.slim
index 25b0cbe50..edcc389b8 100644
--- a/app/views/layouts/application-admin.html.slim
+++ b/app/views/layouts/application-admin.html.slim
@@ -79,8 +79,28 @@ 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.dropdown-toggle
+ summary
+ ' My Account
+ span.caret
+ 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
+ = button_to "Sign out",
+ destroy_admin_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
@@ -99,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 6323148a3..f90988523 100644
--- a/app/views/layouts/application-assessor.html.slim
+++ b/app/views/layouts/application-assessor.html.slim
@@ -60,8 +60,25 @@ 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
+ span.caret
+ 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
@@ -77,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
@@ -88,6 +107,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 a1d45d573..f8c2e45e2 100644
--- a/app/views/layouts/application-judge.html.slim
+++ b/app/views/layouts/application-judge.html.slim
@@ -57,8 +57,25 @@ 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
+ span.caret
+ 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
@@ -74,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
@@ -85,6 +103,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.html.slim b/app/views/layouts/application.html.slim
index fa4520555..0c12654f2 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"
diff --git a/app/views/layouts/govuk_template.html.erb b/app/views/layouts/govuk_template.html.erb
index 903d250f9..2e35de968 100644
--- a/app/views/layouts/govuk_template.html.erb
+++ b/app/views/layouts/govuk_template.html.erb
@@ -20,8 +20,8 @@