Add sorting to session and cohort views

app/controllers/cohorts_controller.rb

@@ -26,7 +26,10 @@ def index
 
   def show
     @cohort = policy_scope(Cohort).find(params[:id])
-    @patients = @cohort.patients.recorded
+    @patients =
+      @cohort.patients.recorded.sort_by do |patient|
+        [patient.first_name, patient.last_name]
+      end
   end
 
   private

app/controllers/programmes_controller.rb

@@ -14,9 +14,16 @@ def show
 
   def sessions
     academic_year = Date.current.academic_year
-    sessions_for_programme = policy_scope(Session).has_programme(@programme)
+    sessions_for_programme =
+      policy_scope(Session)
+        .has_programme(@programme)
+        .strict_loading
+        .includes(:dates, :location)
 
-    @scheduled_sessions = sessions_for_programme.scheduled
+    @scheduled_sessions =
+      sessions_for_programme.scheduled.sort_by do |session|
+        [session.dates.first.value, session.location&.name]
+      end
 
     @unscheduled_sessions =
       sessions_for_programme.unscheduled +
@@ -27,8 +34,12 @@ def sessions
           .map do |location|
             Session.new(team: current_user.team, location:, academic_year:)
           end
+    @unscheduled_sessions.sort_by! { |session| session.location.name }
 
-    @completed_sessions = sessions_for_programme.completed
+    @completed_sessions =
+      sessions_for_programme.completed.sort_by do |session|
+        [session.dates.first.value, session.location.name]
+      end
   end
 
   private

app/controllers/sessions_controller.rb

@@ -21,31 +21,54 @@ def new
   end
 
   def index
-    @sessions = policy_scope(Session).today
+    @sessions =
+      policy_scope(Session)
+        .strict_loading
+        .includes(:dates, :location, :programmes)
+        .today
 
     render layout: "full"
   end
 
   def scheduled
-    @sessions = policy_scope(Session).scheduled
+    @sessions =
+      policy_scope(Session)
+        .strict_loading
+        .includes(:dates, :location, :programmes)
+        .scheduled
+        .sort_by do |session|
+          [session.dates.first.value, session.location.name]
+        end
 
     render layout: "full"
   end
 
   def unscheduled
     @sessions =
-      policy_scope(Session).unscheduled +
+      policy_scope(Session)
+        .strict_loading
+        .includes(:dates, :location, :programmes)
+        .unscheduled +
         team
           .schools
           .for_year_groups(team.year_groups)
           .has_no_session
           .map { |location| Session.new(team:, location:, academic_year:) }
 
+    @sessions.sort_by! { |session| session.location.name }
+
     render layout: "full"
   end
 
   def completed
-    @sessions = policy_scope(Session).completed
+    @sessions =
+      policy_scope(Session)
+        .strict_loading
+        .includes(:dates, :location, :programmes)
+        .completed
+        .sort_by do |session|
+          [session.dates.first.value, session.location.name]
+        end
 
     render layout: "full"
   end

app/models/session.rb

@@ -50,7 +50,10 @@ class Session < ApplicationRecord
   scope :has_programme,
         ->(programme) { joins(:programmes).where(programmes: programme) }
 
-  scope :today, -> { has_date(Date.current) }
+  scope :today, -> { has_date(Date.current).order_by_location_name }
+
+  scope :order_by_location_name,
+        -> { left_joins(:location).order("locations.name ASC NULLS LAST") }
 
   scope :unscheduled,
         -> do