From a0b17a260034395b4a934edc75dd8aa3ad2f423f Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Wed, 15 Apr 2026 15:47:13 +0100 Subject: [PATCH 1/9] adjust folder naming --- app/views/index.html | 25 +++++++++++++++---- .../_includes/primary-navigation.html | 0 .../bso/bso-internal-details.html | 2 +- .../bso/bso-public-details.html | 2 +- .../bso/geo-bso-west-berks.js | 0 .../index.html | 6 ++--- .../location/location-listing.html | 4 +-- .../location/location-location-details.html | 4 +-- .../location-travel-and-transport.html | 4 +-- .../unit/unit-internal-details.html | 4 +-- .../unit/unit-listing.html | 4 +-- .../unit/unit-public-details.html | 4 +-- 12 files changed, 37 insertions(+), 22 deletions(-) rename app/views/{pre-alpha-flats => pre-alpha-bso}/_includes/primary-navigation.html (100%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/bso/bso-internal-details.html (99%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/bso/bso-public-details.html (99%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/bso/geo-bso-west-berks.js (100%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/index.html (92%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/location/location-listing.html (92%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/location/location-location-details.html (98%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/location/location-travel-and-transport.html (98%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/unit/unit-internal-details.html (97%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/unit/unit-listing.html (94%) rename app/views/{pre-alpha-flats => pre-alpha-bso}/unit/unit-public-details.html (98%) diff --git a/app/views/index.html b/app/views/index.html index 8225aa6..de4606b 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -38,20 +38,35 @@

Late March 2026

-

Mat note: first rounds of flats based on "easy win" building blocks. Cheap sketches to provoke.

+

Mat note: first rounds of flats based on "easy win" BSO level building blocks.

  1. - Manage organisation, breast screening units, and locations + Manage organisation, breast screening units, and locations
  2. - BSO organisation + BSO organisation
  3. - Breast screening units + Breast screening units
  4. - Locations + Locations +
    5. +
+ +

Mid April 2026

+

Batches: first run at these fundamental objects.

+ +
    +
  1. + Batch listing +
    2. +
  2. + Brand new batch +
    3. +
  3. + Batch in progress
diff --git a/app/views/pre-alpha-flats/_includes/primary-navigation.html b/app/views/pre-alpha-bso/_includes/primary-navigation.html similarity index 100% rename from app/views/pre-alpha-flats/_includes/primary-navigation.html rename to app/views/pre-alpha-bso/_includes/primary-navigation.html diff --git a/app/views/pre-alpha-flats/bso/bso-internal-details.html b/app/views/pre-alpha-bso/bso/bso-internal-details.html similarity index 99% rename from app/views/pre-alpha-flats/bso/bso-internal-details.html rename to app/views/pre-alpha-bso/bso/bso-internal-details.html index d6b5252..6b874a6 100644 --- a/app/views/pre-alpha-flats/bso/bso-internal-details.html +++ b/app/views/pre-alpha-bso/bso/bso-internal-details.html @@ -39,7 +39,7 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" } ] diff --git a/app/views/pre-alpha-flats/bso/bso-public-details.html b/app/views/pre-alpha-bso/bso/bso-public-details.html similarity index 99% rename from app/views/pre-alpha-flats/bso/bso-public-details.html rename to app/views/pre-alpha-bso/bso/bso-public-details.html index 58fc380..930bab5 100644 --- a/app/views/pre-alpha-flats/bso/bso-public-details.html +++ b/app/views/pre-alpha-bso/bso/bso-public-details.html @@ -33,7 +33,7 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" } ] diff --git a/app/views/pre-alpha-flats/bso/geo-bso-west-berks.js b/app/views/pre-alpha-bso/bso/geo-bso-west-berks.js similarity index 100% rename from app/views/pre-alpha-flats/bso/geo-bso-west-berks.js rename to app/views/pre-alpha-bso/bso/geo-bso-west-berks.js diff --git a/app/views/pre-alpha-flats/index.html b/app/views/pre-alpha-bso/index.html similarity index 92% rename from app/views/pre-alpha-flats/index.html rename to app/views/pre-alpha-bso/index.html index f3bab9c..d16833c 100755 --- a/app/views/pre-alpha-flats/index.html +++ b/app/views/pre-alpha-bso/index.html @@ -45,7 +45,7 @@
{{ card({ clickable: true, - href: "/pre-alpha-flats/bso/bso-public-details", + href: "/pre-alpha-bso/bso/bso-public-details", heading: "Breast screening office (BSO)", headingClasses: "nhsuk-heading-m", description: "Manage your organisation details" @@ -56,7 +56,7 @@
  • {{ card({ clickable: true, - href: "/pre-alpha-flats/unit/unit-listing", + href: "/pre-alpha-bso/unit/unit-listing", heading: "Breast screening units", headingClasses: "nhsuk-heading-m", description: "Manage the screening units that make up your BSO" @@ -65,7 +65,7 @@
  • {{ card({ clickable: true, - href: "/pre-alpha-flats/location/location-listing", + href: "/pre-alpha-bso/location/location-listing", heading: "Manage locations", headingClasses: "nhsuk-heading-m", description: "Manage the static and mobile locations available to your units" diff --git a/app/views/pre-alpha-flats/location/location-listing.html b/app/views/pre-alpha-bso/location/location-listing.html similarity index 92% rename from app/views/pre-alpha-flats/location/location-listing.html rename to app/views/pre-alpha-bso/location/location-listing.html index 07f0952..0bc3fcb 100644 --- a/app/views/pre-alpha-flats/location/location-listing.html +++ b/app/views/pre-alpha-bso/location/location-listing.html @@ -33,7 +33,7 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" } ] @@ -51,7 +51,7 @@

  • {% set cardHeadingHtml %} -

    Camberwell building

    +

    Camberwell building

    {% endset %} {% set cardDescriptionHtml %} diff --git a/app/views/pre-alpha-flats/location/location-location-details.html b/app/views/pre-alpha-bso/location/location-location-details.html similarity index 98% rename from app/views/pre-alpha-flats/location/location-location-details.html rename to app/views/pre-alpha-bso/location/location-location-details.html index c76e1d9..a4a9616 100644 --- a/app/views/pre-alpha-flats/location/location-location-details.html +++ b/app/views/pre-alpha-bso/location/location-location-details.html @@ -39,11 +39,11 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" }, { - href: "/pre-alpha-flats/location/location-listing", + href: "/pre-alpha-bso/location/location-listing", text: "Locations" } ] diff --git a/app/views/pre-alpha-flats/location/location-travel-and-transport.html b/app/views/pre-alpha-bso/location/location-travel-and-transport.html similarity index 98% rename from app/views/pre-alpha-flats/location/location-travel-and-transport.html rename to app/views/pre-alpha-bso/location/location-travel-and-transport.html index 3cee8c7..24df192 100644 --- a/app/views/pre-alpha-flats/location/location-travel-and-transport.html +++ b/app/views/pre-alpha-bso/location/location-travel-and-transport.html @@ -33,11 +33,11 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" }, { - href: "/pre-alpha-flats/location/location-listing", + href: "/pre-alpha-bso/location/location-listing", text: "Locations" } ] diff --git a/app/views/pre-alpha-flats/unit/unit-internal-details.html b/app/views/pre-alpha-bso/unit/unit-internal-details.html similarity index 97% rename from app/views/pre-alpha-flats/unit/unit-internal-details.html rename to app/views/pre-alpha-bso/unit/unit-internal-details.html index 72dbf9c..a7bae0c 100644 --- a/app/views/pre-alpha-flats/unit/unit-internal-details.html +++ b/app/views/pre-alpha-bso/unit/unit-internal-details.html @@ -33,11 +33,11 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" }, { - href: "/pre-alpha-flats/unit/unit-listing", + href: "/pre-alpha-bso/unit/unit-listing", text: "Units" } ] diff --git a/app/views/pre-alpha-flats/unit/unit-listing.html b/app/views/pre-alpha-bso/unit/unit-listing.html similarity index 94% rename from app/views/pre-alpha-flats/unit/unit-listing.html rename to app/views/pre-alpha-bso/unit/unit-listing.html index ee9a3a1..208d69e 100644 --- a/app/views/pre-alpha-flats/unit/unit-listing.html +++ b/app/views/pre-alpha-bso/unit/unit-listing.html @@ -33,7 +33,7 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" } ] @@ -52,7 +52,7 @@

    {% set cardHeadingHtml %} Mobile unit: Mandy - AN-SKIT-p33ps -

    West Berks mobile screening unit

    +

    West Berks mobile screening unit

    {% endset %} {% set cardDescriptionHtml %} diff --git a/app/views/pre-alpha-flats/unit/unit-public-details.html b/app/views/pre-alpha-bso/unit/unit-public-details.html similarity index 98% rename from app/views/pre-alpha-flats/unit/unit-public-details.html rename to app/views/pre-alpha-bso/unit/unit-public-details.html index 777baa1..c2a4d11 100644 --- a/app/views/pre-alpha-flats/unit/unit-public-details.html +++ b/app/views/pre-alpha-bso/unit/unit-public-details.html @@ -33,11 +33,11 @@ text: "Home" }, { - href: "/pre-alpha-flats/", + href: "/pre-alpha-bso/", text: "Manage other stuff" }, { - href: "/pre-alpha-flats/unit/unit-listing", + href: "/pre-alpha-bso/unit/unit-listing", text: "Units" } ] From a6ec2d9e1836aecd1369136066fd4b7bd2b735e7 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Wed, 15 Apr 2026 15:48:23 +0100 Subject: [PATCH 2/9] Sort out the relative paths --- app/views/pre-alpha-bso/bso/bso-internal-details.html | 2 +- app/views/pre-alpha-bso/bso/bso-public-details.html | 2 +- app/views/pre-alpha-bso/index.html | 2 +- app/views/pre-alpha-bso/location/location-listing.html | 2 +- app/views/pre-alpha-bso/location/location-location-details.html | 2 +- .../pre-alpha-bso/location/location-travel-and-transport.html | 2 +- app/views/pre-alpha-bso/unit/unit-internal-details.html | 2 +- app/views/pre-alpha-bso/unit/unit-listing.html | 2 +- app/views/pre-alpha-bso/unit/unit-public-details.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/pre-alpha-bso/bso/bso-internal-details.html b/app/views/pre-alpha-bso/bso/bso-internal-details.html index 6b874a6..6c06004 100644 --- a/app/views/pre-alpha-bso/bso/bso-internal-details.html +++ b/app/views/pre-alpha-bso/bso/bso-internal-details.html @@ -26,7 +26,7 @@ {% endblock %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/bso/bso-public-details.html b/app/views/pre-alpha-bso/bso/bso-public-details.html index 930bab5..a6ee841 100644 --- a/app/views/pre-alpha-bso/bso/bso-public-details.html +++ b/app/views/pre-alpha-bso/bso/bso-public-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berkshire Screening Service" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/index.html b/app/views/pre-alpha-bso/index.html index d16833c..10e860e 100755 --- a/app/views/pre-alpha-bso/index.html +++ b/app/views/pre-alpha-bso/index.html @@ -20,7 +20,7 @@ {% set pageName = "Manage other stuff" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/location/location-listing.html b/app/views/pre-alpha-bso/location/location-listing.html index 0bc3fcb..6992eed 100644 --- a/app/views/pre-alpha-bso/location/location-listing.html +++ b/app/views/pre-alpha-bso/location/location-listing.html @@ -20,7 +20,7 @@ {% set pageName = "Units" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/location/location-location-details.html b/app/views/pre-alpha-bso/location/location-location-details.html index a4a9616..fd1803c 100644 --- a/app/views/pre-alpha-bso/location/location-location-details.html +++ b/app/views/pre-alpha-bso/location/location-location-details.html @@ -26,7 +26,7 @@ {% endblock %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/location/location-travel-and-transport.html b/app/views/pre-alpha-bso/location/location-travel-and-transport.html index 24df192..4735518 100644 --- a/app/views/pre-alpha-bso/location/location-travel-and-transport.html +++ b/app/views/pre-alpha-bso/location/location-travel-and-transport.html @@ -20,7 +20,7 @@ {% set pageName = "Camberwell Building" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/unit/unit-internal-details.html b/app/views/pre-alpha-bso/unit/unit-internal-details.html index a7bae0c..5b55bcc 100644 --- a/app/views/pre-alpha-bso/unit/unit-internal-details.html +++ b/app/views/pre-alpha-bso/unit/unit-internal-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berks mobile screening unit name" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/unit/unit-listing.html b/app/views/pre-alpha-bso/unit/unit-listing.html index 208d69e..7f05d04 100644 --- a/app/views/pre-alpha-bso/unit/unit-listing.html +++ b/app/views/pre-alpha-bso/unit/unit-listing.html @@ -20,7 +20,7 @@ {% set pageName = "Units" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/pre-alpha-bso/unit/unit-public-details.html b/app/views/pre-alpha-bso/unit/unit-public-details.html index c2a4d11..bee2e12 100644 --- a/app/views/pre-alpha-bso/unit/unit-public-details.html +++ b/app/views/pre-alpha-bso/unit/unit-public-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berks mobile screening unit name" %} {% block header %} - {% include "pre-alpha-flats/_includes/primary-navigation.html" %} + {% include "pre-alpha-bso/_includes/primary-navigation.html" %} {% endblock %} From 983b26137de931624b17ebedf6f2ab87c3b2911c Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 16 Apr 2026 17:39:30 +0100 Subject: [PATCH 3/9] Slight folder rejig --- .../_includes/primary-navigation.html | 0 .../bso/bso-internal-details.html | 4 +-- .../bso/bso-public-details.html | 4 +-- .../bso/geo-bso-west-berks.js | 0 .../{pre-alpha-bso => bso-objects}/index.html | 8 +++--- .../location/location-listing.html | 6 ++--- .../location/location-location-details.html | 6 ++--- .../location-travel-and-transport.html | 6 ++--- .../unit/unit-internal-details.html | 6 ++--- .../unit/unit-listing.html | 6 ++--- .../unit/unit-public-details.html | 6 ++--- app/views/index.html | 26 +++++++++---------- 12 files changed, 39 insertions(+), 39 deletions(-) rename app/views/{pre-alpha-bso => }/_includes/primary-navigation.html (100%) rename app/views/{pre-alpha-bso => bso-objects}/bso/bso-internal-details.html (98%) rename app/views/{pre-alpha-bso => bso-objects}/bso/bso-public-details.html (98%) rename app/views/{pre-alpha-bso => bso-objects}/bso/geo-bso-west-berks.js (100%) rename app/views/{pre-alpha-bso => bso-objects}/index.html (90%) rename app/views/{pre-alpha-bso => bso-objects}/location/location-listing.html (89%) rename app/views/{pre-alpha-bso => bso-objects}/location/location-location-details.html (98%) rename app/views/{pre-alpha-bso => bso-objects}/location/location-travel-and-transport.html (97%) rename app/views/{pre-alpha-bso => bso-objects}/unit/unit-internal-details.html (96%) rename app/views/{pre-alpha-bso => bso-objects}/unit/unit-listing.html (91%) rename app/views/{pre-alpha-bso => bso-objects}/unit/unit-public-details.html (96%) diff --git a/app/views/pre-alpha-bso/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html similarity index 100% rename from app/views/pre-alpha-bso/_includes/primary-navigation.html rename to app/views/_includes/primary-navigation.html diff --git a/app/views/pre-alpha-bso/bso/bso-internal-details.html b/app/views/bso-objects/bso/bso-internal-details.html similarity index 98% rename from app/views/pre-alpha-bso/bso/bso-internal-details.html rename to app/views/bso-objects/bso/bso-internal-details.html index 6c06004..f1f84b2 100644 --- a/app/views/pre-alpha-bso/bso/bso-internal-details.html +++ b/app/views/bso-objects/bso/bso-internal-details.html @@ -26,7 +26,7 @@ {% endblock %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -39,7 +39,7 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" } ] diff --git a/app/views/pre-alpha-bso/bso/bso-public-details.html b/app/views/bso-objects/bso/bso-public-details.html similarity index 98% rename from app/views/pre-alpha-bso/bso/bso-public-details.html rename to app/views/bso-objects/bso/bso-public-details.html index a6ee841..162f54c 100644 --- a/app/views/pre-alpha-bso/bso/bso-public-details.html +++ b/app/views/bso-objects/bso/bso-public-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berkshire Screening Service" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -33,7 +33,7 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" } ] diff --git a/app/views/pre-alpha-bso/bso/geo-bso-west-berks.js b/app/views/bso-objects/bso/geo-bso-west-berks.js similarity index 100% rename from app/views/pre-alpha-bso/bso/geo-bso-west-berks.js rename to app/views/bso-objects/bso/geo-bso-west-berks.js diff --git a/app/views/pre-alpha-bso/index.html b/app/views/bso-objects/index.html similarity index 90% rename from app/views/pre-alpha-bso/index.html rename to app/views/bso-objects/index.html index 10e860e..0e9ed8d 100755 --- a/app/views/pre-alpha-bso/index.html +++ b/app/views/bso-objects/index.html @@ -20,7 +20,7 @@ {% set pageName = "Manage other stuff" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -45,7 +45,7 @@
    {{ card({ clickable: true, - href: "/pre-alpha-bso/bso/bso-public-details", + href: "/bso-objects/bso/bso-public-details", heading: "Breast screening office (BSO)", headingClasses: "nhsuk-heading-m", description: "Manage your organisation details" @@ -56,7 +56,7 @@
  • {{ card({ clickable: true, - href: "/pre-alpha-bso/unit/unit-listing", + href: "/bso-objects/unit/unit-listing", heading: "Breast screening units", headingClasses: "nhsuk-heading-m", description: "Manage the screening units that make up your BSO" @@ -65,7 +65,7 @@
  • {{ card({ clickable: true, - href: "/pre-alpha-bso/location/location-listing", + href: "/bso-objects/location/location-listing", heading: "Manage locations", headingClasses: "nhsuk-heading-m", description: "Manage the static and mobile locations available to your units" diff --git a/app/views/pre-alpha-bso/location/location-listing.html b/app/views/bso-objects/location/location-listing.html similarity index 89% rename from app/views/pre-alpha-bso/location/location-listing.html rename to app/views/bso-objects/location/location-listing.html index 6992eed..7e431e0 100644 --- a/app/views/pre-alpha-bso/location/location-listing.html +++ b/app/views/bso-objects/location/location-listing.html @@ -20,7 +20,7 @@ {% set pageName = "Units" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -33,7 +33,7 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" } ] @@ -51,7 +51,7 @@

  • {% set cardHeadingHtml %} -

    Camberwell building

    +

    Camberwell building

    {% endset %} {% set cardDescriptionHtml %} diff --git a/app/views/pre-alpha-bso/location/location-location-details.html b/app/views/bso-objects/location/location-location-details.html similarity index 98% rename from app/views/pre-alpha-bso/location/location-location-details.html rename to app/views/bso-objects/location/location-location-details.html index fd1803c..43bdab9 100644 --- a/app/views/pre-alpha-bso/location/location-location-details.html +++ b/app/views/bso-objects/location/location-location-details.html @@ -26,7 +26,7 @@ {% endblock %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -39,11 +39,11 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" }, { - href: "/pre-alpha-bso/location/location-listing", + href: "/bso-objects/location/location-listing", text: "Locations" } ] diff --git a/app/views/pre-alpha-bso/location/location-travel-and-transport.html b/app/views/bso-objects/location/location-travel-and-transport.html similarity index 97% rename from app/views/pre-alpha-bso/location/location-travel-and-transport.html rename to app/views/bso-objects/location/location-travel-and-transport.html index 4735518..0a4a227 100644 --- a/app/views/pre-alpha-bso/location/location-travel-and-transport.html +++ b/app/views/bso-objects/location/location-travel-and-transport.html @@ -20,7 +20,7 @@ {% set pageName = "Camberwell Building" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -33,11 +33,11 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" }, { - href: "/pre-alpha-bso/location/location-listing", + href: "/bso-objects/location/location-listing", text: "Locations" } ] diff --git a/app/views/pre-alpha-bso/unit/unit-internal-details.html b/app/views/bso-objects/unit/unit-internal-details.html similarity index 96% rename from app/views/pre-alpha-bso/unit/unit-internal-details.html rename to app/views/bso-objects/unit/unit-internal-details.html index 5b55bcc..999b1a0 100644 --- a/app/views/pre-alpha-bso/unit/unit-internal-details.html +++ b/app/views/bso-objects/unit/unit-internal-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berks mobile screening unit name" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -33,11 +33,11 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" }, { - href: "/pre-alpha-bso/unit/unit-listing", + href: "/bso-objects/unit/unit-listing", text: "Units" } ] diff --git a/app/views/pre-alpha-bso/unit/unit-listing.html b/app/views/bso-objects/unit/unit-listing.html similarity index 91% rename from app/views/pre-alpha-bso/unit/unit-listing.html rename to app/views/bso-objects/unit/unit-listing.html index 7f05d04..e584d4e 100644 --- a/app/views/pre-alpha-bso/unit/unit-listing.html +++ b/app/views/bso-objects/unit/unit-listing.html @@ -20,7 +20,7 @@ {% set pageName = "Units" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -33,7 +33,7 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" } ] @@ -52,7 +52,7 @@

    {% set cardHeadingHtml %} Mobile unit: Mandy - AN-SKIT-p33ps -

    West Berks mobile screening unit

    +

    West Berks mobile screening unit

    {% endset %} {% set cardDescriptionHtml %} diff --git a/app/views/pre-alpha-bso/unit/unit-public-details.html b/app/views/bso-objects/unit/unit-public-details.html similarity index 96% rename from app/views/pre-alpha-bso/unit/unit-public-details.html rename to app/views/bso-objects/unit/unit-public-details.html index bee2e12..30910d7 100644 --- a/app/views/pre-alpha-bso/unit/unit-public-details.html +++ b/app/views/bso-objects/unit/unit-public-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berks mobile screening unit name" %} {% block header %} - {% include "pre-alpha-bso/_includes/primary-navigation.html" %} + {% include "../_includes/primary-navigation.html" %} {% endblock %} @@ -33,11 +33,11 @@ text: "Home" }, { - href: "/pre-alpha-bso/", + href: "/bso-objects/", text: "Manage other stuff" }, { - href: "/pre-alpha-bso/unit/unit-listing", + href: "/bso-objects/unit/unit-listing", text: "Units" } ] diff --git a/app/views/index.html b/app/views/index.html index de4606b..2ca6a47 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -37,36 +37,36 @@

    {{ serviceName }}

    -

    Late March 2026

    -

    Mat note: first rounds of flats based on "easy win" BSO level building blocks.

    +

    Mid April 2026

    +

    Batches: first run at these fundamental objects

    1. - Manage organisation, breast screening units, and locations -
      2. -
    2. - BSO organisation + Batch listing
    3. - Breast screening units + Brand new batch
    4. - Locations + Batch in progress
    -

    Mid April 2026

    -

    Batches: first run at these fundamental objects.

    +

    Late March 2026

    +

    BSO-level building blocks

    1. - Batch listing + Manage organisation, breast screening units, and locations +
      2. +
    2. + BSO organisation
    3. - Brand new batch + Breast screening units
    4. - Batch in progress + Locations
    From 9565991b66ba57b0d641d3dc0fa55a1160b7eb96 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 16 Apr 2026 17:48:26 +0100 Subject: [PATCH 4/9] Getting include route correct, sigh --- app/views/bso-objects/bso/bso-internal-details.html | 2 +- app/views/bso-objects/bso/bso-public-details.html | 2 +- app/views/bso-objects/index.html | 2 +- app/views/bso-objects/location/location-listing.html | 2 +- app/views/bso-objects/location/location-location-details.html | 2 +- .../bso-objects/location/location-travel-and-transport.html | 2 +- app/views/bso-objects/unit/unit-internal-details.html | 2 +- app/views/bso-objects/unit/unit-listing.html | 2 +- app/views/bso-objects/unit/unit-public-details.html | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/bso-objects/bso/bso-internal-details.html b/app/views/bso-objects/bso/bso-internal-details.html index f1f84b2..c606288 100644 --- a/app/views/bso-objects/bso/bso-internal-details.html +++ b/app/views/bso-objects/bso/bso-internal-details.html @@ -26,7 +26,7 @@ {% endblock %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/bso/bso-public-details.html b/app/views/bso-objects/bso/bso-public-details.html index 162f54c..935da2f 100644 --- a/app/views/bso-objects/bso/bso-public-details.html +++ b/app/views/bso-objects/bso/bso-public-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berkshire Screening Service" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/index.html b/app/views/bso-objects/index.html index 0e9ed8d..901d6e4 100755 --- a/app/views/bso-objects/index.html +++ b/app/views/bso-objects/index.html @@ -20,7 +20,7 @@ {% set pageName = "Manage other stuff" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/location/location-listing.html b/app/views/bso-objects/location/location-listing.html index 7e431e0..09f23b5 100644 --- a/app/views/bso-objects/location/location-listing.html +++ b/app/views/bso-objects/location/location-listing.html @@ -20,7 +20,7 @@ {% set pageName = "Units" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/location/location-location-details.html b/app/views/bso-objects/location/location-location-details.html index 43bdab9..f24480f 100644 --- a/app/views/bso-objects/location/location-location-details.html +++ b/app/views/bso-objects/location/location-location-details.html @@ -26,7 +26,7 @@ {% endblock %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/location/location-travel-and-transport.html b/app/views/bso-objects/location/location-travel-and-transport.html index 0a4a227..b60c229 100644 --- a/app/views/bso-objects/location/location-travel-and-transport.html +++ b/app/views/bso-objects/location/location-travel-and-transport.html @@ -20,7 +20,7 @@ {% set pageName = "Camberwell Building" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/unit/unit-internal-details.html b/app/views/bso-objects/unit/unit-internal-details.html index 999b1a0..2ce9fa4 100644 --- a/app/views/bso-objects/unit/unit-internal-details.html +++ b/app/views/bso-objects/unit/unit-internal-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berks mobile screening unit name" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/unit/unit-listing.html b/app/views/bso-objects/unit/unit-listing.html index e584d4e..0c35106 100644 --- a/app/views/bso-objects/unit/unit-listing.html +++ b/app/views/bso-objects/unit/unit-listing.html @@ -20,7 +20,7 @@ {% set pageName = "Units" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} diff --git a/app/views/bso-objects/unit/unit-public-details.html b/app/views/bso-objects/unit/unit-public-details.html index 30910d7..0aa3c1f 100644 --- a/app/views/bso-objects/unit/unit-public-details.html +++ b/app/views/bso-objects/unit/unit-public-details.html @@ -20,7 +20,7 @@ {% set pageName = "West Berks mobile screening unit name" %} {% block header %} - {% include "../_includes/primary-navigation.html" %} + {% include "_includes/primary-navigation.html" %} {% endblock %} From f66c6d7b56f1db560bfc2baf9952a8fa62e64f00 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Sun, 19 Apr 2026 18:31:27 +0100 Subject: [PATCH 5/9] First pass at the page view --- app/assets/sass/main.scss | 87 +++++++++ app/views/batches/batch-new.html | 303 +++++++++++++++++++++++++++++++ 2 files changed, 390 insertions(+) create mode 100644 app/views/batches/batch-new.html diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index ad807ef..bcd4ce7 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -1,5 +1,6 @@ // Import NHS.UK frontend library @forward "nhsuk-frontend/dist/nhsuk/nhsuk"; +@use "nhsuk-frontend/dist/nhsuk/core" as *; // Stolen Manage prototype components :P // https://github.com/NHSDigital/manage-breast-screening-prototype @@ -12,3 +13,89 @@ justify-content: space-between; align-items: baseline; } + +// Batch (for now) view bar charts and legends + +:root { + --standard-chart-hatch: repeating-linear-gradient(45deg, #004c23, #004c23 1px, #cce5d8 1px, #cce5d8 12px); + --special-chart-hatch: repeating-linear-gradient(-45deg, #4d3708, #4d3708 1px, #ffdc8e 1px, #ffdc8e 12px); + --vhr-chart-hatch-1: repeating-linear-gradient(-45deg, #6b140e, #6b140e 1px, transparent 1px, transparent 12px); + --vhr-chart-hatch-2: repeating-linear-gradient(45deg, #6b140e, #6b140e 1px, #f7d4d1 1px, #f7d4d1 12px); +} + +.hatching--standard { + background: var(--standard-chart-hatch) +} +.hatching--special { + background: var(--special-chart-hatch), +} +.hatching--high-risk { + background: var(--vhr-chart-hatch-1), var(--vhr-chart-hatch-2) +} + +.app-chart-bar-segmented-horizontal { + margin: 0; + /* Turn the table tbody into a single horizontal bar */ + tbody { + display: flex; + width: 100%; + height: 3rem; + overflow: hidden; + } + /* Each row becomes a segment, sized by its proportion of the total */ + tbody tr { + display: flex; + align-items: center; + justify-content: left; + overflow: hidden; + } +} +.app-chart-bar-segmented-horizontal--legend { + @include nhsuk-media-query($from: tablet) { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 1.5rem; + align-items: flex-start; + + li { + display: flex; + flex-direction: row; + align-items: flex-start; + gap: 8px; + } + } + .swatch { + display: inline-block; + width: 2rem; + height: 2rem; + flex-shrink: 0; + margin-right: 6px; + vertical-align: middle; + } +} + +.app-batch-overview-sparkline { + background-color: #fff; +} +.app-u-one-left-one-right { + display: flex; + justify-content: space-between; + align-items: center; + width: 100%; +} + +.app-simple-progress-bar { + width: 100%; + height: 2.5rem; + + &.--standard { + background: var(--standard-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff; + } + &.--special { + background: var(--special-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff; + } + &.--vhr { + background: var(--vhr-chart-hatch-1) 0 0 / var(--percentage) 100% no-repeat, var(--vhr-chart-hatch-2) 0 0 / var(--percentage) 100% no-repeat,#fff; + } +} diff --git a/app/views/batches/batch-new.html b/app/views/batches/batch-new.html new file mode 100644 index 0000000..f023f0d --- /dev/null +++ b/app/views/batches/batch-new.html @@ -0,0 +1,303 @@ + + + + + +{% extends 'layout.html' %} + + + +{% set pageName = "West Berks mobile screening unit name" %} + +{% block header %} + {% include "_includes/primary-navigation.html" %} +{% endblock %} + + + +{% block beforeContent %} +{{ breadcrumb({ + items: [ + { + href: "#", + text: "Home" + }, + { + href: "/batches/", + text: "Manage batches" + } + ] +}) }} +{% endblock %} + + + +{% block content %} + +
    +
    +
    + BDE-NTDD-202601011200 +
    +

    + Harrogate Practices Feb-March 2026 Round 13 +

    +

    Change

    +
    + Standard (NTDD) batch imported 1st January 2026 +
    +
    + +
    +
    +
    +
    +

    + + 1987 + +

    + total participants +
    +
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +

    Participant breakdown

    + +
    +
    Participant breakdown by type
    + + + + + + + + + + + + + + + + + + + + + + + + +
    CategoryCount
    + Standard + + {{ tag({ + text: "1970", + classes: "nhsuk-tag--green nhsuk-u-margin-left-2" + }) }} +
    + Special Requirements + + {{ tag({ + text: "12", + classes: "nhsuk-tag--orange nhsuk-u-margin-left-2" + }) }} +
    + Very High Risk + + {{ tag({ + text: "5", + classes: "nhsuk-tag--red nhsuk-u-margin-left-2" + }) }} +
    + + + +
    +
    +
    + +
    +
    +

    Participant distribution by next test due date

    +
    +
    +
    +
    +
    + +
    +
    +
    + Earliest next test due date: +

    + 28 February 2026 +

    +
    +
    + Latest: +

    + 31 March 2026 +

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

    Batch progress

    + +
    +
    + +
    +
    + Standard +
    +
    +
    +
    +
    + 0% appointed +
    +
    +
    +

    0 of 1970 appointed

    +
    +
    + + +
    +
    + Special requirements +
    +
    +
    +
    +
    + 0% appointed +
    +
    +
    +

    0 of 12 appointed

    +
    +
    + + + +
    +
    +

    Reconciliation

    + Very high risk (VHR) +
    +
    +
    +
    +
    + 0% reconciled +
    +
    +
    +

    0 of 5 reconciled

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

    Clinics associated with this batch

    ' + }) %} +

    ...

    + {% endcall %} +
    +
    +
    + +{% endblock %} From fa2dd2c17f6edcae3eca56b74c2e92d89c28e9c6 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Mon, 20 Apr 2026 12:05:55 +0100 Subject: [PATCH 6/9] FInish up initial punt --- app/assets/sass/main.scss | 2 +- app/views/batches/batch-new.html | 65 ++++++++++++++++++-------------- 2 files changed, 38 insertions(+), 29 deletions(-) diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index bcd4ce7..7d6cb72 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -87,7 +87,7 @@ .app-simple-progress-bar { width: 100%; - height: 2.5rem; + height: 3rem; &.--standard { background: var(--standard-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff; diff --git a/app/views/batches/batch-new.html b/app/views/batches/batch-new.html index f023f0d..7129218 100644 --- a/app/views/batches/batch-new.html +++ b/app/views/batches/batch-new.html @@ -57,7 +57,7 @@

    Standard (NTDD) batch imported 1st January 2026

    • - +
    @@ -80,18 +80,18 @@

    - +
    - +
    - +

    Participant breakdown

    - +
    Participant breakdown by type
    - + - + @@ -148,7 +148,7 @@

    Participant breakdown

    - +
    • @@ -172,11 +172,11 @@

      Participant breakdown

    - +
    - +

    Participant distribution by next test due date

    @@ -210,9 +210,9 @@

    - +
    - +
    @@ -232,7 +232,7 @@

    -->

    - +
    Standard @@ -240,16 +240,19 @@

    -
    - 0% appointed +
    + {{ tag({ + text: "0% appointed", + classes: "nhsuk-tag--green nhsuk-u-margin-left-2" + }) }}
    -

    0 of 1970 appointed

    +

    0 of 1970 appointed

    - - + +
    Special requirements @@ -257,17 +260,20 @@

    -
    - 0% appointed +
    + {{ tag({ + text: "0% appointed", + classes: "nhsuk-tag--orange nhsuk-u-margin-left-2" + }) }}
    -

    0 of 12 appointed

    +

    0 of 12 appointed

    - - - + + +

    Reconciliation

    @@ -276,16 +282,19 @@

    Reconci

    -
    - 0% reconciled +
    + {{ tag({ + text: "0% reconciled", + classes: "nhsuk-tag--red nhsuk-u-margin-left-2" + }) }}
    -

    0 of 5 reconciled

    +

    0 of 5 reconciled

    - +
    From fbd380d0ef1790f91c0285a920ee4c2f4a8986b1 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Mon, 20 Apr 2026 12:19:20 +0100 Subject: [PATCH 7/9] Update the primary nav for sections --- app/views/_includes/primary-navigation.html | 102 ++++++++++-------- app/views/batches/batch-new.html | 3 +- .../bso-objects/bso/bso-internal-details.html | 3 +- .../bso-objects/bso/bso-public-details.html | 3 +- app/views/bso-objects/index.html | 3 +- .../location/location-listing.html | 3 +- .../location/location-location-details.html | 3 +- .../location-travel-and-transport.html | 3 +- .../unit/unit-internal-details.html | 3 +- app/views/bso-objects/unit/unit-listing.html | 3 +- .../bso-objects/unit/unit-public-details.html | 3 +- 11 files changed, 75 insertions(+), 57 deletions(-) diff --git a/app/views/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html index 35021dc..0efe053 100644 --- a/app/views/_includes/primary-navigation.html +++ b/app/views/_includes/primary-navigation.html @@ -1,47 +1,55 @@ -{{ header({ - account: { - items: [ - { - text: "West Berkshire BSO" - }, - { - href: "#", - text: "Thomas Pynchon", - icon: true - }, - { - href: "/", - text: "Log out" - } - ] - }, - service: { - text: serviceName, - href: "/" - }, - navigation: { - items: [ - { - href: "#", - text: "Dashboard" - }, - { - href: "#", - text: "Manage batches" - }, - { - href: "#", - text: "Manage clinics" - }, - { - href: "#", - text: "Manage other stuff", - active: true - }, - { - href: "#", - text: "Reports" - } - ] - } -}) }} +{% from 'header/macro.njk' import header %} + +{% macro primaryNavigation(activeItem, serviceName) %} + {{ header({ + account: { + items: [ + { + text: "West Berkshire BSO" + }, + { + href: "#", + text: "Thomas Pynchon", + icon: true + }, + { + href: "/", + text: "Log out" + } + ] + }, + service: { + text: serviceName, + href: "/" + }, + navigation: { + items: [ + { + href: "#", + text: "Dashboard", + active: activeItem === "Dashboard" + }, + { + href: "#", + text: "Manage batches", + active: activeItem === "Manage batches" + }, + { + href: "#", + text: "Manage clinics", + active: activeItem === "Manage clinics" + }, + { + href: "#", + text: "Manage other stuff", + active: activeItem === "Manage other stuff" + }, + { + href: "#", + text: "Reports", + active: activeItem === "Reports" + } + ] + } + }) }} +{% endmacro %} diff --git a/app/views/batches/batch-new.html b/app/views/batches/batch-new.html index 7129218..e7fa152 100644 --- a/app/views/batches/batch-new.html +++ b/app/views/batches/batch-new.html @@ -19,8 +19,9 @@ --> {% set pageName = "West Berks mobile screening unit name" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage batches", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/bso/bso-internal-details.html b/app/views/bso-objects/bso/bso-internal-details.html index c606288..f6d9447 100644 --- a/app/views/bso-objects/bso/bso-internal-details.html +++ b/app/views/bso-objects/bso/bso-internal-details.html @@ -25,8 +25,9 @@ {% endblock %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/bso/bso-public-details.html b/app/views/bso-objects/bso/bso-public-details.html index 935da2f..7286a1c 100644 --- a/app/views/bso-objects/bso/bso-public-details.html +++ b/app/views/bso-objects/bso/bso-public-details.html @@ -19,8 +19,9 @@ --> {% set pageName = "West Berkshire Screening Service" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/index.html b/app/views/bso-objects/index.html index 901d6e4..a1d595c 100755 --- a/app/views/bso-objects/index.html +++ b/app/views/bso-objects/index.html @@ -19,8 +19,9 @@ --> {% set pageName = "Manage other stuff" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/location/location-listing.html b/app/views/bso-objects/location/location-listing.html index 09f23b5..94d63ac 100644 --- a/app/views/bso-objects/location/location-listing.html +++ b/app/views/bso-objects/location/location-listing.html @@ -19,8 +19,9 @@ --> {% set pageName = "Units" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/location/location-location-details.html b/app/views/bso-objects/location/location-location-details.html index f24480f..53c0519 100644 --- a/app/views/bso-objects/location/location-location-details.html +++ b/app/views/bso-objects/location/location-location-details.html @@ -25,8 +25,9 @@ {% endblock %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/location/location-travel-and-transport.html b/app/views/bso-objects/location/location-travel-and-transport.html index b60c229..1ee0cf8 100644 --- a/app/views/bso-objects/location/location-travel-and-transport.html +++ b/app/views/bso-objects/location/location-travel-and-transport.html @@ -19,8 +19,9 @@ --> {% set pageName = "Camberwell Building" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/unit/unit-internal-details.html b/app/views/bso-objects/unit/unit-internal-details.html index 2ce9fa4..89de1b4 100644 --- a/app/views/bso-objects/unit/unit-internal-details.html +++ b/app/views/bso-objects/unit/unit-internal-details.html @@ -19,8 +19,9 @@ --> {% set pageName = "West Berks mobile screening unit name" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/unit/unit-listing.html b/app/views/bso-objects/unit/unit-listing.html index 0c35106..a66bdef 100644 --- a/app/views/bso-objects/unit/unit-listing.html +++ b/app/views/bso-objects/unit/unit-listing.html @@ -19,8 +19,9 @@ --> {% set pageName = "Units" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} diff --git a/app/views/bso-objects/unit/unit-public-details.html b/app/views/bso-objects/unit/unit-public-details.html index 0aa3c1f..407bdcf 100644 --- a/app/views/bso-objects/unit/unit-public-details.html +++ b/app/views/bso-objects/unit/unit-public-details.html @@ -19,8 +19,9 @@ --> {% set pageName = "West Berks mobile screening unit name" %} +{% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {% include "_includes/primary-navigation.html" %} + {{ primaryNavigation("Manage other stuff", serviceName) }} {% endblock %} From 2f2a503dfb81b4006c4d054239a7c348a54fec99 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Mon, 20 Apr 2026 16:39:46 +0100 Subject: [PATCH 8/9] super rough listing and in-progress prototypes --- app/assets/sass/main.scss | 10 + app/views/_includes/primary-navigation.html | 4 +- .../batches/batch-detail-in-progress.html | 287 ++++++++++++++++++ .../{batch-new.html => batch-detail.html} | 50 +-- app/views/batches/index.html | 134 ++++++++ app/views/index.html | 4 +- 6 files changed, 447 insertions(+), 42 deletions(-) create mode 100644 app/views/batches/batch-detail-in-progress.html rename app/views/batches/{batch-new.html => batch-detail.html} (86%) create mode 100644 app/views/batches/index.html diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 7d6cb72..a6046b9 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -17,6 +17,7 @@ // Batch (for now) view bar charts and legends :root { + --generic-chart-hatch: repeating-linear-gradient(45deg, #005eb8, #005eb8 1px, #ccdff1 1px, #ccdff1 12px); --standard-chart-hatch: repeating-linear-gradient(45deg, #004c23, #004c23 1px, #cce5d8 1px, #cce5d8 12px); --special-chart-hatch: repeating-linear-gradient(-45deg, #4d3708, #4d3708 1px, #ffdc8e 1px, #ffdc8e 12px); --vhr-chart-hatch-1: repeating-linear-gradient(-45deg, #6b140e, #6b140e 1px, transparent 1px, transparent 12px); @@ -87,8 +88,17 @@ .app-simple-progress-bar { width: 100%; + min-width: 200px; height: 3rem; + &.--thin { + height: auto; + } + + &.--generic { + background: var(--generic-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff; + } + &.--standard { background: var(--standard-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff; } diff --git a/app/views/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html index 0efe053..834ab3f 100644 --- a/app/views/_includes/primary-navigation.html +++ b/app/views/_includes/primary-navigation.html @@ -30,7 +30,7 @@ active: activeItem === "Dashboard" }, { - href: "#", + href: "/batches/", text: "Manage batches", active: activeItem === "Manage batches" }, @@ -40,7 +40,7 @@ active: activeItem === "Manage clinics" }, { - href: "#", + href: "/bso-objects/", text: "Manage other stuff", active: activeItem === "Manage other stuff" }, diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html new file mode 100644 index 0000000..a3dc85a --- /dev/null +++ b/app/views/batches/batch-detail-in-progress.html @@ -0,0 +1,287 @@ + +{% extends 'layout.html' %} + + +{% set pageName = "West Berks mobile screening unit name" %} + +{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage batches", serviceName) }} +{% endblock %} + +{% block beforeContent %} +{{ breadcrumb({ + items: [ + { + href: "#", + text: "Home" + }, + { + href: "/batches/", + text: "Manage batches" + } + ] +}) }} +{% endblock %} + + + +{% block content %} + +
    +
    +
    + BDE-NTDD-202601011200 +
    +

    + Harrogate Practices Feb-March 2026 Round 13 +

    +

    Change

    +
    + Standard (NTDD) batch imported 1st January 2026 +
    +
    + +
    +
    +
    +
    +

    + + 1987 + +

    + total participants +
    +
    +
    +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +

    Participant breakdown

    + +
    +
    Participant breakdown by type
    + + + + + + + + + + + + + + + + + + + + + + + + +
    CategoryCount
    + Standard + + {{ tag({ + text: "1970", + classes: "nhsuk-tag--green nhsuk-u-margin-left-2" + }) }} +
    + Special Requirements + + {{ tag({ + text: "12", + classes: "nhsuk-tag--orange nhsuk-u-margin-left-2" + }) }} +
    + Very High Risk + + {{ tag({ + text: "5", + classes: "nhsuk-tag--red nhsuk-u-margin-left-2" + }) }} +
    + + + +
    +
    +
    + +
    +
    +

    Participant distribution by next test due date

    +
    +
    +
    +
    +
    + +
    +
    +
    + Earliest next test due date: +

    + 28 February 2026 +

    +
    +
    + Latest: +

    + 31 March 2026 +

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

    Batch progress

    +
    + {{ tag({ + text: "1970 of 1987 dealt with", + classes: "nhsuk-tag--blue nhsuk-u-margin-left-2" + }) }} +
    +
    +
    + +
    +
    +

    Appointed

    + Standard +
    +
    +
    +
    +
    + {{ tag({ + text: "100% appointed", + classes: "nhsuk-tag--green nhsuk-u-margin-left-2" + }) }} +
    +
    +
    +

    1970 of 1970 appointed

    +
    +
    + +
    +
    + Special requirements +
    +
    +
    +
    +
    + {{ tag({ + text: "0% appointed", + classes: "nhsuk-tag--orange nhsuk-u-margin-left-2" + }) }} +
    +
    +
    +

    0 of 12 appointed

    +
    +
    + +
    +
    +

    Reconciled

    + Very high risk (VHR) +
    +
    +
    +
    +
    + {{ tag({ + text: "0% reconciled", + classes: "nhsuk-tag--red nhsuk-u-margin-left-2" + }) }} +
    +
    +
    +

    0 of 5 reconciled

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

    Clinics associated with this batch

    ' + }) %} +

    No clinics associated with this batch

    + {% endcall %} +
    +
    +
    + +{% endblock %} diff --git a/app/views/batches/batch-new.html b/app/views/batches/batch-detail.html similarity index 86% rename from app/views/batches/batch-new.html rename to app/views/batches/batch-detail.html index e7fa152..b28cb55 100644 --- a/app/views/batches/batch-new.html +++ b/app/views/batches/batch-detail.html @@ -1,22 +1,7 @@ - - - - {% extends 'layout.html' %} - - + {% set pageName = "West Berks mobile screening unit name" %} {% from "_includes/primary-navigation.html" import primaryNavigation %} @@ -24,8 +9,6 @@ {{ primaryNavigation("Manage batches", serviceName) }} {% endblock %} - - {% block beforeContent %} {{ breadcrumb({ items: [ @@ -88,7 +71,7 @@

    -

    Participant breakdown

    +

    Participant breakdown

    Participant breakdown by type
    @@ -212,30 +195,24 @@

    -
    +
    -

    Batch progress

    -
    +

    Appointed

    Standard
    @@ -253,7 +230,6 @@

    -
    Special requirements @@ -273,11 +249,9 @@

    - -
    -

    Reconciliation

    +

    Reconciled

    Very high risk (VHR)
    @@ -304,7 +278,7 @@

    Reconci {% call details({ summaryHtml: '

    Clinics associated with this batch

    ' }) %} -

    ...

    +

    No clinics associated with this batch

    {% endcall %} diff --git a/app/views/batches/index.html b/app/views/batches/index.html new file mode 100644 index 0000000..55ea1e8 --- /dev/null +++ b/app/views/batches/index.html @@ -0,0 +1,134 @@ +{% extends 'layout.html' %} + +{% set pageName = "Manage batches" %} + +{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation("Manage batches", serviceName) }} +{% endblock %} + +{% block beforeContent %} + +{{ breadcrumb({ + items: [ + { + href: "#", + text: "Home" + } + ] +}) }} + +{% endblock %} + +{% block content %} +
    +

    Batches in progress

    + + {{ button({ + text: "Import a new batch", + href: "#", + classes: "nhsuk-button--secondary" + }) }} +
    + +
    +
    + + + {% set batch %} + + Harrogate Practices Feb-March 2026 Round 13
    + BDE-NTDD-202601011200 +     + {% endset %} + + {% set progress %} +
    + {{ tag({ + text: "99%", + classes: "nhsuk-tag--blue nhsuk-u-margin-1" + }) }} +
    + {% endset %} + + + {% set batch_new %} + + Harrogate Practices Feb-March 2026 Round 13
    + BDE-NTDD-202601011200 +     + {% endset %} + + {% set progress_new %} +
    + {{ tag({ + text: "0%", + classes: "nhsuk-tag--blue nhsuk-u-margin-1" + }) }} +
    + {% endset %} + + {{ table({ + firstCellIsHeader: true, + head: [ + { + text: "Batch" + }, + { + text: "Type" + }, + { + text: "Participants", + format: "numeric" + }, + { + text: "Progress" + } + ], + rows: [ + [ + { + html: batch_new + }, + { + text: "Standard (NTDD)" + }, + { + text: "1987", + format: "numeric" + }, + { + html: progress_new + } + ], + [ + { + html: batch + }, + { + text: "Standard (NTDD)" + }, + { + text: "1987", + format: "numeric" + }, + { + html: progress + } + ] + ] + }) }} + + +
    +
    + +
    +
    +

    Completed batches

    +

    + View completed batches +

    +
    +
    +{% endblock %} diff --git a/app/views/index.html b/app/views/index.html index 2ca6a47..fa3cfab 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -45,10 +45,10 @@

    Mid April 2026

    Batch listing
  • - Brand new batch + Brand new batch
  • - Batch in progress + Batch in progress
    • From deeb612a88ee7635a3ccb4ba0dfecafecbc58cd0 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Wed, 22 Apr 2026 14:35:46 +0100 Subject: [PATCH 9/9] Appoint not import --- app/views/batches/batch-detail-in-progress.html | 2 +- app/views/batches/batch-detail.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index a3dc85a..19064fc 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -138,7 +138,7 @@

    Participant breakdown

    1970 standard
    - ready to import + ready to appoint
  • diff --git a/app/views/batches/batch-detail.html b/app/views/batches/batch-detail.html index b28cb55..e974b23 100644 --- a/app/views/batches/batch-detail.html +++ b/app/views/batches/batch-detail.html @@ -138,7 +138,7 @@

    Participant breakdown

    1970 standard
    - ready to import + ready to appoint