Add Programmes::OverviewController

thomasleese · thomasleese · commit fc790a8c2288 · 2025-07-18T16:23:04.000+01:00
This moves the logic related to the overview tab of the programmes page
in to its own controller in preparation for having multiple programmes
per academic year.
diff --git a/app/components/app_programme_navigation_component.rb b/app/components/app_programme_navigation_component.rb
@@ -10,17 +10,13 @@ def initialize(programme, active:)
 
   def call
     render AppSecondaryNavigationComponent.new do |nav|
-      nav.with_item(
-        href: programme_path(programme),
-        text: "Overview",
-        selected: active == :overview
-      )
-
       SECTIONS.each do |section|
+        action = section == :overview ? :show : :index
+
         nav.with_item(
           href: public_send("programme_#{section}_path", programme),
-          text: I18n.t("title", scope: [:programmes, section, :index]),
-          selected: active == session
+          text: I18n.t("title", scope: [:programmes, section, action]),
+          selected: active == section
         )
       end
     end
@@ -30,5 +26,5 @@ def call
 
   attr_reader :programme, :active
 
-  SECTIONS = %i[cohorts sessions patients vaccinations].freeze
+  SECTIONS = %i[overview cohorts sessions patients vaccinations].freeze
 end
diff --git a/app/controllers/programmes/overview_controller.rb b/app/controllers/programmes/overview_controller.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+class Programmes::OverviewController < ApplicationController
+  before_action :set_programme
+
+  layout "full"
+
+  def show
+    patients = policy_scope(Patient).in_programmes([@programme])
+
+    @consents =
+      policy_scope(Consent).where(patient: patients, programme: @programme)
+  end
+
+  private
+
+  def set_programme
+    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
+  end
+end
diff --git a/app/controllers/programmes_controller.rb b/app/controllers/programmes_controller.rb
@@ -10,12 +10,6 @@ def index
       policy_scope(Programme).order(:type).includes(:active_vaccines)
   end
 
-  def show
-    patients = policy_scope(Patient).in_programmes([@programme])
-    @consents =
-      policy_scope(Consent).where(patient: patients, programme: @programme)
-  end
-
   def consent_form
     send_file(
       "public/consent_forms/#{@programme.type}.pdf",
diff --git a/app/views/programmes/cohorts/index.html.erb b/app/views/programmes/cohorts/index.html.erb
@@ -4,7 +4,7 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: @programme.name, href: programme_overview_path(@programme) },
                                         ]) %>
 <% end %>
 
diff --git a/app/views/programmes/cohorts/show.html.erb b/app/views/programmes/cohorts/show.html.erb
@@ -2,7 +2,7 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: @programme.name, href: programme_overview_path(@programme) },
                                           { text: t("programmes.cohorts.index.title"), href: programme_cohorts_path(@programme) },
                                         ]) %>
 <% end %>
diff --git a/app/views/programmes/index.html.erb b/app/views/programmes/index.html.erb
@@ -18,7 +18,7 @@
         <% body.with_row do |row| %>
           <% row.with_cell do %>
             <span class="nhsuk-table-responsive__heading">Programme</span>
-            <%= link_to programme.name, programme_path(programme) %>
+            <%= link_to programme.name, programme_overview_path(programme) %>
           <% end %>
 
           <% row.with_cell do %>
diff --git a/app/views/programmes/overview/show.html.erb b/app/views/programmes/overview/show.html.erb
@@ -1,4 +1,4 @@
-<% content_for :page_title, "#{@programme.name} – Overview" %>
+<% content_for :page_title, "#{@programme.name} – #{t(".title")}" %>
 
 <% content_for :before_main do %>
   <%= render AppBreadcrumbComponent.new(items: [
diff --git a/app/views/programmes/patients/index.html.erb b/app/views/programmes/patients/index.html.erb
@@ -4,7 +4,7 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: @programme.name, href: programme_overview_path(@programme) },
                                         ]) %>
 <% end %>
 
diff --git a/app/views/programmes/sessions/index.html.erb b/app/views/programmes/sessions/index.html.erb
@@ -4,7 +4,7 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: @programme.name, href: programme_overview_path(@programme) },
                                         ]) %>
 <% end %>
 
diff --git a/app/views/programmes/vaccinations/index.html.erb b/app/views/programmes/vaccinations/index.html.erb
@@ -4,7 +4,7 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: @programme.name, href: programme_overview_path(@programme) },
                                         ]) %>
 <% end %>
 
diff --git a/app/views/vaccination_records/show.html.erb b/app/views/vaccination_records/show.html.erb
@@ -2,7 +2,7 @@
   <%= render AppBreadcrumbComponent.new(items: [
                                           { text: t("dashboard.index.title"), href: dashboard_path },
                                           { text: t("programmes.index.title"), href: programmes_path },
-                                          { text: @programme.name, href: programme_path(@programme) },
+                                          { text: @programme.name, href: programme_overview_path(@programme) },
                                           { text: t("programmes.vaccinations.index.title"), href: programme_vaccinations_path(@programme) },
                                         ]) %>
 <% end %>
diff --git a/app/views/vaccination_reports/dates.html.erb b/app/views/vaccination_reports/dates.html.erb
@@ -1,5 +1,5 @@
 <% content_for :before_main do %>
-  <%= render AppBacklinkComponent.new(programme_path(@programme), name: @programme.name) %>
+  <%= render AppBacklinkComponent.new(programme_overview_path(@programme), name: @programme.name) %>
 <% end %>
 
 <%= form_with model: @vaccination_report, url: wizard_path, method: :put do |f| %>
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -586,6 +586,9 @@ en:
         title: Cohorts
     index:
       title: Programmes
+    overview:
+      show:
+        title: Overview
     patients:
       index:
         title: Children
diff --git a/config/routes.rb b/config/routes.rb
@@ -165,10 +165,11 @@
     end
   end
 
-  resources :programmes, only: %i[index show], param: :type do
+  resources :programmes, only: :index, param: :type do
     get "consent-form", on: :member
 
     scope module: :programmes do
+      resource :overview, path: "", only: :show, controller: :overview
       resources :cohorts, only: %i[index show]
       resources :patients, only: :index
       resources :reports, only: :create
diff --git a/spec/features/download_vaccination_reports_spec.rb b/spec/features/download_vaccination_reports_spec.rb
@@ -117,7 +117,7 @@ def and_an_administered_vaccination_record_exists
 
   def when_i_go_to_the_programme
     sign_in @organisation.users.first
-    visit programme_path(@programme)
+    visit programme_overview_path(@programme)
   end
 
   def and_i_click_on_download_vaccination_report

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<% content_for :page_title, "#{@programme.name} – Overview" %>`
	`1`	`+<% content_for :page_title, "#{@programme.name} – #{t(".title")}" %>`
`2`	`2`
`3`	`3`	`<% content_for :before_main do %>`
`4`	`4`	`<%= render AppBreadcrumbComponent.new(items: [`