From fc8e0489ad82f820857bb5ea02e7c6b39cdacab5 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Fri, 8 May 2026 09:55:52 +0100 Subject: [PATCH 1/2] Dedupe info in this listing --- app/views/batches/index.html | 46 +++++++++--------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/app/views/batches/index.html b/app/views/batches/index.html index c23de5d..ff62988 100644 --- a/app/views/batches/index.html +++ b/app/views/batches/index.html @@ -37,13 +37,13 @@

Manage batches

{% set batch_1 %} Crawley - Pound Hill
- HWO-standard-20251209 + HWO-standard-20251209 {% endset %} {% set batch_1_progress %}
{{ tag({ - text: "0 of 2172", + text: "0 of 2172 appointed", classes: "nhsuk-tag--blue" }) }}
@@ -52,13 +52,13 @@

Manage batches

{% set batch_2 %} Chichester - Parklands
- HWO-standard-20251212 + HWO-standard-20251212 {% endset %} {% set batch_2_progress %}
{{ tag({ - text: "1306 of 1352", + text: "1306 of 1352 appointed", classes: "nhsuk-tag--blue" }) }}
@@ -67,13 +67,13 @@

Manage batches

{% set failsafe %} February failsafe
- HWO-failsafe-20260115 + HWO-failsafe-20260115 {% endset %} {% set failsafe_progress %}
{{ tag({ - text: "0 of 308", + text: "0 of 308 appointed", classes: "nhsuk-tag--blue" }) }}
@@ -82,13 +82,13 @@

Manage batches

{% set auto %} Aged over 71 - slippage 03-Feb-2026 11:00
- HWO-auto-slippage-2020203-1100 + HWO-auto-slippage-2020203-1100 {% endset %} {% set auto_progress %}
{{ tag({ - text: "0 of 2", + text: "0 of 2 appointed", classes: "nhsuk-tag--blue" }) }}
@@ -97,20 +97,20 @@

Manage batches

{% set auto_2 %} Aged 53 - never invited 03-Feb-2026 11:00
- HWO-auto-never-invited-2020203-1100 + HWO-auto-never-invited-2020203-1100 {% endset %} {% set auto_2_progress %}
{{ tag({ - text: "0 of 4", + text: "0 of 4 appointed", classes: "nhsuk-tag--blue" }) }}
{% endset %} {{ table({ - firstCellIsHeader: true, + firstCellIsHeader: false, head: [ { text: "Batch" @@ -118,10 +118,6 @@

Manage batches

{ text: "Type" }, - { - text: "Participants", - format: "numeric" - }, { text: "Progress" } @@ -134,10 +130,6 @@

Manage batches

{ text: "Failsafe" }, - { - text: "308", - format: "numeric" - }, { html: failsafe_progress } @@ -149,10 +141,6 @@

Manage batches

{ text: "Auto" }, - { - text: "2", - format: "numeric" - }, { html: auto_progress } @@ -164,10 +152,6 @@

Manage batches

{ text: "Auto" }, - { - text: "4", - format: "numeric" - }, { html: auto_2_progress } @@ -179,10 +163,6 @@

Manage batches

{ text: "Standard" }, - { - text: "2172", - format: "numeric" - }, { html: batch_1_progress } @@ -194,10 +174,6 @@

Manage batches

{ text: "Standard" }, - { - text: "1352", - format: "numeric" - }, { html: batch_2_progress } From 4d716948b00b5744e67c3e152415c00d203edcac Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Fri, 8 May 2026 10:41:50 +0100 Subject: [PATCH 2/2] First run at clinics, plus adding clarity to the small progress bars in listings --- app/assets/sass/main.scss | 3 +- .../clinics/clinic-listing-table.html | 56 +++++++++++++++++++ app/views/_includes/primary-navigation.html | 2 +- .../batches/batch-detail-in-progress.html | 8 ++- app/views/batches/index.html | 40 ++++--------- app/views/clinics/index.html | 50 +++++++++++++++++ app/views/index.html | 10 +++- 7 files changed, 134 insertions(+), 35 deletions(-) create mode 100644 app/views/_includes/clinics/clinic-listing-table.html create mode 100644 app/views/clinics/index.html diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 01acaa7..f349cda 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -114,9 +114,10 @@ .app-simple-progress-bar { width: 100%; min-width: 200px; + outline: 1px solid #aeb7bd; &.--thin { - height: auto; + min-height: 19px; } &.--generic { diff --git a/app/views/_includes/clinics/clinic-listing-table.html b/app/views/_includes/clinics/clinic-listing-table.html new file mode 100644 index 0000000..cf58f24 --- /dev/null +++ b/app/views/_includes/clinics/clinic-listing-table.html @@ -0,0 +1,56 @@ +{{ table({ + firstCellIsHeader: false, + head: [ + { + text: 'Clinic' + }, + { + text: 'Location' + }, + { + text: 'Unit' + }, + { + text: 'Timeframe' + }, + { + text: 'Capacity' + } + ], + rows: [ + [ + { + html: 'Chichester - standard slots May 2026
HWO-NNN-standard-20260501' + }, + { + html: 'Chichester
St Richard’s Hospital' + }, + { + html: 'Alpha van
HWO-mobile-1 ' + }, + { + html: '1 May 2026 to 31 May 2026
21 days' + }, + { + html: '
10 slots available' + } + ], + [ + { + html: 'Worthing - special slots May 2026
HWO-NNN-special-20260501' + }, + { + html: 'Worthing
Worthing Hospital' + }, + { + html: 'Home base
HWO-static-1 ' + }, + { + html: '7, 21 May 2026
2 days' + }, + { + html: '
40 slots available' + } + ] + ] +}) }} diff --git a/app/views/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html index 5efae8e..7805246 100644 --- a/app/views/_includes/primary-navigation.html +++ b/app/views/_includes/primary-navigation.html @@ -35,7 +35,7 @@ active: activeItem === "Manage batches" }, { - href: "#", + href: "/clinics/", text: "Manage clinics", active: activeItem === "Manage clinics" }, diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index a264f53..489d015 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -242,11 +242,15 @@

Reconci
-
+
{% call details({ summaryHtml: '

Clinics associated with this batch

' }) %} -

No clinics associated with this batch

+ + + + {% include "_includes/clinics/clinic-listing-table.html"%} + {% endcall %}
diff --git a/app/views/batches/index.html b/app/views/batches/index.html index ff62988..3c7fa97 100644 --- a/app/views/batches/index.html +++ b/app/views/batches/index.html @@ -41,12 +41,8 @@

Manage batches

HWO-standard-20251209 {% endset %} {% set batch_1_progress %} -
- {{ tag({ - text: "0 of 2172 appointed", - classes: "nhsuk-tag--blue" - }) }} -
+
+ 0 of 2172 appointed {% endset %} {% set batch_2 %} @@ -56,12 +52,8 @@

Manage batches

HWO-standard-20251212 {% endset %} {% set batch_2_progress %} -
- {{ tag({ - text: "1306 of 1352 appointed", - classes: "nhsuk-tag--blue" - }) }} -
+
+ 1306 of 1352 appointed {% endset %} {% set failsafe %} @@ -71,12 +63,8 @@

Manage batches

HWO-failsafe-20260115 {% endset %} {% set failsafe_progress %} -
- {{ tag({ - text: "0 of 308 appointed", - classes: "nhsuk-tag--blue" - }) }} -
+
+ 0 of 308 appointed {% endset %} {% set auto %} @@ -86,12 +74,8 @@

Manage batches

HWO-auto-slippage-2020203-1100 {% endset %} {% set auto_progress %} -
- {{ tag({ - text: "0 of 2 appointed", - classes: "nhsuk-tag--blue" - }) }} -
+
+ 0 of 2 appointed {% endset %} {% set auto_2 %} @@ -101,12 +85,8 @@

Manage batches

HWO-auto-never-invited-2020203-1100 {% endset %} {% set auto_2_progress %} -
- {{ tag({ - text: "0 of 4 appointed", - classes: "nhsuk-tag--blue" - }) }} -
+
+ 0 of 4 appointed {% endset %} {{ table({ diff --git a/app/views/clinics/index.html b/app/views/clinics/index.html new file mode 100644 index 0000000..aceefb0 --- /dev/null +++ b/app/views/clinics/index.html @@ -0,0 +1,50 @@ +{% extends 'layout.html' %} + +{% set pageName = "Manage clinics" %} + +{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage clinics", serviceName, bsoName) }} +{% endblock %} + +{% block beforeContent %} + +{{ breadcrumb({ + items: [ + { + href: "#", + text: "Home" + } + ] +}) }} + +{% endblock %} + +{% block content %} +
+

Manage clinics

+ + {{ button({ + text: "Create a new clinic", + href: "#", + classes: "nhsuk-button--secondary" + }) }} +
+ +
+
+ + {% include "_includes/clinics/clinic-listing-table.html"%} + +
+
+ +
+
+

Completed batches

+

+ View completed clinics +

+
+
+{% endblock %} diff --git a/app/views/index.html b/app/views/index.html index 22e44af..0c6d77a 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -37,8 +37,16 @@

{{ serviceName }}

+

Early May 2026

+

Clinics: first run

+
    +
  1. + Clinic listing +
    2. +
+

Mid April 2026

-

Batches: first run at these fundamental objects

+

Batches: first run