diff --git a/app/models/form/sales/pages/person2_age.rb b/app/models/form/sales/pages/person2_age.rb index aaf818b5a..3b300f957 100644 --- a/app/models/form/sales/pages/person2_age.rb +++ b/app/models/form/sales/pages/person2_age.rb @@ -6,9 +6,9 @@ class Form::Sales::Pages::Person2Age < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 2 }, - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, + { "hholdcount" => 2, "details_known_2" => 1 }, + { "hholdcount" => 3, "details_known_2" => 1 }, + { "hholdcount" => 4, "details_known_2" => 1 }, ] end diff --git a/app/models/form/sales/pages/person3_age.rb b/app/models/form/sales/pages/person3_age.rb index 39aa45f27..0f8635b23 100644 --- a/app/models/form/sales/pages/person3_age.rb +++ b/app/models/form/sales/pages/person3_age.rb @@ -6,8 +6,8 @@ class Form::Sales::Pages::Person3Age < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, + { "hholdcount" => 3, "details_known_3" => 1 }, + { "hholdcount" => 4, "details_known_3" => 1 }, ] end diff --git a/app/models/form/sales/pages/person3_known.rb b/app/models/form/sales/pages/person3_known.rb index 60b344034..7671a0de4 100644 --- a/app/models/form/sales/pages/person3_known.rb +++ b/app/models/form/sales/pages/person3_known.rb @@ -7,8 +7,8 @@ class Form::Sales::Pages::Person3Known < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 3 }, - { "hholdcount" => 4 }, + { "hholdcount" => 3, "details_known_2" => 1 }, + { "hholdcount" => 4, "details_known_2" => 1 }, ] end diff --git a/app/models/form/sales/pages/person4_age.rb b/app/models/form/sales/pages/person4_age.rb index d2ff447e3..42d926c2b 100644 --- a/app/models/form/sales/pages/person4_age.rb +++ b/app/models/form/sales/pages/person4_age.rb @@ -6,7 +6,7 @@ class Form::Sales::Pages::Person4Age < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 4 }, + { "hholdcount" => 4, "details_known_4" => 1 }, ] end diff --git a/app/models/form/sales/pages/person4_known.rb b/app/models/form/sales/pages/person4_known.rb index b07ef6356..c6c0208ea 100644 --- a/app/models/form/sales/pages/person4_known.rb +++ b/app/models/form/sales/pages/person4_known.rb @@ -7,7 +7,7 @@ class Form::Sales::Pages::Person4Known < ::Form::Page @description = "" @subsection = subsection @depends_on = [ - { "hholdcount" => 4 }, + { "hholdcount" => 4, "details_known_3" => 1 }, ] end diff --git a/app/models/form/sales/questions/person2_age_known.rb b/app/models/form/sales/questions/person2_age_known.rb index d91fc87ad..af06a0eb8 100644 --- a/app/models/form/sales/questions/person2_age_known.rb +++ b/app/models/form/sales/questions/person2_age_known.rb @@ -16,6 +16,12 @@ class Form::Sales::Questions::Person2AgeKnown < ::Form::Question { "age4_known" => 0, }, + { + "details_known_2" => nil, + }, + { + "details_known_2" => 2, + }, ], } end diff --git a/app/models/form/sales/questions/person3_age_known.rb b/app/models/form/sales/questions/person3_age_known.rb index a0e5d3da1..c784ef1cb 100644 --- a/app/models/form/sales/questions/person3_age_known.rb +++ b/app/models/form/sales/questions/person3_age_known.rb @@ -16,6 +16,12 @@ class Form::Sales::Questions::Person3AgeKnown < ::Form::Question { "age5_known" => 0, }, + { + "details_known_3" => nil, + }, + { + "details_known_3" => 2, + }, ], } end diff --git a/app/models/form/sales/questions/person4_age_known.rb b/app/models/form/sales/questions/person4_age_known.rb index 2ba5256da..e21aa51d6 100644 --- a/app/models/form/sales/questions/person4_age_known.rb +++ b/app/models/form/sales/questions/person4_age_known.rb @@ -16,6 +16,12 @@ class Form::Sales::Questions::Person4AgeKnown < ::Form::Question { "age6_known" => 0, }, + { + "details_known_4" => nil, + }, + { + "details_known_4" => 2, + }, ], } end diff --git a/app/views/form/headers/_person_4_known_page.erb b/app/views/form/headers/_person_4_known_page.erb new file mode 100644 index 000000000..3c9ec278e --- /dev/null +++ b/app/views/form/headers/_person_4_known_page.erb @@ -0,0 +1 @@ +You have given us the details for 3 of the <%= hholdcount %> other people in the household diff --git a/db/migrate/20221010153632_add_person2_age_to_sales_log.rb b/db/migrate/20221010153632_add_person2_age_to_sales_log.rb deleted file mode 100644 index 6e6387203..000000000 --- a/db/migrate/20221010153632_add_person2_age_to_sales_log.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddPerson2AgeToSalesLog < ActiveRecord::Migration[7.0] - def change - change_table :sales_logs, bulk: true do |t| - t.column :age4, :integer - t.column :age4_known, :integer - end - end -end diff --git a/db/schema.rb b/db/schema.rb index 51aa4c704..20dfe0f81 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -358,6 +358,9 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_11_094347) do t.integer "hholdcount" t.integer "age3" t.integer "age3_known" + t.integer "details_known_2" + t.integer "details_known_3" + t.integer "details_known_4" t.integer "age4" t.integer "age4_known" t.integer "age5"