diff --git a/app/components/document_list_component.rb b/app/components/document_list_component.rb
index 253370c98..e5ad9c843 100644
--- a/app/components/document_list_component.rb
+++ b/app/components/document_list_component.rb
@@ -1,8 +1,9 @@
class DocumentListComponent < ViewComponent::Base
- attr_reader :items
+ attr_reader :items, :label
- def initialize(items:)
+ def initialize(items:, label:)
@items = items
+ @label = label
super
end
end
diff --git a/app/controllers/start_controller.rb b/app/controllers/start_controller.rb
index 318e7cace..e07615901 100644
--- a/app/controllers/start_controller.rb
+++ b/app/controllers/start_controller.rb
@@ -5,6 +5,14 @@ class StartController < ApplicationController
end
end
+ def download_24_25_sales_form
+ send_file(
+ Rails.root.join("public/files/2024_25_sales_paper_form.pdf"),
+ filename: "2024-25 Sales paper form.pdf",
+ type: "application/pdf",
+ )
+ end
+
def download_23_24_sales_form
send_file(
Rails.root.join("public/files/2023_24_sales_paper_form.pdf"),
@@ -21,6 +29,14 @@ class StartController < ApplicationController
)
end
+ def download_24_25_lettings_form
+ send_file(
+ Rails.root.join("public/files/2024_25_lettings_paper_form.pdf"),
+ filename: "2024-25 Lettings paper form.pdf",
+ type: "application/pdf",
+ )
+ end
+
def download_23_24_lettings_form
send_file(
Rails.root.join("public/files/2023_24_lettings_paper_form.pdf"),
@@ -37,6 +53,38 @@ class StartController < ApplicationController
)
end
+ def download_24_25_lettings_bulk_upload_template
+ send_file(
+ Rails.root.join("public/files/bulk-upload-lettings-template-2024-25.xlsx"),
+ filename: "2024-25-lettings-bulk-upload-template.xlsx",
+ type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ )
+ end
+
+ def download_24_25_lettings_bulk_upload_specification
+ send_file(
+ Rails.root.join("public/files/bulk-upload-lettings-specification-2024-25.xlsx"),
+ filename: "2024-25-lettings-bulk-upload-specification.xlsx",
+ type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ )
+ end
+
+ def download_24_25_sales_bulk_upload_template
+ send_file(
+ Rails.root.join("public/files/bulk-upload-sales-template-2024-25.xlsx"),
+ filename: "2024-25-sales-bulk-upload-template.xlsx",
+ type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ )
+ end
+
+ def download_24_25_sales_bulk_upload_specification
+ send_file(
+ Rails.root.join("public/files/bulk-upload-sales-specification-2024-25.xlsx"),
+ filename: "2024-25-sales-bulk-upload-specification.xlsx",
+ type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+ )
+ end
+
def download_23_24_lettings_bulk_upload_template
send_file(
Rails.root.join("public/files/bulk-upload-lettings-template-2023-24.xlsx"),
diff --git a/app/frontend/styles/_tab.scss b/app/frontend/styles/_tab.scss
new file mode 100644
index 000000000..8dbaf3418
--- /dev/null
+++ b/app/frontend/styles/_tab.scss
@@ -0,0 +1,15 @@
+.app-tab__small-headers {
+ @include govuk-font(16);
+}
+
+@media (min-width: 35.375em) {
+ .app-tab__list-view {
+ min-width: 35.375em;
+ }
+}
+
+@media (min-width: 35.375em) {
+ .app-tab__underline {
+ min-width: 35.375em;
+ }
+}
diff --git a/app/frontend/styles/application.scss b/app/frontend/styles/application.scss
index 6309425de..a81214894 100644
--- a/app/frontend/styles/application.scss
+++ b/app/frontend/styles/application.scss
@@ -38,6 +38,7 @@ $govuk-breakpoints: (
@import "metadata";
@import "related-navigation";
@import "section-skip-link";
+@import "tab";
@import "table-group";
@import "tag";
@import "task-list";
diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index aa8f7135f..852cbda93 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -48,7 +48,7 @@
<%= render partial: "layouts/collection_resources" %>
-
+
<%= render partial: "home/upcoming_deadlines" %>
<%= render partial: "layouts/about_this_service" %>
diff --git a/app/views/layouts/_collection_resources.html.erb b/app/views/layouts/_collection_resources.html.erb
index 0c084596e..bc0e07360 100644
--- a/app/views/layouts/_collection_resources.html.erb
+++ b/app/views/layouts/_collection_resources.html.erb
@@ -4,56 +4,111 @@
<% else %>
Collection resources
<% end %>
+
Use the 2024 to 2025 forms for lettings that start and sales that complete between 1 April 2024 and 31 March 2025.
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: %w[app-tab__small-headers]) 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 24/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)",
+ 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"),
+ },
+ ],
+ label: "Lettings 2024 to 2025",
+ ) %>
+ <% end %>
+ <% c.with_tab(label: "Sales 24/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)",
+ 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"),
+ },
+ ],
+ label: "Sales 2024 to 2025",
+ ) %>
+ <% 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: [
- {
- name: "Download the lettings log for tenants (2023 to 2024)",
- href: download_23_24_lettings_form_path,
- metadata: file_type_size_and_pages("2023_24_lettings_paper_form.pdf", number_of_pages: 8),
- },
- {
- name: "Download the lettings bulk upload template (2023 to 2024) – New question ordering",
- href: download_23_24_lettings_bulk_upload_template_path,
- metadata: file_type_size_and_pages("bulk-upload-lettings-template-2023-24.xlsx"),
- },
- {
- name: "Download the lettings bulk upload template (2023 to 2024) – Legacy version",
- href: download_23_24_lettings_bulk_upload_legacy_template_path,
- metadata: file_type_size_and_pages("bulk-upload-lettings-legacy-template-2023-24.xlsx"),
- },
- {
- name: "Download the lettings bulk upload specification (2023 to 2024)",
- href: download_23_24_lettings_bulk_upload_specification_path,
- metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2023-24.xlsx"),
- },
- ]) %>
+ <% c.with_tab(label: "Lettings 23/24") do %>
+ <%= render DocumentListComponent.new(
+ items: [
+ {
+ name: "Download the lettings log for tenants (2023 to 2024)",
+ href: download_23_24_lettings_form_path,
+ metadata: file_type_size_and_pages("2023_24_lettings_paper_form.pdf", number_of_pages: 8),
+ },
+ {
+ name: "Download the lettings bulk upload template (2023 to 2024) – New question ordering",
+ href: download_23_24_lettings_bulk_upload_template_path,
+ metadata: file_type_size_and_pages("bulk-upload-lettings-template-2023-24.xlsx"),
+ },
+ {
+ name: "Download the lettings bulk upload template (2023 to 2024) – Legacy version",
+ href: download_23_24_lettings_bulk_upload_legacy_template_path,
+ metadata: file_type_size_and_pages("bulk-upload-lettings-legacy-template-2023-24.xlsx"),
+ },
+ {
+ name: "Download the lettings bulk upload specification (2023 to 2024)",
+ href: download_23_24_lettings_bulk_upload_specification_path,
+ metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2023-24.xlsx"),
+ },
+ ],
+ label: "Lettings 2023 to 2024",
+ ) %>
<% end %>
- <% c.with_tab(label: "Sales 2023/24") do %>
- <%= render DocumentListComponent.new(items: [
- {
- name: "Download the sales log for buyers (2023 to 2024)",
- href: download_23_24_sales_form_path,
- metadata: file_type_size_and_pages("2023_24_sales_paper_form.pdf", number_of_pages: 8),
- },
- {
- name: "Download the sales bulk upload template (2023 to 2024) – New question ordering",
- href: download_23_24_sales_bulk_upload_template_path,
- metadata: file_type_size_and_pages("bulk-upload-sales-template-2023-24.xlsx"),
- },
- {
- name: "Download the sales bulk upload template (2023 to 2024) – Legacy version",
- href: download_23_24_sales_bulk_upload_legacy_template_path,
- metadata: file_type_size_and_pages("bulk-upload-sales-legacy-template-2023-24.xlsx"),
- },
- {
- name: "Download the sales bulk upload specification (2023 to 2024)",
- href: download_23_24_sales_bulk_upload_specification_path,
- metadata: file_type_size_and_pages("bulk-upload-sales-specification-2023-24.xlsx"),
- },
- ]) %>
+ <% c.with_tab(label: "Sales 23/24") do %>
+ <%= render DocumentListComponent.new(
+ items: [
+ {
+ name: "Download the sales log for buyers (2023 to 2024)",
+ href: download_23_24_sales_form_path,
+ metadata: file_type_size_and_pages("2023_24_sales_paper_form.pdf", number_of_pages: 8),
+ },
+ {
+ name: "Download the sales bulk upload template (2023 to 2024) – New question ordering",
+ href: download_23_24_sales_bulk_upload_template_path,
+ metadata: file_type_size_and_pages("bulk-upload-sales-template-2023-24.xlsx"),
+ },
+ {
+ name: "Download the sales bulk upload template (2023 to 2024) – Legacy version",
+ href: download_23_24_sales_bulk_upload_legacy_template_path,
+ metadata: file_type_size_and_pages("bulk-upload-sales-legacy-template-2023-24.xlsx"),
+ },
+ {
+ name: "Download the sales bulk upload specification (2023 to 2024)",
+ href: download_23_24_sales_bulk_upload_specification_path,
+ metadata: file_type_size_and_pages("bulk-upload-sales-specification-2023-24.xlsx"),
+ },
+ ],
+ label: "Sales 2023 to 2024",
+ ) %>
<% end %>
<% end %>
<% end %>
+
diff --git a/app/views/start/index.html.erb b/app/views/start/index.html.erb
index 79abb5df7..14ed39282 100644
--- a/app/views/start/index.html.erb
+++ b/app/views/start/index.html.erb
@@ -22,10 +22,10 @@
Use your account details to sign in.
If you need to set up a new account, speak to your organisation’s CORE data coordinator. If you don’t know who that is, <%= govuk_link_to("contact the helpdesk", GlobalConstants::HELPDESK_URL) %>.
You can <%= govuk_mail_to("dluhc.digital-services@levellingup.gov.uk", "request an account", subject: "CORE: Request a new account") %> if your organisation doesn’t have one.
-
<%= govuk_link_to guidance_path do %>Guidance for submitting social housing lettings and sales data (CORE)<% end %>
+
<%= govuk_link_to guidance_path do %>Guidance for submitting social housing lettings and sales data (CORE)<% end %>
<%= render partial: "layouts/collection_resources" %>
-
+
<%= render partial: "layouts/about_this_service" %>