From eba25254be93fc1f66dd3ee63f1c17f2f0abe21d Mon Sep 17 00:00:00 2001
From: Kat <katrina@kosiak.co.uk>
Date: Tue, 15 Oct 2024 11:55:02 +0100
Subject: [PATCH] Change the ordering for collection resources

---
 app/frontend/styles/_document-list.scss       | 1 -
 app/views/collection_resources/index.html.erb | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/frontend/styles/_document-list.scss b/app/frontend/styles/_document-list.scss
index e8cef0625..a1f812551 100644
--- a/app/frontend/styles/_document-list.scss
+++ b/app/frontend/styles/_document-list.scss
@@ -1,5 +1,4 @@
 .app-document-list {
-  margin-top: govuk-spacing(3);
   margin-bottom: govuk-spacing(6);
 }
 
diff --git a/app/views/collection_resources/index.html.erb b/app/views/collection_resources/index.html.erb
index 207a63991..ee5574f80 100644
--- a/app/views/collection_resources/index.html.erb
+++ b/app/views/collection_resources/index.html.erb
@@ -14,16 +14,13 @@
 <% end %>
 <h1 class="govuk-heading-l"><%= title %></h1>
 
-<% @mandatory_lettings_collection_resources_per_year.each do |year, mandatory_resources| %>
+<% editable_collection_resource_years.each do |year| %>
   <h2 class="govuk-heading-m">
     Lettings <%= text_year_range_format(year) %>
   </h2>
-  <%= render partial: "collection_resource_summary_list", locals: { mandatory_resources:, additional_resources: @additional_lettings_collection_resources_per_year[year] } %>
-<% end %>
-
-<% @mandatory_sales_collection_resources_per_year.each do |year, mandatory_resources| %>
+  <%= render partial: "collection_resource_summary_list", locals: { mandatory_resources: @mandatory_lettings_collection_resources_per_year[year], additional_resources: @additional_lettings_collection_resources_per_year[year] } %>
   <h2 class="govuk-heading-m">
     Sales <%= text_year_range_format(year) %>
   </h2>
-  <%= render partial: "collection_resource_summary_list", locals: { mandatory_resources:, additional_resources: @additional_sales_collection_resources_per_year[year] } %>
+  <%= render partial: "collection_resource_summary_list", locals: { mandatory_resources: @mandatory_sales_collection_resources_per_year[year], additional_resources: @additional_sales_collection_resources_per_year[year] } %>
 <% end %>