feat: household characteristics section and typo fix

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

@@ -24,6 +24,7 @@ class Form::Sales::Questions::Buyer1AgeKnown < ::Form::Question
       ],
     }
     @check_answers_card_number = 1
+    @question_number = 20
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,11 +3,12 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundArab < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Arab background?"
+    @header = "Which of the following best describes buyer 1’s Arab background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @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."
     @check_answers_card_number = 1
+    @question_number = 23
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,11 +3,12 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundAsian < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Asian or Asian British background?"
+    @header = "Which of the following best describes buyer 1’s Asian or Asian British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @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."
     @check_answers_card_number = 1
+    @question_number = 23
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,11 +3,12 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundBlack < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?"
+    @header = "Which of the following best describes buyer 1’s Black, African, Caribbean or Black British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @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."
     @check_answers_card_number = 1
+    @question_number = 23
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,11 +3,12 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundMixed < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?"
+    @header = "Which of the following best describes buyer 1’s Mixed or Multiple ethnic groups background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @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."
     @check_answers_card_number = 1
+    @question_number = 23
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,11 +3,12 @@ class Form::Sales::Questions::Buyer1EthnicBackgroundWhite < ::Form::Question
     super
     @id = "ethnic"
     @check_answer_label = "Buyer 1’s ethnic background"
-    @header = "Which of the following best describes the buyer 1’s White background?"
+    @header = "Which of the following best describes buyer 1’s White background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @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."
     @check_answers_card_number = 1
+    @question_number = 23
   end
 
   ANSWER_OPTIONS = {

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

@@ -14,6 +14,7 @@ class Form::Sales::Questions::Buyer1EthnicGroup < ::Form::Question
       "value" => "Prefers not to say",
     }]
     @check_answers_card_number = 1
+    @question_number = 22
   end
 
   ANSWER_OPTIONS = {

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

@@ -8,6 +8,7 @@ class Form::Sales::Questions::Buyer1LiveInProperty < ::Form::Question
     @answer_options = ANSWER_OPTIONS
     @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."
     @check_answers_card_number = 1
+    @question_number = 26
   end
 
   ANSWER_OPTIONS = {

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

@@ -14,6 +14,7 @@ class Form::Sales::Questions::Buyer1WorkingSituation < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 25
   end
 
   ANSWER_OPTIONS = {

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

@@ -20,6 +20,7 @@ class Form::Sales::Questions::Buyer2AgeKnown < ::Form::Question
       ],
     }
     @check_answers_card_number = 2
+    @question_number = 28
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,10 +3,11 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundArab < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Arab background?"
+    @header = "Which of the following best describes buyer 2’s Arab background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
+    @question_number = 31
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,10 +3,11 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundAsian < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Asian or Asian British background?"
+    @header = "Which of the following best describes buyer 2’s Asian or Asian British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
+    @question_number = 31
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,10 +3,11 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundBlack < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Black, African, Caribbean or Black British background?"
+    @header = "Which of the following best describes buyer 2’s Black, African, Caribbean or Black British background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
+    @question_number = 31
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,10 +3,11 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundMixed < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s Mixed or Multiple ethnic groups background?"
+    @header = "Which of the following best describes buyer 2’s Mixed or Multiple ethnic groups background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
+    @question_number = 31
   end
 
   ANSWER_OPTIONS = {

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

@@ -3,10 +3,11 @@ class Form::Sales::Questions::Buyer2EthnicBackgroundWhite < ::Form::Question
     super
     @id = "ethnicbuy2"
     @check_answer_label = "Buyer 2’s ethnic background"
-    @header = "Which of the following best describes the buyer 2’s White background?"
+    @header = "Which of the following best describes buyer 2’s White background?"
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
+    @question_number = 31
   end
 
   ANSWER_OPTIONS = {

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

@@ -13,6 +13,7 @@ class Form::Sales::Questions::Buyer2EthnicGroup < ::Form::Question
       "value" => "Prefers not to say",
     }]
     @check_answers_card_number = 2
+    @question_number = 30
   end
 
   ANSWER_OPTIONS = {

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

@@ -7,6 +7,7 @@ class Form::Sales::Questions::Buyer2LiveInProperty < ::Form::Question
     @type = "radio"
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 2
+    @question_number = 34
   end
 
   ANSWER_OPTIONS = {

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

@@ -13,6 +13,7 @@ class Form::Sales::Questions::Buyer2RelationshipToBuyer1 < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 27
   end
 
   ANSWER_OPTIONS = {

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

@@ -13,6 +13,7 @@ class Form::Sales::Questions::Buyer2WorkingSituation < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 33
   end
 
   ANSWER_OPTIONS = {

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

@@ -7,6 +7,7 @@ class Form::Sales::Questions::BuyerInterview < ::Form::Question
     @type = "radio"
     @hint_text = "You should still try to answer all questions even if the buyer wasn't interviewed in person"
     @answer_options = ANSWER_OPTIONS
+    @question_number = 18
   end
 
   ANSWER_OPTIONS = {

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

@@ -8,6 +8,7 @@ class Form::Sales::Questions::GenderIdentity1 < ::Form::Question
     @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."
     @answer_options = ANSWER_OPTIONS
     @check_answers_card_number = 1
+    @question_number = 21
   end
 
   ANSWER_OPTIONS = {

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

@@ -13,6 +13,7 @@ class Form::Sales::Questions::GenderIdentity2 < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 29
   end
 
   ANSWER_OPTIONS = {

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

@@ -24,6 +24,7 @@ class Form::Sales::Questions::Nationality1 < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 24
   end
 
   ANSWER_OPTIONS = {

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

@@ -9,6 +9,7 @@ class Form::Sales::Questions::NumberOfOthersInProperty < ::Form::Question
     @width = 2
     @min = 0
     @max = joint_purchase ? 4 : 5
+    @question_number = 35
   end
 
 private

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

@@ -19,6 +19,7 @@ class Form::Sales::Questions::PersonAgeKnown < ::Form::Question
       ],
     }
     @check_answers_card_number = person_index
+    @question_number = 29 + person_index * 4
   end
 
   ANSWER_OPTIONS = {

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

@@ -12,6 +12,7 @@ class Form::Sales::Questions::PersonGenderIdentity < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 30 + person_index * 4
   end
 
   ANSWER_OPTIONS = {

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

@@ -12,6 +12,7 @@ class Form::Sales::Questions::PersonRelationshipToBuyer1 < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 28 + person_index * 4
   end
 
   ANSWER_OPTIONS = {

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

@@ -12,6 +12,7 @@ class Form::Sales::Questions::PersonWorkingSituation < ::Form::Question
       },
       "value" => "Prefers not to say",
     }]
+    @question_number = 31 + person_index * 4
   end
 
   ANSWER_OPTIONS = {

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

@@ -7,6 +7,7 @@ class Form::Sales::Questions::PrivacyNotice < ::Form::Question
     @type = "checkbox"
     @answer_options = ANSWER_OPTIONS
     @guidance_partial = "privacy_notice_buyer"
+    @question_number = 19
   end
 
   ANSWER_OPTIONS = {

spec/models/form/sales/questions/buyer1_ethnic_background_arab_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundArab, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Arab background?")
+    expect(question.header).to eq("Which of the following best describes buyer 1’s Arab background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer1_ethnic_background_asian_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundAsian, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Asian or Asian British background?")
+    expect(question.header).to eq("Which of the following best describes buyer 1’s Asian or Asian British background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer1_ethnic_background_black_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundBlack, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Black, African, Caribbean or Black British background?")
+    expect(question.header).to eq("Which of the following best describes buyer 1’s Black, African, Caribbean or Black British background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer1_ethnic_background_mixed_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundMixed, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s Mixed or Multiple ethnic groups background?")
+    expect(question.header).to eq("Which of the following best describes buyer 1’s Mixed or Multiple ethnic groups background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer1_ethnic_background_white_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer1EthnicBackgroundWhite, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 1’s White background?")
+    expect(question.header).to eq("Which of the following best describes buyer 1’s White background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer2_ethnic_background_arab_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundArab, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Arab background?")
+    expect(question.header).to eq("Which of the following best describes buyer 2’s Arab background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer2_ethnic_background_asian_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundAsian, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Asian or Asian British background?")
+    expect(question.header).to eq("Which of the following best describes buyer 2’s Asian or Asian British background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer2_ethnic_background_black_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundBlack, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Black, African, Caribbean or Black British background?")
+    expect(question.header).to eq("Which of the following best describes buyer 2’s Black, African, Caribbean or Black British background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer2_ethnic_background_mixed_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundMixed, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s Mixed or Multiple ethnic groups background?")
+    expect(question.header).to eq("Which of the following best describes buyer 2’s Mixed or Multiple ethnic groups background?")
   end
 
   it "has the correct check_answer_label" do

spec/models/form/sales/questions/buyer2_ethnic_background_white_spec.rb

@@ -16,7 +16,7 @@ RSpec.describe Form::Sales::Questions::Buyer2EthnicBackgroundWhite, type: :model
   end
 
   it "has the correct header" do
-    expect(question.header).to eq("Which of the following best describes the buyer 2’s White background?")
+    expect(question.header).to eq("Which of the following best describes buyer 2’s White background?")
   end
 
   it "has the correct check_answer_label" do