From ddaf51d2fda523264846f03fe993ff2683f513c0 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 25 Jun 2026 14:44:50 +0100 Subject: [PATCH 1/4] search and results but after a git add lol --- .../_includes/participant-search.html | 8 ++------ .../search-and-results.html | 11 +++++++---- 2 files changed, 9 insertions(+), 10 deletions(-) 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..a6bf20f 100644 --- a/app/views/z-september-transactional-journey/_includes/participant-search.html +++ b/app/views/z-september-transactional-journey/_includes/participant-search.html @@ -64,9 +64,7 @@

-
-

Error states

@@ -102,14 +100,12 @@

- +

Find participants in Test batch 1

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

- \ No newline at end of file + \ No newline at end of file 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..b7304d3 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/z-september-transactional-journey/search-and-results.html @@ -17,7 +17,10 @@
-

4 participants found

+

+ Search results +

+

4 participants found

@@ -97,12 +100,12 @@

4 participants found

- + From 73359a1a9b9a8efee60cfb1dfab2b09188d9983b Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 25 Jun 2026 16:07:40 +0100 Subject: [PATCH 2/4] Tweaks to group views --- .../sass/components/_participant-table.scss | 18 ++++++------- .../group.html | 25 ++++++++++++++++--- 2 files changed, 28 insertions(+), 15 deletions(-) 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/z-september-transactional-journey/group.html b/app/views/z-september-transactional-journey/group.html index 616429e..fa7222e 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({ @@ -25,12 +25,24 @@ {% set html %}

- Participant removed from group + Billie Joanne Marquardt removed from group

Undo {% endset %} {{ notificationBanner({ - html: html + html: html, + titleText: "Participant removed" + }) }} + + {% set html %} +

+ Billie Joanne Marquardt returned to group +

+ {% endset %} + {{ notificationBanner({ + html: html, + titleText: "Participant reinstated", + type: "success" }) }}
@@ -71,7 +83,12 @@

Test clinic group

 - + From 73f83c25a1cfc39d77e2f5820878925e9836e308 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Thu, 25 Jun 2026 16:37:24 +0100 Subject: [PATCH 3/4] Error around a table --- .../_includes/participant-search.html | 6 ++++++ .../search-and-results.html | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) 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 a6bf20f..344f053 100644 --- a/app/views/z-september-transactional-journey/_includes/participant-search.html +++ b/app/views/z-september-transactional-journey/_includes/participant-search.html @@ -83,6 +83,9 @@

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

+

+ Select one or more participants +

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 b7304d3..53478a1 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/z-september-transactional-journey/search-and-results.html @@ -20,9 +20,16 @@

Search results

+ +
+

4 participants found

-
999 054 3666Billie Joanne Marquardt + Billie Joanne Marquardt + + Just added + + 15 March 1960 Remove
+ + Error: Select one or more participants + + +
@@ -93,6 +100,8 @@

4 participants found

+
+ Add selected to Test clinic group From c403f4c18037758e1f8798902e913e3284e2bb63 Mon Sep 17 00:00:00 2001 From: Mat Johnson Date: Fri, 26 Jun 2026 12:23:51 +0100 Subject: [PATCH 4/4] Tweaks and more tweaks. Revisited confirmation page --- .../_includes/participant-search.html | 78 ++++----- .../batch-detail.html | 2 +- .../group.html | 9 +- .../pre-appoint-confirm.html | 137 ++++------------ .../search-and-results.html | 11 +- .../z-pre-appoint-confirm-v1.html | 151 ++++++++++++++++++ 6 files changed, 234 insertions(+), 154 deletions(-) create mode 100644 app/views/z-september-transactional-journey/z-pre-appoint-confirm-v1.html 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 344f053..32a92eb 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
@@ -66,51 +66,51 @@

-
-
-
-
-

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

-

- Select one or more participants -

- -
+
+
+
+
+

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

+

+ Select one or more participants +

+
+
- +

- Find participants in Test batch 1 + Find participants

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

- \ No newline at end of file + \ No newline at end of file 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 fa7222e..0a0d8f2 100644 --- a/app/views/z-september-transactional-journey/group.html +++ b/app/views/z-september-transactional-journey/group.html @@ -220,7 +220,12 @@

Test clinic group

631 776 9904 - Nora Blake + + Nora Blake + + 30 December 1966 Remove @@ -228,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..5f16178 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -8,57 +8,14 @@ {% 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 - - -

- or - cancel and go back -

+
+

+ 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

+ + + Book + + +
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 53478a1..8fc6d47 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/z-september-transactional-journey/search-and-results.html @@ -13,7 +13,7 @@ {% include "z-september-transactional-journey/_includes/participant-search.html"%} -
+
@@ -103,20 +103,21 @@

4 participants found

- Add selected to Test clinic group + Add selected to booking group
+ +

No participants found

-

Check your spelling or search again

+

Try again

- -
+ {% endblock %} diff --git a/app/views/z-september-transactional-journey/z-pre-appoint-confirm-v1.html b/app/views/z-september-transactional-journey/z-pre-appoint-confirm-v1.html new file mode 100644 index 0000000..65c2da1 --- /dev/null +++ b/app/views/z-september-transactional-journey/z-pre-appoint-confirm-v1.html @@ -0,0 +1,151 @@ +{% extends 'layout.html' %} + +{% set pageName = "Assign slots to participants" %} + +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation() }} +{% endblock %} + +{% block beforeContent %} +{% 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 + + +

+ or + cancel and go back +

+
+
+ +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %}