From 5a2b0a3c8e20a6b5a5837b0b0c6ed3c779fc5eec Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 28 Nov 2022 10:12:13 +0000 Subject: [PATCH] display inset hint text for unresolved log questions --- app/models/form/lettings/questions/tenancy_start_date.rb | 1 + app/models/form/question.rb | 4 +++- app/views/form/_date_question.html.erb | 4 +++- app/views/logs/update_logs.html.erb | 2 +- spec/requests/lettings_logs_controller_spec.rb | 7 ++++++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/app/models/form/lettings/questions/tenancy_start_date.rb b/app/models/form/lettings/questions/tenancy_start_date.rb index f7e2622ac..f2d421a13 100644 --- a/app/models/form/lettings/questions/tenancy_start_date.rb +++ b/app/models/form/lettings/questions/tenancy_start_date.rb @@ -5,6 +5,7 @@ class Form::Lettings::Questions::TenancyStartDate < ::Form::Question @check_answer_label = "Tenancy start date" @header = "What is the tenancy start date?" @type = "date" + @unresolved_hint_text = "Check the tenancy start date is correct" @page = page end end diff --git a/app/models/form/question.rb b/app/models/form/question.rb index 13b1c62c9..05e712e38 100644 --- a/app/models/form/question.rb +++ b/app/models/form/question.rb @@ -3,7 +3,8 @@ class Form::Question :type, :min, :max, :step, :width, :fields_to_add, :result_field, :conditional_for, :readonly, :answer_options, :page, :check_answer_label, :inferred_answers, :hidden_in_check_answers, :inferred_check_answers_value, - :guidance_partial, :prefix, :suffix, :requires_js, :fields_added, :derived, :check_answers_card_number + :guidance_partial, :prefix, :suffix, :requires_js, :fields_added, :derived, + :check_answers_card_number, :unresolved_hint_text module GuidancePosition TOP = 1 @@ -38,6 +39,7 @@ class Form::Question @requires_js = hsh["requires_js"] @fields_added = hsh["fields_added"] @check_answers_card_number = hsh["check_answers_card_number"] || 0 + @unresolved_hint_text = hsh["unresolved_hint_text"] end end diff --git a/app/views/form/_date_question.html.erb b/app/views/form/_date_question.html.erb index 53abb5878..153679ace 100644 --- a/app/views/form/_date_question.html.erb +++ b/app/views/form/_date_question.html.erb @@ -5,6 +5,8 @@ legend: legend(question, page_header, conditional), hint: { text: question.hint_text&.html_safe || "For example, 1 9 2022." }, width: 20, - **stimulus_html_attributes(question) %> + **stimulus_html_attributes(question) do %> + <%= govuk_inset_text(text: question.unresolved_hint_text) if question.unresolved_hint_text.present? && @log.unresolved %> +<% end %> <%= render partial: "form/guidance/#{question.guidance_partial}" if question.bottom_guidance? %> diff --git a/app/views/logs/update_logs.html.erb b/app/views/logs/update_logs.html.erb index 758d78253..cd8447277 100644 --- a/app/views/logs/update_logs.html.erb +++ b/app/views/logs/update_logs.html.erb @@ -1,5 +1,5 @@ <% item_label = format_label(@pagy.count, "logs") %> -<% title = "Update logs"%> +<% title = "Update logs" %> <% content_for :title, title %> diff --git a/spec/requests/lettings_logs_controller_spec.rb b/spec/requests/lettings_logs_controller_spec.rb index dac94e60b..a02d4247f 100644 --- a/spec/requests/lettings_logs_controller_spec.rb +++ b/spec/requests/lettings_logs_controller_spec.rb @@ -710,9 +710,9 @@ RSpec.describe LettingsLogsController, type: :request do context "when the log is unresolved" do let!(:scheme) { FactoryBot.create(:scheme, owning_organisation: user.organisation) } let!(:location) { FactoryBot.create(:location, scheme:) } - let!(:unresolved_lettings_logs) { FactoryBot.create_list(:lettings_log, 3, unresolved: true, created_by: user) } before do + FactoryBot.create_list(:lettings_log, 3, unresolved: true, created_by: user) lettings_log.update!(needstype: 2, scheme:, location:, unresolved: true) sign_in user get "/lettings-logs/#{lettings_log.id}", headers:, params: {} @@ -886,6 +886,11 @@ RSpec.describe LettingsLogsController, type: :request do get "/lettings-logs/#{affected_lettings_log.id}/scheme", headers:, params: {} expect(page).to have_link("Skip for now", href: "/lettings-logs/#{affected_lettings_log.id}/location") end + + it "displays inset hint text on the tenancy start date question" do + get "/lettings-logs/#{affected_lettings_log.id}/tenancy-start-date", headers:, params: {} + expect(page).to have_content("Check the tenancy start date is correct") + end end end