From e9f3e42904e2e46ee40bd43c990c0d232c8e3c4d Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 11:20:18 +0100 Subject: [PATCH 01/13] Add error page for vaccination history retrieval failure --- .../errors/history-error-continue-anyway.html | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 app/views/errors/history-error-continue-anyway.html diff --git a/app/views/errors/history-error-continue-anyway.html b/app/views/errors/history-error-continue-anyway.html new file mode 100644 index 00000000..919e4a6a --- /dev/null +++ b/app/views/errors/history-error-continue-anyway.html @@ -0,0 +1,30 @@ +{% extends 'layout.html' %} + +{% set pageName = "We could not get Jodie Brown's vaccination history" %} + + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/patient" }) }} +{% endblock %} + +{% set currentSection = "vaccinate" %} + + +{% block content %} +
+
+

{{ pageName }}

+ + +{% from "button/macro.njk" import button %} + +{{ button({ + text: "Continue anyway" +}) }} + + +
+
+ + +{% endblock %} From dbbe1faa1c59804a9700ecf4b8fb73544d2bb879 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 11:21:27 +0100 Subject: [PATCH 02/13] Remove Continue anyway button from error page --- app/views/errors/no-vaccination-history.html | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/views/errors/no-vaccination-history.html b/app/views/errors/no-vaccination-history.html index 388a256a..4a1a9b94 100644 --- a/app/views/errors/no-vaccination-history.html +++ b/app/views/errors/no-vaccination-history.html @@ -23,15 +23,6 @@

{{ pageName }}

}) }} -    - -{% from "button/macro.njk" import button %} - -{{ button({ - text: "Continue anyway", - classes: "nhsuk-button--secondary" -}) }} - From b91a2f1c7d3d6cb279c94c933599922e61029492 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 11:28:43 +0100 Subject: [PATCH 03/13] Added vax history error page to index --- app/views/index.html | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/index.html b/app/views/index.html index 3c3c2d98..3b6a3d3b 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -437,7 +437,15 @@

Error pages

html: "There is a temporary problem getting [patient name]'s vaccination history (history API issue)" }, { - text: "When no vaccination history can be retrieved from the history APIs or RAVS database." + text: "When no vaccination history can be retrieved from the history APIs or RAVS database but we allow the user to try again." + } + ], + [ + { + html: "We could not get the patient's vaccination history" + }, + { + text: "When we cannot fetch any history from the APIs or RAVS database and we allow the user to continue with no history." } ], [ From d16da8025aa84c5ca8b9097f8f8732cda6f82435 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 11:30:26 +0100 Subject: [PATCH 04/13] Update vaccination history error link in index.html --- app/views/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/index.html b/app/views/index.html index 3b6a3d3b..60a3cf47 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -442,7 +442,7 @@

Error pages

], [ { - html: "We could not get the patient's vaccination history" + html: "We could not get the patient's vaccination history" }, { text: "When we cannot fetch any history from the APIs or RAVS database and we allow the user to continue with no history." From 0cb40a5f217b7cb7d3ea09f5c1da4afb1e0d83db Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 11:40:44 +0100 Subject: [PATCH 05/13] Update error message for patient details retrieval --- app/views/errors/pds-error-continue-anyway.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/errors/pds-error-continue-anyway.html b/app/views/errors/pds-error-continue-anyway.html index bb269301..bb3e60d6 100644 --- a/app/views/errors/pds-error-continue-anyway.html +++ b/app/views/errors/pds-error-continue-anyway.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "We could not get the patient's details" %} +{% set pageName = "We cannot get the patient's details" %} {% block beforeContent %} From 9d3c2cccfc5d497ae5b4285a5dd1fbae37afcb17 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 11:44:25 +0100 Subject: [PATCH 06/13] Refine error messages for vaccination and patient details --- app/views/index.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index 60a3cf47..f836bca8 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -442,10 +442,10 @@

Error pages

], [ { - html: "We could not get the patient's vaccination history" + html: "We could not any vaccination history for [patient name]" }, { - text: "When we cannot fetch any history from the APIs or RAVS database and we allow the user to continue with no history." + text: "When the user has tried again and we still cannot fetch any history from the APIs or RAVS database and we allow the user to continue with no history." } ], [ @@ -474,7 +474,7 @@

Error pages

], [ { - html: "We could not get the patient's details" + html: "We cannot get the patient's details" }, { text: "When we cannot fetch patient details from PDS and allow the user to continue recording without the NHS number match." From c614ed40a69463621f15440690edf2f9aad366ec Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 12:03:57 +0100 Subject: [PATCH 07/13] Update error message for vaccination history --- app/views/errors/history-error-continue-anyway.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/errors/history-error-continue-anyway.html b/app/views/errors/history-error-continue-anyway.html index 919e4a6a..d9686158 100644 --- a/app/views/errors/history-error-continue-anyway.html +++ b/app/views/errors/history-error-continue-anyway.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "We could not get Jodie Brown's vaccination history" %} +{% set pageName = "We could not get any vaccination history for Jodie Brown" %} {% block beforeContent %} From b21725617a19de9d03174030e7b749c777461590 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Mon, 19 Oct 2026 12:08:46 +0100 Subject: [PATCH 08/13] Update text for vaccination history retrieval messages --- app/views/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index f836bca8..ade6e55d 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -437,7 +437,7 @@

Error pages

html: "There is a temporary problem getting [patient name]'s vaccination history (history API issue)" }, { - text: "When no vaccination history can be retrieved from the history APIs or RAVS database but we allow the user to try again." + text: "When no vaccination history can be retrieved from the history APIs so we allow the user to try again." } ], [ @@ -445,7 +445,7 @@

Error pages

html: "We could not any vaccination history for [patient name]" }, { - text: "When the user has tried again and we still cannot fetch any history from the APIs or RAVS database and we allow the user to continue with no history." + text: "When the user has tried again and we still cannot fetch any history from the APIs so we allow the user to continue with no history." } ], [ From b3b6bddaaac78d4673ebad2393455a8b15f8de78 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Tue, 27 Oct 2026 08:33:10 +0000 Subject: [PATCH 09/13] Tidy up white space --- app/views/errors/pds-error-continue-anyway.html | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/app/views/errors/pds-error-continue-anyway.html b/app/views/errors/pds-error-continue-anyway.html index bb3e60d6..68cfc05e 100644 --- a/app/views/errors/pds-error-continue-anyway.html +++ b/app/views/errors/pds-error-continue-anyway.html @@ -2,26 +2,21 @@ {% set pageName = "We cannot get the patient's details" %} - {% block beforeContent %} {{ backLink({ href: "/record-vaccinations/patient" }) }} {% endblock %} - {% block content %} +

{{ pageName }}

- -{% from "button/macro.njk" import button %} - -{{ button({ - text: "Continue anyway" -}) }} + {{ button({ + text: "Continue anyway" + }) }}
- -{% endblock %} +{% endblock %} \ No newline at end of file From c145f587d0f1ce6a0058a5f2fd19f34cb68cbbf9 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Tue, 27 Oct 2026 08:37:12 +0000 Subject: [PATCH 10/13] Tidy up whitespace --- app/views/errors/no-vaccination-history.html | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/app/views/errors/no-vaccination-history.html b/app/views/errors/no-vaccination-history.html index 4a1a9b94..f204aba7 100644 --- a/app/views/errors/no-vaccination-history.html +++ b/app/views/errors/no-vaccination-history.html @@ -2,29 +2,23 @@ {% set pageName = "There is a temporary problem getting Jodie Brown's vaccination history" %} - {% block beforeContent %} {{ backLink({ href: "/record-vaccinations/patient" }) }} {% endblock %} {% set currentSection = "vaccinate" %} - {% block content %} +

{{ pageName }}

- -{% from "button/macro.njk" import button %} - -{{ button({ - text: "Try again" -}) }} - + {{ button({ + text: "Try again" + }) }}
- -{% endblock %} +{% endblock %} \ No newline at end of file From 0d779fbaab91c5268620e50c82c39b523f6aa720 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Tue, 27 Oct 2026 08:39:10 +0000 Subject: [PATCH 11/13] Tidy whitespace --- .../errors/history-error-continue-anyway.html | 17 ++++++----------- app/views/errors/no-vaccination-history.html | 1 + app/views/errors/pds-error-continue-anyway.html | 1 + 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/app/views/errors/history-error-continue-anyway.html b/app/views/errors/history-error-continue-anyway.html index d9686158..76346f78 100644 --- a/app/views/errors/history-error-continue-anyway.html +++ b/app/views/errors/history-error-continue-anyway.html @@ -2,29 +2,24 @@ {% set pageName = "We could not get any vaccination history for Jodie Brown" %} - {% block beforeContent %} {{ backLink({ href: "/record-vaccinations/patient" }) }} {% endblock %} {% set currentSection = "vaccinate" %} - {% block content %} +
+

{{ pageName }}

- -{% from "button/macro.njk" import button %} - -{{ button({ - text: "Continue anyway" -}) }} - + {{ button({ + text: "Continue anyway" + }) }}
- -{% endblock %} +{% endblock %} \ No newline at end of file diff --git a/app/views/errors/no-vaccination-history.html b/app/views/errors/no-vaccination-history.html index f204aba7..fa869442 100644 --- a/app/views/errors/no-vaccination-history.html +++ b/app/views/errors/no-vaccination-history.html @@ -12,6 +12,7 @@
+

{{ pageName }}

{{ button({ diff --git a/app/views/errors/pds-error-continue-anyway.html b/app/views/errors/pds-error-continue-anyway.html index 68cfc05e..d7279f24 100644 --- a/app/views/errors/pds-error-continue-anyway.html +++ b/app/views/errors/pds-error-continue-anyway.html @@ -10,6 +10,7 @@
+

{{ pageName }}

{{ button({ From a2d58a8b52ca68d031f578780aa1fd633243c708 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Tue, 27 Oct 2026 08:43:41 +0000 Subject: [PATCH 12/13] Tidy whitespace --- app/views/index.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index ade6e55d..409b5d11 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -13,13 +13,11 @@ {% set pageName = "NHS Record a vaccination prototypes" %} - ---> + {% block beforeContent %} {% endblock %} - {% block content %} From baff1ef066e6c11a754a3ade0868fdded6827ad1 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 27 Oct 2026 09:13:18 +0000 Subject: [PATCH 13/13] Update app/views/errors/pds-error-continue-anyway.html Co-authored-by: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> --- app/views/errors/pds-error-continue-anyway.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/errors/pds-error-continue-anyway.html b/app/views/errors/pds-error-continue-anyway.html index d7279f24..11bbb8e3 100644 --- a/app/views/errors/pds-error-continue-anyway.html +++ b/app/views/errors/pds-error-continue-anyway.html @@ -6,6 +6,8 @@ {{ backLink({ href: "/record-vaccinations/patient" }) }} {% endblock %} +{% set currentSection = "vaccinate" %} + {% block content %}