Use valid dose count for patient status and dose tracking

dosesRemaining now uses scheduleSummary.dosesComplete (valid doses
  per programme rules) instead of vaccinationsGiven.length (all given
  doses). This fixes status, doseDue, and sequence for patients with
  ignored dose

Also moves the status line from
  Procedures into the Vaccination record card, swaps the Programme
  column for Outcome in Procedures, adds linked dates and Age/Source
  columns to the Vaccination record table

Author: wrightmartin

app/models/patient-programme.js

@@ -236,8 +236,9 @@ export class PatientProgramme {
    * @returns {number} Doses remaining
    */
   get dosesRemaining() {
-    if (this.vaccinationsGiven?.length > 0) {
-      return this.dosesNeeded - this.vaccinationsGiven?.length
+    const validCount = this.scheduleSummary.dosesComplete
+    if (validCount > 0) {
+      return this.dosesNeeded - validCount
     }
 
     return this.dosesNeeded

app/views/patient/_vaccination-record.njk

@@ -4,6 +4,8 @@
   heading: __("patientProgramme.vaccinationRecord.label"),
   headingLevel: 3
 }) %}
+  {{ patientProgramme.formatted.statusWithNotes | nhsukMarkdown }}
+
   <p class="nhsuk-body">
     {{ __mf("patientProgramme.vaccinationRecord.dosesComplete", {
       complete: summary.dosesComplete,
@@ -31,7 +33,15 @@
       },
       {
         header: __("vaccination.createdAt.label"),
-        text: ignored.vaccination.formatted.createdAt_date
+        html: ignored.vaccination.link.createdAt
+      },
+      {
+        header: __("vaccination.age.label"),
+        text: patient.dob | age(at=ignored.vaccination.createdAt)
+      },
+      {
+        header: __("vaccination.source.label"),
+        text: ignored.vaccination.source
       }
     ]) %}
   {% endfor %}
@@ -46,7 +56,15 @@
       },
       {
         header: __("vaccination.createdAt.label"),
-        text: valid.vaccination.formatted.createdAt_date
+        html: valid.vaccination.link.createdAt
+      },
+      {
+        header: __("vaccination.age.label"),
+        text: patient.dob | age(at=valid.vaccination.createdAt)
+      },
+      {
+        header: __("vaccination.source.label"),
+        text: valid.vaccination.source
       }
     ]) %}
   {% endfor %}
@@ -70,6 +88,14 @@
       {
         header: __("vaccination.createdAt.label"),
         text: dateText
+      },
+      {
+        header: __("vaccination.age.label"),
+        text: "—"
+      },
+      {
+        header: __("vaccination.source.label"),
+        text: "—"
       }
     ]) %}
   {% endfor %}
@@ -79,7 +105,9 @@
     responsive: true,
     head: [
       { text: __("patientProgramme.vaccinationRecord.dose.label") },
-      { text: __("vaccination.createdAt.label") }
+      { text: __("vaccination.createdAt.label") },
+      { text: __("vaccination.age.label") },
+      { text: __("vaccination.source.label") }
     ],
     rows: rows
   }) if rows.length }}

app/views/patient/programme.njk

@@ -34,8 +34,6 @@
     }),
     headingLevel: 3
   }) %}
-    {{ patientProgramme.formatted.statusWithNotes | nhsukMarkdown }}
-
     {% if patientProgramme.vaccinationOutcomes.length %}
       {% set vaccinationRows = [] %}
       {% for vaccination in patientProgramme.vaccinationOutcomes %}
@@ -49,8 +47,8 @@
             text: patient.dob | age(at=vaccination.createdAt)
           },
           {
-            header: __("vaccination.programme.label"),
-            html: vaccination.formatted.programmeWithSequence
+            header: __("vaccination.outcome.label"),
+            html: vaccination.formatted.outcome
           },
           {
             header: __("vaccination.source.label"),
@@ -65,7 +63,7 @@
         head: [
           { text: __("vaccination.createdAt.label") },
           { text: __("vaccination.age.label") },
-          { text: __("vaccination.programme.label") },
+          { text: __("vaccination.outcome.label") },
           { text: __("vaccination.source.label") }
         ],
         rows: vaccinationRows

lib/create-data.js

@@ -722,18 +722,21 @@ function buildSeededMmrVaccination({
   patient_uuid,
   ageMonths,
   ageDays = 0,
-  given
+  given,
+  service = false
 }) {
   const createdAt = addDays(addMonths(seededMmrDob, ageMonths), ageDays)
   return new Vaccination({
     uuid,
     createdAt,
     patient_uuid,
     programme_id: 'mmr',
-    outcome: given ? VaccinationOutcome.AlreadyVaccinated : VaccinationOutcome.Unwell,
-    source: given
-      ? VaccinationSource.NhsImmunisationsApi
-      : VaccinationSource.Service
+    outcome: given
+      ? (service ? VaccinationOutcome.Vaccinated : VaccinationOutcome.AlreadyVaccinated)
+      : VaccinationOutcome.Unwell,
+    source: service || !given
+      ? VaccinationSource.Service
+      : VaccinationSource.NhsImmunisationsApi
   })
 }
 
@@ -746,7 +749,7 @@ const seededMmrPatients = [
     doses: [
       // Case 1 — two valid doses
       { uuid: 'mmr00001-v001-4000-8000-000000000001', ageMonths: 12, ageDays: 14, given: true },
-      { uuid: 'mmr00001-v002-4000-8000-000000000002', ageMonths: 15, ageDays: 7, given: true }
+      { uuid: 'mmr00001-v002-4000-8000-000000000002', ageMonths: 15, ageDays: 7, given: true, service: true }
     ]
   },
   {