From da06cadf1ac8907ce3395312b75bbc37f3a5896b Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Wed, 27 May 2026 15:40:40 +0100 Subject: [PATCH 01/18] First round of updated interruption pages --- .../covid-19/interval-warning.html | 40 +++++++++------ .../covid-19/too-young-warning.html | 28 +++++++---- app/views/record-vaccinations/dose.html | 13 +++-- .../not-yet-16-weeks-pregnant-warning.html | 44 +++++++++++------ .../not-yet-28-weeks-pregnant-warning.html | 49 +++++++++++++------ 5 files changed, 117 insertions(+), 57 deletions(-) diff --git a/app/views/record-vaccinations/covid-19/interval-warning.html b/app/views/record-vaccinations/covid-19/interval-warning.html index 6060af62..d05e7236 100644 --- a/app/views/record-vaccinations/covid-19/interval-warning.html +++ b/app/views/record-vaccinations/covid-19/interval-warning.html @@ -12,23 +12,33 @@
-

{{ data.firstName }} {{ data.lastName }} had a COVID-19 vaccine less than 3 months ago

- -

- They had a COVID-19 vaccine on 15 April 2025. -

- -

- For most people, the minimum recommended gap between COVID-19 vaccine doses is 3 months. -

+
+ + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} had a COVID-19 vaccine less than 3 months ago

+ +
+

+ They had a COVID-19 vaccine on 15 April 2025. +

+ +

+ For most people, the minimum recommended gap between COVID-19 vaccine doses is 3 months. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/covid-19/too-young-warning.html b/app/views/record-vaccinations/covid-19/too-young-warning.html index b2da41a7..30ed21e0 100644 --- a/app/views/record-vaccinations/covid-19/too-young-warning.html +++ b/app/views/record-vaccinations/covid-19/too-young-warning.html @@ -13,18 +13,28 @@
-

{{ data.firstName }} {{ data.lastName }} may be too young for this vaccine product

-

Adjuvanted Quadrivalent Influenza Vaccine (aQIV) is not usually recommended for people under the age of 65. {{ data.firstName }} {{ data.lastName }} is 64 years old.

-

Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} may be too young for this vaccine product

+ +
+

Adjuvanted Quadrivalent Influenza Vaccine (aQIV) is not usually recommended for people under the age of 65. {{ displayName }} is 64 years old.

+

Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/dose.html b/app/views/record-vaccinations/dose.html index 8913c9b2..668ef439 100644 --- a/app/views/record-vaccinations/dose.html +++ b/app/views/record-vaccinations/dose.html @@ -1,6 +1,13 @@ {% extends 'layout.html' %} -{% set pageName = "Which dose of the " + data.vaccine + " are you giving?" %} +{% set vaccineDisplayName = data.vaccine %} +{% if data.vaccine == "Flu" %} + {% set vaccineDisplayName = "flu" %} +{% elif data.vaccine == "Flu (London service)" %} + {% set vaccineDisplayName = "flu (London service)" %} +{% endif %} + +{% set pageName = "Which dose of the " + vaccineDisplayName + " are you giving?" %} {% set currentSection = "vaccinate" %} {% set organisationSetting = currentUser.organisations | findById(data.currentOrganisationId) %} @@ -17,7 +24,7 @@ {% if data.showError == "yes" %} {% set errors = [{ - text: "Select which dose of the " + data.vaccine + " are you giving", + text: "Select which dose of the " + vaccineDisplayName + " are you giving", href: "#vaccineDose" }] %} {% endif %} @@ -109,7 +116,7 @@ } if (errors | length) > 0, fieldset: { legend: { - text: ("Which dose of the " + data.vaccine + " vaccine are you giving?" if data.vaccinationToday == 'yes' else "Which dose of the " + data.vaccine + " vaccine was it?"), + text: ("Which dose of the " + vaccineDisplayName + " vaccine are you giving?" if data.vaccinationToday == 'yes' else "Which dose of the " + vaccineDisplayName + " vaccine was it?"), classes: "nhsuk-fieldset__legend--l", isPageHeading: true } diff --git a/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html b/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html index 7b0c2cff..5c7105d1 100644 --- a/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html +++ b/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html @@ -12,22 +12,38 @@
-

{{ data.firstName }} {{ data.lastName }} is not yet 16 weeks pregnant

- - -

{{ data.firstName }} {{ data.lastName }} is {{ fullWeeksPregnant | plural("week") }}{% if remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant.

-

The pertussis vaccine is recommended between 16 and 32 weeks of pregnancy.

- -

UKHSA guidance on pertussis vaccination of pregnant women (opens in new tab). - +

+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} is not yet 16 weeks pregnant

+ +
+ {% set randomWeeks = (range(1, 15) | random) %} +

+ {{ displayName }} is + {% if fullWeeksPregnant is defined and fullWeeksPregnant is not none %} + {{ fullWeeksPregnant | plural("week") }} + {% else %} + {{ randomWeeks }} week{{ 's' if randomWeeks > 1 }} + {% endif %} + {% if remainderDaysPregnant is defined and remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. +

+

The pertussis vaccine is recommended between 16 and 32 weeks of pregnancy.

+ +

UKHSA guidance on pertussis vaccination of pregnant women (opens in new tab).

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html b/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html index ea8aa2dd..735ac67f 100644 --- a/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html +++ b/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html @@ -12,24 +12,41 @@
-

{{ data.firstName }} {{ data.lastName }} is not yet 28 weeks pregnant

- - -

{{ data.firstName }} {{ data.lastName }} is {{ fullWeeksPregnant | plural("week") }}{% if remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. -

- -

The {{ data.vaccine }} vaccine is not routinely recommended before 28 weeks of pregnancy.

- -

UKHSA guidance on RSV vaccination of pregnant women (opens in new tab). - +

+ + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} is not yet 28 weeks pregnant

+ +
+ + {% set randomWeeks = (range(1, 27) | random) %} +

+ {{ displayName }} is + {% if fullWeeksPregnant is defined and fullWeeksPregnant is not none %} + {{ fullWeeksPregnant | plural("week") }} + {% else %} + {{ randomWeeks }} week{{ 's' if randomWeeks > 1 }} + {% endif %} + {% if remainderDaysPregnant is defined and remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. +

+ +

The {{ data.vaccine }} vaccine is not routinely recommended before 28 weeks of pregnancy.

+ +

UKHSA guidance on RSV vaccination of pregnant women (opens in new tab).

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} From e8c8445c1365f9cc4c953ab6424860d0db66a35e Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Wed, 27 May 2026 15:56:25 +0100 Subject: [PATCH 02/18] More interruption pages --- .../mmr/already-had-2-doses-warning.html | 39 ++++++++------ .../mmr/interval-warning.html | 39 ++++++++------ .../mmr/too-old-warning.html | 47 +++++++++------- .../ppv/already-had-it-warning.html | 38 ++++++++----- .../ppv/too-young-warning.html | 54 ++++++++++++------- 5 files changed, 134 insertions(+), 83 deletions(-) diff --git a/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html b/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html index de68ef0f..02d0df30 100644 --- a/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html +++ b/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html @@ -12,23 +12,32 @@
-

Jodie Brown has already had 2 MMR vaccinations

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} has already had 2 MMR vaccinations

+ +
+

+ {{ displayName }} had a second MMR vaccination on 10 July 2025. +

+ +

+ Most people only need 2 doses of the MMR vaccine. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
-

- Jodie Brown had a second MMR vaccination on 10 July 2025. -

- -

- Most people only need 2 doses of the MMR vaccine. -

-
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/mmr/interval-warning.html b/app/views/record-vaccinations/mmr/interval-warning.html index 0089685b..ab5837e8 100644 --- a/app/views/record-vaccinations/mmr/interval-warning.html +++ b/app/views/record-vaccinations/mmr/interval-warning.html @@ -12,23 +12,32 @@
-

Jodie Brown had an MMR vaccination less than 1 month ago

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} had an MMR vaccination less than 1 month ago

+ +
+

+ {{ displayName }} had an MMR vaccination on 10 July 2025. +

+ +

+ The minimum recommended gap between MMR doses is 1 month. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
-

- Jodie Brown had an MMR vaccination on 10 July 2025. -

- -

- The minimum recommended gap between MMR doses is 1 month. -

-
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/mmr/too-old-warning.html b/app/views/record-vaccinations/mmr/too-old-warning.html index 9a8119eb..68781378 100644 --- a/app/views/record-vaccinations/mmr/too-old-warning.html +++ b/app/views/record-vaccinations/mmr/too-old-warning.html @@ -12,27 +12,36 @@
-

Jodie Brown is too old for the London MMR service

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} is too old for the London MMR service

+ +
+

+ {{ displayName }} is 20 years old. +

+ +

+ To be eligible for this service, you have to be under the age of 20. Refer this patient to their GP for a vaccination. +

+ +

+ Your organisation may not be paid for this vaccination. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
-

- Jodie Brown is 20 years old. -

- -

- To be eligible for this service, you have to be under the age of 20. Refer this patient to their GP for a vaccination. -

- -

- Your organisation may not be paid for this vaccination. -

-
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/ppv/already-had-it-warning.html b/app/views/record-vaccinations/ppv/already-had-it-warning.html index da32cbe2..da3f81ee 100644 --- a/app/views/record-vaccinations/ppv/already-had-it-warning.html +++ b/app/views/record-vaccinations/ppv/already-had-it-warning.html @@ -12,22 +12,32 @@
-

Jodie Brown has already had a pneumococcal vaccine

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} has already had a pneumococcal vaccine

+ +
+

+ {{ displayName }} had a pneumococcal vaccine on 15 September 2024. +

+ +

+ Most adults only need 1 dose of the pneumococcal vaccine. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
-

- Jodie Brown had a pneumococcal vaccine on 15 September 2024. -

- -

- Most adults only need 1 dose of the pneumococcal vaccine.

-
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/ppv/too-young-warning.html b/app/views/record-vaccinations/ppv/too-young-warning.html index 50a0bdbd..deca10a7 100644 --- a/app/views/record-vaccinations/ppv/too-young-warning.html +++ b/app/views/record-vaccinations/ppv/too-young-warning.html @@ -12,28 +12,42 @@
-

Jodie Brown is too young for the London pneumococcal service -

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} is too young for the London pneumococcal service

+ +
+ {% set randomAge = (range(1, 17) | random) %} +

+ {{ displayName }} is + {% if data.age is defined and data.age is not none %} + {{ data.age }} years old. + {% else %} + {{ randomAge }} years old. + {% endif %} +

+ +

+ To be eligible for this service, you have to be aged 18 or older. +

+ +

+ Your organisation may not be paid for this vaccination. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
-

- Jodie Brown is 17 years old. -

- -

- To be eligible for this service, you have to be aged 18 or older. -

- -

- Your organisation may not be paid for this vaccination. -

-
- - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} From 5f7c4e9070005aebcbc9d3da8b0b0f2c31faa6d2 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Wed, 27 May 2026 17:04:16 +0100 Subject: [PATCH 03/18] last ones updated --- app/views/index.html | 2 +- .../flu/too-young-warning.html | 28 +++++++---- .../mmr/too-young-warning.html | 46 +++++++++++-------- 3 files changed, 48 insertions(+), 28 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index b0b46014..19cfd787 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -97,7 +97,7 @@

COVID-19

Flu

RSV

diff --git a/app/views/record-vaccinations/flu/too-young-warning.html b/app/views/record-vaccinations/flu/too-young-warning.html index dbd135d3..46430f03 100644 --- a/app/views/record-vaccinations/flu/too-young-warning.html +++ b/app/views/record-vaccinations/flu/too-young-warning.html @@ -13,18 +13,28 @@
-

{{ data.firstName }} {{ data.lastName }} may be too young for this vaccine product

- -

[Product name] is not usually recommended for people under the age of 65. {{ data.firstName }} {{ data.lastName }} is 64 years old.

-

Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} may be too young for this vaccine product

+ +
+

[Product name] is not usually recommended for people under the age of 65. {{ displayName }} is 64 years old.

+

Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
- {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} diff --git a/app/views/record-vaccinations/mmr/too-young-warning.html b/app/views/record-vaccinations/mmr/too-young-warning.html index a34207a7..3c7c630a 100644 --- a/app/views/record-vaccinations/mmr/too-young-warning.html +++ b/app/views/record-vaccinations/mmr/too-young-warning.html @@ -12,27 +12,37 @@
-

Jodie Brown is too young for the London MMR service

- -

- Jodie Brown is 4 years old. -

- -

- To be eligible for this service, you have to be aged 5 years or over. Refer this patient to their GP for a vaccination. -

- -

- Your organisation may not be paid for this vaccination. -

+
+ {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} +

{{ displayName }} is too young for the London MMR service

+ +
+

+ {{ displayName }} is 4 years old. +

+ +

+ To be eligible for this service, you have to be aged 5 years or over. Refer this patient to their GP for a vaccination. +

+ +

+ Your organisation may not be paid for this vaccination. +

+ + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} +
+
- {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent" - }) }} - {% endblock %} From a947c6e16ef97282acc69d5f2f0689047ab834da Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:16:05 +0100 Subject: [PATCH 04/18] Update app/views/index.html Co-authored-by: Anna-Sutton --- 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 19cfd787..9ed8cf02 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -124,7 +124,7 @@

MMR

From a749529db065c9b49cf17b1a54e0ebc60a4ed002 Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:16:18 +0100 Subject: [PATCH 05/18] Update app/views/index.html Co-authored-by: Anna-Sutton --- 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 9ed8cf02..3e8e486a 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -125,7 +125,7 @@

MMR

  • Had an MMR vaccine less than 1 month ago
  • Already had 2 doses
  • Too young for the London MMR service
    • -
  • Too old
    • +
  • Too old for the London MMR service
    • From 76420831decfcce939d0a3134465a0c329456276 Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:17:48 +0100 Subject: [PATCH 06/18] Update app/views/record-vaccinations/mmr/already-had-2-doses-warning.html Co-authored-by: Anna-Sutton --- .../record-vaccinations/mmr/already-had-2-doses-warning.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html b/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html index 02d0df30..3ee1fc15 100644 --- a/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html +++ b/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html @@ -22,7 +22,7 @@

    {{ displayName }} has already had 2 MMR vaccinati

    - {{ displayName }} had a second MMR vaccination on 10 July 2025. + {{ displayName }} had a 2nd MMR vaccination on 10 July 2025.

    From ffc57a92e471825590d6dc45bcd7c3a89fe1791a Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:18:01 +0100 Subject: [PATCH 07/18] Update app/views/record-vaccinations/mmr/interval-warning.html Co-authored-by: Anna-Sutton --- app/views/record-vaccinations/mmr/interval-warning.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/mmr/interval-warning.html b/app/views/record-vaccinations/mmr/interval-warning.html index ab5837e8..ae42c2a8 100644 --- a/app/views/record-vaccinations/mmr/interval-warning.html +++ b/app/views/record-vaccinations/mmr/interval-warning.html @@ -18,7 +18,7 @@ {% else %} {% set displayName = 'Patient Name' %} {% endif %} -

    {{ displayName }} had an MMR vaccination less than 1 month ago

    +

    {{ displayName }} had an MMR vaccination less than 4 weeks ago

    From 7b5108eedf9d0e5b4dbf6b5f33803f6c73a48c68 Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:18:11 +0100 Subject: [PATCH 08/18] Update app/views/index.html Co-authored-by: Anna-Sutton --- 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 3e8e486a..a95757c7 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -116,7 +116,7 @@

    Pneumococcal

    MMR

    From 90bf66e810c25614744087858d4cb1df250685f9 Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:18:29 +0100 Subject: [PATCH 09/18] Update app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html Co-authored-by: Anna-Sutton --- .../rsv/not-yet-28-weeks-pregnant-warning.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html b/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html index 735ac67f..072d294b 100644 --- a/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html +++ b/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html @@ -34,7 +34,7 @@

    {{ displayName }} is not yet 28 weeks pregnant 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant.

    -

    The {{ data.vaccine }} vaccine is not routinely recommended before 28 weeks of pregnancy.

    +

    The RSV vaccine is not routinely recommended before 28 weeks of pregnancy.

    UKHSA guidance on RSV vaccination of pregnant women (opens in new tab).

    From 88ee2a3190cdbae102820152af897e42ac8835b7 Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:18:59 +0100 Subject: [PATCH 10/18] Update app/views/index.html Co-authored-by: Anna-Sutton --- 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 a95757c7..bc5e1c00 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -112,7 +112,7 @@

    Pertussis

  • Not yet 16 weeks pregnant
    • -

    Pneumococcal

    +

    Pneumococcal London service

    • Already had vaccine
      • From fff480d5dcdb0849857d4eb4673f015c313128b6 Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:19:14 +0100 Subject: [PATCH 11/18] Update app/views/index.html Co-authored-by: Anna-Sutton --- 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 bc5e1c00..c2ef3871 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -119,7 +119,7 @@

      Pneumococcal London service

    • Too young for the London pneumococcal service
    -

    MMR

    +

    MMR London service

    • Had an MMR vaccine less than 1 month ago
      • From 5e9ee8ab63ce28e859c9b02c863b196a7e446f2e Mon Sep 17 00:00:00 2001 From: caitlinroach-nhs Date: Thu, 28 May 2026 16:19:46 +0100 Subject: [PATCH 12/18] Update app/views/index.html Co-authored-by: Anna-Sutton --- 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 c2ef3871..0dc7ce61 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -122,7 +122,7 @@

      Pneumococcal London service

      MMR London service

        -
      • Had an MMR vaccine less than 1 month ago
        • +
      • Had an MMR vaccine less than 4 weeks ago
      • Already had 2 doses
      • Too young for the London MMR service
      • Too old for the London MMR service
        • From a5b34f9461bc35f239691e3458c253a717590889 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Thu, 28 May 2026 16:27:18 +0100 Subject: [PATCH 13/18] remove code that isn't needed in this branch --- app/views/record-vaccinations/dose.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/app/views/record-vaccinations/dose.html b/app/views/record-vaccinations/dose.html index 668ef439..25f5bd54 100644 --- a/app/views/record-vaccinations/dose.html +++ b/app/views/record-vaccinations/dose.html @@ -1,11 +1,6 @@ {% extends 'layout.html' %} {% set vaccineDisplayName = data.vaccine %} -{% if data.vaccine == "Flu" %} - {% set vaccineDisplayName = "flu" %} -{% elif data.vaccine == "Flu (London service)" %} - {% set vaccineDisplayName = "flu (London service)" %} -{% endif %} {% set pageName = "Which dose of the " + vaccineDisplayName + " are you giving?" %} From 5d362b76bd96b589d538398120ccaa22d9cc8d4b Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Thu, 28 May 2026 16:27:45 +0100 Subject: [PATCH 14/18] remove unneeded code --- app/views/record-vaccinations/dose.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/dose.html b/app/views/record-vaccinations/dose.html index 25f5bd54..24611e3d 100644 --- a/app/views/record-vaccinations/dose.html +++ b/app/views/record-vaccinations/dose.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set vaccineDisplayName = data.vaccine %} + {% set pageName = "Which dose of the " + vaccineDisplayName + " are you giving?" %} From 37fe5af4036e25caf893a14167babe8065fed36a Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Wed, 3 Jun 2026 11:25:37 +0100 Subject: [PATCH 15/18] Update to interval-warning.html Removed 'For most people' from this line: For most people, the minimum recommended gap between COVID-19 vaccine doses is 3 months. --- app/views/record-vaccinations/covid-19/interval-warning.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/covid-19/interval-warning.html b/app/views/record-vaccinations/covid-19/interval-warning.html index d05e7236..40cb443e 100644 --- a/app/views/record-vaccinations/covid-19/interval-warning.html +++ b/app/views/record-vaccinations/covid-19/interval-warning.html @@ -27,7 +27,7 @@

        {{ displayName }} had a COVID-19 vaccine less tha

        - For most people, the minimum recommended gap between COVID-19 vaccine doses is 3 months. + The minimum recommended gap between COVID-19 vaccine doses is 3 months.

        {{ button({ From b45142a979b516119c61fed93541639ec8db332e Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Wed, 3 Jun 2026 12:04:19 +0100 Subject: [PATCH 16/18] Updated to use nunjucks for interruption pages and added copilot instructions to prefer nunjucks --- .github/copilot-instructions.md | 1 + app/views/pharmacies/index.html | 88 +++++++++++++++++++ .../covid-19/interval-warning.html | 52 +++++------ .../covid-19/too-young-warning.html | 41 +++++---- .../flu/too-young-warning.html | 41 +++++---- .../mmr/already-had-2-doses-warning.html | 51 ++++++----- .../mmr/interval-warning.html | 51 ++++++----- .../mmr/too-old-warning.html | 59 +++++++------ .../mmr/too-young-warning.html | 59 +++++++------ .../not-yet-16-weeks-pregnant-warning.html | 63 ++++++------- .../ppv/already-had-it-warning.html | 51 ++++++----- .../ppv/too-young-warning.html | 71 ++++++++------- .../not-yet-28-weeks-pregnant-warning.html | 67 +++++++------- 13 files changed, 407 insertions(+), 288 deletions(-) create mode 100644 .github/copilot-instructions.md create mode 100644 app/views/pharmacies/index.html diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 00000000..4cb7ad9e --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1 @@ +When using components from the NHS.UK Frontend library, prefer the Nunjucks version over HTML. \ No newline at end of file diff --git a/app/views/pharmacies/index.html b/app/views/pharmacies/index.html new file mode 100644 index 00000000..de7d72cf --- /dev/null +++ b/app/views/pharmacies/index.html @@ -0,0 +1,88 @@ +{% extends 'layout.html' %} + +{% set currentSection = "pharmacies" %} + +{% block content %} +
        +
        + + {% if added %} + {% set html %} +

        + {{ added | int | plural('pharmacy') }} added +

        +

        You can now add users to these pharmacies.

        + {% endset %} + + {{ notificationBanner({ + html: html, + type: "success" + }) }} + {% endif %} + +

        Pharmacies

        + +

        Add pharmacies or manage users at an existing pharmacy.

        + + {{ button({ + text: "Add pharmacies", + href: "/pharmacies/select" + }) }} + + + +
        Pharmacies added ({{ organisations | length }})
        + {% if (organisations | length) > 10 %} +
        + + +
        + {% endif %} + + + + + + + + + + + {% for organisation in organisations %} + + + + + + + {% endfor %} + + +
        + Name + + Vaccines + + Users + + Actions +
        + {{ organisation.name }} ({{ organisation.id}}) + + {% set vaccinesEnabled = [] %} + {% for vaccine in organisation.vaccines %} + {% if vaccine.status == "enabled" %} + {% set vaccinesEnabled = (vaccinesEnabled.push(vaccine.name | vaccineDisplayName), vaccinesEnabled) %} + {% endif %} + {% endfor %} + + {{ vaccinesEnabled | sort | join(", ") }} + + {{ organisationUserCounts[organisation.id] }} + + Manage +
        +
        +
        + +{% endblock %} diff --git a/app/views/record-vaccinations/covid-19/interval-warning.html b/app/views/record-vaccinations/covid-19/interval-warning.html index d05e7236..00aea726 100644 --- a/app/views/record-vaccinations/covid-19/interval-warning.html +++ b/app/views/record-vaccinations/covid-19/interval-warning.html @@ -12,31 +12,33 @@
        -
        - - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

        {{ displayName }} had a COVID-19 vaccine less than 3 months ago

        - -
        -

        - They had a COVID-19 vaccine on 15 April 2025. -

        - -

        - For most people, the minimum recommended gap between COVID-19 vaccine doses is 3 months. -

        - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
        -
        + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

        + They had a COVID-19 vaccine on 15 April 2025. +

        + +

        + For most people, the minimum recommended gap between COVID-19 vaccine doses is 3 months. +

        + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " had a COVID-19 vaccine less than 3 months ago", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
        diff --git a/app/views/record-vaccinations/covid-19/too-young-warning.html b/app/views/record-vaccinations/covid-19/too-young-warning.html index 30ed21e0..994b0851 100644 --- a/app/views/record-vaccinations/covid-19/too-young-warning.html +++ b/app/views/record-vaccinations/covid-19/too-young-warning.html @@ -14,25 +14,28 @@
        -
        - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

        {{ displayName }} may be too young for this vaccine product

        - -
        -

        Adjuvanted Quadrivalent Influenza Vaccine (aQIV) is not usually recommended for people under the age of 65. {{ displayName }} is 64 years old.

        -

        Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

        - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
        -
        + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

        Adjuvanted Quadrivalent Influenza Vaccine (aQIV) is not usually recommended for people under the age of 65. {{ displayName }} is 64 years old.

        +

        Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

        + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " may be too young for this vaccine product", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}

    diff --git a/app/views/record-vaccinations/flu/too-young-warning.html b/app/views/record-vaccinations/flu/too-young-warning.html index 46430f03..37ff62fa 100644 --- a/app/views/record-vaccinations/flu/too-young-warning.html +++ b/app/views/record-vaccinations/flu/too-young-warning.html @@ -13,25 +13,28 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} may be too young for this vaccine product

    - -
    -

    [Product name] is not usually recommended for people under the age of 65. {{ displayName }} is 64 years old.

    -

    Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

    [Product name] is not usually recommended for people under the age of 65. {{ displayName }} is 64 years old.

    +

    Check before going ahead or refer to a prescriber for a patient specific direction (PSD).

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " may be too young for this vaccine product", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html b/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html index 3ee1fc15..b9e0436f 100644 --- a/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html +++ b/app/views/record-vaccinations/mmr/already-had-2-doses-warning.html @@ -12,30 +12,33 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} has already had 2 MMR vaccinations

    - -
    -

    - {{ displayName }} had a 2nd MMR vaccination on 10 July 2025. -

    - -

    - Most people only need 2 doses of the MMR vaccine. -

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

    + {{ displayName }} had a 2nd MMR vaccination on 10 July 2025. +

    + +

    + Most people only need 2 doses of the MMR vaccine. +

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " has already had 2 MMR vaccinations", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/mmr/interval-warning.html b/app/views/record-vaccinations/mmr/interval-warning.html index ae42c2a8..1c6003c6 100644 --- a/app/views/record-vaccinations/mmr/interval-warning.html +++ b/app/views/record-vaccinations/mmr/interval-warning.html @@ -12,30 +12,33 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} had an MMR vaccination less than 4 weeks ago

    - -
    -

    - {{ displayName }} had an MMR vaccination on 10 July 2025. -

    - -

    - The minimum recommended gap between MMR doses is 1 month. -

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

    + {{ displayName }} had an MMR vaccination on 10 July 2025. +

    + +

    + The minimum recommended gap between MMR doses is 1 month. +

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " had an MMR vaccination less than 4 weeks ago", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/mmr/too-old-warning.html b/app/views/record-vaccinations/mmr/too-old-warning.html index 68781378..e84a25c0 100644 --- a/app/views/record-vaccinations/mmr/too-old-warning.html +++ b/app/views/record-vaccinations/mmr/too-old-warning.html @@ -12,34 +12,37 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} is too old for the London MMR service

    - -
    -

    - {{ displayName }} is 20 years old. -

    - -

    - To be eligible for this service, you have to be under the age of 20. Refer this patient to their GP for a vaccination. -

    - -

    - Your organisation may not be paid for this vaccination. -

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

    + {{ displayName }} is 20 years old. +

    + +

    + To be eligible for this service, you have to be under the age of 20. Refer this patient to their GP for a vaccination. +

    + +

    + 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 too old for the London MMR service", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/mmr/too-young-warning.html b/app/views/record-vaccinations/mmr/too-young-warning.html index 3c7c630a..cdaf84bb 100644 --- a/app/views/record-vaccinations/mmr/too-young-warning.html +++ b/app/views/record-vaccinations/mmr/too-young-warning.html @@ -12,34 +12,37 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} is too young for the London MMR service

    - -
    -

    - {{ displayName }} is 4 years old. -

    - -

    - To be eligible for this service, you have to be aged 5 years or over. Refer this patient to their GP for a vaccination. -

    - -

    - Your organisation may not be paid for this vaccination. -

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

    + {{ displayName }} is 4 years old. +

    + +

    + To be eligible for this service, you have to be aged 5 years or over. Refer this patient to their GP for a vaccination. +

    + +

    + 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 too young for the London MMR service", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html b/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html index 5c7105d1..a2f1968d 100644 --- a/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html +++ b/app/views/record-vaccinations/pertussis/not-yet-16-weeks-pregnant-warning.html @@ -12,36 +12,39 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} is not yet 16 weeks pregnant

    - -
    - {% set randomWeeks = (range(1, 15) | random) %} -

    - {{ displayName }} is - {% if fullWeeksPregnant is defined and fullWeeksPregnant is not none %} - {{ fullWeeksPregnant | plural("week") }} - {% else %} - {{ randomWeeks }} week{{ 's' if randomWeeks > 1 }} - {% endif %} - {% if remainderDaysPregnant is defined and remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. -

    -

    The pertussis vaccine is recommended between 16 and 32 weeks of pregnancy.

    - -

    UKHSA guidance on pertussis vaccination of pregnant women (opens in new tab).

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} + {% set randomWeeks = (range(1, 15) | random) %} +

    + {{ displayName }} is + {% if fullWeeksPregnant is defined and fullWeeksPregnant is not none %} + {{ fullWeeksPregnant | plural("week") }} + {% else %} + {{ randomWeeks }} week{{ 's' if randomWeeks > 1 }} + {% endif %} + {% if remainderDaysPregnant is defined and remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. +

    +

    The pertussis vaccine is recommended between 16 and 32 weeks of pregnancy.

    + +

    UKHSA guidance on pertussis vaccination of pregnant women (opens in new tab).

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " is not yet 16 weeks pregnant", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/ppv/already-had-it-warning.html b/app/views/record-vaccinations/ppv/already-had-it-warning.html index da3f81ee..16162858 100644 --- a/app/views/record-vaccinations/ppv/already-had-it-warning.html +++ b/app/views/record-vaccinations/ppv/already-had-it-warning.html @@ -12,30 +12,33 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} has already had a pneumococcal vaccine

    - -
    -

    - {{ displayName }} had a pneumococcal vaccine on 15 September 2024. -

    - -

    - Most adults only need 1 dose of the pneumococcal vaccine. -

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} +

    + {{ displayName }} had a pneumococcal vaccine on 15 September 2024. +

    + +

    + Most adults only need 1 dose of the pneumococcal vaccine. +

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " has already had a pneumococcal vaccine", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/ppv/too-young-warning.html b/app/views/record-vaccinations/ppv/too-young-warning.html index deca10a7..5dd684a6 100644 --- a/app/views/record-vaccinations/ppv/too-young-warning.html +++ b/app/views/record-vaccinations/ppv/too-young-warning.html @@ -12,40 +12,43 @@
    -
    - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} is too young for the London pneumococcal service

    - -
    - {% set randomAge = (range(1, 17) | random) %} -

    - {{ displayName }} is - {% if data.age is defined and data.age is not none %} - {{ data.age }} years old. - {% else %} - {{ randomAge }} years old. - {% endif %} -

    - -

    - To be eligible for this service, you have to be aged 18 or older. -

    - -

    - Your organisation may not be paid for this vaccination. -

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} + {% set randomAge = (range(1, 17) | random) %} +

    + {{ displayName }} is + {% if data.age is defined and data.age is not none %} + {{ data.age }} years old. + {% else %} + {{ randomAge }} years old. + {% endif %} +

    + +

    + To be eligible for this service, you have to be aged 18 or older. +

    + +

    + 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 too young for the London pneumococcal service", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    diff --git a/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html b/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html index 072d294b..ddd77b5b 100644 --- a/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html +++ b/app/views/record-vaccinations/rsv/not-yet-28-weeks-pregnant-warning.html @@ -12,39 +12,40 @@
    -
    - - {% if data.firstName and data.lastName %} - {% set displayName = data.firstName ~ ' ' ~ data.lastName %} - {% else %} - {% set displayName = 'Patient Name' %} - {% endif %} -

    {{ displayName }} is not yet 28 weeks pregnant

    - -
    - - {% set randomWeeks = (range(1, 27) | random) %} -

    - {{ displayName }} is - {% if fullWeeksPregnant is defined and fullWeeksPregnant is not none %} - {{ fullWeeksPregnant | plural("week") }} - {% else %} - {{ randomWeeks }} week{{ 's' if randomWeeks > 1 }} - {% endif %} - {% if remainderDaysPregnant is defined and remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. -

    - -

    The RSV vaccine is not routinely recommended before 28 weeks of pregnancy.

    - -

    UKHSA guidance on RSV vaccination of pregnant women (opens in new tab).

    - - {{ button({ - "text": "Continue anyway", - "href": "/record-vaccinations/consent", - "classes": "nhsuk-button--reverse" - }) }} -
    -
    + {% if data.firstName and data.lastName %} + {% set displayName = data.firstName ~ ' ' ~ data.lastName %} + {% else %} + {% set displayName = 'Patient Name' %} + {% endif %} + + {% set panelHtml %} + {% set randomWeeks = (range(1, 27) | random) %} +

    + {{ displayName }} is + {% if fullWeeksPregnant is defined and fullWeeksPregnant is not none %} + {{ fullWeeksPregnant | plural("week") }} + {% else %} + {{ randomWeeks }} week{{ 's' if randomWeeks > 1 }} + {% endif %} + {% if remainderDaysPregnant is defined and remainderDaysPregnant > 0 %} and {{ remainderDaysPregnant | plural("day") }}{% endif %} pregnant. +

    + +

    The RSV vaccine is not routinely recommended before 28 weeks of pregnancy.

    + +

    UKHSA guidance on RSV vaccination of pregnant women (opens in new tab).

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " is not yet 28 weeks pregnant", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }}
    From 33485f926d7ec5707b9be16a689a6fbbbfbfbc54 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Wed, 3 Jun 2026 12:15:53 +0100 Subject: [PATCH 17/18] Added MenB interval warning --- app/views/index.html | 6 +++ .../menb/interval-warning.html | 46 +++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 app/views/record-vaccinations/menb/interval-warning.html diff --git a/app/views/index.html b/app/views/index.html index 0dc7ce61..e3d77afb 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -128,6 +128,12 @@

    MMR London service

  • Too old for the London MMR service
    • +

    MenB

    + + +
    {% endblock %} diff --git a/app/views/record-vaccinations/menb/interval-warning.html b/app/views/record-vaccinations/menb/interval-warning.html new file mode 100644 index 00000000..44255795 --- /dev/null +++ b/app/views/record-vaccinations/menb/interval-warning.html @@ -0,0 +1,46 @@ +{% extends 'layout.html' %} + +{% set pageName = "MenB vaccine interval warning" %} + +{% 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 %} +

    + They had a MenB vaccine on 15 April 2025. +

    + +

    + The minimum recommended gap between MenB vaccine doses is 4 weeks. +

    + + {{ button({ + "text": "Continue anyway", + "href": "/record-vaccinations/consent", + "classes": "nhsuk-button--reverse" + }) }} + {% endset %} + + {{ panel({ + titleText: displayName + " had a MenB vaccine less than 3 months ago", + html: panelHtml, + classes: "nhsuk-panel--interruption" + }) }} + +
    +
    +{% endblock %} + From 2493e0adea5833a03ccf174ffd54994941980d4f Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Wed, 3 Jun 2026 12:19:23 +0100 Subject: [PATCH 18/18] fix to pass style checks --- .github/copilot-instructions.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md index 4cb7ad9e..fc6ae43d 100644 --- a/.github/copilot-instructions.md +++ b/.github/copilot-instructions.md @@ -1 +1 @@ -When using components from the NHS.UK Frontend library, prefer the Nunjucks version over HTML. \ No newline at end of file +When using components from the NHS.UK Frontend library, prefer the Nunjucks version over HTML.