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) }}
-
-
-
-
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
- }
- ]
- }) }}
-
-
-
-
-
-
-
-{% 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 @@
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 @@