Merge pull request #6055 from nhsuk/already-vaccinated-activity-log

Already vaccinated activity log

Author: stevehook

app/components/app_activity_log_component.rb

@@ -400,19 +400,30 @@ def vaccination_events
         if vaccination_record.administered?
           if (vaccine = vaccination_record.vaccine)
             "Vaccinated with #{vaccine.brand}"
+          elsif vaccination_record.sourced_from_manual_report? ||
+                vaccination_record.sourced_from_historical_upload?
+            "Historical vaccination record added"
           else
             "Vaccinated"
           end
         else
           "Vaccination not given: #{vaccination_record.human_enum_name(:outcome)}"
         end
 
+      subtitle =
+        if historical_vaccination_event?(vaccination_record)
+          "Record added #{vaccination_record.reported_at.to_fs(:long)}. " \
+            "Vaccination given #{vaccination_record.performed_at.to_date.to_fs(:long)}."
+        end
+      at = historical_vaccination_event?(vaccination_record) ? vaccination_record.reported_at : vaccination_record.performed_at
+
       kept = {
         title:,
         body: vaccination_record.notes,
-        at: vaccination_record.performed_at,
+        at:,
         by: vaccination_record.performed_by,
-        programmes: [vaccination_record.programme]
+        programmes: [vaccination_record.programme],
+        subtitle:
       }
 
       discarded =
@@ -428,6 +439,14 @@ def vaccination_events
     end
   end
 
+  def historical_vaccination_event?(vaccination_record)
+    vaccination_record.reported_at.present? &&
+    (
+      vaccination_record.sourced_from_manual_report? ||
+        vaccination_record.sourced_from_historical_upload?
+    )
+  end
+
   def attendance_events
     attendance_records.map do |attendance_record|
       title =

app/components/app_log_event_component.rb

@@ -38,7 +38,8 @@ def initialize(
     by: nil,
     programmes: [],
     invalidated: false,
-    card: false
+    card: false,
+    subtitle: nil
   )
     @title = title
     @body = body
@@ -47,13 +48,14 @@ def initialize(
     @programmes = programmes
     @invalidated = invalidated
     @card = card
+    @subtitle = subtitle
   end
 
   private
 
   attr_reader :title, :body, :programmes, :invalidated, :card
 
   def subtitle
-    safe_join([@at, @by].compact, " · ".html_safe)
+    @subtitle || safe_join([@at, @by].compact, " · ".html_safe)
   end
 end

spec/components/app_activity_log_component_spec.rb

@@ -168,6 +168,18 @@
         vaccine: programmes.first.vaccines.find_by!(upload_name: "Cervarix")
       )
 
+      create(
+        :vaccination_record,
+        programme: programmes.second,
+        patient:,
+        session:,
+        performed_at: Date.new(2025, 1, 6),
+        performed_by: nil,
+        reported_at: Time.zone.local(2025, 2, 15, 14, 33, 23),
+        source: :manual_report,
+        vaccine: nil
+      )
+
       create(
         :notify_log_entry,
         :email,
@@ -189,7 +201,7 @@
     end
 
     it "has cards" do
-      expect(rendered).to have_css(".nhsuk-card", count: 11)
+      expect(rendered).to have_css(".nhsuk-card", count: 12)
     end
 
     include_examples "card",
@@ -207,6 +219,12 @@
                      notes: "Some notes millisecond later",
                      programme: "HPV"
 
+    include_examples "card",
+                     title: "Historical vaccination record added",
+                     date:
+                       "Record added 15 February 2025 at 2:33pm. Vaccination given 6 January 2025.",
+                     programme: "Flu"
+
     include_examples "card",
                      title: "Triaged decision: Safe to vaccinate",
                      date: "30 May 2025 at 2:30pm",
@@ -538,6 +556,7 @@
           :vaccination_record,
           patient:,
           programme:,
+          session:,
           performed_at: Time.zone.local(2025, 5, 31, 13)
         )
       end
@@ -554,6 +573,7 @@
           :vaccination_record,
           patient:,
           programme: programmes.first,
+          session:,
           vaccine: nil,
           performed_at: Time.zone.local(2025, 5, 31, 13)
         )

spec/features/mmr_already_had_spec.rb

@@ -67,6 +67,10 @@
       when_the_status_updater_runs
       and_i_navigate_to_the_patient_record
       then_i_see_that_the_vaccination_record_has_outcome_vaccinated
+
+      when_i_open_the_activity_log
+      then_i_see_a_historical_vaccination_log_entry_for_mmr
+      and_it_includes_the_programme_and_both_reported_and_performed_at_dates
     end
 
     scenario "record a patient as already had their 1st MMR dose and then edit dates" do
@@ -416,10 +420,26 @@ def and_i_navigate_to_the_patient_record
   end
 
   def then_i_see_that_the_vaccination_record_has_outcome_vaccinated
-    expect(page).to have_content("Vaccination date #{@vaccination_date.strftime("%-d %B %Y")}")
+    expect(page).to have_content(
+      "Vaccination date #{@vaccination_date.strftime("%-d %B %Y")}"
+    )
     expect(page).to have_content("Location Unknown")
     expect(page).to have_content("Programme MMR")
     expect(page).to have_content("Source Manual report")
     expect(page).to have_content("Outcome Vaccinated")
   end
+
+  def when_i_open_the_activity_log
+    click_on "Activity log"
+  end
+
+  def then_i_see_a_historical_vaccination_log_entry_for_mmr
+    expect(page).to have_content("Historical vaccination record added")
+  end
+
+  def and_it_includes_the_programme_and_both_reported_and_performed_at_dates
+    expect(page).to have_content(
+      "MMR   Record added 1 July 2025 at 12:00am. Vaccination given #{@vaccination_date.strftime("%-d %B %Y")}."
+    )
+  end
 end