From 491b5a68f1015f0f2c7dc9e6ba73e9b8ca970380 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 23 Apr 2026 13:29:31 +0100 Subject: [PATCH 1/3] states of standard --- app/views/batches/batch-detail copy.html | 279 ++++++++++++++++++ .../batches/batch-detail-in-progress.html | 6 +- .../participant-breakdown/standard.html | 93 ++++++ 3 files changed, 375 insertions(+), 3 deletions(-) create mode 100644 app/views/batches/batch-detail copy.html create mode 100644 app/views/batches/participant-breakdown/standard.html diff --git a/app/views/batches/batch-detail copy.html b/app/views/batches/batch-detail copy.html new file mode 100644 index 0000000..1fd8b62 --- /dev/null +++ b/app/views/batches/batch-detail copy.html @@ -0,0 +1,279 @@ + +{% 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-20260101 +
+

+ Harrogate Practices Feb-March 2026 Round 13 +

+

Change

+
+ Imported 1 January 2026 +
+
+ +
+
+
+
+

+ + 610 + +

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

Participant breakdown

+ +
+
Participant breakdown by type
+ + + + + + + + + + + + + + + + + + + + + + + + +
CategoryCount
+ Standard + + {{ tag({ + text: "560", + classes: "nhsuk-tag--green" + }) }} +
+ Special Requirements + + {{ tag({ + text: "40", + classes: "nhsuk-tag--orange" + }) }} +
+ Very High Risk + + {{ tag({ + text: "10", + classes: "nhsuk-tag--red" + }) }} +
+ + + +
+
+
+ +
+
+

Participant distribution by next test due date

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

+ 28 February 2026 +

+
+
+ Latest: +

+ 31 March 2026 +

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

Batch progress

+
+ {{ tag({ + text: "0 of 610 dealt with", + classes: "nhsuk-tag--blue" + }) }} +
+
+
+ +
+
+

Appointed

+ Standard +
+
+
+
+
+ {{ tag({ + text: "0 of 560 appointed", + classes: "nhsuk-tag--green" + }) }} +
+
+
+ +
+
+ Special requirements +
+
+
+
+
+ {{ tag({ + text: "0 of 40 appointed", + classes: "nhsuk-tag--orange" + }) }} +
+
+
+ +
+
+

Reconciled

+ Very high risk (VHR) +
+
+
+
+
+ {{ tag({ + text: "0 of 10 reconciled", + classes: "nhsuk-tag--red" + }) }} +
+
+
+
+ +
+ +
+
+
+ {% call details({ + summaryHtml: '

Clinics associated with this batch

' + }) %} +

No clinics associated with this batch

+ {% endcall %} +
+
+
+ +{% endblock %} diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index bf449d4..b590406 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -140,7 +140,7 @@

Participant breakdown

  • - 700 standard
    + 700 standard
    ready to appoint
    • @@ -168,7 +168,7 @@

    Participant breakdown

    }) %}
    - 700 standard
    + 700 standard
    ready to appoint
    {% endcall %} @@ -195,7 +195,7 @@

    Participant breakdown

    {% endcall %} - + diff --git a/app/views/batches/participant-breakdown/standard.html b/app/views/batches/participant-breakdown/standard.html new file mode 100644 index 0000000..4738867 --- /dev/null +++ b/app/views/batches/participant-breakdown/standard.html @@ -0,0 +1,93 @@ + +{% 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" + }, + { + href: "/batches/batch-detail-in-progress", + text: "Malton Practices Apr-May 26 NTDD RD 13" + } + ] +}) }} +{% endblock %} + +{% block content %} +

    + Malton Practices Apr-May 26 NTDD RD 13 + Standard participants +

    + +
    +
    +
    + {{ tag({ + text: "700 of 700 appointed", + classes: "nhsuk-tag--green" + }) }} +
    +

    + View all participants +

    +
    +
    + +
    +
    +
    + {{ tag({ + text: "350 of 700 appointed", + classes: "nhsuk-tag--green" + }) }} +
    +
    + {{ button({ + text: "Appoint participants", + href: "#", + classes: "" + }) }} +
    +

    + View all participants +

    +
    +
    + +
    +
    +
    + {{ tag({ + text: "0 of 700 appointed", + classes: "nhsuk-tag--green" + }) }} +
    +
    + {{ button({ + text: "Appoint participants", + href: "#", + classes: "" + }) }} +
    +

    + View all participants +

    +
    +
    + +{% endblock %} From 670151f671eddbd87f3e780d2f69d2b9f1ae6f2b Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Fri, 24 Apr 2026 11:38:48 +0100 Subject: [PATCH 2/3] Stopgap commit --- app/views/batches/batch-detail copy.html | 279 ------------------ .../batches/batch-detail-in-progress.html | 6 +- .../special-requirements.html | 108 +++++++ 3 files changed, 111 insertions(+), 282 deletions(-) delete mode 100644 app/views/batches/batch-detail copy.html create mode 100644 app/views/batches/participant-breakdown/special-requirements.html diff --git a/app/views/batches/batch-detail copy.html b/app/views/batches/batch-detail copy.html deleted file mode 100644 index 1fd8b62..0000000 --- a/app/views/batches/batch-detail copy.html +++ /dev/null @@ -1,279 +0,0 @@ - -{% 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-20260101 -
    -

    - Harrogate Practices Feb-March 2026 Round 13 -

    -

    Change

    -
    - Imported 1 January 2026 -
    -
    - -
    -
    -
    -
    -

    - - 610 - -

    - total participants -
    -
    -
    -
    - -
    -
    - -
    - -
    - -
    -
    -
    - -

    Participant breakdown

    - -
    -
    Participant breakdown by type
    - - - - - - - - - - - - - - - - - - - - - - - - -
    CategoryCount
    - Standard - - {{ tag({ - text: "560", - classes: "nhsuk-tag--green" - }) }} -
    - Special Requirements - - {{ tag({ - text: "40", - classes: "nhsuk-tag--orange" - }) }} -
    - Very High Risk - - {{ tag({ - text: "10", - classes: "nhsuk-tag--red" - }) }} -
    - - - -
    -
    -
    - -
    -
    -

    Participant distribution by next test due date

    -
    -
    -
    -
    -
    - -
    -
    -
    - Earliest next test due date: -

    - 28 February 2026 -

    -
    -
    - Latest: -

    - 31 March 2026 -

    -
    -
    -
    -
    -
    - -
    - -
    -
    -
    -

    Batch progress

    -
    - {{ tag({ - text: "0 of 610 dealt with", - classes: "nhsuk-tag--blue" - }) }} -
    -
    -
    - -
    -
    -

    Appointed

    - Standard -
    -
    -
    -
    -
    - {{ tag({ - text: "0 of 560 appointed", - classes: "nhsuk-tag--green" - }) }} -
    -
    -
    - -
    -
    - Special requirements -
    -
    -
    -
    -
    - {{ tag({ - text: "0 of 40 appointed", - classes: "nhsuk-tag--orange" - }) }} -
    -
    -
    - -
    -
    -

    Reconciled

    - Very high risk (VHR) -
    -
    -
    -
    -
    - {{ tag({ - text: "0 of 10 reconciled", - classes: "nhsuk-tag--red" - }) }} -
    -
    -
    -
    - -
    - -
    -
    -
    - {% call details({ - summaryHtml: '

    Clinics associated with this batch

    ' - }) %} -

    No clinics associated with this batch

    - {% endcall %} -
    -
    -
    - -{% endblock %} diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index b590406..945a171 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -179,7 +179,7 @@

    Participant breakdown

    }) %}
    - 10 special requirements
    + 10 special requirements
    reasonable adjustments etc.
    {% endcall %} @@ -252,7 +252,7 @@

    Batch progress

    Appointed

    - Standard + Standard
    @@ -268,7 +268,7 @@

    Appoint
    - Special requirements + Special requirements
    diff --git a/app/views/batches/participant-breakdown/special-requirements.html b/app/views/batches/participant-breakdown/special-requirements.html new file mode 100644 index 0000000..4e72510 --- /dev/null +++ b/app/views/batches/participant-breakdown/special-requirements.html @@ -0,0 +1,108 @@ + +{% 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" + }, + { + href: "/batches/batch-detail-in-progress", + text: "Malton Practices Apr-May 26 NTDD RD 13" + } + ] +}) }} +{% endblock %} + +{% block content %} +

    + Malton Practices Apr-May 26 NTDD RD 13 + Participants with special requirements +

    + +
    +
    +
    + {{ tag({ + text: "0 of 10 appointed", + classes: "nhsuk-tag--orange" + }) }} +
    +
    +
    + +
    +
    + + {{ table({ + firstCellIsHeader: false, + classes: "nhsuk-u-font-size-14", + head: [ + { + text: "Name" + }, + { + text: "Date of birth" + }, + { + text: "NHS number" + }, + { + text: "Next test due date (NTDD)" + }, + { + text: "Requirement" + }, + { + text: "Select" + } + ], + rows: [ + [ + { + html: 'Olga Tokarczuk' + }, + { + html: "1 January 1967
    (00 years old)" + }, + { + text: "943 579 7881" + }, + { + text: "1 May 2026" + }, + { + text: "Sanitise these" + }, + { + text: "checkbox" + } + ] + ] + }) }} +
    +
    + +
    +
    +

    + Appoint selected participants +

    +
    +
    + +{% endblock %} From 4557c72ecf5d2ff26274044f474cde691316ea88 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Tue, 28 Apr 2026 12:14:57 +0100 Subject: [PATCH 3/3] Back to work --- .../special-requirements.html | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/app/views/batches/participant-breakdown/special-requirements.html b/app/views/batches/participant-breakdown/special-requirements.html index 4e72510..c980957 100644 --- a/app/views/batches/participant-breakdown/special-requirements.html +++ b/app/views/batches/participant-breakdown/special-requirements.html @@ -48,6 +48,15 @@

    + {% set select %} +
    + + +
    + {% endset %} + {{ table({ firstCellIsHeader: false, classes: "nhsuk-u-font-size-14", @@ -62,13 +71,10 @@

    text: "NHS number" }, { - text: "Next test due date (NTDD)" + text: "Next test due date" }, { text: "Requirement" - }, - { - text: "Select" } ], rows: [ @@ -87,9 +93,6 @@

    }, { text: "Sanitise these" - }, - { - text: "checkbox" } ] ] @@ -97,12 +100,4 @@

    -
    -
    -

    - Appoint selected participants -

    -
    -
    - {% endblock %}