diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 07c01d7..01acaa7 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -20,6 +20,7 @@ --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); + --ceased-chart-hatch: repeating-linear-gradient(90deg, #354550, #354550 1px, #dbe0e3 1px, #dbe0e3 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); } @@ -28,7 +29,10 @@ background: var(--standard-chart-hatch) } .hatching--special { - background: var(--special-chart-hatch), + background: var(--special-chart-hatch) +} +.hatching--ceased { + background: var(--ceased-chart-hatch) } .hatching--high-risk { background: var(--vhr-chart-hatch-1), var(--vhr-chart-hatch-2) @@ -125,6 +129,9 @@ &.--special { background: var(--special-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff; } + &.--ceased { + background: var(--ceased-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/config.js b/app/config.js index 8fd8d1d..f2f2928 100644 --- a/app/config.js +++ b/app/config.js @@ -2,7 +2,7 @@ module.exports = { // Service name - serviceName: 'Cohort to clinic service name', + serviceName: 'Cohort to clinic prototype', // Port to run the prototype on locally port: 3000 diff --git a/app/data/session-data-defaults.js b/app/data/session-data-defaults.js index 5056067..d0e97e0 100644 --- a/app/data/session-data-defaults.js +++ b/app/data/session-data-defaults.js @@ -1,4 +1,3 @@ // Use this file to set any default data -module.exports = { -} +module.exports = {} diff --git a/app/views/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html index 834ab3f..5efae8e 100644 --- a/app/views/_includes/primary-navigation.html +++ b/app/views/_includes/primary-navigation.html @@ -1,11 +1,11 @@ {% from 'header/macro.njk' import header %} -{% macro primaryNavigation(activeItem, serviceName) %} +{% macro primaryNavigation(activeItem, serviceName, bsoName) %} {{ header({ account: { items: [ { - text: "West Berkshire BSO" + text: "West Sussex BSO" }, { href: "#", diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index 945a171..60ad531 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -31,175 +31,96 @@
- BDE-NTDD-20260201 + HWO-standard-20251212

- Malton Practices Apr-May 26 NTDD RD 13 + Chichester - Parklands

-

Change

+

Edit batch name

- Imported 2 February 2026
- {% call card({ - clickable: true, - heading: "715", - headingClasses: "nhsuk-u-font-size-36 nhsuk-u-margin-bottom-1" - }) %} -

- 715 total participants -

- {% endcall %} -
-
- +
+
+

+ + 1352 + +

+ total participants +
+
-
- -
- -
-

Participant breakdown

- +

Participant breakdown

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

Further batch information

' + }) %} +

Participants in this batch represent:

+ +

Batch imported 14 December 2025

+ {% endcall %}
+
-
+

Batch progress

-
+
{{ tag({ - text: "704 of 715 dealt with", + text: "1306 of 1352 dealt with", classes: "nhsuk-tag--blue" }) }}
@@ -259,7 +181,7 @@

Appoint
{{ tag({ - text: "700 of 700 appointed", + text: "1330 of 1330 appointed", classes: "nhsuk-tag--green" }) }}
@@ -268,14 +190,14 @@

Appoint
- Special requirements + Special requirements
-
+
{{ tag({ - text: "4 of 10 appointed", + text: "6 of 12 appointed", classes: "nhsuk-tag--orange" }) }}
@@ -285,6 +207,22 @@

Appoint

Reconciled

+ Ceased +
+
+
+
+
+ {{ tag({ + text: "0 of 5 reconciled", + classes: "nhsuk-tag--grey" + }) }} +
+
+
+ +
+
Very high risk (VHR)
diff --git a/app/views/batches/batch-detail.html b/app/views/batches/batch-detail.html index 1fd8b62..2289392 100644 --- a/app/views/batches/batch-detail.html +++ b/app/views/batches/batch-detail.html @@ -31,137 +31,96 @@
- BDE-NTDD-20260101 + HWO-standard-20251209

- Harrogate Practices Feb-March 2026 Round 13 + Crawley - Pound Hill

-

Change

+

Edit batch name

- Imported 1 January 2026
-
+
-
+

- 610 + 2172

- total participants + 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" - }) }} -
- - +
+
- +
+
+ {% call details({ + summaryHtml: '

Further batch information

' + }) %} +

Participants in this batch represent:

+ +

Batch imported 11 December 2025

+ {% endcall %}
+
-
+
@@ -204,7 +164,7 @@

Batch progress

{{ tag({ - text: "0 of 610 dealt with", + text: "0 of 2172 dealt with", classes: "nhsuk-tag--blue" }) }}
@@ -221,7 +181,7 @@

Appoint
{{ tag({ - text: "0 of 560 appointed", + text: "0 of 2150 appointed", classes: "nhsuk-tag--green" }) }}
@@ -237,7 +197,7 @@

Appoint
{{ tag({ - text: "0 of 40 appointed", + text: "0 of 12 appointed", classes: "nhsuk-tag--orange" }) }}
@@ -247,6 +207,22 @@

Appoint

Reconciled

+ Ceased +
+
+
+
+
+ {{ tag({ + text: "0 of 5 reconciled", + classes: "nhsuk-tag--grey" + }) }} +
+
+
+ +
+
Very high risk (VHR)
@@ -254,7 +230,7 @@

Reconci
{{ tag({ - text: "0 of 10 reconciled", + text: "0 of 5 reconciled", classes: "nhsuk-tag--red" }) }}
diff --git a/app/views/batches/index.html b/app/views/batches/index.html index 0f572a4..c23de5d 100644 --- a/app/views/batches/index.html +++ b/app/views/batches/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Manage batches", serviceName) }} + {{ primaryNavigation("Manage batches", serviceName, bsoName) }} {% endblock %} {% block beforeContent %} @@ -22,7 +22,7 @@ {% block content %}
-

Batches in progress

+

Manage batches

{{ button({ text: "Import a new batch", @@ -34,31 +34,76 @@

Batches in progress

- {% set batch_new %} + {% set batch_1 %} - Harrogate Practices Feb-March 2026 Round 13
- BYO-NTDD-20260101 + Crawley - Pound Hill
+ HWO-standard-20251209 {% endset %} - {% set progress_new %} + {% set batch_1_progress %}
{{ tag({ - text: "0 of 610", + text: "0 of 2172", classes: "nhsuk-tag--blue" }) }}
{% endset %} - {% set batch %} + {% set batch_2 %} - Malton Practices Apr-May 26 NTDD RD 13
- BYO-NTDD-20260201 + Chichester - Parklands
+ HWO-standard-20251212 {% endset %} - {% set progress %} -
+ {% set batch_2_progress %} +
{{ tag({ - text: "704 of 715", + text: "1306 of 1352", + classes: "nhsuk-tag--blue" + }) }} +
+ {% endset %} + + {% set failsafe %} + + February failsafe
+ HWO-failsafe-20260115 + + {% endset %} + {% set failsafe_progress %} +
+ {{ tag({ + text: "0 of 308", + classes: "nhsuk-tag--blue" + }) }} +
+ {% endset %} + + {% set auto %} + + Aged over 71 - slippage 03-Feb-2026 11:00
+ HWO-auto-slippage-2020203-1100 + + {% endset %} + {% set auto_progress %} +
+ {{ tag({ + text: "0 of 2", + classes: "nhsuk-tag--blue" + }) }} +
+ {% endset %} + + {% set auto_2 %} + + Aged 53 - never invited 03-Feb-2026 11:00
+ HWO-auto-never-invited-2020203-1100 + + {% endset %} + {% set auto_2_progress %} +
+ {{ tag({ + text: "0 of 4", classes: "nhsuk-tag--blue" }) }}
@@ -84,32 +129,77 @@

Batches in progress

rows: [ [ { - html: batch_new + html: failsafe + }, + { + text: "Failsafe" + }, + { + text: "308", + format: "numeric" + }, + { + html: failsafe_progress + } + ], + [ + { + html: auto + }, + { + text: "Auto" + }, + { + text: "2", + format: "numeric" + }, + { + html: auto_progress + } + ], + [ + { + html: auto_2 + }, + { + text: "Auto" + }, + { + text: "4", + format: "numeric" + }, + { + html: auto_2_progress + } + ], + [ + { + html: batch_1 }, { - text: "Standard (NTDD)" + text: "Standard" }, { - text: "610", + text: "2172", format: "numeric" }, { - html: progress_new + html: batch_1_progress } ], [ { - html: batch + html: batch_2 }, { - text: "Standard (NTDD)" + text: "Standard" }, { - text: "715", + text: "1352", format: "numeric" }, { - html: progress + html: batch_2_progress } ] ] diff --git a/app/views/batches/participant-breakdown/special-requirements.html b/app/views/batches/participant-breakdown/special-requirements.html index c980957..acf8fc5 100644 --- a/app/views/batches/participant-breakdown/special-requirements.html +++ b/app/views/batches/participant-breakdown/special-requirements.html @@ -22,7 +22,7 @@ }, { href: "/batches/batch-detail-in-progress", - text: "Malton Practices Apr-May 26 NTDD RD 13" + text: "Chichester - Parklands" } ] }) }} @@ -30,7 +30,7 @@ {% block content %}

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

diff --git a/app/views/batches/participant-breakdown/standard.html b/app/views/batches/participant-breakdown/standard.html index 4738867..8559d29 100644 --- a/app/views/batches/participant-breakdown/standard.html +++ b/app/views/batches/participant-breakdown/standard.html @@ -22,7 +22,7 @@ }, { href: "/batches/batch-detail-in-progress", - text: "Malton Practices Apr-May 26 NTDD RD 13" + text: "Chichester - Parklands" } ] }) }} @@ -30,7 +30,7 @@ {% block content %}

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

@@ -48,6 +48,8 @@

+
+
@@ -69,6 +71,8 @@

+
+
diff --git a/app/views/bso-objects/bso/bso-internal-details.html b/app/views/bso-objects/bso/bso-internal-details.html index f6d9447..b9e52f0 100644 --- a/app/views/bso-objects/bso/bso-internal-details.html +++ b/app/views/bso-objects/bso/bso-internal-details.html @@ -17,7 +17,7 @@ service name is needed. You can also reuse this variable within the

, where they are the same. --> -{% set pageName = "West Berkshire Screening Service" %} +{% set pageName = "West Sussex Breast Screening Service" %} {% block customStyles %} @@ -50,14 +50,16 @@ {% block content %} -
-
- BSO ID: WBBSS-p33ps -

- West Berkshire Screening Service -

+
+
+
+ BSO ID: HWO-p33ps +

+ {{ pageName }} +

+
+
-

Change

{% set secondaryNavItems = [] %} @@ -125,25 +127,25 @@

BSO area

heading: "1", headingClasses: "nhsuk-u-font-size-48 nhsuk-u-margin-bottom-1" }) %} - Static unit + Static unit {% endcall %}
  • {% call card({ clickable: true, - heading: "2", + heading: "4", headingClasses: "nhsuk-u-font-size-48 nhsuk-u-margin-bottom-1" }) %} - Mobile units + Mobile units {% endcall %}
  • {% call card({ clickable: true, - heading: "13", + heading: "11", headingClasses: "nhsuk-u-font-size-48 nhsuk-u-margin-bottom-1" }) %} - Locations + Locations {% endcall %}
    • @@ -212,7 +214,7 @@

    BSO area

    }); - +