diff --git a/app/assets/sass/components/_participant-table.scss b/app/assets/sass/components/_participant-table.scss index fb7f1a4..9080899 100644 --- a/app/assets/sass/components/_participant-table.scss +++ b/app/assets/sass/components/_participant-table.scss @@ -1,16 +1,12 @@ .app-participant-table { - /*thead tr { - position: sticky; - top: 0; - background-color: #f0f4f5; - }*/ - - tbody tr:nth-child(odd) { - background-color: #f8fafa; - } - tbody tr:nth-child(even) { - background-color: #f0f4f5; + .nhsuk-table__body { + tr:nth-child(odd) { + background-color: #f8fafa; + } + tr:nth-child(even) { + background-color: #f0f4f5; + } } th:first-child, diff --git a/app/views/index.html b/app/views/index.html index ac0a368..29f084a 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -89,7 +89,8 @@

March 2026

Work for September Test

-

Iteration 1: transactional journey

+

Iteration 1

+

Users upload a csv containing the participants they wish to book into a prearranged single day clinic.

Simple click through journey

@@ -97,6 +98,18 @@

Iteration 1: transactional journey

  • Upload a batch
    • +
  • + Batch detail for trimmed csv +
    • +
  • + Pre-appointment confirmation +
    • +
  • + Single day of appointments +
    • + +

    Defunct work on finding and grouping participants. Components to be reused elsewhere.

    +
    1. Batch detail
      2. @@ -109,15 +122,9 @@

      Iteration 1: transactional journey

    2. Group
      3. -
    3. - Pre-appointment confirmation -
    4. [Utility] "appointing" spinner
      5. -
    5. - Single day of appointments -
    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 0ba1965..be9281f 100644 --- a/app/views/z-september-transactional-journey/_includes/participant-search.html +++ b/app/views/z-september-transactional-journey/_includes/participant-search.html @@ -2,7 +2,7 @@

    - Find participants in Test batch 1 + Find participants

    Use one or more fields
    @@ -64,52 +64,54 @@

    -
    -

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

    - -
    + Error: Use one or more fields @@ -176,4 +178,4 @@

    - \ 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 4009272..79d4e5d 100644 --- a/app/views/z-september-transactional-journey/appointing-complete.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -23,30 +23,30 @@ html: html, type: "success" }) }} -

    - CLINC-ID - Test Clinic 1 -

    -
    - Unit name at location name +
    +

    + CLINC-ID + Test Clinic 1 +

    +
    + Unit name at location name +
    + {{ actionLink({ + text: "Download .csv", + href: "#" + }) }}
    -
    +
    -
    -

    - Tuesday - 1 September 2026 -

    - {{ actionLink({ - text: "Download .csv", - href: "#" - }) }} -
    +

    + Tuesday + 1 September 2026 +

    diff --git a/app/views/z-september-transactional-journey/batch-detail-trimmed-csv.html b/app/views/z-september-transactional-journey/batch-detail-trimmed-csv.html new file mode 100644 index 0000000..d2e1b87 --- /dev/null +++ b/app/views/z-september-transactional-journey/batch-detail-trimmed-csv.html @@ -0,0 +1,331 @@ +{% extends 'layout.html' %} + +{% set pageName = "Batch detail" %} + +{% 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" + }) }} +

    + BS1345815F + Test batch 1 +

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

    + + 48 + +

    + total participants +
    +
    +
    +
    + +
    + + + Show all participants + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + NHS Number + + Name + + Date of birth +
    186 771 9002Callie Morris14 September 1968
    750 218 3446Emma Cole17 April 1975
    642 109 8875Megan Price5 February 1961
    378 290 4601Elaine Fox11 February 1976
    977 332 1108Dara Moss24 June 1960
    196 804 7753Georgia Mills30 June 1968
    075 439 3321Helena Rowe2 April 1963
    086 221 4409Shannon Boyd22 November 1971
    604 118 9756Nadia Singh7 April 1957
    702 195 4836Marta O'Neill3 May 1971
    520 665 8805Olivia Lee19 August 1960
    614 287 9305Susan Carter19 September 1967
    642 787 0083Wendy Fox21 June 1967
    419 502 6683Zoe Grant11 March 1965
    957 613 2084Tessa King25 August 1963
    742 908 2233Leona Grant15 October 1974
    297 883 4455Bethany Cross7 July 1975
    864 009 2201Uma Jha17 September 1962
    329 487 9901Catherine Wood16 January 1956
    964 210 5587Danielle Nash23 June 1970
    319 454 7756Zara Moon6 May 1973
    853 619 4470Faye Turner8 January 1957
    419 554 7706Priya Desai10 May 1973
    531 678 2209Mia Ford19 May 1972
    188 905 6423Imogen Frost31 December 1972
    861 427 5930Sophie Hartley2 August 1962
    208 343 6647Abigail Stone14 October 1959
    531 676 9974Xena Holt11 December 1960
    999 054 3666Billie Joanne Marquardt15 March 1960
    214 603 1774Victoria Hale13 October 1966
    548 901 7732Naomi Bell21 September 1974
    753 898 1192Victoria Dean4 April 1976
    842 039 6617Jane Reed18 November 1970
    197 332 5508Rosa Kirk13 July 1958
    420 565 8865Yasmin Noor28 August 1961
    821 374 0952Daphne Hart22 July 1958
    308 244 1196Ariana Miles28 November 1959
    308 443 6607Quinn Park26 March 1964
    505 463 1129Olivia Barnes12 January 1975
    631 776 9904Nora Blake30 December 1966
    336 774 2201Rachel Price27 April 1962
    410 559 3322Fiona Lambert14 December 1973
    731 259 1148Laura White29 May 1965
    665 880 3320Marissa Young9 March 1961
    439 216 5087Paige Long4 July 1969
    943 582 7164Alice Marie Gregory8 November 1964
    223 546 8870Hannah Wallace6 October 1959
    975 110 3310Tara Voss9 February 1969
    +
    + +
    + +
    +
    + + Book participants + +
    +
    + +{% 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 index 95d0d67..b022529 100644 --- a/app/views/z-september-transactional-journey/batch-detail.html +++ b/app/views/z-september-transactional-journey/batch-detail.html @@ -50,7 +50,7 @@

    - Select participants to book + Find participants to book
    diff --git a/app/views/z-september-transactional-journey/group.html b/app/views/z-september-transactional-journey/group.html index 616429e..86f6a41 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[s] successfully added to group + 1 participant added to group

    {% endset %} {{ notificationBanner({ @@ -23,15 +23,27 @@ type: "success" }) }} - {% set html %} +

    @@ -71,7 +83,12 @@

    Test clinic group

    999 054 3666 - Billie Joanne Marquardt + + Billie Joanne Marquardt + + Just added + + 15 March 1960 Remove @@ -203,7 +220,12 @@

    Test clinic group

    631 776 9904 - Nora Blake + + Nora Blake + + 30 December 1966 Remove @@ -211,7 +233,7 @@

    Test clinic group

    - Book into slots + Book this 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 65c2da1..24d0513 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -8,56 +8,13 @@ {% endblock %} {% block beforeContent %} + + Back + {% endblock %} {% block content %} - - -
    -
    -

    - Book participants into slots -

    -
    -
    - -
    - -
    -
    -
    - 48 participants -
    -
    - from Test Clinic group -
    -
    -
    - -
    - into -
    - -
    -
    -
    - 48 available slots -
    -
    - in Test Clinic 1
    - Tuesday 1 September 2026 -
    -
    - Unit name at location name -
    -
    +
    +

    + Book participants +

    + +

    You are booking 48 participants from Test Clinic group into:

    + +

    + Test Clinic 1 + Tuesday 1 September +

    +

    + Waverley Breast Unit
    + Waverley Hospital +

    +

    48 slots available

    + +
    + Information: +

    Participants will be booked in random order

    + + Book + +
    - -
    -
    - -
    -
    - - - Book - - -

    - 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 a2dc512..3e4723d 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/z-september-transactional-journey/search-and-results.html @@ -13,98 +13,111 @@ {% include "z-september-transactional-journey/_includes/participant-search.html"%} -
    +
    -

    4 participants found

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - NHS Number - - Name - - Date of birth -
    -
    - - -
    -     		531 676 9974Xena Holt11 December 1960
    -
    - - -
    -     		420 565 8865Yasmin Noor28 August 1961
    -
    - - -
    -     		319 454 7756Zara Moon6 May 1973
    -
    - - -
    -     		208 343 6647Abigail Stone14 October 1959
    +

    + Search results +

    + + + +

    4 participants found

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + NHS Number + + Name + + Date of birth +
    +
    + + +
    +     		531 676 9974Xena Holt11 December 1960
    +
    + + +
    +     		420 565 8865Yasmin Noor28 August 1961
    +
    + + +
    +     		319 454 7756Zara Moon6 May 1973
    +
    + + +
    +     		208 343 6647Abigail Stone14 October 1959
    + + - Add selected to Test clinic group + Add selected to booking group
    +
    - - -
    +
    + --> {% 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 index 001e93e..a0f79b3 100644 --- a/app/views/z-september-transactional-journey/upload-a-batch.html +++ b/app/views/z-september-transactional-journey/upload-a-batch.html @@ -21,7 +21,7 @@

    - + Upload file