From 2a8c48a18445588dcfbbdaa02ab2b52cebc2a658 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Tue, 16 Jun 2026 16:14:41 +0100 Subject: [PATCH 01/12] Add empty state for no pharmacies --- app/routes/prototype-admin.js | 14 +++ .../includes/_preset-scenarios-table.html | 8 ++ app/views/pharmacies/index.html | 116 +++++++++--------- 3 files changed, 81 insertions(+), 57 deletions(-) diff --git a/app/routes/prototype-admin.js b/app/routes/prototype-admin.js index b2401748..2bd6777f 100644 --- a/app/routes/prototype-admin.js +++ b/app/routes/prototype-admin.js @@ -564,6 +564,20 @@ module.exports = (router) => { res.redirect('/home') }) + // ---------------------------------------------------------------- + // Preset: Pharmacy HQ, no data (Amanda White, P15951) + // ---------------------------------------------------------------- + + router.get('/prototype-setup/preset/pharmacy-hq-no-data', (req, res) => { + resetSession(req) + const data = req.session.data + data.currentUserId = '6424325235325' + data.currentOrganisationId = 'P15951' + // Remove all pharmacies belonging to P15951 to start with a clean slate + data.organisations = data.organisations.filter(org => org.companyId !== 'P15951' || org.type === 'Pharmacy HQ') + res.redirect('/home') + }) + // ---------------------------------------------------------------- // Preset: Recorder, single organisation (Ocean Merritt, FR4V56) // ---------------------------------------------------------------- diff --git a/app/views/includes/_preset-scenarios-table.html b/app/views/includes/_preset-scenarios-table.html index 3d9bd63b..05a98cf7 100644 --- a/app/views/includes/_preset-scenarios-table.html +++ b/app/views/includes/_preset-scenarios-table.html @@ -71,6 +71,14 @@ role: "Group administrator", scenarioDetails: "Group admin for a large pharmacy chain (same-name pharmacies)." }, + { + presetLabel: "Group admin, pharmacy HQ (no data)", + presetPath: "/prototype-setup/preset/pharmacy-hq-no-data", + userName: "Amanda White", + userEmail: "amanda.white@nhs.net", + role: "Group administrator", + scenarioDetails: "Group admin for a pharmacy HQ with no pre-loaded data, pharmacies or users." + }, { presetLabel: "Regional lead", presetPath: "/prototype-setup/preset/regions", diff --git a/app/views/pharmacies/index.html b/app/views/pharmacies/index.html index b033a9bf..ac9ab6ff 100644 --- a/app/views/pharmacies/index.html +++ b/app/views/pharmacies/index.html @@ -43,65 +43,67 @@

Pharmacies

href: "/pharmacies/select" }) }} - - -
Pharmacies added ({{ organisations | length }})
- {% if (organisations | length) > 10 %} -
- - -
- {% endif %} - - - - - - - - - - - - {% for organisation in organisations %} - - - - - - + {% if (organisations | length) > 0 %} +
- Name - - Vaccines - - Users - - Status - - Actions -
- {{ organisation.name }} ({{ organisation.id}}) - - {% set vaccinesEnabled = [] %} - {% for vaccine in organisation.vaccines %} - {% if vaccine.status == "enabled" %} - {% set vaccinesEnabled = (vaccinesEnabled.push(vaccine.name), vaccinesEnabled) %} - {% endif %} - {% endfor %} - - {{ (vaccinesEnabled | sort | join(", ")) | capitaliseFirstLetter }} - - {{ organisationUserCounts[organisation.id] }} - - {{ organisation.status }} - - Manage -
+ +
Pharmacies added ({{ organisations | length }})
+ {% if (organisations | length) > 10 %} +
+ + +
+ {% endif %} + + + + + + + + - {% endfor %} + + + {% for organisation in organisations %} + + + + + + + + {% endfor %} - -
+ Name + + Vaccines + + Users + + Status + + Actions +
+ {{ organisation.name }} ({{ organisation.id}}) + + {% set vaccinesEnabled = [] %} + {% for vaccine in organisation.vaccines %} + {% if vaccine.status == "enabled" %} + {% set vaccinesEnabled = (vaccinesEnabled.push(vaccine.name), vaccinesEnabled) %} + {% endif %} + {% endfor %} + + {{ (vaccinesEnabled | sort | join(", ")) | capitaliseFirstLetter }} + + {{ organisationUserCounts[organisation.id] }} + + {{ organisation.status }} + + Manage +
+ + + {% endif %} {% if closedOrganisations.length > 0 %}
From faa3c755204beb2a73f267a7988ce486ce9bec7a Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Mon, 10 Aug 2026 11:30:34 +0100 Subject: [PATCH 02/12] couple of changes that didn't get pushed last week --- app/routes/record-vaccinations.js | 46 ++++++ app/views/index.html | 6 + .../patient-history-deceased.html | 144 +++++++++++++++--- .../vaccination-date-deceased.html | 71 +++++++++ 4 files changed, 244 insertions(+), 23 deletions(-) create mode 100644 app/views/record-vaccinations/vaccination-date-deceased.html diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js index 1e20ad7f..d87681d9 100644 --- a/app/routes/record-vaccinations.js +++ b/app/routes/record-vaccinations.js @@ -87,6 +87,52 @@ module.exports = router => { res.redirect('/record-vaccinations/delivery-team') }) + router.get('/record-vaccinations/vaccination-date-deceased', (req, res) => { + const data = req.session.data + const vaccinationDate = data.vaccinationDate || {} + const vaccinationDateAsDate = dateFromYearMonthDay(vaccinationDate.year, vaccinationDate.month, vaccinationDate.day) + let vaccinationDateError + + if (req.query.showError === 'yes') { + if (!vaccinationDateAsDate) { + vaccinationDateError = 'Enter the vaccination date' + } else { + const today = new Date() + today.setHours(0, 0, 0, 0) + vaccinationDateAsDate.setHours(0, 0, 0, 0) + + if (vaccinationDateAsDate >= today) { + vaccinationDateError = 'Enter a date in the past' + } + } + } + + res.render('record-vaccinations/vaccination-date-deceased', { + vaccinationDateError + }) + }) + + router.post('/record-vaccinations/answer-date-deceased', (req, res) => { + const data = req.session.data + const vaccinationDate = data.vaccinationDate || {} + const vaccinationDateAsDate = dateFromYearMonthDay(vaccinationDate.year, vaccinationDate.month, vaccinationDate.day) + + if (!vaccinationDateAsDate) { + return res.redirect('/record-vaccinations/vaccination-date-deceased?showError=yes') + } + + const today = new Date() + today.setHours(0, 0, 0, 0) + vaccinationDateAsDate.setHours(0, 0, 0, 0) + + if (vaccinationDateAsDate >= today) { + return res.redirect('/record-vaccinations/vaccination-date-deceased?showError=yes') + } + + data.vaccinationToday = 'no' + res.redirect('/record-vaccinations/delivery-team') + }) + router.get('/record-vaccinations/delivery-team', (req, res) => { let errors = [] const data = req.session.data diff --git a/app/views/index.html b/app/views/index.html index fa25b97b..887fe367 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -105,6 +105,12 @@

Main interface

  • Profile page
    • +

    Special circumstances

    + + +

    Regions interface

      diff --git a/app/views/record-vaccinations/patient-history-deceased.html b/app/views/record-vaccinations/patient-history-deceased.html index 8cfac113..b23ca1ee 100644 --- a/app/views/record-vaccinations/patient-history-deceased.html +++ b/app/views/record-vaccinations/patient-history-deceased.html @@ -1,31 +1,42 @@ {% extends 'layout.html' %} -{% set pageName = "Check the patient details" %} +{% set pageName = "Check the patient's details" %} {% set currentSection = "vaccinate" %} -{% if ((data.vaccine == "RSV") and (data.eligibility | arrayOrStringIncludes("Pregnant"))) or (data.vaccine == "Pertussis") %} - {% set nextPage = "/record-vaccinations/patient-estimated-due-date" %} + +{% set patientFirstName = "Jodie" %} +{% set patientLastName = "Brown" %} +{% set patientFullName = patientFirstName + " " + patientLastName %} + +{% set nextPage = "/record-vaccinations/vaccination-date-deceased" %} + +{% if data.from == "appointments" %} + {% set previousPage = "/appointments" %} +{% elseif data.repeatVaccination === "yes" %} + {% set previousPage = "/record-vaccinations/patient" %} +{% elseif data.repeatPatient === "yes" %} + {% set previousPage = "/record-vaccinations/done" %} {% else %} - {% set nextPage = "/record-vaccinations/consent" %} + {% set previousPage = "/record-vaccinations" %} {% endif %} -{% set dateOfBirthHtml %} - {% if data.dateOfBirth %} - {{ (data.dateOfBirth | isoDateFromDateInput | govukDate) }} -
      (75 years old) - {% endif %} -{% endset %} - {% block beforeContent %} - {{ backLink({ href: "/record-vaccinations/patient" }) }} + {{ backLink({ href: previousPage }) }} {% endblock %} {% block content %}
      -

      Check {{ data.firstName }} {{ data.lastName }}’s details and vaccination history

      +

      Check {{ patientFullName }}’s details and vaccination history

      + + {% from "warning-callout/macro.njk" import warningCallout %} + + {{ warningCallout({ + heading: "Important", + text: "This patient is recorded as deceased. Only retrospective vaccinations can be recorded." + }) }} {{ summaryList({ rows: [ @@ -34,7 +45,7 @@

      Check {{ data.firstName }} {{ data.lastName }}’s d text: "Name" }, value: { - text: (data.firstName + " " + data.lastName) + text: patientFullName } }, { @@ -42,15 +53,15 @@

      Check {{ data.firstName }} {{ data.lastName }}’s d text: "Date of birth" }, value: { - html: "15 January 1954" - } + html: "15 March 1984" + } }, { key: { text: "Date of death" }, value: { - html: "20 March 2024
      (70 years old)" + html: "20 April 2024
      40 years old
      " } }, { @@ -66,7 +77,15 @@

      Check {{ data.firstName }} {{ data.lastName }}’s d text: "NHS number" }, value: { - text: data.nhsNumber + text: "9123456789" + } + }, + { + key: { + text: "GP surgery" + }, + value: { + html: "Beech House surgery
      1 Ash Tree Road
      Knaresborough
      HG5 0UB" } } ] @@ -91,9 +110,17 @@

      Check {{ data.firstName }} {{ data.lastName }}’s d

      Vaccination history

      -

      This shows NHS vaccinations given in England. Currently it includes COVID-19, flu, pertussis and RSV.

      -

      However, pertussis vaccinations given at a GP surgery are not shown.

      +{% set insetTextHtml %} +

      This shows NHS vaccinations given in England. It includes all vaccinations recorded in RAVS but only some recorded in other systems.

      + +{% endset %} + +{{ insetText({ + html: insetTextHtml, + classes: "nhsuk-u-padding-top-2 nhsuk-u-padding-bottom-2 nhsuk-u-margin-top-2 nhsuk-u-margin-bottom-4" +}) }} +
      @@ -117,7 +144,7 @@

      Vaccination history

      rows: [ [ { - text: "1 December 2024" + text: "15 April 2025" }, { text: "COVID-19" @@ -125,6 +152,16 @@

      Vaccination history

      { text: "Spikevax JN.1" } + ],[ + { + text: "9 November 2024" + }, + { + text: "MMR (2nd dose)" + }, + { + text: "Priorix" + } ],[ { text: "11 November 2024" @@ -136,12 +173,23 @@

      Vaccination history

      text: "Abrysvo" } ], + [ + { + text: "29 October 2024" + }, + { + text: "Pneumococcal" + }, + { + text: "Pneumovax" + } + ], [ { text: "25 October 2024" }, { - text: "Flu" + text: "Flu (1st dose)" }, { text: "Adjuvanted Quadrivalent Influenza Vaccine (aQIV)" @@ -166,7 +214,19 @@

      Vaccination history

      text: "Flu" }, { - text: "Adjuvanted Quadrivalent Influenza Vaccine (aQIV)" + text: "Not known", + classes: "nhsuk-u-secondary-text-color" + } + ], + [ + { + text: "7 October 2023" + }, + { + text: "Pertussis" + }, + { + text: "Boostrix-IPV suspension" } ], [ @@ -179,10 +239,48 @@

      Vaccination history

      { text: "Moderna mRNA (Spikevax) Original" } + ], + [ + { + text: "4 December 2023" + }, + { + text: "MMR" + }, + { + text: "Priorix" + } ] ] }) }} + {{ pagination({ + next: { + href: "#" + }, + items: [ + { + href: "#", + number: 1, + current: true + }, + { + href: "#", + number: 2 + }, + { + href: "#", + number: 3 + } + ] + }) }} + + +
      + {{ button({ + text: "Continue" + })}} +
      diff --git a/app/views/record-vaccinations/vaccination-date-deceased.html b/app/views/record-vaccinations/vaccination-date-deceased.html new file mode 100644 index 00000000..2938c828 --- /dev/null +++ b/app/views/record-vaccinations/vaccination-date-deceased.html @@ -0,0 +1,71 @@ +{% extends 'layout.html' %} + +{% set pageName = "What was the vaccination date?" %} + +{% set currentSection = "vaccinate" %} + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/patient-history-deceased" }) }} +{% endblock %} + +{% block content %} +
      +
      + + {% if vaccinationDateError %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: [ + { + text: vaccinationDateError, + href: "#vaccinationDate-day" + } + ] + }) }} + {% endif %} + +
      + {{ dateInput({ + id: "vaccinationDate", + namePrefix: "vaccinationDate", + fieldset: { + legend: { + text: "What was the vaccination date?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: true + } + }, + hint: { + text: "Enter a date in the past, for example, 15 3 2024" + }, + errorMessage: { + text: vaccinationDateError + } if vaccinationDateError, + items: [ + { + name: "day", + classes: "nhsuk-input--width-2" + (" nhsuk-input--error" if vaccinationDateError else ""), + value: data.vaccinationDate.day + }, + { + name: "month", + classes: "nhsuk-input--width-2" + (" nhsuk-input--error" if vaccinationDateError else ""), + value: data.vaccinationDate.month + }, + { + name: "year", + classes: "nhsuk-input--width-4" + (" nhsuk-input--error" if vaccinationDateError else ""), + value: data.vaccinationDate.year + } + ] + }) }} + + {{ button({ + text: "Continue" + }) }} +
      + +
      +
      + +{% endblock %} From 20ba2784a3f9df8ae3cd74d0474324c42b5739f6 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 13:52:27 +0100 Subject: [PATCH 03/12] Update warning message for deceased patient --- app/views/record-vaccinations/patient-history-deceased.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/patient-history-deceased.html b/app/views/record-vaccinations/patient-history-deceased.html index b23ca1ee..3192c29c 100644 --- a/app/views/record-vaccinations/patient-history-deceased.html +++ b/app/views/record-vaccinations/patient-history-deceased.html @@ -35,7 +35,7 @@

      Check {{ patientFullName }}’s details and vaccinat {{ warningCallout({ heading: "Important", - text: "This patient is recorded as deceased. Only retrospective vaccinations can be recorded." + text: "This patient has died according to the Personal Demographics Service." }) }} {{ summaryList({ From f913a134f11641a96d5b2f4e765069dce72e2a16 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 15:25:34 +0100 Subject: [PATCH 04/12] Update vaccination date prompt and hint text --- app/views/record-vaccinations/vaccination-date-deceased.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/record-vaccinations/vaccination-date-deceased.html b/app/views/record-vaccinations/vaccination-date-deceased.html index 2938c828..652bbd56 100644 --- a/app/views/record-vaccinations/vaccination-date-deceased.html +++ b/app/views/record-vaccinations/vaccination-date-deceased.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "What was the vaccination date?" %} +{% set pageName = "When was the patient vaccinated?" %} {% set currentSection = "vaccinate" %} @@ -36,7 +36,7 @@ } }, hint: { - text: "Enter a date in the past, for example, 15 3 2024" + text: "Enter a date before the patient died" }, errorMessage: { text: vaccinationDateError From 69c4883bbb7bcbafb21fe60c0b07f1a25be0fb9d Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 15:28:53 +0100 Subject: [PATCH 05/12] Enhance warning message for deceased patient vaccinations Updated warning message to include additional context about recording vaccinations for deceased patients. --- app/views/record-vaccinations/patient-history-deceased.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/patient-history-deceased.html b/app/views/record-vaccinations/patient-history-deceased.html index 3192c29c..fb3f1fb7 100644 --- a/app/views/record-vaccinations/patient-history-deceased.html +++ b/app/views/record-vaccinations/patient-history-deceased.html @@ -35,7 +35,7 @@

      Check {{ patientFullName }}’s details and vaccinat {{ warningCallout({ heading: "Important", - text: "This patient has died according to the Personal Demographics Service." + text: "This patient has died according to the Personal Demographics Service. Only continue if you want to record a vaccination given before they died." }) }} {{ summaryList({ From 70c7310cb181f42ea38cb161fda5e22c5713dc1d Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 15:32:40 +0100 Subject: [PATCH 06/12] Update vaccination date prompt wording --- app/views/record-vaccinations/vaccination-date-deceased.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/record-vaccinations/vaccination-date-deceased.html b/app/views/record-vaccinations/vaccination-date-deceased.html index 652bbd56..f4c5c0e7 100644 --- a/app/views/record-vaccinations/vaccination-date-deceased.html +++ b/app/views/record-vaccinations/vaccination-date-deceased.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "When was the patient vaccinated?" %} +{% set pageName = "When was the vaccination?" %} {% set currentSection = "vaccinate" %} @@ -30,7 +30,7 @@ namePrefix: "vaccinationDate", fieldset: { legend: { - text: "What was the vaccination date?", + text: "When was the vaccination?", classes: "nhsuk-fieldset__legend--l", isPageHeading: true } From 78174eda2dc58245c2e9229c9813a6bd6418b771 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Mon, 10 Aug 2026 15:33:18 +0100 Subject: [PATCH 07/12] Add error when date input is after patient has died --- app/routes/record-vaccinations.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js index d87681d9..6ada50f1 100644 --- a/app/routes/record-vaccinations.js +++ b/app/routes/record-vaccinations.js @@ -92,6 +92,7 @@ module.exports = router => { const vaccinationDate = data.vaccinationDate || {} const vaccinationDateAsDate = dateFromYearMonthDay(vaccinationDate.year, vaccinationDate.month, vaccinationDate.day) let vaccinationDateError + const dateOfDeath = new Date(2024, 3, 20, 12) // 20 April 2024 if (req.query.showError === 'yes') { if (!vaccinationDateAsDate) { @@ -100,9 +101,12 @@ module.exports = router => { const today = new Date() today.setHours(0, 0, 0, 0) vaccinationDateAsDate.setHours(0, 0, 0, 0) + dateOfDeath.setHours(0, 0, 0, 0) if (vaccinationDateAsDate >= today) { vaccinationDateError = 'Enter a date in the past' + } else if (vaccinationDateAsDate > dateOfDeath) { + vaccinationDateError = 'Enter a date on or before the date the patient died (20 April 2024)' } } } @@ -116,6 +120,7 @@ module.exports = router => { const data = req.session.data const vaccinationDate = data.vaccinationDate || {} const vaccinationDateAsDate = dateFromYearMonthDay(vaccinationDate.year, vaccinationDate.month, vaccinationDate.day) + const dateOfDeath = new Date(2024, 3, 20, 12) // 20 April 2024 if (!vaccinationDateAsDate) { return res.redirect('/record-vaccinations/vaccination-date-deceased?showError=yes') @@ -124,11 +129,16 @@ module.exports = router => { const today = new Date() today.setHours(0, 0, 0, 0) vaccinationDateAsDate.setHours(0, 0, 0, 0) + dateOfDeath.setHours(0, 0, 0, 0) if (vaccinationDateAsDate >= today) { return res.redirect('/record-vaccinations/vaccination-date-deceased?showError=yes') } + if (vaccinationDateAsDate > dateOfDeath) { + return res.redirect('/record-vaccinations/vaccination-date-deceased?showError=yes') + } + data.vaccinationToday = 'no' res.redirect('/record-vaccinations/delivery-team') }) From d0ac50d94d13b2b2af2251a89f19f41489d5838f Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Mon, 10 Aug 2026 15:41:14 +0100 Subject: [PATCH 08/12] Added date of death and warning to check and confirm --- app/routes/record-vaccinations.js | 10 ++++++++++ app/views/record-vaccinations/check.html | 18 +++++++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js index 6ada50f1..a68b2f5a 100644 --- a/app/routes/record-vaccinations.js +++ b/app/routes/record-vaccinations.js @@ -87,6 +87,15 @@ module.exports = router => { res.redirect('/record-vaccinations/delivery-team') }) + router.get('/record-vaccinations/patient-history-deceased', (req, res) => { + const data = req.session.data + data.firstName = 'Jodie' + data.lastName = 'Brown' + data.dateOfBirth = { day: '15', month: '3', year: '1984' } + data.nhsNumber = '9123456789' + res.render('record-vaccinations/patient-history-deceased') + }) + router.get('/record-vaccinations/vaccination-date-deceased', (req, res) => { const data = req.session.data const vaccinationDate = data.vaccinationDate || {} @@ -140,6 +149,7 @@ module.exports = router => { } data.vaccinationToday = 'no' + data.patientIsDeceased = true res.redirect('/record-vaccinations/delivery-team') }) diff --git a/app/views/record-vaccinations/check.html b/app/views/record-vaccinations/check.html index b20e1643..a8f34c6f 100644 --- a/app/views/record-vaccinations/check.html +++ b/app/views/record-vaccinations/check.html @@ -60,6 +60,14 @@

      Check and confirm

      + {% if data.patientIsDeceased %} + {% from "warning-callout/macro.njk" import warningCallout %} + {{ warningCallout({ + heading: "Important", + text: "This patient has died according to the Personal Demographics Service. Only continue if you want to record a vaccination given before they died." + }) }} + {% endif %} +

      Patient

      {{ summaryList({ @@ -86,7 +94,7 @@

      Patient

      text: "Date of birth" }, value: { - html: (data.dateOfBirth | formatDate) + "
      (76 years old)" + html: (data.dateOfBirth | formatDate) + ("" if data.patientIsDeceased else "
      (76 years old)") }, actions: { items: [ @@ -98,6 +106,14 @@

      Patient

      ] } }, + { + key: { + text: "Date of death" + }, + value: { + html: "20 April 2024
      40 years old
      " + } + } if data.patientIsDeceased, { key: { text: "Address" From 8e943405990a0722080d6dda09bfd8ac03e9cd33 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Mon, 10 Aug 2026 15:42:24 +0100 Subject: [PATCH 09/12] Removed second sentence in warning on check and confirm --- app/views/record-vaccinations/check.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/check.html b/app/views/record-vaccinations/check.html index a8f34c6f..19c9ef9d 100644 --- a/app/views/record-vaccinations/check.html +++ b/app/views/record-vaccinations/check.html @@ -64,7 +64,7 @@

      Check and confirm

      {% from "warning-callout/macro.njk" import warningCallout %} {{ warningCallout({ heading: "Important", - text: "This patient has died according to the Personal Demographics Service. Only continue if you want to record a vaccination given before they died." + text: "This patient has died according to the Personal Demographics Service." }) }} {% endif %} From 745afefed0cdb210b0151b5d0b05c7e7f0dca89e Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 15:46:34 +0100 Subject: [PATCH 10/12] Remove hint text for vaccination date Removed hint text for vaccination date input. --- app/views/record-vaccinations/vaccination-date-deceased.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/vaccination-date-deceased.html b/app/views/record-vaccinations/vaccination-date-deceased.html index f4c5c0e7..98ac590a 100644 --- a/app/views/record-vaccinations/vaccination-date-deceased.html +++ b/app/views/record-vaccinations/vaccination-date-deceased.html @@ -36,7 +36,7 @@ } }, hint: { - text: "Enter a date before the patient died" + text: "" }, errorMessage: { text: vaccinationDateError From 0a720d57cb5542c18af427bbee2d1d3254d5d78e Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 15:54:52 +0100 Subject: [PATCH 11/12] Modify warning text for deceased patient vaccinations --- app/views/record-vaccinations/patient-history-deceased.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/patient-history-deceased.html b/app/views/record-vaccinations/patient-history-deceased.html index fb3f1fb7..a2c5c9c5 100644 --- a/app/views/record-vaccinations/patient-history-deceased.html +++ b/app/views/record-vaccinations/patient-history-deceased.html @@ -35,7 +35,7 @@

      Check {{ patientFullName }}’s details and vaccinat {{ warningCallout({ heading: "Important", - text: "This patient has died according to the Personal Demographics Service. Only continue if you want to record a vaccination given before they died." + text: "This patient has died according to the Personal Demographics Service. Continue if you want to record a vaccination given before they died." }) }} {{ summaryList({ From f0a8683c6c41842c73ffcf9d4bb3f487233ef0d3 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 10 Aug 2026 16:00:53 +0100 Subject: [PATCH 12/12] Update vaccination date error message --- app/routes/record-vaccinations.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js index a68b2f5a..e793a5f0 100644 --- a/app/routes/record-vaccinations.js +++ b/app/routes/record-vaccinations.js @@ -115,7 +115,7 @@ module.exports = router => { if (vaccinationDateAsDate >= today) { vaccinationDateError = 'Enter a date in the past' } else if (vaccinationDateAsDate > dateOfDeath) { - vaccinationDateError = 'Enter a date on or before the date the patient died (20 April 2024)' + vaccinationDateError = 'The date of vaccination must be the same as or before the date the patient died (20 April 2024)' } } }