From 99804e6f904a4d5d1d46f9dc1543647a28b84034 Mon Sep 17 00:00:00 2001 From: johnrimmer2 Date: Fri, 17 Oct 2025 14:22:53 +0100 Subject: [PATCH 1/2] changes --- app/views/regions/index1.html | 140 ++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 app/views/regions/index1.html diff --git a/app/views/regions/index1.html b/app/views/regions/index1.html new file mode 100644 index 00000000..d9dd6d91 --- /dev/null +++ b/app/views/regions/index1.html @@ -0,0 +1,140 @@ +{% extends 'layout.html' %} + +{% set pageName = currentRegion.name %} +{% set currentSection = "organisations" %} + +{% block header %} + {% include "includes/header-logged-in-region.html" %} +{% endblock %} + +{% block content %} +
+
+ +

{{ pageName }}

+ +

Invite an organisation to create an NHS Record a vaccination service (RAVS) account.

+ +

Once they’re set up, they can add other users and vaccination sites.

+ + +
+ Information: +

You can only delete an organisation if they have not recorded any vaccinations.

+
+ + + {{ button({ + "text": "Invite an organisation", + "href": "/regions/add-organisation" + }) }} + +
+
+ +
+

Current organisations

+ + +
+
+
+ + + + {{ button({ + text: "Search", + classes: "nhsuk-button--secondary nhsuk-u-margin-left-2 app-button--small nhsuk-u-margin-bottom-0" + })}} +
+
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameVaccinesStatus
Alder Hey Children's NHS Foundation Trus (RBS)COVID-19, flu, pertussis, RSV, MMR, pneumococcalDeactivated
Central Manchester University Hospitals NHS Foundation Trust (RW3)COVID-19, flu, pertussis, RSVInvitedDelete
Greater Manchester Ambulance Service NHS Trust (RMA)pertussis, RSVActive
Manchester University NHS Foundation Trust (R0A)COVID-19, flu, pertussis, RSV, MMR, pneumococcalInvitedDelete
Norfolk and Norwich University Hospitals NHS Foundation Trus (RM1)pertussis, RSVActive
North Mersey Community NHS Trust (RES)pertussis, RSVActive
Royal Papworth Hospital NHS Foundation Trust (RGM)pertussis, RSVActive
Pickfords pharmacy (FA424)pertussis, RSVActive
+ + +

View 2 closed organisations

+ + + {% if closedOrganisationsCount > 0 %} +

View {{ closedOrganisationsCount | plural("closed organisation") }}

+ {% endif %} + +{% endblock %} From c929d06f0bfc94382c7da3fc3f98d37360d0d2b5 Mon Sep 17 00:00:00 2001 From: johnrimmer2 Date: Tue, 21 Oct 2025 14:34:07 +0100 Subject: [PATCH 2/2] changes --- app/views/regions/delete.html | 38 +++++++++++++++++++++++++++++++++++ app/views/regions/index1.html | 10 ++++----- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 app/views/regions/delete.html diff --git a/app/views/regions/delete.html b/app/views/regions/delete.html new file mode 100644 index 00000000..bdbcf336 --- /dev/null +++ b/app/views/regions/delete.html @@ -0,0 +1,38 @@ +{% extends 'layout.html' %} + +{% set pageName = "Deactivate " + organisation.name %} +{% set currentSection = "organisations" %} + +{% block header %} + {% include "includes/header-logged-in-region.html" %} +{% endblock %} + +{% block beforeContent %} + {{ backLink({ + href: "/regions/organisations/" + organisation.id, + text: "Back" + }) }} +{% endblock %} + +{% block content %} +
+
+ +

Delete Central Manchester University Hospitals NHS Foundation Trust (RW3)

+ +

Once you delete this organisation, no one at Central Manchester University Hospitals NHS Foundation Trust will be able to record vaccinations.

+ +

You can add this organisation back at any time.

+ + + +
+ {{ button({ + "text": "Delete organisation", + classes: "nhsuk-button--warning" + }) }} +
+ +
+
+{% endblock %} diff --git a/app/views/regions/index1.html b/app/views/regions/index1.html index d9dd6d91..4bad70cd 100644 --- a/app/views/regions/index1.html +++ b/app/views/regions/index1.html @@ -20,7 +20,7 @@

{{ pageName }}

Information: -

You can only delete an organisation if they have not recorded any vaccinations.

+

You can only delete an organisation if they have not recorded any vaccinations.

@@ -40,7 +40,7 @@

Current organisations

@@ -70,7 +70,7 @@

Current organisations

- Alder Hey Children's NHS Foundation Trus (RBS) + Alder Hey Children's NHS Foundation Trust (RBS) COVID-19, flu, pertussis, RSV, MMR, pneumococcal Deactivated @@ -80,7 +80,7 @@

Current organisations

Central Manchester University Hospitals NHS Foundation Trust (RW3) COVID-19, flu, pertussis, RSV Invited - Delete + Delete @@ -98,7 +98,7 @@

Current organisations

- Norfolk and Norwich University Hospitals NHS Foundation Trus (RM1) + Norfolk and Norwich University Hospitals NHS Foundation Trust (RM1) pertussis, RSV Active