From 9d3632b2e6251bf76a6ba8c54cd893e826ebc030 Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Mon, 27 Feb 2023 12:54:21 +0000
Subject: [PATCH] add question_number method to question

---
 app/helpers/question_view_helper.rb                      | 4 ++--
 app/models/form/question.rb                              | 4 ++++
 app/models/form/sales/questions/ownership_scheme.rb      | 4 ++++
 app/models/form/sales/questions/purchaser_code.rb        | 4 ++++
 app/models/form/sales/questions/sale_date.rb             | 4 ++++
 app/models/form/sales/questions/shared_ownership_type.rb | 4 ++++
 app/views/form/_textarea_question.html.erb               | 2 +-
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/app/helpers/question_view_helper.rb b/app/helpers/question_view_helper.rb
index fc308b835..16fa456ef 100644
--- a/app/helpers/question_view_helper.rb
+++ b/app/helpers/question_view_helper.rb
@@ -5,9 +5,9 @@ module QuestionViewHelper
     { text: caption_text.html_safe, size: "l" }
   end
 
-  def legend(question, page_header, conditional)
+  def legend(question, page_header, conditional, log = nil)
     {
-      text: question.header.html_safe,
+      text: [question.question_number(log), question.header.html_safe].compact.join(" - "),
       size: label_size(page_header, conditional),
       tag: label_tag(page_header, conditional),
     }
diff --git a/app/models/form/question.rb b/app/models/form/question.rb
index fffa0059e..d66a32815 100644
--- a/app/models/form/question.rb
+++ b/app/models/form/question.rb
@@ -258,6 +258,10 @@ class Form::Question
     selected_answer_option_is_derived?(log) || has_inferred_check_answers_value?(log)
   end
 
+  def question_number(log)
+    nil
+  end
+
 private
 
   def selected_answer_option_is_derived?(log)
diff --git a/app/models/form/sales/questions/ownership_scheme.rb b/app/models/form/sales/questions/ownership_scheme.rb
index fc30ce3b4..f15f4bdb6 100644
--- a/app/models/form/sales/questions/ownership_scheme.rb
+++ b/app/models/form/sales/questions/ownership_scheme.rb
@@ -13,4 +13,8 @@ class Form::Sales::Questions::OwnershipScheme < ::Form::Question
     "2" => { "value" => "Yes - a discounted ownership scheme" },
     "3" => { "value" => "No - this is an outright or other sale" },
   }.freeze
+
+  def question_number(log)
+    "Q3"
+  end
 end
diff --git a/app/models/form/sales/questions/purchaser_code.rb b/app/models/form/sales/questions/purchaser_code.rb
index 7a5cc4bf7..7e42108f2 100644
--- a/app/models/form/sales/questions/purchaser_code.rb
+++ b/app/models/form/sales/questions/purchaser_code.rb
@@ -8,4 +8,8 @@ class Form::Sales::Questions::PurchaserCode < ::Form::Question
     @type = "text"
     @width = 10
   end
+
+  def question_number(log)
+    "Q2"
+  end
 end
diff --git a/app/models/form/sales/questions/sale_date.rb b/app/models/form/sales/questions/sale_date.rb
index ce085b646..96ee19eb3 100644
--- a/app/models/form/sales/questions/sale_date.rb
+++ b/app/models/form/sales/questions/sale_date.rb
@@ -6,4 +6,8 @@ class Form::Sales::Questions::SaleDate < ::Form::Question
     @header = "What is the sale completion date?"
     @type = "date"
   end
+
+  def question_number(log)
+    "Q1"
+  end
 end
diff --git a/app/models/form/sales/questions/shared_ownership_type.rb b/app/models/form/sales/questions/shared_ownership_type.rb
index 6351cc185..92452443a 100644
--- a/app/models/form/sales/questions/shared_ownership_type.rb
+++ b/app/models/form/sales/questions/shared_ownership_type.rb
@@ -18,4 +18,8 @@ class Form::Sales::Questions::SharedOwnershipType < ::Form::Question
     "31" => { "value" => "Right to Shared Ownership" },
     "30" => { "value" => "Shared Ownership - 2021 model lease" },
   }.freeze
+
+  def question_number(log)
+    "Q4"
+  end
 end
diff --git a/app/views/form/_textarea_question.html.erb b/app/views/form/_textarea_question.html.erb
index a9768e4d0..a7ce882de 100644
--- a/app/views/form/_textarea_question.html.erb
+++ b/app/views/form/_textarea_question.html.erb
@@ -2,7 +2,7 @@
 
 <%= f.govuk_text_area question.id.to_sym,
   caption: caption(caption_text, page_header, conditional),
-  label: legend(question, page_header, conditional),
+  label: legend(question, page_header, conditional, @log),
   hint: { text: question.hint_text&.html_safe },
   width: question.width || nil,
   **stimulus_html_attributes(question) %>