diff --git a/app/assets/sass/components/_session-slots.scss b/app/assets/sass/components/_session-slots.scss new file mode 100644 index 0000000..e19bd8e --- /dev/null +++ b/app/assets/sass/components/_session-slots.scss @@ -0,0 +1,53 @@ +@use "nhsuk-frontend/dist/nhsuk/core" as *; + +.slot { + background-color: #fff; + border: 1px solid #212b32; + padding-left: 8px; + user-select: none; + margin-bottom: 12px; + min-height: 2.75rem; +} + +.slot-end { font-size: 16px; margin-right: 1rem; } +.slot-tag { font-size: 16px; margin-left: 1rem; } + +.slot.is-hold {} +.slot.is-staff-break { + background: transparent; + border-style: dashed; +} +.slot.is-special-appointment {} + +.slot.is-merged { + border-bottom: none; + margin-bottom: 0; +} +.slot.is-merged-child { + border-top: 1px dashed #212b32; + height: 42px; +} +.slot.is-merged-child > .nhsuk-checkboxes__item, +.slot.is-merged-child > div { + display: none; +} +.slot.is-merged-last-child { + border-bottom: 1px solid #212b32; + margin-bottom: 12px; +} + +.slot.is-staff-break.is-merged-last-child { + border-bottom-style: dashed; +} + +.slot.is-merged-child > .slot-time, +.slot.is-merged-child > .slot-end { + display: none; +} + +.slot .nhsuk-checkboxes__label { + width: 100%; +} + +.panel-item { display: block; cursor: pointer; } +.panel-item.disabled { opacity: 0.38; cursor: default; pointer-events: none; } diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index a3b1d1b..282cb23 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -93,6 +93,7 @@ @forward "components/participant-table"; //@forward "components/participant-search"; @forward "components/progress-bar"; +@forward "components/session-slots"; @forward "components/template-card"; @forward "components/template-preview-dialog"; @forward "components/workflow"; diff --git a/app/views/rebook-individual/index.html b/app/views/rebook-individual/index.html new file mode 100755 index 0000000..710edc9 --- /dev/null +++ b/app/views/rebook-individual/index.html @@ -0,0 +1,172 @@ +{% extends 'layout.html' %} +{% set pageName = "" %} + +{% block beforeContent %} +{% endblock %} + +{% block content %} + +

Sketchpad

+ +
+
+
+
+ +

+ Slot type +

+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+ +
+ +

Earlier clinic sessions (days)

+ +
+ +

+ Tuesday + 1 September 2026 +

+ +
+
+ + +
+
+ +
+ +
+
+ + +
+
+ +
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+
+ + +
+
+ +
+ +

Later clinic sessions (days)

+ +
+
+ +{% endblock %} diff --git a/app/views/sessions/02-organise-slots.html b/app/views/sessions/02-organise-slots.html index d1dbb4d..488899a 100644 --- a/app/views/sessions/02-organise-slots.html +++ b/app/views/sessions/02-organise-slots.html @@ -13,59 +13,6 @@ {% block content %} - - {% set tickSvg %}

With selected:

let typeHtml = ''; if (slotType && !isChild) { const typeLabel = slotType === 'hold' ? 'Held' : slotType === 'staff-break' ? 'Staff break' : 'Special appointment'; - const tagClass = slotType === 'hold' ? 'nhsuk-tag--grey' : slotType === 'staff-break' ? 'nhsuk-tag--grey' : 'nhsuk-tag--yellow'; + const tagClass = slotType === 'hold' ? 'nhsuk-tag--orange' : slotType === 'staff-break' ? 'nhsuk-tag--grey' : 'nhsuk-tag--yellow'; typeHtml += `${typeLabel}`; } diff --git a/app/views/sessions/day-slot-view.html b/app/views/sessions/day-slot-view.html index 5c37a19..cd2869d 100644 --- a/app/views/sessions/day-slot-view.html +++ b/app/views/sessions/day-slot-view.html @@ -129,7 +129,7 @@

Daphne Hart
NHS: 999 374 0952
- + Special appointment 2 slots @@ -596,9 +596,9 @@

13:50 to 14:00 - + Held - + hold type x slots @@ -635,7 +635,7 @@

- + Held hold type @@ -688,7 +688,7 @@

- + Held hold type diff --git a/package-lock.json b/package-lock.json index 678deb9..4900de0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3959,7 +3959,6 @@ "cpu": [ "arm" ], - "libc": "glibc", "license": "MIT", "optional": true, "os": [ @@ -3976,7 +3975,6 @@ "cpu": [ "arm64" ], - "libc": "glibc", "license": "MIT", "optional": true, "os": [ @@ -3993,7 +3991,6 @@ "cpu": [ "arm" ], - "libc": "musl", "license": "MIT", "optional": true, "os": [ @@ -4010,7 +4007,6 @@ "cpu": [ "arm64" ], - "libc": "musl", "license": "MIT", "optional": true, "os": [ @@ -4027,7 +4023,6 @@ "cpu": [ "riscv64" ], - "libc": "musl", "license": "MIT", "optional": true, "os": [ @@ -4044,7 +4039,6 @@ "cpu": [ "x64" ], - "libc": "musl", "license": "MIT", "optional": true, "os": [ @@ -4061,7 +4055,6 @@ "cpu": [ "riscv64" ], - "libc": "glibc", "license": "MIT", "optional": true, "os": [ @@ -4078,7 +4071,6 @@ "cpu": [ "x64" ], - "libc": "glibc", "license": "MIT", "optional": true, "os": [