diff --git a/app/models/form/sales/pages/person.rb b/app/models/form/sales/pages/person.rb index 66e797cfa..3cf347353 100644 --- a/app/models/form/sales/pages/person.rb +++ b/app/models/form/sales/pages/person.rb @@ -17,6 +17,8 @@ class Form::Sales::Pages::Person < ::Form::Page end def field_for_person(field, suffix = "") + return [field, person_display_number, suffix].join if field == "details_known_" + [field, @person_index, suffix].join end end diff --git a/app/models/form/sales/pages/person_age.rb b/app/models/form/sales/pages/person_age.rb index 1eea81818..f0f86a251 100644 --- a/app/models/form/sales/pages/person_age.rb +++ b/app/models/form/sales/pages/person_age.rb @@ -4,7 +4,7 @@ class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person @header = "" @description = "" @subsection = subsection - @depends_on = page_depends_on + @depends_on = [{ details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 }] end def questions @@ -13,10 +13,4 @@ class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person Form::Sales::Questions::PersonAge.new(field_for_person("age"), nil, self, person_index: @person_index), ] end - - def page_depends_on - return (person_display_number..4).map { |index| { "hholdcount" => index, "jointpur" => joint_purchase? ? 1 : 2 } } if person_display_number == 1 - - [{ details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 }] - end end diff --git a/app/models/form/sales/pages/person_known.rb b/app/models/form/sales/pages/person_known.rb index 8a2d29bba..df82ff41d 100644 --- a/app/models/form/sales/pages/person_known.rb +++ b/app/models/form/sales/pages/person_known.rb @@ -1,11 +1,11 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person def initialize(id, hsh, subsection, person_index:) super - @header_partial = "#{id}_page" + @header_partial = "person_#{person_display_number}_known_page" @header = "" @description = "" @subsection = subsection - @depends_on = page_depends_on + @depends_on = (person_display_number..4).map { |index| { "hholdcount" => index, "jointpur" => joint_purchase? ? 1 : 2 } } end def questions @@ -13,8 +13,4 @@ class Form::Sales::Pages::PersonKnown < Form::Sales::Pages::Person Form::Sales::Questions::PersonKnown.new(field_for_person("details_known_"), nil, self, person_index: @person_index), ] end - - def page_depends_on - (@person_index..4).map { |index| { "hholdcount" => index } } - end end diff --git a/app/models/form/sales/pages/person_working_situation.rb b/app/models/form/sales/pages/person_working_situation.rb index f232f6a84..a78e90be3 100644 --- a/app/models/form/sales/pages/person_working_situation.rb +++ b/app/models/form/sales/pages/person_working_situation.rb @@ -4,7 +4,7 @@ class Form::Sales::Pages::PersonWorkingSituation < Form::Sales::Pages::Person @header = "" @description = "" @subsection = subsection - @depends_on = page_depends_on + @depends_on = [{ details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 }] end def questions @@ -12,10 +12,4 @@ class Form::Sales::Pages::PersonWorkingSituation < Form::Sales::Pages::Person Form::Sales::Questions::PersonWorkingSituation.new(field_for_person("ecstat"), nil, self, person_index: @person_index), ] end - - def page_depends_on - return (person_display_number..4).map { |index| { "hholdcount" => index, "jointpur" => joint_purchase? ? 1 : 2 } } if person_display_number == 1 - - [{ details_known_question_id => 1, "jointpur" => joint_purchase? ? 1 : 2 }] - end end diff --git a/app/models/form/sales/questions/person.rb b/app/models/form/sales/questions/person.rb index ebc280860..bf62fe7f9 100644 --- a/app/models/form/sales/questions/person.rb +++ b/app/models/form/sales/questions/person.rb @@ -13,6 +13,7 @@ class Form::Sales::Questions::Person < ::Form::Question end def field_for_person(field, suffix = "") - [field, @person_index, suffix].join - end + return [field, person_display_number, suffix].join if field == "details_known_" + + [field, @person_index, suffix].join end end diff --git a/app/models/form/sales/questions/person_known.rb b/app/models/form/sales/questions/person_known.rb index 0c1ef09c2..487b3f6d9 100644 --- a/app/models/form/sales/questions/person_known.rb +++ b/app/models/form/sales/questions/person_known.rb @@ -1,8 +1,8 @@ class Form::Sales::Questions::PersonKnown < Form::Sales::Questions::Person def initialize(id, hsh, page, person_index:) super - @check_answer_label = "Details known for person #{person_index}?" - @header = "Do you know the details for person #{person_index}?" + @check_answer_label = "Details known for person #{person_display_number}?" + @header = "Do you know the details for person #{person_display_number}?" @type = "radio" @answer_options = ANSWER_OPTIONS @page = page @@ -14,7 +14,7 @@ class Form::Sales::Questions::PersonKnown < Form::Sales::Questions::Person }, ], } - @check_answers_card_number = person_index + 2 + @check_answers_card_number = person_index end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 4eb252c52..763577ffe 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -29,7 +29,8 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Buyer2WorkingSituation.new(nil, nil, self), Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self), - Form::Sales::Pages::PersonKnown.new("person_1_known", nil, self, person_index: 1), + Form::Sales::Pages::PersonKnown.new("person_1_known", nil, self, person_index: 2), + Form::Sales::Pages::PersonKnown.new("person_1_known_joint_purchase", nil, self, person_index: 3), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_1_relationship_to_buyer_1", nil, self, person_index: 2), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_1_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 3), Form::Sales::Pages::PersonAge.new("person_1_age", nil, self, person_index: 2), @@ -38,21 +39,24 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self), Form::Sales::Pages::PersonWorkingSituation.new("person_1_working_situation", nil, self, person_index: 2), Form::Sales::Pages::PersonWorkingSituation.new("person_1_working_situation_joint_purchase", nil, self, person_index: 3), - Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 2), + Form::Sales::Pages::PersonKnown.new("person_2_known", nil, self, person_index: 3), + Form::Sales::Pages::PersonKnown.new("person_2_known_joint_purchase", nil, self, person_index: 4), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_2_relationship_to_buyer_1", nil, self, person_index: 3), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_2_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 4), Form::Sales::Pages::PersonAge.new("person_2_age", nil, self, person_index: 3), Form::Sales::Pages::PersonAge.new("person_2_age_joint_purchase", nil, self, person_index: 4), Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation", nil, self, person_index: 3), Form::Sales::Pages::PersonWorkingSituation.new("person_2_working_situation_joint_purchase", nil, self, person_index: 4), - Form::Sales::Pages::PersonKnown.new("person_3_known", nil, self, person_index: 3), + Form::Sales::Pages::PersonKnown.new("person_3_known", nil, self, person_index: 4), + Form::Sales::Pages::PersonKnown.new("person_3_known_joint_purchase", nil, self, person_index: 5), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_3_relationship_to_buyer_1", nil, self, person_index: 4), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_3_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 5), Form::Sales::Pages::PersonAge.new("person_3_age", nil, self, person_index: 4), Form::Sales::Pages::PersonAge.new("person_3_age_joint_purchase", nil, self, person_index: 5), Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation", nil, self, person_index: 4), Form::Sales::Pages::PersonWorkingSituation.new("person_3_working_situation_joint_purchase", nil, self, person_index: 5), - Form::Sales::Pages::PersonKnown.new("person_4_known", nil, self, person_index: 4), + Form::Sales::Pages::PersonKnown.new("person_4_known", nil, self, person_index: 5), + Form::Sales::Pages::PersonKnown.new("person_4_known_joint_purchase", nil, self, person_index: 6), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_4_relationship_to_buyer_1", nil, self, person_index: 5), Form::Sales::Pages::PersonRelationshipToBuyer1.new("person_4_relationship_to_buyer_1_joint_purchase", nil, self, person_index: 6), Form::Sales::Pages::PersonAge.new("person_4_age", nil, self, person_index: 5), diff --git a/config/forms/2021_2022.json b/config/forms/2021_2022.json index ca2fa6e2e..92d495f24 100644 --- a/config/forms/2021_2022.json +++ b/config/forms/2021_2022.json @@ -4624,7 +4624,7 @@ } }, "person_7_known": { - "header": "You’ve given us the details for 7 people in the household", + "header": "You’ve given us the details for 6 people in the household", "description": "", "questions": { "details_known_7": { diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json index dd6d933a3..f49070bbf 100644 --- a/config/forms/2022_2023.json +++ b/config/forms/2022_2023.json @@ -4623,7 +4623,7 @@ } }, "person_7_known": { - "header": "You’ve given us the details for 7 people in the household", + "header": "You’ve given us the details for 6 people in the household", "description": "", "questions": { "details_known_7": {