From 31715eab9200204f5f01daf91cc3ba599eb3c680 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 11 Jun 2026 12:15:34 +0100 Subject: [PATCH 1/6] Add some basics, first iteration --- app/assets/sass/main.scss | 2 +- app/views/index.html | 9 +- .../_includes/min-primary-navigation.html | 29 ++++++ .../appointing-complete.html} | 66 +++++++------- .../batch-detail.html | 61 +++++++++++++ .../pre-appoint-confirm.html | 89 +++++++++++++++++++ 6 files changed, 224 insertions(+), 32 deletions(-) create mode 100644 app/views/z-september-transactional-journey/_includes/min-primary-navigation.html rename app/views/{z-september-views/single-day-simple.html => z-september-transactional-journey/appointing-complete.html} (94%) create mode 100644 app/views/z-september-transactional-journey/batch-detail.html create mode 100644 app/views/z-september-transactional-journey/pre-appoint-confirm.html diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 1afd4dd..f8cb26e 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -13,7 +13,7 @@ .app-card-editable { display: flex; justify-content: space-between; - align-items: baseline; + align-items: last baseline; } // Batch (for now) view bar charts and legends diff --git a/app/views/index.html b/app/views/index.html index 39b2fe0..f81a013 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -89,9 +89,16 @@

March 2026

Work for September Test

+

Iteration 1: transactional journey

  1. - Simple single day slots + Batch detail +
    2. +
  2. + Pre-appointment confirmation +
    3. +
  3. + Single day of appointments
diff --git a/app/views/z-september-transactional-journey/_includes/min-primary-navigation.html b/app/views/z-september-transactional-journey/_includes/min-primary-navigation.html new file mode 100644 index 0000000..28203c0 --- /dev/null +++ b/app/views/z-september-transactional-journey/_includes/min-primary-navigation.html @@ -0,0 +1,29 @@ +{% from 'header/macro.njk' import header %} + +{% macro primaryNavigation(activeItem, serviceName, bsoName) %} + {{ header({ + account: { + items: [ + { + text: "West Sussex BSO" + }, + { + href: "#", + text: "Thomas Pynchon", + icon: true + }, + { + href: "/", + text: "Log out" + } + ] + }, + service: { + text: "Cohort to clinic", + href: "/" + }, + navigation: { + items: [] + } + }) }} +{% endmacro %} diff --git a/app/views/z-september-views/single-day-simple.html b/app/views/z-september-transactional-journey/appointing-complete.html similarity index 94% rename from app/views/z-september-views/single-day-simple.html rename to app/views/z-september-transactional-journey/appointing-complete.html index 76ceff3..98b81f1 100644 --- a/app/views/z-september-views/single-day-simple.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -2,37 +2,30 @@ {% set pageName = "Day clinic view" %} -{% from "_includes/primary-navigation.html" import primaryNavigation %} +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName, bsoName) }} + {{ primaryNavigation() }} {% endblock %} -{% block beforeContent %} -{{ breadcrumb({ - items: [ - { - href: "#", - text: "Home" - }, - { - href: "/clinics/", - text: "Clinics" - }, - { - href: "calendar-layout", - text: "Worthing C2C test 1" - } - ] -}) }} -{% endblock %} +{% block beforeContent %}{% endblock %} {% block content %} +
+ {% set html %} +

+ All participants appointed successfully +

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

- HWO-NNN-standard-20260501 - Worthing C2C test + CLINC-ID + Clinic name

@@ -41,16 +34,25 @@

-

- Day view - 1 September 2026 -

-

- Morning session - 08:30 to 12:30 -

+

+ Day view + 1 September 2026 +

+ {{ actionLink({ + text: "Download .csv", + href: "#" + }) }}
+
+
+ +
+
+

+ Morning session + 08:30 to 12:30 +

@@ -519,3 +521,7 @@

{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %} diff --git a/app/views/z-september-transactional-journey/batch-detail.html b/app/views/z-september-transactional-journey/batch-detail.html new file mode 100644 index 0000000..161c267 --- /dev/null +++ b/app/views/z-september-transactional-journey/batch-detail.html @@ -0,0 +1,61 @@ +{% extends 'layout.html' %} + +{% set pageName = "Day clinic view" %} + +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation() }} +{% endblock %} + +{% block beforeContent %}{% endblock %} + +{% block content %} + +
+
+ {% set html %} +

+ Batch uploaded +

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

+ BATCH-ID + Batch name +

+
+
+ +
+
+
+
+

+ + 2172 + +

+ total participants +
+
+
+
+ +
+
+ + {{ button({ + text: "Select participants to book" + }) }} + +
+
+ +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %} diff --git a/app/views/z-september-transactional-journey/pre-appoint-confirm.html b/app/views/z-september-transactional-journey/pre-appoint-confirm.html new file mode 100644 index 0000000..37b3f5c --- /dev/null +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -0,0 +1,89 @@ +{% extends 'layout.html' %} + +{% set pageName = "Day clinic view" %} + +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation() }} +{% endblock %} + +{% block beforeContent %} + {{ backLink({ + href: "#", + text: "Back" + }) }} +{% endblock %} + +{% block content %} + + + +
+
+

+ Autoflow™ participants into slots +

+

You’re about to automatically book:

+
+
+ +
+
+ +
+ +
+
+
+ XX participants +
+

+ in NAME group +

+
+
+ +
+ into +
+ +
+
+
+ XX slots +
+

+ available in NAME clinic +

+
+
+ +
+ +
+
+ +
+
+ + {{ button({ + text: "Confirm and book" + }) }} +

+ or + cancel and go back +

+
+
+ +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %} From a00b644ee72a7432b02be3177f946b0bbdcff488 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 11 Jun 2026 13:22:33 +0100 Subject: [PATCH 2/6] More tweaks and roughs including a spinner --- app/views/index.html | 3 + .../pre-appoint-confirm.html | 14 ++-- .../spinner.html | 69 +++++++++++++++++++ 3 files changed, 79 insertions(+), 7 deletions(-) create mode 100644 app/views/z-september-transactional-journey/spinner.html diff --git a/app/views/index.html b/app/views/index.html index f81a013..323333b 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -97,6 +97,9 @@

Iteration 1: transactional journey

  • Pre-appointment confirmation
    • +
  • + [Utility] "appointing" spinner +
  • Single day of appointments
    • diff --git a/app/views/z-september-transactional-journey/pre-appoint-confirm.html b/app/views/z-september-transactional-journey/pre-appoint-confirm.html index 37b3f5c..deae259 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -40,27 +40,27 @@

    -
    +
    XX participants
    -

    +

    in NAME group -

    +
    -
    +
    into
    -
    +
    XX slots
    -

    +

    available in NAME clinic -

    +
    diff --git a/app/views/z-september-transactional-journey/spinner.html b/app/views/z-september-transactional-journey/spinner.html new file mode 100644 index 0000000..d70d943 --- /dev/null +++ b/app/views/z-september-transactional-journey/spinner.html @@ -0,0 +1,69 @@ +{% extends 'layout.html' %} + +{% set pageName = "Day clinic view" %} + +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation() }} +{% endblock %} + +{% block beforeContent %}{% endblock %} + +{% block content %} + + + + + +
    +
    + +
    +

    + Appointing participants to slots +

    + +
    +
    + +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %} From a43086d3dbad4e660ef356e66d80d77f9b7c6209 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 11 Jun 2026 15:36:24 +0100 Subject: [PATCH 3/6] Team feedback 1 --- .../appointing-complete.html | 7 ++- .../pre-appoint-confirm.html | 56 ++++++++++++++++--- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/app/views/z-september-transactional-journey/appointing-complete.html b/app/views/z-september-transactional-journey/appointing-complete.html index 98b81f1..883576c 100644 --- a/app/views/z-september-transactional-journey/appointing-complete.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -23,14 +23,17 @@ html: html, type: "success" }) }} -

    +

    CLINC-ID Clinic name

    +
    + Unit name at location name +
    -
    +
    diff --git a/app/views/z-september-transactional-journey/pre-appoint-confirm.html b/app/views/z-september-transactional-journey/pre-appoint-confirm.html index deae259..1729361 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -19,9 +19,46 @@
    @@ -43,14 +80,14 @@

    XX participants
    -
    - in NAME group +
    + from NAME group

    -
    - into +
    + into
    @@ -58,8 +95,11 @@

    XX slots
    -
    - available in NAME clinic +
    + in CLINIC NAME on 1 September 2026 +
    +
    + Unit name at location name

    From 2e8bb199b13debb1703403281e7dda8c6e5012ca Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 11 Jun 2026 15:45:18 +0100 Subject: [PATCH 4/6] Add a quick dummy upload view --- app/views/index.html | 3 ++ .../upload-a-batch.html | 37 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 app/views/z-september-transactional-journey/upload-a-batch.html diff --git a/app/views/index.html b/app/views/index.html index 323333b..ce8bd12 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -91,6 +91,9 @@

    March 2026

    Work for September Test

    Iteration 1: transactional journey

      +
    1. + Upload a batch +
    2. Batch detail
      3. diff --git a/app/views/z-september-transactional-journey/upload-a-batch.html b/app/views/z-september-transactional-journey/upload-a-batch.html new file mode 100644 index 0000000..87b0f01 --- /dev/null +++ b/app/views/z-september-transactional-journey/upload-a-batch.html @@ -0,0 +1,37 @@ +{% extends 'layout.html' %} + +{% set pageName = "Day clinic view" %} + +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation() }} +{% endblock %} + +{% block beforeContent %}{% endblock %} + +{% block content %} + +
      +
      +
      +

      + +

      + +
      + + + {{ button({ + "text": "Upload file" + }) }} + +
      +
      + +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %} From 1161045ca1484a8703cd0ac6f6f1a3726e38986e Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 11 Jun 2026 15:58:20 +0100 Subject: [PATCH 5/6] Tweaking batch imported timestamp in all batch views --- app/views/batches/batch-detail-in-progress.html | 6 ++++-- app/views/batches/batch-detail.html | 6 ++++-- .../z-september-transactional-journey/batch-detail.html | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index 00da9ac..7d8ca21 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -31,13 +31,16 @@
      - HWO-standard-20251212

      + HWO-standard-20251212 Chichester - Parklands

      Edit batch name

      +
      + Batch imported 11 June 2026 at 15:53 (example content) +
      @@ -115,7 +118,6 @@

      Participant breakdown

    3. 16 postal outcodes
    4. 4 GP practices
      5. -

      Batch imported 14 December 2025

      {% endcall %}
    diff --git a/app/views/batches/batch-detail.html b/app/views/batches/batch-detail.html index 2065bc6..eb42dfc 100644 --- a/app/views/batches/batch-detail.html +++ b/app/views/batches/batch-detail.html @@ -31,13 +31,16 @@
    - HWO-standard-20251209

    + HWO-standard-20251209 Crawley - Pound Hill

    Edit batch name

    +
    + Batch imported 11 June 2026 at 15:53 (example content) +
    @@ -115,7 +118,6 @@

    Participant breakdown

  • 16 postal outcodes
  • 4 GP practices
    • -

    Batch imported 11 December 2025

    {% endcall %}
    diff --git a/app/views/z-september-transactional-journey/batch-detail.html b/app/views/z-september-transactional-journey/batch-detail.html index 161c267..675ec6f 100644 --- a/app/views/z-september-transactional-journey/batch-detail.html +++ b/app/views/z-september-transactional-journey/batch-detail.html @@ -22,10 +22,13 @@ html: html, type: "success" }) }} -

    +

    BATCH-ID Batch name

    +
    + Batch uploaded 11 June 2026 at 15:53 +
    From d46c9008a65387cb412a4fd60aedd03dc8c2dfbe Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 11 Jun 2026 16:07:08 +0100 Subject: [PATCH 6/6] Remove all page titles just for now --- .../z-september-transactional-journey/appointing-complete.html | 2 +- app/views/z-september-transactional-journey/batch-detail.html | 2 +- .../z-september-transactional-journey/pre-appoint-confirm.html | 2 +- app/views/z-september-transactional-journey/spinner.html | 2 +- app/views/z-september-transactional-journey/upload-a-batch.html | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/views/z-september-transactional-journey/appointing-complete.html b/app/views/z-september-transactional-journey/appointing-complete.html index 883576c..f03460c 100644 --- a/app/views/z-september-transactional-journey/appointing-complete.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Day clinic view" %} +{% set pageName = "" %} {% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} diff --git a/app/views/z-september-transactional-journey/batch-detail.html b/app/views/z-september-transactional-journey/batch-detail.html index 675ec6f..ec8c1c9 100644 --- a/app/views/z-september-transactional-journey/batch-detail.html +++ b/app/views/z-september-transactional-journey/batch-detail.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Day clinic view" %} +{% set pageName = "" %} {% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} diff --git a/app/views/z-september-transactional-journey/pre-appoint-confirm.html b/app/views/z-september-transactional-journey/pre-appoint-confirm.html index 1729361..4a25ac8 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Day clinic view" %} +{% set pageName = "" %} {% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} diff --git a/app/views/z-september-transactional-journey/spinner.html b/app/views/z-september-transactional-journey/spinner.html index d70d943..d2f42d8 100644 --- a/app/views/z-september-transactional-journey/spinner.html +++ b/app/views/z-september-transactional-journey/spinner.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Day clinic view" %} +{% set pageName = "" %} {% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} diff --git a/app/views/z-september-transactional-journey/upload-a-batch.html b/app/views/z-september-transactional-journey/upload-a-batch.html index 87b0f01..4a952ac 100644 --- a/app/views/z-september-transactional-journey/upload-a-batch.html +++ b/app/views/z-september-transactional-journey/upload-a-batch.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Day clinic view" %} +{% set pageName = "" %} {% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %}