Merge pull request #5831 from nhsuk/de-dup-schools-on-teams-page

Show team schools and clinics for current academic year

Author: murugapl

app/controllers/teams_controller.rb

@@ -3,6 +3,8 @@
 class TeamsController < ApplicationController
   skip_after_action :verify_policy_scoped
   before_action :set_team
+  before_action :set_schools, only: :schools
+  before_action :set_clinics, only: :clinics
 
   layout "full"
 
@@ -23,4 +25,24 @@ def clinics
   def set_team
     @team = authorize current_team
   end
+
+  def set_schools
+    @schools =
+      @team
+        .schools
+        .joins(:team_locations)
+        .where(team_locations: { academic_year: AcademicYear.pending })
+        .distinct
+        .order(:name)
+  end
+
+  def set_clinics
+    @clinics =
+      @team
+        .community_clinics
+        .joins(:team_locations)
+        .where(team_locations: { academic_year: AcademicYear.pending })
+        .distinct
+        .order(:name)
+  end
 end

app/views/teams/clinics.html.erb

@@ -18,7 +18,7 @@
           <% end %>
         <% end %>
         <% table.with_body do |body| %>
-          <% @team.community_clinics.each do |clinic| %>
+          <% @clinics.each do |clinic| %>
             <% body.with_row do |row| %>
               <% row.with_cell {
                    [

app/views/teams/schools.html.erb

@@ -15,12 +15,11 @@
         <% table.with_head do |head| %>
           <% head.with_row do |row| %>
             <% row.with_cell { "Name" } %>
-            <% row.with_cell { "URN" } %>
-            <% row.with_cell { "Phase" } %>
+            <% row.with_cell { "School URN" } %>
           <% end %>
         <% end %>
         <% table.with_body do |body| %>
-          <% @team.schools.each do |school| %>
+          <% @schools.each do |school| %>
             <% body.with_row do |row| %>
               <% row.with_cell {
                    [
@@ -32,7 +31,6 @@
                      .html_safe
                  } %>
                  <% row.with_cell { tag.span(school.urn_and_site, class: "app-u-code") } %>
-              <% row.with_cell { school.human_enum_name(:phase) } %>
             <% end %>
           <% end %>
         <% end %>