From d93ebf6799fc527b29a2a158896435f0cd909db4 Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Tue, 21 Jan 2025 12:12:45 +0000
Subject: [PATCH] Update deadlnes section

---
 app/views/home/_upcoming_deadlines.html.erb | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/views/home/_upcoming_deadlines.html.erb b/app/views/home/_upcoming_deadlines.html.erb
index afc04ae0e..a5e4f59d2 100644
--- a/app/views/home/_upcoming_deadlines.html.erb
+++ b/app/views/home/_upcoming_deadlines.html.erb
@@ -1,10 +1,9 @@
 <h1 class="govuk-heading-l">Upcoming deadlines</h1>
 <% previous_lettings_form = FormHandler.instance.previous_lettings_form %>
 <% current_lettings_form = FormHandler.instance.current_lettings_form %>
-<% open_lettings_form = FormHandler.instance.in_crossover_period? && previous_lettings_form.submission_deadline > Time.zone.now ? previous_lettings_form : current_lettings_form %>
-<% formatted_deadline = open_lettings_form.submission_deadline.strftime("%A %-d %B %Y") %>
+<% crossover_before_submission_deadline =  FormHandler.instance.in_crossover_period? && previous_lettings_form.submission_deadline > Time.zone.now %>
 
-<% if FormHandler.instance.in_crossover_period? && previous_lettings_form.submission_deadline > Time.zone.now %>
+<% if crossover_before_submission_deadline %>
   <p class="govuk-body govuk-body-m"><strong>End of year deadline - <%= previous_lettings_form.submission_deadline.strftime("%A %-d %B %Y") %>:</strong> Deadline to submit logs for tenancies starting between <%= previous_lettings_form.start_date.to_formatted_s(:govuk_date) %> to <%= collection_end_date(previous_lettings_form.start_date).to_formatted_s(:govuk_date) %></p>
 <% end %>
 
@@ -13,13 +12,13 @@
   <p class="govuk-body govuk-body-m"><strong><%= "#{current_quarter.quarter} - #{current_quarter.cutoff_date.strftime('%A %-d %B %Y')}" %>:</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 %>
 
-<% unless FormHandler.instance.in_crossover_period? && open_lettings_form.submission_deadline > Time.zone.now %>
+<% unless crossover_before_submission_deadline %>
 <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>
+<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: <%= current_lettings_form.submission_deadline.strftime("%A %-d %B %Y") %>.</strong></p>
 <% end %>
 
-<% if FormHandler.instance.in_crossover_period? && previous_lettings_form.submission_deadline > Time.zone.now %>
-<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 by the end-of-year deadline. You can still create <%= open_lettings_form.start_date.year %> to <%= open_lettings_form.submission_deadline.year %> logs for this quarter after the quarterly cut-off date.</p>
+<% if crossover_before_submission_deadline %>
+<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 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 #{current_collection_start_year} to #{current_collection_end_year}") do %>