Refactor 2 question pages

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

@@ -2,6 +2,7 @@ class Form::Sales::Pages::Age1 < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "buyer_1_age"
+    @copy_key = "sales.household_characteristics.age1"
     @depends_on = [
       {
         "buyer_has_seen_privacy_notice?" => true,

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

@@ -1,7 +1,7 @@
 class Form::Sales::Pages::PersonAge < Form::Sales::Pages::Person
   def initialize(id, hsh, subsection, person_index:)
     super
-    @copy_key = "sales.household_characteristics.age2.person" if person_index == 2
+    @copy_key = person_index == 2 ? "sales.household_characteristics.age2.person" : "sales.household_characteristics.age#{person_index}"
     @depends_on = [{ "details_known_#{person_index}" => 1 }]
   end
 

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::Age2 < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "age2"
-    @copy_key = "sales.household_characteristics.age2.buyer"
+    @copy_key = "sales.household_characteristics.age2.buyer.age2"
     @type = "numeric"
     @width = 2
     @inferred_check_answers_value = [{

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "age2_known"
-    @copy_key = "sales.household_characteristics.age2_known.buyer"
+    @copy_key = "sales.household_characteristics.age2.buyer.age2_known"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @conditional_for = {

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

@@ -2,7 +2,7 @@ class Form::Sales::Questions::PersonAge < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @type = "numeric"
-    @copy_key = "sales.household_characteristics.age2.person" if person_index == 2
+    @copy_key = person_index == 2 ? "sales.household_characteristics.age2.person.age2" : "sales.household_characteristics.age#{person_index}.age#{person_index}"
     @width = 3
     @inferred_check_answers_value = [{
       "condition" => { "age#{person_index}_known" => 1 },

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

@@ -2,8 +2,7 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Question
   def initialize(id, hsh, page, person_index:)
     super(id, hsh, page)
     @type = "radio"
-    @copy_key = "sales.household_characteristics.age2_known.person" if person_index == 2
+    @copy_key = person_index == 2 ? "sales.household_characteristics.age2.person.age2_known" : "sales.household_characteristics.age#{person_index}.age#{person_index}_known"
-    @answer_options = ANSWER_OPTIONS
     @conditional_for = {
       "age#{person_index}" => [0],
     }

config/locales/forms/2023/sales/household_characteristics.en.yml

@@ -27,14 +27,13 @@ en:
               hint_text: ""
               question_text: "Declaration"
 
-          age1_known:
+          age1:
             page_header: ""
+            age1_known:
               check_answer_label: "Buyer 1’s age"
               hint_text: "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
               question_text: "Do you know buyer 1’s age?"
-
             age1:
-            page_header: ""
               check_answer_label: "Buyer 1’s age"
               hint_text: ""
               question_text: "Age"
@@ -108,26 +107,24 @@ en:
               hint_text: ""
               question_text: "What is Person 2’s relationship to Buyer 1?"
 
-          age2_known:
+          age2:
             buyer:
               page_header: ""
+              age2_known:
                 check_answer_label: "Buyer 2’s age"
                 hint_text: ""
                 question_text: "Do you know buyer 2’s age?"
-            person:
-              page_header: ""
-              check_answer_label: "Person 2’s age known?"
-              hint_text: ""
-              question_text: "Do you know person 2’s age?"
-
               age2:
-            buyer:
-              page_header: ""
                 check_answer_label: "Buyer 2’s age"
                 hint_text: ""
                 question_text: "Age"
             person:
               page_header: ""
+              age2_known:
+                check_answer_label: "Person 2’s age known?"
+                hint_text: ""
+                question_text: "Do you know person 2’s age?"
+              age:
                 check_answer_label: "Person 2’s age"
                 hint_text: ""
                 question_text: "Age"
@@ -231,14 +228,13 @@ en:
             hint_text: ""
             question_text: "What is Person 3’s relationship to Buyer 1?"
 
-          age3_known:
+          age3:
             page_header: ""
+            age3_known:
               check_answer_label: "Person 3’s age known?"
               hint_text: ""
               question_text: "Do you know person 3’s age?"
-
             age3:
-            page_header: ""
               check_answer_label: "Person 3’s age"
               hint_text: ""
               question_text: "Age"
@@ -267,14 +263,13 @@ en:
             hint_text: ""
             question_text: "What is Person 4’s relationship to Buyer 1?"
 
-          age4_known:
+          age4:
             page_header: ""
+            age4_known:
               check_answer_label: "Person 4’s age known?"
               hint_text: ""
               question_text: "Do you know person 4’s age?"
-
             age4:
-            page_header: ""
               check_answer_label: "Person 4’s age"
               hint_text: ""
               question_text: "Age"
@@ -303,14 +298,13 @@ en:
             hint_text: ""
             question_text: "What is Person 5’s relationship to Buyer 1?"
 
-          age5_known:
+          age5:
             page_header: ""
+            age5_known:
               check_answer_label: "Person 5’s age known?"
               hint_text: ""
               question_text: "Do you know person 5’s age?"
-
             age5:
-            page_header: ""
               check_answer_label: "Person 5’s age"
               hint_text: ""
               question_text: "Age"
@@ -339,14 +333,13 @@ en:
             hint_text: ""
             question_text: "What is Person 6’s relationship to Buyer 1?"
 
-          age6_known:
+          age6:
             page_header: ""
+            age6_known:
               check_answer_label: "Person 6’s age known?"
               hint_text: ""
               question_text: "Do you know person 6’s age?"
-
             age6:
-            page_header: ""
               check_answer_label: "Person 6’s age"
               hint_text: ""
               question_text: "Age"

config/locales/forms/2024/sales/household_characteristics.en.yml

@@ -3,14 +3,13 @@ en:
     2024:
       sales:
         household_characteristics:
-          age1_known:
+          age1:
             page_header: ""
+            age1_known:
               check_answer_label: "Buyer 1’s age"
               hint_text: "Buyer 1 is the person in the household who does the most paid work. If it’s a joint purchase and the buyers do the same amount of paid work, buyer 1 is whoever is the oldest."
               question_text: "Do you know buyer 1’s age?"
-
             age1:
-            page_header: ""
               check_answer_label: "Buyer 1’s age"
               hint_text: ""
               question_text: "Age"
@@ -90,28 +89,26 @@ en:
               hint_text: ""
               question_text: "What is Person 2’s relationship to Buyer 1?"
 
-          age2_known:
+          age2:
             buyer:
               page_header: ""
+              age2_known:
                 check_answer_label: "Buyer 2’s age"
                 hint_text: ""
                 question_text: "Do you know buyer 2’s age?"
-            person:
-              page_header: ""
-              check_answer_label: "Person 2’s age known?"
-              hint_text: ""
-              question_text: "Do you know person 2’s age?"
-
               age2:
-            buyer:
-              page_header: ""
                 check_answer_label: "Buyer 2’s age"
                 hint_text: ""
                 question_text: "Age"
             person:
               page_header: ""
+              age2_known:
+                check_answer_label: "Person 2’s age known?"
+                hint_text: ""
+                question_text: "Do you know person 2’s age?"
+              age:
                 check_answer_label: "Person 2’s age"
-              hint_text: "Answer 1 for children aged under 1 year old"
+                hint_text: ""
                 question_text: "Age"
 
           sex2:
@@ -219,16 +216,15 @@ en:
             hint_text: ""
             question_text: "What is Person 3’s relationship to Buyer 1?"
 
-          age3_known:
+          age3:
             page_header: ""
+            age3_known:
               check_answer_label: "Person 3’s age known?"
               hint_text: ""
               question_text: "Do you know person 3’s age?"
-
             age3:
-            page_header: ""
               check_answer_label: "Person 3’s age"
-            hint_text: "Answer 1 for children aged under 1 year old"
+              hint_text: ""
               question_text: "Age"
           
           sex3:
@@ -255,16 +251,15 @@ en:
             hint_text: ""
             question_text: "What is Person 4’s relationship to Buyer 1?"
 
-          age4_known:
+          age4:
             page_header: ""
+            age4_known:
               check_answer_label: "Person 4’s age known?"
               hint_text: ""
               question_text: "Do you know person 4’s age?"
-
             age4:
-            page_header: ""
               check_answer_label: "Person 4’s age"
-            hint_text: "Answer 1 for children aged under 1 year old"
+              hint_text: ""
               question_text: "Age"
           
           sex4:
@@ -291,16 +286,15 @@ en:
             hint_text: ""
             question_text: "What is Person 5’s relationship to Buyer 1?"
 
-          age5_known:
+          age5:
             page_header: ""
+            age5_known:
               check_answer_label: "Person 5’s age known?"
               hint_text: ""
               question_text: "Do you know person 5’s age?"
-
             age5:
-            page_header: ""
               check_answer_label: "Person 5’s age"
-            hint_text: "Answer 1 for children aged under 1 year old"
+              hint_text: ""
               question_text: "Age"
           
           sex5:
@@ -327,16 +321,15 @@ en:
             hint_text: ""
             question_text: "What is Person 6’s relationship to Buyer 1?"
 
-          age6_known:
+          age6:
             page_header: ""
+            age6_known:
               check_answer_label: "Person 6’s age known?"
               hint_text: ""
               question_text: "Do you know person 6’s age?"
-
             age6:
-            page_header: ""
               check_answer_label: "Person 6’s age"
-            hint_text: "Answer 1 for children aged under 1 year old"
+              hint_text: ""
               question_text: "Age"
           
           sex6: