diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 5b1659927..b48b042a6 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1070,22 +1070,6 @@ } } }, - "fixed_term_tenancy": { - "header": "", - "description": "", - "questions": { - "tenancylength": { - "check_answer_label": "If the main tenancy is a fixed term tenancy, please provide the length of the fixed term (to the nearest year) excluding any starter/introductory period", - "header": "If fixed-term, what is the length of the fixed-term tenancy after any starter period?", - "hint_text": "To the nearest year", - "type": "numeric", - "min": 0, - "max": 150, - "step": 1, - "width": 4 - } - } - }, "tenancy_type": { "header": "", "description": "", @@ -1113,18 +1097,35 @@ } } }, - "letting_provider": { + "fixed_term_tenancy": { + "header": "", + "description": "", + "questions": { + "tenancylength": { + "check_answer_label": "If the main tenancy is a fixed term tenancy, please provide the length of the fixed term (to the nearest year) excluding any starter/introductory period", + "header": "If fixed-term, what is the length of the fixed-term tenancy after any starter period?", + "hint_text": "To the nearest year", + "type": "numeric", + "min": 0, + "max": 150, + "step": 1 + } + } + }, + "letting_in_sheltered_accomodation": { "header": "", "description": "", "questions": { - "landlord": { - "check_answer_label": "Provider", - "header": "Who is the letting provider?", + "lettinginshelteredaccomodation": { + "check_answer_label": "Is this letting in sheltered accommodation?", + "header": "Is this letting in sheltered accommodation?", "hint_text": "", "type": "radio", "answer_options": { - "0": "This landlord", - "1": "Another registered provider - includes housing association or local authority" + "0": "Yes - sheltered housing", + "1": "Yes - extra care housing", + "2": "No", + "3": "Don't know" } } } diff --git a/db/migrate/20220112124047_add_letting_in_sheltered_accomodation_field.rb b/db/migrate/20220112124047_add_letting_in_sheltered_accomodation_field.rb new file mode 100644 index 000000000..3b2fd7ecf --- /dev/null +++ b/db/migrate/20220112124047_add_letting_in_sheltered_accomodation_field.rb @@ -0,0 +1,7 @@ +class AddLettingInShelteredAccomodationField < ActiveRecord::Migration[7.0] + def change + change_table :case_logs, bulk: true do |t| + t.column :letting_in_sheltered_accomodation, :integer + end + end +end diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb index 8f00d862e..ca2cd898e 100644 --- a/spec/factories/case_log.rb +++ b/spec/factories/case_log.rb @@ -152,6 +152,7 @@ FactoryBot.define do has_benefits { "Yes" } is_carehome { "No" } chcharge { 7 } + letting_in_sheltered_accomodation { 2 } end created_at { Time.zone.now } updated_at { Time.zone.now } diff --git a/spec/fixtures/complete_case_log.json b/spec/fixtures/complete_case_log.json index fc31d6330..e5cd83d04 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -148,6 +148,7 @@ "has_benefits": "Yes", "household_charge": "Yes", "is_carehome": "Yes", - "chcharge": "6" + "chcharge": "6", + "letting_in_sheltered_accomodation": "No" } }