diff --git a/app/assets/javascript/calendar-table-actions.js b/app/assets/javascript/calendar-table-actions.js index f8d8b672..16255008 100644 --- a/app/assets/javascript/calendar-table-actions.js +++ b/app/assets/javascript/calendar-table-actions.js @@ -1,6 +1,3 @@ - var lastSelectedCell = null; - var selectableCells = Array.from(document.querySelectorAll('.calendar-table td:not(.calendar-table-no-data)')); - function clearSelectedDays() { document.querySelectorAll('.calendar-table td.--date-selected').forEach(function (cell) { cell.classList.remove('--date-selected'); @@ -59,7 +56,6 @@ clickedScheduleName.textContent = isAlreadySelected ? 'Select schedule' : 'Deselect schedule'; } - lastSelectedCell = clickedStartCell; return; } @@ -71,25 +67,27 @@ return; } - if (event.shiftKey && lastSelectedCell) { - var startIndex = selectableCells.indexOf(lastSelectedCell); - var endIndex = selectableCells.indexOf(cell); - - if (startIndex !== -1 && endIndex !== -1) { - var rangeStart = Math.min(startIndex, endIndex); - var rangeEnd = Math.max(startIndex, endIndex); - - for (var index = rangeStart; index <= rangeEnd; index++) { - selectableCells[index].classList.add('--date-selected'); - } - } - } else { - cell.classList.toggle('--date-selected'); - } - - lastSelectedCell = cell; + cell.classList.toggle('--date-selected'); }); table.classList.add('--js-enabled'); }); + + var selectDaysForm = document.getElementById('select-days-form'); + + if (selectDaysForm) { + selectDaysForm.addEventListener('submit', function () { + selectDaysForm.querySelectorAll('input[name="selectedDays"]').forEach(function (input) { + input.remove(); + }); + + document.querySelectorAll('.calendar-table td.--date-selected[data-date]').forEach(function (cell) { + var input = document.createElement('input'); + input.type = 'hidden'; + input.name = 'selectedDays'; + input.value = cell.getAttribute('data-date'); + selectDaysForm.appendChild(input); + }); + }); + } \ No newline at end of file diff --git a/app/assets/sass/components/_calendar-table.scss b/app/assets/sass/components/_calendar-table.scss index ce5422d0..4858c63d 100644 --- a/app/assets/sass/components/_calendar-table.scss +++ b/app/assets/sass/components/_calendar-table.scss @@ -82,6 +82,7 @@ text-wrap: nowrap; } } + .--schedule-end { position: relative; border-right-color: nhsuk-colour("grey-2"); @@ -109,6 +110,12 @@ margin-bottom: nhsuk-spacing(2); } +.--template-name { + display: block; + padding: nhsuk-spacing(1); + margin-top: nhsuk-spacing(2); +} + /// /// /// diff --git a/app/assets/sass/components/_card.scss b/app/assets/sass/components/_card.scss new file mode 100644 index 00000000..3a39888b --- /dev/null +++ b/app/assets/sass/components/_card.scss @@ -0,0 +1,20 @@ +@use "sass:color"; +@use "nhsuk-frontend/dist/nhsuk/core" as *; + +.nhsuk-card--feature.app-card--feature-grey { + background-color: color.scale(nhsuk-colour("grey-4"), $alpha: -50%) !important; +} +.nhsuk-card--feature.app-card--feature-grey .nhsuk-card__heading { + background-color: nhsuk-colour("grey-1"); + color: nhsuk-colour("white"); +} + +.nhsuk-card--feature.app-card--feature-orange .nhsuk-card__heading { + background-color: nhsuk-colour("orange"); + color: nhsuk-colour("white"); +} + +.nhsuk-card--feature.app-card--feature-green .nhsuk-card__heading { + background-color: nhsuk-colour("green"); + color: nhsuk-colour("white"); +} diff --git a/app/assets/sass/components/_clinic-capacity-summary.scss b/app/assets/sass/components/_clinic-capacity-summary.scss new file mode 100644 index 00000000..8a473091 --- /dev/null +++ b/app/assets/sass/components/_clinic-capacity-summary.scss @@ -0,0 +1,18 @@ +@use "nhsuk-frontend/dist/nhsuk/core" as *; + +.app-clinic-capacity-summary { + @include nhsuk-responsive-margin(4, "bottom"); + + .nhsuk-table__body { + display: flex; + } + .nhsuk-table__header:not(:last-child) { + @include nhsuk-responsive-padding(1, "right"); + border: 0; + } + .nhsuk-table__cell { + @include nhsuk-responsive-padding(5, "right"); + border: 0; + } + +} \ No newline at end of file diff --git a/app/assets/sass/components/_progress-bar.scss b/app/assets/sass/components/_progress-bar.scss index e3ac3c90..e6b7780e 100644 --- a/app/assets/sass/components/_progress-bar.scss +++ b/app/assets/sass/components/_progress-bar.scss @@ -55,34 +55,44 @@ min-width: 0; } } -.app-progress-bar::-webkit-progress-bar { +::-webkit-progress-bar { background: #fff; } .app-progress-bar::-moz-progress-bar { background: #fff; } -.app-progress-bar.--generic::-webkit-progress-value, +.app-progress-bar.--generic::-webkit-progress-value { + background: var(--generic-chart-hatch); +} .app-progress-bar.--generic::-moz-progress-bar { background: var(--generic-chart-hatch); } -.app-progress-bar.--standard::-webkit-progress-value, +.app-progress-bar.--standard::-webkit-progress-value { + background: var(--standard-chart-hatch); +} .app-progress-bar.--standard::-moz-progress-bar { background: var(--standard-chart-hatch); } -.app-progress-bar.--special::-webkit-progress-value, +.app-progress-bar.--special::-webkit-progress-value { + background: var(--special-chart-hatch); +} .app-progress-bar.--special::-moz-progress-bar { background: var(--special-chart-hatch); } -.app-progress-bar.--ceased::-webkit-progress-value, +.app-progress-bar.--ceased::-webkit-progress-value { + background: var(--ceased-chart-hatch); +} .app-progress-bar.--ceased::-moz-progress-bar { background: var(--ceased-chart-hatch); } -.app-progress-bar.--vhr::-webkit-progress-value, +.app-progress-bar.--vhr::-webkit-progress-value { + background: var(--vhr-chart-hatch); +} .app-progress-bar.--vhr::-moz-progress-bar { background: var(--vhr-chart-hatch); -} \ No newline at end of file +} diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 701efcd1..cdf5f741 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -85,6 +85,8 @@ // https://github.com/NHSDigital/manage-breast-screening-prototype @forward "components/calendar-table"; +@forward "components/clinic-capacity-summary"; +@forward "components/card"; @forward "components/clinic-level-breadcrumbs"; @forward "components/grid-extensions"; @forward "components/inline-detailed-search"; @@ -106,6 +108,24 @@ a { @extend .nhsuk-link--no-visited-state; } +// Makes a + +
+

Clear search

+ +
+
+ Next test due date +
+ {% for value, label in [['within_week', 'Within the next week'], ['within_month', 'Within the next month'], ['within_3_months', 'Within the next 3 months'], ['within_6_months', 'Within the next 6 months']] %} +
+ + +
+ {% endfor %} +
+
+
+
+
+ Next screening +
+ {% for value, label in [['within_week', 'Within the next week'], ['within_month', 'Within the next month'], ['within_3_months', 'Within the next 3 months'], ['within_6_months', 'Within the next 6 months'], ['not_known', 'Not known']] %} +
+ + +
+ {% endfor %} +
+
+
+
+
+ Last screened +
+ {% for value, label in [['within_3_years', 'Within the last 3 years'], ['3_to_5_years', '3 to 5 years ago'], ['over_5_years', 'More than 5 years ago'], ['never', 'Never screened']] %} +
+ + +
+ {% endfor %} +
+
+
+
+
+ Breach risk +
+ {% for value, label in [['at_risk', 'Participant at risk of breaching'], ['not_at_risk', 'Participant not at risk of breaching']] %} +
+ + +
+ {% endfor %} +
+
+
+ + + + +
+
+

Showing {{ firstRecord }} to {{ lastRecord }} of {{ totalParticipants }} participants

+
+ + {% for filter in selectedNextTestDue %}{% endfor %} + {% for filter in selectedNextScreening %}{% endfor %} + {% for filter in selectedLastScreened %}{% endfor %} + {% for filter in selectedBreachRisk %}{% endfor %} + + +
+
+ + + + + + + + + + + + {% for participant in participants %} + + + + + + + + {% endfor %} + +
NamePostcodeNHS numberNext test due dateNext screening
{{ participant.full_name }}
{{ participant.age }} years old
{{ participant.address.postcode }}{{ participant.nhs_number }}{{ participant.next_test_due_date }}
{{ participant.next_test_due_date_relative }}
{% if participant.next_appointment_date != 'Not known' %}{{ participant.next_appointment_date }}
{% endif %}{{ participant.next_appointment_date_relative }}
+ {% if totalPages > 1 %} + + {% endif %} +
+ + +{% endblock %} diff --git a/app/views/bso-objects/bso/bso-internal-details.html b/app/views/bso-objects/bso/bso-internal-details.html index 4c16f385..71eb2e6e 100644 --- a/app/views/bso-objects/bso/bso-internal-details.html +++ b/app/views/bso-objects/bso/bso-internal-details.html @@ -27,7 +27,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} diff --git a/app/views/bso-objects/bso/bso-public-details.html b/app/views/bso-objects/bso/bso-public-details.html index db2fea9b..67d9400b 100644 --- a/app/views/bso-objects/bso/bso-public-details.html +++ b/app/views/bso-objects/bso/bso-public-details.html @@ -21,7 +21,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} diff --git a/app/views/bso-objects/index.html b/app/views/bso-objects/index.html index 09da6e40..baee73e1 100755 --- a/app/views/bso-objects/index.html +++ b/app/views/bso-objects/index.html @@ -21,7 +21,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} diff --git a/app/views/bso-objects/locations/index.html b/app/views/bso-objects/locations/index.html index 224b13c8..2a439d59 100644 --- a/app/views/bso-objects/locations/index.html +++ b/app/views/bso-objects/locations/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/bso-objects/locations/location-details.html b/app/views/bso-objects/locations/location-details.html index b7df9626..577d2668 100644 --- a/app/views/bso-objects/locations/location-details.html +++ b/app/views/bso-objects/locations/location-details.html @@ -10,7 +10,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/bso-objects/locations/location-travel-and-transport.html b/app/views/bso-objects/locations/location-travel-and-transport.html index 9b71bc4c..d2f3be07 100644 --- a/app/views/bso-objects/locations/location-travel-and-transport.html +++ b/app/views/bso-objects/locations/location-travel-and-transport.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/bso-objects/units/index.html b/app/views/bso-objects/units/index.html index 8b30151a..ad4e9351 100644 --- a/app/views/bso-objects/units/index.html +++ b/app/views/bso-objects/units/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/bso-objects/units/static-internal-details.html b/app/views/bso-objects/units/static-internal-details.html index 2718e22f..2e483ff7 100644 --- a/app/views/bso-objects/units/static-internal-details.html +++ b/app/views/bso-objects/units/static-internal-details.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/bso-objects/units/static-public-details.html b/app/views/bso-objects/units/static-public-details.html index e26e2982..d5ce906b 100644 --- a/app/views/bso-objects/units/static-public-details.html +++ b/app/views/bso-objects/units/static-public-details.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Organisation", serviceName) }} + {{ primaryNavigation("Organisation", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/00-create-new-clinic-details.html b/app/views/clinics-schedules/00-create-new-clinic-details.html index a7431e3d..3457535b 100644 --- a/app/views/clinics-schedules/00-create-new-clinic-details.html +++ b/app/views/clinics-schedules/00-create-new-clinic-details.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/01-create-schedule.html b/app/views/clinics-schedules/01-create-schedule.html index 1633b78b..e009f9b7 100644 --- a/app/views/clinics-schedules/01-create-schedule.html +++ b/app/views/clinics-schedules/01-create-schedule.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/02-choose-session-options.html b/app/views/clinics-schedules/02-choose-session-options.html index 3c70e001..56bfbeab 100644 --- a/app/views/clinics-schedules/02-choose-session-options.html +++ b/app/views/clinics-schedules/02-choose-session-options.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/03-create-session.html b/app/views/clinics-schedules/03-create-session.html index b4026207..ccd9076b 100644 --- a/app/views/clinics-schedules/03-create-session.html +++ b/app/views/clinics-schedules/03-create-session.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/04-organise-slots.html b/app/views/clinics-schedules/04-organise-slots.html index 91bf6749..11d5ec1d 100644 --- a/app/views/clinics-schedules/04-organise-slots.html +++ b/app/views/clinics-schedules/04-organise-slots.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/05-save-as-template.html b/app/views/clinics-schedules/05-save-as-template.html index 9e1e8a2b..811c33c2 100644 --- a/app/views/clinics-schedules/05-save-as-template.html +++ b/app/views/clinics-schedules/05-save-as-template.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/05a-template-details.html b/app/views/clinics-schedules/05a-template-details.html index 6f7d124b..66811536 100644 --- a/app/views/clinics-schedules/05a-template-details.html +++ b/app/views/clinics-schedules/05a-template-details.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/06-apply-session.html b/app/views/clinics-schedules/06-apply-session.html index cdf9b7c1..4ebc7f30 100644 --- a/app/views/clinics-schedules/06-apply-session.html +++ b/app/views/clinics-schedules/06-apply-session.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} -{{ primaryNavigation("Clinics", serviceName) }} +{{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/07-schedule-details.html b/app/views/clinics-schedules/07-schedule-details.html index e2469a50..94d0a3cd 100644 --- a/app/views/clinics-schedules/07-schedule-details.html +++ b/app/views/clinics-schedules/07-schedule-details.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/08-publish-clinic.html b/app/views/clinics-schedules/08-publish-clinic.html index 133603e0..2e56df70 100644 --- a/app/views/clinics-schedules/08-publish-clinic.html +++ b/app/views/clinics-schedules/08-publish-clinic.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/09-prototype-end.html b/app/views/clinics-schedules/09-prototype-end.html index 871063ad..ef350448 100644 --- a/app/views/clinics-schedules/09-prototype-end.html +++ b/app/views/clinics-schedules/09-prototype-end.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html b/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html index d7055582..8f975739 100644 --- a/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html +++ b/app/views/clinics-schedules/0a-clinics-clinic-added-populated.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0a-clinics-clinic-added.html b/app/views/clinics-schedules/0a-clinics-clinic-added.html index 9d4a9069..3cca7339 100644 --- a/app/views/clinics-schedules/0a-clinics-clinic-added.html +++ b/app/views/clinics-schedules/0a-clinics-clinic-added.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html b/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html index 8144cba2..487a5d0b 100644 --- a/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html +++ b/app/views/clinics-schedules/0b-clinic-detail-populated-schedule-added.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} -{{ primaryNavigation("Clinics", serviceName) }} +{{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html b/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html index 5f29108a..90303511 100644 --- a/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html +++ b/app/views/clinics-schedules/0b-clinic-detail-schedule-added-backup.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html b/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html index cbb53439..f056d86d 100644 --- a/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html +++ b/app/views/clinics-schedules/0b-clinic-detail-schedule-added.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0b-clinic-detail.html b/app/views/clinics-schedules/0b-clinic-detail.html index c63a607d..6c3d4ac3 100644 --- a/app/views/clinics-schedules/0b-clinic-detail.html +++ b/app/views/clinics-schedules/0b-clinic-detail.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0c-schedule-detail-session-added.html b/app/views/clinics-schedules/0c-schedule-detail-session-added.html index 70344137..b972fde6 100644 --- a/app/views/clinics-schedules/0c-schedule-detail-session-added.html +++ b/app/views/clinics-schedules/0c-schedule-detail-session-added.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} -{{ primaryNavigation("Clinics", serviceName) }} +{{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/0c-schedule-detail.html b/app/views/clinics-schedules/0c-schedule-detail.html index 21f4e947..a801afa8 100644 --- a/app/views/clinics-schedules/0c-schedule-detail.html +++ b/app/views/clinics-schedules/0c-schedule-detail.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/index.html b/app/views/clinics-schedules/index.html index eae468ad..f7c84eb1 100644 --- a/app/views/clinics-schedules/index.html +++ b/app/views/clinics-schedules/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics-schedules/z-older-versions/00-clinic-details.html b/app/views/clinics-schedules/z-older-versions/00-clinic-details.html index 3109d320..fd6ea0b9 100644 --- a/app/views/clinics-schedules/z-older-versions/00-clinic-details.html +++ b/app/views/clinics-schedules/z-older-versions/00-clinic-details.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/01-create-schedule.html b/app/views/clinics-schedules/z-older-versions/01-create-schedule.html index 948e1ef9..7b03c861 100644 --- a/app/views/clinics-schedules/z-older-versions/01-create-schedule.html +++ b/app/views/clinics-schedules/z-older-versions/01-create-schedule.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html b/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html index 3c70e001..56bfbeab 100644 --- a/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html +++ b/app/views/clinics-schedules/z-older-versions/02-choose-session-options.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/03-create-session.html b/app/views/clinics-schedules/z-older-versions/03-create-session.html index b4026207..ccd9076b 100644 --- a/app/views/clinics-schedules/z-older-versions/03-create-session.html +++ b/app/views/clinics-schedules/z-older-versions/03-create-session.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/04-organise-slots.html b/app/views/clinics-schedules/z-older-versions/04-organise-slots.html index 91bf6749..11d5ec1d 100644 --- a/app/views/clinics-schedules/z-older-versions/04-organise-slots.html +++ b/app/views/clinics-schedules/z-older-versions/04-organise-slots.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/05-save-as-template.html b/app/views/clinics-schedules/z-older-versions/05-save-as-template.html index d3e97f05..f0e2d2ed 100644 --- a/app/views/clinics-schedules/z-older-versions/05-save-as-template.html +++ b/app/views/clinics-schedules/z-older-versions/05-save-as-template.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/05a-template-details.html b/app/views/clinics-schedules/z-older-versions/05a-template-details.html index 6f7d124b..66811536 100644 --- a/app/views/clinics-schedules/z-older-versions/05a-template-details.html +++ b/app/views/clinics-schedules/z-older-versions/05a-template-details.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/06-apply-session.html b/app/views/clinics-schedules/z-older-versions/06-apply-session.html index b906b566..4f24bf62 100644 --- a/app/views/clinics-schedules/z-older-versions/06-apply-session.html +++ b/app/views/clinics-schedules/z-older-versions/06-apply-session.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} -{{ primaryNavigation("Clinics", serviceName) }} +{{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/07-schedule-details.html b/app/views/clinics-schedules/z-older-versions/07-schedule-details.html index e2469a50..94d0a3cd 100644 --- a/app/views/clinics-schedules/z-older-versions/07-schedule-details.html +++ b/app/views/clinics-schedules/z-older-versions/07-schedule-details.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html b/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html index 133603e0..2e56df70 100644 --- a/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html +++ b/app/views/clinics-schedules/z-older-versions/08-publish-clinic.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/09-prototype-end.html b/app/views/clinics-schedules/z-older-versions/09-prototype-end.html index 871063ad..ef350448 100644 --- a/app/views/clinics-schedules/z-older-versions/09-prototype-end.html +++ b/app/views/clinics-schedules/z-older-versions/09-prototype-end.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics-schedules/z-older-versions/index.html b/app/views/clinics-schedules/z-older-versions/index.html index 12d30603..5637cc93 100644 --- a/app/views/clinics-schedules/z-older-versions/index.html +++ b/app/views/clinics-schedules/z-older-versions/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/clinic-detail.html b/app/views/clinics/clinic-detail.html index dc4324a0..cfcf2912 100644 --- a/app/views/clinics/clinic-detail.html +++ b/app/views/clinics/clinic-detail.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/index.html b/app/views/clinics/index.html index b7bdbb22..ad8231f9 100644 --- a/app/views/clinics/index.html +++ b/app/views/clinics/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics/z-older-versions/00-create-day-clinic.html b/app/views/clinics/z-older-versions/00-create-day-clinic.html index 734b7c27..818709f3 100644 --- a/app/views/clinics/z-older-versions/00-create-day-clinic.html +++ b/app/views/clinics/z-older-versions/00-create-day-clinic.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics/z-older-versions/01-set-date-and-time.html b/app/views/clinics/z-older-versions/01-set-date-and-time.html index 74519292..59eca3b1 100644 --- a/app/views/clinics/z-older-versions/01-set-date-and-time.html +++ b/app/views/clinics/z-older-versions/01-set-date-and-time.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics/z-older-versions/02-organise-slots.html b/app/views/clinics/z-older-versions/02-organise-slots.html index 394401aa..bc6642d7 100644 --- a/app/views/clinics/z-older-versions/02-organise-slots.html +++ b/app/views/clinics/z-older-versions/02-organise-slots.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics/z-older-versions/03-publish-clinic.html b/app/views/clinics/z-older-versions/03-publish-clinic.html index 3626c057..f5f8181a 100644 --- a/app/views/clinics/z-older-versions/03-publish-clinic.html +++ b/app/views/clinics/z-older-versions/03-publish-clinic.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics/z-older-versions/2026-06-day-slot-view.html b/app/views/clinics/z-older-versions/2026-06-day-slot-view.html index f62178bd..c607d7ab 100644 --- a/app/views/clinics/z-older-versions/2026-06-day-slot-view.html +++ b/app/views/clinics/z-older-versions/2026-06-day-slot-view.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/z-older-versions/clinic-detail.html b/app/views/clinics/z-older-versions/clinic-detail.html index 07b1e9f9..e382f450 100644 --- a/app/views/clinics/z-older-versions/clinic-detail.html +++ b/app/views/clinics/z-older-versions/clinic-detail.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/z-older-versions/index.html b/app/views/clinics/z-older-versions/index.html index a6707003..32dcf049 100644 --- a/app/views/clinics/z-older-versions/index.html +++ b/app/views/clinics/z-older-versions/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/clinics/z-older-versions/templating-01-set-times.html b/app/views/clinics/z-older-versions/templating-01-set-times.html index 93d45230..91cec683 100644 --- a/app/views/clinics/z-older-versions/templating-01-set-times.html +++ b/app/views/clinics/z-older-versions/templating-01-set-times.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html b/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html index ce439169..d05bfb9e 100644 --- a/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html +++ b/app/views/create-capacity-from-zero/_local-includes/clinic-summary.html @@ -2,28 +2,65 @@

Clinic - Chichester - St Richards + {{ data.createCapacityFromZero.clinicName or pageVarClinicName }}

- Alpha van
- St Richard’s Hospital, Chichester + {{ data.createCapacityFromZero.unit or pageVarUnit }} at {{ data.createCapacityFromZero.location or pageVarLocation }}

+
+
+ + + + + + + + + + + + + + + + + +
+ Capacity summary +
+ Slots available: + + {{ totalAvailableSlots or 0 }} + + of which {{ totalAvailableSlotsHeld or 0 }} held +
+ Locked slots: + + {{ totalLockedSlots or 0 }} + (including held) +
+ Slots booked: + + {{ totalSlotsBooked or 0 }} +
+ +
+
+
{% set secondaryNavItems = [] %} diff --git a/app/views/create-capacity-from-zero/clinic-summary-empty.html b/app/views/create-capacity-from-zero/clinic-summary-empty.html index 3986768f..19d34bb4 100644 --- a/app/views/create-capacity-from-zero/clinic-summary-empty.html +++ b/app/views/create-capacity-from-zero/clinic-summary-empty.html @@ -4,22 +4,13 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} - + + Back to clinic listing + {% endblock %} {% block content %} @@ -28,7 +19,7 @@
-

No schedules yet

+

This clinic contains no schedules

Add a new schedule
diff --git a/app/views/create-capacity-from-zero/clinic-summary-in-progress.html b/app/views/create-capacity-from-zero/clinic-summary-in-progress.html index c90d0613..8509b9e1 100644 --- a/app/views/create-capacity-from-zero/clinic-summary-in-progress.html +++ b/app/views/create-capacity-from-zero/clinic-summary-in-progress.html @@ -2,24 +2,27 @@ {% set pageName = "Calendar view" %} +{% set pageVarClinicName = "Mereford central ongoing" %} +{% set pageVarUnit = "Mereford and Wensley Screening Centre" %} +{% set pageVarLocation = "Mereford and Wensley District Hospital" %} + +{% set totalLockedSlots = 1260 %} +{# Sum of every "X available" link in the dummy calendar tables below #} +{% set totalAvailableSlots = 664 %} +{# Sum of "X held" in the same 18 cells as the available links above #} +{% set totalAvailableSlotsHeld = 176 %} +{# Sum of "X booked" in the same 18 cells as the available links above #} +{% set totalSlotsBooked = 596 %} + {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} - + + Back to clinic listing + {% endblock %} {% block content %} @@ -365,40 +368,41 @@ 19 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
+ Select schedule 20 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
21 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
22 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
23 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
@@ -413,40 +417,40 @@ 26 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
27 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
28 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
29 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
30 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
@@ -504,40 +508,40 @@ 2 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
3 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
4 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
5 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
6 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
@@ -552,40 +556,40 @@ 9 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
10 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
11 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
12 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
13 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
@@ -600,40 +604,40 @@ 16 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
17 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
18 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
19 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
20 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
@@ -648,40 +652,40 @@ 23 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
24 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
25 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
26 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
27 {{ padlockSvg | safe }} - -
+
+ 42 slots
0 booked
8 held
@@ -723,10 +727,11 @@

With selected days:

diff --git a/app/views/create-capacity-from-zero/clinic-summary.html b/app/views/create-capacity-from-zero/clinic-summary.html new file mode 100644 index 00000000..d4b945e0 --- /dev/null +++ b/app/views/create-capacity-from-zero/clinic-summary.html @@ -0,0 +1,114 @@ +{% extends 'layout.html' %} + +{% set pageName = "" %} + +{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} +{% endblock %} + +{% block beforeContent %} + + Back to clinic listing + +{% endblock %} + +{% block content %} + + {% set padlockSvg %} +
+ + Locked +
+ {% endset %} + + {% include "create-capacity-from-zero/_local-includes/clinic-summary.html" %} + + {% if data.createCapacityFromZero.schedules.length > 0 %} +
+
+ {% for calendar in calendars %} + + + + + + + + + + + + + + + {% for week in calendar.weeks %} + + {% for dayItem in week %} + {% if dayItem %} + + {% else %} + + {% endif %} + {% endfor %} + + {% endfor %} + +
+ {{ calendar.monthName }} {{ calendar.year }} +
MondayTuesdayWednesdayThursdayFridaySaturdaySunday
+ {{ dayItem.date }} + {% if dayItem.templateName %} + {{ padlockSvg | safe }} +
+ {{ dayItem.totalSlots }} slots
+ 0 booked
+ {{ dayItem.heldSlots }} held
+ {% endif %} + {% if dayItem.isScheduleStart %} + Select schedule + {% endif %} +
+ No data +
+ {% endfor %} +
+ +
+
+

With selected days:

+
+ +
+
+
+
+ {% endif %} + +
+
+ {% if data.createCapacityFromZero.schedules.length === 0 %} +

This clinic contains no schedules

+ {% endif %} + Add a new schedule +
+
+ + {% include "create-capacity-from-zero/_local-includes/template-preview.html" %} + +{% endblock %} + +{% block pageScripts %} + +{% endblock %} diff --git a/app/views/create-capacity-from-zero/create-clinic.html b/app/views/create-capacity-from-zero/create-clinic.html index ce37220c..39b7cc0d 100644 --- a/app/views/create-capacity-from-zero/create-clinic.html +++ b/app/views/create-capacity-from-zero/create-clinic.html @@ -1,211 +1,146 @@ {% extends 'layout.html' %} -{% set errorState = "false" %} +{% set errorState = "true" if errors else "false" %} {% set pageName = "" %} {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} -{% block beforeContent %}{% endblock %} +{% block beforeContent %} + + Back to clinic listing + +{% endblock %} {% block content %} -{% set tickSvg %} - -{% endset %} - -
- -
-
- - {% if errorState === "true" %} - {{ errorSummary({ - titleText: "There is a problem", - errorList: [ - { - text: "Clinic must be given a name", - href: "#" - }, - { - text: "A unit must be chosen", - href: "#" - }, - { - text: "A location must be chosen", - href: "#" - } - ] - }) }} - {% endif %} - -

Clinic details

- -
- -
-
{% endblock %} \ No newline at end of file diff --git a/app/views/create-capacity-from-zero/index.html b/app/views/create-capacity-from-zero/index.html index 1f15b48a..03ec45e1 100644 --- a/app/views/create-capacity-from-zero/index.html +++ b/app/views/create-capacity-from-zero/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} @@ -14,9 +14,9 @@ {% set secondaryNavItems = [] %} {% for item in [ - { href: '/clinics/', label: 'Active clinics', selected: 'true' }, + { href: '/create-capacity-from-zero/', label: 'Active clinics', selected: 'true' }, { href: '#', label: 'Archived clinics' }, - { href: '/sessions/templating-01-listing', label: 'Manage session templates' } + { href: '#', label: 'Manage session templates' } ] %} {% set secondaryNavItems = secondaryNavItems | push({ text: item.label | safe, @@ -66,12 +66,12 @@

Active clinics

- Chichester - St Richards
- HWO-NNN-standard-20260501 + Existing clinic user defined name
+ NNN-NNN-systemid-20260501 - Alpha van
- St Richard’s Hospital, Chichester + Unit label
+ Location short name 31 August 2026 to 9 October 2026 @@ -81,24 +81,6 @@

Active clinics

of which 150 held - - - - Chichester - St Richards
- HWO-NNN-standard-20260501 - - - Alpha van
- St Richard’s Hospital, Chichester - - - No active schedules - - - 1500 slots available
- of which 150 held - - diff --git a/app/views/create-capacity-from-zero/new-schedule-empty.html b/app/views/create-capacity-from-zero/new-schedule-empty.html index 3e2d23aa..076707e3 100644 --- a/app/views/create-capacity-from-zero/new-schedule-empty.html +++ b/app/views/create-capacity-from-zero/new-schedule-empty.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/create-capacity-from-zero/new-schedule-ready.html b/app/views/create-capacity-from-zero/new-schedule-ready.html index 539e36c6..c4669278 100644 --- a/app/views/create-capacity-from-zero/new-schedule-ready.html +++ b/app/views/create-capacity-from-zero/new-schedule-ready.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/create-capacity-from-zero/select-session-template-full-preview.html b/app/views/create-capacity-from-zero/select-session-template-full-preview.html index f81c9078..751a6783 100644 --- a/app/views/create-capacity-from-zero/select-session-template-full-preview.html +++ b/app/views/create-capacity-from-zero/select-session-template-full-preview.html @@ -76,7 +76,10 @@
-

Session template name

+

+ Template details + Standard +

Session time 09:00 to 17:00 diff --git a/app/views/create-capacity-from-zero/select-session-template.html b/app/views/create-capacity-from-zero/select-session-template.html index 91f28b8d..a419a9a5 100644 --- a/app/views/create-capacity-from-zero/select-session-template.html +++ b/app/views/create-capacity-from-zero/select-session-template.html @@ -4,10 +4,14 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} -{% block beforeContent %}{% endblock %} +{% block beforeContent %} + + Back to clinic: {{ data.createCapacityFromZero.clinicName }} + +{% endblock %} {% block content %}
@@ -18,11 +22,14 @@

Choose session template

- Standard day + Standard

- - Select this template - +
+ + +
@@ -85,11 +92,14 @@

- Special appointments day + Special appointments

- - Select this template - +
+ + +
@@ -152,11 +162,14 @@

- Default session template + Rubie default

- - Select this template - +
+ + +
diff --git a/app/views/index.html b/app/views/index.html index 2dda9980..091f5dee 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -44,11 +44,26 @@

href: "/prototype-admin/reset?returnPage=" + (currentPage | urlencode) }) }} +

September 2026

+

Participant view

+ +
    +
  1. + View standalone participant details +
  2. +
  3. + View participant details within a batch +
  4. +
+

August – September 2026

Clinics with schedules ideation

  1. - Create a new clinic (containers) + Create a new clinic (containers) + + ready to test +
  2. Create a new clinic (transaction) diff --git a/app/views/participants/detail.html b/app/views/participants/detail.html new file mode 100644 index 00000000..0d053758 --- /dev/null +++ b/app/views/participants/detail.html @@ -0,0 +1,224 @@ +{% extends 'layout.html' %} + +{% set pageName = 'Participant details' %} + +{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% block header %} +{{ primaryNavigation("Batches" if participantsPath == "/batches/participants" else "Participants", serviceName) }} +{% endblock %} + +{% block content %} + + + + +
    + +
    + + Participant details +

    {{ participant.full_name }}

    +
    + +
    + +
    +
    + {% if participant.is_breaching %} + At risk of breaching + {% endif %} +
    +
    + +{% set stageText = { +'scheduled': 'Scheduled', +'mammograms': 'Mammograms', +'reading': 'Waiting for reading', +'assessment': 'At assessment', +'closed': 'Closed' +}[participant.episode_stage] %} +{% set stageColour = { +'scheduled': 'blue', +'mammograms': 'purple', +'reading': 'yellow', +'assessment': 'orange', +'closed': 'grey' +}[participant.episode_stage] %} + +
    +
    + +
    +
    +

    Screening details

    +
    +
    +
    Next test due date
    +
    {{ participant.next_test_due_date }}
    + {{ participant.next_test_due_date_relative }} + +
    +
    +
    +
    Next screening appointment
    +
    {% if participant.next_appointment_date != 'Not known' + %}{{ participant.next_appointment_date }}
    {% endif + %} + {{ participant.next_appointment_date_relative }} + {% if participant.next_appointment_unit %}
    + + Appointment taking place at {{ + participant.next_appointment_unit }} in {{ participant.next_appointment_location + }}{% endif %} +
    +
    +
    +
    Last screened
    +
    {{ participant.last_screened_date }}
    +
    +
    +
    +
    + +
    +
    +

    Personal details

    +
    +
    +
    Full name
    +
    {{ participant.full_name }}
    +
    +
    +
    NHS Number
    +
    {{ participant.nhs_number }}
    +
    + +
    +
    Date of birth
    +
    {{ participant.date_of_birth }}
    ({{ participant.age }} years old)
    +
    +
    +
    Gender
    +
    {{ participant.gender }}
    +
    +
    +
    Ethnicity
    +
    {{ participant.ethnicity }}
    +
    +
    +
    +
    + +
    +
    +

    Contact details

    +
    +
    +
    Address
    +
    + {{ participant.address.houseNumber }} {{ participant.address.street }}
    + {{ participant.address.town }}
    + {{ participant.address.postcode }} +
    +
    +
    +
    + {% if participant.phone_numbers.mobile and participant.phone_numbers.home %} + Phone numbers + {% else %} + Phone number + {% endif %} +
    +
    + {% if participant.phone_numbers.mobile %}{{ participant.phone_numbers.mobile }}{% endif %} + {% if participant.phone_numbers.mobile and participant.phone_numbers.home %}
    {% endif %} + {% if participant.phone_numbers.home %}{{ participant.phone_numbers.home }}{% endif %} +
    +
    +
    +
    Email address
    +
    {{ participant.email }}
    +
    +
    +
    +
    + +
    +
    +

    GP details

    +
    +
    +
    Name
    +
    {{ participant.gp_practice.name }}
    +
    +
    +
    Phone number
    +
    {{ participant.gp_practice.phone }}
    +
    +
    +
    Address
    +
    + {{ participant.gp_practice.address.houseNumber }} {{ participant.gp_practice.address.street + }}
    + {{ participant.gp_practice.address.town }}
    + {{ participant.gp_practice.address.postcode }} +
    +
    +
    +
    +
    + +
    +
    +

    Screening episodes

    +

    Current episode

    +
    +
    +
    Stage
    +
    + {{ stageText }} +
    +
    +
    +
    Next screening appointment
    +
    + {% if participant.next_appointment_date != 'Not known' %}{{ + participant.next_appointment_date }}
    {% endif %} + {{ participant.next_appointment_date_relative }} + {% if participant.next_appointment_unit %}
    + + Appointment taking place at {{ + participant.next_appointment_unit }} in {{ participant.next_appointment_location + }}{% endif %} +
    +
    +
    +

    Previous episodes

    +
    +
    +
    Last screened
    +
    + {{ participant.last_screened_date or '-' }} +
    +
    +
    +
    +
    + + +
    +
    +{% endblock %} \ No newline at end of file diff --git a/app/views/participants/index.html b/app/views/participants/index.html new file mode 100644 index 00000000..d840ef11 --- /dev/null +++ b/app/views/participants/index.html @@ -0,0 +1,310 @@ +{% extends 'layout.html' %} + +{% set pageName = "Participants" %} + +{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% block header %} +{{ primaryNavigation("Batches" if participantsPath == "/batches/participants" else "Participants", serviceName) }} +{% endblock %} + +{% block beforeContent %}{% endblock %} + +{% block content %} + +
    +
    +
    +

    {{ pageName }}

    +
    +
    +
    + +
    +
    +
    + +
    +
    +

    + Search and filter +

    +
    + +
    + + +
    +
    +

    Clear search

    +
    +
    +
    + + Next test due date + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    + + Next screening + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    + + Last screened + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    + + Breach risk + +
    +
    + + +
    +
    + + +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +

    Showing {{ firstRecord }} to {{ lastRecord }} of + {{ totalParticipants }} participants +

    +
    + + {% for filter in selectedNextTestDue %}{% endfor %} + {% for filter in selectedNextScreening %}{% endfor %} + {% for filter in selectedLastScreened %}{% endfor %} + {% for filter in selectedBreachRisk %}{% endfor %} + + +
    +
    + + + + + + + + + + + + + {% for participant in participants %} + + + + + + + + {% endfor %} + +
    + Name + + Postcode + + NHS number + + Next test due date + + Next screening +
    + {{ participant.full_name }}
    + {{ participant.age }} years old +
    {{ participant.address.postcode }}{{ participant.nhs_number }} + {{ participant.next_test_due_date }}
    + {{ participant.next_test_due_date_relative }} +
    + {% if participant.next_appointment_date != 'Not known' %}{{ participant.next_appointment_date }}
    {% endif + %} + {{ participant.next_appointment_date_relative }} +
    + + {% if totalPages > 1 %} + + {% endif %} + +
    +
    + +{% endblock %} \ No newline at end of file diff --git a/app/views/sessions/01-set-timings.html b/app/views/sessions/01-set-timings.html index a4bcebcc..2341d90f 100644 --- a/app/views/sessions/01-set-timings.html +++ b/app/views/sessions/01-set-timings.html @@ -7,7 +7,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/sessions/02-organise-slots.html b/app/views/sessions/02-organise-slots.html index b90868a1..d1dbb4db 100644 --- a/app/views/sessions/02-organise-slots.html +++ b/app/views/sessions/02-organise-slots.html @@ -6,7 +6,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/sessions/03-prototype-end.html b/app/views/sessions/03-prototype-end.html index 5eeecc51..36a6e2d1 100644 --- a/app/views/sessions/03-prototype-end.html +++ b/app/views/sessions/03-prototype-end.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/sessions/day-slot-view.html b/app/views/sessions/day-slot-view.html index 316129e1..5c37a19b 100644 --- a/app/views/sessions/day-slot-view.html +++ b/app/views/sessions/day-slot-view.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} @@ -130,7 +130,9 @@

    Daphne Hart
    NHS: 999 374 0952
    - Special appointment 2 slots + Special appointment + + 2 slots
    Tiny note for a special appointment @@ -596,6 +598,10 @@

    Held + + hold type + + x slots
    Tiny note for a non-standard hold @@ -631,6 +637,8 @@

    Held + + hold type
    Tiny note for a non-standard hold @@ -682,6 +690,8 @@

    Held + + hold type
    Tiny note for a non-standard hold @@ -920,8 +930,10 @@

- - Special appointment 3 slots + + Special appointment + + 3 slots diff --git a/app/views/sessions/templating-01-listing.html b/app/views/sessions/templating-01-listing.html index f9d6ae87..8edc6baf 100644 --- a/app/views/sessions/templating-01-listing.html +++ b/app/views/sessions/templating-01-listing.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/sessions/templating-03-name-and-description.html b/app/views/sessions/templating-03-name-and-description.html index 0eba11ba..61ae2021 100644 --- a/app/views/sessions/templating-03-name-and-description.html +++ b/app/views/sessions/templating-03-name-and-description.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %} diff --git a/app/views/sessions/templating-04-check-answers.html b/app/views/sessions/templating-04-check-answers.html index ae91bca6..62e0df7a 100644 --- a/app/views/sessions/templating-04-check-answers.html +++ b/app/views/sessions/templating-04-check-answers.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName) }} + {{ primaryNavigation("Clinics", serviceName, bsoName) }} {% endblock %} {% block beforeContent %}{% endblock %}