From cb56a61668734489c89a2d5ecb0dfe5a55c5ed78 Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Mon, 12 Dec 2022 16:44:41 +0000 Subject: [PATCH] feat: add details_known_1 and use to test question display --- app/models/form/sales/pages/person1_age.rb | 5 +--- .../sales/pages/person1_gender_identity.rb | 6 ++--- .../person1_gender_identity_joint_purchase.rb | 5 +--- app/models/form/sales/pages/person1_known.rb | 22 ++++++++++++++++ app/models/form/sales/pages/person2_known.rb | 6 ++--- .../form/sales/questions/person1_known.rb | 25 +++++++++++++++++++ .../subsections/household_characteristics.rb | 1 + .../form/headers/_person_1_known_page.erb | 1 + ...2161657_add_details_known1_to_sales_log.rb | 5 ++++ db/schema.rb | 3 ++- 10 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 app/models/form/sales/pages/person1_known.rb create mode 100644 app/models/form/sales/questions/person1_known.rb create mode 100644 app/views/form/headers/_person_1_known_page.erb create mode 100644 db/migrate/20221212161657_add_details_known1_to_sales_log.rb diff --git a/app/models/form/sales/pages/person1_age.rb b/app/models/form/sales/pages/person1_age.rb index f297e656f..d37533683 100644 --- a/app/models/form/sales/pages/person1_age.rb +++ b/app/models/form/sales/pages/person1_age.rb @@ -6,10 +6,7 @@ class Form::Sales::Pages::Person1Age < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 1 }, - { "hholdcount" => 2 }, - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, + { "details_known_1" => 1 }, ] end diff --git a/app/models/form/sales/pages/person1_gender_identity.rb b/app/models/form/sales/pages/person1_gender_identity.rb index 8a5504397..fee1a15b3 100644 --- a/app/models/form/sales/pages/person1_gender_identity.rb +++ b/app/models/form/sales/pages/person1_gender_identity.rb @@ -6,10 +6,8 @@ class Form::Sales::Pages::Person1GenderIdentity < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 1, "jointpur" => 2 }, - { "hholdcount" => 2, "jointpur" => 2 }, - { "hholdcount" => 3, "jointpur" => 2 }, - { "hholdcount" => 4, "jointpur" => 2 }, + { "details_known_1" => 1, "jointpur" => 2 }, + ] end diff --git a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb index 8e714266d..4e9cca219 100644 --- a/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb +++ b/app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb @@ -6,10 +6,7 @@ class Form::Sales::Pages::Person1GenderIdentityJointPurchase < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 1, "jointpur" => 1 }, - { "hholdcount" => 2, "jointpur" => 1 }, - { "hholdcount" => 3, "jointpur" => 1 }, - { "hholdcount" => 4, "jointpur" => 1 }, + { "details_known_1" => 1, "jointpur" => 1 }, ] end diff --git a/app/models/form/sales/pages/person1_known.rb b/app/models/form/sales/pages/person1_known.rb new file mode 100644 index 000000000..315dc5f02 --- /dev/null +++ b/app/models/form/sales/pages/person1_known.rb @@ -0,0 +1,22 @@ +class Form::Sales::Pages::Person1Known < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_1_known" + @header_partial = "person_1_known_page" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "hholdcount" => 1 }, + { "hholdcount" => 2 }, + { "hholdcount" => 3 }, + { "hholdcount" => 4 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person1Known.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/pages/person2_known.rb b/app/models/form/sales/pages/person2_known.rb index c1eeebf20..eb29c1cfd 100644 --- a/app/models/form/sales/pages/person2_known.rb +++ b/app/models/form/sales/pages/person2_known.rb @@ -7,9 +7,9 @@ class Form::Sales::Pages::Person2Known < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 2 }, - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, + { "hholdcount" => 2, "details_known_1" => 1 }, + { "hholdcount" => 3, "details_known_1" => 1 }, + { "hholdcount" => 4, "details_known_1" => 1 }, ] end diff --git a/app/models/form/sales/questions/person1_known.rb b/app/models/form/sales/questions/person1_known.rb new file mode 100644 index 000000000..6f7590101 --- /dev/null +++ b/app/models/form/sales/questions/person1_known.rb @@ -0,0 +1,25 @@ +class Form::Sales::Questions::Person1Known < ::Form::Question + def initialize(id, hsh, page) + super + @id = "details_known_1" + @check_answer_label = "Details known for person 1?" + @header = "Do you know the details for person 1?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + @hidden_in_check_answers = { + "depends_on" => [ + { + "details_known_1" => 1, + }, + ], + } + @check_answers_card_number = 3 + end + + ANSWER_OPTIONS = { + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/subsections/household_characteristics.rb b/app/models/form/sales/subsections/household_characteristics.rb index 541b7734b..a2232caa2 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -28,6 +28,7 @@ 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::Person1Known.new(nil, nil, self), Form::Sales::Pages::Person1Age.new(nil, nil, self), Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self), Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self), diff --git a/app/views/form/headers/_person_1_known_page.erb b/app/views/form/headers/_person_1_known_page.erb new file mode 100644 index 000000000..b179fcdb8 --- /dev/null +++ b/app/views/form/headers/_person_1_known_page.erb @@ -0,0 +1 @@ +You have given us the details for 0 of the <%= log.hholdcount %> other people in the household diff --git a/db/migrate/20221212161657_add_details_known1_to_sales_log.rb b/db/migrate/20221212161657_add_details_known1_to_sales_log.rb new file mode 100644 index 000000000..0b0799abd --- /dev/null +++ b/db/migrate/20221212161657_add_details_known1_to_sales_log.rb @@ -0,0 +1,5 @@ +class AddDetailsKnown1ToSalesLog < ActiveRecord::Migration[7.0] + change_table :sales_logs, bulk: true do |t| + t.column :details_known_1, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index 501f738aa..f16ab6d9d 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_07_113235) do +ActiveRecord::Schema[7.0].define(version: 2022_12_12_161657) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -403,6 +403,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_07_113235) do t.integer "savingsnk" t.integer "savings" t.string "sex3" + t.integer "details_known_1" t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" t.index ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"