From f7f47ec8e600e915686a614c14b6bbe9cc6f634b Mon Sep 17 00:00:00 2001 From: Kat Date: Mon, 10 Jan 2022 16:42:56 +0000 Subject: [PATCH] Add nocharge field --- app/models/case_log.rb | 1 + app/models/constants/case_log.rb | 5 +++++ config/forms/2021_2022.json | 17 +++++++++++++++++ db/migrate/20220110161957_add_nocharge_field.rb | 7 +++++++ db/schema.rb | 3 ++- spec/factories/case_log.rb | 1 + spec/fixtures/complete_case_log.json | 3 ++- 7 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20220110161957_add_nocharge_field.rb diff --git a/app/models/case_log.rb b/app/models/case_log.rb index 661240ce9..18b250561 100644 --- a/app/models/case_log.rb +++ b/app/models/case_log.rb @@ -135,6 +135,7 @@ class CaseLog < ApplicationRecord enum postcode_known: POLAR, _suffix: true enum la_known: POLAR, _suffix: true enum net_income_known: NET_INCOME_KNOWN, _suffix: true + enum nocharge: POLAR3, _suffix: true AUTOGENERATED_FIELDS = %w[id status created_at updated_at discarded_at].freeze OPTIONAL_FIELDS = %w[postcode_known la_known first_time_property_let_as_social_housing].freeze diff --git a/app/models/constants/case_log.rb b/app/models/constants/case_log.rb index 94cd874aa..ce737da7b 100644 --- a/app/models/constants/case_log.rb +++ b/app/models/constants/case_log.rb @@ -144,6 +144,11 @@ module Constants::CaseLog "Yes" => 1, }.freeze + POLAR3 = { + "No" => 1, + "Yes" => 0, + }.freeze + POLAR_WITH_UNKNOWN = { "No" => 2, "Yes" => 1, diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 3df89c20e..fb3e44e1f 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1949,6 +1949,23 @@ } } } + }, + "rent_or_other_charges": { + "header": "", + "description": "", + "questions": { + "nocharge": { + "check_answer_label": "Does the household pay rent or other charges for the accommodation?", + "header": "Does the household pay rent or other charges for the accommodation?", + "hint_text": "", + "type": "radio", + "answer_options": { + "0": "Yes", + "1": "No" + } + } + }, + "depends_on": { "needstype": "Supported housing" } } } }, diff --git a/db/migrate/20220110161957_add_nocharge_field.rb b/db/migrate/20220110161957_add_nocharge_field.rb new file mode 100644 index 000000000..b5fbf4f53 --- /dev/null +++ b/db/migrate/20220110161957_add_nocharge_field.rb @@ -0,0 +1,7 @@ +class AddNochargeField < ActiveRecord::Migration[7.0] + def change + change_table :case_logs, bulk: true do |t| + t.column :nocharge, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 6578e596d..7c68a7827 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2022_01_10_115720) do +ActiveRecord::Schema.define(version: 2022_01_10_161957) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -179,6 +179,7 @@ ActiveRecord::Schema.define(version: 2022_01_10_115720) do t.integer "totadult" t.integer "net_income_known" t.string "has_benefits" + t.integer "nocharge" t.index ["discarded_at"], name: "index_case_logs_on_discarded_at" t.index ["managing_organisation_id"], name: "index_case_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_case_logs_on_owning_organisation_id" diff --git a/spec/factories/case_log.rb b/spec/factories/case_log.rb index e8c14f102..ce18923af 100644 --- a/spec/factories/case_log.rb +++ b/spec/factories/case_log.rb @@ -148,6 +148,7 @@ FactoryBot.define do armedforces { 1 } builtype { 1 } unitletas { 2 } + nocharge { "No" } 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 84a5c8725..ad944f825 100644 --- a/spec/fixtures/complete_case_log.json +++ b/spec/fixtures/complete_case_log.json @@ -144,6 +144,7 @@ "property_wheelchair_accessible": "Yes", "void_or_renewal_date": "05/05/2020", "tenant_same_property_renewal": "Yes", - "new_build_handover_date": "01/01/2019" + "new_build_handover_date": "01/01/2019", + "nocharge": "No" } }