Hide school and year group for some patients

thomasleese · thomasleese · commit aef6a1cc1003 · 2025-08-05T19:43:17.000+01:00
If a patient has aged out of all the programmes administered by the SAIS
team, we should no longer show their school or year group.

This is necessary because some schools will keep teaching patients
beyond the normal vaccination programme year groups (for example year
12s and 13s). We would still want these patients to show in the list of
children, but we need to make sure their year group and school are no
longer visible.

Jira-Issue: MAV-1512
diff --git a/app/components/app_child_summary_component.rb b/app/components/app_child_summary_component.rb
@@ -3,16 +3,18 @@
 class AppChildSummaryComponent < ViewComponent::Base
   def initialize(
     child,
-    team: nil,
+    current_team: nil,
     show_parents: false,
+    show_school_and_year_group: true,
     change_links: {},
     remove_links: {}
   )
     super
 
     @child = child
-    @team = team
+    @current_team = current_team
     @show_parents = show_parents
+    @show_school_and_year_group = show_school_and_year_group
     @change_links = change_links
     @remove_links = remove_links
   end
@@ -72,14 +74,16 @@ def call
           row.with_value { format_address }
         end
       end
-      summary_list.with_row do |row|
-        row.with_key { "School" }
-        row.with_value { format_school }
-      end
-      if @child.respond_to?(:year_group)
+      if @show_school_and_year_group
         summary_list.with_row do |row|
-          row.with_key { "Year group" }
-          row.with_value { format_year_group }
+          row.with_key { "School" }
+          row.with_value { format_school }
+        end
+        if @child.respond_to?(:year_group)
+          summary_list.with_row do |row|
+            row.with_key { "Year group" }
+            row.with_value { format_year_group }
+          end
         end
       end
       if (gp_practice = @child.try(:gp_practice))
@@ -129,7 +133,9 @@ def academic_year = AcademicYear.current
 
   def archive_reason
     @archive_reason ||=
-      (ArchiveReason.find_by(team: @team, patient: @child) if @team)
+      if @current_team
+        ArchiveReason.find_by(team: @current_team, patient: @child)
+      end
   end
 
   def format_nhs_number
diff --git a/app/components/app_patient_card_component.rb b/app/components/app_patient_card_component.rb
@@ -24,7 +24,12 @@ class AppPatientCardComponent < ViewComponent::Base
       <% end %>
 
       <%= render AppChildSummaryComponent.new(
-        patient, team:, show_parents: true, change_links:, remove_links:
+        patient,
+        current_team:,
+        show_parents: true,
+        show_school_and_year_group:,
+        change_links:,
+        remove_links:
       ) %>
 
       <%= content %>
@@ -33,21 +38,27 @@ class AppPatientCardComponent < ViewComponent::Base
 
   def initialize(
     patient,
-    team: nil,
+    current_team:,
     change_links: {},
     remove_links: {},
     heading_level: 3
   )
     super
 
     @patient = patient
-    @team = team
+    @current_team = current_team
     @change_links = change_links
     @remove_links = remove_links
     @heading_level = heading_level
   end
 
   private
 
-  attr_reader :patient, :team, :change_links, :remove_links, :heading_level
+  attr_reader :patient,
+              :current_team,
+              :change_links,
+              :remove_links,
+              :heading_level
+
+  def show_school_and_year_group = patient.show_year_group?(team: current_team)
 end
diff --git a/app/controllers/programmes/patients_controller.rb b/app/controllers/programmes/patients_controller.rb
@@ -12,7 +12,8 @@ def index
       patients.includes(
         :consent_statuses,
         :triage_statuses,
-        :vaccination_statuses
+        :vaccination_statuses,
+        school: :location_programme_year_groups
       )
 
     @form.academic_year = @academic_year
diff --git a/app/models/patient.rb b/app/models/patient.rb
@@ -326,8 +326,16 @@ def year_group(academic_year: nil)
     birth_academic_year.to_year_group(academic_year:)
   end
 
-  def year_group_changed?
-    birth_academic_year_changed?
+  def year_group_changed? = birth_academic_year_changed?
+
+  def show_year_group?(team:, academic_year: nil)
+    year_group = self.year_group(academic_year:)
+    programme_year_groups =
+      school&.programme_year_groups || team.programme_year_groups
+
+    team.programmes.any? do |programme|
+      programme_year_groups[programme].include?(year_group)
+    end
   end
 
   def consent_status(programme:, academic_year:)
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -109,7 +109,9 @@ def selected_organisation
   def selected_team
     # TODO: Select the right team based on the user's workgroup.
     @selected_team ||=
-      Team.includes(:programmes).find_by(organisation: selected_organisation)
+      Team.includes(:location_programme_year_groups, :programmes).find_by(
+        organisation: selected_organisation
+      )
   end
 
   def requires_email_and_password?
diff --git a/app/views/consent_forms/patient.html.erb b/app/views/consent_forms/patient.html.erb
@@ -10,7 +10,7 @@
   <%= page_title %>
 <% end %>
 
-<%= render AppPatientCardComponent.new(@patient) %>
+<%= render AppPatientCardComponent.new(@patient, current_team:) %>
 
 <%= render AppConsentFormCardComponent.new(@consent_form) %>
 
diff --git a/app/views/patients/edit.html.erb b/app/views/patients/edit.html.erb
@@ -17,6 +17,6 @@
      end,
    } %>
 
-<%= render AppPatientCardComponent.new(@patient, change_links:, remove_links:, heading_level: 2) %>
+<%= render AppPatientCardComponent.new(@patient, current_team:, change_links:, remove_links:, heading_level: 2) %>
 
 <%= govuk_button_link_to "Continue", patient_path(@patient) %>
diff --git a/app/views/patients/edit/nhs_number_merge.html.erb b/app/views/patients/edit/nhs_number_merge.html.erb
@@ -13,7 +13,7 @@
   Updating the NHS number for <%= @patient.full_name %> will merge their record with an existing record:
 </p>
 
-<%= render AppPatientCardComponent.new(@existing_patient) %>
+<%= render AppPatientCardComponent.new(@existing_patient, current_team:) %>
 
 <%= form_with model: @form, url: edit_nhs_number_merge_patient_path(@patient), method: :put do |f| %>
   <%= f.hidden_field :nhs_number %>
diff --git a/app/views/patients/show.html.erb b/app/views/patients/show.html.erb
@@ -14,7 +14,7 @@
       nav.with_item(href: log_patient_path(@patient), text: "Activity log")
     end %>
 
-<%= render AppPatientCardComponent.new(@patient, team: current_team) do %>
+<%= render AppPatientCardComponent.new(@patient, current_team:) do %>
   <% if @patient.not_archived?(team: current_user.selected_team) %>
     <div class="app-button-group">
       <%= govuk_button_link_to "Edit child record", edit_patient_path(@patient), secondary: true %>
diff --git a/app/views/programmes/patients/index.html.erb b/app/views/programmes/patients/index.html.erb
@@ -37,7 +37,7 @@
               programme: @programme,
               academic_year: @academic_year,
               triage_status: @form.triage_status,
-              show_year_group: true,
+              show_year_group: patient.show_year_group?(team: current_team),
             ) %>
       <% end %>
     <% end %>
diff --git a/app/views/vaccination_records/show.html.erb b/app/views/vaccination_records/show.html.erb
@@ -4,7 +4,7 @@
 
 <%= h1 @patient.full_name %>
 
-<%= render AppPatientCardComponent.new(@patient) %>
+<%= render AppPatientCardComponent.new(@patient, current_team:) %>
 
 <%= render AppCardComponent.new do |c| %>
   <% c.with_heading { "Vaccination details" } %>
diff --git a/spec/components/app_patient_card_component_spec.rb b/spec/components/app_patient_card_component_spec.rb
@@ -5,16 +5,22 @@
 
   let(:component) do
     described_class.new(
-      Patient.includes(parent_relationships: :parent).find(patient.id)
+      Patient.includes(parent_relationships: :parent).find(patient.id),
+      current_team: team
     )
   end
 
-  let(:patient) { create(:patient) }
+  let(:programmes) { [create(:programme, :hpv)] }
+  let(:team) { create(:team, programmes:) }
+  let(:school) { create(:school, team:) }
+
+  let(:patient) { create(:patient, school:, year_group: 8) }
 
   it { should have_content("Child") }
 
   it { should have_content("Full name") }
   it { should have_content("Date of birth") }
+  it { should have_content("Year group") }
   it { should have_content("Address") }
 
   context "with a deceased patient" do
@@ -52,4 +58,10 @@
     it { should have_content("Jenny Smith") }
     it { should have_content("Mum") }
   end
+
+  context "when patient is too old for any programmes" do
+    let(:patient) { create(:patient, year_group: 13) }
+
+    it { should_not have_content("Year group") }
+  end
 end
diff --git a/spec/models/patient_spec.rb b/spec/models/patient_spec.rb
@@ -512,8 +512,40 @@
     end
   end
 
+  describe "#show_year_group?" do
+    subject { patient.show_year_group?(team:) }
+
+    let(:programmes) { [create(:programme, :flu), create(:programme, :hpv)] }
+    let(:team) { create(:team, programmes:) }
+    let(:school) { create(:school, team:) }
+
+    context "for a year 1" do
+      let(:patient) { create(:patient, school:, year_group: 1) }
+
+      it { should be(true) }
+    end
+
+    context "for a year 7" do
+      let(:patient) { create(:patient, school:, year_group: 7) }
+
+      it { should be(true) }
+    end
+
+    context "for a year 11" do
+      let(:patient) { create(:patient, school:, year_group: 11) }
+
+      it { should be(true) }
+    end
+
+    context "for a year 12" do
+      let(:patient) { create(:patient, school:, year_group: 12) }
+
+      it { should be(false) }
+    end
+  end
+
   describe "#initials" do
-    subject(:initials) { patient.initials }
+    subject { patient.initials }
 
     let(:patient) { create(:patient, given_name: "John", family_name: "Doe") }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ def index`
`12`	`12`	`patients.includes(`
`13`	`13`	`:consent_statuses,`
`14`	`14`	`:triage_statuses,`
`15`		`- :vaccination_statuses`
	`15`	`+ :vaccination_statuses,`
	`16`	`+ school: :location_programme_year_groups`
`16`	`17`	`)`
`17`	`18`
`18`	`19`	`@form.academic_year = @academic_year`