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

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

diff --git a/app/views/home/_upcoming_deadlines.html.erb b/app/views/home/_upcoming_deadlines.html.erb
index c1fd7b7ca..afc04ae0e 100644
--- a/app/views/home/_upcoming_deadlines.html.erb
+++ b/app/views/home/_upcoming_deadlines.html.erb
@@ -1,9 +1,11 @@
 <h1 class="govuk-heading-l">Upcoming deadlines</h1>
-
-<% open_lettings_form = FormHandler.instance.in_crossover_period? && FormHandler.instance.previous_lettings_form.submission_deadline > Time.zone.now ? FormHandler.instance.previous_lettings_form : FormHandler.instance.current_lettings_form %>
+<% 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") %>
-<% if FormHandler.instance.in_crossover_period? && open_lettings_form.submission_deadline > Time.zone.now %>
-  <p class="govuk-body govuk-body-m"><strong>End of year deadline - <%= formatted_deadline %>:</strong> Deadline to submit logs for tenancies starting between <%= open_lettings_form.start_date.to_formatted_s(:govuk_date) %> to <%= collection_end_date(open_lettings_form.start_date).to_formatted_s(:govuk_date) %></p>
+
+<% if FormHandler.instance.in_crossover_period? && previous_lettings_form.submission_deadline > Time.zone.now %>
+  <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 %>
 
 <% current_quarter = quarter_for_date(date: Time.zone.now) %>
@@ -16,8 +18,7 @@
 <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? && open_lettings_form.submission_deadline > Time.zone.now %>
-  <% previous_lettings_form = FormHandler.instance.previous_lettings_form %>
+<% 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>
 <% end %>