Merge pull request #4256 from nhsuk/remove-session-outcome

Combine session and programme outcome in to one

Author: thomasleese

app/components/app_patient_programmes_table_component.rb

@@ -102,7 +102,7 @@ def status_for_programme(programme:, academic_year:, vaccination_record: nil)
 
     return "—" if future_eligibility?(earliest_academic_year)
 
-    govuk_tag(text: "No outcome yet", colour: "grey")
+    govuk_tag(text: "No outcome", colour: "grey")
   end
 
   def vaccination_status(vaccination_record)

app/components/app_patient_search_form_component.rb

@@ -67,26 +67,14 @@ class AppPatientSearchFormComponent < ViewComponent::Base
           <% end %>
         <% end %>
 
-        <% if session_statuses.any? %>
-          <%= f.govuk_radio_buttons_fieldset :session_status, legend: { text: "Session outcome", size: "s" } do %>
-            <%= f.govuk_radio_button :session_status, "", checked: form.session_status.blank?, label: { text: "Any" } %>
-            <% session_statuses.each do |status| %>
-              <%= f.govuk_radio_button :session_status,
-                                       status,
-                                       checked: form.session_status == status,
-                                       label: { text: t(status, scope: %i[status session label]) } %>
-            <% end %>
-          <% end %>
-        <% end %>
-
-        <% if programme_statuses.any? %>
-          <%= f.govuk_radio_buttons_fieldset :programme_status, legend: { text: "Programme outcome", size: "s" } do %>
-            <%= f.govuk_radio_button :programme_status, "", checked: form.programme_status.blank?, label: { text: "Any" } %>
+        <% if vaccination_statuses.any? %>
+          <%= f.govuk_radio_buttons_fieldset :vaccination_status, legend: { text: "Outcome", size: "s" } do %>
+            <%= f.govuk_radio_button :vaccination_status, "", checked: form.vaccination_status.blank?, label: { text: "Any" } %>
 
-            <% programme_statuses.each do |status| %>
-              <%= f.govuk_radio_button :programme_status,
+            <% vaccination_statuses.each do |status| %>
+              <%= f.govuk_radio_button :vaccination_status,
                                        status,
-                                       checked: form.programme_status == status,
+                                       checked: form.vaccination_status == status,
                                        label: { text: t(status, scope: %i[status programme label]) } %>
             <% end %>
           <% end %>
@@ -191,10 +179,9 @@ def initialize(
     url:,
     programmes: [],
     consent_statuses: [],
-    programme_statuses: [],
     register_statuses: [],
-    session_statuses: [],
     triage_statuses: [],
+    vaccination_statuses: [],
     vaccine_methods: [],
     year_groups: [],
     heading_level: 3,
@@ -207,10 +194,9 @@ def initialize(
 
     @programmes = programmes
     @consent_statuses = consent_statuses
-    @programme_statuses = programme_statuses
     @register_statuses = register_statuses
-    @session_statuses = session_statuses
     @triage_statuses = triage_statuses
+    @vaccination_statuses = vaccination_statuses
     @vaccine_methods = vaccine_methods
     @year_groups = year_groups
     @heading_level = heading_level
@@ -223,10 +209,9 @@ def initialize(
               :url,
               :programmes,
               :consent_statuses,
-              :programme_statuses,
               :register_statuses,
-              :session_statuses,
               :triage_statuses,
+              :vaccination_statuses,
               :vaccine_methods,
               :year_groups,
               :heading_level,
@@ -240,9 +225,8 @@ def open_details?
 
   def show_buttons_in_details?
     !(
-      consent_statuses.any? || programme_statuses.any? ||
-        register_statuses.any? || session_statuses.any? ||
-        triage_statuses.any? || year_groups.any?
+      consent_statuses.any? || vaccination_statuses.any? ||
+        register_statuses.any? || triage_statuses.any? || year_groups.any?
     )
   end
 

app/components/app_patient_search_result_card_component.rb

@@ -118,10 +118,7 @@ def render_status_tag(status_type, outcome)
       end
 
     latest_session_status =
-      if status_type == :vaccination &&
-           status_model.latest_session_status != status
-        status_model.latest_session_status
-      end
+      (status_model.latest_session_status if status_type == :vaccination)
 
     render AppProgrammeStatusTagsComponent.new(
              { @programme => { status:, latest_session_status: } },

app/components/app_patient_session_search_result_card_component.rb

@@ -147,13 +147,13 @@ def status_tags
     when :record
       []
     when :register
-      [register_status_tag, programme_status_tag]
+      [register_status_tag, vaccination_status_tag]
     when :consent
       [consent_status_tag]
     when :triage
       [triage_status_tag]
     else
-      [programme_status_tag, session_status_tag]
+      [vaccination_status_tag]
     end
   end
 
@@ -175,15 +175,16 @@ def consent_status_tag
     }
   end
 
-  def programme_status_tag
+  def vaccination_status_tag
     {
-      key: :programme,
+      key: :vaccination,
       value:
         render(
           AppProgrammeStatusTagsComponent.new(
             programmes.index_with do |programme|
               patient.vaccination_status(programme:, academic_year:).slice(
-                :status
+                :status,
+                :latest_session_status
               )
             end,
             outcome: :programme
@@ -204,21 +205,6 @@ def register_status_tag
     }
   end
 
-  def session_status_tag
-    {
-      key: :session,
-      value:
-        render(
-          AppProgrammeStatusTagsComponent.new(
-            programmes.index_with do |programme|
-              patient_session.session_status(programme:).slice(:status)
-            end,
-            outcome: :session
-          )
-        )
-    }
-  end
-
   def triage_status_tag
     {
       key: :triage,

app/components/app_programme_session_table_component.rb

@@ -38,7 +38,7 @@ def triage_needed_count(session:)
   end
 
   def vaccinated_scope(session:)
-    patient_sessions(session:).has_session_status(:vaccinated, programme:)
+    session.vaccination_records.where(programme:).administered
   end
 
   def vaccinated_count(session:)

app/components/app_programme_status_tags_component.rb

@@ -1,41 +1,32 @@
 # frozen_string_literal: true
 
 class AppProgrammeStatusTagsComponent < ViewComponent::Base
-  def initialize(programme_statuses, outcome:)
+  def initialize(status_by_programme, outcome:)
     super
 
-    @programme_statuses = programme_statuses
+    @status_by_programme = status_by_programme
     @outcome = outcome
   end
 
   def call
     safe_join(
-      programme_statuses.map do |programme, hash|
+      status_by_programme.map do |programme, hash|
         status = hash[:status]
         vaccine_methods =
           (hash[:vaccine_methods] if programme.has_multiple_vaccine_methods?)
-        latest_session_status = hash[:latest_session_status]
+        latest_session_status = hash[:latest_session_status] if status !=
+          hash[:latest_session_status]
 
-        programme_status_tag(
-          programme,
-          status,
-          vaccine_methods,
-          latest_session_status
-        )
+        status_tag(programme, status, vaccine_methods, latest_session_status)
       end
     )
   end
 
   private
 
-  attr_reader :programme_statuses, :outcome
+  attr_reader :status_by_programme, :outcome
 
-  def programme_status_tag(
-    programme,
-    status,
-    vaccine_methods,
-    latest_session_status
-  )
+  def status_tag(programme, status, vaccine_methods, latest_session_status)
     programme_tag =
       tag.strong(
         programme.name,

app/components/app_session_details_summary_component.rb

@@ -61,15 +61,15 @@ def consent_refused_row
   end
 
   def vaccinated_row
+    counts = session.vaccination_records.administered.group(:programme_id).count
+
     texts =
       session.programmes.map do |programme|
-        count =
-          patient_sessions.has_session_status(:vaccinated, programme:).count
-
+        count = counts.fetch(programme.id, 0)
         "#{I18n.t("vaccinations_given", count:)} for #{programme.name_in_sentence}"
       end
 
-    href = session_patients_path(session, session_status: "vaccinated")
+    href = session_patients_path(session, vaccination_status: "vaccinated")
 
     {
       key: {

app/controllers/concerns/patient_search_form_concern.rb

@@ -27,10 +27,9 @@ def patient_search_form_params
       :date_of_birth_month,
       :date_of_birth_year,
       :missing_nhs_number,
-      :programme_status,
+      :vaccination_status,
       :q,
       :register_status,
-      :session_status,
       :triage_status,
       :vaccine_method,
       consent_statuses: [],

app/controllers/sessions/patients_controller.rb

@@ -9,12 +9,11 @@ class Sessions::PatientsController < ApplicationController
   layout "full"
 
   def show
-    @statuses = PatientSession::SessionStatus.statuses.keys
+    @statuses = Patient::VaccinationStatus.statuses.keys
 
     scope =
       @session.patient_sessions.includes_programmes.includes(
         :latest_note,
-        :session_statuses,
         patient: :vaccination_statuses
       )
 

app/forms/patient_search_form.rb

@@ -11,11 +11,10 @@ class PatientSearchForm < SearchForm
   attribute :date_of_birth_month, :integer
   attribute :date_of_birth_year, :integer
   attribute :missing_nhs_number, :boolean
-  attribute :programme_status, :string
+  attribute :vaccination_status, :string
   attribute :programme_types, array: true
   attribute :q, :string
   attribute :register_status, :string
-  attribute :session_status, :string
   attribute :triage_status, :string
   attribute :vaccine_method, :string
   attribute :year_groups, array: true
@@ -57,7 +56,6 @@ def apply(scope)
     scope = filter_programmes(scope)
     scope = filter_consent_statuses(scope)
     scope = filter_vaccination_statuses(scope)
-    scope = filter_session_status(scope)
     scope = filter_register_status(scope)
     scope = filter_triage_status(scope)
     scope = filter_vaccine_method(scope)
@@ -155,7 +153,7 @@ def filter_consent_statuses(scope)
   end
 
   def filter_vaccination_statuses(scope)
-    if (status = programme_status&.to_sym).present?
+    if (status = vaccination_status&.to_sym).present?
       if @session
         scope.has_vaccination_status(status, programme: programmes)
       else
@@ -170,14 +168,6 @@ def filter_vaccination_statuses(scope)
     end
   end
 
-  def filter_session_status(scope)
-    if (status = session_status&.to_sym).present?
-      scope.has_session_status(status, programme: programmes)
-    else
-      scope
-    end
-  end
-
   def filter_register_status(scope)
     if (status = register_status&.to_sym).present?
       scope.has_registration_status(status)