From ef33b35fafa5006821c8aa7f6cabeb899fb07085 Mon Sep 17 00:00:00 2001
From: natdeanlewissoftwire
 <94526761+natdeanlewissoftwire@users.noreply.github.com>
Date: Wed, 25 Oct 2023 15:39:08 +0100
Subject: [PATCH] CLDC-2803 Show frequency in rent range soft validation pages
 (#1993)

* feat: unrelated html fix

* feat: add period to rent range soft vals for 22/23 and 23/24

* feat: update tests

* feat: move period after brent in soft validation page
---
 app/models/form/lettings/pages/max_rent_value_check.rb       | 2 +-
 app/models/form/lettings/pages/min_rent_value_check.rb       | 2 +-
 app/views/logs/download_csv.html.erb                         | 2 +-
 config/forms/2022_2023.json                                  | 4 ++--
 spec/models/form/lettings/pages/max_rent_value_check_spec.rb | 2 +-
 spec/models/form/lettings/pages/min_rent_value_check_spec.rb | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/models/form/lettings/pages/max_rent_value_check.rb b/app/models/form/lettings/pages/max_rent_value_check.rb
index 82aff8481..f3280420b 100644
--- a/app/models/form/lettings/pages/max_rent_value_check.rb
+++ b/app/models/form/lettings/pages/max_rent_value_check.rb
@@ -19,6 +19,6 @@ class Form::Lettings::Pages::MaxRentValueCheck < ::Form::Page
   end
 
   def interruption_screen_question_ids
-    %w[brent startdate uprn postcode_full la beds rent_type needstype]
+    %w[brent period startdate uprn postcode_full la beds rent_type needstype]
   end
 end
diff --git a/app/models/form/lettings/pages/min_rent_value_check.rb b/app/models/form/lettings/pages/min_rent_value_check.rb
index b2bae4e8e..ee26b4d7e 100644
--- a/app/models/form/lettings/pages/min_rent_value_check.rb
+++ b/app/models/form/lettings/pages/min_rent_value_check.rb
@@ -19,6 +19,6 @@ class Form::Lettings::Pages::MinRentValueCheck < ::Form::Page
   end
 
   def interruption_screen_question_ids
-    %w[brent startdate uprn postcode_full la beds rent_type needstype]
+    %w[brent period startdate uprn postcode_full la beds rent_type needstype]
   end
 end
diff --git a/app/views/logs/download_csv.html.erb b/app/views/logs/download_csv.html.erb
index 5aeea8173..6da8b46fd 100644
--- a/app/views/logs/download_csv.html.erb
+++ b/app/views/logs/download_csv.html.erb
@@ -6,7 +6,7 @@
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-    <h1 class="govuk-heading-l">Download CSV</h2>
+    <h1 class="govuk-heading-l">Download CSV</h1>
 
     <p class="govuk-body">We'll send a secure download link to your email address <strong><%= @current_user.email %></strong>.</p>
     <p class="govuk-body">You've selected <%= count %> logs.</p>
diff --git a/config/forms/2022_2023.json b/config/forms/2022_2023.json
index 81a78bde5..affc18971 100644
--- a/config/forms/2022_2023.json
+++ b/config/forms/2022_2023.json
@@ -8320,7 +8320,7 @@
                   }
                 }
               },
-              "interruption_screen_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"]
+              "interruption_screen_question_ids": ["brent", "period", "startdate", "la", "beds", "rent_type", "needstype"]
             },
             "max_rent_value_check": {
               "depends_on": [
@@ -8365,7 +8365,7 @@
                   }
                 }
               },
-              "interruption_screen_question_ids": ["brent", "startdate", "la", "beds", "rent_type", "needstype"]
+              "interruption_screen_question_ids": ["brent", "period", "startdate", "la", "beds", "rent_type", "needstype"]
             },
             "scharge_value_check": {
               "depends_on": [
diff --git a/spec/models/form/lettings/pages/max_rent_value_check_spec.rb b/spec/models/form/lettings/pages/max_rent_value_check_spec.rb
index 4bbe3d18f..45caf16a3 100644
--- a/spec/models/form/lettings/pages/max_rent_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/max_rent_value_check_spec.rb
@@ -32,6 +32,6 @@ RSpec.describe Form::Lettings::Pages::MaxRentValueCheck, type: :model do
   end
 
   it "has the correct interruption_screen_question_ids" do
-    expect(page.interruption_screen_question_ids).to eq(%w[brent startdate uprn postcode_full la beds rent_type needstype])
+    expect(page.interruption_screen_question_ids).to eq(%w[brent period startdate uprn postcode_full la beds rent_type needstype])
   end
 end
diff --git a/spec/models/form/lettings/pages/min_rent_value_check_spec.rb b/spec/models/form/lettings/pages/min_rent_value_check_spec.rb
index 613c907e9..2f953c4cb 100644
--- a/spec/models/form/lettings/pages/min_rent_value_check_spec.rb
+++ b/spec/models/form/lettings/pages/min_rent_value_check_spec.rb
@@ -41,6 +41,6 @@ RSpec.describe Form::Lettings::Pages::MinRentValueCheck, type: :model do
   end
 
   it "has the correct interruption_screen_question_ids" do
-    expect(page.interruption_screen_question_ids).to eq(%w[brent startdate uprn postcode_full la beds rent_type needstype])
+    expect(page.interruption_screen_question_ids).to eq(%w[brent period startdate uprn postcode_full la beds rent_type needstype])
   end
 end