diff --git a/app/assets/sass/_overrides.scss b/app/assets/sass/_overrides.scss index 546b6b084..589aa38ec 100644 --- a/app/assets/sass/_overrides.scss +++ b/app/assets/sass/_overrides.scss @@ -5,13 +5,17 @@ } } +.nhsuk-width-container { + max-width: 1100px; +} + .app-pre-footer-banner { border-top: 1px solid #b1b4b6; } .app-pre-footer-banner .govuk-phase-banner__content { display: flex; - flex-wrap: nowrap; + flex-wrap: wrap; align-items: baseline; @include nhsuk-font(16); margin-top: 24px; diff --git a/app/assets/sass/components/_related-nav.scss b/app/assets/sass/components/_related-nav.scss index 77deba5eb..bf6dc5d16 100755 --- a/app/assets/sass/components/_related-nav.scss +++ b/app/assets/sass/components/_related-nav.scss @@ -23,3 +23,4 @@ list-style: none; padding-left: 0; } + diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 974636a5c..7f86571e7 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -1,5 +1,6 @@ // Import NHS.UK frontend library @import "nhsuk-frontend/dist/nhsuk"; +@import "../../../node_modules/@x-govuk/govuk-prototype-components/src/x-govuk"; // Local override classes @import 'overrides'; @@ -149,3 +150,184 @@ border-radius: 3px; .nhsuk-checkboxes__item[hidden] { display: none; } + +.x-govuk-sub-navigation__section-item--current { + background-color: transparent; +} + +.app-pharmacy-back-link { + margin-bottom: 24px; +} + +.app-pharmacy-page-title { + margin-bottom: nhsuk-spacing(6); +} + +@include nhsuk-media-query($from: tablet) { + .app-pharmacy-back-link { + margin-bottom: 48px; + } +} + +.app-section-navigation { + margin-bottom: nhsuk-spacing(4); +} + +.app-section-navigation__list { + @include nhsuk-font(19); + + display: flex; + flex-flow: row nowrap; + gap: nhsuk-spacing(1) nhsuk-spacing(2); + list-style: none; + margin: 0; + padding: 0; + box-shadow: inset 0 -1px $nhsuk-border-colour; + overflow-x: auto; +} + +.app-section-navigation__item { + margin: 0; +} + +.app-section-navigation__link { + @include nhsuk-link-style-default; + @include nhsuk-link-style-no-visited-state; + + display: block; + padding: nhsuk-spacing(2) 2px; + text-decoration: none; + white-space: nowrap; +} + +.app-section-navigation__link[aria-current="page"] { + box-shadow: inset 0 -4px $nhsuk-link-colour; +} + +.app-section-navigation__link[aria-current="page"]:focus { + box-shadow: inset 0 -4px $nhsuk-text-colour; +} + +.app-section-navigation__current { + font-weight: 700; +} + +.app-section-navigation--vertical .app-section-navigation__list { + flex-flow: column; + gap: 0; + box-shadow: none; + overflow: visible; +} + +.app-section-navigation--vertical .app-section-navigation__item { + border-left: 4px solid transparent; +} + +.app-section-navigation--vertical .app-section-navigation__item--current { + border-left-color: $nhsuk-link-colour; +} + +.app-section-navigation--vertical .app-section-navigation__link { + padding: nhsuk-spacing(1) nhsuk-spacing(2) nhsuk-spacing(1) calc(#{nhsuk-spacing(2)} + 4px); +} + +.app-section-navigation--vertical .app-section-navigation__link[aria-current="page"] { + box-shadow: none; +} + +.app-section-navigation--vertical .app-section-navigation__link[aria-current="page"]:focus { + box-shadow: inset 0 -4px $nhsuk-text-colour; +} + +.app-pharmacy-users-table-responsive { + container-name: pharmacy-users-table; + container-type: inline-size; + max-width: 100%; +} + +.app-pharmacy-users-table { + width: 100%; +} + +.app-pharmacy-users-table .app-pharmacy-users-vaccinator { + white-space: nowrap; + width: 1%; +} + +.app-pharmacy-users-actions a { + display: block; +} + +.app-pharmacy-users-actions a + a { + margin-top: nhsuk-spacing(1); +} + +@media (max-width: 1200px) { + .app-pharmacy-layout-nav, + .app-pharmacy-layout-content { + float: none; + width: 100%; + } + + .app-pharmacy-layout-nav { + margin-bottom: nhsuk-spacing(4); + } +} + +@container pharmacy-users-table (max-width: 700px) { + .app-pharmacy-users-table { + min-width: 0; + } + + .app-pharmacy-users-table thead { + display: none; + } + + .app-pharmacy-users-table, + .app-pharmacy-users-table tbody, + .app-pharmacy-users-table tr, + .app-pharmacy-users-table td { + display: block; + width: 100%; + } + + .app-pharmacy-users-table tr { + box-sizing: border-box; + border-bottom: 1px solid $nhsuk-border-colour; + margin-bottom: nhsuk-spacing(3); + padding-bottom: nhsuk-spacing(2); + } + + .app-pharmacy-users-table td { + border-bottom: 0; + min-width: 0; + padding: nhsuk-spacing(1) 0; + } + + .app-pharmacy-users-table td::before { + content: attr(data-label); + display: block; + font-weight: 700; + margin-bottom: 2px; + } + + .app-pharmacy-users-actions a { + display: inline; + margin-right: nhsuk-spacing(3); + } + + .app-pharmacy-users-actions a + a { + margin-top: 0; + } +} + +@include nhsuk-media-query($from: tablet) { + .app-pharmacy-users-table { + min-width: 760px; + } + + .app-section-navigation--vertical { + margin-right: -#{nhsuk-spacing(2)}; + margin-left: -#{nhsuk-spacing(2)}; + } +} diff --git a/app/components/secondary-navigation/_secondary-navigation.scss b/app/components/secondary-navigation/_secondary-navigation.scss index f89d0389c..5c623916f 100644 --- a/app/components/secondary-navigation/_secondary-navigation.scss +++ b/app/components/secondary-navigation/_secondary-navigation.scss @@ -62,3 +62,32 @@ padding-bottom: nhsuk-spacing(4) - $_current-link-border-width; } } + + .app-secondary-navigation--side { + border-bottom: 0; + border-left: 4px solid $nhsuk-border-colour; + margin-bottom: nhsuk-spacing(6); + padding-left: nhsuk-spacing(3); + } + + .app-secondary-navigation--side .app-secondary-navigation__list { + @include nhsuk-font(19); + + display: block; + margin-bottom: 0; + } + + .app-secondary-navigation--side .app-secondary-navigation__list-item { + margin: 0 0 nhsuk-spacing(2); + padding: 0; + } + + .app-secondary-navigation--side .app-secondary-navigation__list-item:not(:last-child) { + margin-right: 0; + } + + .app-secondary-navigation--side .app-secondary-navigation__list-item--current { + border-left-width: $_current-link-border-width; + margin-left: ((nhsuk-spacing(2) + $_current-link-border-width) * -1); + padding-left: nhsuk-spacing(2); + } diff --git a/app/components/x-govuk-secondary-navigation/macro.njk b/app/components/x-govuk-secondary-navigation/macro.njk new file mode 100644 index 000000000..d2b639cc8 --- /dev/null +++ b/app/components/x-govuk-secondary-navigation/macro.njk @@ -0,0 +1,3 @@ +{% macro xGovukSecondaryNavigation(params) %} + {%- include "./template.njk" -%} +{% endmacro %} diff --git a/app/components/x-govuk-secondary-navigation/template.njk b/app/components/x-govuk-secondary-navigation/template.njk new file mode 100644 index 000000000..dd4fc4f6b --- /dev/null +++ b/app/components/x-govuk-secondary-navigation/template.njk @@ -0,0 +1,16 @@ +{% from "../../../node_modules/nhsuk-frontend/dist/nhsuk/macros/attributes.njk" import nhsukAttributes %} + + diff --git a/app/components/x-govuk-sub-navigation/macro.njk b/app/components/x-govuk-sub-navigation/macro.njk new file mode 100644 index 000000000..d35b43004 --- /dev/null +++ b/app/components/x-govuk-sub-navigation/macro.njk @@ -0,0 +1,3 @@ +{% macro xGovukSubNavigation(params) %} + {%- include "./template.njk" -%} +{% endmacro %} diff --git a/app/components/x-govuk-sub-navigation/template.njk b/app/components/x-govuk-sub-navigation/template.njk new file mode 100644 index 000000000..7fa95c7d8 --- /dev/null +++ b/app/components/x-govuk-sub-navigation/template.njk @@ -0,0 +1,33 @@ +{% from "../../../node_modules/nhsuk-frontend/dist/nhsuk/macros/attributes.njk" import nhsukAttributes -%} + + diff --git a/app/data/organisations.js b/app/data/organisations.js index bfe3b7bd9..2412317c4 100644 --- a/app/data/organisations.js +++ b/app/data/organisations.js @@ -186,9 +186,9 @@ module.exports = [ }, { id: "RVL", - name: "Barnet and chase farm Hospitals NHS Trust", + name: "Barnet and Chase Farm Hospitals NHS Trust", address: { - line1: "Barnet General hospital", + line1: "Barnet General Hospital", town: "Barnet", postcode: "EN5 3DJ" }, @@ -222,7 +222,7 @@ module.exports = [ }, { id: "RRP", - name: "Barnet, enfield and haringey mental Health NHS Trust", + name: "Barnet, Enfield and Haringey Mental Health NHS Trust", address: { line1: "Trust headquarters block b2", town: "London", @@ -240,7 +240,7 @@ module.exports = [ }, { id: "RCN", - name: "Barnsley Community and priority services NHS Trust", + name: "Barnsley Community and Priority Services NHS Trust", address: { line1: "Kendray hospital", town: "Barnsley", @@ -7694,7 +7694,7 @@ module.exports = [ id: "RDC", name: "Wellhouse NHS Trust", address: { - line1: "Barnet hospital", + line1: "Barnet Hospital", town: "Barnet", postcode: "EN5 3DJ" }, diff --git a/app/routes/pharmacies.js b/app/routes/pharmacies.js index 20638aa45..aadf3db10 100644 --- a/app/routes/pharmacies.js +++ b/app/routes/pharmacies.js @@ -16,6 +16,7 @@ const hasVaccinationRecords = (data, organisationId) => { } const scenarioCompanyIds = ['P0191N', 'P15951'] +const allowedPharmacyVaccineNames = ['flu', 'COVID-19', 'MenB'] const isoDaysAgo = (daysAgo) => { const date = new Date() @@ -846,7 +847,7 @@ module.exports = router => { req.session.data.permissionLevel = '' req.session.data.vaccinator = '' - res.redirect(`/pharmacies/${organisation.id}?added=true&addedUserId=${addedUserId}&tab=${existingUser ? 'active' : 'invited'}`) + res.redirect(`/pharmacies/${organisation.id}?section=users&added=true&addedUserId=${addedUserId}&tab=${existingUser ? 'active' : 'invited'}`) }) @@ -905,7 +906,7 @@ module.exports = router => { return res.redirect(`/pharmacies/users/${user.id}?deactivatedFromPharmacyId=${pharmacy.id}`) } - res.redirect(`/pharmacies/${pharmacy.id}?tab=deactivated&deactivatedUserId=${user.id}&deactivatedFromPharmacyId=${pharmacy.id}`) + res.redirect(`/pharmacies/${pharmacy.id}?section=users&tab=deactivated&deactivatedUserId=${user.id}&deactivatedFromPharmacyId=${pharmacy.id}`) }) @@ -934,7 +935,7 @@ module.exports = router => { } if (!user) { - return res.redirect(`/pharmacies/${pharmacyId}?tab=invited`) + return res.redirect(`/pharmacies/${pharmacyId}?section=users&tab=invited`) } res.render('pharmacies/users/resend-invite', { @@ -958,12 +959,12 @@ module.exports = router => { const role = (user.organisations || []).find((item) => item.id === pharmacyId) if (!role) { - return res.redirect(`/pharmacies/${pharmacyId}?tab=invited`) + return res.redirect(`/pharmacies/${pharmacyId}?section=users&tab=invited`) } role.inviteSent = new Date().toISOString() - res.redirect(`/pharmacies/${pharmacyId}?tab=invited`) + res.redirect(`/pharmacies/${pharmacyId}?section=users&tab=invited`) }) router.get('/pharmacies/:pharmacyId/users/:userId/reactivate', (req, res) => { @@ -992,13 +993,13 @@ module.exports = router => { } if (!user) { - return res.redirect(`/pharmacies/${pharmacyId}?tab=deactivated`) + return res.redirect(`/pharmacies/${pharmacyId}?section=users&tab=deactivated`) } const role = (user.organisations || []).find((item) => item.id === pharmacyId) if (!role) { - return res.redirect(`/pharmacies/${pharmacyId}?tab=deactivated`) + return res.redirect(`/pharmacies/${pharmacyId}?section=users&tab=deactivated`) } role.status = 'Active' @@ -1006,7 +1007,7 @@ module.exports = router => { user.lastLogIn = new Date().toISOString().split('T')[0] } - res.redirect(`/pharmacies/${pharmacyId}?tab=active&reactivatedUserId=${userId}&reactivatedFromPharmacyId=${pharmacyId}`) + res.redirect(`/pharmacies/${pharmacyId}?section=users&tab=active&reactivatedUserId=${userId}&reactivatedFromPharmacyId=${pharmacyId}`) }) router.get('/pharmacies/users/:userId/deactivate-from-all-pharmacies', (req, res) => { @@ -1236,6 +1237,78 @@ module.exports = router => { } }) + router.get('/pharmacies/:id/edit-vaccines', (req, res) => { + const data = req.session.data + const { id } = req.params + const organisation = data.organisations.find((org) => org.id === id) + + if (!organisation) { + return res.redirect('/pharmacies') + } + + const enabledVaccineNames = (organisation.vaccines || []) + .filter((vaccine) => vaccine.status === 'enabled') + .filter((vaccine) => allowedPharmacyVaccineNames.includes(vaccine.name)) + .map((vaccine) => vaccine.name) + + const availableVaccines = (data.vaccines || []) + .filter((vaccine) => allowedPharmacyVaccineNames.includes(vaccine.name)) + .filter((vaccine) => !enabledVaccineNames.includes(vaccine.name)) + + res.render('pharmacies/edit-vaccines', { + organisation, + allVaccines: availableVaccines + }) + }) + + router.post('/pharmacies/:id/update-vaccines', (req, res) => { + const data = req.session.data + const { id } = req.params + const organisation = data.organisations.find((org) => org.id === id) + + if (!organisation) { + return res.redirect('/pharmacies') + } + + const selectedVaccinesRaw = req.body.vaccinesEnabled + const selectedVaccines = Array.isArray(selectedVaccinesRaw) + ? selectedVaccinesRaw + : (selectedVaccinesRaw ? [selectedVaccinesRaw] : []) + + organisation.vaccines ||= [] + let vaccinesUpdatedCount = 0 + + for (const vaccineName of selectedVaccines) { + if (!allowedPharmacyVaccineNames.includes(vaccineName)) { + continue + } + + const existingVaccine = organisation.vaccines.find((vaccine) => vaccine.name === vaccineName) + + if (existingVaccine) { + if (existingVaccine.status !== 'enabled') { + vaccinesUpdatedCount += 1 + } + existingVaccine.status = 'enabled' + } else { + vaccinesUpdatedCount += 1 + organisation.vaccines.push({ + name: vaccineName, + status: 'enabled' + }) + } + } + + return res.redirect(`/pharmacies/${id}?section=vaccines&vaccinesUpdated=true&vaccinesUpdatedCount=${vaccinesUpdatedCount}`) + }) + + router.get('/pharmacies/:id/remove-vaccine', (req, res) => { + const { id } = req.params + + // Group admins can no longer remove vaccines from pharmacies. + return res.redirect(`/pharmacies/${id}?section=vaccines`) + }) + router.get('/pharmacies/:id', async (req, res) => { const data = req.session.data @@ -1247,7 +1320,10 @@ module.exports = router => { const deactivatedFromPharmacyId = req.query.deactivatedFromPharmacyId const reactivatedUserId = req.query.reactivatedUserId const reactivatedFromPharmacyId = req.query.reactivatedFromPharmacyId + const vaccinesUpdated = req.query.vaccinesUpdated + const vaccinesUpdatedCount = Number.parseInt(req.query.vaccinesUpdatedCount, 10) || 0 const tab = (req.query.tab || 'active').toLowerCase() + const section = (req.query.section || 'overview').toLowerCase() const organisation = data.organisations.find((organisation) => organisation.id === id) @@ -1270,6 +1346,13 @@ module.exports = router => { const deactivatedUser = data.users.find((user) => user.id === deactivatedUserId) const reactivatedUser = data.users.find((user) => user.id === reactivatedUserId) const canDeletePharmacy = !hasVaccinationRecords(data, id) + const enabledAllowedVaccineNames = (organisation.vaccines || []) + .filter((vaccine) => vaccine.status === 'enabled') + .filter((vaccine) => allowedPharmacyVaccineNames.includes(vaccine.name)) + .map((vaccine) => vaccine.name) + const hasAvailableVaccinesToAdd = allowedPharmacyVaccineNames.some((vaccineName) => { + return !enabledAllowedVaccineNames.includes(vaccineName) + }) const userOrganisationPermissions = {} @@ -1314,6 +1397,8 @@ module.exports = router => { const validTabs = ['invited', 'active', 'deactivated'] const currentTab = validTabs.includes(tab) ? tab : 'active' + const validSections = ['overview', 'users', 'vaccines', 'action'] + const currentPageSection = validSections.includes(section) ? section : 'overview' const usersForTab = usersByStatus[currentTab] res.render('pharmacies/pharmacy', { @@ -1329,7 +1414,11 @@ module.exports = router => { deactivatedFromPharmacyId, reactivatedUser, reactivatedFromPharmacyId, - canDeletePharmacy + vaccinesUpdated, + vaccinesUpdatedCount, + canDeletePharmacy, + currentPageSection, + hasAvailableVaccinesToAdd }) }) diff --git a/app/routes/regions.js b/app/routes/regions.js index 6fdefc3d0..984106047 100644 --- a/app/routes/regions.js +++ b/app/routes/regions.js @@ -164,24 +164,111 @@ module.exports = router => { router.get('/regions/organisations/:id', (req, res) => { const data = req.session.data const id = req.params.id + const section = (req.query.section || 'overview').toLowerCase() + const tab = (req.query.tab || 'active').toLowerCase() + const removedVaccine = req.query.removedVaccine + const vaccinesAdded = req.query.vaccinesAdded + const vaccinesAddedCount = Number.parseInt(req.query.vaccinesAddedCount, 10) || 0 const organisation = data.organisations.find((org) => org.id === id) if (!organisation) { res.redirect('/regions/'); return } const users = data.users.filter((user) => (user.organisations || []).find((organisation) => organisation.id === id)) + const usersByStatus = { + invited: [], + active: [], + deactivated: [] + } + + for (const user of users) { + const userOrganisationSettings = (user.organisations || []).find((userOrganisation) => userOrganisation.id === id) + const status = (userOrganisationSettings && userOrganisationSettings.status || 'Active').toLowerCase() + + if (status === 'invited') { + usersByStatus.invited.push(user) + } else if (status === 'deactivated') { + usersByStatus.deactivated.push(user) + } else { + usersByStatus.active.push(user) + } + } + + const validTabs = ['invited', 'active', 'deactivated'] + const currentTab = validTabs.includes(tab) ? tab : 'active' + const validSections = ['overview', 'users', 'vaccines', 'action'] + const currentPageSection = validSections.includes(section) ? section : 'overview' + const usersForTab = usersByStatus[currentTab] const vaccines = organisation.vaccines || [] const vaccinesEnabled = vaccines.filter((vaccine) => vaccine.status === "enabled") + const canAddVaccines = vaccinesEnabled.length < (data.vaccines || []).length const messages = (res.locals.currentOrganisation.inbox || []).filter((message) => message.fromOrganisationId === id) res.render('regions/organisation', { organisation, - users, + users: usersForTab, + usersByStatus, + currentTab, + currentPageSection, vaccinesEnabled, + canAddVaccines, + removedVaccine, + vaccinesAdded, + vaccinesAddedCount, messages }) }) + router.get('/regions/organisations/:id/remove-vaccine', (req, res) => { + const data = req.session.data + const id = req.params.id + const vaccineName = req.query.vaccineName + const organisation = data.organisations.find((org) => org.id === id) + if (!organisation) { res.redirect('/regions/'); return } + + if (!vaccineName) { + res.redirect(`/regions/organisations/${id}?section=vaccines`) + return + } + + const existingEnabledVaccine = (organisation.vaccines || []).find((vaccine) => vaccine.name === vaccineName && vaccine.status === 'enabled') + + if (!existingEnabledVaccine) { + res.redirect(`/regions/organisations/${id}?section=vaccines`) + return + } + + res.render('regions/remove-vaccine', { + organisation, + vaccineName + }) + }) + + router.post('/regions/organisations/:id/remove-vaccine', (req, res) => { + const data = req.session.data + const id = req.params.id + const vaccineName = req.body.vaccineName + const organisation = data.organisations.find((org) => org.id === id) + if (!organisation) { res.redirect('/regions/'); return } + + if (!vaccineName) { + res.redirect(`/regions/organisations/${id}?section=vaccines`) + return + } + + organisation.vaccines ||= [] + + const existingVaccine = organisation.vaccines.find((vaccine) => vaccine.name === vaccineName && vaccine.status === 'enabled') + + if (existingVaccine) { + existingVaccine.status = 'disabled' + res.redirect(`/regions/organisations/${id}?section=vaccines&removedVaccine=${encodeURIComponent(vaccineName)}`) + return + } + + res.redirect(`/regions/organisations/${id}?section=vaccines`) + }) + // Viewing the page to set vaccines per organisation router.get('/regions/organisations/:id/add-vaccines', (req, res) => { const data = req.session.data @@ -209,17 +296,25 @@ module.exports = router => { const organisation = data.organisations.find((org) => org.id === id) if (!organisation) { res.redirect('/regions/'); return } - const vaccinesToAdd = data.vaccinesToAdd + const vaccinesToAddRaw = data.vaccinesToAdd + const vaccinesToAdd = Array.isArray(vaccinesToAddRaw) + ? vaccinesToAddRaw + : (vaccinesToAddRaw ? [vaccinesToAddRaw] : []) const vaccines = organisation.vaccines || [] + let vaccinesAddedCount = 0 for (let vaccineToAdd of vaccinesToAdd) { const existingVaccine = vaccines.find((vaccine) => vaccine.name === vaccineToAdd) if (existingVaccine) { + if (existingVaccine.status !== 'enabled') { + vaccinesAddedCount += 1 + } existingVaccine.status = "enabled" } else { + vaccinesAddedCount += 1 vaccines.push({ name: vaccineToAdd, @@ -229,7 +324,7 @@ module.exports = router => { } - res.redirect(`/regions/organisations/${id}`) + res.redirect(`/regions/organisations/${id}?section=vaccines&vaccinesAdded=true&vaccinesAddedCount=${vaccinesAddedCount}`) }) diff --git a/app/views/errors/vaccine-disabled.html b/app/views/errors/vaccine-disabled.html new file mode 100644 index 000000000..39ac17049 --- /dev/null +++ b/app/views/errors/vaccine-disabled.html @@ -0,0 +1,22 @@ +{% extends 'layout.html' %} + +{% set pageName = "There is a problem saving this vaccination" %} + +{% block content %} +
+
+

{{ pageName }}

+ +

You cannot save this vaccination because a regional lead has removed your access to [vaccine name] vaccines.

+ +

If you have already vaccinated the patient, record it on paper and contact your regional lead.

+ +

Go back to the Check and confirm page to see details of the vaccination.

+

Download our paper form (opens in new tab)

+ + +
+
+ + +{% endblock %} diff --git a/app/views/index.html b/app/views/index.html index 1c88c4804..fa25b97ba 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -123,6 +123,7 @@

Error pages

  • Sorry, there is a problem with the service (500 error)
  • Sorry, the service is unavailable (503 error)
  • Rate limited (429 error)
    • +
  • Problem saving the vaccination (Regional admin has removed vaccines mid-recording)
  • Sorry there is a problem with your account (user deactivated)
  • We cannot find a user with this email (after a successful 3rd party login)
  • You previously logged in a different way (Keycloak error)
    • diff --git a/app/views/layout.html b/app/views/layout.html index 372500454..0913025c4 100755 --- a/app/views/layout.html +++ b/app/views/layout.html @@ -8,6 +8,8 @@ {% extends "prototype-kit-template.njk" %} {% from '../components/secondary-navigation/macro.njk' import appSecondaryNavigation %} +{% from '../components/x-govuk-secondary-navigation/macro.njk' import xGovukSecondaryNavigation %} +{% from '../components/x-govuk-sub-navigation/macro.njk' import xGovukSubNavigation %} {% block head %} @@ -28,14 +30,16 @@ {% block footer %}
    -

    - - New features - - - We regularly update the service. Find out more in What's new (opens in new tab) - -

    +
    +

    + + New features + + + We regularly update the service. Find out more in What's new (opens in new tab) + +

    +
    {{ footer({ diff --git a/app/views/messaging/new-vaccine-notification.html b/app/views/messaging/new-vaccine-notification.html new file mode 100644 index 000000000..40d86c36b --- /dev/null +++ b/app/views/messaging/new-vaccine-notification.html @@ -0,0 +1,92 @@ +{% extends 'layout.html' %} + +{% set pageName = "New vaccine notification" %} + +{% set currentSection = "vaccinate" %} + +{% block content %} +
    +
    + + {% set notificationHtml %} +

    + You can now use Record a vaccination for [vaccine name] vaccinations.

    +

    Make sure an administrator has added batches before you start recording. +

    + {% endset %} + + {{ notificationBanner({ + html: notificationHtml + }) }} + + + {% if (errorList | length) > 0 %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} + +
    + + {% set nhsNumberHtml %} + + {{ input({ + id: "nhs-number", + name: "nhsNumber", + classes: "nhsuk-input--width-10", + inputmode: "numeric", + errorMessage: nhsNumberError, + label: { + text: "NHS number", + classes: "nhsuk-label--s" + }, + value: data.nhsNumber, + hint: { + text: "For example, 485 777 3456" + } + }) }} + {% endset %} + + + {{ radios({ + idPrefix: "nhs-number-known", + name: "nhsNumberKnown", + fieldset: { + legend: { + html: "Do you have the patient’s NHS number?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: "true" + } + }, + value: data.nhsNumberKnown, + errorMessage: nhsNumberKnownError if nhsNumberKnownError, + items: [ + { + value: "yes", + text: "Yes", + conditional: { + html: nhsNumberHtml + } + }, + { + value: "no", + text: "No" + } + ] + }) }} + + {# This is to make sure the right options are shown on the 'Done' page. #} + + + + + {{ button({ + text: "Continue" + })}} +
    + +
    +
    + +{% endblock %} diff --git a/app/views/messaging/vaccine-removed-notification.html b/app/views/messaging/vaccine-removed-notification.html new file mode 100644 index 000000000..be1661e94 --- /dev/null +++ b/app/views/messaging/vaccine-removed-notification.html @@ -0,0 +1,91 @@ +{% extends 'layout.html' %} + +{% set pageName = "Vaccine removed notification" %} + +{% set currentSection = "vaccinate" %} + +{% block content %} +
    +
    + + {% set notificationHtml %} +

    + You can no longer record or edit [vaccine name] vaccinations at [organisation name].

    +

    If you still need access to [vaccine name] vaccinations, contact your regional lead.

    + {% endset %} + + {{ notificationBanner({ + html: notificationHtml + }) }} + + + {% if (errorList | length) > 0 %} + {{ errorSummary({ + titleText: "There is a problem", + errorList: errorList + }) }} + {% endif %} + +
    + + {% set nhsNumberHtml %} + + {{ input({ + id: "nhs-number", + name: "nhsNumber", + classes: "nhsuk-input--width-10", + inputmode: "numeric", + errorMessage: nhsNumberError, + label: { + text: "NHS number", + classes: "nhsuk-label--s" + }, + value: data.nhsNumber, + hint: { + text: "For example, 485 777 3456" + } + }) }} + {% endset %} + + + {{ radios({ + idPrefix: "nhs-number-known", + name: "nhsNumberKnown", + fieldset: { + legend: { + html: "Do you have the patient’s NHS number?", + classes: "nhsuk-fieldset__legend--l", + isPageHeading: "true" + } + }, + value: data.nhsNumberKnown, + errorMessage: nhsNumberKnownError if nhsNumberKnownError, + items: [ + { + value: "yes", + text: "Yes", + conditional: { + html: nhsNumberHtml + } + }, + { + value: "no", + text: "No" + } + ] + }) }} + + {# This is to make sure the right options are shown on the 'Done' page. #} + + + + + {{ button({ + text: "Continue" + })}} +
    + +
    +
    + +{% endblock %} diff --git a/app/views/pharmacies/add-user-check.html b/app/views/pharmacies/add-user-check.html index 2ee30845e..8794745fb 100644 --- a/app/views/pharmacies/add-user-check.html +++ b/app/views/pharmacies/add-user-check.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Check" %} +{% set pageName = "Check and add user" %} {% set currentSection = "pharmacies" %} @@ -15,7 +15,9 @@
    -

    Check and {% if existingUserWithSameEmail %}reactivate{% else %}add{% endif %} user to {{ organisation.name }} ({{ organisation.id }})

    +
    {{ organisation.name }} ({{ organisation.id }})
    + +

    Check and add user

    {% set nameText %} {% if existingUser %} diff --git a/app/views/pharmacies/add-user-permission-level.html b/app/views/pharmacies/add-user-permission-level.html index 3a8f2b6e1..4924fee10 100644 --- a/app/views/pharmacies/add-user-permission-level.html +++ b/app/views/pharmacies/add-user-permission-level.html @@ -2,12 +2,13 @@ {% set currentSection = "pharmacies" %} {% if existingUser %} - {% set pageName = existingUser.firstName + " " + existingUser.lastName + "'s role at " + organisation.name + " (" + organisation.id + ")" %} + {% set roleHeading = existingUser.firstName + " " + existingUser.lastName + "'s role" %} {% elseif data.firstName or data.lastName %} - {% set pageName = (data.firstName + " " + data.lastName) + "'s role at " + organisation.name + " (" + organisation.id + ")" %} + {% set roleHeading = (data.firstName + " " + data.lastName) + "'s role" %} {% else %} - {% set pageName = "New user's role at " + organisation.name + " (" + organisation.id + ")" %} + {% set roleHeading = "New user's role" %} {% endif %} +{% set pageName = roleHeading %} {% block beforeContent %} {{ backLink({ @@ -46,15 +47,9 @@ }) }} {% endif %} -

    - {% 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 %} -

    +
    {{ organisation.name }} ({{ organisation.id }})
    + +

    {{ roleHeading }}

    diff --git a/app/views/pharmacies/add-user.html b/app/views/pharmacies/add-user.html index c05d68db6..37a8d8e0a 100644 --- a/app/views/pharmacies/add-user.html +++ b/app/views/pharmacies/add-user.html @@ -1,7 +1,7 @@ {% extends 'layout.html' %} {% set currentSection = "pharmacies" %} -{% set pageName = "Add a user to " + organisation.name + " (" + organisation.id + ")" %} +{% set pageName = "Which user would you like to add?" %} {% block beforeContent %} {{ backLink({ @@ -24,7 +24,9 @@ }) }} {% endif %} -

    {{ pageName }}

    +
    {{ organisation.name }} ({{ organisation.id }})
    + +

    Which user would you like to add?

    You can add an existing user to the pharmacy, or invite a new user.

    diff --git a/app/views/pharmacies/edit-vaccines.html b/app/views/pharmacies/edit-vaccines.html new file mode 100644 index 000000000..22cad92f9 --- /dev/null +++ b/app/views/pharmacies/edit-vaccines.html @@ -0,0 +1,46 @@ +{% extends 'layout.html' %} + +{% set currentSection = "pharmacies" %} +{% set pageName = "Edit vaccines for " + organisation.name %} + +{% block beforeContent %} + {{ backLink({ + href: "/pharmacies/" + organisation.id, + text: "Back" + }) }} +{% endblock %} + +{% block content %} +
    +
    + + {% set items = [] %} + + {% for vaccine in (allVaccines | sort(false, false, "name")) %} + {% set items = (items.push({ + value: vaccine.name, + text: "Men-B" if vaccine.name == "MenB" else (vaccine.name | capitaliseFirstLetter) + }), items) %} + {% endfor %} + +
    {{ organisation.name }} ({{ organisation.id }})
    + + {{ checkboxes({ + name: "vaccinesEnabled", + 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/pharmacies/pharmacy.html b/app/views/pharmacies/pharmacy.html index 3e2f7268d..9e00092dc 100644 --- a/app/views/pharmacies/pharmacy.html +++ b/app/views/pharmacies/pharmacy.html @@ -3,17 +3,21 @@ {% set currentSection = "pharmacies" %} {% set pageName = organisation.name %} +{% set mainClasses = "nhsuk-u-padding-top-0" %} {% block beforeContent %} - {{ backLink({ - href: "/pharmacies" - }) }} {% endblock %} {% block content %}
    + {{ backLink({ + href: "/pharmacies", + text: "Back to all pharmacies", + classes: "app-pharmacy-back-link" + }) }} + {% if added %} {% set html %}

    @@ -70,7 +74,20 @@

    }) }} {% endif %} -

    {{ pageName }}

    + {% if vaccinesUpdated == "true" %} + {% set html %} +

    + {{ "Vaccine" if vaccinesUpdatedCount == 1 else "Vaccines" }} added +

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

    {{ pageName }} ({{ organisation.id }})

    {% set addressParts = [] %} {% if organisation.address.line1 %} @@ -83,104 +100,139 @@

    {{ pageName }}

    {% set addressParts = (addressParts.push(organisation.address.postcode), addressParts) %} {% endif %} - {{ summaryList({ - rows: [ - { - key: { - text: "ODS code" - }, - value: { - text: organisation.id - } - }, - { - key: { - text: "Address" - }, - value: { - text: addressParts | join(", ") - } - }, - { - key: { - text: "Vaccines" - }, - value: { - text: "COVID-19, flu" - } - } - ] - }) }} - - {% if organisation.status != 'Deactivated' %} - {{ button({ - href: "/pharmacies/" + organisation.id + "/view-as", - text: "Access this pharmacy", - classes: "nhsuk-button--secondary" - }) }} + {% set addressText = addressParts | join(", ") %} + + {% set vaccinesEnabled = [] %} + {% for vaccine in (organisation.vaccines or []) %} + {% if vaccine.status == "enabled" %} + {% set vaccinesEnabled = (vaccinesEnabled.push(vaccine.name), vaccinesEnabled) %} + {% endif %} + {% endfor %} + + {% set vaccinesText = "None" %} + {% if (vaccinesEnabled | length) > 0 %} + {% set vaccinesText = (vaccinesEnabled | sort | join(", ")) | capitaliseFirstLetter %} {% endif %} +
    +
    - {% if organisation.status == 'Deactivated' %} -

    This pharmacy has been deactivated.

    +
    +
    + {% set actionNavText = "Overview" %} + {% if canDeletePharmacy %} + {% set actionNavText = "Delete pharmacy" %} + {% elif organisation.status != 'Deactivated' %} + {% set actionNavText = "Deactivate pharmacy" %} + {% endif %} -

    It will be closed in 90 days.

    - {% elif canDeletePharmacy %} -

    This pharmacy has not yet recorded any vaccinations. You can delete it if you added it by mistake.

    -

    Delete this pharmacy

    - {% else %} -

    If a pharmacy is no longer using Record a vaccination, you should deactivate it.

    + +
    +
    +
    +
    - {% if organisation.status != 'Deactivated' %} - {{ button({ - href: "/pharmacies/" + organisation.id + "/add-user", - text: "Add user" - }) }} - {% endif %} + {% if currentPageSection == "overview" %} - {% set totalUsers = (usersByStatus.invited | length) + (usersByStatus.active | length) + (usersByStatus.deactivated | length) %} - - {% if totalUsers > 0 %} - - {{ appSecondaryNavigation({ - visuallyHiddenTitle: "Users by status", - items: [{ - text: "Invited (" + (usersByStatus.invited | length) + ")", - href: "/pharmacies/" + organisation.id + "?tab=invited", - current: (currentTab == "invited") - }, { - text: "Active (" + (usersByStatus.active | length) + ")", - href: "/pharmacies/" + organisation.id + "?tab=active", - current: (currentTab == "active") - }, { - text: "Deactivated (" + (usersByStatus.deactivated | length) + ")", - href: "/pharmacies/" + organisation.id + "?tab=deactivated", - current: (currentTab == "deactivated") - }] - }) }} -
    -
    -
    -
    +

    Overview

    + + {{ summaryList({ + rows: [ + { + key: { + text: "ODS code" + }, + value: { + text: organisation.id + } + }, + { + key: { + text: "Address" + }, + value: { + text: addressText + } + }, + { + key: { + text: "Vaccines" + }, + value: { + text: vaccinesText + } + } + ] + }) }} + + {% if organisation.status != 'Deactivated' %} + {{ button({ + href: "/pharmacies/" + organisation.id + "/view-as", + text: "Access this pharmacy", + classes: "nhsuk-button--secondary" + }) }} + {% endif %} + + {% elif currentPageSection == "users" %} + +

    Users

    - {% if (users | length) > 0 %} + {% if organisation.status != 'Deactivated' %} + {{ button({ + href: "/pharmacies/" + organisation.id + "/add-user", + text: "Add user" + }) }} + {% endif %} - + {% set totalUsers = (usersByStatus.invited | length) + (usersByStatus.active | length) + (usersByStatus.deactivated | length) %} + + {% if totalUsers > 0 %} + + {{ appSecondaryNavigation({ + visuallyHiddenTitle: "Users by status", + items: [{ + text: "Invited (" + (usersByStatus.invited | length) + ")", + href: "/pharmacies/" + organisation.id + "?section=users&tab=invited", + current: (currentTab == "invited") + }, { + text: "Active (" + (usersByStatus.active | length) + ")", + href: "/pharmacies/" + organisation.id + "?section=users&tab=active", + current: (currentTab == "active") + }, { + text: "Deactivated (" + (usersByStatus.deactivated | length) + ")", + href: "/pharmacies/" + organisation.id + "?section=users&tab=deactivated", + current: (currentTab == "deactivated") + }] + }) }} + + {% if (users | length) > 0 %} + +
    +
    - {% if currentTab == "invited" %} - {% elif currentTab == "deactivated" %} - {% else %} - - - - - {% if currentTab == "invited" %} - {% elif currentTab == "deactivated" %} - {% else %} - {% endif %} - @@ -282,6 +331,7 @@

    Users

    {% endfor %}
    - Name - - Email + Name and email + Vaccinator @@ -190,7 +242,7 @@

    Users

    Invite sent     		+ Vaccinator @@ -200,7 +252,7 @@

    Users

    Reason deactivated     		+ Vaccinator @@ -220,20 +272,18 @@

    Users

    {% set inviteAgeDays = userOrganisationPermissions[user.id].inviteSent | daysSince %} {% set daysSinceLastLogIn = user.lastLogIn | daysSince %}
    + {{ user.firstName }} {{ user.lastName }} +
    {{ user.email }}
    		 - {{ user.email }} - + {{ "Yes" if userOrganisationPermissions[user.id].vaccinator else "No" }} + {{ userOrganisationPermissions[user.id].permissionLevel }} + {% if inviteAgeDays == 0 %} Today {% elif inviteAgeDays %} @@ -243,7 +293,7 @@

    Users

    {% endif %}     		+ {% if userOrganisationPermissions[user.id].deactivatedReason == "Deactivated by user" %} By {{ userOrganisationPermissions[user.id].deactivatedBy or ((currentUser.firstName + " " + currentUser.lastName) if currentUser else "User") }} {% elif userOrganisationPermissions[user.id].deactivatedReason %} @@ -255,7 +305,7 @@

    Users

    {% endif %}     		+ {% if daysSinceLastLogIn == 0 %} Today {% elif daysSinceLastLogIn %} @@ -265,7 +315,7 @@

    Users

    {% endif %}     		+ {% if currentTab == "invited" %} {% if inviteAgeDays > 7 %} Resend invite to {{ user.firstName }} {{ user.lastName }} @@ -274,7 +324,6 @@

    Users

    Reactivate {{ user.firstName }} {{ user.lastName }} {% else %} Change permission level for {{ user.firstName }} {{ user.lastName }} -   Deactivate {{ user.firstName }} {{ user.lastName }} {% endif %}
    +
    {% else %} {% if currentTab == "invited" %}

    No invited users.

    @@ -290,10 +340,75 @@

    Users

    {% else %}

    No active users.

    {% endif %} - {% endif %} + {% endif %} - {% endif %} + {% endif %} + + {% elif currentPageSection == "vaccines" %} + + {% set activeVaccines = [] %} + {% for vaccine in (organisation.vaccines or []) %} + {% if vaccine.status == "enabled" %} + {% set activeVaccines = (activeVaccines.push(vaccine.name), activeVaccines) %} + {% endif %} + {% endfor %} + +

    Vaccines

    + + {% if hasAvailableVaccinesToAdd %} + {{ button({ + href: "/pharmacies/" + organisation.id + "/edit-vaccines", + text: "Add vaccines" + }) }} + {% endif %} + + + + + + + + + {% for vaccineName in (activeVaccines | sort) %} + + + + {% endfor %} + {% if (activeVaccines | length) == 0 %} + + + + {% endif %} + +
    + Vaccines this pharmacy can record +
    + {{ vaccineName | capitaliseFirstLetter }} +
    + No active vaccines. +
    + + {% else %} + +
    + {% if organisation.status == 'Deactivated' %} +

    This pharmacy has been deactivated.

    + +

    It will be closed in 90 days.

    + {% elif canDeletePharmacy %} +

    This pharmacy has not yet recorded any vaccinations. You can delete it if you added it by mistake.

    +

    Delete this pharmacy

    + {% else %} +

    If a pharmacy is no longer using Record a vaccination, you should deactivate it.

    + +

    Deactivate this pharmacy

    + + {% endif %} +
    + {% endif %} +
    +
    diff --git a/app/views/regions/add-another-email-check.html b/app/views/regions/add-another-email-check.html index 779a06395..02403bdea 100644 --- a/app/views/regions/add-another-email-check.html +++ b/app/views/regions/add-another-email-check.html @@ -13,6 +13,8 @@ {% block content %}
    +
    {{ organisation.name }} ({{ organisation.id }})
    +

    {{ pageName }}

    This email will be sent to {{ data["email"] }}:

    diff --git a/app/views/regions/add-another-email.html b/app/views/regions/add-another-email.html index 593e9f4b1..90fde8e71 100644 --- a/app/views/regions/add-another-email.html +++ b/app/views/regions/add-another-email.html @@ -14,6 +14,8 @@
    +
    {{ organisation.name }} ({{ organisation.id }})
    +

    {{ pageName }}

    Choose a user at {{ organisation.name }}.

    diff --git a/app/views/regions/add-email.html b/app/views/regions/add-email.html index 4eacfdd82..4c0ee1f65 100644 --- a/app/views/regions/add-email.html +++ b/app/views/regions/add-email.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Add a user" %} +{% set pageName = "Add another user" %} {% set currentSection = "organisations" %} {% block beforeContent %} @@ -14,8 +14,9 @@
    +
    {{ organisation.name }} ({{ organisation.id }})
    -

    {{ pageName }}

    +

    Add another user

    Choose a user at {{ organisation.name }}.

    diff --git a/app/views/regions/add-vaccines.html b/app/views/regions/add-vaccines.html index ac8b8b754..76065140e 100644 --- a/app/views/regions/add-vaccines.html +++ b/app/views/regions/add-vaccines.html @@ -23,7 +23,7 @@ {% for vaccine in (vaccinesNotYetAdded | sort(false, false, "name")) %} {% set items = (items.push({ value: vaccine.name, - text: (vaccine.name ) + text: (vaccine.name | capitaliseFirstLetter) }), items) %} {% endfor %} diff --git a/app/views/regions/check-and-send.html b/app/views/regions/check-and-send.html index 86125f078..ee9b0f926 100644 --- a/app/views/regions/check-and-send.html +++ b/app/views/regions/check-and-send.html @@ -14,6 +14,8 @@
    +
    {{ organisation.name }} ({{ organisation.id }})
    +

    {{ pageName }}

    {{ summaryList({ diff --git a/app/views/regions/organisation.html b/app/views/regions/organisation.html index 4d7521777..773c59dc9 100644 --- a/app/views/regions/organisation.html +++ b/app/views/regions/organisation.html @@ -11,131 +11,232 @@ {% endblock %} {% block content %} -
    -
    -

    {{ organisation.name }}

    - - {% if organisation.status == 'Invited' %} -

    You have invited this organisation to create an NHS Record a vaccination service account.

    - - {% elseif organisation.status == "Deactivated" %} + {% set addressParts = [] %} + {% if organisation.address and organisation.address.line1 %} + {% set addressParts = (addressParts.push(organisation.address.line1), addressParts) %} + {% endif %} + {% if organisation.address and organisation.address.town %} + {% set addressParts = (addressParts.push(organisation.address.town), addressParts) %} + {% endif %} + {% if organisation.address and organisation.address.postcode %} + {% set addressParts = (addressParts.push(organisation.address.postcode), addressParts) %} + {% endif %} -

    This organisation has been deactivated.

    It will be closed in 90 days.

    + {% set addressText = addressParts | join(", ") %} + {% set vaccinesText = "None" %} + {% if (vaccinesEnabled | length) > 0 %} + {% set vaccinesText = (vaccinesEnabled | sort(false, false, "name") | pluck("name") | formatList) %} + {% endif %} -

    Reactivate organisation

    +
    +
    + {% if vaccinesAdded == "true" %} + {% set html %} +

    + {{ "Vaccine" if vaccinesAddedCount == 1 else "Vaccines" }} added +

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

    They can record - {% if (vaccinesEnabled | length) == (data.vaccines | length) %} - all - {% else %} - {{ vaccinesEnabled | sort(false, false, "name") | pluck("name") | formatList }} - {% endif %} - vaccinations. - - {% if (vaccinesEnabled | length) < (data.vaccines | length) %} - Add vaccines - {% endif %} -

    - - {% if (messages | length) > 0 %} - {% set message = (messages | first) %} - - {% set messageHtml %} -

    Access to record {{ message.vaccineRequested }} requested on {{ message.sentOn | govukDate }}. View request

    + {% if removedVaccine %} + {% set html %} +

    + {{ removedVaccine }} removed {% endset %} - {{ insetText({ - html: messageHtml, - classes: "nhsuk-u-margin-top-0 nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1" + {{ notificationBanner({ + html: html, + type: "success" }) }} {% endif %} +

    {{ organisation.name }} ({{ organisation.id }})

    - {% if organisation.status != 'Invited' %} -

    Deactivate organisation

    +
    +
    + +
    +
    + {% set actionNavText = "Deactivate organisation" %} + {% if organisation.status == 'Deactivated' %} + {% set actionNavText = "Reactivate organisation" %} {% endif %} +
    -
    - {% if organisation.status == 'Invited' or organisation.status == 'Active' %} - -
    -
    - - {% if (users | length) > 0 %} - - - - - - - - - - - - {% for leadUser in users %} - - {% set userOrganisationSettings = (leadUser.organisations | findById(organisation.id)) %} - - - - - - - - {% endfor %} - -
    Users
    - Name - - Email address - - Status - - -
    - {{ leadUser.firstName }} {{ leadUser.lastName }} - - {{ leadUser.email }} - - {{ userOrganisationSettings.status }} - - {% if userOrganisationSettings.status == 'Invited' %} - Uninvite - {% endif %} -
    - {% endif %} - - - {% if (users | length) > 3 %} - {{ pagination({ - next: { - href: "#" - }, - items: [ - { - number: 1, - href: "#", - current: true - }, - { - number: 2, - href: "#" - } - ] - }) }} - {% endif %} - - {% set buttonText = "Add another user" if (organisation.leadUsers | length) > 0 else "Add user" %} - - {{ button({ text: buttonText, href: "/regions/organisations/" + organisation.id + "/add-email"}) }} +
    +
    +
    + {% if currentPageSection == "overview" %} +

    Overview

    + + {% if organisation.status == 'Invited' %} +

    You have invited this organisation to create an NHS Record a vaccination service account.

    + {% endif %} + + {{ summaryList({ + rows: [ + { + key: { text: "ODS code" }, + value: { text: organisation.id } + }, + { + key: { text: "Address" }, + value: { text: addressText or "Not provided" } + }, + { + key: { text: "Status" }, + value: { text: organisation.status } + }, + { + key: { text: "Vaccines" }, + value: { text: vaccinesText } + } + ] + }) }} + + {% if (messages | length) > 0 %} + {% set message = (messages | first) %} + + {% set messageHtml %} +

    Access to record {{ message.vaccineRequested }} requested on {{ message.sentOn | govukDate }}. View request

    + {% endset %} + + {{ insetText({ + html: messageHtml, + classes: "nhsuk-u-margin-top-0 nhsuk-u-padding-top-1 nhsuk-u-padding-bottom-1" + }) }} + {% endif %} + + {% elif currentPageSection == "users" %} +

    Users

    + + {% if organisation.status == 'Invited' or organisation.status == 'Active' %} + {% set totalUsers = (usersByStatus.invited | length) + (usersByStatus.active | length) + (usersByStatus.deactivated | length) %} + {% set buttonText = "Add user" if totalUsers > 0 else "Add user" %} + {{ button({ text: buttonText, href: "/regions/organisations/" + organisation.id + "/add-email"}) }} + + {{ appSecondaryNavigation({ + visuallyHiddenTitle: "Users by status", + items: [{ + text: "Invited (" + (usersByStatus.invited | length) + ")", + href: "/regions/organisations/" + organisation.id + "?section=users&tab=invited", + current: (currentTab == "invited") + }, { + text: "Active (" + (usersByStatus.active | length) + ")", + href: "/regions/organisations/" + organisation.id + "?section=users&tab=active", + current: (currentTab == "active") + }, { + text: "Deactivated (" + (usersByStatus.deactivated | length) + ")", + href: "/regions/organisations/" + organisation.id + "?section=users&tab=deactivated", + current: (currentTab == "deactivated") + }] + }) }} + + {% if (users | length) > 0 %} +
    + + + + + + + + + + {% for leadUser in users %} + {% set userOrganisationSettings = (leadUser.organisations | findById(organisation.id)) %} + + + + + + {% endfor %} + +
    Name and emailStatusActions
    + {{ leadUser.firstName }} {{ leadUser.lastName }} +
    {{ leadUser.email }}
    +     		{{ userOrganisationSettings.status }} + {% if userOrganisationSettings.status == 'Invited' %} + Uninvite + {% endif %} +
    +
    + {% else %} +

    No users in this status.

    + {% endif %} + {% else %} +

    This organisation is deactivated. Reactivate it to manage users.

    + {% endif %} + + {% elif currentPageSection == "vaccines" %} +

    Vaccines

    + + {% if canAddVaccines %} + {{ button({ text: "Add vaccines", href: "/regions/organisations/" + organisation.id + "/add-vaccines"}) }} + {% endif %} + + {% if (vaccinesEnabled | length) > 0 %} + + + + + + + + + {% for vaccine in (vaccinesEnabled | sort(false, false, "name")) %} + + + + + {% endfor %} + +
    Vaccines this organisation can recordActions
    {{ vaccine.name | capitaliseFirstLetter }} + Remove {{ vaccine.name | capitaliseFirstLetter }} +
    + {% else %} +

    No vaccines enabled yet.

    + {% endif %} + + {% else %} +

    Deactivate organisation

    + + {% if organisation.status == "Deactivated" %} +

    This organisation has been deactivated.

    +

    It will be closed in 90 days.

    +

    Reactivate organisation

    + {% elseif organisation.status == 'Invited' %} +

    This organisation has been invited and is waiting to set up access.

    + {% else %} +

    If an organisation is no longer using Record a vaccination, you should deactivate it.

    +

    Deactivate organisation

    + {% endif %} + {% endif %} +
    - {% endif %} +
    {% endblock %} diff --git a/app/views/regions/remove-vaccine.html b/app/views/regions/remove-vaccine.html new file mode 100644 index 000000000..2e812064d --- /dev/null +++ b/app/views/regions/remove-vaccine.html @@ -0,0 +1,36 @@ +{% extends 'layout.html' %} + +{% set pageName = "Remove " + vaccineName %} +{% set currentSection = "organisations" %} + +{% block beforeContent %} + {{ backLink({ + href: "/regions/organisations/" + organisation.id + "?section=vaccines", + text: "Back" + }) }} +{% endblock %} + +{% block content %} +
    +
    +

    {{ pageName }}

    + +

    Once you remove this vaccine, users at {{ organisation.name }} will not be able to record any {{ vaccineName }} vaccinations or edit {{ vaccineName }} vaccination records. + +

    You can add this vaccine back at any time.

    + +
    + + +
    + {{ button({ + text: "Remove vaccine", + classes: "nhsuk-button--warning" + }) }} + + Cancel +
    +
    +
    +
    +{% endblock %} diff --git a/package-lock.json b/package-lock.json index e2027dc3e..7432eaa0c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,6 +8,7 @@ "name": "record-a-vaccination-prototype", "license": "MIT", "dependencies": { + "@x-govuk/govuk-prototype-components": "^6.0.0", "@x-govuk/govuk-prototype-filters": "^2.1.0", "accessible-autocomplete": "^3.0.1", "nhsuk-frontend": "github:nhsuk/nhsuk-frontend#0e310c29a", @@ -1792,6 +1793,24 @@ "dev": true, "license": "ISC" }, + "node_modules/@x-govuk/govuk-prototype-components": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@x-govuk/govuk-prototype-components/-/govuk-prototype-components-6.0.0.tgz", + "integrity": "sha512-yTa1rU1ePcBszPs5jWIdwuByS8OQ/4LHrTndt7HaEBJ7bj0Nh+eStobXqmUzbAAHhc1dekE99SH6rVOddZqOjg==", + "license": "MIT", + "dependencies": { + "accessible-autocomplete": "^3.0.0", + "eventslibjs": "^1.2.0", + "gray-matter": "^4.0.3", + "nunjucks": "^3.2.4" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24" + }, + "peerDependencies": { + "govuk-frontend": "^6.0.0" + } + }, "node_modules/@x-govuk/govuk-prototype-filters": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/@x-govuk/govuk-prototype-filters/-/govuk-prototype-filters-2.1.0.tgz", @@ -1814,8 +1833,7 @@ "node_modules/a-sync-waterfall": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/a-sync-waterfall/-/a-sync-waterfall-1.0.1.tgz", - "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==", - "peer": true + "integrity": "sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==" }, "node_modules/accepts": { "version": "1.3.8", @@ -2061,8 +2079,7 @@ "node_modules/asap": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "peer": true + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==" }, "node_modules/async": { "version": "2.6.4", @@ -3678,6 +3695,19 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/esquery": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.7.0.tgz", @@ -3736,6 +3766,12 @@ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==" }, + "node_modules/eventslibjs": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventslibjs/-/eventslibjs-1.2.0.tgz", + "integrity": "sha512-nui7FHXHeeZjWkQ1dZ4R3RchkT+164+y1/puiOY1Zc3CPU9W8XzAzdhqvuVQ4EJt7F/W94O5U26/oVFpBOPY3w==", + "license": "MIT" + }, "node_modules/express": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/express/-/express-5.2.1.tgz", @@ -3994,6 +4030,18 @@ "node": ">= 18" } }, + "node_modules/extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "license": "MIT", + "dependencies": { + "is-extendable": "^0.1.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", @@ -4506,6 +4554,16 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/govuk-frontend": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-6.4.0.tgz", + "integrity": "sha512-jU3oaVFXqK1yDVIdZs1YZ6JD7YDB4PFUHF3rFMWJye9ArImp42F9wCsFzzB1+udjuzGCryJGcHHbBQ5HY+8rqQ==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 4.2.0" + } + }, "node_modules/govuk-markdown": { "version": "0.8.0", "resolved": "https://registry.npmjs.org/govuk-markdown/-/govuk-markdown-0.8.0.tgz", @@ -8757,6 +8815,43 @@ "dev": true, "license": "MIT" }, + "node_modules/gray-matter": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/gray-matter/-/gray-matter-4.0.3.tgz", + "integrity": "sha512-5v6yZd4JK3eMI3FqqCouswVqwugaA9r4dNZB1wwcmrD02QkV5H0y7XBQW8QwQqEaZY1pM9aqORSORhJRdNK44Q==", + "license": "MIT", + "dependencies": { + "js-yaml": "^3.13.1", + "kind-of": "^6.0.2", + "section-matter": "^1.0.0", + "strip-bom-string": "^1.0.0" + }, + "engines": { + "node": ">=6.0" + } + }, + "node_modules/gray-matter/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/gray-matter/node_modules/js-yaml": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.0.tgz", + "integrity": "sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog==", + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, "node_modules/has-bigints": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", @@ -9161,6 +9256,15 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -9559,6 +9663,15 @@ "json-buffer": "3.0.1" } }, + "node_modules/kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/levn": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", @@ -9944,7 +10057,6 @@ "version": "3.2.4", "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.4.tgz", "integrity": "sha512-26XRV6BhkgK0VOxfbU5cQI+ICFUtMLixv1noZn1tGU38kQH5A5nmmbk/O45xdyBhD1esk47nKrY0mvQpZIhRjQ==", - "peer": true, "dependencies": { "a-sync-waterfall": "^1.0.0", "asap": "^2.0.3", @@ -9969,7 +10081,6 @@ "version": "5.1.0", "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz", "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==", - "peer": true, "engines": { "node": ">= 6" } @@ -11232,6 +11343,19 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/section-matter": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/section-matter/-/section-matter-1.0.0.tgz", + "integrity": "sha512-vfD3pmTzGpufjScBh50YHKzEu2lxBWhVEHsNGoEXmCmn2hKGfeNLYMzCJpe8cD7gqX7TJluOVpBkAequ6dgMmA==", + "license": "MIT", + "dependencies": { + "extend-shallow": "^2.0.1", + "kind-of": "^6.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/semver": { "version": "6.3.1", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", @@ -11732,6 +11856,12 @@ "dev": true, "license": "CC0-1.0" }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "license": "BSD-3-Clause" + }, "node_modules/statuses": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", @@ -11864,6 +11994,15 @@ "node": ">=4" } }, + "node_modules/strip-bom-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz", + "integrity": "sha512-uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", diff --git a/package.json b/package.json index cfffd3fa7..3f42dc6be 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "author": "NHS England", "license": "MIT", "dependencies": { + "@x-govuk/govuk-prototype-components": "^6.0.0", "@x-govuk/govuk-prototype-filters": "^2.1.0", "accessible-autocomplete": "^3.0.1", "nhsuk-frontend": "github:nhsuk/nhsuk-frontend#0e310c29a",