natdeanlewissoftwire
2 years ago
11 changed files with 172 additions and 117 deletions
@ -0,0 +1,35 @@
|
||||
<h1 class="govuk-heading-l">Upcoming deadlines</h1> |
||||
|
||||
<% current_lettings_form = FormHandler.instance.in_crossover_period? ? FormHandler.instance.previous_lettings_form : FormHandler.instance.current_lettings_form %> |
||||
<% formatted_deadline = "#{current_lettings_form.submission_deadline.strftime('%A')} #{current_lettings_form.submission_deadline.to_formatted_s(:govuk_date)}" %> |
||||
<% if FormHandler.instance.in_crossover_period? %> |
||||
<p class="govuk-body govuk-body-m"><strong>End of year deadline - <%= formatted_deadline %>:</strong> Deadline to submit logs for tenancies starting between <%= collection_start_date(Time.zone.now).to_formatted_s(:govuk_date) %> to <%= collection_end_date(Time.zone.now).to_formatted_s(:govuk_date) %></p> |
||||
<% end %> |
||||
|
||||
<% current_quarter = quarter_for_date(date: Time.zone.now) %> |
||||
<% if current_quarter.present? %> |
||||
<p class="govuk-body govuk-body-m"><strong><%= "#{current_quarter.quarter} - #{current_quarter.cutoff_date.strftime('%A')} #{current_quarter.cutoff_date.to_formatted_s(:govuk_date)}" %>:</strong> Quarterly cut off date for tenancies and sales starting between <%= current_quarter.quarter_start_date.to_formatted_s(:govuk_date) %> and <%= current_quarter.quarter_end_date.to_formatted_s(:govuk_date) %>.</p> |
||||
<% end %> |
||||
|
||||
<% if !FormHandler.instance.in_crossover_period? %> |
||||
<p class="govuk-body govuk-body-m">Try to complete your logs for each quarter by the cut-off date.</p> |
||||
<p class="govuk-body govuk-body-m">You can still create logs for a previous quarter after its cut-off date, as long as you complete them by the <strong>end-of-year deadline: <%= formatted_deadline %>.</strong></p> |
||||
<% end %> |
||||
|
||||
<% if FormHandler.instance.in_crossover_period? %> |
||||
<% previous_lettings_form = FormHandler.instance.previous_lettings_form %> |
||||
<p class="govuk-body govuk-body-m">Prioritise completing logs for the closing collection year. You must complete all <%= previous_lettings_form.start_date.year %> to <%= previous_lettings_form.submission_deadline.year %> logs must by the end-of-year deadline. You can still create <%= current_lettings_form.start_date.year %> to <%= current_lettings_form.submission_deadline.year %> logs for this quarter after the quarterly cut-off date.</p> |
||||
<% end %> |
||||
|
||||
<%= govuk_details(summary_text: "Quarterly cut-off dates for 2023 to 2024") do %> |
||||
<p class="govuk-body govuk-body-m">The 2023 to 2024 quarterly cut-off dates are:</p> |
||||
<ul class="govuk-list govuk-list--bullet"> |
||||
<li class="govuk-!-padding-bottom-4"><strong>Q1 - Friday 14 July 2023:</strong> Quarterly cut-off date for tenancies and sales starting between 1 April 2023 and 30 June 2023.</li> |
||||
<li class="govuk-!-padding-bottom-4"><strong>Q2 - Friday 13 October 2023:</strong> Quarterly cut-off date for tenancies and sales starting between 1 July 2023 and 30 September 2023.</li> |
||||
<li class="govuk-!-padding-bottom-4"><strong>Q3 - Friday 12 January 2024:</strong> Quarterly cut-off date for tenancies and sales starting between 1 October 2023 and 31 December 2023.</li> |
||||
<li class="govuk-!-padding-bottom-4"><strong>End of year deadline - Friday 7 June 2024:</strong> Deadline for tenancies and sales starting between 1 January 2024 and 31 March 2024, plus any late submissions for the 2023 to 2024 collection year.</li> |
||||
</ul> |
||||
<p class="govuk-body govuk-body-m">It is important that you meet these cut-off dates because we submit data to the Office for National Statistics quarterly, helping them create essential inflation statistics.</p> |
||||
<p class="govuk-body govuk-body-m">Meeting these cut-off dates also gives you more accurate data for your own analysis, and reduces the burden at the end of the year.</p> |
||||
<p class="govuk-body govuk-body-m">If you are not able to meet these quarterly dates, submit your logs as soon as you can so that they can be included in the annual data.</p> |
||||
<% end %> |
||||
@ -1 +1,8 @@
|
||||
<p class="govuk-body-l"><%= "Welcome back, #{@current_user.name}" %></p> |
||||
<div class="govuk-grid-row"> |
||||
<div class="govuk-grid-column-two-thirds"> |
||||
<%= render partial: "layouts/collection_resources" %> |
||||
<hr class="govuk-section-break govuk-section-break--visible govuk-section-break--m"> |
||||
<%= render partial: "home/upcoming_deadlines" %> |
||||
</div> |
||||
</div> |
||||
|
||||
@ -1,94 +1,59 @@
|
||||
<div class="app-card"> |
||||
<% if current_user %> |
||||
<h1 class="govuk-heading-l">Collection resources</h1> |
||||
<p class="govuk-body"><strong><%= govuk_link_to "Guidance for submitting social housing lettings and sales data (CORE)", guidance_path %></strong></p> |
||||
<% else %> |
||||
<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> |
||||
|
||||
<% end %> |
||||
<p class="govuk-body">Use the 2023 to 2024 forms for lettings that start and sales that complete between 1 April 2023 and 31 March 2024.</p> |
||||
<%= govuk_tabs(title: "Collection resources") do |c| %> |
||||
<% if FormHandler.instance.lettings_form_for_start_year(2023) && FormHandler.instance.lettings_form_for_start_year(2023).edit_end_date > Time.zone.today %> |
||||
<h3 class="govuk-heading-s">Lettings 2023/24</h3> |
||||
<% c.with_tab(label: "Lettings 2023/24") do %> |
||||
<%= render DocumentListComponent.new(items: [ |
||||
{ |
||||
name: "Lettings log for tenants (2023/24)", |
||||
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: "Lettings bulk upload template (2023/24) – New question ordering", |
||||
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: "Lettings bulk upload template (2023/24)", |
||||
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: "Lettings bulk upload specification (2023/24)", |
||||
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"), |
||||
}, |
||||
]) %> |
||||
|
||||
<h3 class="govuk-heading-s">Sales 2023/24</h3> |
||||
<% end %> |
||||
<% c.with_tab(label: "Sales 2023/24") do %> |
||||
<%= render DocumentListComponent.new(items: [ |
||||
{ |
||||
name: "Sales log for buyers (2023/24)", |
||||
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: "Sales bulk upload template (2023/24) – New question ordering", |
||||
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: "Sales bulk upload template (2023/24)", |
||||
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: "Sales bulk upload specification (2023/24)", |
||||
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"), |
||||
}, |
||||
]) %> |
||||
<% end %> |
||||
|
||||
<% if FormHandler.instance.lettings_form_for_start_year(2022) && FormHandler.instance.lettings_form_for_start_year(2022).edit_end_date > Time.zone.today %> |
||||
<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, |
||||
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, |
||||
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, |
||||
metadata: file_type_size_and_pages("bulk-upload-lettings-specification-2022-23.xlsx"), |
||||
}, |
||||
]) %> |
||||
|
||||
<h3 class="govuk-heading-s">Sales 2022/23</h3> |
||||
<%= render DocumentListComponent.new(items: [ |
||||
{ |
||||
name: "Sales log for buyers (2022/23)", |
||||
href: download_22_23_sales_form_path, |
||||
metadata: file_type_size_and_pages("2022_23_sales_paper_form.pdf", number_of_pages: 5), |
||||
}, |
||||
{ |
||||
name: "Sales bulk upload template (2022/23)", |
||||
href: download_22_23_sales_bulk_upload_template_path, |
||||
metadata: file_type_size_and_pages("bulk-upload-sales-template-2022-23.xlsx"), |
||||
}, |
||||
{ |
||||
name: "Sales bulk upload specification (2022/23)", |
||||
href: download_22_23_sales_bulk_upload_specification_path, |
||||
metadata: file_type_size_and_pages("bulk-upload-sales-template-2022-23.xlsx"), |
||||
}, |
||||
]) %> |
||||
<% end %> |
||||
</div> |
||||
<% end %> |
||||
|
||||
Loading…
Reference in new issue