diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb index 5b06d6a28..24f836d04 100644 --- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb +++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_age_value_check.rb @@ -3,7 +3,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadAgeValu super(id, hsh, subsection) @id = "females_in_soft_age_range_in_pregnant_household_lead_age_value_check" @copy_key = "lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check" - @depends_on = [{ "female_in_pregnant_household_in_soft_validation_range?" => true }] + @depends_on = [{ "non_males_in_pregnant_household_not_in_pregnancy_range?" => true }] @title_text = { "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text", "arguments" => [], diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb index 3e961b283..c786afe56 100644 --- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb +++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check.rb @@ -3,7 +3,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadHhmembV super(id, hsh, subsection) @id = "females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check" @copy_key = "lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check" - @depends_on = [{ "female_in_pregnant_household_in_soft_validation_range?" => true }] + @depends_on = [{ "non_males_in_pregnant_household_not_in_pregnancy_range?" => true }] @title_text = { "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text", "arguments" => [], diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb index af568b039..bb3670c74 100644 --- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb +++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_lead_value_check.rb @@ -3,7 +3,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadValueCh super @id = "females_in_soft_age_range_in_pregnant_household_lead_value_check" @copy_key = "lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check" - @depends_on = [{ "female_in_pregnant_household_in_soft_validation_range?" => true }] + @depends_on = [{ "non_males_in_pregnant_household_not_in_pregnancy_range?" => true }] @title_text = { "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text", "arguments" => [], diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb index ddc8789f9..cfd035ac3 100644 --- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb +++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_age_value_check.rb @@ -5,7 +5,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeVa @copy_key = "lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check" @depends_on = [ { - "female_in_pregnant_household_in_soft_validation_range?" => true, + "non_males_in_pregnant_household_not_in_pregnancy_range?" => true, "age#{person_index}_known" => 0, }, ] diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb index 099bea5d9..de1fb5fc9 100644 --- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb +++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_person_value_check.rb @@ -6,7 +6,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonValue @depends_on = [ { - "female_in_pregnant_household_in_soft_validation_range?" => true, + "non_males_in_pregnant_household_not_in_pregnancy_range?" => true, "details_known_#{person_index}" => 0, }, ] diff --git a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb index 3822ec940..66603753e 100644 --- a/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb +++ b/app/models/form/lettings/pages/females_in_soft_age_range_in_pregnant_household_value_check.rb @@ -3,7 +3,7 @@ class Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdValueCheck super @id = "females_in_soft_age_range_in_pregnant_household_value_check" @copy_key = "lettings.soft_validations.pregnancy_value_check.females_in_soft_age_range_in_pregnant_household_value_check" - @depends_on = [{ "female_in_pregnant_household_in_soft_validation_range?" => true }] + @depends_on = [{ "non_males_in_pregnant_household_not_in_pregnancy_range?" => true }] @title_text = { "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text", "arguments" => [], diff --git a/app/models/form/lettings/pages/no_household_member_likely_to_be_pregnant_check.rb b/app/models/form/lettings/pages/no_household_member_likely_to_be_pregnant_check.rb new file mode 100644 index 000000000..cefb98ceb --- /dev/null +++ b/app/models/form/lettings/pages/no_household_member_likely_to_be_pregnant_check.rb @@ -0,0 +1,24 @@ +class Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck < ::Form::Page + def initialize(id, hsh, subsection, person_index: 0) + super(id, hsh, subsection) + @copy_key = "lettings.soft_validations.pregnancy_value_check.no_household_member_likely_to_be_pregnant_check" + @depends_on = [{ "no_household_member_likely_to_be_pregnant?" => true }] + @title_text = { + "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text", + "arguments" => [], + } + @informative_text = { + "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text", + "arguments" => [], + } + @person_index = person_index + end + + def questions + @questions ||= [Form::Lettings::Questions::PregnancyValueCheck.new(nil, nil, self, person_index: @person_index)] + end + + def interruption_screen_question_ids + %w[preg_occ age1 sexrab1 gender_same_as_sex1 age2 sexrab2 gender_same_as_sex2 age3 sexrab3 gender_same_as_sex3 age4 sexrab4 gender_same_as_sex4 age5 sexrab5 gender_same_as_sex5 age6 sexrab6 gender_same_as_sex6 age7 sexrab7 gender_same_as_sex7 age8 sexrab8 gender_same_as_sex8] + end +end diff --git a/app/models/form/lettings/subsections/household_characteristics.rb b/app/models/form/lettings/subsections/household_characteristics.rb index d528e3772..ab8e639bc 100644 --- a/app/models/form/lettings/subsections/household_characteristics.rb +++ b/app/models/form/lettings/subsections/household_characteristics.rb @@ -10,18 +10,21 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection @pages ||= [ (Form::Lettings::Pages::Declaration.new(nil, nil, self) unless form.start_year_2024_or_later?), Form::Lettings::Pages::HouseholdMembers.new(nil, nil, self), - Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self), - Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self), + (Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadHhmembValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_hhmemb_check", nil, self) if form.start_year_2026_or_later?), Form::Lettings::Pages::LeadTenantAge.new(nil, nil, self), - Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadAgeValueCheck.new(nil, nil, self), - Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadAgeValueCheck.new(nil, nil, self), + (Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadAgeValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadAgeValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_lead_age_check", nil, self) if form.start_year_2026_or_later?), Form::Lettings::Pages::LeadTenantUnderRetirementValueCheck.new("age_lead_tenant_under_retirement_value_check", nil, self), Form::Lettings::Pages::LeadTenantOverRetirementValueCheck.new("age_lead_tenant_over_retirement_value_check", nil, self), (Form::Lettings::Pages::LeadTenantSexRegisteredAtBirth.new(nil, nil, self) if form.start_year_2026_or_later?), (Form::Lettings::Pages::LeadTenantGenderSameAsSex.new(nil, nil, self) if form.start_year_2026_or_later?), Form::Lettings::Pages::LeadTenantGenderIdentity.new(nil, nil, self), - Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadValueCheck.new(nil, nil, self), - Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadValueCheck.new(nil, nil, self), + (Form::Lettings::Pages::NoFemalesPregnantHouseholdLeadValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdLeadValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_lead_check", nil, self, person_index: 1) if form.start_year_2026_or_later?), Form::Lettings::Pages::LeadTenantOverRetirementValueCheck.new("gender_lead_tenant_over_retirement_value_check", nil, self), Form::Lettings::Pages::LeadTenantEthnicGroup.new(nil, nil, self), Form::Lettings::Pages::LeadTenantEthnicBackgroundArab.new(nil, nil, self), @@ -52,16 +55,18 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("relationship_#{person_index}_partner_under_16_value_check", nil, self, person_index:) if form.start_year_2024_or_later? && !form.start_year_2026_or_later?), (Form::Lettings::Pages::MultiplePartnersValueCheck.new("relationship_#{person_index}_multiple_partners_value_check", nil, self, person_index:) if form.start_year_2024_or_later?), (Form::Lettings::Pages::PersonAge.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?), - Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self, person_index:), - Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self, person_index:), + (Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonAgeValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_person_age_#{person_index}_check", nil, self, person_index:) if form.start_year_2026_or_later?), Form::Lettings::Pages::PersonUnderRetirementValueCheck.new("age_#{person_index}_under_retirement_value_check", nil, self, person_index:), Form::Lettings::Pages::PersonOverRetirementValueCheck.new("age_#{person_index}_over_retirement_value_check", nil, self, person_index:), (Form::Lettings::Pages::PartnerUnder16ValueCheck.new("age_#{person_index}_partner_under_16_value_check", nil, self, person_index:) if form.start_year_2024_or_later? && !form.start_year_2026_or_later?), (Form::Lettings::Pages::PersonSexRegisteredAtBirth.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?), (Form::Lettings::Pages::PersonGenderSameAsSex.new(nil, nil, self, person_index:) if form.start_year_2026_or_later?), Form::Lettings::Pages::PersonGenderIdentity.new(nil, nil, self, person_index:), - Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:), - Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:), + (Form::Lettings::Pages::NoFemalesPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdPersonValueCheck.new(nil, nil, self, person_index:) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_person_#{person_index}_check", nil, self, person_index:) if form.start_year_2026_or_later?), Form::Lettings::Pages::PersonOverRetirementValueCheck.new("gender_#{person_index}_over_retirement_value_check", nil, self, person_index:), Form::Lettings::Pages::PersonWorkingSituation.new(nil, nil, self, person_index:), Form::Lettings::Pages::PersonUnderRetirementValueCheck.new("working_situation_#{person_index}_under_retirement_value_check", nil, self, person_index:), diff --git a/app/models/form/lettings/subsections/household_needs.rb b/app/models/form/lettings/subsections/household_needs.rb index e0502386b..4f6414d18 100644 --- a/app/models/form/lettings/subsections/household_needs.rb +++ b/app/models/form/lettings/subsections/household_needs.rb @@ -12,8 +12,9 @@ class Form::Lettings::Subsections::HouseholdNeeds < ::Form::Subsection Form::Lettings::Pages::ArmedForcesServing.new(nil, nil, self), Form::Lettings::Pages::ArmedForcesInjured.new(nil, nil, self), Form::Lettings::Pages::Pregnant.new("pregnant", nil, self), - Form::Lettings::Pages::NoFemalesPregnantHouseholdValueCheck.new(nil, nil, self), - Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdValueCheck.new(nil, nil, self), + (Form::Lettings::Pages::NoFemalesPregnantHouseholdValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::FemalesInSoftAgeRangeInPregnantHouseholdValueCheck.new(nil, nil, self) unless form.start_year_2026_or_later?), + (Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_check", nil, self) if form.start_year_2026_or_later?), Form::Lettings::Pages::AccessNeedsExist.new("access_needs_exist", nil, self), Form::Lettings::Pages::TypeOfAccessNeeds.new(nil, nil, self), Form::Lettings::Pages::HealthConditions.new("health_conditions", nil, self), diff --git a/app/models/validations/soft_validations.rb b/app/models/validations/soft_validations.rb index 35436dc32..662aa9af6 100644 --- a/app/models/validations/soft_validations.rb +++ b/app/models/validations/soft_validations.rb @@ -75,30 +75,16 @@ module Validations::SoftValidations end end - def all_male_tenants_in_a_pregnant_household? - all_male_tenants_in_the_household? && all_tenants_gender_information_completed? && preg_occ == 1 - end - - def female_in_pregnant_household_in_soft_validation_range? - all_tenants_age_and_gender_information_completed? && females_in_the_household? && !females_in_age_range(16, 50) && preg_occ == 1 + def no_household_member_likely_to_be_pregnant? + all_male_tenants_in_a_pregnant_household? || non_males_in_pregnant_household_not_in_pregnancy_range? end - def all_tenants_age_and_gender_information_completed? - return false if hhmemb.present? && hhmemb > 8 - - person_count = hhmemb || 8 - - (1..person_count).all? do |n| - public_send("sex#{n}").present? && public_send("age#{n}").present? && details_known_or_lead_tenant?(n) && public_send("age#{n}_known").present? && public_send("age#{n}_known").zero? - end + def all_male_tenants_in_a_pregnant_household? + all_tenants_gender_information_completed? && all_male_tenants_in_the_household? && preg_occ == 1 end - def all_tenants_gender_information_completed? - person_count = hhmemb || 8 - - (1..person_count).all? do |n| - public_send("sex#{n}").present? && details_known_or_lead_tenant?(n) - end + def non_males_in_pregnant_household_not_in_pregnancy_range? + all_tenants_age_and_gender_information_completed? && non_males_in_the_household? && !any_non_male_in_expected_pregnancy_age_range(16, 50) && preg_occ == 1 end TWO_YEARS_IN_DAYS = 730 @@ -221,25 +207,54 @@ module Validations::SoftValidations private + def all_tenants_age_and_gender_information_completed? + return false if hhmemb.present? && hhmemb > 8 + return false unless all_tenants_gender_information_completed? + + person_count = hhmemb || 8 + + (1..person_count).all? do |n| + public_send("age#{n}").present? && public_send("age#{n}_known").present? && public_send("age#{n}_known").zero? + end + end + + def all_tenants_gender_information_completed? + return false if hhmemb.present? && hhmemb > 8 + + person_count = hhmemb || 8 + + (1..person_count).all? do |n| + tenant_gender_information_completed?(n) + end + end + + def tenant_gender_information_completed?(tenant_number) + if form.start_year_2026_or_later? + public_send("sexrab#{tenant_number}").present? && public_send("gender_same_as_sex#{tenant_number}").present? && details_known_or_lead_tenant?(tenant_number) + else + public_send("sex#{tenant_number}").present? && details_known_or_lead_tenant?(tenant_number) + end + end + def details_known_or_lead_tenant?(tenant_number) return true if tenant_number == 1 public_send("details_known_#{tenant_number}").zero? end - def females_in_age_range(min, max) + def any_non_male_in_expected_pregnancy_age_range(min, max) person_count = hhmemb || 8 (1..person_count).any? do |n| - public_send("sex#{n}") == "F" && public_send("age#{n}").present? && public_send("age#{n}").between?(min, max) + person_in_expected_pregnancy_age_range(n, min, max) && person_is_non_male(n) end end - def females_in_the_household? + def non_males_in_the_household? person_count = hhmemb || 8 (1..person_count).any? do |n| - public_send("sex#{n}") == "F" || public_send("sex#{n}").nil? + person_is_non_male(n) end end @@ -249,10 +264,36 @@ private person_count = hhmemb || 8 (1..person_count).all? do |n| - public_send("sex#{n}") == "M" + person_is_male(n) + end + end + + def person_is_male(person_number) + if form.start_year_2026_or_later? + sexrab = public_send("sexrab#{person_number}") + gender_same_as_sex = public_send("gender_same_as_sex#{person_number}") + + sexrab == "M" && gender_same_as_sex == 1 + else + public_send("sex#{person_number}") == "M" end end + def person_is_non_male(person_number) + if form.start_year_2026_or_later? + !person_is_male(person_number) + else + # the "non-male" wording was introduced in the 26/27 collection year, before that this behavior was limited to female gender only + public_send("sex#{person_number}") == "F" + end + end + + def person_in_expected_pregnancy_age_range(person_number, min, max) + age = public_send("age#{person_number}") + + age.between?(min, max) + end + def tenant_is_retired?(economic_status) economic_status == 5 end diff --git a/app/services/bulk_upload/lettings/year2026/row_parser.rb b/app/services/bulk_upload/lettings/year2026/row_parser.rb index 6eca624d1..2516a432b 100644 --- a/app/services/bulk_upload/lettings/year2026/row_parser.rb +++ b/app/services/bulk_upload/lettings/year2026/row_parser.rb @@ -1262,6 +1262,22 @@ private sexrab6: %i[field_135], sexrab7: %i[field_136], sexrab8: %i[field_137], + gender_same_as_sex1: %i[field_138], + gender_same_as_sex2: %i[field_140], + gender_same_as_sex3: %i[field_142], + gender_same_as_sex4: %i[field_144], + gender_same_as_sex5: %i[field_146], + gender_same_as_sex6: %i[field_148], + gender_same_as_sex7: %i[field_150], + gender_same_as_sex8: %i[field_152], + gender_description1: %i[field_139], + gender_description2: %i[field_141], + gender_description3: %i[field_143], + gender_description4: %i[field_145], + gender_description5: %i[field_147], + gender_description6: %i[field_149], + gender_description7: %i[field_151], + gender_description8: %i[field_153], }.compact end diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index ac615b0e2..9ed728cda 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -1213,7 +1213,7 @@ "females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { @@ -1355,7 +1355,7 @@ "females_in_soft_age_range_in_pregnant_household_lead_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { @@ -1476,7 +1476,7 @@ "females_in_soft_age_range_in_pregnant_household_lead_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { @@ -2135,7 +2135,7 @@ "females_in_soft_age_range_in_pregnant_household_person_2_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age2_known": 0 } ], @@ -2258,7 +2258,7 @@ "females_in_soft_age_range_in_pregnant_household_person_2_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_2": 0 } ], @@ -2670,7 +2670,7 @@ "females_in_soft_age_range_in_pregnant_household_person_3_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age3_known": 0 } ], @@ -2793,7 +2793,7 @@ "females_in_soft_age_range_in_pregnant_household_person_3_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_3": 0 } ], @@ -3202,7 +3202,7 @@ "females_in_soft_age_range_in_pregnant_household_person_4_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age4_known": 0 } ], @@ -3325,7 +3325,7 @@ "females_in_soft_age_range_in_pregnant_household_person_4_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_4": 0 } ], @@ -3731,7 +3731,7 @@ "females_in_soft_age_range_in_pregnant_household_person_5_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age5_known": 0 } ], @@ -3854,7 +3854,7 @@ "females_in_soft_age_range_in_pregnant_household_person_5_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_5": 0 } ], @@ -4257,7 +4257,7 @@ "females_in_soft_age_range_in_pregnant_household_person_6_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age6_known": 0 } ], @@ -4380,7 +4380,7 @@ "females_in_soft_age_range_in_pregnant_household_person_6_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_6": 0 } ], @@ -4780,7 +4780,7 @@ "females_in_soft_age_range_in_pregnant_household_person_7_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age7_known": 0 } ], @@ -4903,7 +4903,7 @@ "females_in_soft_age_range_in_pregnant_household_person_7_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_7": 0 } ], @@ -5300,7 +5300,7 @@ "females_in_soft_age_range_in_pregnant_household_person_8_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age8_known": 0 } ], @@ -5423,7 +5423,7 @@ "females_in_soft_age_range_in_pregnant_household_person_8_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_8": 0 } ], @@ -5837,7 +5837,7 @@ "females_in_soft_age_range_in_pregnant_household_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index 7d6f44b20..0fa982dd4 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -1254,7 +1254,7 @@ "females_in_soft_age_range_in_pregnant_household_lead_hhmemb_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { @@ -1426,7 +1426,7 @@ "females_in_soft_age_range_in_pregnant_household_lead_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { @@ -1577,7 +1577,7 @@ "females_in_soft_age_range_in_pregnant_household_lead_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { @@ -2218,7 +2218,7 @@ "females_in_soft_age_range_in_pregnant_household_person_2_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age2_known": 0 } ], @@ -2371,7 +2371,7 @@ "females_in_soft_age_range_in_pregnant_household_person_2_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_2": 0 } ], @@ -2801,7 +2801,7 @@ "females_in_soft_age_range_in_pregnant_household_person_3_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age3_known": 0 } ], @@ -2954,7 +2954,7 @@ "females_in_soft_age_range_in_pregnant_household_person_3_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_3": 0 } ], @@ -3381,7 +3381,7 @@ "females_in_soft_age_range_in_pregnant_household_person_4_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age4_known": 0 } ], @@ -3534,7 +3534,7 @@ "females_in_soft_age_range_in_pregnant_household_person_4_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_4": 0 } ], @@ -3958,7 +3958,7 @@ "females_in_soft_age_range_in_pregnant_household_person_5_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age5_known": 0 } ], @@ -4111,7 +4111,7 @@ "females_in_soft_age_range_in_pregnant_household_person_5_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_5": 0 } ], @@ -4532,7 +4532,7 @@ "females_in_soft_age_range_in_pregnant_household_person_6_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age6_known": 0 } ], @@ -4685,7 +4685,7 @@ "females_in_soft_age_range_in_pregnant_household_person_6_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_6": 0 } ], @@ -5103,7 +5103,7 @@ "females_in_soft_age_range_in_pregnant_household_person_7_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age7_known": 0 } ], @@ -5256,7 +5256,7 @@ "females_in_soft_age_range_in_pregnant_household_person_7_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_7": 0 } ], @@ -5671,7 +5671,7 @@ "females_in_soft_age_range_in_pregnant_household_person_8_age_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "age8_known": 0 } ], @@ -5824,7 +5824,7 @@ "females_in_soft_age_range_in_pregnant_household_person_8_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true, + "non_males_in_pregnant_household_not_in_pregnancy_range?": true, "details_known_8": 0 } ], @@ -6259,7 +6259,7 @@ "females_in_soft_age_range_in_pregnant_household_value_check": { "depends_on": [ { - "female_in_pregnant_household_in_soft_validation_range?": true + "non_males_in_pregnant_household_not_in_pregnancy_range?": true } ], "title_text": { diff --git a/config/locales/forms/2026/lettings/soft_validations.en.yml b/config/locales/forms/2026/lettings/soft_validations.en.yml index 5a1d7d1a3..74e7af46f 100644 --- a/config/locales/forms/2026/lettings/soft_validations.en.yml +++ b/config/locales/forms/2026/lettings/soft_validations.en.yml @@ -12,14 +12,14 @@ en: question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." informative_text: "You also told us that all the tenants living at the property are male." - females_in_soft_age_range_in_pregnant_household_value_check: + no_household_member_likely_to_be_pregnant_check: page_header: "" check_answer_label: "Pregnancy confirmation" check_answer_prompt: "Confirm pregnancy status" hint_text: "" question_text: "Are you sure this is correct?" title_text: "You told us somebody in the household is pregnant." - informative_text: "You also told us that any female tenants living at the property are in the following age ranges: