From c89263504899015556b9cbf06013bab5a2a652fd Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Wed, 14 Dec 2022 10:51:12 +0000 Subject: [PATCH] feat: use dynamic question --- .../form/sales/pages/person1_relationship_to_buyer1.rb | 2 +- .../pages/person1_relationship_to_buyer1_joint_purchase.rb | 2 +- .../form/sales/questions/person1_relationship_to_buyer1.rb | 3 +-- .../person1_relationship_to_buyer1_joint_purchase.rb | 4 ++-- db/schema.rb | 5 +++-- 5 files changed, 8 insertions(+), 8 deletions(-) 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 b86b19aef..1bd12388c 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(nil, nil, self), + Form::Sales::Questions::Person1RelationshipToBuyer1.new("relat2", { check_answers_card_number: 2 }, 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 3c1373e21..16f1fb002 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::Person1RelationshipToBuyer1JointPurchase.new(nil, nil, self), + Form::Sales::Questions::Person1RelationshipToBuyer1.new("relat3", { check_answers_card_number: 3 }, self), ] end end 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 b90d5d864..2e4ee06f7 100644 --- a/app/models/form/sales/questions/person1_relationship_to_buyer1.rb +++ b/app/models/form/sales/questions/person1_relationship_to_buyer1.rb @@ -1,14 +1,13 @@ class Form::Sales::Questions::Person1RelationshipToBuyer1 < ::Form::Question def initialize(id, hsh, page) super - @id = "relat2" @check_answer_label = "Person 1's relationship to buyer 1" @header = "What is person 1's relationship to buyer 1?" @type = "radio" @hint_text = "" @page = page @answer_options = ANSWER_OPTIONS - @check_answers_card_number = 3 + @check_answers_card_number = hsh[:check_answers_card_number] end ANSWER_OPTIONS = { diff --git a/app/models/form/sales/questions/person1_relationship_to_buyer1_joint_purchase.rb b/app/models/form/sales/questions/person1_relationship_to_buyer1_joint_purchase.rb index b2c5d92d1..77075f044 100644 --- a/app/models/form/sales/questions/person1_relationship_to_buyer1_joint_purchase.rb +++ b/app/models/form/sales/questions/person1_relationship_to_buyer1_joint_purchase.rb @@ -1,14 +1,14 @@ class Form::Sales::Questions::Person1RelationshipToBuyer1JointPurchase < ::Form::Question def initialize(id, hsh, page) super - @id = "relat3" @check_answer_label = "Person 1's relationship to buyer 1" @header = "What is person 1's relationship to buyer 1?" @type = "radio" @hint_text = "" @page = page @answer_options = ANSWER_OPTIONS - @check_answers_card_number = 3 + @check_answers_card_number = hsh[:check_answers_card_number] + end ANSWER_OPTIONS = { diff --git a/db/schema.rb b/db/schema.rb index ac78ab8fc..04bc40b05 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2022_12_13_085819) do +ActiveRecord::Schema[7.0].define(version: 2022_12_13_130736) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -399,11 +399,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_13_085819) do t.integer "inc1mort" t.integer "income2" t.integer "income2nk" + t.integer "prevown" t.integer "savingsnk" t.integer "savings" - t.integer "prevown" t.string "sex3" t.integer "details_known_1" + t.string "relat3" t.integer "income1_value_check" t.integer "mortgage" t.integer "inc2mort"