From f5931d0430e0372a5a116ba71ad28a238ee7dc8c Mon Sep 17 00:00:00 2001
From: Arthur Campbell <arfa.camble@gmail.com>
Date: Thu, 6 Apr 2023 10:43:46 +0100
Subject: [PATCH] update the 22_23 json form to use the new option as well

---
 config/forms/2022_2023.json | 201 +++++-------------------------------
 1 file changed, 25 insertions(+), 176 deletions(-)

diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index e13ce5516..9b5aa6bb8 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -7492,23 +7492,26 @@
                     "4": {
                       "value": "Every calendar month"
                     },
-                    "5": {
-                      "value": "Weekly for 50 weeks"
+                    "9": {
+                      "value": "Weekly for 46 weeks"
                     },
-                    "6": {
-                      "value": "Weekly for 49 weeks"
+                    "8": {
+                      "value": "Weekly for 47 weeks"
                     },
                     "7": {
                       "value": "Weekly for 48 weeks"
                     },
-                    "8": {
-                      "value": "Weekly for 47 weeks"
+                    "6": {
+                      "value": "Weekly for 49 weeks"
                     },
-                    "9": {
-                      "value": "Weekly for 46 weeks"
+                    "5": {
+                      "value": "Weekly for 50 weeks"
                     },
                     "1": {
                       "value": "Weekly for 52 weeks"
+                    },
+                    "10": {
+                      "value": "Weekly for 53 weeks"
                     }
                   }
                 }
@@ -7558,63 +7561,13 @@
               },
               "depends_on": [
                 {
-                  "period": 1,
-                  "needstype": 2,
+                  "rent_and_charges_paid_weekly?": true,
+                  "is_supported_housing?": true,
                   "household_charge": 0
                 },
                 {
-                  "period": 1,
-                  "needstype": 2,
-                  "household_charge": null
-                },
-                {
-                  "period": 5,
-                  "needstype": 2,
-                  "household_charge": 0
-                },
-                {
-                  "period": 5,
-                  "needstype": 2,
-                  "household_charge": null
-                },
-                {
-                  "period": 6,
-                  "needstype": 2,
-                  "household_charge": 0
-                },
-                {
-                  "period": 6,
-                  "needstype": 2,
-                  "household_charge": null
-                },
-                {
-                  "period": 7,
-                  "needstype": 2,
-                  "household_charge": 0
-                },
-                {
-                  "period": 7,
-                  "needstype": 2,
-                  "household_charge": null
-                },
-                {
-                  "period": 8,
-                  "needstype": 2,
-                  "household_charge": 0
-                },
-                {
-                  "period": 8,
-                  "needstype": 2,
-                  "household_charge": null
-                },
-                {
-                  "period": 9,
-                  "needstype": 2,
-                  "household_charge": 0
-                },
-                {
-                  "period": 9,
-                  "needstype": 2,
+                  "rent_and_charges_paid_weekly?": true,
+                  "is_supported_housing?": true,
                   "household_charge": null
                 }
               ]
@@ -7898,124 +7851,14 @@
               },
               "depends_on": [
                 {
-                  "period": 1,
-                  "household_charge": 0,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 1,
-                  "household_charge": null,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 5,
-                  "household_charge": 0,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 5,
-                  "household_charge": null,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 6,
-                  "household_charge": 0,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 6,
-                  "household_charge": null,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 7,
-                  "household_charge": 0,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 7,
-                  "household_charge": null,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 8,
+                  "rent_and_charges_paid_weekly?": true,
                   "household_charge": 0,
-                  "is_carehome": 0
+                  "is_carehome?": false
                 },
                 {
-                  "period": 8,
+                  "rent_and_charges_paid_weekly?": true,
                   "household_charge": null,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 9,
-                  "household_charge": 0,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 9,
-                  "household_charge": null,
-                  "is_carehome": 0
-                },
-                {
-                  "period": 1,
-                  "household_charge": 0,
-                  "is_carehome": null
-                },
-                {
-                  "period": 1,
-                  "household_charge": null,
-                  "is_carehome": null
-                },
-                {
-                  "period": 5,
-                  "household_charge": 0,
-                  "is_carehome": null
-                },
-                {
-                  "period": 5,
-                  "household_charge": null,
-                  "is_carehome": null
-                },
-                {
-                  "period": 6,
-                  "household_charge": 0,
-                  "is_carehome": null
-                },
-                {
-                  "period": 6,
-                  "household_charge": null,
-                  "is_carehome": null
-                },
-                {
-                  "period": 7,
-                  "household_charge": 0,
-                  "is_carehome": null
-                },
-                {
-                  "period": 7,
-                  "household_charge": null,
-                  "is_carehome": null
-                },
-                {
-                  "period": 8,
-                  "household_charge": 0,
-                  "is_carehome": null
-                },
-                {
-                  "period": 8,
-                  "household_charge": null,
-                  "is_carehome": null
-                },
-                {
-                  "period": 9,
-                  "household_charge": 0,
-                  "is_carehome": null
-                },
-                {
-                  "period": 9,
-                  "household_charge": null,
-                  "is_carehome": null
+                  "is_carehome?": false
                 }
               ]
             },
@@ -8602,6 +8445,12 @@
                       "depends_on": {
                         "period": 1
                       }
+                    },
+                    {
+                      "label": " every week for 53 weeks",
+                      "depends_on": {
+                        "period": 10
+                      }
                     }
                   ]
                 }