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..3e6bde9bc 100644 --- a/app/models/form/sales/pages/person1_gender_identity.rb +++ b/app/models/form/sales/pages/person1_gender_identity.rb @@ -6,10 +6,7 @@ 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" diff --git a/spec/factories/sales_log.rb b/spec/factories/sales_log.rb index 2e6729a4f..945b58201 100644 --- a/spec/factories/sales_log.rb +++ b/spec/factories/sales_log.rb @@ -39,6 +39,7 @@ FactoryBot.define do ecstat2 { "1" } hholdcount { "1" } wheel { 1 } + details_known_1 { 1 } age3_known { 0 } age3 { 40 } details_known_2 { 1 } diff --git a/spec/models/form/sales/pages/person1_age_spec.rb b/spec/models/form/sales/pages/person1_age_spec.rb index 38f4ac039..553a7cff4 100644 --- a/spec/models/form/sales/pages/person1_age_spec.rb +++ b/spec/models/form/sales/pages/person1_age_spec.rb @@ -30,10 +30,7 @@ RSpec.describe Form::Sales::Pages::Person1Age, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( [ - { "hholdcount" => 1 }, - { "hholdcount" => 2 }, - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, + { "details_known_1" => 1 }, ], ) end diff --git a/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb index 1b0bfdc52..94975b2e3 100644 --- a/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb +++ b/spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb @@ -28,9 +28,6 @@ RSpec.describe Form::Sales::Pages::Person1GenderIdentityJointPurchase, type: :mo end it "has correct depends_on" do - expect(page.depends_on).to eq([{ "hholdcount" => 1, "jointpur" => 1 }, - { "hholdcount" => 2, "jointpur" => 1 }, - { "hholdcount" => 3, "jointpur" => 1 }, - { "hholdcount" => 4, "jointpur" => 1 }]) + expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 1 }]) end end diff --git a/spec/models/form/sales/pages/person1_gender_identity_spec.rb b/spec/models/form/sales/pages/person1_gender_identity_spec.rb index 54a8eaf4f..ac63a1da7 100644 --- a/spec/models/form/sales/pages/person1_gender_identity_spec.rb +++ b/spec/models/form/sales/pages/person1_gender_identity_spec.rb @@ -28,11 +28,6 @@ RSpec.describe Form::Sales::Pages::Person1GenderIdentity, type: :model do end it "has correct depends_on" do - expect(page.depends_on).to eq([ - { "hholdcount" => 1, "jointpur" => 2 }, - { "hholdcount" => 2, "jointpur" => 2 }, - { "hholdcount" => 3, "jointpur" => 2 }, - { "hholdcount" => 4, "jointpur" => 2 }, - ]) + expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 2 }]) end end diff --git a/spec/models/form/sales/pages/person1_known_spec.rb b/spec/models/form/sales/pages/person1_known_spec.rb new file mode 100644 index 000000000..9353b82aa --- /dev/null +++ b/spec/models/form/sales/pages/person1_known_spec.rb @@ -0,0 +1,44 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Pages::Person1Known, type: :model do + subject(:page) { described_class.new(page_id, page_definition, subsection) } + + let(:page_id) { nil } + let(:page_definition) { nil } + let(:subsection) { instance_double(Form::Subsection) } + + it "has correct subsection" do + expect(page.subsection).to eq(subsection) + end + + it "has correct questions" do + expect(page.questions.map(&:id)).to eq(%w[details_known_1]) + end + + it "has the correct id" do + expect(page.id).to eq("person_1_known") + end + + it "has the correct header" do + expect(page.header).to eq("") + end + + it "has the correct header_partial" do + expect(page.header_partial).to eq("person_1_known_page") + end + + it "has the correct description" do + expect(page.description).to eq("") + end + + it "has correct depends_on" do + expect(page.depends_on).to eq( + [ + { "hholdcount" => 1 }, + { "hholdcount" => 2 }, + { "hholdcount" => 3 }, + { "hholdcount" => 4 }, + ], + ) + end +end diff --git a/spec/models/form/sales/pages/person2_known_spec.rb b/spec/models/form/sales/pages/person2_known_spec.rb index 57bac950f..46ab592de 100644 --- a/spec/models/form/sales/pages/person2_known_spec.rb +++ b/spec/models/form/sales/pages/person2_known_spec.rb @@ -34,9 +34,9 @@ RSpec.describe Form::Sales::Pages::Person2Known, type: :model do it "has correct depends_on" do expect(page.depends_on).to eq( [ - { "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/spec/models/form/sales/questions/person1_known_spec.rb b/spec/models/form/sales/questions/person1_known_spec.rb new file mode 100644 index 000000000..e1207ea1b --- /dev/null +++ b/spec/models/form/sales/questions/person1_known_spec.rb @@ -0,0 +1,64 @@ +require "rails_helper" + +RSpec.describe Form::Sales::Questions::Person1Known, type: :model do + subject(:question) { described_class.new(question_id, question_definition, page) } + + let(:question_id) { nil } + let(:question_definition) { nil } + let(:page) { instance_double(Form::Page) } + + it "has correct page" do + expect(question.page).to eq(page) + end + + it "has the correct id" do + expect(question.id).to eq("details_known_1") + end + + it "has the correct header" do + expect(question.header).to eq("Do you know the details for person 1?") + end + + it "has the correct check_answer_label" do + expect(question.check_answer_label).to eq("Details known for person 1?") + end + + it "has the correct type" do + expect(question.type).to eq("radio") + end + + it "is not marked as derived" do + expect(question.derived?).to be false + end + + it "has the correct answer_options" do + expect(question.answer_options).to eq({ + "1" => { "value" => "Yes" }, + "2" => { "value" => "No" }, + }) + end + + it "has correct conditional for" do + expect(question.conditional_for).to eq(nil) + end + + it "has the correct hint" do + expect(question.hint_text).to eq("") + end + + it "has the correct hidden_in_check_answers" do + expect(question.hidden_in_check_answers).to eq( + { + "depends_on" => [ + { + "details_known_1" => 1, + }, + ], + }, + ) + end + + it "has the correct check_answers_card_number" do + expect(question.check_answers_card_number).to eq(3) + end +end diff --git a/spec/models/form/sales/subsections/household_characteristics_spec.rb b/spec/models/form/sales/subsections/household_characteristics_spec.rb index 0146e9aea..63c27291f 100644 --- a/spec/models/form/sales/subsections/household_characteristics_spec.rb +++ b/spec/models/form/sales/subsections/household_characteristics_spec.rb @@ -33,6 +33,7 @@ RSpec.describe Form::Sales::Subsections::HouseholdCharacteristics, type: :model buyer_2_working_situation buyer_2_live_in_property number_of_others_in_property + person_1_known person_1_age person_1_gender_identity person_1_gender_identity_joint_purchase diff --git a/spec/models/form_handler_spec.rb b/spec/models/form_handler_spec.rb index fe979ac27..c328d6ad0 100644 --- a/spec/models/form_handler_spec.rb +++ b/spec/models/form_handler_spec.rb @@ -52,14 +52,14 @@ RSpec.describe FormHandler do it "is able to load a current sales form" do form = form_handler.get_form("current_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(50) + expect(form.pages.count).to eq(51) expect(form.name).to eq("2022_2023_sales") end it "is able to load a previous sales form" do form = form_handler.get_form("previous_sales") expect(form).to be_a(Form) - expect(form.pages.count).to eq(50) + expect(form.pages.count).to eq(51) expect(form.name).to eq("2021_2022_sales") end end