Add Programmes::SessionsController

This encapsulates logic related to displaying the sessions tab when
viewing a programme to reduce the size of the existing
ProgrammesController and make the code easier to maintain.

By making the controllers consistent we're also able to refactor
`AppProgrammeNavigationComponent` to simplify the logic and reduce
duplication.

Author: thomasleese

app/components/app_programme_navigation_component.rb

@@ -16,33 +16,19 @@ def call
         selected: active == :overview
       )
 
-      nav.with_item(
-        href: programme_cohorts_path(programme),
-        text: I18n.t("programmes.cohorts.index.title"),
-        selected: active == :cohorts
-      )
-
-      nav.with_item(
-        href: sessions_programme_path(programme),
-        text: I18n.t("sessions.index.title"),
-        selected: active == :sessions
-      )
-
-      nav.with_item(
-        href: programme_patients_path(programme),
-        text: I18n.t("programmes.patients.index.title"),
-        selected: active == :patients
-      )
-
-      nav.with_item(
-        href: programme_vaccinations_path(programme),
-        text: I18n.t("programmes.vaccinations.index.title"),
-        selected: active == :vaccinations
-      )
+      SECTIONS.each do |section|
+        nav.with_item(
+          href: public_send("programme_#{section}_path", programme),
+          text: I18n.t("title", scope: [:programmes, section, :index]),
+          selected: active == session
+        )
+      end
     end
   end
 
   private
 
   attr_reader :programme, :active
+
+  SECTIONS = %i[cohorts sessions patients vaccinations].freeze
 end

app/controllers/programmes/sessions_controller.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class Programmes::SessionsController < ApplicationController
+  before_action :set_programme
+
+  layout "full"
+
+  def index
+    @sessions =
+      policy_scope(Session)
+        .has_programme(@programme)
+        .for_current_academic_year
+        .includes(:location, :session_dates)
+        .order("locations.name")
+  end
+
+  private
+
+  def set_programme
+    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
+  end
+end

app/controllers/programmes_controller.rb

@@ -16,15 +16,6 @@ def show
       policy_scope(Consent).where(patient: patients, programme: @programme)
   end
 
-  def sessions
-    @sessions =
-      policy_scope(Session)
-        .has_programme(@programme)
-        .for_current_academic_year
-        .includes(:location, :session_dates)
-        .order("locations.name")
-  end
-
   def consent_form
     send_file(
       "public/consent_forms/#{@programme.type}.pdf",

app/views/programmes/sessions.html.erb …views/programmes/sessions/index.html.erbapp/views/programmes/sessions.html.erb renamed to app/views/programmes/sessions/index.html.erb app/views/programmes/sessions.html.erb renamed to app/views/programmes/sessions/index.html.erb

@@ -1,4 +1,4 @@
-<%= content_for :page_title, "#{@programme.name} – Sessions" %>
+<%= content_for :page_title, "#{@programme.name} – #{t(".title")}" %>
 
 <% content_for :before_main do %>
   <%= render AppBreadcrumbComponent.new(items: [

config/locales/en.yml

@@ -590,10 +590,8 @@ en:
       index:
         title: Children
     sessions:
-      table_headings:
-        completed: All sessions completed
-        scheduled: Sessions scheduled
-        unscheduled: No sessions scheduled
+      index:
+        title: Sessions
     vaccinations:
       index:
         title: Vaccinations

config/routes.rb

@@ -166,16 +166,15 @@
   end
 
   resources :programmes, only: %i[index show], param: :type do
-    member do
-      get "sessions"
-
-      get "consent-form", action: "consent_form"
+    get "consent-form", on: :member
+
+    scope module: :programmes do
+      resources :cohorts, only: %i[index show]
+      resources :patients, only: :index
+      resources :reports, only: :create
+      resources :sessions, only: :index
+      resources :vaccinations, only: :index
     end
-
-    resources :cohorts, only: %i[index show], controller: "programmes/cohorts"
-    resources :patients, only: :index, controller: "programmes/patients"
-    resources :reports, only: :create, controller: "programmes/reports"
-    resources :vaccinations, only: :index, controller: "programmes/vaccinations"
   end
 
   resources :school_moves, path: "school-moves", only: %i[index show update]