diff --git a/app/models/form/sales/pages/person3_age.rb b/app/models/form/sales/pages/person3_age.rb new file mode 100644 index 000000000..39aa45f27 --- /dev/null +++ b/app/models/form/sales/pages/person3_age.rb @@ -0,0 +1,20 @@ +class Form::Sales::Pages::Person3Age < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_3_age" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "hholdcount" => 3 }, + { "hholdcount" => 4 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person3AgeKnown.new(nil, nil, self), + Form::Sales::Questions::Person3Age.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/pages/person4_age.rb b/app/models/form/sales/pages/person4_age.rb new file mode 100644 index 000000000..d2ff447e3 --- /dev/null +++ b/app/models/form/sales/pages/person4_age.rb @@ -0,0 +1,19 @@ +class Form::Sales::Pages::Person4Age < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_4_age" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "hholdcount" => 4 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person4AgeKnown.new(nil, nil, self), + Form::Sales::Questions::Person4Age.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/person3_age.rb b/app/models/form/sales/questions/person3_age.rb new file mode 100644 index 000000000..ca6c71953 --- /dev/null +++ b/app/models/form/sales/questions/person3_age.rb @@ -0,0 +1,11 @@ +class Form::Sales::Questions::Person3Age < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age5" + @check_answer_label = "Person 3’s age" + @header = "Age" + @type = "numeric" + @page = page + @width = 3 + end +end diff --git a/app/models/form/sales/questions/person3_age_known.rb b/app/models/form/sales/questions/person3_age_known.rb new file mode 100644 index 000000000..a0e5d3da1 --- /dev/null +++ b/app/models/form/sales/questions/person3_age_known.rb @@ -0,0 +1,27 @@ +class Form::Sales::Questions::Person3AgeKnown < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age5_known" + @check_answer_label = "Person 3’s age known?" + @header = "Do you know person 3’s age?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + @conditional_for = { + "age5" => [0], + } + @hidden_in_check_answers = { + "depends_on" => [ + { + "age5_known" => 0, + }, + ], + } + end + + ANSWER_OPTIONS = { + "0" => { "value" => "Yes" }, + "1" => { "value" => "No" }, + }.freeze +end diff --git a/app/models/form/sales/questions/person4_age.rb b/app/models/form/sales/questions/person4_age.rb new file mode 100644 index 000000000..ca858fe72 --- /dev/null +++ b/app/models/form/sales/questions/person4_age.rb @@ -0,0 +1,11 @@ +class Form::Sales::Questions::Person4Age < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age6" + @check_answer_label = "Person 4’s age" + @header = "Age" + @type = "numeric" + @page = page + @width = 3 + end +end diff --git a/app/models/form/sales/questions/person4_age_known.rb b/app/models/form/sales/questions/person4_age_known.rb new file mode 100644 index 000000000..2ba5256da --- /dev/null +++ b/app/models/form/sales/questions/person4_age_known.rb @@ -0,0 +1,27 @@ +class Form::Sales::Questions::Person4AgeKnown < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age6_known" + @check_answer_label = "Person 4’s age known?" + @header = "Do you know person 4’s age?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + @conditional_for = { + "age6" => [0], + } + @hidden_in_check_answers = { + "depends_on" => [ + { + "age6_known" => 0, + }, + ], + } + end + + ANSWER_OPTIONS = { + "0" => { "value" => "Yes" }, + "1" => { "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 c8d4ae8d6..c7c0846c3 100644 --- a/app/models/form/sales/subsections/household_characteristics.rb +++ b/app/models/form/sales/subsections/household_characteristics.rb @@ -29,6 +29,9 @@ class Form::Sales::Subsections::HouseholdCharacteristics < ::Form::Subsection Form::Sales::Pages::Buyer2LiveInProperty.new(nil, nil, self), Form::Sales::Pages::NumberOfOthersInProperty.new(nil, nil, self), Form::Sales::Pages::Person1Age.new(nil, nil, self), + Form::Sales::Pages::Person2Age.new(nil, nil, self), + Form::Sales::Pages::Person3Age.new(nil, nil, self), + Form::Sales::Pages::Person4Age.new(nil, nil, self), ] end end diff --git a/db/migrate/20221011094347_add_more_ages_to_sales_log.rb b/db/migrate/20221011094347_add_more_ages_to_sales_log.rb new file mode 100644 index 000000000..645b47497 --- /dev/null +++ b/db/migrate/20221011094347_add_more_ages_to_sales_log.rb @@ -0,0 +1,12 @@ +class AddMoreAgesToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :age4, :integer + t.column :age4_known, :integer + t.column :age5, :integer + t.column :age5_known, :integer + t.column :age6, :integer + t.column :age6_known, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index f12988ab8..51aa4c704 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_10_07_093606) do +ActiveRecord::Schema[7.0].define(version: 2022_10_11_094347) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -358,6 +358,12 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_07_093606) do t.integer "hholdcount" t.integer "age3" t.integer "age3_known" + t.integer "age4" + t.integer "age4_known" + t.integer "age5" + t.integer "age5_known" + t.integer "age6" + t.integer "age6_known" 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"