CLDC-2593 Add upcoming deadlines section (#2119)

* Add upcoming deadlines section

* Update the content to use the correct dates

* Update content

* lint

* typos

app/helpers/collection_time_helper.rb

@@ -45,4 +45,24 @@ module CollectionTimeHelper
   def previous_collection_start_date
     current_collection_start_date - 1.year
   end
+
+  def quarter_for_date(date: Time.zone.now)
+    quarters = [
+      { quarter: "Q3", cutoff_date: Time.zone.local(2024, 1, 12), start_date: Time.zone.local(2023, 10, 1), end_date: Time.zone.local(2023, 12, 31) },
+      { quarter: "Q1", cutoff_date: Time.zone.local(2024, 7, 12), start_date: Time.zone.local(2024, 4, 1), end_date: Time.zone.local(2024, 6, 30) },
+      { quarter: "Q2", cutoff_date: Time.zone.local(2024, 10, 11), start_date: Time.zone.local(2024, 7, 1), end_date: Time.zone.local(2024, 9, 30) },
+      { quarter: "Q3", cutoff_date: Time.zone.local(2025, 1, 10), start_date: Time.zone.local(2024, 10, 1), end_date: Time.zone.local(2024, 12, 31) },
+    ]
+
+    quarter = quarters.find { |q| date.between?(q[:start_date], q[:cutoff_date] + 1.day) }
+
+    return unless quarter
+
+    OpenStruct.new(
+      quarter: quarter[:quarter],
+      cutoff_date: quarter[:cutoff_date],
+      quarter_start_date: quarter[:start_date],
+      quarter_end_date: quarter[:end_date],
+    )
+  end
 end

app/models/form_handler.rb

@@ -28,6 +28,10 @@ class FormHandler
     forms["current_lettings"]
   end
 
+  def previous_lettings_form
+    forms["previous_lettings"]
+  end
+
   def current_sales_form
     forms["current_sales"]
   end

app/views/home/_upcoming_deadlines.html.erb

@@ -0,0 +1,35 @@
+<h1 class="govuk-heading-l">Upcoming deadlines</h1>
+
+<% current_lettings_form = FormHandler.instance.in_crossover_period? ? FormHandler.instance.previous_lettings_form : FormHandler.instance.current_lettings_form %>
+<% formatted_deadline = "#{current_lettings_form.submission_deadline.strftime('%A')} #{current_lettings_form.submission_deadline.to_formatted_s(:govuk_date)}" %>
+<% if FormHandler.instance.in_crossover_period? %>
+  <p class="govuk-body govuk-body-m"><strong>End of year deadline - <%= formatted_deadline %>:</strong> Deadline to submit logs for tenancies starting between <%= collection_start_date(Time.zone.now).to_formatted_s(:govuk_date) %> to <%= collection_end_date(Time.zone.now).to_formatted_s(:govuk_date) %></p>
+<% end %>
+
+<% current_quarter = quarter_for_date(date: Time.zone.now) %>
+<% if current_quarter.present? %>
+  <p class="govuk-body govuk-body-m"><strong><%= "#{current_quarter.quarter} - #{current_quarter.cutoff_date.strftime('%A')} #{current_quarter.cutoff_date.to_formatted_s(:govuk_date)}" %>:</strong> Quarterly cut off date for tenancies and sales starting between <%= current_quarter.quarter_start_date.to_formatted_s(:govuk_date) %> and <%= current_quarter.quarter_end_date.to_formatted_s(:govuk_date) %>.</p>
+<% end %>
+
+<% if !FormHandler.instance.in_crossover_period? %>
+<p class="govuk-body govuk-body-m">Try to complete your logs for each quarter by the cut-off date.</p>
+<p class="govuk-body govuk-body-m">You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the <strong>end-of-year deadline: <%= formatted_deadline %>.</strong></p>
+<% end %>
+
+<% if FormHandler.instance.in_crossover_period? %>
+<% previous_lettings_form = FormHandler.instance.previous_lettings_form %>
+<p class="govuk-body govuk-body-m">Prioritise completing logs for the closing collection year. You must complete all <%= previous_lettings_form.start_date.year %> to <%= previous_lettings_form.submission_deadline.year %> logs must by the end-of-year deadline. You can still create <%= current_lettings_form.start_date.year %> to <%= current_lettings_form.submission_deadline.year %> logs for this quarter after the quarterly cut-off date.</p>
+<% end %>
+
+<%= govuk_details(summary_text: "Quarterly cut-off dates for 2023 to 2024") do %>
+  <p class="govuk-body govuk-body-m">The 2023 to 2024 quarterly cut-off dates are:</p>
+  <ul class="govuk-list govuk-list--bullet">
+    <li class="govuk-!-padding-bottom-4"><strong>Q1 - Friday 14 July 2023:</strong> Quarterly cut-off date for tenancies and sales starting between 1 April 2023 and 30 June 2023.</li>
+    <li class="govuk-!-padding-bottom-4"><strong>Q2 - Friday 13 October 2023:</strong> Quarterly cut-off date for tenancies and sales starting between 1 July 2023 and 30 September 2023.</li>
+    <li class="govuk-!-padding-bottom-4"><strong>Q3 - Friday 12 January 2024:</strong> Quarterly cut-off date for tenancies and sales starting between 1 October 2023 and 31 December 2023.</li>
+    <li class="govuk-!-padding-bottom-4"><strong>End of year deadline - Friday 7 June 2024:</strong> Deadline for tenancies and sales starting between 1 January 2024 and 31 March 2024, plus any late submissions for the 2023 to 2024 collection year.</li>
+  </ul>
+  <p class="govuk-body govuk-body-m">It is important that you meet these cut-off dates because we submit data to the Office for National Statistics quarterly, helping them create essential inflation statistics.</p>
+  <p class="govuk-body govuk-body-m">Meeting these cut-off dates also gives you more accurate data for your own analysis, and reduces the burden at the end of the year.</p>
+  <p class="govuk-body govuk-body-m">If you are not able to meet these quarterly dates, submit your logs as soon as you can so that they can be included in the annual data.</p>
+<% end %>

app/views/home/index.html.erb

@@ -2,5 +2,7 @@
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     <%= render partial: "layouts/collection_resources" %>
+    <hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m">
+    <%= render partial: "home/upcoming_deadlines" %>
   </div>
 </div>

spec/helpers/collection_time_helper_spec.rb

@@ -109,4 +109,34 @@ RSpec.describe CollectionTimeHelper do
       end
     end
   end
+
+  describe "#quarter_for_date" do
+    it "returns correct cutoff date for curent quarter" do
+      quarter = quarter_for_date(date: Time.zone.local(2023, 10, 1))
+      expect(quarter.cutoff_date).to eq(Time.zone.local(2024, 1, 12))
+      expect(quarter.quarter_start_date).to eq(Time.zone.local(2023, 10, 1))
+      expect(quarter.quarter_end_date).to eq(Time.zone.local(2023, 12, 31))
+    end
+
+    it "returns correct cutoff date for the first quarter of 2024/25" do
+      quarter = quarter_for_date(date: Time.zone.local(2024, 4, 1))
+      expect(quarter.cutoff_date).to eq(Time.zone.local(2024, 7, 12))
+      expect(quarter.quarter_start_date).to eq(Time.zone.local(2024, 4, 1))
+      expect(quarter.quarter_end_date).to eq(Time.zone.local(2024, 6, 30))
+    end
+
+    it "returns correct cutoff date for the second quarter of 2024/25" do
+      quarter = quarter_for_date(date: Time.zone.local(2024, 9, 30))
+      expect(quarter.cutoff_date).to eq(Time.zone.local(2024, 10, 11))
+      expect(quarter.quarter_start_date).to eq(Time.zone.local(2024, 7, 1))
+      expect(quarter.quarter_end_date).to eq(Time.zone.local(2024, 9, 30))
+    end
+
+    it "returns correct cutoff date for the third quarter of 2024/25" do
+      quarter = quarter_for_date(date: Time.zone.local(2024, 10, 25))
+      expect(quarter.cutoff_date).to eq(Time.zone.local(2025, 1, 10))
+      expect(quarter.quarter_start_date).to eq(Time.zone.local(2024, 10, 1))
+      expect(quarter.quarter_end_date).to eq(Time.zone.local(2024, 12, 31))
+    end
+  end
 end