From f68f1563c0ec90a0352f125f97f5bf143c7f7135 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Tue, 11 Aug 2026 16:42:25 +0100 Subject: [PATCH 1/8] Fix orphaned/missing label issue --- app/views/record-vaccinations/location.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/location.html b/app/views/record-vaccinations/location.html index 8f3aa8fa..aa5cf5ad 100644 --- a/app/views/record-vaccinations/location.html +++ b/app/views/record-vaccinations/location.html @@ -39,7 +39,7 @@
Search by name or ODS code
- @@ -71,7 +71,7 @@ } }, hint: { - text: "This is needed for payment and reporting. You can use the note section later to record more details about the location, if you need." + text: "This is needed for payment and reporting." }, errorMessage: { text: (errorList | first).text @@ -80,10 +80,7 @@ items: [ { text: "On site", - value: "On site", - hint: { - text: "Includes: hospital hubs, vaccination centres, Primary Care Networks (PCNs), pharmacies, GP surgeries and detained settings" - } + value: "On site" }, { value: "Care home", @@ -117,4 +114,3 @@ {% endblock %} - From d7b5923802a00a8165ed963ba6603dc7b26158c5 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Tue, 25 Aug 2026 17:02:45 +0100 Subject: [PATCH 6/8] Update location.html --- app/views/record-vaccinations/location.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/location.html b/app/views/record-vaccinations/location.html index 04029eb2..dd34b5fd 100644 --- a/app/views/record-vaccinations/location.html +++ b/app/views/record-vaccinations/location.html @@ -113,4 +113,4 @@ -{% endblock %} +{% endblock %} \ No newline at end of file From 6951905c3c3a3ba3206d4a2cf3ddb2e6061dc661 Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Wed, 26 Aug 2026 11:21:44 +0100 Subject: [PATCH 7/8] Update location.html --- app/views/record-vaccinations/location.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/record-vaccinations/location.html b/app/views/record-vaccinations/location.html index dd34b5fd..04029eb2 100644 --- a/app/views/record-vaccinations/location.html +++ b/app/views/record-vaccinations/location.html @@ -113,4 +113,4 @@ -{% endblock %} \ No newline at end of file +{% endblock %} From b52507ee372d37172769834c9c957fd6ea1d1c7c Mon Sep 17 00:00:00 2001 From: Benjy Stanton <2545065+benjystanton@users.noreply.github.com> Date: Wed, 26 Aug 2026 11:21:55 +0100 Subject: [PATCH 8/8] Adding location help options --- app/views/record-vaccinations/location-a.html | 121 +++++++++++++++ app/views/record-vaccinations/location-b.html | 139 ++++++++++++++++++ 2 files changed, 260 insertions(+) create mode 100644 app/views/record-vaccinations/location-a.html create mode 100644 app/views/record-vaccinations/location-b.html diff --git a/app/views/record-vaccinations/location-a.html b/app/views/record-vaccinations/location-a.html new file mode 100644 index 00000000..a45aeefa --- /dev/null +++ b/app/views/record-vaccinations/location-a.html @@ -0,0 +1,121 @@ +{% extends 'layout.html' %} + +{% set pageName = "Where is the vaccination taking place?" %} + +{% set currentSection = "vaccinate" %} + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/eligibility" }) }} +{% endblock %} + +{% block content %} +
+
+ + {% set errorList = [] %} + {% for error in errors %} + {% if error.code == "required" %} + {% set errorList = (errorList.push({ + text: "Select where the vaccination is taking place", + href: error.href + }), errorList) %} + {% endif %} + {% endfor %} + + {% if (errorList | length) > 0 %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} + +
+ {% set careHtml %} + +
+ +
+ Search by name or ODS code +
+ +
+ {% endset -%} + + + {{ radios({ + idPrefix: "location-type", + name: "locationType", + fieldset: { + legend: { + text: ("Where is the vaccination taking place?" if data.vaccinationToday == 'yes' else "Where did the vaccination take place?"), + size: "l", + isPageHeading: true + } + }, + hint: { + text: "This is needed for payment and reporting." + }, + errorMessage: { + text: (errorList | first).text + } if (errorList | length) > 0, + value: data.locationType, + items: [ + { + text: "On site", + value: "On site", + hint: { + text: "Includes: hospital hubs, vaccination centres, Primary Care Networks (PCNs), pharmacies, GP surgeries and detained settings" + } + }, + { + value: "Care home", + text: "Care home", + conditional: { + html: careHtml + } + }, + { + text: "Housebound patient’s home", + value: "Housebound patient’s home" + }, + { + text: "Outreach event", + value: "Outreach event" + } + ] + + }) }} + + + {{ button({ + text: "Continue" + })}} + + +
+ + +
+
+ +{% endblock %} + diff --git a/app/views/record-vaccinations/location-b.html b/app/views/record-vaccinations/location-b.html new file mode 100644 index 00000000..f4421378 --- /dev/null +++ b/app/views/record-vaccinations/location-b.html @@ -0,0 +1,139 @@ +{% extends 'layout.html' %} + +{% set pageName = "Where is the vaccination taking place?" %} + +{% set currentSection = "vaccinate" %} + +{% block beforeContent %} + {{ backLink({ href: "/record-vaccinations/eligibility" }) }} +{% endblock %} + +{% block content %} +
+
+ + {% from "details/macro.njk" import details %} + + {% set details %} + +
+ + + Help with location + + +
+

On site includes:

+
    +
  • hospital hubs
    • +
  • vaccination centres
    • +
  • Primary Care Networks (PCNs)
    • +
  • pharmacies
    • +
  • GP surgeries
    • +
  • detained settings
    • +
+
+
+ {% endset %} + + {% set errorList = [] %} + {% for error in errors %} + {% if error.code == "required" %} + {% set errorList = (errorList.push({text: "Select where the vaccination is taking place", href: error.href}), errorList) %} + {% endif %} + {% endfor %} + + {% if (errorList | length) > 0 %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} + +
+ {% set careHtml %} + +
+ +
+ Search by name or ODS code +
+ +
+ {% endset -%} + + {{ radios({ + idPrefix: "location-type", + name: "locationType", + formGroup: { + beforeInputs: { + html: details + } + }, + fieldset: { + legend: { + text: ("Where is the vaccination taking place?" if data.vaccinationToday == 'yes' else "Where did the vaccination take place?"), + size: "l", + isPageHeading: true + } + }, + hint: { + text: "This is needed for payment and reporting." + }, + errorMessage: { + text: (errorList | first).text + } if (errorList | length) > 0, + value: data.locationType, + items: [ + { + text: "On site", + value: "On site" + }, + { + value: "Care home", + text: "Care home", + conditional: { + html: careHtml + } + }, + { + text: "Housebound patient’s home", + value: "Housebound patient’s home" + }, + { + text: "Outreach event", + value: "Outreach event" + } + ] + + }) }} + + {{ button({ + text: "Continue" + })}} + +
+ +
+
+ +{% endblock %} \ No newline at end of file