Merge pull request #5818 from nhsuk/alistair/national-reporting-edit-location-performance-fix

Filter schools when editing location on NR records

Author: alistair-white-horne-tng

app/controllers/draft_vaccination_records_controller.rb

@@ -244,7 +244,7 @@ def set_batches
   def set_locations
     @locations =
       if @draft_vaccination_record.bulk_upload_user_and_record?
-        Location.school.order(:name)
+        Location.school.where(status: "open").order(:name)
       else
         policy_scope(Location).community_clinic
       end

app/views/draft_vaccination_records/location.html.erb

@@ -14,11 +14,11 @@
                      caption: { text: @patient.full_name },
                      data: { module: "app-autocomplete" } do %>
 
-      <% @locations.find_each do |school| %>
-        <%= tag.option location_display_name(school, show_urn: true),
-                       value: school.id,
-                       selected: school.id == @draft_vaccination_record.location&.id,
-                       data: { hint: format_address_single_line(school) } %>
+      <% @locations.find_each do |location| %>
+        <%= tag.option location_display_name(location, show_urn: true),
+                       value: location.id,
+                       selected: location.id == @draft_vaccination_record.location&.id,
+                       data: { hint: format_address_single_line(location) } %>
       <% end %>
       <%= tag.option "Unknown", value: "unknown", selected: @draft_vaccination_record.location.nil? %>
   <% end %>

spec/features/edit_vaccination_record_spec.rb

@@ -456,7 +456,7 @@ def given_a_bulk_upload_team_exists
         year_group: 8
       )
 
-    @school = create(:school, name: "A New School")
+    @school = create(:school, name: "A New School", status: "open")
 
     @vaccine = @programme.vaccines.first