From 2c885ed982f91504cc4c213114b20f88dca5bd6b Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Fri, 1 Mar 2024 11:02:52 +0000
Subject: [PATCH] Update some question numbers

---
 app/models/form/lettings/pages/address.rb                     | 4 +++-
 app/models/form/lettings/questions/age.rb                     | 1 +
 app/models/form/lettings/questions/age_known.rb               | 1 +
 app/models/form/lettings/questions/earnings.rb                | 2 +-
 app/models/form/lettings/questions/incfreq.rb                 | 2 +-
 app/models/form/lettings/questions/person_gender_identity.rb  | 1 +
 app/models/form/lettings/questions/person_relationship.rb     | 1 +
 .../form/lettings/questions/person_working_situation.rb       | 1 +
 8 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/models/form/lettings/pages/address.rb b/app/models/form/lettings/pages/address.rb
index 916b2f2ca..9fe18d3ef 100644
--- a/app/models/form/lettings/pages/address.rb
+++ b/app/models/form/lettings/pages/address.rb
@@ -2,7 +2,7 @@ class Form::Lettings::Pages::Address < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "Q12 - What is the property's address?"
+    @header = "Q#{QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]} - What is the property's address?"
     @depends_on = [
       { "is_supported_housing?" => false, "uprn_known" => nil },
       { "is_supported_housing?" => false, "uprn_known" => 0 },
@@ -19,4 +19,6 @@ class Form::Lettings::Pages::Address < ::Form::Page
       Form::Lettings::Questions::PostcodeForFullAddress.new(nil, nil, self),
     ]
   end
+
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 12, 2024 => 13 }.freeze
 end
diff --git a/app/models/form/lettings/questions/age.rb b/app/models/form/lettings/questions/age.rb
index 17652b3ef..26f7527d6 100644
--- a/app/models/form/lettings/questions/age.rb
+++ b/app/models/form/lettings/questions/age.rb
@@ -13,6 +13,7 @@ class Form::Lettings::Questions::Age < ::Form::Question
     @step = 1
     @hint_text = "For a child under 1, enter 1" if person_type == "child"
     @person_index = person_index
+    @question_number = question_number
   end
 
   def question_number
diff --git a/app/models/form/lettings/questions/age_known.rb b/app/models/form/lettings/questions/age_known.rb
index 1ba815e7f..10ae7dad5 100644
--- a/app/models/form/lettings/questions/age_known.rb
+++ b/app/models/form/lettings/questions/age_known.rb
@@ -16,6 +16,7 @@ class Form::Lettings::Questions::AgeKnown < ::Form::Question
       ],
     }
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = { "0" => { "value" => "Yes" }, "1" => { "value" => "No" } }.freeze
diff --git a/app/models/form/lettings/questions/earnings.rb b/app/models/form/lettings/questions/earnings.rb
index 2ebb3e30b..3aa7888d4 100644
--- a/app/models/form/lettings/questions/earnings.rb
+++ b/app/models/form/lettings/questions/earnings.rb
@@ -20,5 +20,5 @@ class Form::Lettings::Questions::Earnings < ::Form::Question
     @question_number = QUESTION_NUMBER_FROM_YEAR[form.start_date.year] || QUESTION_NUMBER_FROM_YEAR[QUESTION_NUMBER_FROM_YEAR.keys.max]
   end
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 87 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 88, 2024 => 86 }.freeze
 end
diff --git a/app/models/form/lettings/questions/incfreq.rb b/app/models/form/lettings/questions/incfreq.rb
index 3067c5c98..6648ec20d 100644
--- a/app/models/form/lettings/questions/incfreq.rb
+++ b/app/models/form/lettings/questions/incfreq.rb
@@ -18,5 +18,5 @@ class Form::Lettings::Questions::Incfreq < ::Form::Question
     "3" => { "value" => "Yearly" },
   }.freeze
 
-  QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 86 }.freeze
+  QUESTION_NUMBER_FROM_YEAR = { 2023 => 87, 2024 => 87 }.freeze
 end
diff --git a/app/models/form/lettings/questions/person_gender_identity.rb b/app/models/form/lettings/questions/person_gender_identity.rb
index ba12eab7c..21244938d 100644
--- a/app/models/form/lettings/questions/person_gender_identity.rb
+++ b/app/models/form/lettings/questions/person_gender_identity.rb
@@ -8,6 +8,7 @@ class Form::Lettings::Questions::PersonGenderIdentity < ::Form::Question
     @check_answers_card_number = person_index
     @answer_options = ANSWER_OPTIONS
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/person_relationship.rb b/app/models/form/lettings/questions/person_relationship.rb
index 11b5dad51..118211c9d 100644
--- a/app/models/form/lettings/questions/person_relationship.rb
+++ b/app/models/form/lettings/questions/person_relationship.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::PersonRelationship < ::Form::Question
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {
diff --git a/app/models/form/lettings/questions/person_working_situation.rb b/app/models/form/lettings/questions/person_working_situation.rb
index c74411579..8541d096a 100644
--- a/app/models/form/lettings/questions/person_working_situation.rb
+++ b/app/models/form/lettings/questions/person_working_situation.rb
@@ -9,6 +9,7 @@ class Form::Lettings::Questions::PersonWorkingSituation < ::Form::Question
     @hint_text = ""
     @answer_options = ANSWER_OPTIONS
     @person_index = person_index
+    @question_number = question_number
   end
 
   ANSWER_OPTIONS = {