baarkerlounger
/
submit-social-housing-lettings-and-sales-data
mirror of https://github.com/communitiesuk/submit-social-housing-lettings-and-sales-data.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Do not display resources for a closed collection year

pull/1721/head
Kat 2 years ago
parent
0292681fe7
commit
4ffe8edb26
2 changed files with 124 additions and 82 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 168
      app/views/layouts/_collection_resources.html.erb
  2. 38
      spec/requests/organisations_controller_spec.rb

168
app/views/layouts/_collection_resources.html.erb
Unescape View File

@ -2,89 +2,93 @@
<h2 class="govuk-heading-m">Collection resources</h2> <h2 class="govuk-heading-m">Collection resources</h2>
<p class="govuk-body-s">For lettings starting during 1 April 2023 to 31 March 2024 and sales completing during the same period, use the 2023/24 forms.</p> <p class="govuk-body-s">For lettings starting during 1 April 2023 to 31 March 2024 and sales completing during the same period, use the 2023/24 forms.</p>
<h3 class="govuk-heading-s">Lettings 2023/24</h3> <% if FormHandler.instance.lettings_form_for_start_year(2023) && FormHandler.instance.lettings_form_for_start_year(2023).edit_end_date > Time.zone.today %>
<%= render DocumentListComponent.new(items: [ <h3 class="govuk-heading-s">Lettings 2023/24</h3>
{ <%= render DocumentListComponent.new(items: [
name: "Lettings log for tenants (2023/24)", {
href: download_23_24_lettings_form_path, name: "Lettings log for tenants (2023/24)",
metadata: file_type_size_and_pages("2023_24_lettings_paper_form.pdf", number_of_pages: 8), href: download_23_24_lettings_form_path,
}, metadata: file_type_size_and_pages("2023_24_lettings_paper_form.pdf", number_of_pages: 8),
{ },
name: "Lettings bulk upload template (2023/24) – New question ordering", {
href: download_23_24_lettings_bulk_upload_template_path, name: "Lettings bulk upload template (2023/24) – New question ordering",
metadata: file_type_size_and_pages("bulk-upload-lettings-template-2023-24.xlsx"), href: download_23_24_lettings_bulk_upload_template_path,
}, metadata: file_type_size_and_pages("bulk-upload-lettings-template-2023-24.xlsx"),
{ },
name: "Lettings bulk upload template (2023/24)", {
href: download_23_24_lettings_bulk_upload_legacy_template_path, name: "Lettings bulk upload template (2023/24)",
metadata: file_type_size_and_pages("bulk-upload-lettings-legacy-template-2023-24.xlsx"), 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: "Lettings bulk upload specification (2023/24)", {
href: download_23_24_lettings_bulk_upload_specification_path, name: "Lettings bulk upload specification (2023/24)",
metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2023-24.xlsx"), href: download_23_24_lettings_bulk_upload_specification_path,
}, metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2023-24.xlsx"),
]) %> },
]) %>
<h3 class="govuk-heading-s">Sales 2023/24</h3> <h3 class="govuk-heading-s">Sales 2023/24</h3>
<%= render DocumentListComponent.new(items: [ <%= render DocumentListComponent.new(items: [
{ {
name: "Sales log for buyers (2023/24)", name: "Sales log for buyers (2023/24)",
href: download_23_24_sales_form_path, href: download_23_24_sales_form_path,
metadata: file_type_size_and_pages("2023_24_sales_paper_form.pdf", number_of_pages: 8), metadata: file_type_size_and_pages("2023_24_sales_paper_form.pdf", number_of_pages: 8),
}, },
{ {
name: "Sales bulk upload template (2023/24) – New question ordering", name: "Sales bulk upload template (2023/24) – New question ordering",
href: download_23_24_sales_bulk_upload_template_path, href: download_23_24_sales_bulk_upload_template_path,
metadata: file_type_size_and_pages("bulk-upload-sales-template-2023-24.xlsx"), metadata: file_type_size_and_pages("bulk-upload-sales-template-2023-24.xlsx"),
}, },
{ {
name: "Sales bulk upload template (2023/24)", name: "Sales bulk upload template (2023/24)",
href: download_23_24_sales_bulk_upload_legacy_template_path, href: download_23_24_sales_bulk_upload_legacy_template_path,
metadata: file_type_size_and_pages("bulk-upload-sales-legacy-template-2023-24.xlsx"), metadata: file_type_size_and_pages("bulk-upload-sales-legacy-template-2023-24.xlsx"),
}, },
{ {
name: "Sales bulk upload specification (2023/24)", name: "Sales bulk upload specification (2023/24)",
href: download_23_24_sales_bulk_upload_specification_path, href: download_23_24_sales_bulk_upload_specification_path,
metadata: file_type_size_and_pages("bulk-upload-sales-specification-2023-24.xlsx"), metadata: file_type_size_and_pages("bulk-upload-sales-specification-2023-24.xlsx"),
}, },
]) %> ]) %>
<% end %>
<h3 class="govuk-heading-s">Lettings 2022/23</h3> <% if FormHandler.instance.lettings_form_for_start_year(2022) && FormHandler.instance.lettings_form_for_start_year(2022).edit_end_date > Time.zone.today %>
<%= render DocumentListComponent.new(items: [ <h3 class="govuk-heading-s">Lettings 2022/23</h3>
{ <%= render DocumentListComponent.new(items: [
name: "Lettings log for tenants (2022/23)", {
href: download_22_23_lettings_form_path, name: "Lettings log for tenants (2022/23)",
metadata: file_type_size_and_pages("2022_23_lettings_paper_form.pdf", number_of_pages: 4), href: download_22_23_lettings_form_path,
}, metadata: file_type_size_and_pages("2022_23_lettings_paper_form.pdf", number_of_pages: 4),
{ },
name: "Lettings bulk upload template (2022/23)", {
href: download_22_23_lettings_bulk_upload_template_path, name: "Lettings bulk upload template (2022/23)",
metadata: file_type_size_and_pages("bulk-upload-lettings-template-2022-23.xlsx"), href: download_22_23_lettings_bulk_upload_template_path,
}, metadata: file_type_size_and_pages("bulk-upload-lettings-template-2022-23.xlsx"),
{ },
name: "Lettings bulk upload specification (2022/23)", {
href: download_22_23_lettings_bulk_upload_specification_path, name: "Lettings bulk upload specification (2022/23)",
metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2022-23.xlsx"), href: download_22_23_lettings_bulk_upload_specification_path,
}, metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2022-23.xlsx"),
]) %> },
]) %>
<h3 class="govuk-heading-s">Sales 2022/23</h3> <h3 class="govuk-heading-s">Sales 2022/23</h3>
<%= render DocumentListComponent.new(items: [ <%= render DocumentListComponent.new(items: [
{ {
name: "Sales log for buyers (2022/23)", name: "Sales log for buyers (2022/23)",
href: download_22_23_sales_form_path, href: download_22_23_sales_form_path,
metadata: file_type_size_and_pages("2022_23_sales_paper_form.pdf", number_of_pages: 5), metadata: file_type_size_and_pages("2022_23_sales_paper_form.pdf", number_of_pages: 5),
}, },
{ {
name: "Sales bulk upload template (2022/23)", name: "Sales bulk upload template (2022/23)",
href: download_22_23_sales_bulk_upload_template_path, href: download_22_23_sales_bulk_upload_template_path,
metadata: file_type_size_and_pages("bulk-upload-sales-template-2022-23.xlsx"), metadata: file_type_size_and_pages("bulk-upload-sales-template-2022-23.xlsx"),
}, },
{ {
name: "Sales bulk upload specification (2022/23)", name: "Sales bulk upload specification (2022/23)",
href: download_22_23_sales_bulk_upload_specification_path, href: download_22_23_sales_bulk_upload_specification_path,
metadata: file_type_size_and_pages("bulk-upload-sales-template-2022-23.xlsx"), metadata: file_type_size_and_pages("bulk-upload-sales-template-2022-23.xlsx"),
}, },
]) %> ]) %>
<% end %>
</div> </div>

38
spec/requests/organisations_controller_spec.rb
Unescape View File

@ -175,7 +175,9 @@ RSpec.describe OrganisationsController, type: :request do
describe "#show" do describe "#show" do
context "with an organisation that the user belongs to" do context "with an organisation that the user belongs to" do
let(:set_time) {}
before do before do
set_time
sign_in user sign_in user
get "/organisations/#{organisation.id}", headers:, params: {} get "/organisations/#{organisation.id}", headers:, params: {}
end end
@ -183,6 +185,42 @@ RSpec.describe OrganisationsController, type: :request do
it "redirects to details" do it "redirects to details" do
expect(response).to have_http_status(:redirect) expect(response).to have_http_status(:redirect)
end end
context "and 2022 collection window is open" do
let(:set_time) { allow(Time).to receive(:now).and_return(Time.zone.local(2023, 1, 1)) }
it "displays correct resources for 2022/23 and 2023/24 collection years" do
follow_redirect!
expect(page).to have_content("Lettings 2023/24")
expect(page).to have_content("Sales 2023/24")
expect(page).to have_content("Lettings 2022/23")
expect(page).to have_content("Sales 2022/23")
end
end
context "and 2022 collection window is closed for editing" do
let(:set_time) { allow(Time).to receive(:now).and_return(Time.zone.local(2024, 1, 1)) }
it "displays correct resources for 2022/23 and 2023/24 collection years" do
follow_redirect!
expect(page).to have_content("Lettings 2023/24")
expect(page).to have_content("Sales 2023/24")
expect(page).not_to have_content("Lettings 2022/23")
expect(page).not_to have_content("Sales 2022/23")
end
end
context "and 2023 collection window is closed for editing" do
let(:set_time) { allow(Time).to receive(:now).and_return(Time.zone.local(2025, 1, 1)) }
it "displays correct resources for 2022/23 and 2023/24 collection years" do
follow_redirect!
expect(page).not_to have_content("Lettings 2023/24")
expect(page).not_to have_content("Sales 2023/24")
expect(page).not_to have_content("Lettings 2022/23")
expect(page).not_to have_content("Sales 2022/23")
end
end
end end
context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do context "with an organisation that are not in scope for the user, i.e. that they do not belong to" do

Write Preview
Loading…
Cancel
Save