diff --git a/app/routes.js b/app/routes.js index 3b51666c3..733498988 100644 --- a/app/routes.js +++ b/app/routes.js @@ -59,7 +59,6 @@ require('./routes/support')(router) require('./routes/auth')(router) require('./routes/home')(router) require('./routes/helpers')(router) -require('./routes/explorations')(router) router.get('/product-page', (req, res) => { // Sign out the user - this is just to make it easier diff --git a/app/routes/explorations.js b/app/routes/explorations.js deleted file mode 100644 index f362b24b7..000000000 --- a/app/routes/explorations.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = (router) => { - router.get('/explorations', (req, res) => { - const explorationLinks = [ - { - href: '/explorations/record-vaccinations-v2', - title: 'Record vaccinations v2', - description: 'Pilot area for trying alternative record vaccination journey ideas without affecting the current flow.' - } - ] - - res.render('explorations/index', { explorationLinks }) - }) - - router.get('/explorations/record-vaccinations-v2', (req, res) => { - res.render('explorations/record-vaccinations-v2') - }) -} diff --git a/app/routes/prototype-admin.js b/app/routes/prototype-admin.js index e074e81f7..2207be17b 100644 --- a/app/routes/prototype-admin.js +++ b/app/routes/prototype-admin.js @@ -657,18 +657,6 @@ module.exports = (router) => { res.redirect('/regions') }) - // ---------------------------------------------------------------- - // Preset: Support admin (Sally Green) - // ---------------------------------------------------------------- - - router.get('/prototype-setup/preset/support-admin', (req, res) => { - resetSession(req) - const data = req.session.data - data.currentUserId = '66435353634' - data.currentOrganisationId = null - res.redirect('/support/regions') - }) - // ---------------------------------------------------------------- // Preset: Limited-vaccine pharmacy (Jeremy Blue Holborn, FT81513) // ---------------------------------------------------------------- diff --git a/app/views/alerts/notification.html b/app/views/alerts/notification.html deleted file mode 100644 index f950669e1..000000000 --- a/app/views/alerts/notification.html +++ /dev/null @@ -1,139 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Vaccines" %} - -{% set currentSection = "vaccines" %} - -{% set sites = [] %} -{% for vaccine in (data.vaccines) %} - {% if not (sites | arrayOrStringIncludes(vaccine.siteCode)) %} - {% set sites = (sites.push(vaccine.siteCode), sites) %} - {% endif %} -{% endfor %} - -{% block content %} -
-
- - {% include "_notification.html" %} - -

{{ pageName }}

- -

Add and edit your vaccines for your organisation.

- - {{ button({ - "text": "Add vaccine", - "href": "/vaccines/choose-site" - }) }} - -
-
- - {% from 'select/macro.njk' import select %} - - - {% if (sites | length) > 4 %} - {% set filterItems = [{ - text: "All sites", - value: "", - selected: true - }] %} - - {% for site in sites %} - {% set filterItems = (filterItems.push({text: data.sites[site].name, value: site}), filterItems) %} - {% endfor %} - - - {{ select({ - label: { - text: "Show" - }, - id: "select-1", - name: "select-1", - items: filterItems, - classes: "nhsuk-u-margin-bottom-3" - }) }} - {% endif %} - - -
-
- - {% for site in sites %} - - - - - - - - - - - - - - {% set vaccinesAtSite = [] %} - {% for vaccine in (data.vaccines) %} - {% if vaccine.siteCode == site and not (vaccinesAtSite | arrayOrStringIncludes(vaccine.vaccine)) %} - {% set vaccinesAtSite = (vaccinesAtSite.push(vaccine.vaccine), vaccinesAtSite) %} - {% endif %} - {% endfor %} - - {% for vaccineAtSite in vaccinesAtSite %} - - {% set vaccineProductsAtSite = [] %} - {% for vaccine in (data.vaccines) %} - {% if vaccine.vaccine == vaccineAtSite and vaccine.siteCode == site and not (vaccineProductsAtSite | arrayOrStringIncludes(vaccine.vaccineProduct)) %} - {% set vaccineProductsAtSite = (vaccineProductsAtSite.push(vaccine.vaccineProduct), vaccineProductsAtSite) %} - {% endif %} - {% endfor %} - - - - {% for vaccineProduct in vaccineProductsAtSite %} - - - - - - - - {% endfor %} - {% endfor %} - -
{{ data.sites[site].name }}
- Vaccine - - Product - - Active batches - - - -
- {{ (vaccineAtSite ) | capitaliseFirstLetter }} - - {{ vaccineProduct }} - - {% set count = 0 %} - {% set thisVaccine = {} %} - {% for vaccine in data.vaccines %} - {% if (vaccine.siteCode == site) and (vaccine.vaccine == vaccineAtSite) and (vaccine.vaccineProduct == vaccineProduct) %} - {% set thisVaccine = vaccine %} - {% endif %} - {% endfor %} - {{ thisVaccine.batches | length }} - - - - -
- {% endfor %} - - -
-
- -{% endblock %} - diff --git a/app/views/explorations/index.html b/app/views/explorations/index.html deleted file mode 100644 index f55b6ac56..000000000 --- a/app/views/explorations/index.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = 'Feature explorations' %} - -{% block beforeContent %} - {{ backLink({ - text: 'Back', - href: '/' - }) }} -{% endblock %} - -{% block content %} -
-
-

Feature explorations

- -

Use this area to house experimental journeys and alternative versions without changing the current prototype flows.

- - -
-
-{% endblock %} diff --git a/app/views/explorations/record-vaccinations-v2.html b/app/views/explorations/record-vaccinations-v2.html deleted file mode 100644 index d196917d4..000000000 --- a/app/views/explorations/record-vaccinations-v2.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = 'Record vaccinations v2' %} - -{% block beforeContent %} - {{ backLink({ - text: 'Back', - href: '/explorations' - }) }} -{% endblock %} - -{% block content %} -
-
-

Record vaccinations v2

- -

This is a safe exploration area for trying new journey ideas. It has its own route namespace and does not change the live prototype flow.

- - {{ insetText({ - text: 'Use this page as the starting point for alternative layouts, content, or step structures before deciding whether to merge anything into the main prototype.' - }) }} -
-
-{% endblock %} diff --git a/app/views/find-a-patient.html b/app/views/find-a-patient.html deleted file mode 100644 index 7844812e3..000000000 --- a/app/views/find-a-patient.html +++ /dev/null @@ -1,29 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Find a patient" %} -{% set currentSection = "find-a-patient" %} - - -{% block content %} -
-
- -

{{ pageName }}

- - {% set insetTextHtml %} -

This section will soon be replaced by Record vaccinations. From 1 December 2025, you must record all vaccinations in the new section. -

Find out more (opens in new tab)

- {% endset %} - - {{ insetText({ - html: insetTextHtml, - classes: "nhsuk-u-margin-top-0 nhsuk-u-padding-top-3 nhsuk-u-padding-bottom-3 app-inset-text--white" - })}} - - -

[Existing interface here]

-
-
- - -{% endblock %} diff --git a/app/views/includes/_preset-scenarios-table.html b/app/views/includes/_preset-scenarios-table.html index 50290130a..ddddd3705 100644 --- a/app/views/includes/_preset-scenarios-table.html +++ b/app/views/includes/_preset-scenarios-table.html @@ -72,12 +72,12 @@ scenarioDetails: "Group admin for a large pharmacy chain (same-name pharmacies)." }, { - presetLabel: "Group admin, pharmacy HQ (no data)", + presetLabel: "Group admin, pharmacy chain (no data)", presetPath: "/prototype-setup/preset/pharmacy-hq-no-data", userName: "Amanda White", userEmail: "amanda.white@nhs.net", role: "Group administrator", - scenarioDetails: "Group admin for a pharmacy HQ with no pre-loaded data, pharmacies or users." + scenarioDetails: "Group admin for a pharmacy chain with no pre-loaded data, pharmacies or users." }, { presetLabel: "Regional lead", @@ -87,14 +87,6 @@ role: "Regional lead", scenarioDetails: "Redirects to the regions interface." }, - { - presetLabel: "Support user", - presetPath: "/prototype-setup/preset/support-admin", - userName: "Sally Green", - userEmail: "sally.green@nhs.net", - role: "Support admin", - scenarioDetails: "System-wide support user with no default organisation. Redirects to support interface." - }, { presetLabel: "Lead admin, trust with all vaccines enabled", presetPath: "/prototype-setup/preset/all-vaccines-trust", diff --git a/app/views/index.html b/app/views/index.html index c7646d8c5..8a243c7f6 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -23,196 +23,754 @@ {% block content %} -
-
- -

- Prototype -

- -

Prototype setup

- -

Use a preset to quickly start with a specific scenario, or set up a custom configuration. Presets reset all session data before applying.

- - {% set presetsTableHtml %} - {% set enableEmailPrefill = false %} - {% include "includes/_preset-scenarios-table.html" %} - {% endset %} - - {% set customConfigHtml %} - - {% endset %} - - {% set presetsTabHtml %} -

Start with one of the predefined test setups.

- {{ presetsTableHtml | safe }} - {% endset %} - - {% set customTabHtml %} -

Build your own scenario with specific settings.

- {{ customConfigHtml | safe }} - {% endset %} - - {{ tabs({ - items: [ - { - label: "Preset scenarios", - id: "preset-scenarios", - panel: { - html: presetsTabHtml - } - }, - { - label: "Custom configuration", - id: "custom-configuration", - panel: { - html: customTabHtml - } - } - ] - }) }} - -

Feature explorations

- -

Use this area for alternative journeys and early explorations without changing the current prototype flows.

- - - -
- -

Signed-out interface

- -

Product page

- -

Email invite

- -

Main interface

- -

Quick access links below apply the Pharmacy lead admin preset first, so you can open these pages without manually signing in.

- - - -

Special circumstances

- - - -

GP scenarios

- - -

Regions interface

- - - -

Support interface

- - - -

Error pages

- - - -

Messaging

- - - - -

Warning messages

- -

COVID-19

- - - -

flu

- - - -

RSV

- - - -

Pertussis

- - - -

Pneumococcal London service

- - - -

MMR London service

- - - -

MenB

+
+
+ +

+ Prototype +

+ +

Prototype setup

+ +

Use a preset to quickly start with a specific scenario, or set up a custom configuration. Presets reset all + session data before applying.

+ + {% set presetsTableHtml %} + {% set enableEmailPrefill = false %} + {% include "includes/_preset-scenarios-table.html" %} + {% endset %} + + {% set customConfigHtml %} + + {% endset %} + + {% set presetsTabHtml %} +

Start with one of the predefined test setups.

+ {{ presetsTableHtml | safe }} + {% endset %} + + {% set customTabHtml %} +

Build your own scenario with specific settings.

+ {{ customConfigHtml | safe }} + {% endset %} + + {{ tabs({ + items: [ + { + label: "Preset scenarios", + id: "preset-scenarios", + panel: { + html: presetsTabHtml + } + }, + { + label: "Custom configuration", + id: "custom-configuration", + panel: { + html: customTabHtml + } + } + ] + }) }} + +
+ +

Signed-out interface

+ +
    +
  • + {{ card({ + heading: { + text: "Product page", + size: "m" + }, + description: "This is the page that users land on when navigate to RAVS while not signed in.", + href: "/product-page", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Email invite", + size: "m" + }, + description: "This is an example email template.", + href: "/email-invite", + clickable: true, + variant: "primary" + }) }} +
  • +
+ +
+ +

Main interface

+ +
+
+

Quick access links below apply the Pharmacy lead admin preset first, so you can open these pages without manually + signing in.

+
+
- +
    +
  • + {{ card({ + heading: { + text: "Record vaccinations", + size: "m" + }, + description: "This is the page that users land on when they navigate to RAVS to record vaccinations. When a user logs in, this is the page they are taken to.", + href: "/prototype-setup/quick-access/pharmacy?next=/record-vaccinations", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Dashboard", + size: "m" + }, + description: "This the dashboard page. It shows information about the vaccinations an organisation has given.", + href: "/prototype-setup/quick-access/pharmacy?next=/home", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Records", + size: "m" + }, + description: "This is the records page. It allows users to find individual records of past vaccinations.", + href: "/prototype-setup/quick-access/pharmacy?next=/records", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Reports", + size: "m" + }, + description: "This is the reports page. It allows users to generate and view reports of past vaccinations.", + href: "/prototype-setup/quick-access/pharmacy?next=/reports", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Vaccines", + size: "m" + }, + description: "This is the vaccines page. It allows users to view and manage vaccines.", + href: "/prototype-setup/quick-access/pharmacy?next=/vaccines", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Manage users", + size: "m" + }, + description: "This is the manage users page. It allows users to manage user accounts.", + href: "/prototype-setup/quick-access/pharmacy?next=/user-admin", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Profile page", + size: "m" + }, + description: "This is the profile page. It allows users to view and manage their profile.", + href: "/prototype-setup/quick-access/pharmacy?next=/user-profile", + clickable: true, + variant: "primary" + }) }} +
  • +
+ +
+ +

Special circumstances

+ +
    +
  • + {{ card({ + heading: { + text: "Deceased patient history", + size: "m" + }, + description: "This shows what users will see if they access a patient history for a patient who is recorded as deceased", + href: "/prototype-setup/quick-access/pharmacy?next=/record-vaccinations/patient-history-deceased", + clickable: true, + variant: "primary" + }) }} +
  • +
+ +
+ +

GP scenarios

+ +
    +
  • + {{ card({ + heading: { + text: "Record vaccinations (in PCN)", + size: "m" + }, + description: "Add a description", + href: "/prototype-setup/quick-access/gp?next=/record-vaccinations?gpit=inPCN", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Record vaccinations (not in PCN)", + size: "m" + }, + description: "Add a description", + href: "/prototype-setup/quick-access/gp?next=/record-vaccinations?gpit=notInPCN", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Record vaccinations (no GP surgery)", + size: "m" + }, + description: "Add a description", + href: "/prototype-setup/quick-access/gp?next=/record-vaccinations?gpit=noGP", + clickable: true, + variant: "primary" + }) }} +
  • +
  • + {{ card({ + heading: { + text: "Patient details - no NHS number and no GP surgery", + size: "m" + }, + description: "Add a description", + href: "/record-vaccinations/patient-history-none?gpit=noGP", + clickable: true, + variant: "primary" + }) }} +
  • +
+ +
+ +

Regions interface

+ +
    +
  • + {{ card({ + heading: { + text: "Regions interface", + size: "m" + }, + description: "This interface is used by regional administrators to manage vaccines, users and organisations.", + href: "/prototype-setup/quick-access/regions?next=/regions", + clickable: true, + variant: "primary" + }) }} +
  • +
+ +
+ +

Error pages

+ + {% set generalErrorsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Error message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Sorry, there is a problem with the service (500 error)" + }, + { + text: "Use this page for unexpected internal server errors." + } + ], + [ + { + html: "Sorry, the service is unavailable (503 error)" + }, + { + text: "Use this page when the service is temporarily unavailable." + } + ], + [ + { + html: "Rate limited (429 error)" + }, + { + text: "Use this page when too many requests are made in a short time." + } + ], + [ + { + html: "Problem saving the vaccination (Regional admin has removed vaccines mid-recording)" + }, + { + text: "Use this page when a vaccine becomes unavailable during the recording flow." + } + ] + ] + }) }} + {% endset %} + + {% set authErrorsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Error message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "You previously logged in a different way (Keycloak error)" + }, + { + text: "Use this page when a user signs in with a different identity provider than before." + } + ], + [ + { + html: "Sorry there is a problem with your account (user deactivated)" + }, + { + text: "Use this page when a signed-in user account has been deactivated." + } + ], + [ + { + html: "We cannot find a user with this email (after a successful 3rd party login)" + }, + { + text: "Use this page when authentication succeeds but no matching prototype user is found." + } + ], + [ + { + html: "Sorry, there is a problem (Keycloak generic error)" + }, + { + text: "Use this page for generic identity provider or sign-in timeout errors." + } + ] + ] + }) }} + {% endset %} + + {% set apiErrorsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Error message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "There is a temporary problem getting [patient name]'s vaccination history (history API issue)" + }, + { + text: "Use this page when vaccination history cannot be retrieved from the history API." + } + ], + [ + { + html: "There is a temporary problem accessing appointments (MYA is down/API issue)" + }, + { + text: "Use this page when the appointments dependency is unavailable." + } + ], + [ + { + html: "There is a temporary problem getting the patient's details (PDS API issue)" + }, + { + text: "Use this page when patient details cannot be fetched from PDS." + } + ], + [ + { + html: "There is still a problem getting the patient's details (ongoing PDS API issue)" + }, + { + text: "Use this page for ongoing patient detail lookup failures after retry." + } + ] + ] + }) }} + {% endset %} + + {{ tabs({ + items: [ + { + label: "General errors", + id: "general-errors", + panel: { + html: generalErrorsTabHtml + } + }, + { + label: "Login and access", + id: "login-access-errors", + panel: { + html: authErrorsTabHtml + } + }, + { + label: "API and service dependencies", + id: "api-service-errors", + panel: { + html: apiErrorsTabHtml + } + } + ] + }) }} + + +
+ + +

Warning messages

+ + {% set covid19WarningsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Warning message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Had a COVID-19 vaccine less than 3 months ago" + }, + { + text: "Use this warning when a recent COVID-19 vaccination falls within the interval rule." + } + ], + [ + { + html: "Too young for product" + }, + { + text: "Use this warning when the patient is below the age range for the selected COVID-19 product." + } + ], + [ + { + html: "Too old for product" + }, + { + text: "Use this warning when the patient is above the supported age range for the selected COVID-19 product." + } + ], + [ + { + html: "No GP surgery and not outreach" + }, + { + text: "Use this warning when there is no GP surgery on record and the vaccination is not marked as outreach." + } + ], + [ + { + html: "Not in PCN and not outreach" + }, + { + text: "Use this warning when the patient is outside the PCN and the vaccination is not outreach." + } + ] + ] + }) }} + {% endset %} + + {% set fluWarningsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Warning message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Too young for product" + }, + { + text: "Use this warning when the patient is below the age range for the selected flu product." + } + ], + [ + { + html: "Too old for product" + }, + { + text: "Use this warning when the patient is above the age range for the selected flu product." + } + ] + ] + }) }} + {% endset %} + + {% set rsvWarningsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Warning message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Not yet 28 weeks pregnant" + }, + { + text: "Use this warning when RSV vaccination is attempted before 28 weeks of pregnancy." + } + ] + ] + }) }} + {% endset %} + + {% set pertussisWarningsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Warning message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Not yet 16 weeks pregnant" + }, + { + text: "Use this warning when pertussis vaccination is attempted before 16 weeks of pregnancy." + } + ] + ] + }) }} + {% endset %} + + {% set mmrWarningsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Warning message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Had an MMR vaccine less than 4 weeks ago" + }, + { + text: "Use this warning when another MMR dose was recorded too recently." + } + ], + [ + { + html: "Already had 2 doses" + }, + { + text: "Use this warning when the patient already has two recorded MMR doses." + } + ], + [ + { + html: "Too young for the London MMR service" + }, + { + text: "Use this warning when the patient is below the eligible age for the London MMR service." + } + ], + [ + { + html: "Too old for the London MMR service" + }, + { + text: "Use this warning when the patient is above the eligible age for the London MMR service." + } + ] + ] + }) }} + {% endset %} + + {% set menbWarningsTabHtml %} + {{ table({ + responsive: true, + panel: false, + firstCellIsHeader: false, + head: [ + { + text: "Warning message", + classes: "nhsuk-u-width-one-half" + }, + { + text: "When to use", + classes: "nhsuk-u-width-one-half" + } + ], + rows: [ + [ + { + html: "Had a MenB vaccine less than 4 weeks ago" + }, + { + text: "Use this warning when a prior MenB dose was given within the restricted interval." + } + ] + ] + }) }} + {% endset %} + + {{ tabs({ + items: [ + { + label: "COVID-19", + id: "warning-covid-19", + panel: { + html: covid19WarningsTabHtml + } + }, + { + label: "Flu", + id: "warning-flu", + panel: { + html: fluWarningsTabHtml + } + }, + { + label: "RSV", + id: "warning-rsv", + panel: { + html: rsvWarningsTabHtml + } + }, + { + label: "Pertussis", + id: "warning-pertussis", + panel: { + html: pertussisWarningsTabHtml + } + }, + { + label: "MMR London service", + id: "warning-mmr-london-service", + panel: { + html: mmrWarningsTabHtml + } + }, + { + label: "MenB", + id: "warning-menb", + panel: { + html: menbWarningsTabHtml + } + } + ] + }) }} -
-{% endblock %} +
+{% endblock %} \ No newline at end of file diff --git a/app/views/layout.html b/app/views/layout.html index 0913025c4..0788257b9 100755 --- a/app/views/layout.html +++ b/app/views/layout.html @@ -62,7 +62,7 @@ text: "Accessibility statement" }, { - href: "/terms-of-use1", + href: "/terms-of-use-full", text: "Terms of use" }, { diff --git a/app/views/lists/add-more-nhs-numbers.html b/app/views/lists/add-more-nhs-numbers.html deleted file mode 100644 index 9c47723ff..000000000 --- a/app/views/lists/add-more-nhs-numbers.html +++ /dev/null @@ -1,49 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Add a list of NHS numbers" %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ href: "/lists/list/" + patientList.id }) }} -{% endblock %} - -{% block content %} -
-
- - {{ patientList.name }} -

Add more NHS numbers to your list

- -

Copy and paste NHS numbers from a spreadsheet or another source.

-

Each number must be 10 digits and can include spaces. Include 1 NHS number per line with no punctuation.

-

For example, -
485 777 3456 -
9012345678 -
1234567890 -

- -
- -
- - - -
- - - - {{ button({ - text: "Confirm" - }) }} -
- -
-
- - - -{% endblock %} - diff --git a/app/views/lists/add-nhs-numbers.html b/app/views/lists/add-nhs-numbers.html deleted file mode 100644 index c374feeca..000000000 --- a/app/views/lists/add-nhs-numbers.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Add a list of NHS numbers" %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ href: "/lists/date" }) }} -{% endblock %} - -{% block content %} -
-
- - {% if (errors | length) > 0 %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: errors - }) }} - {% endif %} - -
- -

Add a list of NHS numbers

- -

Copy and paste NHS numbers from a spreadsheet or another source.

-

Each number must be 10 digits and can include spaces. Include 1 NHS number per line with no punctuation.

-

For example, -
485 777 3456 -
9012345678 -
1234567890 -

- -
- - - -
- - -
-
- - - {{ button({ - text: "Confirm" - }) }} - - -{% endblock %} - diff --git a/app/views/lists/date.html b/app/views/lists/date.html deleted file mode 100644 index 2ebfe23fd..000000000 --- a/app/views/lists/date.html +++ /dev/null @@ -1,94 +0,0 @@ - -{% extends 'layout.html' %} - -{% set pageName = "Choose a date" %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ - href: "/lists/team", - text: "Back" - }) }} -{% endblock %} - -{% block content %} -
-
- -
- - {% set dateinputHtml %} - {{ dateInput({ - id: "other-date", - namePrefix: "otherDate", - values: data.otherDate, - fieldset: { - legend: { - text: "Date", - size: "s", - isPageHeading: false - } - }, - hint: { - text: "For example, 15 3 2026" - } - }) }} - {% endset %} - - {% set items = [] %} - {% for date in (dates) %} - {% set text %} - {% if loop.index == 1 %} - Today ({{ (date | govukDate(showWeekday=true)) }}) - {% else %} - {{ (date | govukDate(showWeekday=true)) }} - {% endif %} - {% endset %} - - {% set items = (items.push({ - text: text, - value: date - }), items) %} - {% endfor %} - - {% set items = (items.push({ - divider: 'or' - }), items) %} - - {% set items = (items.push({ - value: "other-date", - text: "Select a different date", - conditional: { - html: dateinputHtml - } - }), items) %} - - {% set items = (items.push({ - value: "no-date", - text: "No date" - }), items) %} - - {{ radios({ - idPrefix: "date", - name: "date", - value: data.date, - fieldset: { - legend: { - text: "Choose a date", - size: "l", - isPageHeading: true - } - }, - items: items - }) }} - - {{ button({ - text: "Continue" - }) }} -
- -
-
-{% endblock %} - diff --git a/app/views/lists/delete.html b/app/views/lists/delete.html deleted file mode 100644 index c2c6dafbe..000000000 --- a/app/views/lists/delete.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Delete list" %} -{% set site = currentOrganisation.sites | findById(patientList.siteId) %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ href: "/lists/list/" + patientList.id }) }} -{% endblock %} - -{% block content %} -
-
- - {{ site.name }} -

- {% if patientList.date %} - Delete list for {{ patientList.date | govukDate }}? - {% else %} - Delete {{ patientList.name }} list? - {% endif %} -

- -

The list will be deleted but not any vaccination records.

- -
-
- {{ button({ - text: "Yes, delete list" - }) }} -
- -
-
- - {% endblock %} diff --git a/app/views/lists/edit-name.html b/app/views/lists/edit-name.html deleted file mode 100644 index 2455fd3d4..000000000 --- a/app/views/lists/edit-name.html +++ /dev/null @@ -1,43 +0,0 @@ -{% extends 'layout.html' %} - -{% set currentSection = "lists" %} -{% set site = currentOrganisation.sites | findById(patientList.siteId) %} -{% set pageName = "Name your list" %} - -{% block beforeContent %} - {{ backLink({ href: "/lists/list/" + patientList.id }) }} -{% endblock %} - -{% block content %} -
-
- - {{ site.name }} - -
- - {{ input({ - label: { - text: "Edit list name", - isPageHeading: true, - classes: "nhsuk-label--l" - }, - hint: { - text: "For example, Maternity list" - }, - id: "name", - name: "name", - value: patientList.name - }) }} - - {{ button({ - text: "Continue" - }) }} - -
- -
-
- -{% endblock %} - diff --git a/app/views/lists/index.html b/app/views/lists/index.html deleted file mode 100644 index c65dfaa76..000000000 --- a/app/views/lists/index.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Lists" %} - -{% set currentSection = "lists" %} - -{% block content %} -
-
- - {{ tag({ - text: "New", - classes: "nhsuk-tag--blue" - })}} -

- - -

Lists

- -

To save time when you record vaccinations, you can add a list of NHS numbers.

- - - - - {{ button({ - text: "Add a list", - href: "/lists/team" - }) }} - -
-
- -{% endblock %} diff --git a/app/views/lists/list.html b/app/views/lists/list.html deleted file mode 100644 index 04b89c1a9..000000000 --- a/app/views/lists/list.html +++ /dev/null @@ -1,151 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = (patientList.date | govukDate) if patientList.date else patientList.name %} -{% set site = currentOrganisation.sites | findById(patientList.siteId) %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ - href: "/lists/site/" + patientList.siteId - }) }} - {% endblock %} -{% block content %} - -
-
- -
{{ site.name }}
- -

{{ pageName }}

- -

To record a vaccination, search for the person in the list and select the Record link next to their details.

- - -

- Add more NHS numbers       - {% if patientList.name %} - Edit list name       - {% endif %} - Delete list -

- -
-
-
- - - - {{ button({ - text: "Search", - classes: "nhsuk-button--secondary nhsuk-u-margin-left-2 nhsuk-button--small" - })}} -
-
-
- -
- -
-
-
-
- - - - - - - - - - - - - - - - - - - - - - {% for patient in patients %} - - - - - - - - {% endfor %} - - - - - - - - - -
Showing {{ patients | length }} of {{ totalPatients }} patients
- Name - - NHS number - - Date of birth - - - - -
- {{ patient.firstName }} - {{ patient.lastName }} - - {{ patient.nhsNumber }} - - {{ patient.dateOfBirth | govukDate }} - - Record - - Remove -
- NHS number not found - - 9523654781 - - Remove -
- - - {{ pagination({ - next: { - href: "#" - }, - items: [ - { - number: 1, - href: "#", - current: true - }, - { - number: 2, - href: "#" - }, - { - number: 3, - href: "#" - } - ] - }) }} - -
-
- -{% endblock %} - - - diff --git a/app/views/lists/loading.html b/app/views/lists/loading.html deleted file mode 100644 index 6b106ce38..000000000 --- a/app/views/lists/loading.html +++ /dev/null @@ -1,59 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Add a list of NHS numbers" %} - -{% set currentSection = "lists" %} - - -{% block content %} -
-
- - {% if (errors | length) > 0 %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: errors - }) }} - {% endif %} - -
- -

Loading

- - -
- - -
- - -

Looking up NHS numbers
Found 16 out of 104

- - - - - -{% endblock %} - diff --git a/app/views/lists/name.html b/app/views/lists/name.html deleted file mode 100644 index 6a8d2f8a1..000000000 --- a/app/views/lists/name.html +++ /dev/null @@ -1,54 +0,0 @@ -{% extends 'layout.html' %} - -{% set currentSection = "lists" %} - -{% set pageName = "List name" %} - -{% block beforeContent %} - {{ backLink({ href: "/lists/date" }) }} -{% endblock %} - - - - -{% from 'back-link/macro.njk' import backLink %} -{% from 'button/macro.njk' import button %} -{% from 'input/macro.njk' import input %} - -{% set mainClasses = "nhsuk-main-wrapper--s" %} - - -{% block content %} -
-
- - - - - - - {{ input({ - label: { - text: "Enter a name for your list", - isPageHeading: true, - size: "l" - }, - hint: { - text: "For example, Maternity patients" - }, - id: "name", - name: "name" - }) }} - - - {{ button({ - text: "Continue" - }) }} - - -
-
- - -{% endblock %} - diff --git a/app/views/lists/no-lists-created.html b/app/views/lists/no-lists-created.html deleted file mode 100644 index 8bed9b143..000000000 --- a/app/views/lists/no-lists-created.html +++ /dev/null @@ -1,52 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "no-lists-created" %} - -{% set currentSection = "lists" %} - -{% block content %} -
-
- - {{ tag({ - text: "New", - classes: "nhsuk-tag--blue" - })}} -

-

Lists

- -

To save time when you record vaccinations, you can add a list of NHS numbers.

- - {% set howItWorksHtml %} -

Add a list of NHS numbers and we will match them to patient details.

-

This means you will not have to input each patient's NHS number when you record vaccinations.

- {% endset %} - - {% if (lists | length) > 0 %} - {{ details({ - text: "How it works", - html: howItWorksHtml - }) }} - - - - {% else %} -

How it works

- - {{ howItWorksHtml | safe }} - - {% endif %} - - - {{ button({ - text: "Add a list", - href: "/lists/team" - }) }} - -
-
- -{% endblock %} diff --git a/app/views/lists/no-vaccines-added.html b/app/views/lists/no-vaccines-added.html deleted file mode 100644 index e1f3f3056..000000000 --- a/app/views/lists/no-vaccines-added.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Lists" %} -{% set currentSection = "lists" %} -{% set organisationSetting = currentUser.organisations | findById(data.currentOrganisationId) %} - - -{% block content %} -
-
- -

{{ pageName }}

- - {% if organisationSetting.permissionLevel == "Recorder" %} -

An admin user needs to add a vaccine before you can create a list.

- {% else %} -

You need to add a vaccine before you can create a list.

- {% endif %} - -
-
- -{% endblock %} diff --git a/app/views/lists/record/done.html b/app/views/lists/record/done.html deleted file mode 100644 index e9c0ae2d0..000000000 --- a/app/views/lists/record/done.html +++ /dev/null @@ -1,62 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Vaccination saved" %} - -{% set currentSection = "vaccinate" %} - -{% block content %} -
-
- - {% if (errors | length) > 0 %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: errors - }) }} - {% endif %} - - {% set panelHtml %} - Michael James's COVID-19 record will be sent to their GP. - {% endset %} - - {{ panel({ - titleText: "Vaccination saved", - html: panelHtml - }) }} - - - {{ radios({ - idPrefix: "next-step", - name: "nextStep", - fieldset: { - legend: { - text: "What would you like to do next?", - classes: "nhsuk-fieldset__legend--m" - } - }, - errorMessage: { - text: error.text - } if error, - items: [ - { - value: "same-patient-another-vaccination", - text: "Record a second vaccination for Michael James" - }, - { - value: "same-vaccination-another-patient", - text: "Return to list" - } - ] - }) }} - - {{ button({ - text: "Continue", - href: "/lists/list" - }) }} - - -
-
- -{% endblock %} - diff --git a/app/views/lists/remove.html b/app/views/lists/remove.html deleted file mode 100644 index 4297b5cb7..000000000 --- a/app/views/lists/remove.html +++ /dev/null @@ -1,33 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Remove Tom Smith from the list?" %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ - href: "/lists/list", - text: "Back" - }) }} -{% endblock %} - - -{% block content %} -
-
- - -

{{ pageName }}

- - -
-
- -
- -
-
- - {% endblock %} diff --git a/app/views/lists/team-lists.html b/app/views/lists/team-lists.html deleted file mode 100644 index 7fcb63817..000000000 --- a/app/views/lists/team-lists.html +++ /dev/null @@ -1,98 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = site.name %} - -{% set currentSection = "lists" %} - -{% block beforeContent %} - {{ backLink({ - href: "/lists", - text: "Back" - }) }} -{% endblock %} - -{% block content %} -
-
- - {% if justAddedList %} - - {% set html %} -

- {{ (justAddedList.date | govukDate) if justAddedList.date else justAddedList.name }} list added -

-

It can take several minutes to check NHS numbers.

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

{{ pageName }}

- - {% if (lists | length) > 0 %} - - - - - - - - - - {% for list in lists %} - - - - - - {% endfor %} - -
ListNHS numbers
- - {% if list.date %} - {{ list.date | govukDate }} - {% else %} - {{ list.name }} - {% endif %} - - - {% if list.id == justAddedList.id %} - 1 checked out of {{ list.patients | length }} - {% else %} - {{ list.patients | length }} - {% endif %} -
- {% else %} -

No lists added.

- {% endif %} - - {{ button({ - text: "Add a list", - href: "/lists/date?siteId=" + site.id - }) }} - -
-
- - {% if justAddedList %} - - {% endif %} - -{% endblock %} diff --git a/app/views/lists/team.html b/app/views/lists/team.html deleted file mode 100644 index 8ca4e8e1a..000000000 --- a/app/views/lists/team.html +++ /dev/null @@ -1,47 +0,0 @@ -{% extends 'layout.html' %} - -{% set currentSection = "lists" %} - -{% set pageName = "Choose a site" %} - -{% block beforeContent %} - {{ backLink({ href: "/lists" }) }} -{% endblock %} - -{% block content %} -
-
- -
- {% set items = [] %} - {% for site in (sites | sort(false, false, "name")) %} - {% set items = (items.push({ - text: site.name, - value: site.id - }), items) %} - {% endfor %} - - {{ radios({ - idPrefix: "siteId", - name: "siteId", - fieldset: { - legend: { - text: "Choose a site", - size: "l", - isPageHeading: true - } - }, - items: items, - value: data.siteId - }) }} - - {{ button({ - text: "Continue" - }) }} -
- -
-
- -{% endblock %} - diff --git a/app/views/pharmacies/add-user-permission-level.html b/app/views/pharmacies/add-user-permission-level.html index 6fd96d6a8..0c991cd04 100644 --- a/app/views/pharmacies/add-user-permission-level.html +++ b/app/views/pharmacies/add-user-permission-level.html @@ -2,13 +2,12 @@ {% set currentSection = "pharmacies" %} {% if existingUser %} - {% set roleHeading = existingUser.firstName + " " + existingUser.lastName + "'s role" %} + {% set pageName = existingUser.firstName + " " + existingUser.lastName + "'s role at " + organisation.name + " (" + organisation.id + ")" %} {% elseif data.firstName or data.lastName %} - {% set roleHeading = (data.firstName + " " + data.lastName) + "'s role" %} + {% set pageName = (data.firstName + " " + data.lastName) + "'s role at " + organisation.name + " (" + organisation.id + ")" %} {% else %} - {% set roleHeading = "New user's role" %} + {% set pageName = "New user's role at " + organisation.name + " (" + organisation.id + ")" %} {% endif %} -{% set pageName = roleHeading %} {% block beforeContent %} {{ backLink({ @@ -19,103 +18,46 @@ {% block content %}
- - {% if firstNameError == "required" %} - {% set firstNameErrorMessage = "Enter a first name" %} - {% endif %} - {% if lastNameError == "required" %} - {% set lastNameErrorMessage = "Enter a last name" %} - {% endif %} - {% if emailError == "required" %} - {% set emailErrorMessage = "Enter an email address" %} - {% elseif emailError == "invalid-domain" %} - {% set emailErrorMessage = "Enter an allowed email address" %} - {% elseif emailError == "group-admin-not-allowed" %} - {% set emailErrorMessage = "You cannot add a group administrator to an individual pharmacy" %} - {% endif %} - {% if vaccinatorError == "required" %} - {% set vaccinatorErrorMessage = "Select if they’re a vaccinator" %} - {% endif %} - {% if permissionLevelError == "required" %} - {% set permissionLevelErrorMessage = "Select a permission level" %} - {% endif %} - - {% if firstNameErrorMessage or lastNameErrorMessage or emailErrorMessage or permissionLevelErrorMessage or vaccinatorErrorMessage %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: [ - { - text: firstNameErrorMessage, - href: "#first-name" - } if firstNameErrorMessage, - { - text: lastNameErrorMessage, - href: "#last-name" - } if lastNameErrorMessage, - { - text: emailErrorMessage, - href: "#email" - } if emailErrorMessage, - { - text: vaccinatorErrorMessage, - href: "#vaccinator" - } if vaccinatorErrorMessage, - { - text: permissionLevelErrorMessage, - href: "#permission-level-1" - } if permissionLevelErrorMessage - ] - }) }} - {% endif %} - -
{{ organisation.name }} ({{ organisation.id }})
- -

{{ roleHeading }}

+

+ {% if existingUser %} + {{ existingUser.firstName }} {{ existingUser.lastName }}'s role at {{ organisation.name }} ({{ organisation.id }}) + {% elseif data.firstName or data.lastName %} + {{ data.firstName }} {{ data.lastName }}'s role at {{ organisation.name }} ({{ organisation.id }}) + {% else %} + Add a new user to {{ organisation.name }} ({{ organisation.id }}) + {% endif %} +

{% if not existingUser %} -

Users must have an nhs.net email or another allowed email address. See examples of allowed email addresses (opens in new tab).

- -      

If the email address is not allowed, use a different email or contact us.

+

Users must have an NHS-approved email address. See the list of approved email domains (opens in new tab).

{{ input({ label: { text: "First name" }, - id: "first-name", name: "firstName", classes: "nhsuk-input--width-20", - value: data.firstName, - errorMessage: { - text: firstNameErrorMessage - } if firstNameErrorMessage + value: data.firstName }) }} {{ input({ label: { text: "Last name" }, - id: "last-name", name: "lastName", classes: "nhsuk-input--width-20", - value: data.lastName, - errorMessage: { - text: lastNameErrorMessage - } if lastNameErrorMessage + value: data.lastName }) }} {{ input({ label: { text: "Email address" }, - id: "email", name: "email", type: "email", - value: data.email, - errorMessage: { - text: emailErrorMessage - } if emailErrorMessage + value: data.email }) }} {% endif %} @@ -131,9 +73,6 @@

{{ roleHeading }}

text: "Vaccination records include the name of the person who gave the vaccination" }, value: data.vaccinator, - errorMessage: { - text: vaccinatorErrorMessage - } if vaccinatorErrorMessage, "items": [ { "value": "yes", @@ -157,9 +96,6 @@

{{ roleHeading }}

} }, value: data.permissionLevel, - errorMessage: { - text: permissionLevelErrorMessage - } if permissionLevelErrorMessage, items: [ { value: "Recorder", diff --git a/app/views/reports/index.html b/app/views/reports/index.html index 13356a41e..b88788620 100644 --- a/app/views/reports/index.html +++ b/app/views/reports/index.html @@ -18,7 +18,7 @@

Reports

-

Create and download reports.

+

Create and download reports.

{% if vaccinationsRecordedCount > 0 %} diff --git a/app/views/reports/notification.html b/app/views/reports/notification.html deleted file mode 100644 index e2b2f52cf..000000000 --- a/app/views/reports/notification.html +++ /dev/null @@ -1,42 +0,0 @@ -{% extends 'layout.html' %} - -{% block pageTitle %} - Reports -{% endblock %} - -{% set currentSection = "reports" %} - - - - -{% block content %} - - -
-
- - {% include "_report-notification.html" %} - - -

Reports

-

Create and download reports

- - {{ insetText({ - html: "

Reports may take longer to process if you choose more data or a wider date range.

" - })}} - - {{ button({ - "text": "Create report", - "href": "/reports/choose-dates" - }) }} - - - -
-
- - - - - -{% endblock %} diff --git a/app/views/support/index.html b/app/views/support/index.html deleted file mode 100644 index 66a77ae0b..000000000 --- a/app/views/support/index.html +++ /dev/null @@ -1,92 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Dashboard" %} - -{% set currentSection = "dashboard" %} -postcode: - -{% block content %} -
-
- -

Dashboard

- - - - - - - - - - - - - - - - - - - - - - - {% for region in (regions | sort(false, true, "name")) %} - - - - - - - - - - - - {% endfor %} - - - - - - - - - - - - - - -
By region
- Region - - Organisations - - Users - - Vaccinations -
- Lead - - Admin - - Recorder - - COVID - - flu - - RSV - - Pertussis -
{{ region.name }}1501031505011,01430473416
Total1,0507211,0503,5077,0982,1285,138112
- - - -
-
- -{% endblock %} - diff --git a/app/views/support/organisations.html b/app/views/support/organisations.html deleted file mode 100644 index bbdbfe3b7..000000000 --- a/app/views/support/organisations.html +++ /dev/null @@ -1,57 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Organisations" %} - -{% set currentSection = "organisations" %} -postcode: - -{% block content %} -
-
- -

{{ pageName }}

- - - - - - - - - - - - - - {% for organisation in (organisations | sort(false, false, "name") ) %} - - - - - - - {% endfor %} - -
- Name - - ODS code - - Type - - Status -
- {{ organisation.name }} - - {{ organisation.id }} - - {{ organisation.type }} - - {{ organisation.status }} -
- -
-
- -{% endblock %} - diff --git a/app/views/support/organisations/add-user.html b/app/views/support/organisations/add-user.html deleted file mode 100644 index ed2323d7d..000000000 --- a/app/views/support/organisations/add-user.html +++ /dev/null @@ -1,122 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = organisation.name %} - -{% block beforeContent %} - {{ backLink({ - href: "/support/organisations/" + organisation.id, - text: "Back" - }) }} -{% endblock %} - -{% set currentSection = "organisations" %} -postcode: - -{% block content %} -
-
- -
{{ organisation.name }}
-

Add user

- - {{ insetText({ - text: "Lead administrators in organisations can self-manage their users." - }) }} - - - - {{ input({ - label: { - text: "First name" - }, - id: "first-name", - name: "firstName", - classes: "nhsuk-input--width-20" - }) }} - - {{ input({ - label: { - text: "Last name" - }, - id: "last-name", - name: "lastName", - classes: "nhsuk-input--width-20" - }) }} - - {{ input({ - label: { - text: "NHS email address" - }, - id: "email", - name: "email", - type: "email" - }) }} - - {{ radios({ - name: "vaccinator", - fieldset: { - legend: { - text: "Are they a vaccinator?" - } - }, - hint: { - text: "Vaccination records include the name of the person who gave the vaccination" - }, - "items": [ - { - value: "yes", - text: "Yes", - id: "vaccinator" - }, - { - value: "no", - text: "No" - } - ] - }) }} - - - {{ radios({ - name: "permissionLevel", - fieldset: { - legend: { - text: "Permission level" - } - }, - value: data.permissionLevel, - items: [ - { - value: "Recorder", - text: "Recorder", - hint: { - text: "Record vaccinations only" - } - }, - { - value: "Administrator", - text: "Administrator", - hint: { - text: "Record vaccinations, create reports and manage vaccines" - } - }, - { - value: "Lead administrator", - text: "Lead administrator", - hint: { - text: "Record vaccinations, create reports, manage vaccines and users" - } - } - ] - }) }} - - - {{ button({ - text: "Save" - }) }} - - -
-
- -{% endblock %} - diff --git a/app/views/support/organisations/add-vaccines.html b/app/views/support/organisations/add-vaccines.html deleted file mode 100644 index dd4eef230..000000000 --- a/app/views/support/organisations/add-vaccines.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Add vaccines for " + organisation.name %} -{% set currentSection = "organisations" %} -postcode: - -{% block beforeContent %} - {{ backLink({ - href: "/support/organisations/" + organisation.id, - text: "Back" - }) }} -{% endblock %} - -{% block content %} -
-
- -
- -
{{ organisation.name }}
- - {% set items = [] %} - - {% for vaccine in (vaccinesNotYetAdded | sort(false, false, "name")) %} - {% set items = (items.push({ - value: vaccine.name, - text: (vaccine.name ) - }), items) %} - {% endfor %} - - {{ checkboxes({ - name: "vaccinesToAdd", - classes: "nhsuk-radios--inline", - fieldset: { - legend: { - text: "Which vaccines do you want to add?", - size: "l", - isPageHeading: true - } - }, - items: items - }) }} - - {{ button({ - text: "Confirm" - }) }} -
- -
-
-{% endblock %} diff --git a/app/views/support/organisations/change-region.html b/app/views/support/organisations/change-region.html deleted file mode 100644 index b51a393a2..000000000 --- a/app/views/support/organisations/change-region.html +++ /dev/null @@ -1,56 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Change region" %} - -{% block beforeContent %} - {{ backLink({ - href: "/support/organisations/" + organisation.id, - text: "Back" - }) }} -{% endblock %} - -{% set currentSection = "organisations" %} -postcode: - -{% block content %} -
-
- -
{{ organisation.name }}
- -
- - {% set items = [] %} - - {% for region in data.regions %} - {% set items = (items.push({ - text: region.name, - value: region.id - }), items) %} - {% endfor %} - - {{ radios({ - idPrefix: "region", - name: "region", - fieldset: { - legend: { - text: pageName, - size: "l", - isPageHeading: true - } - }, - value: organisation.region, - items: items - }) }} - - - {{ button({ - text: "Save" - }) }} -
- -
-
- -{% endblock %} - diff --git a/app/views/support/organisations/feature-flag.html b/app/views/support/organisations/feature-flag.html deleted file mode 100644 index fb829a1e5..000000000 --- a/app/views/support/organisations/feature-flag.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = organisation.name %} - -{% block beforeContent %} - {{ backLink({ - href: "/support/organisations/" + organisation.id, - text: "Back" - }) }} -{% endblock %} - -{% set currentSection = "organisations" %} -postcode: - -{% block content %} -
-
- -
{{ organisation.name }}
- -
- - {{ radios({ - idPrefix: "feature-flag", - name: "featureFlagStatus", - fieldset: { - legend: { - text: featureFlag.name, - size: "l", - isPageHeading: true - } - }, - value: (organisation.featureFlags[featureFlag.id] if organisation.featureFlags[featureFlag.id] else "off"), - items: [ - { - value: "on", - text: "On" - }, - { - value: "off", - text: "Off" - } - ] - }) }} - - {{ button({ - text: "Save" - }) }} -
- -
-
- -{% endblock %} - diff --git a/app/views/support/organisations/show.html b/app/views/support/organisations/show.html deleted file mode 100644 index 505fbb892..000000000 --- a/app/views/support/organisations/show.html +++ /dev/null @@ -1,212 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = organisation.name %} - -{% block beforeContent %} - {{ backLink({ - href: "/support/organisations", - text: "Back" - }) }} -{% endblock %} - -{% set currentSection = "organisations" %} -postcode: - -{% set region = data.regions | findById(organisation.region) %} - -{% block content %} -
-
- -

{{ pageName }}

- - {{ summaryList({ - rows: [ - { - key: { - text: "ODS code", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: organisation.id - }, - actions: { - items: [] - } - }, - { - key: { - text: "Name", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - text: organisation.name - }, - actions: { - items: [ - { - href: "/support/organisations/" + organisation.id + "/update-details", - text: "Update", - visuallyHiddenText: "name" - } - ] - } - }, - { - key: { - text: "Region", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: "" + region.name + "" - } if region, - actions: { - items: [ - { - href: "/support/organisations/" + organisation.id + "/change-region", - text: "Change", - visuallyHiddenText: "region" - } - ] - } - },{ - key: { - text: "Vaccines enabled", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: (vaccinesEnabled | sort(false, false, "name") | pluck("name") | formatList) - }, - actions: { - items: [ - { - href: "/support/organisations/" + organisation.id + "/add-vaccines", - text: "Add", - visuallyHiddenText: "vaccines" - } - ] - } if ((vaccinesEnabled | length) != (data.vaccines | length)) - } - ] - }) }} - -

Beta features enabled

- - {% set recordInterface %} - {{ tag({ - text: ("On" if organisation.featureFlags.newRecordInterface == "on" else "Off"), - classes: ("nhsuk-tag--green" if organisation.featureFlags.newRecordInterface == "on" else "nhsuk-tag--red") - }) }} - {% endset %} - - {% set paymentIntegration %} - {{ tag({ - text: ("On" if organisation.featureFlags.paymentIntegration == "on" else "Off"), - classes: ("nhsuk-tag--green" if organisation.featureFlags.paymentIntegration == "on" else "nhsuk-tag--red") - }) }} - {% endset %} - - {{ summaryList({ - rows: [ - { - key: { - text: "New streamlined Record interface", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: recordInterface - }, - actions: { - items: [ - { - href: "/support/organisations/" + organisation.id + "/feature-flag?featureFlag=newRecordInterface", - text: "Change", - visuallyHiddenText: "name" - } - ] - } - }, - { - key: { - text: "BSA Payment API integration", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: paymentIntegration - }, - actions: { - items: [ - { - href: "/support/organisations/" + organisation.id + "/feature-flag?flag=paymentIntegration", - text: "Change", - visuallyHiddenText: "date of birth" - } - ] - } - } - ] - }) }} - -

Users

- - {{ button({ - text: "Add user", - href: "/support/organisations/" + organisation.id + "/add-user" - }) }} - -
-
-
-
- - - {% if (users | length) > 0 %} - - - - - - - - - - - - - {% for user in (users | sort(false, false, "name") ) %} - - {% set userOrganisationSettings = (user.organisations | findById(organisation.id)) %} - - - - - - - - {% endfor %} - -
- Name - - Permission level - - Vaccinator - - Status -
- {{ user.firstName }} {{ user.lastName }} - - {{ userOrganisationSettings.permissionLevel }} - - {{ "Yes" if userOrganisationSettings.vaccinator else "No" }} - - {{ userOrganisationSettings.status }} - -
- {% endif %} - -
-
- -{% endblock %} - diff --git a/app/views/support/organisations/update-details.html b/app/views/support/organisations/update-details.html deleted file mode 100644 index ffda4d365..000000000 --- a/app/views/support/organisations/update-details.html +++ /dev/null @@ -1,37 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Update details from ODS" %} - -{% block beforeContent %} - {{ backLink({ - href: "/support/organisations/" + organisation.id, - text: "Back" - }) }} -{% endblock %} - -{% set currentSection = "organisations" %} -postcode: - -{% block content %} -
-
- -
{{ organisation.name }}
-

{{ pageName }}

- -
- -

Organisations can update their details in the NHS Organisation Data Service (ODS).

- -

If these details have recently been updated, you can sync them back to our service.

- - {{ button({ - text: "Sync organisation details from ODS" - }) }} -
- -
-
- -{% endblock %} - diff --git a/app/views/support/region.html b/app/views/support/region.html deleted file mode 100644 index 80667f1f5..000000000 --- a/app/views/support/region.html +++ /dev/null @@ -1,113 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = region.name %} - -{% block beforeContent %} - {{ breadcrumb({ - items: [ - { - href: "/support/regions", - text: "Regions" - } - ] - }) }} -{% endblock %} - -{% set currentSection = "regions" %} -postcode: - -{% block content %} -
-
- -

{{ pageName }}

- - -

Users

- - {% if (users | length) > 0 %} - - - - - - - - - - - {% for user in (users | sort(false, false, "name") ) %} - - {% set userRegionSettings = (user.regions | findById(region.id)) %} - - - - - - - {% endfor %} - -
- Name - - Email - - Status -
- {{ user.firstName }} {{ user.lastName }} - - {{ user.email }} - - {{ userRegionSettings.status }} - -
- {% endif %} - - {{ button({ - text: "Add user", - href: "/support/regions/" + region.id + "/add-user" - }) }} - -
-
-
-
- -

Organisations

- - - - - - - - - - - {% for organisation in (organisations | sort(false, true)) %} - - - - - - {% endfor %} - -
- Name - - Users - - Vaccinations -
- - {{ organisation.name }} - - 1033,304
- - - -
-
- -{% endblock %} - diff --git a/app/views/support/regions.html b/app/views/support/regions.html deleted file mode 100644 index 31664b6ea..000000000 --- a/app/views/support/regions.html +++ /dev/null @@ -1,24 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Regions" %} - -{% set currentSection = "regions" %} -postcode: - -{% block content %} -
-
- -

{{ pageName }}

- -
    - {% for region in (regions | sort(false, true, "name")) %} -
  • {{ region.name }}
  • - {% endfor %} -
- -
-
- -{% endblock %} - diff --git a/app/views/support/regions/add-user.html b/app/views/support/regions/add-user.html deleted file mode 100644 index ff0d84d78..000000000 --- a/app/views/support/regions/add-user.html +++ /dev/null @@ -1,68 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = region.name %} - -{% block beforeContent %} -{{ breadcrumb({ - items: [ - { - href: "/support/regions", - text: "Regions" - }, - { - href: "/support/regions/" + region.id, - text: region.name - } - ] -}) }} -{% endblock %} - -{% set currentSection = "regions" %} -postcode: - -{% block content %} -
-
- -
{{ region.name }}
-

Add user

- -
- - {{ input({ - label: { - text: "First name" - }, - id: "first-name", - name: "firstName", - classes: "nhsuk-input--width-20" - }) }} - - {{ input({ - label: { - text: "Last name" - }, - id: "last-name", - name: "lastName", - classes: "nhsuk-input--width-20" - }) }} - - {{ input({ - label: { - text: "NHS email address" - }, - id: "email", - name: "email", - type: "email" - }) }} - - {{ button({ - text: "Save" - }) }} -
- -
-
- -{% endblock %} - diff --git a/app/views/support/users.html b/app/views/support/users.html deleted file mode 100644 index 61a7a16d5..000000000 --- a/app/views/support/users.html +++ /dev/null @@ -1,103 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Users" %} - -{% set currentSection = "users" %} -postcode: - -{% block content %} -
-
- -

{{ pageName }}

- -
-
-
- - - - {{ button({ - text: "Search", - classes: "nhsuk-button--secondary nhsuk-u-margin-left-2 nhsuk-button--small" - })}} -
-
-
- - - - - - - - - - - - {% for user in users %} - - - - - - - {% endfor %} - -
- Name - - Email - - Organisation -
- {{ user.firstName }} {{ user.lastName }} - - {{ user.email }} - - {% for organisation in user.organisations %} - {{ (data.organisations | findById(organisation.id)).name }}
- {% endfor %} -
- -
- - {% set items = [] %} - - {% set ellipsisAdded = false %} - {% for i in range(1, totalPages + 1) -%} - {% if i == 1 or i == (page -1) or (i == page) or (i == page + 1) or (i == totalPages) %} - {% set items = (items.push({ - number: i, - href: "/support/users?page=" + i + "&q=" + (q if q else ""), - current: (i === page) - }), items) %} - {% set ellipsisAdded = false %} - {% elif ellipsisAdded == false %} - {% set items = (items.push({ - ellipsis: true - }), items) %} - {% set ellipsisAdded = true %} - {% endif %} - {%- endfor %} - - - {% if totalPages > 1 %} - {{ pagination({ - previous: { - href: "/support/users?page=" + (page - 1) + "&q=" + (q if q else "") - } if page != 1, - next: { - href: "/support/users?page=" + (page + 1) + "&q=" + (q if q else "") - } if page != totalPages, - items: items - }) }} - {% endif %} - -
-
- -{% endblock %} - diff --git a/app/views/support/users/edit-organisation.html b/app/views/support/users/edit-organisation.html deleted file mode 100644 index c963e0c76..000000000 --- a/app/views/support/users/edit-organisation.html +++ /dev/null @@ -1,123 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "Edit user permissions" %} - -{% block beforeContent %} - {{ breadcrumb({ - items: [ - { - href: "/support/users", - text: "Users" - }, - { - href: "/support/users/" + user.id, - text: user.firstName + " " + user.lastName - } - ] - }) }} -{% endblock %} - -{% set currentSection = "users" %} -postcode: - -{% block content %} -
-
- -
{{ user.firstName }} {{ user.lastName }}
-

{{ organisation.name }}

- -
- - {% set vaccinatorStatus = ("yes" if userOrganisationSettings.vaccinator else "no") %} - - {{ radios({ - "name": "vaccinator", - "fieldset": { - "legend": { - "text": "Are they a vaccinator?" - } - }, - hint: { - text: "Vaccination records include the name of the person who gave the vaccination" - }, - value: vaccinatorStatus, - "items": [ - { - "value": "yes", - "text": "Yes" - }, - { - "value": "no", - "text": "No" - } - ] - }) }} - - - {{ radios({ - "name": "permissionLevel", - "fieldset": { - "legend": { - "text": "Permission level", - classes: "nhsuk-fieldset__legend--m" - } - }, - value: userOrganisationSettings.permissionLevel, - "items": [ - { - "value": "Recorder", - "text": "Recorder", - "hint": { - "text": "Record vaccinations only" - } - }, - { - "value": "Administrator", - "text": "Administrator", - "hint": { - "text": "Record vaccinations, create reports and manage vaccines" - } - }, - { - "value": "Lead administrator", - "text": "Lead administrator", - "hint": { - "text": "Record vaccinations, create reports, manage vaccines and users" - } - } - ] - }) }} - - {{ radios({ - name: "status", - fieldset: { - legend: { - text: "Status", - classes: "nhsuk-fieldset__legend--m" - } - }, - value: userOrganisationSettings.status, - items: [ - { - value: "Active", - text: "Active" - }, - { - "value": "Deactivated", - "text": "Deactivated" - } - ] - }) }} - - - {{ button({ - "text": "Save" - }) }} -
- -
-
- - -{% endblock %} diff --git a/app/views/support/users/edit-region.html b/app/views/support/users/edit-region.html deleted file mode 100644 index bfbf8feff..000000000 --- a/app/views/support/users/edit-region.html +++ /dev/null @@ -1,55 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = "User" %} - -{% block beforeContent %} - {{ backLink({ - href: "/support/users/" + user.id, - text: "Back" - }) }} -{% endblock %} - -{% set currentSection = "regions" %} -postcode: - -{% block content %} -
-
- -
{{ user.firstName }} {{ user.lastName }}
-

{{ region.name }}

- -
- - {{ radios({ - name: "status", - fieldset: { - legend: { - text: "Status", - classes: "nhsuk-fieldset__legend--s" - } - }, - value: userRegionSettings.status, - items: [ - { - value: "Active", - text: "Active" - }, - { - "value": "Deactivated", - "text": "Deactivated" - } - ] - }) }} - - - {{ button({ - "text": "Save" - }) }} -
- -
-
- - -{% endblock %} diff --git a/app/views/support/users/show.html b/app/views/support/users/show.html deleted file mode 100644 index 24edd6a83..000000000 --- a/app/views/support/users/show.html +++ /dev/null @@ -1,165 +0,0 @@ -{% extends 'layout.html' %} - -{% set pageName = user.firstName + " " + user.lastName %} - -{% block beforeContent %} - {{ breadcrumb({ - items: [ - { - href: "/support/users", - text: "Users" - } - ] - }) }} -{% endblock %} - -{% set currentSection = "users" %} -postcode: - -{% block content %} -
-
- -

{{ pageName }}

- - {{ summaryList({ - rows: [ - { - key: { - text: "Name", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: user.firstName + " " + user.lastName - } - }, - { - key: { - text: "Email", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: user.email - } - }, - { - key: { - text: "Account created", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: "2024-09-13T13:45" | govukDateTime - } - }, - { - key: { - text: "Last signed in", - classes: "nhsuk-u-font-weight-normal" - }, - value: { - html: "2025-02-18T15:17" | govukDateTime - } - } - ] - }) }} - - {% if (user.regions | length) > 0 %} - -

{{ (user.regions | length) | plural("Region", showNumber = false) }}

- - - - - - - - - - - - - {% for region in (user.regions | sort(false, false, "name") ) %} - - - - - - {% endfor %} - -
- Name - - Status -
- {{ (data.regions | findById(region.id)).name }} - - {{ region.status }} - - Change - status for {{ region.name }} - -
- - {% endif %} - - - {% if (user.organisations | length) > 0 %} - -

Organisations

- -
-
-
-
- - - - - - - - - - - - - - {% for organisation in (user.organisations | sort(false, false, "name") ) %} - - - - - - - - {% endfor %} - -
- Name - - Permission level - - Vaccinator - - Status -
- {{ (data.organisations | findById(organisation.id)).name }} - - {{ organisation.permissionLevel }} - - {{ "Yes" if organisation.vaccinator else "No" }} - - {{ organisation.status }} - - Change - settings for {{ organisation.name }} - -
- - {% endif %} - -
-
- -{% endblock %} - diff --git a/app/views/survey/index.html b/app/views/survey/index.html deleted file mode 100644 index 1cb3fd68e..000000000 --- a/app/views/survey/index.html +++ /dev/null @@ -1,46 +0,0 @@ -{% extends "layout.html" %} - -{% set currentSection = "none" %} - -{% block content %} -
-
- -
Give us your feedback
- {{ radios({ - idPrefix: "survey", - name: "survey", - fieldset: { - legend: { - text: "How satisfied are you with this service? (optional)", - size: "l", - isPageHeading: true - } - }, - items: [ - { - text: "Very satisfied" - }, - { - text: "Satisfied" - }, - { - text: "Neither satisfied nor dissatisfied" - }, - { - text: "Dissatisfied" - }, - { - text: "Very dissatisfied" - } - ] - }) }} - - {{ button({ - text: "Continue", - href: "/home" - }) }} - -
-
-{% endblock %} diff --git a/app/views/terms-of-use1.html b/app/views/terms-of-use-full.html similarity index 100% rename from app/views/terms-of-use1.html rename to app/views/terms-of-use-full.html diff --git a/app/views/terms-of-use.html b/app/views/terms-of-use-short.html similarity index 86% rename from app/views/terms-of-use.html rename to app/views/terms-of-use-short.html index 4d93db652..c244fc95c 100644 --- a/app/views/terms-of-use.html +++ b/app/views/terms-of-use-short.html @@ -15,7 +15,7 @@

{{ pageName }}

  • Never allow anyone else to use your details to log in.
  • -

    Read the full terms of use (opens in new tab)

    +

    Read the full terms of use (opens in new tab)

    By continuing, you agree to the full terms of use.

    diff --git a/package-lock.json b/package-lock.json index 51febb28e..d87b305ed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,8 +10,8 @@ "@x-govuk/govuk-prototype-components": "^6.0.0", "@x-govuk/govuk-prototype-filters": "^2.1.0", "accessible-autocomplete": "^3.0.1", - "nhsuk-frontend": "10.5.2", - "nhsuk-prototype-kit": "^8.3.1" + "nhsuk-frontend": "^10.6.0", + "nhsuk-prototype-kit": "^8.4.0" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^8.67.0", @@ -26,7 +26,7 @@ }, "engines": { "node": "^24", - "npm": "^11.6.1 <11.6.3 || ^11.6.4 <11.12.0" + "npm": "^11.6.1 <12" } }, "node_modules/@bufbuild/protobuf": { @@ -2164,13 +2164,13 @@ } }, "node_modules/axios": { - "version": "1.18.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.0.tgz", - "integrity": "sha512-E32NzpYKp++W7XRe52rHiXV2ehxmh3wbdgO7MHeFM+vqxLBYHzt0ElkiImtOBxtOmyp0yoC8C6uESVV84Y2/hw==", + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.19.0.tgz", + "integrity": "sha512-ht/iuYZXEjFxLH/Hkezgd7m6JKlHHXEUSneaDz8uZe1Gj5QZtCnpyDsckvAiEnT89OEbCLmnte4R4sn7P0EKFw==", "license": "MIT", "dependencies": { "follow-redirects": "^1.16.0", - "form-data": "^4.0.5", + "form-data": "^4.0.6", "https-proxy-agent": "^5.0.1", "proxy-from-env": "^2.1.0" } @@ -3280,9 +3280,9 @@ } }, "node_modules/esbuild-clean-plugin": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/esbuild-clean-plugin/-/esbuild-clean-plugin-2.0.0.tgz", - "integrity": "sha512-3q6Q2P+BAs583djXRlWj+clTvJiEcDr1OkSUdcwJou9Z/X/JjVtlQtr60eb7RNFORtjyVohidyH2B94mohwsMg==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/esbuild-clean-plugin/-/esbuild-clean-plugin-2.1.4.tgz", + "integrity": "sha512-6cg09bH4TKt+7PVYRrkVaIEh5NkxsE5xwZNFCgIoRPh+vAtaBKTCiHFsfv6eItbFS6s3ZjBxNBZhCuU+YZX5Jw==", "license": "MIT", "dependencies": { "del": "^8.0.0" @@ -9426,9 +9426,9 @@ "license": "ISC" }, "node_modules/joi": { - "version": "18.2.3", - "resolved": "https://registry.npmjs.org/joi/-/joi-18.2.3.tgz", - "integrity": "sha512-N5A3KTWQpPWT4ExxxPlUx7WmykGXRzhNidWhV41d6Abu9YfI2NyWCJuxdPnslJCPWtbRpSVOWSnSS6GakLM/Rg==", + "version": "18.2.5", + "resolved": "https://registry.npmjs.org/joi/-/joi-18.2.5.tgz", + "integrity": "sha512-+gEA7rLfaNWx9JzawWPrPetSZwT16NUqHtECDgjyAJreXcs4TM7tx2Pa+VVJJK0YHM83ybrVdaT6UekHH50FJQ==", "license": "BSD-3-Clause", "dependencies": { "@hapi/address": "^5.1.1", @@ -9752,9 +9752,9 @@ } }, "node_modules/nhsuk-frontend": { - "version": "10.5.2", - "resolved": "https://registry.npmjs.org/nhsuk-frontend/-/nhsuk-frontend-10.5.2.tgz", - "integrity": "sha512-lTOmzSDJkEn8uhuEuj3NKAW5MYuG/5tqMRsp15An2oLKlpGEoEAoREp+tHYJ7DLOPDRp9Z/zmp6/pLea75ae1g==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/nhsuk-frontend/-/nhsuk-frontend-10.6.0.tgz", + "integrity": "sha512-ZhnQiK6q6C8d0nwwzYSI+dSPuvJMqVPPtCHCoQif75L2Y8QW4Im0Q76UvqrNWkPAkX/lV2W1QNbot27ej61+3g==", "license": "MIT", "engines": { "node": "^20.9.0 || ^22.11.0 || >= 24.11.0" @@ -9785,9 +9785,9 @@ } }, "node_modules/nhsuk-prototype-kit": { - "version": "8.3.1", - "resolved": "https://registry.npmjs.org/nhsuk-prototype-kit/-/nhsuk-prototype-kit-8.3.1.tgz", - "integrity": "sha512-wSEXJQC4PpwEWU7ZF7FdwwiUV5uuPP6d9Q/DQc70QWP1PB4fsDz90ZWWRPO/qcdEeShRgR4LtcdRdoQNqV3KPw==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/nhsuk-prototype-kit/-/nhsuk-prototype-kit-8.4.0.tgz", + "integrity": "sha512-3zE6QMfO8NRP5HSR91iHv3CbGksBfe0Aw2D6WlMJ2pcngXN8zBnhFBiFtohEOCadouLyDg8q6FoOpMPjiHSkOg==", "license": "MIT", "workspaces": [ ".", @@ -9798,8 +9798,8 @@ "body-parser": "^2.3.0", "browser-sync": "^3.0.4", "cookie-parser": "^1.4.7", - "esbuild": "^0.28.1", - "esbuild-clean-plugin": "^2.0.0", + "esbuild": "^0.28.2", + "esbuild-clean-plugin": "^2.1.4", "esbuild-sass-plugin": "^3.7.0", "express-flash": "^0.0.2", "express-session": "^1.19.0", @@ -9807,7 +9807,7 @@ "nodemon": "^3.1.14", "portscanner": "^2.2.0", "sass-embedded": "^1.100.0", - "wait-on": "^9.0.10" + "wait-on": "^9.1.0" }, "engines": { "node": "^22.16.0 || ^24.11.0", @@ -9815,7 +9815,7 @@ }, "peerDependencies": { "express": "^5.2.0", - "nhsuk-frontend": "^10.5.1 || >=11.0.0-preview || >=11.0.0-internal || >=11.0.0-beta", + "nhsuk-frontend": "^10.6.0 || >=11.0.0-preview || >=11.0.0-internal || >=11.0.0-beta", "nunjucks": "^3.2.4" } }, @@ -10161,9 +10161,9 @@ } }, "node_modules/p-map": { - "version": "7.0.4", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", - "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.6.tgz", + "integrity": "sha512-I4Prw6ivkd6p8PiYR1tXASOAOBzIJwu0TB7fqaX0c/8c3QAehNYmX57EijyGGGBt3c/BIowGwV03RVBtXvHEVg==", "license": "MIT", "engines": { "node": ">=18" @@ -12387,13 +12387,13 @@ } }, "node_modules/wait-on": { - "version": "9.0.10", - "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.0.10.tgz", - "integrity": "sha512-rCoJEhvMr0X6alHmwc9abbrA5ZrLZFKpFQVKPNFwl2h7DapXOGdmimIHDtLOWhT4PjhZhxFEtZoQgEXbkDWdZw==", + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-9.1.0.tgz", + "integrity": "sha512-PymrLXHLBM1Ju/Xspb2ADUhbPSMvbnuNvy/mN2hWtpbJ3da0h3Ky1LqwKPG5QSVR57liyO0iUpfipYl/s5qNvA==", "license": "MIT", "dependencies": { - "axios": "^1.16.0", - "joi": "^18.2.1", + "axios": "^1.18.1", + "joi": "^18.2.3", "lodash": "^4.18.1", "minimist": "^1.2.8", "rxjs": "^7.8.2" diff --git a/package.json b/package.json index 9db6e8d2a..049e988e8 100644 --- a/package.json +++ b/package.json @@ -17,8 +17,8 @@ "@x-govuk/govuk-prototype-components": "^6.0.0", "@x-govuk/govuk-prototype-filters": "^2.1.0", "accessible-autocomplete": "^3.0.1", - "nhsuk-frontend": "10.5.2", - "nhsuk-prototype-kit": "^8.3.1" + "nhsuk-frontend": "^10.6.0", + "nhsuk-prototype-kit": "^8.4.0" }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^8.67.0", @@ -33,6 +33,6 @@ }, "engines": { "node": "^24", - "npm": "^11.6.1 <11.6.3 || ^11.6.4 <11.12.0" + "npm": "^11.6.1 <12" } }