CLDC-2301 Update bulk upload journey copy (#1590)

# Context

- https://digital.dclg.gov.uk/jira/browse/CLDC-2301
- Content for 2022 and 2023 bulk upload journey need to differ to give users the correct info they need to complete the journey

# Changes

- Update 2022 and 2023 `Prepare your file` and guidance pages

app/models/forms/bulk_upload_lettings/prepare_your_file.rb

@@ -9,7 +9,12 @@ module Forms
       attribute :needstype, :integer
 
       def view_path
-        "bulk_upload_lettings_logs/forms/prepare_your_file"
+        case year
+        when 2022
+          "bulk_upload_lettings_logs/forms/prepare_your_file_2022"
+        else
+          "bulk_upload_lettings_logs/forms/prepare_your_file_2023"
+        end
       end
 
       def back_path
@@ -29,7 +34,7 @@ module Forms
         case year
         when 2022
           "/files/bulk-upload-lettings-template-2022-23.xlsx"
-        when 2023
+        else
           "/files/bulk-upload-lettings-legacy-template-2023-24.xlsx"
         end
       end
@@ -38,7 +43,7 @@ module Forms
         case year
         when 2022
           "/files/bulk-upload-lettings-template-2022-23.xlsx"
-        when 2023
+        else
           "/files/bulk-upload-lettings-template-2023-24.xlsx"
         end
       end
@@ -47,7 +52,7 @@ module Forms
         case year
         when 2022
           "/files/bulk-upload-lettings-specification-2022-23.xlsx"
-        when 2023
+        else
           "/files/bulk-upload-lettings-specification-2023-24.xlsx"
         end
       end
@@ -56,12 +61,6 @@ module Forms
         "#{year}/#{year + 1 - 2000}"
       end
 
-      def inset_text
-        if year == 2022
-          '<p class="govuk-inset-text">For 2022/23 data, you cannot have a CSV file with both general needs logs and supported housing logs. These must be in separate files.</p>'.html_safe
-        end
-      end
-
       def save!
         true
       end

app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2022.html.erb

@@ -11,27 +11,31 @@
       <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>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.template_path %>.
+        </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 "Lettings #{@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_lettings_log_path(id: "guidance", form: { year: @form.year }) %></li>
       </ul>
 
-      <%= @form.inset_text %>
+      <%= govuk_inset_text(text: "Upload separate files for general needs and supported housing logs for 2022/23 data.") %>
 
       <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 %>
+      <%= f.govuk_submit class: "govuk-!-margin-top-7" %>
     <% end %>
   </div>
 </div>

app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb

@@ -0,0 +1,45 @@
+<% 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_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %>
+      <%= f.hidden_field :year %>
+
+      <span class="govuk-caption-l">Upload lettings 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>
+          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>
+      </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 "Lettings #{@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_lettings_log_path(id: "guidance", form: { year: @form.year }) %></li>
+      </ul>
+
+      <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2023/24 data.") %>
+
+      <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 class: "govuk-!-margin-top-7" %>
+    <% end %>
+  </div>
+</div>

app/views/bulk_upload_shared/guidance.html.erb

@@ -26,20 +26,29 @@
 
     <div class="govuk-!-padding-bottom-4">
       <h2 class="govuk-heading-s">Exporting CSV data</h2>
+
       <p class="govuk-body">Export CSV data directly from your current systems, or export then adjust it to CSV.</p>
       <p class="govuk-body">You can then upload it via a button at the top of the lettings and sales logs pages.</p>
-      <%= govuk_details(summary_text: "My organisation has a CMS") do %>
+
+      <%= govuk_details(summary_text: "My organisation has a HMS") do %>
         <p class="govuk-body">Some HMS providers sell an add-on "eCORE" module, which exports CSV data for you.</p>
         <p class="govuk-!-font-weight-bold">It can take HMS providers a while to update these per new collection year, so you may have to wait for updates to export, or adjust your data manually post-export.</p>
       <% end %>
-      <%= govuk_details(summary_text: "My organisation does not have a CMS") do %>
+
+      <%= govuk_details(summary_text: "My organisation does not have a HMS") do %>
         <p class="govuk-body">Your organisation’s IT team may be able to export CSV data for you - <%= govuk_link_to "find out more about data specification", @form.specification_path, target: "_blank" %>. This document outlines:</p>
+
         <ul class="govuk-list govuk-list--bullet">
           <li>required fields</li>
           <li>each field's valid response</li>
           <li>if/when certain fields can be left blank</li>
         </ul>
-        <p class="govuk-body">Fields can appear in any order, as long as you include the <%= govuk_link_to "template document", @form.template_path %> headers, to easily identify what each column represents. You can rearrange data columns to match your system exports, copy-pasting multiple columns at once. For data stored in multiple systems, you can copy-paste all columns for one system next to each other, repeating this for subsequent system exports.</p>
+
+        <% if @form.year == 2022 %>
+          <p class="govuk-body">Fields must be in the same order as <%= govuk_link_to "the template", @form.template_path %>. Copy each column of your exported data one at a time and paste into the correct template column.</p>
+        <% else %>
+          <p class="govuk-body">Fields can appear in any order, as long as you include the <%= govuk_link_to "template document", @form.template_path %> headers, to easily identify what each column represents. You can rearrange data columns to match your system exports, copy-pasting multiple columns at once. For data stored in multiple systems, you can copy-paste all columns for one system next to each other, repeating this for subsequent system exports.</p>
+        <% end %>
       <% end %>
     </div>