diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index a6046b9..07c01d7 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -40,7 +40,7 @@ tbody { display: flex; width: 100%; - height: 3rem; + min-height: 2rem; overflow: hidden; } /* Each row becomes a segment, sized by its proportion of the total */ @@ -50,6 +50,10 @@ justify-content: left; overflow: hidden; } + /* Each row becomes a segment, sized by its proportion of the total */ + tbody td { + padding: 0; + } } .app-chart-bar-segmented-horizontal--legend { @include nhsuk-media-query($from: tablet) { @@ -76,6 +80,23 @@ } } +// alternate to stacked bar? +.app-segmented-cards { + .nhsuk-card__content { + display: flex; + gap: 8px; + @include nhsuk-responsive-padding(3); + } + .swatch { + display: inline-block; + width: 2rem; + height: 2rem; + flex-shrink: 0; + margin-right: 6px; + vertical-align: middle; + } +} + .app-batch-overview-sparkline { background-color: #fff; } @@ -89,7 +110,6 @@ .app-simple-progress-bar { width: 100%; min-width: 200px; - height: 3rem; &.--thin { height: auto; diff --git a/app/views/batches/batch-detail-in-progress.html b/app/views/batches/batch-detail-in-progress.html index 19064fc..bf449d4 100644 --- a/app/views/batches/batch-detail-in-progress.html +++ b/app/views/batches/batch-detail-in-progress.html @@ -31,34 +31,34 @@
- BDE-NTDD-202601011200 + BDE-NTDD-20260201

- Harrogate Practices Feb-March 2026 Round 13 + Malton Practices Apr-May 26 NTDD RD 13

Change

- Standard (NTDD) batch imported 1st January 2026 + Imported 2 February 2026
-
-
-
-

- - 1987 - -

- total participants -
-
+
+ {% call card({ + clickable: true, + heading: "715", + headingClasses: "nhsuk-u-font-size-36 nhsuk-u-margin-bottom-1" + }) %} +

+ 715 total participants +

+ {% endcall %}
-
+
@@ -72,20 +72,20 @@

Participant breakdown

- + +
    +
  • + {% call card({ + clickable: true + }) %} + +
    + 700 standard
    + ready to appoint +
    + {% endcall %} +
    • +
  • + {% call card({ + clickable: true + }) %} + +
    + 10 special requirements
    + reasonable adjustments etc. +
    + {% endcall %} +
    • +
  • + {% call card({ + clickable: true + }) %} + +
    + 5 very high risk (VHR)
    + ready to reconcile +
    + {% endcall %} +
    • + +

@@ -181,13 +220,13 @@

Participant distribution by next test due date

Earliest next test due date:

- 28 February 2026 + 6 April 2026

Latest:

- 31 March 2026 + 27 May 2026

@@ -201,10 +240,10 @@

Batch progress

-
+
{{ tag({ - text: "1970 of 1987 dealt with", - classes: "nhsuk-tag--blue nhsuk-u-margin-left-2" + text: "704 of 715 dealt with", + classes: "nhsuk-tag--blue" }) }}
@@ -218,16 +257,13 @@

Appoint

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

1970 of 1970 appointed

-
@@ -237,16 +273,13 @@

Appoint

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

0 of 12 appointed

-
@@ -257,16 +290,13 @@

Reconci

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

0 of 5 reconciled

-

diff --git a/app/views/batches/batch-detail.html b/app/views/batches/batch-detail.html index e974b23..1fd8b62 100644 --- a/app/views/batches/batch-detail.html +++ b/app/views/batches/batch-detail.html @@ -31,14 +31,14 @@
- BDE-NTDD-202601011200 + BDE-NTDD-20260101

Harrogate Practices Feb-March 2026 Round 13

Change

- Standard (NTDD) batch imported 1st January 2026 + Imported 1 January 2026
@@ -48,7 +48,7 @@

- 1987 + 610

total participants @@ -57,6 +57,7 @@

@@ -79,13 +80,13 @@

Participant breakdown

@@ -101,10 +102,10 @@

Participant breakdown

Standard - + {{ tag({ - text: "1970", - classes: "nhsuk-tag--green nhsuk-u-margin-left-2" + text: "560", + classes: "nhsuk-tag--green" }) }} @@ -112,10 +113,10 @@

Participant breakdown

Special Requirements - + {{ tag({ - text: "12", - classes: "nhsuk-tag--orange nhsuk-u-margin-left-2" + text: "40", + classes: "nhsuk-tag--orange" }) }} @@ -123,10 +124,10 @@

Participant breakdown

Very High Risk - + {{ tag({ - text: "5", - classes: "nhsuk-tag--red nhsuk-u-margin-left-2" + text: "10", + classes: "nhsuk-tag--red" }) }} @@ -137,21 +138,21 @@

Participant breakdown

  • - 1970 standard
    + 560 standard
    ready to appoint
  • - 12 special requirements
    + 40 special requirements
    reasonable adjustments etc.
  • - 5 very high risk (VHR)
    + 10 very high risk (VHR)
    ready to reconcile
    • @@ -201,10 +202,10 @@

    Batch progress

    -
    +
    {{ tag({ - text: "0 of 1987 dealt with", - classes: "nhsuk-tag--blue nhsuk-u-margin-left-2" + text: "0 of 610 dealt with", + classes: "nhsuk-tag--blue" }) }}
    @@ -218,16 +219,13 @@

    Appoint

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

    0 of 1970 appointed

    -
    @@ -237,16 +235,13 @@

    Appoint

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

    0 of 12 appointed

    -
    @@ -257,16 +252,13 @@

    Reconci

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

    0 of 5 reconciled

    -

    diff --git a/app/views/batches/index.html b/app/views/batches/index.html index 55ea1e8..0f572a4 100644 --- a/app/views/batches/index.html +++ b/app/views/batches/index.html @@ -34,36 +34,32 @@

    Batches in progress

    - - {% set batch %} - + {% set batch_new %} + Harrogate Practices Feb-March 2026 Round 13
    - BDE-NTDD-202601011200 + BYO-NTDD-20260101     {% endset %} - - {% set progress %} -
    + {% set progress_new %} +
    {{ tag({ - text: "99%", - classes: "nhsuk-tag--blue nhsuk-u-margin-1" + text: "0 of 610", + classes: "nhsuk-tag--blue" }) }}
    {% endset %} - - {% set batch_new %} - - Harrogate Practices Feb-March 2026 Round 13
    - BDE-NTDD-202601011200 + {% set batch %} +     + Malton Practices Apr-May 26 NTDD RD 13
    + BYO-NTDD-20260201     {% endset %} - - {% set progress_new %} -
    + {% set progress %} +
    {{ tag({ - text: "0%", - classes: "nhsuk-tag--blue nhsuk-u-margin-1" + text: "704 of 715", + classes: "nhsuk-tag--blue" }) }}
    {% endset %} @@ -94,7 +90,7 @@

    Batches in progress

    text: "Standard (NTDD)" }, { - text: "1987", + text: "610", format: "numeric" }, { @@ -109,7 +105,7 @@

    Batches in progress

    text: "Standard (NTDD)" }, { - text: "1987", + text: "715", format: "numeric" }, {