From 65fc660278bb157fba7a7fec1f9bc4f63b1db4cd Mon Sep 17 00:00:00 2001 From: natdeanlewissoftwire Date: Thu, 23 Feb 2023 10:13:06 +0000 Subject: [PATCH] feat: add specification files and links for sales/lettings --- .../bulk_upload_lettings_logs_controller.rb | 4 +++- .../bulk_upload_sales_logs_controller.rb | 4 +++- .../bulk_upload_lettings/prepare_your_file.rb | 4 ++++ .../bulk_upload_sales/prepare_your_file.rb | 4 ++++ app/views/bulk_upload_shared/guidance.html.erb | 4 ++-- ...ttings 2022-23 Bulk Upload Specification.csv | Bin 0 -> 52988 bytes .../Sales 2022-23 Bulk Upload Specification.csv | Bin 0 -> 42425 bytes 7 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 public/files/Lettings 2022-23 Bulk Upload Specification.csv create mode 100644 public/files/Sales 2022-23 Bulk Upload Specification.csv diff --git a/app/controllers/bulk_upload_lettings_logs_controller.rb b/app/controllers/bulk_upload_lettings_logs_controller.rb index 8a10db7f0..f8cb6c80d 100644 --- a/app/controllers/bulk_upload_lettings_logs_controller.rb +++ b/app/controllers/bulk_upload_lettings_logs_controller.rb @@ -22,7 +22,9 @@ class BulkUploadLettingsLogsController < ApplicationController end def guidance - @template_path = Forms::BulkUploadLettings::PrepareYourFile.new.template_path + path_form = Forms::BulkUploadLettings::PrepareYourFile.new + @template_path = path_form.template_path + @specification_path = path_form.specification_path render "bulk_upload_shared/guidance" end diff --git a/app/controllers/bulk_upload_sales_logs_controller.rb b/app/controllers/bulk_upload_sales_logs_controller.rb index 0ea081362..0cb3269b9 100644 --- a/app/controllers/bulk_upload_sales_logs_controller.rb +++ b/app/controllers/bulk_upload_sales_logs_controller.rb @@ -22,7 +22,9 @@ class BulkUploadSalesLogsController < ApplicationController end def guidance - @template_path = Forms::BulkUploadSales::PrepareYourFile.new.template_path + path_form = Forms::BulkUploadSales::PrepareYourFile.new + @template_path = path_form.template_path + @specification_path = path_form.specification_path render "bulk_upload_shared/guidance" end 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 5bfc0a2aa..9a2d71af4 100644 --- a/app/models/forms/bulk_upload_lettings/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_lettings/prepare_your_file.rb @@ -29,6 +29,10 @@ module Forms "/files/bulk-upload-lettings-template-v1.xlsx" end + def specification_path + "/files/Lettings 2022-23 Bulk Upload Specification.csv" + end + def year_combo "#{year}/#{year + 1 - 2000}" end 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 5c7e775ef..3b3ddce94 100644 --- a/app/models/forms/bulk_upload_sales/prepare_your_file.rb +++ b/app/models/forms/bulk_upload_sales/prepare_your_file.rb @@ -27,6 +27,10 @@ module Forms "/files/bulk-upload-sales-template-v1.xlsx" end + def specification_path + "/files/Sales 2022-23 Bulk Upload Specification.csv" + end + def year_combo "#{year}/#{year + 1 - 2000}" end diff --git a/app/views/bulk_upload_shared/guidance.html.erb b/app/views/bulk_upload_shared/guidance.html.erb index c4d628c96..0523208ca 100644 --- a/app/views/bulk_upload_shared/guidance.html.erb +++ b/app/views/bulk_upload_shared/guidance.html.erb @@ -33,7 +33,7 @@

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

Your organisation’s IT team may be able to export CSV data for you - find out more about data specifications. This document outlines:

+

Your organisation’s IT team may be able to export CSV data for you - <%= govuk_link_to "find out more about data specification", @specification_path %>. This document outlines: