From 2a8c48a18445588dcfbbdaa02ab2b52cebc2a658 Mon Sep 17 00:00:00 2001 From: Caitlin Roach Date: Tue, 16 Jun 2026 16:14:41 +0100 Subject: [PATCH 1/7] Add empty state for no pharmacies --- app/routes/prototype-admin.js | 14 +++ .../includes/_preset-scenarios-table.html | 8 ++ app/views/pharmacies/index.html | 116 +++++++++--------- 3 files changed, 81 insertions(+), 57 deletions(-) diff --git a/app/routes/prototype-admin.js b/app/routes/prototype-admin.js index b2401748..2bd6777f 100644 --- a/app/routes/prototype-admin.js +++ b/app/routes/prototype-admin.js @@ -564,6 +564,20 @@ module.exports = (router) => { res.redirect('/home') }) + // ---------------------------------------------------------------- + // Preset: Pharmacy HQ, no data (Amanda White, P15951) + // ---------------------------------------------------------------- + + router.get('/prototype-setup/preset/pharmacy-hq-no-data', (req, res) => { + resetSession(req) + const data = req.session.data + data.currentUserId = '6424325235325' + data.currentOrganisationId = 'P15951' + // Remove all pharmacies belonging to P15951 to start with a clean slate + data.organisations = data.organisations.filter(org => org.companyId !== 'P15951' || org.type === 'Pharmacy HQ') + res.redirect('/home') + }) + // ---------------------------------------------------------------- // Preset: Recorder, single organisation (Ocean Merritt, FR4V56) // ---------------------------------------------------------------- diff --git a/app/views/includes/_preset-scenarios-table.html b/app/views/includes/_preset-scenarios-table.html index 3d9bd63b..05a98cf7 100644 --- a/app/views/includes/_preset-scenarios-table.html +++ b/app/views/includes/_preset-scenarios-table.html @@ -71,6 +71,14 @@ role: "Group administrator", scenarioDetails: "Group admin for a large pharmacy chain (same-name pharmacies)." }, + { + presetLabel: "Group admin, pharmacy HQ (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." + }, { presetLabel: "Regional lead", presetPath: "/prototype-setup/preset/regions", diff --git a/app/views/pharmacies/index.html b/app/views/pharmacies/index.html index b033a9bf..ac9ab6ff 100644 --- a/app/views/pharmacies/index.html +++ b/app/views/pharmacies/index.html @@ -43,65 +43,67 @@

Pharmacies

href: "/pharmacies/select" }) }} - - -
Pharmacies added ({{ organisations | length }})
- {% if (organisations | length) > 10 %} -
- - -
- {% endif %} - - - - - - - - - - - - {% for organisation in organisations %} - - - - - - + {% if (organisations | length) > 0 %} +
- Name - - Vaccines - - Users - - Status - - Actions -
- {{ organisation.name }} ({{ organisation.id}}) - - {% set vaccinesEnabled = [] %} - {% for vaccine in organisation.vaccines %} - {% if vaccine.status == "enabled" %} - {% set vaccinesEnabled = (vaccinesEnabled.push(vaccine.name), vaccinesEnabled) %} - {% endif %} - {% endfor %} - - {{ (vaccinesEnabled | sort | join(", ")) | capitaliseFirstLetter }} - - {{ organisationUserCounts[organisation.id] }} - - {{ organisation.status }} - - Manage -
+ +
Pharmacies added ({{ organisations | length }})
+ {% if (organisations | length) > 10 %} +
+ + +
+ {% endif %} + + + + + + + + - {% endfor %} + + + {% for organisation in organisations %} + + + + + + + + {% endfor %} - -
+ Name + + Vaccines + + Users + + Status + + Actions +
+ {{ organisation.name }} ({{ organisation.id}}) + + {% set vaccinesEnabled = [] %} + {% for vaccine in organisation.vaccines %} + {% if vaccine.status == "enabled" %} + {% set vaccinesEnabled = (vaccinesEnabled.push(vaccine.name), vaccinesEnabled) %} + {% endif %} + {% endfor %} + + {{ (vaccinesEnabled | sort | join(", ")) | capitaliseFirstLetter }} + + {{ organisationUserCounts[organisation.id] }} + + {{ organisation.status }} + + Manage +
+ + + {% endif %} {% if closedOrganisations.length > 0 %}
From a9f0174f9c08a90dbdebfee4a0638f1e8bf3e2e0 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Tue, 25 Aug 2026 17:10:13 +0100 Subject: [PATCH 2/7] Update description for MediCare user link Updated description of one of the links on this page to make it more accurate. --- app/views/auth/medicare-sign-in.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/auth/medicare-sign-in.html b/app/views/auth/medicare-sign-in.html index 7def5e0f..36eca4d5 100644 --- a/app/views/auth/medicare-sign-in.html +++ b/app/views/auth/medicare-sign-in.html @@ -101,7 +101,7 @@

Testing area

From 874c0b12cdafb809e7480857cdf7a71f93926ed1 Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Thu, 27 Aug 2026 15:46:22 +0100 Subject: [PATCH 3/7] Updates to CPIT error msg if no active RAVS account --- app/views/auth/user-not-recognised.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/views/auth/user-not-recognised.html b/app/views/auth/user-not-recognised.html index 484bfc85..6e55eb9d 100644 --- a/app/views/auth/user-not-recognised.html +++ b/app/views/auth/user-not-recognised.html @@ -6,14 +6,15 @@
-

We cannot find a user with this email

- -

There is no Record a vaccination (RAVS) account for james.blue@nhs.net.

- -

If you’ve previously used RAVS, try logging in with the email address you used last time.

- -

If you've never used RAVS before, you'll need to be invited by a colleague to use the service.

+

We cannot find an active user with this email

+

There is no active Record a vaccination (RAVS) account for james.blue@nhs.net.

+
    +
  • If your RAVS account has been deactivated, ask someone who is a lead administrator in RAVS to reactivate it.
    • +
  • If you think you do have an active RAVS account, try logging in with Okta and the email address you used last time.
    • +
  • If you've never used RAVS before, you'll need to be invited by a colleague to use the service.
    • +
+
{% endblock %} From ea584624558e6481d9532493cbd41f39a1574e9e Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Thu, 27 Aug 2026 15:56:40 +0100 Subject: [PATCH 4/7] Update user-not-recognised message for clarity --- app/views/auth/user-not-recognised.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/auth/user-not-recognised.html b/app/views/auth/user-not-recognised.html index 6e55eb9d..a1119a01 100644 --- a/app/views/auth/user-not-recognised.html +++ b/app/views/auth/user-not-recognised.html @@ -11,8 +11,8 @@

We cannot find an active user with this email

There is no active Record a vaccination (RAVS) account for james.blue@nhs.net.

From c8ab1f66dbcf96542448d50d0ad99cca611c539e Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Thu, 27 Aug 2026 16:07:09 +0100 Subject: [PATCH 5/7] Update user-not-recognised.html instructions --- app/views/auth/user-not-recognised.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/auth/user-not-recognised.html b/app/views/auth/user-not-recognised.html index a1119a01..aa1b4939 100644 --- a/app/views/auth/user-not-recognised.html +++ b/app/views/auth/user-not-recognised.html @@ -10,9 +10,9 @@

We cannot find an active user with this email

There is no active Record a vaccination (RAVS) account for james.blue@nhs.net.

From 25579577a4aa3f8d8877f7130b40a82cc9740b3f Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Fri, 28 Aug 2026 15:35:01 +0100 Subject: [PATCH 6/7] Update user-not-recognised message for clarity --- app/views/auth/user-not-recognised.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/auth/user-not-recognised.html b/app/views/auth/user-not-recognised.html index aa1b4939..5dc12994 100644 --- a/app/views/auth/user-not-recognised.html +++ b/app/views/auth/user-not-recognised.html @@ -11,7 +11,7 @@

We cannot find an active user with this email

There is no active Record a vaccination (RAVS) account for james.blue@nhs.net.

From 3e7d7a60a206d7aa456b231391c5f87f92f877af Mon Sep 17 00:00:00 2001 From: Anna-Sutton Date: Fri, 28 Aug 2026 16:24:31 +0100 Subject: [PATCH 7/7] Update login instructions for RAVS account access --- app/views/auth/user-not-recognised.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/auth/user-not-recognised.html b/app/views/auth/user-not-recognised.html index 5dc12994..bdf1993f 100644 --- a/app/views/auth/user-not-recognised.html +++ b/app/views/auth/user-not-recognised.html @@ -11,7 +11,7 @@

We cannot find an active user with this email

There is no active Record a vaccination (RAVS) account for james.blue@nhs.net.