diff --git a/app/assets/sass/components/_inline-detailed-search.scss b/app/assets/sass/components/_inline-detailed-search.scss index e7d8b16..4b8509a 100644 --- a/app/assets/sass/components/_inline-detailed-search.scss +++ b/app/assets/sass/components/_inline-detailed-search.scss @@ -1,17 +1,11 @@ .app-inline-detailed-search { display: flex; - gap: 1rem; + //gap: 1rem; + gap: 2rem; & > .nhsuk-form-group { margin-bottom: 0; - - &:nth-child(4) { - width: 210px; - flex-shrink: 0; - } - &:last-child { - align-self: flex-end; - } + align-self: flex-end; } & .nhsuk-button { @@ -19,7 +13,8 @@ } .nhsuk-date-input__item { - margin-right: 8px; + //margin-right: 8px; + margin-right: 1rem; &:last-child { margin-right: 0; } diff --git a/app/assets/sass/components/_participant-table.scss b/app/assets/sass/components/_participant-table.scss index 1cb1606..fb7f1a4 100644 --- a/app/assets/sass/components/_participant-table.scss +++ b/app/assets/sass/components/_participant-table.scss @@ -1,17 +1,35 @@ .app-participant-table { + /*thead tr { + position: sticky; + top: 0; + background-color: #f0f4f5; + }*/ + tbody tr:nth-child(odd) { - background-color: rgba(255,255,255,0.5); + background-color: #f8fafa; + } + tbody tr:nth-child(even) { + background-color: #f0f4f5; } + th:first-child, td:first-child { padding-left: 12px; } - &.nhsuk-checkboxes--small { - .nhsuk-checkboxes__item { - margin-top: -8px; - } + td:has( > .nhsuk-checkboxes__item) { + padding-right: 0; + padding-top: 8px; + width: 62px; + } + + .app-column-time { + width: 5rem; + } + .app-column-nhs-number { + text-align: right; + width: 10rem; } - + } \ No newline at end of file diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 54712b2..1b9b32a 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -1,5 +1,8 @@ // Import NHS.UK frontend library -@forward "nhsuk-frontend/dist/nhsuk/nhsuk"; +@forward "nhsuk-frontend/dist/nhsuk/nhsuk" with ( + $nhsuk-page-width: 1280px +); +//@forward "nhsuk-frontend/dist/nhsuk/nhsuk"; @use "nhsuk-frontend/dist/nhsuk/core" as *; // Stolen Manage prototype components :P @@ -12,7 +15,12 @@ @forward "components/participant-table"; //@forward "components/participant-search"; +//{% set containerClasses = "nhsuk-width-container-fluid" %} + // Add your custom CSS/Sass styles below. +.app-width-extended { + width: 1280px; +} .app-card-editable { display: flex; justify-content: space-between; diff --git a/app/views/_includes/primary-navigation.html b/app/views/_includes/primary-navigation.html index f0c1f3e..f68669e 100644 --- a/app/views/_includes/primary-navigation.html +++ b/app/views/_includes/primary-navigation.html @@ -1,6 +1,6 @@ {% from 'header/macro.njk' import header %} -{% macro primaryNavigation(activeItem, serviceName, bsoName) %} +{% macro primaryNavigation(activeItem, serviceName) %} {{ header({ account: { items: [ diff --git a/app/views/batches/index.html b/app/views/batches/index.html index 73515c5..780dbef 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("Batches", serviceName, bsoName) }} + {{ primaryNavigation("Batches", serviceName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/clinic-detail.html b/app/views/clinics/clinic-detail.html index e382f45..07b1e9f 100644 --- a/app/views/clinics/clinic-detail.html +++ b/app/views/clinics/clinic-detail.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName, bsoName) }} + {{ primaryNavigation("Clinics", serviceName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/day-slot-view.html b/app/views/clinics/day-slot-view.html index c607d7a..f62178b 100644 --- a/app/views/clinics/day-slot-view.html +++ b/app/views/clinics/day-slot-view.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName, bsoName) }} + {{ primaryNavigation("Clinics", serviceName) }} {% endblock %} {% block beforeContent %} diff --git a/app/views/clinics/index.html b/app/views/clinics/index.html index 7fddb82..b5206c8 100644 --- a/app/views/clinics/index.html +++ b/app/views/clinics/index.html @@ -4,7 +4,7 @@ {% from "_includes/primary-navigation.html" import primaryNavigation %} {% block header %} - {{ primaryNavigation("Clinics", serviceName, bsoName) }} + {{ primaryNavigation("Clinics", serviceName) }} {% endblock %} {% block beforeContent %} 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 index 28203c0..fc087e3 100644 --- a/app/views/z-september-transactional-journey/_includes/min-primary-navigation.html +++ b/app/views/z-september-transactional-journey/_includes/min-primary-navigation.html @@ -1,6 +1,6 @@ {% from 'header/macro.njk' import header %} -{% macro primaryNavigation(activeItem, serviceName, bsoName) %} +{% macro primaryNavigation(activeItem, serviceName) %} {{ header({ account: { items: [ diff --git a/app/views/z-september-transactional-journey/_includes/participant-search.html b/app/views/z-september-transactional-journey/_includes/participant-search.html index ac89e4b..0ba1965 100644 --- a/app/views/z-september-transactional-journey/_includes/participant-search.html +++ b/app/views/z-september-transactional-journey/_includes/participant-search.html @@ -1,64 +1,179 @@ -
-
-

- Find participants -

- Use one or more fields + +
+
+

+ Find participants in Test batch 1 +

+ Use one or more fields +
-
-
-
- - -
-
- - -
-
- - -
-
-
- - Date of birth - -
-
-
- - +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + Date of birth + +
+
+
+ + +
-
-
-
- - +
+
+ + +
+
+
+
+ + +
-
-
- - +
+
+
+ +
+
+ + +
+ +

Error states

+ +
+
+
+
+

+ There is a problem +

+
+

+ Is an empty submission an error or a "no results" return? +

+

+ Bad formatting on NHS number. Non-numeric entry on NHS number. Anything else? +

+

+ Missing date element (day, month or year). Non-numeric entry on dates. DOB mnust be in the past. Anything else? +

+
-
+
-
- + + +
+
+

+ Find participants in Test batch 1 +

+ Use one or more fields + + + Error: Use one or more fields + +
+
+
+
+ + + Error: NHS number formatting message or something long + + +
+
+ + +
+
+ + +
+
+
+ + Date of birth + + + Error: Date of birth must be in the past + +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+ +
-
-
\ No newline at end of file + \ No newline at end of file diff --git a/app/views/z-september-transactional-journey/appointing-complete.html b/app/views/z-september-transactional-journey/appointing-complete.html index a21cc91..4009272 100644 --- a/app/views/z-september-transactional-journey/appointing-complete.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -25,7 +25,7 @@ }) }}

CLINC-ID - Clinic name + Test Clinic 1

Unit name at location name @@ -52,7 +52,7 @@

-

+

Morning session 08:30 to 12:30

@@ -63,224 +63,170 @@

-
    -
  • -
    - 08:30 - - Billie Joanne Marquardt
    - NHS: 999 054 3666 -     -
    -
    • -
  • -
    - 08:40 - - Alice Marie Gregory
    - NHS: 943 582 7164 -     -
    -
    • -
  • -
    - 08:50 - - Daphne Hart
    - NHS: 821 374 0952 -     -
    -
    • -
  • -
    - 09:00 - - Marta O'Neill
    - NHS: 702 195 4836 -     -
    -
    • -
  • -
    - 09:10 - - Susan Carter
    - NHS: 614 287 9305 -     -
    -
    • -
  • -
    - 09:20 - - Olivia Barnes
    - NHS: 505 463 1129 -     -
    -
    • -
  • -
    - 09:30 - - Rachel Price
    - NHS: 336 774 2201 -     -
    -
    • -
  • -
    - 09:40 - - Hannah Wallace
    - NHS: 223 546 8870 -     -
    -
    • -
  • -
    - 09:50 - - Fiona Lambert
    - NHS: 410 559 3322 -     -
    -
    • -
  • -
    - 10:00 - - Georgia Mills
    - NHS: 196 804 7753 -     -
    -
    • -
  • -
    - 10:10 - - Elaine Fox
    - NHS: 378 290 4601 -     -
    -
    • -
  • -
    - 10:20 - - Tessa King
    - NHS: 957 613 2084 -     -
    -
    • -
  • -
    - 10:30 - - Nadia Singh
    - NHS: 604 118 9756 -     -
    -
    • -
  • -
    - 10:40 - - Jane Reed
    - NHS: 842 039 6617 -     -
    -
    • -
  • -
    - 10:50 - - Laura White
    - NHS: 731 259 1148 -     -
    -
    • -
  • -
    - 11:00 - - Marissa Young
    - NHS: 665 880 3320 -     -
    -
    • -
  • -
    - 11:10 - - Naomi Bell
    - NHS: 548 901 7732 -     -
    -
    • -
  • -
    - 11:20 - - Paige Long
    - NHS: 439 216 5087 -     -
    -
    • -
  • -
    - 11:30 - - Catherine Wood
    - NHS: 329 487 9901 -     -
    -
    • -
  • -
    - 11:40 - - Victoria Hale
    - NHS: 214 603 1774 -     -
    -
    • -
  • -
    - 11:50 - - Imogen Frost
    - NHS: 188 905 6423 -     -
    -
    • -
  • -
    - 12:00 - - Dara Moss
    - NHS: 977 332 1108 -     -
    -
    • -
  • -
    - 12:10 - - Sophie Hartley
    - NHS: 861 427 5930 -     -
    -
    • -
  • -
    - 12:20 - - Emma Cole
    - NHS: 750 218 3446 -     -
    -
    • -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Time + + NHS Number + + Name + + Date of birth +
08:30999 054 3666Billie Joanne Marquardt15 March 1960
08:40943 582 7164Alice Marie Gregory8 November 1964
08:50821 374 0952Daphne Hart22 July 1958
09:00702 195 4836Marta O'Neill3 May 1971
09:10614 287 9305Susan Carter19 September 1967
09:20505 463 1129Olivia Barnes12 January 1975
09:30336 774 2201Rachel Price27 April 1962
09:40223 546 8870Hannah Wallace6 October 1959
09:50410 559 3322Fiona Lambert14 December 1973
10:00196 804 7753Georgia Mills30 June 1968
10:10378 290 4601Elaine Fox11 February 1976
10:20957 613 2084Tessa King25 August 1963
10:30604 118 9756Nadia Singh7 April 1957
10:40842 039 6617Jane Reed18 November 1970
10:50731 259 1148Laura White29 May 1965
11:00665 880 3320Marissa Young9 March 1961
11:10548 901 7732Naomi Bell21 September 1974
11:20439 216 5087Paige Long4 July 1969
11:30329 487 9901Catherine Wood16 January 1956
11:40214 603 1774Victoria Hale13 October 1966
11:50188 905 6423Imogen Frost31 December 1972
12:00977 332 1108Dara Moss24 June 1960
12:10861 427 5930Sophie Hartley2 August 1962
12:20750 218 3446Emma Cole17 April 1975

@@ -289,7 +235,7 @@

-

+

Afternoon session 13:30 to 17:30

@@ -301,224 +247,170 @@

-
    -
  • -
    - 13:30 - - Megan Price
    - NHS: 642 109 8875 -     -
    -
    • -
  • -
    - 13:40 - - Mia Ford
    - NHS: 531 678 2209 -     -
    -
    • -
  • -
    - 13:50 - - Zoe Grant
    - NHS: 419 502 6683 -     -
    -
    • -
  • -
    - 14:00 - - Ariana Miles
    - NHS: 308 244 1196 -     -
    -
    • -
  • -
    - 14:10 - - Bethany Cross
    - NHS: 297 883 4455 -     -
    -
    • -
  • -
    - 14:20 - - Callie Morris
    - NHS: 186 771 9002 -     -
    -
    • -
  • -
    - 14:30 - - Helena Rowe
    - NHS: 075 439 3321 -     -
    -
    • -
  • -
    - 14:40 - - Danielle Nash
    - NHS: 964 210 5587 -     -
    -
    • -
  • -
    - 14:50 - - Faye Turner
    - NHS: 853 619 4470 -     -
    -
    • -
  • -
    - 15:00 - - Leona Grant
    - NHS: 742 908 2233 -     -
    -
    • -
  • -
    - 15:10 - - Nora Blake
    - NHS: 631 776 9904 -     -
    -
    • -
  • -
    - 15:20 - - Olivia Lee
    - NHS: 520 665 8805 -     -
    -
    • -
  • -
    - 15:30 - - Priya Desai
    - NHS: 419 554 7706 -     -
    -
    • -
  • -
    - 15:40 - - Quinn Park
    - NHS: 308 443 6607 -     -
    -
    • -
  • -
    - 15:50 - - Rosa Kirk
    - NHS: 197 332 5508 -     -
    -
    • -
  • -
    - 16:00 - - Shannon Boyd
    - NHS: 086 221 4409 -     -
    -
    • -
  • -
    - 16:10 - - Tara Voss
    - NHS: 975 110 3310 -     -
    -
    • -
  • -
    - 16:20 - - Uma Jha
    - NHS: 864 009 2201 -     -
    -
    • -
  • -
    - 16:30 - - Victoria Dean
    - NHS: 753 898 1192 -     -
    -
    • -
  • -
    - 16:40 - - Wendy Fox
    - NHS: 642 787 0083 -     -
    -
    • -
  • -
    - 16:50 - - Xena Holt
    - NHS: 531 676 9974 -     -
    -
    • -
  • -
    - 17:00 - - Yasmin Noor
    - NHS: 420 565 8865 -     -
    -
    • -
  • -
    - 17:10 - - Zara Moon
    - NHS: 319 454 7756 -     -
    -
    • -
  • -
    - 17:20 - - Abigail Stone
    - NHS: 208 343 6647 -     -
    -
    • -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Time + + NHS Number + + Name + + Date of birth +
13:30642 109 8875Megan Price5 February 1961
13:40531 678 2209Mia Ford19 May 1972
13:50419 502 6683Zoe Grant11 March 1965
14:00308 244 1196Ariana Miles28 November 1959
14:10297 883 4455Bethany Cross7 July 1975
14:20186 771 9002Callie Morris14 September 1968
14:30075 439 3321Helena Rowe2 April 1963
14:40964 210 5587Danielle Nash23 June 1970
14:50853 619 4470Faye Turner8 January 1957
15:00742 908 2233Leona Grant15 October 1974
15:10631 776 9904Nora Blake30 December 1966
15:20520 665 8805Olivia Lee19 August 1960
15:30419 554 7706Priya Desai10 May 1973
15:40308 443 6607Quinn Park26 March 1964
15:50197 332 5508Rosa Kirk13 July 1958
16:00086 221 4409Shannon Boyd22 November 1971
16:10975 110 3310Tara Voss9 February 1969
16:20864 009 2201Uma Jha17 September 1962
16:30753 898 1192Victoria Dean4 April 1976
16:40642 787 0083Wendy Fox21 June 1967
16:50531 676 9974Xena Holt11 December 1960
17:00420 565 8865Yasmin Noor28 August 1961
17:10319 454 7756Zara Moon6 May 1973
17:20208 343 6647Abigail Stone14 October 1959

diff --git a/app/views/z-september-transactional-journey/batch-detail.html b/app/views/z-september-transactional-journey/batch-detail.html index 740bc95..95d0d67 100644 --- a/app/views/z-september-transactional-journey/batch-detail.html +++ b/app/views/z-september-transactional-journey/batch-detail.html @@ -22,9 +22,9 @@ html: html, type: "success" }) }} -

- BATCH-ID - Batch name +

+ BS1345815F + Test batch 1

Batch uploaded 11 June 2026 at 15:53 diff --git a/app/views/z-september-transactional-journey/group.html b/app/views/z-september-transactional-journey/group.html index 58f271c..5a038a0 100644 --- a/app/views/z-september-transactional-journey/group.html +++ b/app/views/z-september-transactional-journey/group.html @@ -15,7 +15,7 @@
{% set html %}

- Participant successfully added to group + Participant[s] successfully added to group

{% endset %} {{ notificationBanner({ @@ -25,8 +25,9 @@ {% set html %}

- Participant successfully removed from group + Participant removed from group

+ Undo {% endset %} {{ notificationBanner({ html: html @@ -53,7 +54,7 @@

Test clinic group

- - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + 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 f65c2a6..ce1f081 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -22,8 +22,8 @@ .app-flow-arrow { position: relative; transform: translateX(calc(-50% + 14px)); - color: #4c6272; - background: #fff; + color: #fff; + background: #4c6272; font-weight: bold; padding: 0.3rem 0 0.3rem 0.75rem; z-index: 1; @@ -40,7 +40,7 @@ height: 0; border-top: 28px solid transparent; border-bottom: 28px solid transparent; - border-left: 28px solid #fff; + border-left: 28px solid #4c6272; } /* Make the cards fill the flex item's cross size and allow their content to stretch */ @@ -96,10 +96,10 @@

- 23 participants + 48 participants
- from NAME group + from Test Clinic group
@@ -114,7 +114,7 @@

48 available slots
- in CLINIC NAME
+ in Test Clinic 1
Tuesday 1 September 2026
@@ -131,9 +131,12 @@

- + +

or cancel and go back diff --git a/app/views/z-september-transactional-journey/search-and-results.html b/app/views/z-september-transactional-journey/search-and-results.html index 6717484..9678204 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/z-september-transactional-journey/search-and-results.html @@ -13,15 +13,17 @@ {% include "z-september-transactional-journey/_includes/participant-search.html"%} +

-

[X] participants found

+ +

4 participants found

+ NHS Number @@ -69,27 +70,141 @@

Test clinic group
628 334 7720Christine Thompson17 September 1967999 054 3666Billie Joanne Marquardt15 March 1960Remove
943 582 7164Alice Marie Gregory8 November 1964Remove
821 374 0952Daphne Hart22 July 1958Remove
702 195 4836Marta O'Neill3 May 1971Remove
614 287 9305Susan Carter19 September 1967Remove
505 463 1129Olivia Barnes12 January 1975Remove
336 774 2201Rachel Price27 April 1962Remove
223 546 8870Hannah Wallace6 October 1959Remove
410 559 3322Fiona Lambert14 December 1973Remove
196 804 7753Georgia Mills30 June 1968Remove
378 290 4601Elaine Fox11 February 1976Remove
957 613 2084Tessa King25 August 1963Remove
642 109 8875Megan Price5 February 1961Remove
531 678 2209Mia Ford19 May 1972Remove
419 502 6683Zoe Grant11 March 1965Remove
308 244 1196Ariana Miles28 November 1959Remove
297 883 4455Bethany Cross7 July 1975Remove
186 771 9002Callie Morris14 September 1968Remove
075 439 3321Helena Rowe2 April 1963Remove
964 210 5587Danielle Nash23 June 1970 Remove
628 334 7720Christine Thompson17 September 1967853 619 4470Faye Turner8 January 1957 Remove
628 334 7720Christine Thompson17 September 1967742 908 2233Leona Grant15 October 1974 Remove
628 334 7720Christine Thompson17 September 1967631 776 9904Nora Blake30 December 1966 Remove
- - - + + + - - - + + + - - - + + + - - - + + +
+ NHS Number @@ -42,9 +44,9 @@

[X] participants found

- 		628 334 7720Christine Thompson17 September 1967531 676 9974Xena Holt11 December 1960
@@ -55,9 +57,9 @@

[X] participants found

628 334 7720Christine Thompson17 September 1967420 565 8865Yasmin Noor28 August 1961
@@ -68,9 +70,9 @@

[X] participants found

628 334 7720Christine Thompson17 September 1967319 454 7756Zara Moon6 May 1973
@@ -81,9 +83,9 @@

[X] participants found

628 334 7720Christine Thompson17 September 1967208 343 6647Abigail Stone14 October 1959
@@ -102,6 +104,8 @@

No participants found

--> + + {% endblock %} {% block footer %}