diff --git a/app/models/form/lettings/pages/void_or_renewal_date.rb b/app/models/form/lettings/pages/void_date.rb similarity index 86% rename from app/models/form/lettings/pages/void_or_renewal_date.rb rename to app/models/form/lettings/pages/void_date.rb index 1ea4ea982..3acd2c46a 100644 --- a/app/models/form/lettings/pages/void_or_renewal_date.rb +++ b/app/models/form/lettings/pages/void_date.rb @@ -1,7 +1,7 @@ -class Form::Lettings::Pages::VoidOrRenewalDate < ::Form::Page +class Form::Lettings::Pages::VoidDate < ::Form::Page def initialize(id, hsh, subsection) super - @id = "void_or_renewal_date" + @id = "void_date" @depends_on = [ { "renewal" => 0, "rsnvac" => 5 }, { "renewal" => 0, "rsnvac" => 6 }, diff --git a/app/models/form/lettings/questions/voiddate.rb b/app/models/form/lettings/questions/voiddate.rb index a91ac6ddb..0431b9adb 100644 --- a/app/models/form/lettings/questions/voiddate.rb +++ b/app/models/form/lettings/questions/voiddate.rb @@ -2,10 +2,12 @@ class Form::Lettings::Questions::Voiddate < ::Form::Question def initialize(id, hsh, page) super @id = "voiddate" - @check_answer_label = "Void or renewal date" - @header = "What is the void or renewal date?" + @check_answer_label = "Void date" + @header = "What is the void date?" @type = "date" @check_answers_card_number = 0 @question_number = 23 + @guidance_partial = "void_date" + @guidance_position = GuidancePosition::BOTTOM end end diff --git a/app/models/form/lettings/subsections/property_information.rb b/app/models/form/lettings/subsections/property_information.rb index cc07535ae..6c3541e52 100644 --- a/app/models/form/lettings/subsections/property_information.rb +++ b/app/models/form/lettings/subsections/property_information.rb @@ -20,7 +20,7 @@ class Form::Lettings::Subsections::PropertyInformation < ::Form::Subsection Form::Lettings::Pages::PropertyBuildingType.new(nil, nil, self), Form::Lettings::Pages::PropertyWheelchairAccessible.new(nil, nil, self), Form::Lettings::Pages::PropertyNumberOfBedrooms.new(nil, nil, self), - Form::Lettings::Pages::VoidOrRenewalDate.new(nil, nil, self), + Form::Lettings::Pages::VoidDate.new(nil, nil, self), Form::Lettings::Pages::VoidDateValueCheck.new(nil, nil, self), Form::Lettings::Pages::NewBuildHandoverDate.new(nil, nil, self), Form::Lettings::Pages::PropertyMajorRepairs.new(nil, nil, self), diff --git a/app/services/bulk_upload/lettings/year2022/row_parser.rb b/app/services/bulk_upload/lettings/year2022/row_parser.rb index 560ed82b5..8c1ad2f55 100644 --- a/app/services/bulk_upload/lettings/year2022/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2022/row_parser.rb @@ -91,9 +91,9 @@ class BulkUpload::Lettings::Year2022::RowParser field_86: "Does the household pay rent or other charges for the accommodation?", field_87: "After the household has received any housing-related benefits, will they still need to pay basic rent and other charges?", field_88: "What do you expect the outstanding amount to be?", - field_89: "What is the void or renewal date?", - field_90: "What is the void or renewal date?", - field_91: "What is the void or renewal date?", + field_89: "What is the void date?", + field_90: "What is the void date?", + field_91: "What is the void date?", field_92: "What date were major repairs completed on?", field_93: "What date were major repairs completed on?", field_94: "What date were major repairs completed on?", diff --git a/app/views/form/guidance/_void_date.html.erb b/app/views/form/guidance/_void_date.html.erb new file mode 100644 index 000000000..69ea9384f --- /dev/null +++ b/app/views/form/guidance/_void_date.html.erb @@ -0,0 +1,9 @@ +<%= govuk_details(summary_text: "What is a void date?") do %> +

Date the property was (legally or contractually) available to let, or for:

+ +<% end %> diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index eeed6c3c7..d558f15e9 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -714,15 +714,16 @@ } ] }, - "void_or_renewal_date": { + "void_date": { "header": "", "description": "", "questions": { "voiddate": { - "check_answer_label": "Void or renewal date", - "header": "What is the void or renewal date?", + "check_answer_label": "Void date", + "header": "What is the void date?", "hint_text": "For example, 27 3 2021.", - "type": "date" + "type": "date", + "guidance_partial": "void_date" } }, "depends_on": [ diff --git a/spec/models/form/lettings/subsections/property_information_spec.rb b/spec/models/form/lettings/subsections/property_information_spec.rb index 227773487..6194bafb7 100644 --- a/spec/models/form/lettings/subsections/property_information_spec.rb +++ b/spec/models/form/lettings/subsections/property_information_spec.rb @@ -26,7 +26,7 @@ RSpec.describe Form::Lettings::Subsections::PropertyInformation, type: :model do property_building_type property_wheelchair_accessible property_number_of_bedrooms - void_or_renewal_date + void_date void_date_value_check new_build_handover_date property_major_repairs