From b63a0693117bf356691406bb0f335df06830a498 Mon Sep 17 00:00:00 2001
From: kosiakkatrina <54268893+kosiakkatrina@users.noreply.github.com>
Date: Mon, 19 Jun 2023 09:00:02 +0100
Subject: [PATCH] CLDC-2374 Update bulk upload guidance (#1703)

* Update 23/24 lettings prepare your file guidance

* Separate and update bulk upload sales guidance

* Update shared guidance and sales file path

* Rename old_template_path to legacy_template_path

* Remove wrong bullet point

* Update legacy template path based on year
---
 .../forms/bulk_upload_lettings/guidance.rb    |  4 +--
 .../bulk_upload_lettings/prepare_your_file.rb |  2 +-
 .../forms/bulk_upload_sales/guidance.rb       |  4 +--
 .../bulk_upload_sales/prepare_your_file.rb    | 16 +++++++--
 .../forms/prepare_your_file_2023.html.erb     |  5 +--
 ...ml.erb => prepare_your_file_2022.html.erb} |  3 +-
 .../forms/prepare_your_file_2023.html.erb     | 36 +++++++++++++++++++
 .../bulk_upload_shared/guidance.html.erb      |  9 ++++-
 8 files changed, 66 insertions(+), 13 deletions(-)
 rename app/views/bulk_upload_sales_logs/forms/{prepare_your_file.html.erb => prepare_your_file_2022.html.erb} (79%)
 create mode 100644 app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb

diff --git a/app/models/forms/bulk_upload_lettings/guidance.rb b/app/models/forms/bulk_upload_lettings/guidance.rb
index 55db10718..862a8af51 100644
--- a/app/models/forms/bulk_upload_lettings/guidance.rb
+++ b/app/models/forms/bulk_upload_lettings/guidance.rb
@@ -15,8 +15,8 @@ module Forms
         bulk_upload_lettings_log_path(id: "prepare-your-file", form: { year: })
       end
 
-      def old_template_path
-        Forms::BulkUploadLettings::PrepareYourFile.new.old_template_path
+      def legacy_template_path
+        Forms::BulkUploadLettings::PrepareYourFile.new.legacy_template_path
       end
 
       def template_path
diff --git a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
index 26032e614..601f09848 100644
--- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb
@@ -30,7 +30,7 @@ module Forms
         bulk_upload_lettings_log_path(id: page_id, form: { year:, needstype: })
       end
 
-      def old_template_path
+      def legacy_template_path
         case year
         when 2022
           "/files/bulk-upload-lettings-template-2022-23.xlsx"
diff --git a/app/models/forms/bulk_upload_sales/guidance.rb b/app/models/forms/bulk_upload_sales/guidance.rb
index c9869ee14..eb472ad3a 100644
--- a/app/models/forms/bulk_upload_sales/guidance.rb
+++ b/app/models/forms/bulk_upload_sales/guidance.rb
@@ -15,8 +15,8 @@ module Forms
         bulk_upload_sales_log_path(id: "prepare-your-file", form: { year: })
       end
 
-      def old_template_path
-        Forms::BulkUploadLettings::PrepareYourFile.new.old_template_path
+      def legacy_template_path
+        Forms::BulkUploadSales::PrepareYourFile.new.legacy_template_path
       end
 
       def template_path
diff --git a/app/models/forms/bulk_upload_sales/prepare_your_file.rb b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
index 710cdbef3..9425a6662 100644
--- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb
+++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb
@@ -8,7 +8,12 @@ module Forms
       attribute :year, :integer
 
       def view_path
-        "bulk_upload_sales_logs/forms/prepare_your_file"
+        case year
+        when 2022
+          "bulk_upload_sales_logs/forms/prepare_your_file_2022"
+        else
+          "bulk_upload_sales_logs/forms/prepare_your_file_2023"
+        end
       end
 
       def back_path
@@ -23,8 +28,13 @@ module Forms
         bulk_upload_sales_log_path(id: "upload-your-file", form: { year: })
       end
 
-      def old_template_path
-        "/files/bulk-upload-sales-template-2022-23.xlsx"
+      def legacy_template_path
+        case year
+        when 2022
+          "/files/bulk-upload-sales-template-2022-23.xlsx"
+        else
+          "/files/bulk-upload-sales-legacy-template-2023-24.xlsx"
+        end
       end
 
       def template_path
diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb
index a1d25397b..f15972491 100644
--- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb
+++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb
@@ -12,13 +12,14 @@
 
       <h2 class="govuk-heading-s">Download template</h2>
 
+      <p class="govuk-body govuk-!-margin-bottom-2">Use one of these templates to upload logs for 2023/24:</p>
       <ul class="govuk-list govuk-list--bullet">
         <li>
-          If your organisation is new to using bulk upload or you have updated your HMS export, use <%= govuk_link_to "this template (improved question ordering)", @form.template_path %>.
+          <%= govuk_link_to "New template", @form.template_path %>: In this template, the questions are in the same order as the 2023/24 paper form and web form.
         </li>
 
         <li>
-          If your organisation was using bulk upload on the previous CORE website and hasn't changed its HMS to be compatible with the new CORE service, use <%= govuk_link_to "this template", @form.old_template_path %>.
+          <%= govuk_link_to "Legacy template", @form.legacy_template_path %>: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end.
         </li>
       </ul>
 
diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2022.html.erb
similarity index 79%
rename from app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
rename to app/views/bulk_upload_sales_logs/forms/prepare_your_file_2022.html.erb
index 71e759306..624b3fe8b 100644
--- a/app/views/bulk_upload_sales_logs/forms/prepare_your_file.html.erb
+++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2022.html.erb
@@ -12,8 +12,7 @@
 
       <h2 class="govuk-heading-s">Download template</h2>
       <ul class="govuk-list govuk-list--bullet">
-        <li>If your organisation is new to using bulk upload or you have updated your HMS export use <%= govuk_link_to "this template (improved question ordering)", @form.template_path %></li>
-        <li>If your organisation was using bulk upload on the previous CORE website and hasn't changed its HMS to be compatible with the new CORE service, use <%= govuk_link_to "this template", @form.old_template_path %></li>
+        <li>Download and use <%= govuk_link_to "this template", @form.legacy_template_path %>.</li>
       </ul>
 
       <h2 class="govuk-heading-s">Create your file</h2>
diff --git a/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb
new file mode 100644
index 000000000..7fc522e88
--- /dev/null
+++ b/app/views/bulk_upload_sales_logs/forms/prepare_your_file_2023.html.erb
@@ -0,0 +1,36 @@
+<% content_for :before_content do %>
+  <%= govuk_back_link href: @form.back_path %>
+<% end %>
+
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
+    <%= form_with model: @form, scope: :form, url: bulk_upload_sales_log_path(id: "prepare-your-file"), method: :patch do |f| %>
+      <%= f.hidden_field :year %>
+
+      <span class="govuk-caption-l">Upload sales logs in bulk (<%= @form.year_combo %>)</span>
+      <h1 class="govuk-heading-l">Prepare your file</h1>
+
+      <h2 class="govuk-heading-s">Download template</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li><%= govuk_link_to "New template", @form.template_path %>: In this template, the questions are in the same order as the 2023/24 paper form and web form.</li>
+        <li><%= govuk_link_to "Legacy template", @form.legacy_template_path %>: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end.</li>
+      </ul>
+
+      <h2 class="govuk-heading-s">Create your file</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Fill in the template with CORE data from your housing management system according to the <%= govuk_link_to "Sales #{@form.year_combo} Bulk Upload Specification", @form.specification_path %></li>
+        <li><strong>Username field:</strong> To assign a log to someone else, enter the email address they use to log into CORE</li>
+        <li>If you have to manually enter large volumes of data into the bulk upload template, we recommend creating logs directly in the service instead. <%= govuk_link_to "Find out more about exporting your data", bulk_upload_sales_log_path(id: "guidance", form: { year: @form.year }) %></li>
+        <li>If you are using the new template, keep the headers. If you are using the legacy template, you can either keep or remove the headers.</li>
+      </ul>
+
+      <h2 class="govuk-heading-s">Save your file</h2>
+      <ul class="govuk-list govuk-list--bullet">
+        <li>Save your file as a CSV</li>
+        <li>Your file should now be ready to upload</li>
+      </ul>
+
+      <%= f.govuk_submit %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/bulk_upload_shared/guidance.html.erb b/app/views/bulk_upload_shared/guidance.html.erb
index 9d2147105..d2fdc9230 100644
--- a/app/views/bulk_upload_shared/guidance.html.erb
+++ b/app/views/bulk_upload_shared/guidance.html.erb
@@ -54,7 +54,14 @@
 
     <div class="govuk-!-padding-bottom-4">
       <h2 class="govuk-heading-s">Getting help</h2>
-      <p class="govuk-body">There is no step-by-step bulk upload guide like there is with single log upload. However, you can download <%= govuk_link_to "our template", @form.template_path %>, which you can copy-paste data into from your systems column-by-column. You can also view a post-upload report showing any data errors, and our <%= govuk_link_to "data specification", @form.specification_path, target: "_blank" %> can help fix these.</p>
+      <p class="govuk-body">There is no step-by-step bulk upload guide like there is with single log upload. However, you can download <%= @form.year == 2022 ? govuk_link_to("our template", @form.template_path) : "one of our templates" %>, which you can copy-paste data into from your systems column-by-column. You can also view a post-upload report showing any data errors, and our <%= govuk_link_to "data specification", @form.specification_path, target: "_blank" %> can help fix these.</p>
+      <% if @form.year == 2023 %>
+        <%= govuk_details(summary_text: "How to choose the right template") do %>
+          <p class="govuk-body">Use one of these templates to upload logs for 2023/24:</p>
+          <p class="govuk-body"><%= govuk_link_to "New template", @form.template_path %>: In this template, the questions are in the same order as the 2023/24 paper form and web form. Use this template if your organisation is new to bulk upload or if your housing management system matches the new column ordering.</p>
+          <p class="govuk-body"><%= govuk_link_to "Legacy template", @form.legacy_template_path %>: In this template, the questions are in the same order as the 2022/23 template, with new questions added on to the end. Use this template if you have not updated your system to match the new template yet.</p>
+        <% end %>
+      <% end %>
       <p class="govuk-body">If you still need support mapping data in the way we need, DLUHC’s helpdesk can help. If your data is across multiple systems, or is hard to export as a single file in the correct format, you could try different exports, or copy-pasting data by hand.</p>
     </div>
   </div>