Browse Source

Cldc 1537 details for person 1 (#1083)

* feat: add details_known_1 and use to test question display

* refactor: remove redundant line

* test: add tests

* test: update tests
pull/1086/head
natdeanlewissoftwire 2 years ago committed by GitHub
parent
commit
6a15c51133
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 5
      app/models/form/sales/pages/person1_age.rb
  2. 5
      app/models/form/sales/pages/person1_gender_identity.rb
  3. 5
      app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb
  4. 22
      app/models/form/sales/pages/person1_known.rb
  5. 6
      app/models/form/sales/pages/person2_known.rb
  6. 25
      app/models/form/sales/questions/person1_known.rb
  7. 1
      app/models/form/sales/subsections/household_characteristics.rb
  8. 1
      app/views/form/headers/_person_1_known_page.erb
  9. 5
      db/migrate/20221212161657_add_details_known1_to_sales_log.rb
  10. 3
      db/schema.rb
  11. 1
      spec/factories/sales_log.rb
  12. 5
      spec/models/form/sales/pages/person1_age_spec.rb
  13. 5
      spec/models/form/sales/pages/person1_gender_identity_joint_purchase_spec.rb
  14. 7
      spec/models/form/sales/pages/person1_gender_identity_spec.rb
  15. 44
      spec/models/form/sales/pages/person1_known_spec.rb
  16. 6
      spec/models/form/sales/pages/person2_known_spec.rb
  17. 64
      spec/models/form/sales/questions/person1_known_spec.rb
  18. 1
      spec/models/form/sales/subsections/household_characteristics_spec.rb
  19. 4
      spec/models/form_handler_spec.rb

5
app/models/form/sales/pages/person1_age.rb

@ -6,10 +6,7 @@ class Form::Sales::Pages::Person1Age < ::Form::Page
@description = "" @description = ""
@subsection = subsection @subsection = subsection
@depends_on = [ @depends_on = [
{ "hholdcount" => 1 }, { "details_known_1" => 1 },
{ "hholdcount" => 2 },
{ "hholdcount" => 3 },
{ "hholdcount" => 4 },
] ]
end end

5
app/models/form/sales/pages/person1_gender_identity.rb

@ -6,10 +6,7 @@ class Form::Sales::Pages::Person1GenderIdentity < ::Form::Page
@description = "" @description = ""
@subsection = subsection @subsection = subsection
@depends_on = [ @depends_on = [
{ "hholdcount" => 1, "jointpur" => 2 }, { "details_known_1" => 1, "jointpur" => 2 },
{ "hholdcount" => 2, "jointpur" => 2 },
{ "hholdcount" => 3, "jointpur" => 2 },
{ "hholdcount" => 4, "jointpur" => 2 },
] ]
end end

5
app/models/form/sales/pages/person1_gender_identity_joint_purchase.rb

@ -6,10 +6,7 @@ class Form::Sales::Pages::Person1GenderIdentityJointPurchase < ::Form::Page
@description = "" @description = ""
@subsection = subsection @subsection = subsection
@depends_on = [ @depends_on = [
{ "hholdcount" => 1, "jointpur" => 1 }, { "details_known_1" => 1, "jointpur" => 1 },
{ "hholdcount" => 2, "jointpur" => 1 },
{ "hholdcount" => 3, "jointpur" => 1 },
{ "hholdcount" => 4, "jointpur" => 1 },
] ]
end end

22
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

6
app/models/form/sales/pages/person2_known.rb

@ -7,9 +7,9 @@ class Form::Sales::Pages::Person2Known < ::Form::Page
@description = "" @description = ""
@subsection = subsection @subsection = subsection
@depends_on = [ @depends_on = [
{ "hholdcount" => 2 }, { "hholdcount" => 2, "details_known_1" => 1 },
{ "hholdcount" => 3 }, { "hholdcount" => 3, "details_known_1" => 1 },
{ "hholdcount" => 4 }, { "hholdcount" => 4, "details_known_1" => 1 },
] ]
end end

25
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

1
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::Buyer2WorkingSituation.new(nil, nil, self),
Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self),
Form::Sales::Pages::NumberOfOthersInProperty.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::Person1Age.new(nil, nil, self),
Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self), Form::Sales::Pages::Person1GenderIdentity.new(nil, nil, self),
Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self), Form::Sales::Pages::Person1GenderIdentityJointPurchase.new(nil, nil, self),

1
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

5
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

3
db/schema.rb

@ -10,7 +10,7 @@
# #
# It's strongly recommended that you check this file into your version control system. # 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 # These are extensions that must be enabled in order to support this database
enable_extension "plpgsql" enable_extension "plpgsql"
@ -403,6 +403,7 @@ ActiveRecord::Schema[7.0].define(version: 2022_12_07_113235) do
t.integer "savingsnk" t.integer "savingsnk"
t.integer "savings" t.integer "savings"
t.string "sex3" t.string "sex3"
t.integer "details_known_1"
t.index ["created_by_id"], name: "index_sales_logs_on_created_by_id" 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 ["managing_organisation_id"], name: "index_sales_logs_on_managing_organisation_id"
t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id" t.index ["owning_organisation_id"], name: "index_sales_logs_on_owning_organisation_id"

1
spec/factories/sales_log.rb

@ -39,6 +39,7 @@ FactoryBot.define do
ecstat2 { "1" } ecstat2 { "1" }
hholdcount { "1" } hholdcount { "1" }
wheel { 1 } wheel { 1 }
details_known_1 { 1 }
age3_known { 0 } age3_known { 0 }
age3 { 40 } age3 { 40 }
details_known_2 { 1 } details_known_2 { 1 }

5
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 it "has correct depends_on" do
expect(page.depends_on).to eq( expect(page.depends_on).to eq(
[ [
{ "hholdcount" => 1 }, { "details_known_1" => 1 },
{ "hholdcount" => 2 },
{ "hholdcount" => 3 },
{ "hholdcount" => 4 },
], ],
) )
end end

5
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 end
it "has correct depends_on" do it "has correct depends_on" do
expect(page.depends_on).to eq([{ "hholdcount" => 1, "jointpur" => 1 }, expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 1 }])
{ "hholdcount" => 2, "jointpur" => 1 },
{ "hholdcount" => 3, "jointpur" => 1 },
{ "hholdcount" => 4, "jointpur" => 1 }])
end end
end end

7
spec/models/form/sales/pages/person1_gender_identity_spec.rb

@ -28,11 +28,6 @@ RSpec.describe Form::Sales::Pages::Person1GenderIdentity, type: :model do
end end
it "has correct depends_on" do it "has correct depends_on" do
expect(page.depends_on).to eq([ expect(page.depends_on).to eq([{ "details_known_1" => 1, "jointpur" => 2 }])
{ "hholdcount" => 1, "jointpur" => 2 },
{ "hholdcount" => 2, "jointpur" => 2 },
{ "hholdcount" => 3, "jointpur" => 2 },
{ "hholdcount" => 4, "jointpur" => 2 },
])
end end
end end

44
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

6
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 it "has correct depends_on" do
expect(page.depends_on).to eq( expect(page.depends_on).to eq(
[ [
{ "hholdcount" => 2 }, { "hholdcount" => 2, "details_known_1" => 1 },
{ "hholdcount" => 3 }, { "hholdcount" => 3, "details_known_1" => 1 },
{ "hholdcount" => 4 }, { "hholdcount" => 4, "details_known_1" => 1 },
], ],
) )
end end

64
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

1
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_working_situation
buyer_2_live_in_property buyer_2_live_in_property
number_of_others_in_property number_of_others_in_property
person_1_known
person_1_age person_1_age
person_1_gender_identity person_1_gender_identity
person_1_gender_identity_joint_purchase person_1_gender_identity_joint_purchase

4
spec/models/form_handler_spec.rb

@ -52,14 +52,14 @@ RSpec.describe FormHandler do
it "is able to load a current sales form" do it "is able to load a current sales form" do
form = form_handler.get_form("current_sales") form = form_handler.get_form("current_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2022_2023_sales")
end end
it "is able to load a previous sales form" do it "is able to load a previous sales form" do
form = form_handler.get_form("previous_sales") form = form_handler.get_form("previous_sales")
expect(form).to be_a(Form) 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") expect(form.name).to eq("2021_2022_sales")
end end
end end

Loading…
Cancel
Save