From f1589f696dd48cb8d8d458ab15c6338875829051 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 12:30:39 +0100 Subject: [PATCH 01/22] Updated options for let type --- config/forms/2021_2022.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 0b92bf3b2..73c01def0 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -586,19 +586,19 @@ "hint_text": "", "type": "radio", "answer_options": { - "1": { + "2": { "value": "Affordable rent basis" }, - "2": { + "3": { "value": "Intermediate rent basis" }, - "0": { + "1": { "value": "Social rent basis" }, "divider": { "value": true }, - "3": { + "4": { "value": "Don’t know" } } From 5a439e600e5e713e6439a8a7b1ab60c7094b56d8 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 12:36:03 +0100 Subject: [PATCH 02/22] Changed IDs and ordering for property_vacancy_reason_not_first_let --- config/forms/2021_2022.json | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 73c01def0..97ab10736 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -621,39 +621,39 @@ "hint_text": "", "type": "radio", "answer_options": { - "1": { + "13": { "value": "Internal transfer", "hint": "Excluding renewals of a fixed-term tenancy" }, - "10": { + "5": { "value": "Previous tenant died with no succession" }, - "2": { + "9": { "value": "Re-let to tenant who occupied same property as temporary accommodation" }, - "0": { + "14": { "value": "Renewal of fixed-term tenancy" }, - "7": { - "value": "Tenant abandoned property" - }, - "3": { + "19": { "value": "Tenant involved in a succession downsize" }, - "6": { - "value": "Tenant moved to care home" + "8": { + "value": "Tenant moved to private sector or other accommodation" }, - "5": { + "12": { "value": "Tenant moved to other social housing provider" }, - "4": { - "value": "Tenant moved to private sector or other accommodation" + "18": { + "value": "Tenant moved to care home" }, - "9": { - "value": "Tenant was evicted due to anti-social behaviour" + "6": { + "value": "Tenant abandoned property" }, - "8": { + "10": { "value": "Tenant was evicted due to rent arrears" + }, + "11": { + "value": "Tenant was evicted due to anti-social behaviour" } } } From cdc76a47c4e2ae3cd37bdb3005f1df81dcc76fd8 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 12:38:31 +0100 Subject: [PATCH 03/22] Updated order on property_vacancy_reason_first_let --- config/forms/2021_2022.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 97ab10736..73b87b9e3 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -675,14 +675,14 @@ "hint_text": "", "type": "radio", "answer_options": { - "15": { - "value": "First let of new-build property" - }, "16": { "value": "First let of conversion, rehabilitation or acquired property" }, "17": { "value": "First let of leased property" + }, + "15": { + "value": "First let of new-build property" } } } From 5ebdc47c80a58348064c37a19ec452cba17c2eee Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 12:41:04 +0100 Subject: [PATCH 04/22] changed option IDs on property_unit_type --- config/forms/2021_2022.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 73b87b9e3..a4711f40e 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -748,28 +748,28 @@ "hint_text": "", "type": "radio", "answer_options": { - "1": { + "2": { "value": "Bedsit" }, - "3": { + "8": { "value": "Bungalow" }, - "0": { + "1": { "value": "Flat or maisonette" }, - "2": { + "7": { "value": "House" }, - "6": { + "10": { "value": "Shared bungalow" }, "4": { "value": "Shared flat or maisonette" }, - "5": { + "9": { "value": "Shared house" }, - "7": { + "6": { "value": "Other" } } From cb3b513e675a5d9689c19ffc7639cd57f9c87eb0 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 12:46:17 +0100 Subject: [PATCH 05/22] updated IDs on property_building_type --- config/forms/2021_2022.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index a4711f40e..f4c5844bf 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -786,10 +786,10 @@ "hint_text": "", "type": "radio", "answer_options": { - "1": { + "2": { "value": "Converted from previous residential or non-residential property" }, - "0": { + "1": { "value": "Purpose built" } } From 0bb9fa413a90d70a43fba3eea98501f63aff0090 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 12:47:18 +0100 Subject: [PATCH 06/22] updated IDs on property_wheelchair_accessible --- config/forms/2021_2022.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index f4c5844bf..68038dc0c 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -806,10 +806,10 @@ "hint_text": "", "type": "radio", "answer_options": { - "0": { + "1": { "value": "Yes" }, - "1": { + "2": { "value": "No" } } From 7710490aace441bb49fc551942c37b5e3d54e0fe Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 13:04:06 +0100 Subject: [PATCH 07/22] fix vars on property_let_type --- config/forms/2021_2022.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 68038dc0c..6e92bb707 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -586,19 +586,19 @@ "hint_text": "", "type": "radio", "answer_options": { + "1": { + "value": "Social rent basis" + }, "2": { "value": "Affordable rent basis" }, - "3": { + "4": { "value": "Intermediate rent basis" }, - "1": { - "value": "Social rent basis" - }, "divider": { "value": true }, - "4": { + "3": { "value": "Don’t know" } } From 5daefae5b3e16c3e47298a01379af2bf5b09e16f Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 13:16:34 +0100 Subject: [PATCH 08/22] update IDs for starter_tenancy --- config/forms/2021_2022.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 6e92bb707..e5c7db877 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -938,10 +938,10 @@ "hint_text": "", "type": "radio", "answer_options": { - "0": { + "1": { "value": "Yes" }, - "1": { + "2": { "value": "No" } } From bb31bb456ec0c358b1dc840e446a6590f29c1504 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 13:18:06 +0100 Subject: [PATCH 09/22] Updated options for tenancy_type --- config/forms/2021_2022.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index e5c7db877..ee5e96fae 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -958,19 +958,19 @@ "hint_text": "", "type": "radio", "answer_options": { - "0": { + "2": { "value": "Assured" }, - "1": { + "4": { "value": "Assured Shorthold" }, - "2": { + "5": { "value": "Licence agreement (almshouses only)" }, - "3": { + "1": { "value": "Secure (including flexible)" }, - "4": { + "3": { "value": "Other" } }, From e20642196ec5b8371a2f1f2a361af3e011f54088 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 13:19:38 +0100 Subject: [PATCH 10/22] updated options on starter_tenancy_type --- config/forms/2021_2022.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index ee5e96fae..70ef33494 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1002,19 +1002,19 @@ "hint_text": "This is also known as an ‘introductory period’.", "type": "radio", "answer_options": { - "0": { + "2": { "value": "Assured" }, - "1": { + "4": { "value": "Assured Shorthold" }, - "2": { + "5": { "value": "Licence agreement (almshouses only)" }, - "3": { + "1": { "value": "Secure (including flexible)" }, - "4": { + "3": { "value": "Other" } }, From 49482aeb3428b8a7c1a8134e129736fb2f7ec519 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 13:23:39 +0100 Subject: [PATCH 11/22] updated key and options on letting_in_sheltered_accommodation --- config/forms/2021_2022.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 70ef33494..191d043c8 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1064,25 +1064,25 @@ "header": "", "description": "", "questions": { - "letting_in_sheltered_accommodation": { + "shelteredaccom": { "check_answer_label": "Is this letting in sheltered accommodation?", "header": "Is this letting in sheltered accommodation?", "hint_text": "", "type": "radio", "answer_options": { - "0": { + "1": { "value": "Yes – sheltered housing" }, - "1": { + "2": { "value": "Yes – extra care housing" }, - "2": { + "3": { "value": "No" }, "divider": { "value": true }, - "3": { + "4": { "value": "Don’t know" } } From f51a143ff2d1b9fa0877da8d88938df65b52fdf2 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 13:58:46 +0100 Subject: [PATCH 12/22] updated ethnic_group options --- config/forms/2021_2022.json | 46 ++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 191d043c8..15810563b 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1223,7 +1223,7 @@ "divider": { "value": true }, - "5": { + "17": { "value": "Tenant prefers not to say" } } @@ -1240,16 +1240,16 @@ "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "type": "radio", "answer_options": { - "0": { + "19": { "value": "Arab" }, - "1": { + "16": { "value": "Other ethnic group" } }, "conditional_for": { "ethnic_other": [ - 1 + 16 ] } }, @@ -1275,25 +1275,25 @@ "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "type": "radio", "answer_options": { - "0": { + "10": { "value": "Bangladeshi" }, - "1": { + "15": { "value": "Chinese" }, - "2": { + "8": { "value": "Indian" }, - "3": { + "9": { "value": "Pakistani" }, - "4": { + "11": { "value": "Other ethnic group" } }, "conditional_for": { "ethnic_other": [ - 4 + 11 ] } }, @@ -1319,13 +1319,13 @@ "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "type": "radio", "answer_options": { - "0": { + "13": { "value": "African" }, - "1": { + "12": { "value": "Caribbean" }, - "2": { + "14": { "value": "Any other Black, African or Caribbean background" } }, @@ -1357,19 +1357,22 @@ "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "type": "radio", "answer_options": { - "0": { + "4": { "value": "White and Black Caribbean" }, - "1": { + "5": { "value": "White and Black African" }, - "2": { + "6": { + "value": "White and Asian" + }, + "7": { "value": "Any other Mixed or Multiple ethnic background" } }, "conditional_for": { "ethnic_other": [ - 2 + 7 ] } }, @@ -1395,17 +1398,14 @@ "hint_text": "The lead tenant is the person in the household who does the most paid work. If several people do the same paid work, the lead tenant is whoever is the oldest.", "type": "radio", "answer_options": { - "0": { + "1": { "value": "English, Welsh, Northern Irish, Scottish or British" }, - "1": { + "2": { "value": "Irish" }, - "2": { + "18": { "value": "Gypsy or Irish Traveller" - }, - "3": { - "value": "Any other White background" } }, "conditional_for": { From 82f68774735ebdfb0db2bed9916840d0acca8c04 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 16:12:17 +0100 Subject: [PATCH 13/22] updated options for armed_forces and subsequent questions --- config/forms/2021_2022.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 15810563b..b95bf5e60 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -2987,22 +2987,22 @@ "type": "radio", "check_answer_label": "Household links to UK armed forces", "answer_options": { - "0": { + "1": { "value": "Yes – the person is a current or former regular" }, - "1": { + "4": { "value": "Yes – the person is a current or former reserve" }, - "2": { + "5": { "value": "Yes – the person is a spouse or civil partner of a UK armed forces member and has been bereaved or separated from them within the last 2 years" }, - "3": { + "2": { "value": "No" }, "divider": { "value": true }, - "4": { + "3": { "value": "Person prefers not to say" } } @@ -3014,7 +3014,7 @@ "description": "", "depends_on": [ { - "armedforces": 0 + "armedforces": 1 } ], "questions": { @@ -3048,10 +3048,10 @@ "description": "", "depends_on": [ { - "armedforces": 0 + "armedforces": 1 }, { - "armedforces": 1 + "armedforces": 4 } ], "questions": { From 1381bf6cc5388f4710be4b6046977aa83f83f5dc Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 16:17:14 +0100 Subject: [PATCH 14/22] updated options for pregnant --- config/forms/2021_2022.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index b95bf5e60..db991095b 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -3087,16 +3087,16 @@ "type": "radio", "check_answer_label": "Anybody in household pregnant", "answer_options": { - "0": { + "1": { "value": "Yes" }, - "1": { + "2": { "value": "No" }, "divider": { "value": true }, - "2": { + "3": { "value": "Tenant prefers not to say" } } From 5924e7af4eed7917e4f892689133747d55a238e0 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 16:21:45 +0100 Subject: [PATCH 15/22] updated options for health_conditions --- config/forms/2021_2022.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index db991095b..16e509965 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -3148,16 +3148,16 @@ "type": "radio", "check_answer_label": "Anybody in household with physical or mental health condition", "answer_options": { - "0": { + "1": { "value": "Yes" }, - "1": { + "2": { "value": "No" }, "divider": { "value": true }, - "2": { + "3": { "value": "Tenant prefers not to say" } } @@ -3169,7 +3169,7 @@ "description": "", "depends_on": [ { - "illness": 0 + "illness": 1 } ], "questions": { From ecfb8d6ebc20ebe03c5c2363b3f30b7ab5ad0833 Mon Sep 17 00:00:00 2001 From: roobottom Date: Mon, 11 Apr 2022 16:30:19 +0100 Subject: [PATCH 16/22] Updated show when for tenancy_length --- config/forms/2021_2022.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index 16e509965..cb4a6f7ac 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1020,7 +1020,7 @@ }, "conditional_for": { "tenancyother": [ - 4 + 3 ] } }, @@ -1053,10 +1053,10 @@ }, "depends_on": [ { - "tenancy": 3 + "tenancy": 1 }, { - "tenancy": 1 + "tenancy": 4 } ] }, From ee6d73ec8a986ee626bab322ea39eaa0368be948 Mon Sep 17 00:00:00 2001 From: roobottom Date: Tue, 12 Apr 2022 14:46:18 +0100 Subject: [PATCH 17/22] updated time_on_waiting_list --- config/forms/2021_2022.json | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index cb4a6f7ac..d5b5e3ab1 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -3279,37 +3279,37 @@ "header": "", "description": "", "questions": { - "lawaitlist": { + "waityear": { "check_answer_label": "Length of time on local authority waiting list", "header": "How long has the household been on the local authority waiting list for the new letting?", "hint_text": "", "type": "radio", "answer_options": { - "0": { + "1": { "value": "Just moved to local authority area" }, - "1": { + "2": { "value": "Less than 1 year" }, - "2": { + "7": { "value": "1 year but under 2 years" }, - "3": { + "8": { "value": "2 years but under 3 years" }, - "4": { + "9": { "value": "3 years but under 4 years" }, - "5": { + "10": { "value": "4 years but under 5 years" }, - "6": { + "5": { "value": "5 years or more" }, "divider": { "value": true }, - "7": { + "6": { "value": "Don’t know" } } From f81d5551d575f8a0d77f99d30a84d1a902aa0d1b Mon Sep 17 00:00:00 2001 From: roobottom Date: Wed, 13 Apr 2022 13:39:01 +0100 Subject: [PATCH 18/22] updated other option for reason_for_leaving_last_settled_home --- config/forms/2021_2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index d5b5e3ab1..bd7abef4d 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -3439,7 +3439,7 @@ }, "conditional_for": { "other_reason_for_leaving_last_settled_home": [ - 31 + 20 ] } }, From d3f6fa798ba0bcbd49cf5ea408428b3ccf9205f6 Mon Sep 17 00:00:00 2001 From: roobottom Date: Wed, 13 Apr 2022 13:56:58 +0100 Subject: [PATCH 19/22] updated income_amount --- config/forms/2021_2022.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index bd7abef4d..f6dddb559 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -4515,19 +4515,19 @@ { "label": "every week", "depends_on": { - "incfreq": 0 + "incfreq": 1 } }, { "label": "every month", "depends_on": { - "incfreq": 1 + "incfreq": 2 } }, { - "label": "every month", + "label": "every year", "depends_on": { - "incfreq": 2 + "incfreq": 3 } } ] @@ -4538,13 +4538,13 @@ "hint_text": "", "type": "radio", "answer_options": { - "0": { + "1": { "value": "Weekly" }, - "1": { + "2": { "value": "Monthly" }, - "2": { + "3": { "value": "Yearly" } }, From 26259e172fd1ddb67b8e72e5b7eb2a1c91f84402 Mon Sep 17 00:00:00 2001 From: roobottom Date: Wed, 13 Apr 2022 14:30:16 +0100 Subject: [PATCH 20/22] updated housing_benefit --- config/forms/2021_2022.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index f6dddb559..b85728ea7 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -4607,7 +4607,7 @@ "3": { "value": "Don’t know" }, - "6": { + "1000": { "value": "Tenant prefers not to say" } } From 4cd60bc8abdb7afc89c02d60e500a055b928ff3f Mon Sep 17 00:00:00 2001 From: roobottom Date: Wed, 13 Apr 2022 14:31:51 +0100 Subject: [PATCH 21/22] updated benefits_proportion --- config/forms/2021_2022.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index b85728ea7..f800dea3a 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -4624,19 +4624,19 @@ "hint_text": "This excludes child and housing benefit, council tax support and tax credits.", "type": "radio", "answer_options": { - "0": { + "1": { "value": "All" }, - "1": { + "2": { "value": "Some" }, - "2": { + "3": { "value": "None" }, "divider": { "value": true }, - "3": { + "4": { "value": "Don’t know" } } From 02832c99aa633bb9971476ce96b7c497894035aa Mon Sep 17 00:00:00 2001 From: roobottom Date: Thu, 14 Apr 2022 15:28:15 +0100 Subject: [PATCH 22/22] remove "prefer not to say" options --- config/forms/2021_2022.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index f800dea3a..3c3764ad4 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -3432,9 +3432,6 @@ }, "28": { "value": "Don’t know" - }, - "10000": { - "value": "Tenant prefers not to say" } }, "conditional_for": { @@ -4606,9 +4603,6 @@ }, "3": { "value": "Don’t know" - }, - "1000": { - "value": "Tenant prefers not to say" } } }