From 5a3c1506446b82a068e18e33dfa3e7c58b9e95aa Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Fri, 4 Sep 2026 14:13:37 +0100 Subject: [PATCH 1/5] Remove pages introduced for GP scenarios --- .../covid-19/no-gp-surgery-warning.html | 48 ---- .../covid-19/not-in-pcn-warning.html | 42 --- .../patient-history-no-gp.html | 266 ------------------ 3 files changed, 356 deletions(-) delete mode 100644 app/views/record-vaccinations/covid-19/no-gp-surgery-warning.html delete mode 100644 app/views/record-vaccinations/covid-19/not-in-pcn-warning.html delete mode 100644 app/views/record-vaccinations/patient-history-no-gp.html diff --git a/app/views/record-vaccinations/covid-19/no-gp-surgery-warning.html b/app/views/record-vaccinations/covid-19/no-gp-surgery-warning.html deleted file mode 100644 index 002e4f69..00000000 --- a/app/views/record-vaccinations/covid-19/no-gp-surgery-warning.html +++ /dev/null @@ -1,48 +0,0 @@ - -{% extends 'layout.html' %} - -{% set pageName = "Patient has no GP surgery" %} - -{% set currentSection = "vaccinate" %} - -{% block beforeContent %} - {{ backLink({ href: "/record-vaccinations/patient-history" }) }} -{% endblock %} - -{% block content %} -
-
- - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} - - {% if data.locationType %} - {% set locationType = data.locationType %} - {% else %} - {% set locationType = '[Location Type]' %} - {% endif %} - - {% set panelHtml %} - {#

This patient does not have a registered GP surgery.

#} -

Your organisation may not be paid for this vaccination.

- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} - {% endset %} - - {{ panel({ - titleText: displayName + " is not registered with a GP surgery", - html: panelHtml, - classes: "nhsuk-panel--interruption" - }) }} - -
-
-{% endblock %} - diff --git a/app/views/record-vaccinations/covid-19/not-in-pcn-warning.html b/app/views/record-vaccinations/covid-19/not-in-pcn-warning.html deleted file mode 100644 index ceb22725..00000000 --- a/app/views/record-vaccinations/covid-19/not-in-pcn-warning.html +++ /dev/null @@ -1,42 +0,0 @@ - -{% extends 'layout.html' %} - -{% set pageName = "Patient not in PCN" %} - -{% set currentSection = "vaccinate" %} - -{% block beforeContent %} - {{ backLink({ href: "/record-vaccinations/patient-history" }) }} -{% endblock %} - -{% block content %} -
-
- - - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} - - {% set panelHtml %} -

Your organisation may not be paid for this vaccination.

- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} - {% endset %} - - {{ panel({ - titleText: displayName + "'s GP surgery is not in your PCN", - html: panelHtml, - classes: "nhsuk-panel--interruption" - }) }} - -
-
-{% endblock %} - diff --git a/app/views/record-vaccinations/patient-history-no-gp.html b/app/views/record-vaccinations/patient-history-no-gp.html deleted file mode 100644 index cb0047cb..00000000 --- a/app/views/record-vaccinations/patient-history-no-gp.html +++ /dev/null @@ -1,266 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Check the patient's details" %} - -{% set currentSection = "vaccinate" %} - -{% set dateOfBirthHtml %} - {% if data.dateOfBirth.day %} - {{ (data.dateOfBirth | isoDateFromDateInput | govukDate) }} -
{{ data.dateOfBirth | isoDateFromDateInput | age }} old
- {% else %} - {{ (data.dateOfBirth | govukDate) }} -
{{ data.dateOfBirth | age }} old
- {% endif %} -{% endset %} - -{% if data.repeatVaccination === "yes" %} - {% set nextPage = "/record-vaccinations/consent" %} -{% elseif data.repeatPatient === "yes" %} - {% set nextPage = "/record-vaccinations/vaccine" %} -{% else %} - {% set nextPage = "/record-vaccinations/vaccination-date" %} -{% endif %} - -{% 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 previousPage = "/record-vaccinations" %} -{% endif %} - -{% block beforeContent %} - {{ backLink({ href: previousPage }) }} -{% endblock %} - -{% block content %} -
-
- -

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

- - {{ warningCallout({ - heading: "No GP surgery", - headingLevel: 2, - text: "This patient is not registered with a GP surgery." - }) }} - - {{ summaryList({ - rows: [ - { - key: { - text: "Name" - }, - value: { - text: (data.firstName + " " + data.lastName) - } - }, - { - key: { - text: "Date of birth" - }, - value: { - html: dateOfBirthHtml - } - }, - { - key: { - text: "Address" - }, - value: { - html: "73 Roman Rd
Leeds
LS2 5ZN" - } - }, - { - key: { - text: "NHS number" - }, - value: { - text: data.nhsNumber - } - } - ] - }) }} - -

Vaccination history

- - -{% 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" -}) }} - -
-
-
-
- - {{ table({ - panel: false, - caption: "", - firstCellIsHeader: false, - head: [ - { - text: "Date" - }, - { - text: "Vaccine" - }, - { - text: "Product" - } - ], - rows: [ - [ - { - text: "15 April 2025" - }, - { - text: "COVID-19" - }, - { - text: "Spikevax JN.1" - } - ],[ - { - text: "9 November 2024" - }, - { - text: "MMR (2nd dose)" - }, - { - text: "Priorix" - } - ],[ - { - text: "11 November 2024" - }, - { - text: "RSV" - }, - { - text: "Abrysvo" - } - ], - [ - { - text: "29 October 2024" - }, - { - text: "Pneumococcal" - }, - { - text: "Pneumovax" - } - ], - [ - { - text: "25 October 2024" - }, - { - text: "Flu (1st dose)" - }, - { - text: "Adjuvanted Quadrivalent Influenza Vaccine (aQIV)" - } - ], - [ - { - text: "15 October 2023" - }, - { - text: "COVID-19" - }, - { - text: "Comirnaty 30 Omicron XBB.1.5" - } - ], - [ - { - text: "10 October 2023" - }, - { - text: "Flu" - }, - { - text: "Not known", - classes: "nhsuk-u-secondary-text-color" - } - ], - [ - { - text: "7 October 2023" - }, - { - text: "Pertussis" - }, - { - text: "Boostrix-IPV suspension" - } - ], - [ - { - text: "11 March 2022" - }, - { - text: "COVID-19" - }, - { - 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" - })}} -
- -
-
- -{% endblock %} - From 5df6e955506069648c658ed266c7db7b138d7d16 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Fri, 4 Sep 2026 15:05:02 +0100 Subject: [PATCH 2/5] Remove conditional GP scenario messages --- .../record-vaccinations/patient-history.html | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/app/views/record-vaccinations/patient-history.html b/app/views/record-vaccinations/patient-history.html index f0f42ef5..0e2a2d93 100644 --- a/app/views/record-vaccinations/patient-history.html +++ b/app/views/record-vaccinations/patient-history.html @@ -42,22 +42,6 @@

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

- {% if data.gpit === "inPCN" %} - - {% set insetTextHtml %} -

This patient's GP surgery is in your PCN.

- {% endset %} - {{ insetText({ - html: insetTextHtml - }) }} - {% elif data.gpit === "notInPCN" %} - {{ warningCallout({ - heading: "Important", - headingLevel: 2, - text: "This patient's GP surgery is not in your PCN." - }) }} - {% endif %} - {{ summaryList({ rows: [ { @@ -102,10 +86,6 @@

Check {{ data.firstName }} {{ data.lastName }}’s d } ] }) }} -{# - {{ insetText({ - html: insetTextHtml - }) }} #}

Vaccination history

From d1e654066e028f9e08d3f23655ecdea344572257 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Fri, 4 Sep 2026 15:06:16 +0100 Subject: [PATCH 3/5] Remove conditional GP scenario messages --- .../record-vaccinations/patient-history-none.html | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/app/views/record-vaccinations/patient-history-none.html b/app/views/record-vaccinations/patient-history-none.html index a073ff7e..6657ce05 100644 --- a/app/views/record-vaccinations/patient-history-none.html +++ b/app/views/record-vaccinations/patient-history-none.html @@ -46,15 +46,6 @@

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

- {% if data.gpit === "noGP" %} - {{ warningCallout({ - heading: "Important", - headingLevel: 2, - text: "This patient is not registered with a GP surgery, and we could not get any vaccination history for them." - }) }} - {% else %} - {% endif %} - {{ summaryList({ classes: 'xnhsuk-summary-list--no-border', rows: [ @@ -85,9 +76,6 @@

Check {{ displayName }}’s details and vaccination ] }) }} - {% if data.gpit === "noGP" %} - {% else %} - {% from "warning-callout/macro.njk" import warningCallout %} {{ warningCallout({ @@ -95,9 +83,7 @@

Check {{ displayName }}’s details and vaccination headingLevel: 2, text: "We could not get any vaccination history for this patient." }) }} - {% endif %} -
{{ button({ text: "Continue" From 56b2ad23e2ec0ed4e27ebe432193c44057de1fdd Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Fri, 4 Sep 2026 15:07:38 +0100 Subject: [PATCH 4/5] Remove GP scenario routes --- app/routes/record-vaccinations.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js index d38dec83..b96c5ed1 100644 --- a/app/routes/record-vaccinations.js +++ b/app/routes/record-vaccinations.js @@ -295,15 +295,7 @@ module.exports = router => { const nhsNumber = req.session.data.nhsNumber.replaceAll(' ', '') const data = req.session.data - if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) && nhsNumber.startsWith('9') && data.gpit === "noGP") { - - req.session.data.firstName = "Jodie" - req.session.data.lastName = "Brown" - req.session.data.dateOfBirth = {day: "15", month: "8", year: "1949"} - req.session.data.postcode = "GD3 I83" - - res.redirect('/record-vaccinations/patient-history-no-gp') - } else if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) && nhsNumber.startsWith('9')) { + if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) && nhsNumber.startsWith('9')) { req.session.data.firstName = "Jodie" req.session.data.lastName = "Brown" @@ -966,10 +958,6 @@ module.exports = router => { if (!data.locationType) { redirectPath = "/record-vaccinations/location?showErrors=yes" - } else if (data.gpit === "notInPCN" && data.locationType !== "Outreach event"){ - redirectPath = "/record-vaccinations/covid-19/not-in-pcn-warning" - } else if (data.gpit === "noGP" && data.locationType !== "Outreach event"){ - redirectPath = "/record-vaccinations/covid-19/no-gp-surgery-warning" } else { redirectPath = "/record-vaccinations/consent" } From 8373d7e0c8699e7d5878d492a3808513f86d2df2 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Thu, 17 Sep 2026 16:48:41 +0100 Subject: [PATCH 5/5] Remove const data --- app/routes/record-vaccinations.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/routes/record-vaccinations.js b/app/routes/record-vaccinations.js index 9aa4d4d9..42e153fa 100644 --- a/app/routes/record-vaccinations.js +++ b/app/routes/record-vaccinations.js @@ -335,7 +335,6 @@ module.exports = router => { const nhsNumberKnown = req.session.data.nhsNumberKnown; req.session.data.nhsNumber = req.session.data.nhsNumber.trim() const nhsNumber = req.session.data.nhsNumber.replaceAll(' ', '') - const data = req.session.data if (nhsNumberKnown === "yes" && nhsNumber.match(/^\d{10}$/) && nhsNumber.startsWith('9')) {