diff --git a/app/models/form/sales/pages/person1_age.rb b/app/models/form/sales/pages/person1_age.rb new file mode 100644 index 000000000..f297e656f --- /dev/null +++ b/app/models/form/sales/pages/person1_age.rb @@ -0,0 +1,22 @@ +class Form::Sales::Pages::Person1Age < ::Form::Page + def initialize(id, hsh, subsection) + super + @id = "person_1_age" + @header = "" + @description = "" + @subsection = subsection + @depends_on = [ + { "hholdcount" => 1 }, + { "hholdcount" => 2 }, + { "hholdcount" => 3 }, + { "hholdcount" => 4 }, + ] + end + + def questions + @questions ||= [ + Form::Sales::Questions::Person1AgeKnown.new(nil, nil, self), + Form::Sales::Questions::Person1Age.new(nil, nil, self), + ] + end +end diff --git a/app/models/form/sales/questions/person1_age.rb b/app/models/form/sales/questions/person1_age.rb new file mode 100644 index 000000000..49f37bcbb --- /dev/null +++ b/app/models/form/sales/questions/person1_age.rb @@ -0,0 +1,12 @@ +class Form::Sales::Questions::Person1Age < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age3" + @check_answer_label = "Person 1’s age" + @header = "Age" + @type = "numeric" + @page = page + @width = 3 + end +end + diff --git a/app/models/form/sales/questions/person1_age_known.rb b/app/models/form/sales/questions/person1_age_known.rb new file mode 100644 index 000000000..22ef82234 --- /dev/null +++ b/app/models/form/sales/questions/person1_age_known.rb @@ -0,0 +1,28 @@ +class Form::Sales::Questions::Person1AgeKnown < ::Form::Question + def initialize(id, hsh, page) + super + @id = "age3_known" + @check_answer_label = "Person 1’s age known?" + @header = "Do you know person 1’s age?" + @type = "radio" + @answer_options = ANSWER_OPTIONS + @page = page + @hint_text = "" + @conditional_for = { + "age3" => [0], + } + @hidden_in_check_answers = { + "depends_on" => [ + { + "age3_known" => 0, + }, + ], + } + @hide + 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 7af439221..c8d4ae8d6 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::Person1Age.new(nil, nil, self), ] end end diff --git a/db/migrate/20221007093606_add_person1_age_to_sales_log.rb b/db/migrate/20221007093606_add_person1_age_to_sales_log.rb new file mode 100644 index 000000000..5199d71ee --- /dev/null +++ b/db/migrate/20221007093606_add_person1_age_to_sales_log.rb @@ -0,0 +1,8 @@ +class AddPerson1AgeToSalesLog < ActiveRecord::Migration[7.0] + def change + change_table :sales_logs, bulk: true do |t| + t.column :age3, :integer + t.column :age3_known, :integer + end + end +end diff --git a/db/schema.rb b/db/schema.rb index eec74a385..f12988ab8 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_05_150022) do +ActiveRecord::Schema[7.0].define(version: 2022_10_07_093606) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -348,15 +348,16 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_05_150022) do t.integer "age2" t.integer "age2_known" t.string "relat2" - t.string "otherrelat2" t.string "sex2" t.integer "noint" t.integer "buy2livein" t.integer "ecstat2" t.integer "privacynotice" t.integer "ecstat1" - t.integer "hholdcount" t.integer "wheel" + t.integer "hholdcount" + t.integer "age3" + t.integer "age3_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"