feat: add more age questions

app/models/form.rb

@@ -60,6 +60,8 @@ class Form
     page_index = page_ids.index(page.id)
     page_id = if page.id.include?("value_check") && log[page.questions[0].id] == 1 && page.routed_to?(log, current_user)
                 previous_page(page_ids, page_index, log, current_user)
+              elsif page.id == ("person_x_known")
+                "person_1_age"
               else
                 page_ids[page_index + 1]
               end

app/models/form/page.rb

@@ -41,4 +41,8 @@ private
       q.conditional_for.keys if q.type == "radio"
     }.compact
   end
+
+  def person_x_known_id
+    "person_x_known"
+  end
 end

app/models/form/sales/pages/person_2_age.rb

@@ -0,0 +1,22 @@
+class Form::Sales::Pages::Person2Age < ::Form::Page
+  def initialize(id, hsh, subsection)
+    super
+    @id = "person_2_age"
+    @header = ""
+    @description = ""
+    @subsection = subsection
+    @depends_on = [
+      { "hholdcount" => 1 },
+      { "hholdcount" => 2 },
+      { "hholdcount" => 3 },
+      { "hholdcount" => 4 },
+    ]
+  end
+
+  def questions
+    @questions ||= [
+      Form::Sales::Questions::Person2AgeKnown.new(nil, nil, self),
+      Form::Sales::Questions::Person2Age.new(nil, nil, self),
+    ]
+  end
+end

app/models/form/sales/pages/person_x_known.rb

@@ -1,8 +1,8 @@
-class Form::Sales::Pages::Person2Known < ::Form::Page
+class Form::Sales::Pages::PersonXKnown < ::Form::Page
   def initialize(id, hsh, subsection)
     super
-    @id = "person_2_known"
-    @header_partial = "personx_known_page"
+    @id = person_x_known_id
+    @header_partial = "person_x_known_page"
     @header = ""
     @description = ""
     @subsection = subsection
@@ -15,7 +15,7 @@ class Form::Sales::Pages::Person2Known < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::Person2Known.new(nil, nil, self),
+      Form::Sales::Questions::PersonXKnown.new(nil, nil, self),
     ]
   end
 end

app/models/form/sales/questions/person2_age.rb

@@ -0,0 +1,11 @@
+class Form::Sales::Questions::Person2Age < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "age4"
+    @check_answer_label = "Person 2’s age"
+    @header = "Age"
+    @type = "numeric"
+    @page = page
+    @width = 3
+  end
+end

app/models/form/sales/questions/person2_age_known.rb

@@ -0,0 +1,27 @@
+class Form::Sales::Questions::Person2AgeKnown < ::Form::Question
+  def initialize(id, hsh, page)
+    super
+    @id = "age4_known"
+    @check_answer_label = "Person 2’s age known?"
+    @header = "Do you know person 2’s age?"
+    @type = "radio"
+    @answer_options = ANSWER_OPTIONS
+    @page = page
+    @hint_text = ""
+    @conditional_for = {
+      "age4" => [0],
+    }
+    @hidden_in_check_answers = {
+      "depends_on" => [
+        {
+          "age4_known" => 0,
+        },
+      ],
+    }
+  end
+
+  ANSWER_OPTIONS = {
+    "0" => { "value" => "Yes" },
+    "1" => { "value" => "No" },
+  }.freeze
+end

app/models/form/sales/questions/person_x_known.rb

@@ -1,9 +1,9 @@
-class Form::Sales::Questions::Person2Known < ::Form::Question
+class Form::Sales::Questions::PersonXKnown < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "details_known_2"
-    @check_answer_label = "Details known for person 2"
-    @header = "Do you know the details for person 2?"
+    @check_answer_label = "Details known for person X"
+    @header = "Do you know the details for person X?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @page = page

app/models/form/sales/subsections/household_characteristics.rb

@@ -29,7 +29,8 @@ 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::Person2Known.new(nil, nil, self),
+      Form::Sales::Pages::Person2Age.new(nil, nil, self),
+      Form::Sales::Pages::PersonXKnown.new(nil, nil, self),
     ]
   end
 end

app/views/form/headers/_person_x_known_page.erb

@@ -0,0 +1 @@
+You have given us the details for X of the <%= hholdcount %> other people in the household

app/views/form/headers/_personx_known_page.erb

@@ -1 +0,0 @@
-You have given us the details for 1 of the <%= hholdcount %> other people in the household

db/migrate/20221010153632_add_person2_age_to_sales_log.rb

@@ -0,0 +1,8 @@
+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

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_10_085259) do
+ActiveRecord::Schema[7.0].define(version: 2022_10_10_153632) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
 
@@ -361,6 +361,8 @@ ActiveRecord::Schema[7.0].define(version: 2022_10_10_085259) do
     t.integer "details_known_2"
     t.integer "details_known_3"
     t.integer "details_known_4"
+    t.integer "age4"
+    t.integer "age4_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"