From 6273a076cb67cb5881db64594e0014de6d2da1da Mon Sep 17 00:00:00 2001
From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com>
Date: Fri, 19 Jul 2024 17:50:29 +0100
Subject: [PATCH] CLDC-3414&5 Close 2023/24 - No new/No editing of entries
 (#2520)

* Close 2023/24
---
 app/models/form.rb                                            | 2 ++
 .../forms/prepare_your_file_2024.html.erb                     | 2 +-
 app/views/layouts/_collection_resources.html.erb              | 4 +++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/models/form.rb b/app/models/form.rb
index 755121473..4336376e6 100644
--- a/app/models/form.rb
+++ b/app/models/form.rb
@@ -11,6 +11,8 @@ class Form
     },
     2023 => {
       submission_deadline: Time.zone.local(2024, 6, 7),
+      new_logs_end_date: Time.zone.local(2024, 7, 22),
+      edit_end_date: Time.zone.local(2024, 7, 22),
     },
     2024 => {
       submission_deadline: Time.zone.local(2025, 6, 6),
diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb
index 6413d70cb..45ce4b385 100644
--- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb
+++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2024.html.erb
@@ -26,7 +26,7 @@
         <li>If you have reordered the headers, keep the headers in the file.</li>
       </ul>
 
-      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2023/24 data.") %>
+      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2024/25 data.") %>
 
       <h2 class="govuk-heading-s">Save your file</h2>
 
diff --git a/app/views/layouts/_collection_resources.html.erb b/app/views/layouts/_collection_resources.html.erb
index acdc5cb88..48976088a 100644
--- a/app/views/layouts/_collection_resources.html.erb
+++ b/app/views/layouts/_collection_resources.html.erb
@@ -6,7 +6,9 @@
   <h2 class="govuk-heading-m">Collection resources</h2>
 <% end %>
 <p class="govuk-body">Use the 2024 to 2025 forms for lettings that start and sales that complete between 1 April 2024 and 31 March 2025.</p>
-<p class="govuk-body">Use the 2023 to 2024 forms for lettings that start and sales that complete between 1 April 2023 and 31 March 2024.</p>
+<% if FormHandler.instance.lettings_form_for_start_year(2023) && FormHandler.instance.lettings_form_for_start_year(2023).edit_end_date > Time.zone.today %>
+  <p class="govuk-body">Use the 2023 to 2024 forms for lettings that start and sales that complete between 1 April 2023 and 31 March 2024.</p>
+<% end %>
 <div class="app-tab__list-view">
 <%= govuk_tabs(title: "Collection resources", classes: %w[app-tab__small-headers]) do |c| %>
   <% if FormHandler.instance.lettings_form_for_start_year(2024) && FormHandler.instance.lettings_form_for_start_year(2024).edit_end_date > Time.zone.today %>