diff --git a/app/components/tab_navigation_component.html.erb b/app/components/tab_navigation_component.html.erb
index 874caaf39..871cd4cbf 100644
--- a/app/components/tab_navigation_component.html.erb
+++ b/app/components/tab_navigation_component.html.erb
@@ -3,11 +3,11 @@
<% items.each do |item| %>
<% if item.fetch(:current, false) || current_page?(strip_query(item.fetch(:url))) %>
- <%= govuk_link_to item[:name], item[:url], class: 'app-tab-navigation__link', aria: { current: 'page' } %>
+ <%= govuk_link_to item[:name], item[:url], class: "app-tab-navigation__link", aria: { current: "page" } %>
<% else %>
- <%= govuk_link_to item[:name], item[:url], class: 'app-tab-navigation__link' %>
+ <%= govuk_link_to item[:name], item[:url], class: "app-tab-navigation__link" %>
<% end %>
<% end %>
diff --git a/app/views/case_logs/_log_list.html.erb b/app/views/case_logs/_log_list.html.erb
index cf6b3927e..3cde563c5 100644
--- a/app/views/case_logs/_log_list.html.erb
+++ b/app/views/case_logs/_log_list.html.erb
@@ -28,21 +28,21 @@
<%= govuk_link_to log.id, case_log_path(log) %>
- <%= log.tenant_code? ? log.tenant_code : '–' %>
+ <%= log.tenant_code? ? log.tenant_code : "–" %>
|
- <%= log.propcode? ? log.propcode : '–' %>
+ <%= log.propcode? ? log.propcode : "–" %>
|
- <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : '–' %>
+ <%= log.startdate.present? ? log.startdate.to_formatted_s(:govuk_date) : "–" %>
|
<%= log.created_at.to_formatted_s(:govuk_date) %>
|
<%= govuk_tag(
- colour: log.status == 'completed' ? 'blue' : 'grey',
- text: log.status.humanize
+ colour: log.status == "completed" ? "blue" : "grey",
+ text: log.status.humanize,
) %>
|
<% if current_user.support? %>
diff --git a/app/views/case_logs/edit.html.erb b/app/views/case_logs/edit.html.erb
index 015db4454..26f3509d3 100644
--- a/app/views/case_logs/edit.html.erb
+++ b/app/views/case_logs/edit.html.erb
@@ -1,7 +1,7 @@
<% content_for :title, "Log #{@case_log.id}" %>
<% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
"Logs" => "/logs",
- content_for(:title) => ""
+ content_for(:title) => "",
}) %>
diff --git a/app/views/case_logs/index.html.erb b/app/views/case_logs/index.html.erb
index 0812fefc4..857b1dbd8 100644
--- a/app/views/case_logs/index.html.erb
+++ b/app/views/case_logs/index.html.erb
@@ -13,7 +13,7 @@
<% if @case_logs.present? %>
<%= render partial: "log_list", locals: { case_logs: @case_logs, title: "Logs", pagy: @pagy } %>
- <%== render partial: 'pagy/nav', locals: { pagy: @pagy, item_name: "logs" } %>
+ <%== render partial: "pagy/nav", locals: { pagy: @pagy, item_name: "logs" } %>
<% end %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
index 74e5cc3a9..579eb64c6 100644
--- a/app/views/devise/passwords/edit.html.erb
+++ b/app/views/devise/passwords/edit.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
index 3982b6e61..b677b4c17 100644
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>
diff --git a/app/views/devise/passwords/reset_password.html.erb b/app/views/devise/passwords/reset_password.html.erb
index bd57b7611..04353c7b2 100644
--- a/app/views/devise/passwords/reset_password.html.erb
+++ b/app/views/devise/passwords/reset_password.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>
diff --git a/app/views/devise/two_factor_authentication/resend.html.erb b/app/views/devise/two_factor_authentication/resend.html.erb
index c8bb5eec5..a2cc00198 100644
--- a/app/views/devise/two_factor_authentication/resend.html.erb
+++ b/app/views/devise/two_factor_authentication/resend.html.erb
@@ -2,8 +2,8 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
- href: 'javascript:history.back()',
+ text: "Back",
+ href: "javascript:history.back()",
) %>
<% end %>
diff --git a/app/views/devise/two_factor_authentication/show.html.erb b/app/views/devise/two_factor_authentication/show.html.erb
index 008377b3c..55df4caeb 100644
--- a/app/views/devise/two_factor_authentication/show.html.erb
+++ b/app/views/devise/two_factor_authentication/show.html.erb
@@ -15,7 +15,7 @@
<%= f.govuk_number_field :code,
label: { text: "Security code", size: "m" },
width: 5,
- autocomplete: 'one-time-code',
+ autocomplete: "one-time-code",
autofocus: true %>
<%= f.govuk_submit "Submit" %>
diff --git a/app/views/filters/_checkbox_filter.html.erb b/app/views/filters/_checkbox_filter.html.erb
index aa2fc71a4..cbbf5c39d 100644
--- a/app/views/filters/_checkbox_filter.html.erb
+++ b/app/views/filters/_checkbox_filter.html.erb
@@ -1,6 +1,6 @@
-<%= f.govuk_check_boxes_fieldset category.to_sym, legend: { text: label, size: "s"}, small: true, form_group: { classes: "app-filter__group" } do %>
+<%= f.govuk_check_boxes_fieldset category.to_sym, legend: { text: label, size: "s" }, small: true, form_group: { classes: "app-filter__group" } do %>
<% options.map do |key, option| %>
- <%= f.govuk_check_box category, "#{key}",
+ <%= f.govuk_check_box category, key.to_s,
label: { text: option },
checked: filter_selected?(category, key),
size: "s" %>
diff --git a/app/views/form/_check_answers_table.html.erb b/app/views/form/_check_answers_table.html.erb
index f72381d12..c34c868e0 100644
--- a/app/views/form/_check_answers_table.html.erb
+++ b/app/views/form/_check_answers_table.html.erb
@@ -1,6 +1,6 @@
- <%= question.check_answer_label.to_s.present? ? question.check_answer_label.to_s : question.header.to_s %>
+ <%= question.check_answer_label.to_s.presence || question.header.to_s %>
<%= get_answer_label(question, @case_log) %>
diff --git a/app/views/form/_checkbox_question.html.erb b/app/views/form/_checkbox_question.html.erb
index 941a32a17..99551bac1 100644
--- a/app/views/form/_checkbox_question.html.erb
+++ b/app/views/form/_checkbox_question.html.erb
@@ -12,8 +12,8 @@
<%= f.govuk_check_box_divider %>
<% else %>
<%= f.govuk_check_box question.id, key,
- label: { text: options['value'] },
- hint: { text: options['hint'] },
+ label: { text: options["value"] },
+ hint: { text: options["hint"] },
checked: @case_log[key] == 1,
exclusive: after_divider,
**stimulus_html_attributes(question) %>
diff --git a/app/views/form/_interruption_screen_question.html.erb b/app/views/form/_interruption_screen_question.html.erb
index 923d323b3..8913aa1e7 100644
--- a/app/views/form/_interruption_screen_question.html.erb
+++ b/app/views/form/_interruption_screen_question.html.erb
@@ -1,6 +1,6 @@
<%= govuk_panel(
- title_text: title_text,
- classes: 'app-panel--interruption',
+ title_text:,
+ classes: "app-panel--interruption",
) do %>
<%= display_informative_text(informative_text, case_log) %>
<%= f.govuk_radio_buttons_fieldset question.id.to_sym,
@@ -12,8 +12,8 @@
<% else %>
<%= f.govuk_radio_button question.id,
key,
- label: { text: options['value'] },
- hint: { text: options['hint'] },
+ label: { text: options["value"] },
+ hint: { text: options["hint"] },
**stimulus_html_attributes(question) %>
<% end %>
<% end %>
diff --git a/app/views/form/_numeric_output_question.html.erb b/app/views/form/_numeric_output_question.html.erb
index 01527be09..e3019a62c 100644
--- a/app/views/form/_numeric_output_question.html.erb
+++ b/app/views/form/_numeric_output_question.html.erb
@@ -15,7 +15,7 @@
step="<%= question.step %>"
type="number"
name="case_log[tcharge]"
- for="<%= question.fields_added.present? ? question.fields_added.map { |x| "case-log-#{x}-field"}.join(" ") : "" %>">
+ for="<%= question.fields_added.present? ? question.fields_added.map { |x| "case-log-#{x}-field" }.join(" ") : "" %>">
<%= case_log[question.id] %>
<%= question.suffix %>
diff --git a/app/views/form/_numeric_question.html.erb b/app/views/form/_numeric_question.html.erb
index 933cf7abd..c392ebaf1 100644
--- a/app/views/form/_numeric_question.html.erb
+++ b/app/views/form/_numeric_question.html.erb
@@ -5,7 +5,8 @@
label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe },
min: question.min, max: question.max, step: question.step,
- width: question.width, :readonly => question.read_only?,
+ width: question.width,
+ readonly: question.read_only?,
prefix_text: question.prefix.to_s,
suffix_text: question.suffix.is_a?(String) ? question.suffix : nil,
**stimulus_html_attributes(question) %>
diff --git a/app/views/form/_radio_question.html.erb b/app/views/form/_radio_question.html.erb
index 5b770994a..a79e9422d 100644
--- a/app/views/form/_radio_question.html.erb
+++ b/app/views/form/_radio_question.html.erb
@@ -13,21 +13,21 @@
<% if conditional_question.nil? %>
<%= f.govuk_radio_button question.id,
key,
- label: { text: options['value'] },
- hint: { text: options['hint'] },
+ label: { text: options["value"] },
+ hint: { text: options["hint"] },
**stimulus_html_attributes(question) %>
<% else %>
<%= f.govuk_radio_button question.id,
key,
- label: { text: options['value'] },
- hint: { text: options['hint'] },
+ label: { text: options["value"] },
+ hint: { text: options["hint"] },
**stimulus_html_attributes(question) do %>
<%= render partial: "#{conditional_question.type}_question", locals: {
question: conditional_question,
- caption_text: caption_text,
- page_header: page_header,
- f: f,
- conditional: true
+ caption_text:,
+ page_header:,
+ f:,
+ conditional: true,
} %>
<% end %>
<% end %>
diff --git a/app/views/form/_select_question.html.erb b/app/views/form/_select_question.html.erb
index d758f3a85..fb12a203b 100644
--- a/app/views/form/_select_question.html.erb
+++ b/app/views/form/_select_question.html.erb
@@ -1,13 +1,13 @@
<%= render partial: "form/guidance/#{question.guidance_partial}" if question.guidance_partial %>
<% selected = @case_log.public_send(question.id) || "" %>
-<%= answers = question.displayed_answer_options.map { |key, value| OpenStruct.new(id: key, name: value) }
- f.govuk_collection_select question.id.to_sym,
+<%= answers = question.displayed_answer_options.map { |key, value| OpenStruct.new(id: key, name: value) } %>
+ <%= f.govuk_collection_select question.id.to_sym,
answers,
:id,
:name,
caption: caption(caption_text, page_header, conditional),
label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe },
- options: { disabled: [""], selected: selected },
+ options: { disabled: [""], selected: },
"data-controller": "accessible-autocomplete" %>
diff --git a/app/views/form/_text_question.html.erb b/app/views/form/_text_question.html.erb
index f842982bd..4b11bea36 100644
--- a/app/views/form/_text_question.html.erb
+++ b/app/views/form/_text_question.html.erb
@@ -4,5 +4,5 @@
caption: caption(caption_text, page_header, conditional),
label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe },
- width: question.width ? question.width : nil,
+ width: question.width || nil,
**stimulus_html_attributes(question) %>
diff --git a/app/views/form/_textarea_question.html.erb b/app/views/form/_textarea_question.html.erb
index 5499b100b..e87cb558b 100644
--- a/app/views/form/_textarea_question.html.erb
+++ b/app/views/form/_textarea_question.html.erb
@@ -4,5 +4,5 @@
caption: caption(caption_text, page_header, conditional),
label: legend(question, page_header, conditional),
hint: { text: question.hint_text&.html_safe },
- width: question.width ? question.width : nil,
+ width: question.width || nil,
**stimulus_html_attributes(question) %>
diff --git a/app/views/form/check_answers.html.erb b/app/views/form/check_answers.html.erb
index fb912990c..94f5757b6 100644
--- a/app/views/form/check_answers.html.erb
+++ b/app/views/form/check_answers.html.erb
@@ -1,8 +1,8 @@
<% content_for :title, "#{subsection.id.humanize} - Check your answers" %>
<% content_for :breadcrumbs, govuk_breadcrumbs(breadcrumbs: {
"Logs" => "/logs",
- "Log #{@case_log.id.to_s}" => "/logs/" + @case_log.id.to_s,
- subsection.label => ""
+ "Log #{@case_log.id}" => "/logs/#{@case_log.id}",
+ subsection.label => "",
}) %>
@@ -16,16 +16,16 @@
<% subsection.applicable_questions(@case_log).each do |question| %>
- <%= render partial: 'form/check_answers_table', locals: { question: question, case_log: @case_log } %>
+ <%= render partial: "form/check_answers_table", locals: { question:, case_log: @case_log } %>
<% end %>
<%= form_with model: @case_log, method: "get" do |f| %>
- <%= f.govuk_submit 'Save and return to log' do %>
+ <%= f.govuk_submit "Save and return to log" do %>
<% if @case_log.status == "in_progress" && @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) == false %>
- <%= govuk_button_link_to 'Save and go to next incomplete section', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
+ <%= govuk_button_link_to "Save and go to next incomplete section", "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
<% elsif @case_log.status == "completed" || @case_log.form.all_subsections_except_declaration_completed?(@case_log) %>
- <%= govuk_button_link_to 'Save and go to submit', "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
+ <%= govuk_button_link_to "Save and go to submit", "/logs/#{@case_log.id}/#{@case_log.form.next_incomplete_section_redirect_path(subsection, @case_log)}", secondary: true %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/form/guidance/_what_counts_as_income.html.erb b/app/views/form/guidance/_what_counts_as_income.html.erb
index 79326d909..55362d941 100644
--- a/app/views/form/guidance/_what_counts_as_income.html.erb
+++ b/app/views/form/guidance/_what_counts_as_income.html.erb
@@ -1,4 +1,4 @@
-<%= govuk_details(summary_text: 'What counts as income?') do %>
+<%= govuk_details(summary_text: "What counts as income?") do %>
You should include any income after tax from:
- employment
diff --git a/app/views/form/page.html.erb b/app/views/form/page.html.erb
index 2a09d6253..37c6bc18e 100644
--- a/app/views/form/page.html.erb
+++ b/app/views/form/page.html.erb
@@ -1,9 +1,9 @@
-<% content_for :title, @page.header.present? ? @page.header : @page.questions.first().header.html_safe %>
+<% content_for :title, @page.header.presence || @page.questions.first.header.html_safe %>
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
- href: 'javascript:history.back()',
+ text: "Back",
+ href: "javascript:history.back()",
) %>
<% end %>
@@ -34,9 +34,9 @@
<% end %>
<% if question.type == "interruption_screen" %>
- <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f: f, conditional: false } %>
+ <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, title_text: @page.title_text, informative_text: @page.informative_text, form: @form, f:, conditional: false } %>
<% else %>
- <%= render partial: "form/#{question.type}_question", locals: { question: question, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f: f, conditional: false } %>
+ <%= render partial: "form/#{question.type}_question", locals: { question:, caption_text: @subsection.label, page_header: @page.header, case_log: @case_log, f:, conditional: false } %>
<% end %>
<% end %>
diff --git a/app/views/layouts/_collection_resources.html.erb b/app/views/layouts/_collection_resources.html.erb
index 4b45b0a8d..4be268e7a 100644
--- a/app/views/layouts/_collection_resources.html.erb
+++ b/app/views/layouts/_collection_resources.html.erb
@@ -1,13 +1,16 @@
Collection resources
- <%= render DocumentListComponent.new(items: [{
- name: "Lettings log for tenants (2022/23)",
- href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2022-23%20Lettings%20paper%20form.pdf?download-format=pdf",
- metadata: "PDF, 654 KB, 4 pages"
- }, {
- name: "Lettings log for tenants (2021/22)",
- href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2021_22%20Lettings%20Log.pdf?download-format=pdf",
- metadata: "PDF, 302 KB, 3 pages"
- }]) %>
+ <%= render DocumentListComponent.new(items: [
+ {
+ name: "Lettings log for tenants (2022/23)",
+ href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2022-23%20Lettings%20paper%20form.pdf?download-format=pdf",
+ metadata: "PDF, 654 KB, 4 pages",
+ },
+ {
+ name: "Lettings log for tenants (2021/22)",
+ href: "https://core.communities.gov.uk/public/download/guides-and-manuals/2021_22%20Lettings%20Log.pdf?download-format=pdf",
+ metadata: "PDF, 302 KB, 3 pages",
+ },
+ ]) %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 9b0ba04b7..701c42b95 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -4,19 +4,19 @@
<%= browser_title(yield(:title), @pagy, @admin_user, @user, @organisation, @case_log, @resource) %>
<%= csrf_meta_tags %>
<%= csp_meta_tag %>
- <%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
- <%= tag :meta, property: 'og:image', content: asset_path('images/govuk-opengraph-image.png') %>
- <%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
- <%= favicon_link_tag asset_path('images/favicon.ico') %>
- <%= favicon_link_tag asset_path('images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %>
+ <%= tag.meta name: "viewport", content: "width=device-width, initial-scale=1" %>
+ <%= tag.meta property: "og:image", content: asset_path("images/govuk-opengraph-image.png") %>
+ <%= tag.meta name: "theme-color", content: "#0b0c0c" %>
+ <%= favicon_link_tag asset_path("images/favicon.ico") %>
+ <%= favicon_link_tag asset_path("images/govuk-mask-icon.svg"), rel: "mask-icon", type: "image/svg", color: "#0b0c0c" %>
+ <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon.png"), rel: "apple-touch-icon", type: "image/png" %>
+ <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-152x152.png"), rel: "apple-touch-icon", type: "image/png", size: "152x152" %>
+ <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-167x167.png"), rel: "apple-touch-icon", type: "image/png", size: "167x167" %>
+ <%= favicon_link_tag asset_path("images/govuk-apple-touch-icon-180x180.png"), rel: "apple-touch-icon", type: "image/png", size: "180x180" %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "vendor/html5shiv.min.js" %>
<%= javascript_include_tag "vendor/polyfill-output-value.js" %>
@@ -37,43 +37,44 @@
<%= govuk_skip_link %>
<%= govuk_header(
- logotype: 'GOV.UK',
- service_name: t('service_name'),
- service_url: current_user.nil? ? "/" : '/logs'
+ logotype: "GOV.UK",
+ service_name: t("service_name"),
+ service_url: current_user.nil? ? "/" : "/logs",
) do |component|
if current_user.nil?
- component.navigation_item(text: 'Sign in', href: user_session_path)
- elsif
- component.navigation_item(text: 'Logs', href: case_logs_path)
- component.navigation_item(text: 'Your organisation', href: "/organisations/#{current_user.organisation.id}")
- component.navigation_item(text: 'Your account', href: account_path)
- component.navigation_item(text: 'Sign out', href: destroy_user_session_path)
+ component.navigation_item(text: "Sign in", href: user_session_path)
+ else
+ component.navigation_item(text: "Logs", href: case_logs_path)
+ component.navigation_item(text: "Your organisation", href: "/organisations/#{current_user.organisation.id}")
+ component.navigation_item(text: "Your account", href: account_path)
+ component.navigation_item(text: "Sign out", href: destroy_user_session_path)
end
end %>
- <% if flash.notice && !flash.notice.include?('translation missing') %>
+ <% if flash.notice && !flash.notice.include?("translation missing") %>
<%= govuk_notification_banner(
- title_text: 'Success',
+ title_text: "Success",
success: true, title_heading_level: 3,
- title_id: "swanky-notifications") do |notification_banner|
- notification_banner.heading(text: flash.notice)
+ title_id: "swanky-notifications"
+ ) do |notification_banner|
+ notification_banner.heading(text: flash.notice)
end %>
<% end %>
<%= content_for?(:content) ? yield(:content) : yield %>
diff --git a/app/views/layouts/organisations.html.erb b/app/views/layouts/organisations.html.erb
index b316bf64f..aea5983c3 100644
--- a/app/views/layouts/organisations.html.erb
+++ b/app/views/layouts/organisations.html.erb
@@ -5,7 +5,7 @@
<% items = tab_items(current_user) %>
- <%= render TabNavigationComponent.new(items: items) %>
+ <%= render TabNavigationComponent.new(items:) %>
<%= content_for(:tab_title) %>
diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb
index b0c0d6adb..93dafc4a7 100644
--- a/app/views/organisations/edit.html.erb
+++ b/app/views/organisations/edit.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
index 8af61268f..f98ea86a9 100644
--- a/app/views/organisations/show.html.erb
+++ b/app/views/organisations/show.html.erb
@@ -10,17 +10,21 @@
<% @organisation.display_attributes.each do |attr| %>
<% if current_user.data_coordinator? && attr[:editable] %>
- <%= summary_list.row do |row|
- row.key { attr[:name].to_s.humanize }
- row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") }
- row.action(visually_hidden_text: 'name', href: edit_organisation_path, html_attributes: { 'data-qa': "change-#{attr[:name]}" })
- end %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s.humanize } %>
+ <% row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } %>
+ <% row.action(
+ visually_hidden_text: "name",
+ href: edit_organisation_path,
+ html_attributes: { "data-qa": "change-#{attr[:name]}" },
+ ) %>
+ <% end %>
<% else %>
- <%= summary_list.row do |row|
- row.key { attr[:name].to_s.humanize }
- row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") }
- row.action()
- end %>
+ <%= summary_list.row do |row| %>
+ <% row.key { attr[:name].to_s.humanize } %>
+ <% row.value { simple_format(attr[:value].to_s, {}, wrapper_tag: "div") } %>
+ <% row.action %>
+ <% end %>
<% end %>
<% end %>
diff --git a/app/views/organisations/users.html.erb b/app/views/organisations/users.html.erb
index 304528016..8c0e5e5d0 100644
--- a/app/views/organisations/users.html.erb
+++ b/app/views/organisations/users.html.erb
@@ -9,19 +9,19 @@
<% end %>
<%= govuk_table do |table| %>
<%= table.head do |head| %>
- <%= head.row do |row|
- row.cell(header: true, text: "Name and email adress")
- row.cell(header: true, text: "Organisation and role")
- row.cell(header: true, text: "Last logged in")
- end %>
+ <%= head.row do |row| %>
+ <% row.cell(header: true, text: "Name and email adress") %>
+ <% row.cell(header: true, text: "Organisation and role") %>
+ <% row.cell(header: true, text: "Last logged in") %>
+ <% end %>
<% end %>
<% @organisation.users.each do |user| %>
<%= table.body do |body| %>
- <%= body.row do |row|
- row.cell(text: simple_format(user_cell(user), {}, wrapper_tag: "div"))
- row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div"))
- row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date) )
- end %>
+ <%= body.row do |row| %>
+ <% row.cell(text: simple_format(user_cell(user), {}, wrapper_tag: "div")) %>
+ <% row.cell(text: simple_format(org_cell(user), {}, wrapper_tag: "div")) %>
+ <% row.cell(text: user.last_sign_in_at&.to_formatted_s(:govuk_date)) %>
+ <% end %>
<% end %>
<% end %>
<% end %>
diff --git a/app/views/start/index.html.erb b/app/views/start/index.html.erb
index 578fccc53..72a6619e4 100644
--- a/app/views/start/index.html.erb
+++ b/app/views/start/index.html.erb
@@ -10,10 +10,10 @@
The data will be used to update the national record for social housing. It will also help to inform policy about the cost of social housing and what type of housing needs to be built.
This service is only for social housing in England.
- <% start_path = current_user ? case_logs_path : (user_session_path + "?start=true") %>
+ <% start_path = current_user ? case_logs_path : "#{user_session_path}?start=true" %>
<%= govuk_start_button(
- text: 'Start now',
- href: start_path
+ text: "Start now",
+ href: start_path,
) %>
Before you start
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 257764f7f..d357f69fc 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>
@@ -25,9 +25,13 @@
spellcheck: "false" %>
<% if current_user.data_coordinator? || current_user.support? %>
- <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) }
+ <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
- f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" } %>
+ <%= f.govuk_collection_radio_buttons :role,
+ roles,
+ :id,
+ :name,
+ legend: { text: "Role", size: "m" } %>
<%= f.govuk_collection_radio_buttons :is_dpo,
[OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],
diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb
index 903af4d3b..488290ee2 100644
--- a/app/views/users/new.html.erb
+++ b/app/views/users/new.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>
@@ -25,8 +25,13 @@
spellcheck: "false",
value: @resource.email %>
- <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) }
- f.govuk_collection_radio_buttons :role, roles, :id, :name, legend: { text: "Role", size: "m" } %>
+ <%= roles = current_user.assignable_roles.map { |key, _| OpenStruct.new(id: key, name: key.to_s.humanize) } %>
+
+ <%= f.govuk_collection_radio_buttons :role,
+ roles,
+ :id,
+ :name,
+ legend: { text: "Role", size: "m" } %>
<%= f.govuk_collection_radio_buttons :is_dpo,
[OpenStruct.new(id: false, name: "No"), OpenStruct.new(id: true, name: "Yes")],
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 846472ca1..af0aa0599 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -12,70 +12,86 @@
<%= govuk_summary_list do |summary_list| %>
<%= summary_list.row do |row|
- row.key { "Name" }
- row.value { @user.name }
- if can_edit_names?(@user, current_user)
- row.action(visually_hidden_text: "name", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-name" })
- else
- row.action()
- end
- end %>
+ row.key { "Name" }
+ row.value { @user.name }
+ if can_edit_names?(@user, current_user)
+ row.action(visually_hidden_text: "name", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-name" })
+ else
+ row.action
+ end
+ end %>
- <%= summary_list.row() do |row|
- row.key { "Email address" }
- row.value { @user.email }
- if can_edit_emails?(@user, current_user)
- row.action(visually_hidden_text: "email address", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-email-address" })
- else
- row.action()
- end
- end %>
+ <%= summary_list.row do |row|
+ row.key { "Email address" }
+ row.value { @user.email }
+ if can_edit_emails?(@user, current_user)
+ row.action(visually_hidden_text: "email address", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-email-address" })
+ else
+ row.action
+ end
+ end %>
<%= summary_list.row do |row|
- row.key { "Password" }
- row.value { "••••••••" }
- if can_edit_password?(@user, current_user)
- row.action(visually_hidden_text: "password", href: edit_password_account_path, html_attributes: { "data-qa": "change-password" })
- else
- row.action()
- end
- end %>
+ row.key { "Password" }
+ row.value { "••••••••" }
+ if can_edit_password?(@user, current_user)
+ row.action(
+ visually_hidden_text: "password",
+ href: edit_password_account_path,
+ html_attributes: { "data-qa": "change-password" },
+ )
+ else
+ row.action
+ end
+ end %>
<%= summary_list.row do |row|
- row.key { "Organisation" }
- row.value { @user.organisation.name }
- row.action()
- end %>
+ row.key { "Organisation" }
+ row.value { @user.organisation.name }
+ row.action
+ end %>
<%= summary_list.row do |row|
- row.key { "Role" }
- row.value { @user.role.humanize }
- if can_edit_roles?(@user, current_user)
- row.action(visually_hidden_text: "role", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-role" })
- else
- row.action()
- end
- end %>
+ row.key { "Role" }
+ row.value { @user.role.humanize }
+ if can_edit_roles?(@user, current_user)
+ row.action(
+ visually_hidden_text: "role",
+ href: aliased_user_edit(@user, current_user),
+ html_attributes: { "data-qa": "change-role" },
+ )
+ else
+ row.action
+ end
+ end %>
<%= summary_list.row do |row|
- row.key { "Data protection officer" }
- row.value { @user.is_data_protection_officer? ? "Yes" : "No" }
- if can_edit_dpo?(@user, current_user)
- row.action(visually_hidden_text: "are #{pronoun(@user, current_user)} a data protection officer?", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-data-protection-officer" })
- else
- row.action()
- end
- end %>
+ row.key { "Data protection officer" }
+ row.value { @user.is_data_protection_officer? ? "Yes" : "No" }
+ if can_edit_dpo?(@user, current_user)
+ row.action(
+ visually_hidden_text: "are #{pronoun(@user, current_user)} a data protection officer?",
+ href: aliased_user_edit(@user, current_user),
+ html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-data-protection-officer" },
+ )
+ else
+ row.action
+ end
+ end %>
<%= summary_list.row do |row|
- row.key { "Key contact" }
- row.value { @user.is_key_contact? ? "Yes" : "No" }
- if can_edit_key_contact?(@user, current_user)
- row.action(visually_hidden_text: "are #{pronoun(@user, current_user)} a key contact?", href: aliased_user_edit(@user, current_user), html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-key-contact" })
- else
- row.action()
- end
- end %>
+ row.key { "Key contact" }
+ row.value { @user.is_key_contact? ? "Yes" : "No" }
+ if can_edit_key_contact?(@user, current_user)
+ row.action(
+ visually_hidden_text: "are #{pronoun(@user, current_user)} a key contact?",
+ href: aliased_user_edit(@user, current_user),
+ html_attributes: { "data-qa": "change-are-#{pronoun(@user, current_user)}-a-key-contact" },
+ )
+ else
+ row.action
+ end
+ end %>
<% end %>
diff --git a/spec/features/reset_password.html.erb b/spec/features/reset_password.html.erb
index a1735c5ec..1bf271dab 100644
--- a/spec/features/reset_password.html.erb
+++ b/spec/features/reset_password.html.erb
@@ -2,7 +2,7 @@
<% content_for :before_content do %>
<%= govuk_back_link(
- text: 'Back',
+ text: "Back",
href: :back,
) %>
<% end %>