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/_includes/participant-search.html b/app/views/z-september-transactional-journey/_includes/participant-search.html index 0ba1965..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
@@ -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? -

- -
+
+
+
+
+

+ 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

- Use one or more fields - Error: Use one or more fields 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 @@

diff --git a/app/views/z-september-transactional-journey/group.html b/app/views/z-september-transactional-journey/group.html index 616429e..0a0d8f2 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

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..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 a2dc512..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,13 +13,23 @@ {% include "z-september-transactional-journey/_includes/participant-search.html"%} -
+
-

4 participants found

+

+ Search results +

- +
+ +

4 participants found

+ + + Error: Select one or more participants + + +
@@ -90,21 +100,24 @@

4 participants found

+
+ - Add selected to Test clinic group + Add selected to booking group
+ - - - +
+ {% 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 %}