Add Programmes::PatientsController

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

Author: thomasleese

app/components/app_programme_navigation_component.rb

@@ -29,8 +29,8 @@ def call
       )
 
       nav.with_item(
-        href: patients_programme_path(programme),
-        text: I18n.t("patients.index.title"),
+        href: programme_patients_path(programme),
+        text: I18n.t("programmes.patients.index.title"),
         selected: active == :patients
       )
 

app/controllers/programmes/patients_controller.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class Programmes::PatientsController < ApplicationController
+  include Pagy::Backend
+  include SearchFormConcern
+
+  before_action :set_programme
+  before_action :set_search_form
+
+  layout "full"
+
+  def index
+    scope =
+      policy_scope(Patient).includes(:vaccination_statuses).in_programmes(
+        [@programme]
+      )
+
+    @form.programme_types = [@programme.type]
+
+    patients = @form.apply(scope)
+    @pagy, @patients = pagy(patients)
+  end
+
+  private
+
+  def set_programme
+    @programme = policy_scope(Programme).find_by!(type: params[:programme_type])
+  end
+end

app/controllers/programmes_controller.rb

@@ -1,13 +1,7 @@
 # frozen_string_literal: true
 
-require "pagy/extras/array"
-
 class ProgrammesController < ApplicationController
-  include Pagy::Backend
-  include SearchFormConcern
-
   before_action :set_programme, except: :index
-  before_action :set_search_form, only: :patients
 
   layout "full"
 
@@ -31,18 +25,6 @@ def sessions
         .order("locations.name")
   end
 
-  def patients
-    scope =
-      policy_scope(Patient).includes(:vaccination_statuses).in_programmes(
-        [@programme]
-      )
-
-    @form.programme_types = [@programme.type]
-
-    patients = @form.apply(scope)
-    @pagy, @patients = pagy(patients)
-  end
-
   def consent_form
     send_file(
       "public/consent_forms/#{@programme.type}.pdf",

app/controllers/sessions/register_controller.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "pagy/extras/array"
-
 class Sessions::RegisterController < ApplicationController
   include Pagy::Backend
   include SearchFormConcern

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

@@ -1,4 +1,4 @@
-<%= content_for :page_title, "#{@programme.name} – #{t("patients.index.title")}" %>
+<%= content_for :page_title, "#{@programme.name} – #{t(".title")}" %>
 
 <% content_for :before_main do %>
   <%= render AppBreadcrumbComponent.new(items: [
@@ -20,7 +20,7 @@
   <div class="app-grid-column-filters">
     <%= render AppSearchComponent.new(
           form: @form,
-          url: patients_programme_path(@programme),
+          url: programme_patients_path(@programme),
           programme_statuses: Patient::VaccinationStatus.statuses.keys,
           consent_statuses: Patient::ConsentStatus.statuses.keys,
           triage_statuses: %w[required delay_vaccination do_not_vaccinate safe_to_vaccinate],

config/locales/en.yml

@@ -586,6 +586,9 @@ en:
         title: Cohorts
     index:
       title: Programmes
+    patients:
+      index:
+        title: Children
     sessions:
       table_headings:
         completed: All sessions completed

config/routes.rb

@@ -168,12 +168,12 @@
   resources :programmes, only: %i[index show], param: :type do
     member do
       get "sessions"
-      get "patients"
 
       get "consent-form", action: "consent_form"
     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