diff --git a/app/frontend/styles/_document-list.scss b/app/frontend/styles/_document-list.scss index e8cef0625..be4efe92f 100644 --- a/app/frontend/styles/_document-list.scss +++ b/app/frontend/styles/_document-list.scss @@ -11,6 +11,10 @@ } } +.app-document-list__tab { + @include govuk-font($size: 16); +} + .app-document-list__item-title { @include govuk-font($size: 16); margin: 0 0 govuk-spacing(1); diff --git a/app/views/layouts/_collection_resources.html.erb b/app/views/layouts/_collection_resources.html.erb index 0c084596e..aa79d2dac 100644 --- a/app/views/layouts/_collection_resources.html.erb +++ b/app/views/layouts/_collection_resources.html.erb @@ -5,7 +5,47 @@

Collection resources

<% end %>

Use the 2023 to 2024 forms for lettings that start and sales that complete between 1 April 2023 and 31 March 2024.

-<%= govuk_tabs(title: "Collection resources") do |c| %> +<%= govuk_tabs(title: "Collection resources", classes: ["app-document-list__tab"]) 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 %> + <% c.with_tab(label: "Lettings 2024/25") do %> + <%= render DocumentListComponent.new(items: [ + { + name: "Download the lettings log for tenants (2024 to 2025)", + href: download_24_25_lettings_form_path, + metadata: file_type_size_and_pages("2024_25_lettings_paper_form.pdf", number_of_pages: 8), + }, + { + name: "Download the lettings bulk upload template (2024 to 2025) – New question ordering", + href: download_24_25_lettings_bulk_upload_template_path, + metadata: file_type_size_and_pages("bulk-upload-lettings-template-2024-25.xlsx"), + }, + { + name: "Download the lettings bulk upload specification (2024 to 2025)", + href: download_24_25_lettings_bulk_upload_specification_path, + metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2024-25.xlsx"), + }, + ]) %> + <% end %> + <% c.with_tab(label: "Sales 2024/25") do %> + <%= render DocumentListComponent.new(items: [ + { + name: "Download the sales log for buyers (2024 to 2025)", + href: download_24_25_sales_form_path, + metadata: file_type_size_and_pages("2024_25_sales_paper_form.pdf", number_of_pages: 8), + }, + { + name: "Download the sales bulk upload template (2024 to 2025) – New question ordering", + href: download_24_25_sales_bulk_upload_template_path, + metadata: file_type_size_and_pages("bulk-upload-sales-template-2024-25.xlsx"), + }, + { + name: "Download the sales bulk upload specification (2024 to 2025)", + href: download_24_25_sales_bulk_upload_specification_path, + metadata: file_type_size_and_pages("bulk-upload-sales-specification-2024-25.xlsx"), + }, + ]) %> + <% end %> + <% end %> <% if FormHandler.instance.lettings_form_for_start_year(2023) && FormHandler.instance.lettings_form_for_start_year(2023).edit_end_date > Time.zone.today %> <% c.with_tab(label: "Lettings 2023/24") do %> <%= render DocumentListComponent.new(items: [ diff --git a/config/routes.rb b/config/routes.rb index 06cb4f8d3..3207b911f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -39,23 +39,32 @@ Rails.application.routes.draw do get "/service-moved", to: "maintenance#service_moved" get "/service-unavailable", to: "maintenance#service_unavailable" - get "/download-23-24-lettings-form", to: "start#download_23_24_lettings_form" get "/download-22-23-lettings-form", to: "start#download_22_23_lettings_form" + get "/download-22-23-lettings-bulk-upload-template", to: "start#download_22_23_lettings_bulk_upload_template" + get "/download-22-23-lettings-bulk-upload-specification", to: "start#download_22_23_lettings_bulk_upload_specification" + + get "/download-22-23-sales-form", to: "start#download_22_23_sales_form" + get "/download-22-23-sales-bulk-upload-template", to: "start#download_22_23_sales_bulk_upload_template" + get "/download-22-23-sales-bulk-upload-specification", to: "start#download_22_23_sales_bulk_upload_specification" + + get "/download-23-24-lettings-form", to: "start#download_23_24_lettings_form" get "/download-23-24-lettings-bulk-upload-template", to: "start#download_23_24_lettings_bulk_upload_template" get "/download-23-24-lettings-bulk-upload-legacy-template", to: "start#download_23_24_lettings_bulk_upload_legacy_template" get "/download-23-24-lettings-bulk-upload-specification", to: "start#download_23_24_lettings_bulk_upload_specification" - get "/download-22-23-lettings-bulk-upload-template", to: "start#download_22_23_lettings_bulk_upload_template" - get "/download-22-23-lettings-bulk-upload-specification", to: "start#download_22_23_lettings_bulk_upload_specification" - get "/download-23-24-sales-form", to: "start#download_23_24_sales_form" - get "/download-22-23-sales-form", to: "start#download_22_23_sales_form" get "/download-23-24-sales-bulk-upload-template", to: "start#download_23_24_sales_bulk_upload_template" get "/download-23-24-sales-bulk-upload-legacy-template", to: "start#download_23_24_sales_bulk_upload_legacy_template" get "/download-23-24-sales-bulk-upload-specification", to: "start#download_23_24_sales_bulk_upload_specification" - get "/download-22-23-sales-bulk-upload-template", to: "start#download_22_23_sales_bulk_upload_template" - get "/download-22-23-sales-bulk-upload-specification", to: "start#download_22_23_sales_bulk_upload_specification" + get "/download-24-25-lettings-form", to: "start#download_24_25_lettings_form" + get "/download-24-25-lettings-bulk-upload-template", to: "start#download_24_25_lettings_bulk_upload_template" + get "/download-24-25-lettings-bulk-upload-specification", to: "start#download_24_25_lettings_bulk_upload_specification" + + get "/download-24-25-sales-form", to: "start#download_24_25_sales_form" + get "/download-24-25-sales-bulk-upload-template", to: "start#download_24_25_sales_bulk_upload_template" + get "/download-24-25-sales-bulk-upload-specification", to: "start#download_24_25_sales_bulk_upload_specification" + get "clear-filters", to: "sessions#clear_filters" diff --git a/public/files/2024_25_lettings_paper_form.pdf b/public/files/2024_25_lettings_paper_form.pdf new file mode 100644 index 000000000..08ace8e29 Binary files /dev/null and b/public/files/2024_25_lettings_paper_form.pdf differ diff --git a/public/files/2024_25_sales_paper_form.pdf b/public/files/2024_25_sales_paper_form.pdf new file mode 100644 index 000000000..0e5261b5b Binary files /dev/null and b/public/files/2024_25_sales_paper_form.pdf differ diff --git a/public/files/bulk-upload-lettings-specification-2024-25.xlsx b/public/files/bulk-upload-lettings-specification-2024-25.xlsx new file mode 100644 index 000000000..29d7efe75 Binary files /dev/null and b/public/files/bulk-upload-lettings-specification-2024-25.xlsx differ diff --git a/public/files/bulk-upload-lettings-template-2024-25.xlsx b/public/files/bulk-upload-lettings-template-2024-25.xlsx new file mode 100644 index 000000000..c29586e20 Binary files /dev/null and b/public/files/bulk-upload-lettings-template-2024-25.xlsx differ diff --git a/public/files/bulk-upload-sales-specification-2024-25.xlsx b/public/files/bulk-upload-sales-specification-2024-25.xlsx new file mode 100644 index 000000000..7e94ee89d Binary files /dev/null and b/public/files/bulk-upload-sales-specification-2024-25.xlsx differ diff --git a/public/files/bulk-upload-sales-template-2024-25.xlsx b/public/files/bulk-upload-sales-template-2024-25.xlsx new file mode 100644 index 000000000..a75800377 Binary files /dev/null and b/public/files/bulk-upload-sales-template-2024-25.xlsx differ