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/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

  • 16 postal outcodes
  • 4 GP practices
    • -

    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/index.html b/app/views/index.html index 39b2fe0..ce8bd12 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -89,9 +89,22 @@

    March 2026

    Work for September Test

    +

    Iteration 1: transactional journey

    1. - Simple single day slots + Upload a batch +
      2. +
    2. + Batch detail +
      3. +
    3. + Pre-appointment confirmation +
      4. +
    4. + [Utility] "appointing" spinner +
      5. +
    5. + 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 93% rename from app/views/z-september-views/single-day-simple.html rename to app/views/z-september-transactional-journey/appointing-complete.html index 76ceff3..f03460c 100644 --- a/app/views/z-september-views/single-day-simple.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -1,56 +1,61 @@ {% extends 'layout.html' %} -{% set pageName = "Day clinic view" %} +{% set pageName = "" %} -{% 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 %} +
    -

    - HWO-NNN-standard-20260501 - Worthing C2C test + {% set html %} +

    + All participants appointed successfully +

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

    + CLINC-ID + Clinic name

    +
    + Unit name at location name +
    -
    +
    -

    - 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 +524,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..ec8c1c9 --- /dev/null +++ b/app/views/z-september-transactional-journey/batch-detail.html @@ -0,0 +1,64 @@ +{% extends 'layout.html' %} + +{% set pageName = "" %} + +{% 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 +

    +
    + Batch uploaded 11 June 2026 at 15:53 +
    +
    +
    + +
    +
    +
    +
    +

    + + 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..4a25ac8 --- /dev/null +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -0,0 +1,129 @@ +{% extends 'layout.html' %} + +{% set pageName = "" %} + +{% 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 +
    +
    + from NAME group +
    +
    +
    + +
    + into +
    + +
    +
    +
    + XX slots +
    +
    + in CLINIC NAME on 1 September 2026 +
    +
    + Unit name at location name +
    +
    +
    + +
    + +
    +
    + +
    +
    + + {{ button({ + text: "Confirm and book" + }) }} +

    + or + cancel and go back +

    +
    +
    + +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %} 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..d2f42d8 --- /dev/null +++ b/app/views/z-september-transactional-journey/spinner.html @@ -0,0 +1,69 @@ +{% extends 'layout.html' %} + +{% set pageName = "" %} + +{% 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 %} 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..4a952ac --- /dev/null +++ b/app/views/z-september-transactional-journey/upload-a-batch.html @@ -0,0 +1,37 @@ +{% extends 'layout.html' %} + +{% set pageName = "" %} + +{% 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 %}