diff --git a/app/models/form/sales/pages/person1_age.rb b/app/models/form/sales/pages/person1_age.rb index d7bae480d..d669c76eb 100644 --- a/app/models/form/sales/pages/person1_age.rb +++ b/app/models/form/sales/pages/person1_age.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person1Age < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person1AgeKnown.new("age2_known", { check_answers_card_number: 2, - conditional_for: { - "age2" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age2_known" => 0, - }, - { - "age2_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person1Age.new("age2", { check_answers_card_number: 2, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 1 }] }, - inferred_check_answers_value: { "condition" => { "age2_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person1AgeKnown.new("age2_known", nil, self), + Form::Sales::Questions::Person1Age.new("age2", nil, self), ] end end diff --git a/app/models/form/sales/pages/person1_age_joint_purchase.rb b/app/models/form/sales/pages/person1_age_joint_purchase.rb index ee7fa9a18..fa40a59f1 100644 --- a/app/models/form/sales/pages/person1_age_joint_purchase.rb +++ b/app/models/form/sales/pages/person1_age_joint_purchase.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person1AgeJointPurchase < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person1AgeKnown.new("age3_known", { check_answers_card_number: 3, - conditional_for: { - "age3" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age3_known" => 0, - }, - { - "age3_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person1Age.new("age3", { check_answers_card_number: 3, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 2 }] }, - inferred_check_answers_value: { "condition" => { "age3_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person1AgeKnown.new("age3_known", nil, self), + Form::Sales::Questions::Person1Age.new("age3", nil, self), ] end end diff --git a/app/models/form/sales/pages/person1_relationship_to_buyer1.rb b/app/models/form/sales/pages/person1_relationship_to_buyer1.rb index 1bd12388c..7ee7787a8 100644 --- a/app/models/form/sales/pages/person1_relationship_to_buyer1.rb +++ b/app/models/form/sales/pages/person1_relationship_to_buyer1.rb @@ -15,7 +15,7 @@ class Form::Sales::Pages::Person1RelationshipToBuyer1 < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person1RelationshipToBuyer1.new("relat2", { check_answers_card_number: 2 }, self), + Form::Sales::Questions::Person1RelationshipToBuyer1.new("relat2", nil, self), ] end end diff --git a/app/models/form/sales/pages/person1_relationship_to_buyer1_joint_purchase.rb b/app/models/form/sales/pages/person1_relationship_to_buyer1_joint_purchase.rb index 16f1fb002..5c91452c0 100644 --- a/app/models/form/sales/pages/person1_relationship_to_buyer1_joint_purchase.rb +++ b/app/models/form/sales/pages/person1_relationship_to_buyer1_joint_purchase.rb @@ -15,7 +15,7 @@ class Form::Sales::Pages::Person1RelationshipToBuyer1JointPurchase < ::Form::Pag def questions @questions ||= [ - Form::Sales::Questions::Person1RelationshipToBuyer1.new("relat3", { check_answers_card_number: 3 }, self), + Form::Sales::Questions::Person1RelationshipToBuyer1.new("relat3", nil, self), ] end end diff --git a/app/models/form/sales/pages/person2_age.rb b/app/models/form/sales/pages/person2_age.rb index 816ea4dec..bee287c18 100644 --- a/app/models/form/sales/pages/person2_age.rb +++ b/app/models/form/sales/pages/person2_age.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person2Age < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person2AgeKnown.new("age3_known", { check_answers_card_number: 3, - conditional_for: { - "age3" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age3_known" => 0, - }, - { - "age3_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person2Age.new("age3", { check_answers_card_number: 3, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 1 }] }, - inferred_check_answers_value: { "condition" => { "age3_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person2AgeKnown.new("age3_known", nil, self), + Form::Sales::Questions::Person2Age.new("age3", nil, self), ] end end diff --git a/app/models/form/sales/pages/person2_age_joint_purchase.rb b/app/models/form/sales/pages/person2_age_joint_purchase.rb index 8bfd9b1fc..96d6d61ec 100644 --- a/app/models/form/sales/pages/person2_age_joint_purchase.rb +++ b/app/models/form/sales/pages/person2_age_joint_purchase.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person2AgeJointPurchase < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person2AgeKnown.new("age4_known", { check_answers_card_number: 4, - conditional_for: { - "age4" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age4_known" => 0, - }, - { - "age4_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person2Age.new("age4", { check_answers_card_number: 4, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 2 }] }, - inferred_check_answers_value: { "condition" => { "age4_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person2AgeKnown.new("age4_known", nil, self), + Form::Sales::Questions::Person2Age.new("age4", nil, self), ] end end diff --git a/app/models/form/sales/pages/person3_age.rb b/app/models/form/sales/pages/person3_age.rb index 0e0e67603..9156ae831 100644 --- a/app/models/form/sales/pages/person3_age.rb +++ b/app/models/form/sales/pages/person3_age.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person3Age < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person3AgeKnown.new("age4_known", { check_answers_card_number: 4, - conditional_for: { - "age4" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age4_known" => 0, - }, - { - "age4_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person3Age.new("age4", { check_answers_card_number: 4, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 1 }] }, - inferred_check_answers_value: { "condition" => { "age4_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person3AgeKnown.new("age4_known", nil, self), + Form::Sales::Questions::Person3Age.new("age4", nil, self), ] end end diff --git a/app/models/form/sales/pages/person3_age_joint_purchase.rb b/app/models/form/sales/pages/person3_age_joint_purchase.rb index 6043d723d..5cad52685 100644 --- a/app/models/form/sales/pages/person3_age_joint_purchase.rb +++ b/app/models/form/sales/pages/person3_age_joint_purchase.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person3AgeJointPurchase < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person3AgeKnown.new("age5_known", { check_answers_card_number: 5, - conditional_for: { - "age5" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age5_known" => 0, - }, - { - "age5_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person3Age.new("age5", { check_answers_card_number: 5, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 2 }] }, - inferred_check_answers_value: { "condition" => { "age5_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person3AgeKnown.new("age5_known", nil, self), + Form::Sales::Questions::Person3Age.new("age5", nil, self), ] end end diff --git a/app/models/form/sales/pages/person4_age.rb b/app/models/form/sales/pages/person4_age.rb index e84a32454..0e24128be 100644 --- a/app/models/form/sales/pages/person4_age.rb +++ b/app/models/form/sales/pages/person4_age.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person4Age < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person4AgeKnown.new("age5_known", { check_answers_card_number: 5, - conditional_for: { - "age5" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age5_known" => 0, - }, - { - "age5_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person4Age.new("age5", { check_answers_card_number: 5, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 1 }] }, - inferred_check_answers_value: { "condition" => { "age5_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person4AgeKnown.new("age5_known", nil, self), + Form::Sales::Questions::Person4Age.new("age5", nil, self), ] end end diff --git a/app/models/form/sales/pages/person4_age_joint_purchase.rb b/app/models/form/sales/pages/person4_age_joint_purchase.rb index 765f1aaf5..e3e6a2ce1 100644 --- a/app/models/form/sales/pages/person4_age_joint_purchase.rb +++ b/app/models/form/sales/pages/person4_age_joint_purchase.rb @@ -12,23 +12,8 @@ class Form::Sales::Pages::Person4AgeJointPurchase < ::Form::Page def questions @questions ||= [ - Form::Sales::Questions::Person4AgeKnown.new("age6_known", { check_answers_card_number: 6, - conditional_for: { - "age6" => [0], - }, - hidden_in_check_answers: { - "depends_on" => [ - { - "age6_known" => 0, - }, - { - "age6_known" => 1, - }, - ], - } }, self), - Form::Sales::Questions::Person4Age.new("age6", { check_answers_card_number: 6, - hidden_in_check_answers: { "depends_on" => [{ "jointpur" => 2 }] }, - inferred_check_answers_value: { "condition" => { "age6_known" => 1 }, "value" => "Not known" } }, self), + Form::Sales::Questions::Person4AgeKnown.new("age6_known", nil, self), + Form::Sales::Questions::Person4Age.new("age6", nil, self), ] end end diff --git a/app/models/form/sales/questions/person1_age.rb b/app/models/form/sales/questions/person1_age.rb index d1936caee..501a45fe5 100644 --- a/app/models/form/sales/questions/person1_age.rb +++ b/app/models/form/sales/questions/person1_age.rb @@ -6,8 +6,16 @@ class Form::Sales::Questions::Person1Age < ::Form::Question @type = "numeric" @page = page @width = 3 - @inferred_check_answers_value = hsh[:inferred_check_answers_value] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @inferred_check_answers_value = if id == "age2" + { "condition" => { "age2_known" => 1 }, "value" => "Not known" } + else + { "condition" => { "age3_known" => 1 }, "value" => "Not known" } + end + @hidden_in_check_answers = if id == "age2" + { "depends_on" => [{ "jointpur" => 1 }] } + else + { "depends_on" => [{ "jointpur" => 2 }] } + end + @check_answers_card_number = id == "age2" ? 2 : 3 end end diff --git a/app/models/form/sales/questions/person1_age_known.rb b/app/models/form/sales/questions/person1_age_known.rb index f6f78ebe4..610ad1aec 100644 --- a/app/models/form/sales/questions/person1_age_known.rb +++ b/app/models/form/sales/questions/person1_age_known.rb @@ -7,9 +7,39 @@ class Form::Sales::Questions::Person1AgeKnown < ::Form::Question @answer_options = ANSWER_OPTIONS @page = page @hint_text = "" - @conditional_for = hsh[:conditional_for] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @conditional_for = if id == "age2_known" + { + "age2" => [0], + } + else + { + "age3" => [0], + } + end + @hidden_in_check_answers = if id == "age2_known" + { + "depends_on" => [ + { + "age2_known" => 0, + }, + { + "age2_known" => 1, + }, + ], + } + else + { + "depends_on" => [ + { + "age3_known" => 0, + }, + { + "age3_known" => 1, + }, + ], + } + end + @check_answers_card_number = id == "age2_known" ? 2 : 3 end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person1_relationship_to_buyer1.rb b/app/models/form/sales/questions/person1_relationship_to_buyer1.rb index 2e4ee06f7..dcabc950a 100644 --- a/app/models/form/sales/questions/person1_relationship_to_buyer1.rb +++ b/app/models/form/sales/questions/person1_relationship_to_buyer1.rb @@ -7,7 +7,7 @@ class Form::Sales::Questions::Person1RelationshipToBuyer1 < ::Form::Question @hint_text = "" @page = page @answer_options = ANSWER_OPTIONS - @check_answers_card_number = hsh[:check_answers_card_number] + @check_answers_card_number = id == "relat2" ? 2 : 3 end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person2_age.rb b/app/models/form/sales/questions/person2_age.rb index 7cbcd6b61..93c455149 100644 --- a/app/models/form/sales/questions/person2_age.rb +++ b/app/models/form/sales/questions/person2_age.rb @@ -6,8 +6,16 @@ class Form::Sales::Questions::Person2Age < ::Form::Question @type = "numeric" @page = page @width = 3 - @inferred_check_answers_value = hsh[:inferred_check_answers_value] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @inferred_check_answers_value = if id == "age3" + { "condition" => { "age3_known" => 1 }, "value" => "Not known" } + else + { "condition" => { "age4_known" => 1 }, "value" => "Not known" } + end + @hidden_in_check_answers = if id == "age3" + { "depends_on" => [{ "jointpur" => 1 }] } + else + { "depends_on" => [{ "jointpur" => 2 }] } + end + @check_answers_card_number = id == "age3" ? 3 : 4 end end diff --git a/app/models/form/sales/questions/person2_age_known.rb b/app/models/form/sales/questions/person2_age_known.rb index a8cd7883d..ac87e3aac 100644 --- a/app/models/form/sales/questions/person2_age_known.rb +++ b/app/models/form/sales/questions/person2_age_known.rb @@ -7,9 +7,39 @@ class Form::Sales::Questions::Person2AgeKnown < ::Form::Question @answer_options = ANSWER_OPTIONS @page = page @hint_text = "" - @conditional_for = hsh[:conditional_for] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @conditional_for = if id == "age3_known" + { + "age3" => [0], + } + else + { + "age4" => [0], + } + end + @hidden_in_check_answers = if id == "age3_known" + { + "depends_on" => [ + { + "age3_known" => 0, + }, + { + "age3_known" => 1, + }, + ], + } + else + { + "depends_on" => [ + { + "age4_known" => 0, + }, + { + "age4_known" => 1, + }, + ], + } + end + @check_answers_card_number = id == "age3_known" ? 3 : 4 end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person3_age.rb b/app/models/form/sales/questions/person3_age.rb index f94a45cdb..b376a1d6d 100644 --- a/app/models/form/sales/questions/person3_age.rb +++ b/app/models/form/sales/questions/person3_age.rb @@ -6,8 +6,16 @@ class Form::Sales::Questions::Person3Age < ::Form::Question @type = "numeric" @page = page @width = 3 - @inferred_check_answers_value = hsh[:inferred_check_answers_value] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @inferred_check_answers_value = if id == "age4" + { "condition" => { "age4_known" => 1 }, "value" => "Not known" } + else + { "condition" => { "age5_known" => 1 }, "value" => "Not known" } + end + @hidden_in_check_answers = if id == "age4" + { "depends_on" => [{ "jointpur" => 1 }] } + else + { "depends_on" => [{ "jointpur" => 2 }] } + end + @check_answers_card_number = id == "age4" ? 4 : 5 end end diff --git a/app/models/form/sales/questions/person3_age_known.rb b/app/models/form/sales/questions/person3_age_known.rb index be8027107..08e41b686 100644 --- a/app/models/form/sales/questions/person3_age_known.rb +++ b/app/models/form/sales/questions/person3_age_known.rb @@ -7,9 +7,39 @@ class Form::Sales::Questions::Person3AgeKnown < ::Form::Question @answer_options = ANSWER_OPTIONS @page = page @hint_text = "" - @conditional_for = hsh[:conditional_for] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @conditional_for = if id == "age4_known" + { + "age4" => [0], + } + else + { + "age5" => [0], + } + end + @hidden_in_check_answers = if id == "age4_known" + { + "depends_on" => [ + { + "age4_known" => 0, + }, + { + "age4_known" => 1, + }, + ], + } + else + { + "depends_on" => [ + { + "age5_known" => 0, + }, + { + "age5_known" => 1, + }, + ], + } + end + @check_answers_card_number = id == "age4_known" ? 4 : 5 end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person4_age.rb b/app/models/form/sales/questions/person4_age.rb index 33562e6db..fa59a4916 100644 --- a/app/models/form/sales/questions/person4_age.rb +++ b/app/models/form/sales/questions/person4_age.rb @@ -6,8 +6,16 @@ class Form::Sales::Questions::Person4Age < ::Form::Question @type = "numeric" @page = page @width = 3 - @inferred_check_answers_value = hsh[:inferred_check_answers_value] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @inferred_check_answers_value = if id == "age5" + { "condition" => { "age5_known" => 1 }, "value" => "Not known" } + else + { "condition" => { "age6_known" => 1 }, "value" => "Not known" } + end + @hidden_in_check_answers = if id == "age5" + { "depends_on" => [{ "jointpur" => 1 }] } + else + { "depends_on" => [{ "jointpur" => 2 }] } + end + @check_answers_card_number = id == "age5" ? 5 : 6 end end diff --git a/app/models/form/sales/questions/person4_age_known.rb b/app/models/form/sales/questions/person4_age_known.rb index a03cccc46..fd8c14ae7 100644 --- a/app/models/form/sales/questions/person4_age_known.rb +++ b/app/models/form/sales/questions/person4_age_known.rb @@ -7,9 +7,39 @@ class Form::Sales::Questions::Person4AgeKnown < ::Form::Question @answer_options = ANSWER_OPTIONS @page = page @hint_text = "" - @conditional_for = hsh[:conditional_for] - @hidden_in_check_answers = hsh[:hidden_in_check_answers] - @check_answers_card_number = hsh[:check_answers_card_number] + @conditional_for = if id == "age5_known" + { + "age5" => [0], + } + else + { + "age6" => [0], + } + end + @hidden_in_check_answers = if id == "age5_known" + { + "depends_on" => [ + { + "age5_known" => 0, + }, + { + "age5_known" => 1, + }, + ], + } + else + { + "depends_on" => [ + { + "age6_known" => 0, + }, + { + "age6_known" => 1, + }, + ], + } + end + @check_answers_card_number = id == "age5_known" ? 5 : 6 end ANSWER_OPTIONS = {