From ea64aa3533ca31d29b42d151c8121cf501251d50 Mon Sep 17 00:00:00 2001 From: baarkerlounger <5101747+baarkerlounger@users.noreply.github.com> Date: Mon, 13 Jun 2022 16:33:20 +0100 Subject: [PATCH] Revert "Refactor depends on (#649)" (#659) This reverts commit 16fce6f2bfcc0c1b5eb25de33b3dfb2d52acc383. --- app/models/form.rb | 19 +- config/forms/2021_2022.json | 3437 +++++++------------------- config/forms/2022_2023.json | 3680 +++++++--------------------- spec/fixtures/forms/2021_2022.json | 89 +- 4 files changed, 1884 insertions(+), 5341 deletions(-) diff --git a/app/models/form.rb b/app/models/form.rb index 7149612ba..7f48d7d4c 100644 --- a/app/models/form.rb +++ b/app/models/form.rb @@ -157,25 +157,16 @@ class Form depends_on.any? do |conditions_set| return false unless conditions_set - conditions_set.all? do |condition| - object, method, value = condition.values_at("object", "method", "value") - object_instance = case object - when "case_log" - case_log - when "user" - nil - end - + conditions_set.all? do |question, value| if value.is_a?(Hash) && value.key?("operator") operator = value["operator"] operand = value["operand"] - object_instance[method]&.send(operator, operand) + case_log[question]&.send(operator, operand) else - parts = method.split(".") - - object_instance_value = send_chain(parts, object_instance) + parts = question.split(".") + case_log_value = send_chain(parts, case_log) - value.nil? ? object_instance_value == value : !object_instance_value.nil? && object_instance_value == value + value.nil? ? case_log_value == value : !case_log_value.nil? && case_log_value == value end end end diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index a14ee5955..93879529e 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -516,13 +516,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "is_la_inferred", - "value": false - } - ] + { + "is_la_inferred": false + } ] }, "first_time_property_let_as_social_housing": { @@ -547,7 +543,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "renewal", "value": 0 }] + { + "renewal": 0 + } ] }, "property_let_type": { @@ -579,14 +577,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 0 - }, - { "object": "case_log", "method": "renewal", "value": 0 } - ] + { + "first_time_property_let_as_social_housing": 0, + "renewal": 0 + } ] }, "property_vacancy_reason_not_first_let": { @@ -637,14 +631,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 0 - }, - { "object": "case_log", "method": "renewal", "value": 0 } - ] + { + "first_time_property_let_as_social_housing": 0, + "renewal": 0 + } ] }, "property_vacancy_reason_first_let": { @@ -670,14 +660,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 1 - }, - { "object": "case_log", "method": "renewal", "value": 0 } - ] + { + "first_time_property_let_as_social_housing": 1, + "renewal": 0 + } ] }, "property_number_of_times_relet_not_social_let": { @@ -696,14 +682,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 0 - }, - { "object": "case_log", "method": "renewal", "value": 0 } - ] + { + "first_time_property_let_as_social_housing": 0, + "renewal": 0 + } ] }, "property_number_of_times_relet_social_let": { @@ -722,14 +704,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 1 - }, - { "object": "case_log", "method": "renewal", "value": 0 } - ] + { + "first_time_property_let_as_social_housing": 1, + "renewal": 0 + } ] }, "property_unit_type": { @@ -826,7 +804,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "needstype", "value": 1 }] + { + "needstype": 1 + } ] }, "void_or_renewal_date": { @@ -841,54 +821,54 @@ } }, "depends_on": [ - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 5 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 6 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 8 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 9 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 10 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 11 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 12 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 13 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 16 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 17 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 18 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 19 } - ] + { + "renewal": 0, + "rsnvac": 5 + }, + { + "renewal": 0, + "rsnvac": 6 + }, + { + "renewal": 0, + "rsnvac": 8 + }, + { + "renewal": 0, + "rsnvac": 9 + }, + { + "renewal": 0, + "rsnvac": 10 + }, + { + "renewal": 0, + "rsnvac": 11 + }, + { + "renewal": 0, + "rsnvac": 12 + }, + { + "renewal": 0, + "rsnvac": 13 + }, + { + "renewal": 0, + "rsnvac": 16 + }, + { + "renewal": 0, + "rsnvac": 17 + }, + { + "renewal": 0, + "rsnvac": 18 + }, + { + "renewal": 0, + "rsnvac": 19 + } ] }, "new_build_handover_date": { @@ -903,10 +883,10 @@ } }, "depends_on": [ - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 15 } - ] + { + "renewal": 0, + "rsnvac": 15 + } ] }, "property_major_repairs": { @@ -938,54 +918,54 @@ } }, "depends_on": [ - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 5 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 6 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 8 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 9 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 10 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 11 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 12 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 13 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 16 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 17 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 18 } - ], - [ - { "object": "case_log", "method": "renewal", "value": 0 }, - { "object": "case_log", "method": "rsnvac", "value": 19 } - ] + { + "renewal": 0, + "rsnvac": 5 + }, + { + "renewal": 0, + "rsnvac": 6 + }, + { + "renewal": 0, + "rsnvac": 8 + }, + { + "renewal": 0, + "rsnvac": 9 + }, + { + "renewal": 0, + "rsnvac": 10 + }, + { + "renewal": 0, + "rsnvac": 11 + }, + { + "renewal": 0, + "rsnvac": 12 + }, + { + "renewal": 0, + "rsnvac": 13 + }, + { + "renewal": 0, + "rsnvac": 16 + }, + { + "renewal": 0, + "rsnvac": 17 + }, + { + "renewal": 0, + "rsnvac": 18 + }, + { + "renewal": 0, + "rsnvac": 19 + } ] } } @@ -1055,13 +1035,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "startertenancy", - "value": 2 - } - ] + { + "startertenancy": 2 + } ] }, "starter_tenancy_type": { @@ -1101,13 +1077,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "startertenancy", - "value": 1 - } - ] + { + "startertenancy": 1 + } ] }, "tenancy_length": { @@ -1126,8 +1098,12 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "tenancy", "value": 1 }], - [{ "object": "case_log", "method": "tenancy", "value": 4 }] + { + "tenancy": 1 + }, + { + "tenancy": 4 + } ] }, "shelteredaccom": { @@ -1159,7 +1135,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "needstype", "value": 2 }] + { + "needstype": 2 + } ] } } @@ -1211,15 +1189,7 @@ } }, "no_females_pregnant_household_lead_hhmemb_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -1259,13 +1229,9 @@ }, "females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -1324,22 +1290,7 @@ "age1": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age1_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age1_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age1_known": 0 }, { "age1_known": 1 }] } }, "age1": { @@ -1360,15 +1311,7 @@ } }, "no_females_pregnant_household_lead_age_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -1408,13 +1351,9 @@ }, "females_in_soft_age_range_in_pregnant_household_lead_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -1483,15 +1422,7 @@ } }, "no_females_pregnant_household_lead_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -1531,13 +1462,9 @@ }, "females_in_soft_age_range_in_pregnant_household_lead_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -1631,7 +1558,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "ethnic_group", "value": 4 }] + { + "ethnic_group": 4 + } ] }, "lead_tenant_ethnic_background_asian": { @@ -1663,7 +1592,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "ethnic_group", "value": 2 }] + { + "ethnic_group": 2 + } ] }, "lead_tenant_ethnic_background_black": { @@ -1689,7 +1620,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "ethnic_group", "value": 3 }] + { + "ethnic_group": 3 + } ] }, "lead_tenant_ethnic_background_mixed": { @@ -1718,7 +1651,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "ethnic_group", "value": 1 }] + { + "ethnic_group": 1 + } ] }, "lead_tenant_ethnic_background_white": { @@ -1747,7 +1682,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "ethnic_group", "value": 0 }] + { + "ethnic_group": 0 + } ] }, "lead_tenant_nationality": { @@ -1864,15 +1801,7 @@ } }, "lead_tenant_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_1_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_1_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -1917,13 +1846,7 @@ }, "lead_tenant_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_1_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_1_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -1987,13 +1910,27 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 2 }], - [{ "object": "case_log", "method": "hhmemb", "value": 3 }], - [{ "object": "case_log", "method": "hhmemb", "value": 4 }], - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 2 + }, + { + "hhmemb": 3 + }, + { + "hhmemb": 4 + }, + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_2_relationship_to_lead": { @@ -2026,13 +1963,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "details_known_2": 0 + } ] }, "person_2_age": { @@ -2055,22 +1988,7 @@ "age2": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age2_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age2_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age2_known": 0 }, { "age2_known": 1 }] } }, "age2": { @@ -2090,25 +2008,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "details_known_2": 0 + } ] }, "no_females_pregnant_household_person_2_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { "object": "case_log", "method": "age2_known", "value": 0 } - ] + { "no_females_in_a_pregnant_household?": true, "age2_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2149,14 +2056,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_2_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { "object": "case_log", "method": "age2_known", "value": 0 } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age2_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2224,29 +2127,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "details_known_2": 0 + } ] }, "no_females_pregnant_household_person_2_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_2": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2287,18 +2178,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_2_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_2": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2374,18 +2257,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age2_known?", - "value": 1 - }, - { - "object": "case_log", - "method": "age2", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age2_known": 1 }, + { "age2": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -2401,38 +2274,18 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - }, - { - "object": "case_log", - "method": "age2", - "value": { "operator": ">", "operand": 15 } - } - ], - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - }, - { "object": "case_log", "method": "age2", "value": null } - ] + { + "details_known_2": 0, + "age2": { "operator": ">", "operand": 15 } + }, + { + "details_known_2": 0, + "age2": null + } ] }, "person_2_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_2_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_2_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -2477,13 +2330,7 @@ }, "person_2_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_2_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_2_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -2547,12 +2394,24 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 3 }], - [{ "object": "case_log", "method": "hhmemb", "value": 4 }], - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 3 + }, + { + "hhmemb": 4 + }, + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_3_relationship_to_lead": { @@ -2585,13 +2444,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0 + } ] }, "person_3_age": { @@ -2614,22 +2469,7 @@ "age3": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age3_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age3_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age3_known": 0 }, { "age3_known": 1 }] } }, "age3": { @@ -2649,29 +2489,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0 + } ] }, "no_females_pregnant_household_person_3_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age3_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age3_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2712,18 +2537,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_3_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age3_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age3_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2791,29 +2608,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0 + } ] }, "no_females_pregnant_household_person_3_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_3": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2854,18 +2659,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_3_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_3": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2941,18 +2738,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age3_known", - "value": 1 - }, - { - "object": "case_log", - "method": "age3", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age3_known": 1 }, + { "age3": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -2968,42 +2755,18 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "age3", - "value": { "operator": ">", "operand": 15 } - }, - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age3", - "value": null - }, - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0, + "age3": { "operator": ">", "operand": 15 } + }, + { + "details_known_3": 0, + "age3": null + } ] }, "person_3_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_3_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_3_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -3048,13 +2811,7 @@ }, "person_3_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_3_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_3_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -3118,11 +2875,21 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 4 }], - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 4 + }, + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_4_relationship_to_lead": { @@ -3155,13 +2922,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "details_known_4": 0 + } ] }, "person_4_age": { @@ -3184,26 +2947,7 @@ "age4": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - [ - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ] - ], - [ - [ - { - "object": "case_log", - "method": "age4_known", - "value": 1 - } - ] - ] - ] + "depends_on": [{ "age4_known": 0 }, { "age4_known": 1 }] } }, "age4": { @@ -3223,29 +2967,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "details_known_4": 0 + } ] }, "no_females_pregnant_household_person_4_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age4_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3286,18 +3015,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_4_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age4_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3365,29 +3086,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "details_known_4": 0 + } ] }, "no_females_pregnant_household_person_4_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_4": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3428,18 +3137,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_4_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_4": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3515,18 +3216,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age4_known", - "value": 1 - }, - { - "object": "case_log", - "method": "age4", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age4_known": 1 }, + { "age4": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -3542,42 +3233,18 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - }, - { - "object": "case_log", - "method": "age4", - "value": { "operator": ">", "operand": 15 } - } - ], - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - }, - { - "object": "case_log", - "method": "age4", - "value": null - } - ] + { + "details_known_4": 0, + "age4": { "operator": ">", "operand": 15 } + }, + { + "details_known_4": 0, + "age4": null + } ] }, "person_4_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_4_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_4_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -3622,13 +3289,7 @@ }, "person_4_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_4_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_4_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -3692,10 +3353,18 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_5_relationship_to_lead": { @@ -3728,13 +3397,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "details_known_5": 0 + } ] }, "person_5_age": { @@ -3757,22 +3422,7 @@ "age5": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age5_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age5_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age5_known": 0 }, { "age5_known": 1 }] } }, "age5": { @@ -3792,25 +3442,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "details_known_5": 0 + } ] }, "no_females_pregnant_household_person_5_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": 0 - }, - { "object": "case_log", "method": "age5_known", "value": 0 } - ] + { "no_females_in_a_pregnant_household?": true, "age5_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3851,18 +3490,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_5_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age5_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age5_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3930,29 +3561,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "details_known_5": 0 + } ] }, "no_females_pregnant_household_person_5_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age5_known", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_5": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3993,18 +3612,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_5_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_5": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4080,18 +3691,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age5_known", - "value": 1 - }, - { - "object": "case_log", - "method": "age5", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age5_known": 1 }, + { "age5": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -4107,42 +3708,18 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - }, - { - "object": "case_log", - "method": "age5", - "value": { "operator": ">", "operand": 15 } - } - ], - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - }, - { - "object": "case_log", - "method": "age5", - "value": null - } - ] + { + "details_known_5": 0, + "age5": { "operator": ">", "operand": 15 } + }, + { + "details_known_5": 0, + "age5": null + } ] }, "person_5_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_5_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_5_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -4187,13 +3764,7 @@ }, "person_5_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_5_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_5_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -4257,9 +3828,15 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_6_relationship_to_lead": { @@ -4292,13 +3869,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "details_known_6": 0 + } ] }, "person_6_age": { @@ -4321,20 +3894,7 @@ "age6": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age6_known", - "value": 0 - }, - { - "object": "case_log", - "method": "age6_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age6_known": 0 }, { "age6_known": 1 }] } }, "age6": { @@ -4354,25 +3914,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "details_known_6": 0 + } ] }, "no_females_pregnant_household_person_6_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": 0 - }, - { "object": "case_log", "method": "age6_known", "value": 0 } - ] + { "no_females_in_a_pregnant_household?": true, "age6_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4413,18 +3962,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_6_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age6_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age6_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4492,29 +4033,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "details_known_6": 0 + } ] }, "no_females_pregnant_household_person_6_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age6_known", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_6": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4555,18 +4084,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_6_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_6": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4642,20 +4163,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age6_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age6", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age6_known": 1 }, + { "age6": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -4671,42 +4180,18 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - }, - { - "object": "case_log", - "method": "age6", - "value": { "operator": ">", "operand": 15 } - } - ], - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - }, - { - "object": "case_log", - "method": "age6", - "value": null - } - ] + { + "details_known_6": 0, + "age6": { "operator": ">", "operand": 15 } + }, + { + "details_known_6": 0, + "age6": null + } ] }, "person_6_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_6_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_6_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -4751,13 +4236,7 @@ }, "person_6_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_6_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_6_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -4821,8 +4300,12 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_7_relationship_to_lead": { @@ -4855,13 +4338,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "details_known_7": 0 + } ] }, "person_7_age": { @@ -4884,22 +4363,7 @@ "age7": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age7_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age7_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age7_known": 0 }, { "age7_known": 1 }] } }, "age7": { @@ -4919,25 +4383,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "details_known_7": 0 + } ] }, "no_females_pregnant_household_person_7_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": 0 - }, - { "object": "case_log", "method": "age7_known", "value": 0 } - ] + { "no_females_in_a_pregnant_household?": true, "age7_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4978,18 +4431,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_7_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age7_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age7_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5057,29 +4502,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "details_known_7": 0 + } ] }, "no_females_pregnant_household_person_7_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age7_known", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_7": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5120,18 +4553,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_7_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_7": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5207,20 +4632,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age7_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age7", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age7_known": 1 }, + { "age7": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -5236,42 +4649,18 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - }, - { - "object": "case_log", - "method": "age7", - "value": { "operator": ">", "operand": 15 } - } - ], - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - }, - { - "object": "case_log", - "method": "age7", - "value": null - } - ] + { + "details_known_7": 0, + "age7": { "operator": ">", "operand": 15 } + }, + { + "details_known_7": 0, + "age7": null + } ] }, "person_7_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_7_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_7_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -5316,13 +4705,7 @@ }, "person_7_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_7_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_7_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -5386,7 +4769,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 8 + } ] }, "person_8_relationship_to_lead": { @@ -5419,13 +4804,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "details_known_8": 0 + } ] }, "person_8_age": { @@ -5448,22 +4829,7 @@ "age8": [0] }, "hidden_in_check_answers": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "age8_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age8_known", - "value": 1 - } - ] - ] + "depends_on": [{ "age8_known": 0 }, { "age8_known": 1 }] } }, "age8": { @@ -5483,25 +4849,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "details_known_8": 0 + } ] }, "no_females_pregnant_household_person_8_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": 0 - }, - { "object": "case_log", "method": "age8_known", "value": 0 } - ] + { "no_females_in_a_pregnant_household?": true, "age8_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5542,18 +4897,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_8_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age8_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age8_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5621,29 +4968,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "details_known_8": 0 + } ] }, "no_females_pregnant_household_person_8_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age8_known", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_8": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5684,18 +5019,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_8_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_8": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5771,20 +5098,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age8_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age8", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age8_known": 1 }, + { "age8": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -5800,45 +5115,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - }, - { - "object": "case_log", - "method": "age8", - "value": { "operator": ">", "operand": 15 } - } - ], - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - }, - { - "object": "case_log", - "method": "age8", - "value": null - } - ] - ] - }, - "person_8_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_8_retired_under_soft_min_age?", - "value": true - } - ] - ], - "title_text": { - "translation": "soft_validations.retirement.min.title", - "arguments": [ + { + "details_known_8": 0, + "age8": { "operator": ">", "operand": 15 } + }, + { + "details_known_8": 0, + "age8": null + } + ] + }, + "person_8_under_retirement_value_check": { + "depends_on": [{ "person_8_retired_under_soft_min_age?": true }], + "title_text": { + "translation": "soft_validations.retirement.min.title", + "arguments": [ { "key": "retirement_age_for_person_8", "label": false, @@ -5880,13 +5171,7 @@ }, "person_8_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_8_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_8_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -5976,13 +5261,9 @@ "header": "", "description": "", "depends_on": [ - [ - { - "object": "case_log", - "method": "armedforces", - "value": 1 - } - ] + { + "armedforces": 1 + } ], "questions": { "leftreg": { @@ -6014,20 +5295,12 @@ "header": "", "description": "", "depends_on": [ - [ - { - "object": "case_log", - "method": "armedforces", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "armedforces", - "value": 4 - } - ] + { + "armedforces": 1 + }, + { + "armedforces": 4 + } ], "questions": { "reservist": { @@ -6079,15 +5352,7 @@ } }, "no_females_pregnant_household_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -6127,13 +5392,9 @@ }, "females_in_soft_age_range_in_pregnant_household_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -6237,13 +5498,9 @@ "header": "", "description": "", "depends_on": [ - [ - { - "object": "case_log", - "method": "illness", - "value": 1 - } - ] + { + "illness": 1 + } ], "questions": { "condition_effects": { @@ -6387,13 +5644,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "reason_for_leaving_last_settled_home": { @@ -6520,13 +5773,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "reason_for_leaving_last_settled_home_renewal": { @@ -6549,13 +5798,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 1 - } - ] + { + "renewal": 1 + } ] }, "previous_housing_situation": { @@ -6641,13 +5886,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "previous_housing_situation_renewal": { @@ -6670,18 +5911,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 1 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - } - ] + { + "renewal": 1, + "needstype": 2 + } ] }, "under_occupation_benefit_cap": { @@ -6716,13 +5949,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "homelessness": { @@ -6748,13 +5977,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "previous_postcode": { @@ -6778,20 +6003,8 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "previous_postcode_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "previous_postcode_known", - "value": 0 - } - ] + { "previous_postcode_known": 0 }, + { "previous_postcode_known": 1 } ] } }, @@ -6826,20 +6039,8 @@ "type": "radio", "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "previous_la_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "previous_la_known", - "value": 0 - } - ] + { "previous_la_known": 0 }, + { "previous_la_known": 1 } ] }, "answer_options": { @@ -7254,13 +6455,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "is_previous_la_inferred", - "value": false - } - ] + { + "is_previous_la_inferred": false + } ] }, "reasonable_preference": { @@ -7321,13 +6518,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "reasonpref", - "value": 1 - } - ] + { + "reasonpref": 1 + } ] }, "allocation_system": { @@ -7406,23 +6599,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "LA" - }, - { - "object": "case_log", - "method": "needstype", - "value": 1 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "LA", + "needstype": 1, + "renewal": 0 + } ] }, "referral_prp": { @@ -7475,23 +6656,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "PRP" - }, - { - "object": "case_log", - "method": "needstype", - "value": 1 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "PRP", + "needstype": 1, + "renewal": 0 + } ] }, "referral_supported_housing": { @@ -7544,23 +6713,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "LA" - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "LA", + "needstype": 2, + "renewal": 0 + } ] }, "referral_supported_housing_prp": { @@ -7616,23 +6773,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "PRP" - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "PRP", + "needstype": 2, + "renewal": 0 + } ] } } @@ -7679,13 +6824,9 @@ }, "income_amount": { "depends_on": [ - [ - { - "object": "case_log", - "method": "net_income_known", - "value": 0 - } - ] + { + "net_income_known": 0 + } ], "header": "Total household income", "description": "", @@ -7742,18 +6883,8 @@ } }, "net_income_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "net_income_soft_validation_triggered?", - "value": true - } - ] - ], - "title_text": { - "translation": "soft_validations.net_income.title_text" - }, + "depends_on": [{ "net_income_soft_validation_triggered?": true }], + "title_text": { "translation": "soft_validations.net_income.title_text" }, "informative_text": { "translation": "soft_validations.net_income.hint_text", "arguments": [ @@ -7870,7 +7001,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "needstype", "value": 2 }] + { + "needstype": 2 + } ] }, "rent_period": { @@ -7914,20 +7047,12 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "household_charge": 0 + }, + { + "household_charge": null + } ] }, "care_home_weekly": { @@ -7963,210 +7088,66 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 1, + "needstype": 2, + "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, + "household_charge": null + } ] }, "care_home_bi_weekly": { @@ -8202,40 +7183,16 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 2, + "needstype": 2, + "household_charge": 0 + }, + { + "period": 2, + "needstype": 2, + "household_charge": null + } ] }, "care_home_4_weekly": { @@ -8271,40 +7228,16 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 3, + "needstype": 2, + "household_charge": 0 + }, + { + "period": 3, + "needstype": 2, + "household_charge": null + } ] }, "care_home_monthly": { @@ -8340,40 +7273,16 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 4, + "needstype": 2, + "household_charge": 0 + }, + { + "period": 4, + "needstype": 2, + "household_charge": null + } ] }, "rent_weekly": { @@ -8452,414 +7361,126 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "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, + "household_charge": 0, + "is_carehome": 0 + }, + { + "period": 8, + "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 + } ] }, "rent_bi_weekly": { @@ -8938,78 +7559,26 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "household_charge": 0, + "period": 2, + "is_carehome": 0 + }, + { + "household_charge": null, + "period": 2, + "is_carehome": 0 + }, + { + "household_charge": 0, + "period": 2, + "is_carehome": null + }, + { + "household_charge": null, + "period": 2, + "is_carehome": null + } ] }, "rent_4_weekly": { @@ -9088,78 +7657,26 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "household_charge": 0, + "period": 3, + "is_carehome": 0 + }, + { + "household_charge": null, + "period": 3, + "is_carehome": 0 + }, + { + "household_charge": 0, + "period": 3, + "is_carehome": null + }, + { + "household_charge": null, + "period": 3, + "is_carehome": null + } ] }, "rent_monthly": { @@ -9238,90 +7755,30 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "household_charge": 0, + "period": 4, + "is_carehome": 0 + }, + { + "household_charge": null, + "period": 4, + "is_carehome": 0 + }, + { + "household_charge": 0, + "period": 4, + "is_carehome": null + }, + { + "household_charge": null, + "period": 4, + "is_carehome": null + } ] }, "min_rent_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "rent_in_soft_min_range?", - "value": true - } - ] - ], + "depends_on": [{ "rent_in_soft_min_range?": true }], "title_text": { "translation": "soft_validations.rent.min.title_text", "arguments": [ @@ -9365,15 +7822,7 @@ } }, "max_rent_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "rent_in_soft_max_range?", - "value": true - } - ] - ], + "depends_on": [{ "rent_in_soft_max_range?": true }], "title_text": { "translation": "soft_validations.rent.max.title_text", "arguments": [ @@ -9439,78 +7888,30 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "hb", - "value": 1 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 1 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 6 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 6 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 8 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 8 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "hb": 1, + "household_charge": 0 + }, + { + "hb": 1, + "household_charge": null + }, + { + "hb": 6, + "household_charge": 0 + }, + { + "hb": 6, + "household_charge": null + }, + { + "hb": 8, + "household_charge": 0 + }, + { + "hb": 8, + "household_charge": null + } ] }, "outstanding_amount_known": { @@ -9553,54 +7954,22 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "hb", - "value": 1 - }, - { - "object": "case_log", - "method": "hbrentshortfall", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 6 - }, - { - "object": "case_log", - "method": "hbrentshortfall", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 7 - }, - { - "object": "case_log", - "method": "hbrentshortfall", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 8 - }, - { - "object": "case_log", - "method": "hbrentshortfall", - "value": 1 - } - ] + { + "hb": 1, + "hbrentshortfall": 1 + }, + { + "hb": 6, + "hbrentshortfall": 1 + }, + { + "hb": 7, + "hbrentshortfall": 1 + }, + { + "hb": 8, + "hbrentshortfall": 1 + } ] } } diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index 1eb9694d5..ce32663f0 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -516,13 +516,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "is_la_inferred", - "value": false - } - ] + { + "is_la_inferred": false + } ] }, "first_time_property_let_as_social_housing": { @@ -547,13 +543,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "property_let_type": { @@ -585,18 +577,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 0 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "first_time_property_let_as_social_housing": 0, + "renewal": 0 + } ] }, "property_vacancy_reason_not_first_let": { @@ -647,18 +631,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 0 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "first_time_property_let_as_social_housing": 0, + "renewal": 0 + } ] }, "property_vacancy_reason_first_let": { @@ -684,18 +660,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 1 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "first_time_property_let_as_social_housing": 1, + "renewal": 0 + } ] }, "property_number_of_times_relet_not_social_let": { @@ -714,18 +682,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 0 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "first_time_property_let_as_social_housing": 0, + "renewal": 0 + } ] }, "property_number_of_times_relet_social_let": { @@ -744,18 +704,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "first_time_property_let_as_social_housing", - "value": 1 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "first_time_property_let_as_social_housing": 1, + "renewal": 0 + } ] }, "property_unit_type": { @@ -852,13 +804,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "needstype", - "value": 1 - } - ] + { + "needstype": 1 + } ] }, "void_or_renewal_date": { @@ -873,150 +821,54 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 5 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 6 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 8 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 9 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 10 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 11 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 12 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 13 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 16 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 17 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 18 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 19 - } - ] + { + "renewal": 0, + "rsnvac": 5 + }, + { + "renewal": 0, + "rsnvac": 6 + }, + { + "renewal": 0, + "rsnvac": 8 + }, + { + "renewal": 0, + "rsnvac": 9 + }, + { + "renewal": 0, + "rsnvac": 10 + }, + { + "renewal": 0, + "rsnvac": 11 + }, + { + "renewal": 0, + "rsnvac": 12 + }, + { + "renewal": 0, + "rsnvac": 13 + }, + { + "renewal": 0, + "rsnvac": 16 + }, + { + "renewal": 0, + "rsnvac": 17 + }, + { + "renewal": 0, + "rsnvac": 18 + }, + { + "renewal": 0, + "rsnvac": 19 + } ] }, "new_build_handover_date": { @@ -1031,18 +883,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 15 - } - ] + { + "renewal": 0, + "rsnvac": 15 + } ] }, "property_major_repairs": { @@ -1074,150 +918,54 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 5 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 6 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 8 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 9 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 10 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 11 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 12 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 13 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 16 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 17 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 18 - } - ], - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - }, - { - "object": "case_log", - "method": "rsnvac", - "value": 19 - } - ] + { + "renewal": 0, + "rsnvac": 5 + }, + { + "renewal": 0, + "rsnvac": 6 + }, + { + "renewal": 0, + "rsnvac": 8 + }, + { + "renewal": 0, + "rsnvac": 9 + }, + { + "renewal": 0, + "rsnvac": 10 + }, + { + "renewal": 0, + "rsnvac": 11 + }, + { + "renewal": 0, + "rsnvac": 12 + }, + { + "renewal": 0, + "rsnvac": 13 + }, + { + "renewal": 0, + "rsnvac": 16 + }, + { + "renewal": 0, + "rsnvac": 17 + }, + { + "renewal": 0, + "rsnvac": 18 + }, + { + "renewal": 0, + "rsnvac": 19 + } ] } } @@ -1316,13 +1064,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "startertenancy", - "value": 2 - } - ] + { + "startertenancy": 2 + } ] }, "starter_tenancy_type": { @@ -1365,13 +1109,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "startertenancy", - "value": 1 - } - ] + { + "startertenancy": 1 + } ] }, "tenancy_length": { @@ -1390,27 +1130,15 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "tenancy", - "value": 4 - } - ], - [ - { - "object": "case_log", - "method": "tenancy", - "value": 6 - } - ], - [ - { - "object": "case_log", - "method": "tenancy", - "value": 3 - } - ] + { + "tenancy": 4 + }, + { + "tenancy": 6 + }, + { + "tenancy": 3 + } ] }, "shelteredaccom": { @@ -1442,13 +1170,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "needstype", - "value": 2 - } - ] + { + "needstype": 2 + } ] } } @@ -1500,15 +1224,7 @@ } }, "no_females_pregnant_household_lead_hhmemb_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -1548,13 +1264,9 @@ }, "females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -1614,20 +1326,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age1_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age1_known", - "value": 1 - } - ] + { + "age1_known": 0 + }, + { + "age1_known": 1 + } ] } }, @@ -1649,15 +1353,7 @@ } }, "no_females_pregnant_household_lead_age_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -1697,13 +1393,9 @@ }, "females_in_soft_age_range_in_pregnant_household_lead_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -1772,15 +1464,7 @@ } }, "no_females_pregnant_household_lead_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -1820,13 +1504,9 @@ }, "females_in_soft_age_range_in_pregnant_household_lead_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -1920,13 +1600,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "ethnic_group", - "value": 4 - } - ] + { + "ethnic_group": 4 + } ] }, "lead_tenant_ethnic_background_asian": { @@ -1958,13 +1634,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "ethnic_group", - "value": 2 - } - ] + { + "ethnic_group": 2 + } ] }, "lead_tenant_ethnic_background_black": { @@ -1990,13 +1662,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "ethnic_group", - "value": 3 - } - ] + { + "ethnic_group": 3 + } ] }, "lead_tenant_ethnic_background_mixed": { @@ -2025,13 +1693,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "ethnic_group", - "value": 1 - } - ] + { + "ethnic_group": 1 + } ] }, "lead_tenant_ethnic_background_white": { @@ -2060,13 +1724,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "ethnic_group", - "value": 0 - } - ] + { + "ethnic_group": 0 + } ] }, "lead_tenant_nationality": { @@ -2147,15 +1807,7 @@ } }, "lead_tenant_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_1_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_1_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -2200,13 +1852,7 @@ }, "lead_tenant_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_1_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_1_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -2270,13 +1916,27 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 2 }], - [{ "object": "case_log", "method": "hhmemb", "value": 3 }], - [{ "object": "case_log", "method": "hhmemb", "value": 4 }], - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 2 + }, + { + "hhmemb": 3 + }, + { + "hhmemb": 4 + }, + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_2_relationship_to_lead": { @@ -2309,13 +1969,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "details_known_2": 0 + } ] }, "person_2_age": { @@ -2339,20 +1995,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age2_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age2_known", - "value": 1 - } - ] + { + "age2_known": 0 + }, + { + "age2_known": 1 + } ] } }, @@ -2373,29 +2021,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "details_known_2": 0 + } ] }, "no_females_pregnant_household_person_2_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age2_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age2_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2436,18 +2069,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_2_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age2_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age2_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2515,29 +2140,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "details_known_2": 0 + } ] }, "no_females_pregnant_household_person_2_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_2": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2578,18 +2191,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_2_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_2": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -2665,20 +2270,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age2_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age2", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age2_known": 1 }, + { "age2": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -2694,42 +2287,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - }, - { - "object": "case_log", - "method": "age2", - "value": { "operator": ">", "operand": 15 } + { + "details_known_2": 0, + "age2": { + "operator": ">", + "operand": 15 } - ], - [ - { - "object": "case_log", - "method": "details_known_2", - "value": 0 - }, - { - "object": "case_log", - "method": "age2", - "value": null - } - ] + }, + { + "details_known_2": 0, + "age2": null + } ] }, "person_2_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_2_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_2_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -2774,13 +2346,7 @@ }, "person_2_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_2_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_2_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -2844,12 +2410,24 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 3 }], - [{ "object": "case_log", "method": "hhmemb", "value": 4 }], - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 3 + }, + { + "hhmemb": 4 + }, + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_3_relationship_to_lead": { @@ -2882,13 +2460,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0 + } ] }, "person_3_age": { @@ -2912,20 +2486,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age3_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age3_known", - "value": 1 - } - ] + { + "age3_known": 0 + }, + { + "age3_known": 1 + } ] } }, @@ -2946,29 +2512,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0 + } ] }, "no_females_pregnant_household_person_3_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age3_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age3_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3009,18 +2560,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_3_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age3_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age3_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3088,29 +2631,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "details_known_3": 0 + } ] }, "no_females_pregnant_household_person_3_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_3": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3151,18 +2682,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_3_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_3": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3238,20 +2761,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age3_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age3", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age3_known": 1 }, + { "age3": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -3267,45 +2778,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - }, - { - "object": "case_log", - "method": "age3", - "value": { - "operator": ">", - "operand": 15 - } - } - ], - [ - { - "object": "case_log", - "method": "details_known_3", - "value": 0 - }, - { - "object": "case_log", - "method": "age3", - "value": null + { + "details_known_3": 0, + "age3": { + "operator": ">", + "operand": 15 } - ] + }, + { + "details_known_3": 0, + "age3": null + } ] }, "person_3_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_3_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_3_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -3350,13 +2837,7 @@ }, "person_3_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_3_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_3_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -3420,11 +2901,21 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 4 }], - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 4 + }, + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_4_relationship_to_lead": { @@ -3457,13 +2948,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "details_known_4": 0 + } ] }, "person_4_age": { @@ -3487,20 +2974,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age4_known", - "value": 1 - } - ] + { + "age4_known": 0 + }, + { + "age4_known": 1 + } ] } }, @@ -3521,29 +3000,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "details_known_4": 0 + } ] }, "no_females_pregnant_household_person_4_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age4_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3584,18 +3048,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_4_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age4_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age4_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3663,29 +3119,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "details_known_4": 0 + } ] }, "no_females_pregnant_household_person_4_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_4": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3726,18 +3170,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_4_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_4": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -3813,20 +3249,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age4_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age4", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age4_known": 1 }, + { "age4": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -3842,45 +3266,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - }, - { - "object": "case_log", - "method": "age4", - "value": { - "operator": ">", - "operand": 15 - } - } - ], - [ - { - "object": "case_log", - "method": "details_known_4", - "value": 0 - }, - { - "object": "case_log", - "method": "age4", - "value": null + { + "details_known_4": 0, + "age4": { + "operator": ">", + "operand": 15 } - ] + }, + { + "details_known_4": 0, + "age4": null + } ] }, "person_4_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_4_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_4_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -3925,13 +3325,7 @@ }, "person_4_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_4_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_4_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -3995,10 +3389,18 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 5 }], - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 5 + }, + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_5_relationship_to_lead": { @@ -4031,13 +3433,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "details_known_5": 0 + } ] }, "person_5_age": { @@ -4061,20 +3459,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age5_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age5_known", - "value": 1 - } - ] + { + "age5_known": 0 + }, + { + "age5_known": 1 + } ] } }, @@ -4095,29 +3485,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 1 - } - ] + { + "details_known_5": 0 + } ] }, "no_females_pregnant_household_person_5_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age5_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age5_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4158,18 +3533,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_5_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age5_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age5_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4237,29 +3604,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "details_known_5": 0 + } ] }, "no_females_pregnant_household_person_5_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_5": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4300,18 +3655,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_5_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_5": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4387,20 +3734,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age5_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age5", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age5_known": 1 }, + { "age5": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -4416,45 +3751,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - }, - { - "object": "case_log", - "method": "age5", - "value": { - "operator": ">", - "operand": 15 - } - } - ], - [ - { - "object": "case_log", - "method": "details_known_5", - "value": 0 - }, - { - "object": "case_log", - "method": "age5", - "value": null + { + "details_known_5": 0, + "age5": { + "operator": ">", + "operand": 15 } - ] + }, + { + "details_known_5": 0, + "age5": null + } ] }, "person_5_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_5_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_5_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -4499,13 +3810,7 @@ }, "person_5_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_5_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_5_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -4569,9 +3874,15 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 6 }], - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 6 + }, + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_6_relationship_to_lead": { @@ -4604,13 +3915,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "details_known_6": 0 + } ] }, "person_6_age": { @@ -4634,20 +3941,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age6_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age6_known", - "value": 1 - } - ] + { + "age6_known": 0 + }, + { + "age6_known": 1 + } ] } }, @@ -4668,29 +3967,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "details_known_6": 0 + } ] }, "no_females_pregnant_household_person_6_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age6_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age6_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4731,18 +4015,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_6_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age6_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age6_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4810,29 +4086,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "details_known_6": 0 + } ] }, "no_females_pregnant_household_person_6_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_6": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4873,18 +4137,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_6_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_6": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -4960,20 +4216,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age6_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age6", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age6_known": 1 }, + { "age6": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -4989,45 +4233,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - }, - { - "object": "case_log", - "method": "age6", - "value": { - "operator": ">", - "operand": 15 - } - } - ], - [ - { - "object": "case_log", - "method": "details_known_6", - "value": 0 - }, - { - "object": "case_log", - "method": "age6", - "value": null + { + "details_known_6": 0, + "age6": { + "operator": ">", + "operand": 15 } - ] + }, + { + "details_known_6": 0, + "age6": null + } ] }, "person_6_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_6_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_6_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -5072,13 +4292,7 @@ }, "person_6_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_6_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_6_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -5142,8 +4356,12 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 7 }], - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 7 + }, + { + "hhmemb": 8 + } ] }, "person_7_relationship_to_lead": { @@ -5176,13 +4394,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "details_known_7": 0 + } ] }, "person_7_age": { @@ -5206,20 +4420,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age7_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age7_known", - "value": 1 - } - ] + { + "age7_known": 0 + }, + { + "age7_known": 1 + } ] } }, @@ -5240,29 +4446,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "details_known_7": 0 + } ] }, "no_females_pregnant_household_person_7_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age7_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age7_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5303,18 +4494,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_7_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age7_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age7_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5382,29 +4565,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "details_known_7": 0 + } ] }, "no_females_pregnant_household_person_7_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_7": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5445,18 +4616,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_7_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_7": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5532,20 +4695,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age7_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age7", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age7_known": 1 }, + { "age7": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -5561,45 +4712,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - }, - { - "object": "case_log", - "method": "age7", - "value": { - "operator": ">", - "operand": 15 - } - } - ], - [ - { - "object": "case_log", - "method": "details_known_7", - "value": 0 - }, - { - "object": "case_log", - "method": "age7", - "value": null + { + "details_known_7": 0, + "age7": { + "operator": ">", + "operand": 15 } - ] + }, + { + "details_known_7": 0, + "age7": null + } ] }, "person_7_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_7_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_7_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -5644,13 +4771,7 @@ }, "person_7_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_7_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_7_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -5714,7 +4835,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "hhmemb", "value": 8 }] + { + "hhmemb": 8 + } ] }, "person_8_relationship_to_lead": { @@ -5747,13 +4870,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "details_known_8": 0 + } ] }, "person_8_age": { @@ -5777,20 +4896,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "age8_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "age8_known", - "value": 1 - } - ] + { + "age8_known": 0 + }, + { + "age8_known": 1 + } ] } }, @@ -5811,29 +4922,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "details_known_8": 0 + } ] }, "no_females_pregnant_household_person_8_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "age8_known", - "value": 0 - } - ] + { "no_females_in_a_pregnant_household?": true, "age8_known": 0 } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5874,18 +4970,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_8_age_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "age8_known", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "age8_known": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -5953,29 +5041,17 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "details_known_8": 0 + } ] }, "no_females_pregnant_household_person_8_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "no_females_in_a_pregnant_household?": true, + "details_known_8": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -6016,18 +5092,10 @@ }, "females_in_soft_age_range_in_pregnant_household_person_8_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - }, - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true, + "details_known_8": 0 + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -6103,20 +5171,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age8_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age8", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age8_known": 1 }, + { "age8": { "operator": "<", "operand": 16 } } ] }, "0": { @@ -6132,45 +5188,21 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - }, - { - "object": "case_log", - "method": "age8", - "value": { - "operator": ">", - "operand": 15 - } - } - ], - [ - { - "object": "case_log", - "method": "details_known_8", - "value": 0 - }, - { - "object": "case_log", - "method": "age8", - "value": null + { + "details_known_8": 0, + "age8": { + "operator": ">", + "operand": 15 } - ] + }, + { + "details_known_8": 0, + "age8": null + } ] }, "person_8_under_retirement_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "person_8_retired_under_soft_min_age?", - "value": true - } - ] - ], + "depends_on": [{ "person_8_retired_under_soft_min_age?": true }], "title_text": { "translation": "soft_validations.retirement.min.title", "arguments": [ @@ -6215,13 +5247,7 @@ }, "person_8_over_retirement_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "person_8_not_retired_over_soft_max_age?", - "value": true - } - ] + { "person_8_not_retired_over_soft_max_age?": true } ], "title_text": { "translation": "soft_validations.retirement.max.title", @@ -6311,13 +5337,9 @@ "header": "", "description": "", "depends_on": [ - [ - { - "object": "case_log", - "method": "armedforces", - "value": 1 - } - ] + { + "armedforces": 1 + } ], "questions": { "leftreg": { @@ -6349,20 +5371,12 @@ "header": "", "description": "", "depends_on": [ - [ - { - "object": "case_log", - "method": "armedforces", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "armedforces", - "value": 4 - } - ] + { + "armedforces": 1 + }, + { + "armedforces": 4 + } ], "questions": { "reservist": { @@ -6414,15 +5428,7 @@ } }, "no_females_pregnant_household_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "no_females_in_a_pregnant_household?", - "value": true - } - ] - ], + "depends_on": [{ "no_females_in_a_pregnant_household?": true }], "title_text": { "translation": "soft_validations.pregnancy.title", "arguments": [ @@ -6462,13 +5468,9 @@ }, "females_in_soft_age_range_in_pregnant_household_value_check": { "depends_on": [ - [ - { - "object": "case_log", - "method": "female_in_pregnant_household_in_soft_validation_range?", - "value": true - } - ] + { + "female_in_pregnant_household_in_soft_validation_range?": true + } ], "title_text": { "translation": "soft_validations.pregnancy.title", @@ -6572,13 +5574,9 @@ "header": "", "description": "", "depends_on": [ - [ - { - "object": "case_log", - "method": "illness", - "value": 1 - } - ] + { + "illness": 1 + } ], "questions": { "condition_effects": { @@ -6722,13 +5720,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "reason_for_leaving_last_settled_home": { @@ -6855,13 +5849,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "renewal": 0 + } ] }, "reason_for_leaving_last_settled_home_renewal": { @@ -6884,13 +5874,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 1 - } - ] + { + "renewal": 1 + } ] }, "previous_housing_situation": { @@ -6976,7 +5962,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "renewal", "value": 0 }] + { + "renewal": 0 + } ] }, "previous_housing_situation_renewal": { @@ -6999,18 +5987,10 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "renewal", - "value": 1 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - } - ] + { + "renewal": 1, + "needstype": 2 + } ] }, "homelessness": { @@ -7033,7 +6013,9 @@ } }, "depends_on": [ - [{ "object": "case_log", "method": "renewal", "value": 0 }] + { + "renewal": 0 + } ] }, "previous_postcode": { @@ -7057,20 +6039,12 @@ }, "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "previous_postcode_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "previous_postcode_known", - "value": 1 - } - ] + { + "previous_postcode_known": 0 + }, + { + "previous_postcode_known": 1 + } ] } }, @@ -7105,20 +6079,12 @@ "type": "radio", "hidden_in_check_answers": { "depends_on": [ - [ - { - "object": "case_log", - "method": "previous_la_known", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "previous_la_known", - "value": 1 - } - ] + { + "previous_la_known": 0 + }, + { + "previous_la_known": 1 + } ] }, "answer_options": { @@ -7533,13 +6499,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "is_previous_la_inferred", - "value": false - } - ] + { + "is_previous_la_inferred": false + } ] }, "reasonable_preference": { @@ -7600,13 +6562,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "reasonpref", - "value": 1 - } - ] + { + "reasonpref": 1 + } ] }, "allocation_system": { @@ -7685,23 +6643,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "LA" - }, - { - "object": "case_log", - "method": "needstype", - "value": 1 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "LA", + "needstype": 1, + "renewal": 0 + } ] }, "referral_prp": { @@ -7754,23 +6700,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "PRP" - }, - { - "object": "case_log", - "method": "needstype", - "value": 1 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "PRP", + "needstype": 1, + "renewal": 0 + } ] }, "referral_supported_housing": { @@ -7823,23 +6757,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "LA" - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "LA", + "needstype": 2, + "renewal": 0 + } ] }, "referral_supported_housing_prp": { @@ -7895,23 +6817,11 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "managing_organisation.provider_type", - "value": "PRP" - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "renewal", - "value": 0 - } - ] + { + "managing_organisation.provider_type": "PRP", + "needstype": 2, + "renewal": 0 + } ] } } @@ -7958,13 +6868,9 @@ }, "income_amount": { "depends_on": [ - [ - { - "object": "case_log", - "method": "net_income_known", - "value": 0 - } - ] + { + "net_income_known": 0 + } ], "header": "Total household income", "description": "", @@ -8021,18 +6927,8 @@ } }, "net_income_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "net_income_soft_validation_triggered?", - "value": true - } - ] - ], - "title_text": { - "translation": "soft_validations.net_income.title_text" - }, + "depends_on": [{ "net_income_soft_validation_triggered?": true }], + "title_text": { "translation": "soft_validations.net_income.title_text" }, "informative_text": { "translation": "soft_validations.net_income.hint_text", "arguments": [ @@ -8146,13 +7042,9 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "needstype", - "value": 2 - } - ] + { + "needstype": 2 + } ] }, "rent_period": { @@ -8196,20 +7088,12 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "household_charge": 0 + }, + { + "household_charge": null + } ] }, "care_home_weekly": { @@ -8245,210 +7129,66 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "needstype", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 1, + "needstype": 2, + "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, + "household_charge": null + } ] }, "care_home_bi_weekly": { @@ -8484,40 +7224,16 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "needst", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "needst", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 2, + "needstype": 2, + "household_charge": 0 + }, + { + "period": 2, + "needstype": 2, + "household_charge": null + } ] }, "care_home_4_weekly": { @@ -8553,40 +7269,16 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "needst", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "needst", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 3, + "needstype": 2, + "household_charge": 0 + }, + { + "period": 3, + "needstype": 2, + "household_charge": null + } ] }, "care_home_monthly": { @@ -8622,40 +7314,16 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "needst", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "needst", - "value": 2 - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "period": 4, + "needstype": 2, + "household_charge": 0 + }, + { + "period": 4, + "needstype": 2, + "household_charge": null + } ] }, "rent_weekly": { @@ -8734,397 +7402,126 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 1 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 5 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 6 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 7 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 8 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 9 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "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, + "household_charge": 0, + "is_carehome": 0 + }, + { + "period": 8, + "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 + } ] }, "rent_bi_weekly": { @@ -9203,57 +7600,26 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 2 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "household_charge": 0, + "period": 2, + "is_carehome": 0 + }, + { + "household_charge": null, + "period": 2, + "is_carehome": 0 + }, + { + "household_charge": 0, + "period": 2, + "is_carehome": null + }, + { + "household_charge": null, + "period": 2, + "is_carehome": null + } ] }, "rent_4_weekly": { @@ -9332,74 +7698,26 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 3 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "household_charge": 0, + "period": 3, + "is_carehome": 0 + }, + { + "household_charge": null, + "period": 3, + "is_carehome": 0 + }, + { + "household_charge": 0, + "period": 3, + "is_carehome": null + }, + { + "household_charge": null, + "period": 3, + "is_carehome": null + } ] }, "rent_monthly": { @@ -9478,86 +7796,30 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": 0 - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "household_charge", - "value": null - }, - { - "object": "case_log", - "method": "period", - "value": 4 - }, - { - "object": "case_log", - "method": "is_carehome", - "value": null - } - ] + { + "household_charge": 0, + "period": 4, + "is_carehome": 0 + }, + { + "household_charge": null, + "period": 4, + "is_carehome": 0 + }, + { + "household_charge": 0, + "period": 4, + "is_carehome": null + }, + { + "household_charge": null, + "period": 4, + "is_carehome": null + } ] }, "min_rent_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "rent_in_soft_min_range?", - "value": true - } - ] - ], + "depends_on": [{ "rent_in_soft_min_range?": true }], "title_text": { "translation": "soft_validations.rent.min.title_text", "arguments": [ @@ -9601,15 +7863,7 @@ } }, "max_rent_value_check": { - "depends_on": [ - [ - { - "object": "case_log", - "method": "rent_in_soft_max_range?", - "value": true - } - ] - ], + "depends_on": [{ "rent_in_soft_max_range?": true }], "title_text": { "translation": "soft_validations.rent.max.title_text", "arguments": [ @@ -9675,54 +7929,22 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "hb", - "value": "1" - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": "1" - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": "6" - }, - { - "object": "case_log", - "method": "household_charge", - "value": 0 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": "6" - }, - { - "object": "case_log", - "method": "household_charge", - "value": null - } - ] + { + "hb": 1, + "household_charge": 0 + }, + { + "hb": 1, + "household_charge": null + }, + { + "hb": 6, + "household_charge": 0 + }, + { + "hb": 6, + "household_charge": null + } ] }, "outstanding_amount_known": { @@ -9765,30 +7987,14 @@ } }, "depends_on": [ - [ - { - "object": "case_log", - "method": "hb", - "value": 1 - }, - { - "object": "case_log", - "method": "hbrentshortfall", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "hb", - "value": 6 - }, - { - "object": "case_log", - "method": "hbrentshortfall", - "value": 1 - } - ] + { + "hb": 1, + "hbrentshortfall": 1 + }, + { + "hb": 6, + "hbrentshortfall": 1 + } ] } } diff --git a/spec/fixtures/forms/2021_2022.json b/spec/fixtures/forms/2021_2022.json index 02ba32d19..3b83b3499 100644 --- a/spec/fixtures/forms/2021_2022.json +++ b/spec/fixtures/forms/2021_2022.json @@ -21,8 +21,12 @@ } }, "depends_on": [ - [{"object": "case_log", "method": "housingneeds_a", "value": 1}], - [{"object": "case_log", "method": "housingneeds_a", "value": null}] + { + "housingneeds_a": 1 + }, + { + "housingneeds_a": null + } ] }, "person_1_age": { "questions": { @@ -185,20 +189,8 @@ "9": { "value": "Child under 16", "depends_on": [ - [ - { - "object": "case_log", - "method": "age2_known", - "value": 1 - } - ], - [ - { - "object": "case_log", - "method": "age2", - "value": { "operator": "<", "operand": 16 } - } - ] + { "age2_known": 1 }, + { "age2": { "operator": "<", "operand": 16 } } ] }, "1": { @@ -208,9 +200,9 @@ } }, "depends_on": [ - [{ - "object": "case_log", "method": "age2", "value": { "operator": ">", "operand": 15 } - }] + { + "age2": { "operator": ">", "operand": 15 } + } ] }, "propcode": { @@ -330,10 +322,11 @@ } } }, - "depends_on": [[ - {"object": "case_log", "method": "previous_la_known", "value": 1}, - {"object": "case_log", "method": "is_previous_la_inferred", "value": false} - ] + "depends_on": [ + { + "previous_la_known": 1, + "is_previous_la_inferred": false + } ] }, "condition_effects": { @@ -354,7 +347,9 @@ } }, "depends_on": [ - [{"object": "case_log", "method": "illness", "value": 1}] + { + "illness": 1 + } ] } } @@ -402,7 +397,9 @@ } }, "depends_on": [ - [{"object": "case_log", "method": "is_la_inferred", "value": false}] + { + "is_la_inferred": false + } ] }, "property_postcode": { @@ -462,9 +459,7 @@ } } }, - "depends_on": [ - [{"object": "case_log", "method": "is_la_inferred", "value": false}] - ] + "depends_on": [{"is_la_inferred": false}] }, "property_wheelchair_accessible": { "questions": { @@ -518,10 +513,7 @@ } } }, - "depends_on": [ - [{"object": "case_log", "method": "preg_occ", "value": 1}], - [{"object": "case_log", "method": "wchair", "value": 1}] - ] + "depends_on": [{ "preg_occ": 1 }, { "wchair" : 1 }] }, "conditional_question_no_page": { "questions": { @@ -539,9 +531,7 @@ } } }, - "depends_on": [ - [{"object": "case_log", "method": "preg_occ", "value": 2}] - ] + "depends_on": [{ "preg_occ": 2 }] }, "conditional_question_no_second_page": { "questions": { @@ -559,10 +549,7 @@ } } }, - "depends_on": [ - [{"object": "case_log", "method": "preg_occ", "value": 2}, - {"object": "case_log", "method": "sex1", "value": "M"}] - ] + "depends_on": [{ "preg_occ": 2, "sex1": "M" }] } } } @@ -612,9 +599,7 @@ } }, "net_income_value_check": { - "depends_on": [ - [{"object": "case_log", "method": "net_income_soft_validation_triggered?", "value": true}] - ], + "depends_on": [{ "net_income_soft_validation_triggered?": true }], "title_text": { "translation": "soft_validations.net_income.title_text" }, "informative_text": { "translation": "soft_validations.net_income.hint_text", @@ -696,9 +681,7 @@ } }, "dependent_page": { - "depends_on": [ - [{"object": "case_log", "method": "incfreq", "value": 1}] - ], + "depends_on": [{ "incfreq": 1 }], "questions": { "dependent_question": { "check_answer_label": "Dependent Question", @@ -842,9 +825,7 @@ "width": 4 } }, - "depends_on": [ - [{"object": "case_log", "method": "period", "value": 3}] - ] + "depends_on": [{"period": 3}] }, "care_home_charge_bi_weekly": { "questions": { @@ -858,9 +839,7 @@ "width": 4 } }, - "depends_on": [ - [{"object": "case_log", "method": "period", "value": 2}] - ] + "depends_on": [{"period": 2}] } } } @@ -909,15 +888,13 @@ }, "hidden_in_check_answers": { "depends_on": [ - [{"object": "case_log", "method": "layear", "value": 0}], - [{"object": "case_log", "method": "layear", "value": 1}] + { "layear": 0 }, + { "layear": 1 } ] } } }, - "depends_on": [ - [{"object": "case_log", "method": "renewal", "value": 0}] - ] + "depends_on": [{ "renewal": 0 }] }, "time_on_la_waiting_list": { "questions": {