From f9f3edd11a754bcce7b026293ca52a8636167721 Mon Sep 17 00:00:00 2001 From: Samuel Young Date: Wed, 15 Apr 2026 17:46:09 +0100 Subject: [PATCH] CLDC-4373: Fix pregnancy check appearing twice (#3308) * CLDC-4373: Add a person_index to lead age pregnancy check * CLDC-4373: Ensure pregnancy validation is not shown for people without details --- ...o_household_member_likely_to_be_pregnant_check.rb | 12 ++++++++++-- .../subsections/household_characteristics.rb | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) 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 index cefb98ceb..da0fdbb9f 100644 --- 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 @@ -2,7 +2,8 @@ class Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck < ::Form:: 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 }] + @person_index = person_index + @depends_on = depends_on @title_text = { "translation" => "forms.#{form.start_date.year}.#{@copy_key}.title_text", "arguments" => [], @@ -11,7 +12,14 @@ class Form::Lettings::Pages::NoHouseholdMemberLikelyToBePregnantCheck < ::Form:: "translation" => "forms.#{form.start_date.year}.#{@copy_key}.informative_text", "arguments" => [], } - @person_index = person_index + end + + def depends_on + if @person_index >= 2 + [{ "no_household_member_likely_to_be_pregnant?" => true, "details_known_#{@person_index}" => 0 }] + else + [{ "no_household_member_likely_to_be_pregnant?" => true }] + end end def questions diff --git a/app/models/form/lettings/subsections/household_characteristics.rb b/app/models/form/lettings/subsections/household_characteristics.rb index 50e2cfa61..5ac573df3 100644 --- a/app/models/form/lettings/subsections/household_characteristics.rb +++ b/app/models/form/lettings/subsections/household_characteristics.rb @@ -16,7 +16,7 @@ class Form::Lettings::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Lettings::Pages::LeadTenantAge.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::NoHouseholdMemberLikelyToBePregnantCheck.new("no_household_member_likely_to_be_pregnant_lead_age_check", nil, self, person_index: 1) 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?),