From 8ef0d1f2cd568b6787d5d26885f7ce61b0f8f356 Mon Sep 17 00:00:00 2001 From: Phil Lee Date: Fri, 28 Apr 2023 12:56:48 +0100 Subject: [PATCH] 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 --- .../bulk_upload_lettings/prepare_your_file.rb | 19 ++++---- ...ml.erb => prepare_your_file_2022.html.erb} | 12 +++-- .../forms/prepare_your_file_2023.html.erb | 45 +++++++++++++++++++ .../bulk_upload_shared/guidance.html.erb | 15 +++++-- 4 files changed, 74 insertions(+), 17 deletions(-) rename app/views/bulk_upload_lettings_logs/forms/{prepare_your_file.html.erb => prepare_your_file_2022.html.erb} (77%) create mode 100644 app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2023.html.erb 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 b5d28a7a2..26032e614 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/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 - '

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.

'.html_safe - end - end - def save! true end diff --git a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2022.html.erb similarity index 77% rename from app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb rename to app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2022.html.erb index 45c2be562..632f320a2 100644 --- a/app/views/bulk_upload_lettings_logs/forms/prepare_your_file.html.erb +++ b/app/views/bulk_upload_lettings_logs/forms/prepare_your_file_2022.html.erb @@ -11,27 +11,31 @@

Prepare your file

Download template

+

Create your file

+ - <%= @form.inset_text %> + <%= govuk_inset_text(text: "Upload separate files for general needs and supported housing logs for 2022/23 data.") %>

Save your file

+ - <%= f.govuk_submit %> + <%= f.govuk_submit class: "govuk-!-margin-top-7" %> <% end %> 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 new file mode 100644 index 000000000..a1d25397b --- /dev/null +++ b/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 %> + +
+
+ <%= form_with model: @form, scope: :form, url: bulk_upload_lettings_log_path(id: "prepare-your-file"), method: :patch do |f| %> + <%= f.hidden_field :year %> + + Upload lettings logs in bulk (<%= @form.year_combo %>) +

Prepare your file

+ +

Download template

+ +
    +
  • + 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 %>. +
    • + +
  • + 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 %>. +
    • +
+ +

Create your file

+ +
    +
  • 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 %>
    • +
  • Username field: To assign a log to someone else, enter the email address they use to log into CORE
    • +
  • 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 }) %>
    • +
+ + <%= govuk_inset_text(text: "You can upload both general needs and supported housing logs in the same file for 2023/24 data.") %> + +

Save your file

+ +
    +
  • Save your file as a CSV
    • +
  • Your file should now be ready to upload
    • +
+ + <%= f.govuk_submit class: "govuk-!-margin-top-7" %> + <% end %> +
+
diff --git a/app/views/bulk_upload_shared/guidance.html.erb b/app/views/bulk_upload_shared/guidance.html.erb index 7b4048469..9d2147105 100644 --- a/app/views/bulk_upload_shared/guidance.html.erb +++ b/app/views/bulk_upload_shared/guidance.html.erb @@ -26,20 +26,29 @@

Exporting CSV data

+

Export CSV data directly from your current systems, or export then adjust it to CSV.

You can then upload it via a button at the top of the lettings and sales logs pages.

- <%= govuk_details(summary_text: "My organisation has a CMS") do %> + + <%= govuk_details(summary_text: "My organisation has a HMS") do %>

Some HMS providers sell an add-on "eCORE" module, which exports CSV data for you.

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.

<% 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 %>

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:

+ -

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.

+ + <% if @form.year == 2022 %> +

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.

+ <% else %> +

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.

+ <% end %> <% end %>