Fix question number rendering

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 = "What is the property's address?"
+    @header = "Q12 - What is the property's address?"
   end
 
   def questions

app/models/form/lettings/questions/address_line1.rb

@@ -6,7 +6,7 @@ class Form::Lettings::Questions::AddressLine1 < ::Form::Question
     @header = "Address line 1"
     @type = "text"
     @plain_label = true
-    @question_number = 12
+    @check_answer_label = "Q12 - Address"
   end
 
   def hidden_in_check_answers?(log, _current_user = nil)

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

@@ -2,7 +2,7 @@ class Form::Sales::Pages::Address < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "address"
-    @header = "What is the property's address?"
+    @header = "Q15 - What is the property's address?"
   end
 
   def questions

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

@@ -6,7 +6,7 @@ class Form::Sales::Questions::AddressLine1 < ::Form::Question
     @header = "Address line 1"
     @type = "text"
     @plain_label = true
-    @question_number = 15
+    @check_answer_label = "Q15 - Address"
   end
 
   def hidden_in_check_answers?(log, _current_user = nil)

spec/models/form/lettings/pages/address_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Form::Lettings::Pages::Address, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("What is the property's address?")
+    expect(page.header).to eq("Q12 - What is the property's address?")
   end
 
   it "has the correct description" do

spec/models/form/lettings/questions/address_line1_spec.rb

@@ -20,11 +20,11 @@ RSpec.describe Form::Lettings::Questions::AddressLine1, type: :model do
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(12)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct check_answer_label" do
-    expect(question.check_answer_label).to eq("Address")
+    expect(question.check_answer_label).to eq("Q12 - Address")
   end
 
   it "has the correct type" do

spec/models/form/sales/pages/address_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe Form::Sales::Pages::Address, type: :model do
   end
 
   it "has the correct header" do
-    expect(page.header).to eq("What is the property's address?")
+    expect(page.header).to eq("Q15 - What is the property's address?")
   end
 
   it "has the correct description" do

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

@@ -12,7 +12,7 @@ RSpec.describe Form::Sales::Questions::AddressLine1, type: :model do
   end
 
   it "has the correct question_number" do
-    expect(question.question_number).to eq(15)
+    expect(question.question_number).to be_nil
   end
 
   it "has the correct id" do
@@ -24,7 +24,7 @@ RSpec.describe Form::Sales::Questions::AddressLine1, type: :model do
   end
 
   it "has the correct check_answer_label" do
-    expect(question.check_answer_label).to eq("Address")
+    expect(question.check_answer_label).to eq("Q15 - Address")
   end
 
   it "has the correct type" do