diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..f6027fe --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "css.styleSheets": ["public/assets/sass/main.css"] +} \ No newline at end of file diff --git a/app/assets/sass/components/_day-listing.scss b/app/assets/sass/components/_day-listing.scss index d5f1121..66d8a22 100644 --- a/app/assets/sass/components/_day-listing.scss +++ b/app/assets/sass/components/_day-listing.scss @@ -1,34 +1,34 @@ - .app-slot-listing { - border: 1px solid #aeb7bd; - background-color: #fff; - padding: 10px; - margin-bottom: 10px; - &.--hold { - background-color: #f0f4f5; - border-style: dashed; - } - &.--merged-start { - border-bottom: 1px dashed #aeb7bd; - margin-bottom: 0 !important; - } - &.--merged-mid { - border-top: 0; - border-bottom: 1px dashed #aeb7bd; - margin-bottom: 0 !important; - min-height: 16px; - } - &.--merged-end { - border-top: 0; - min-height: 16px; - } - } +.app-slot-listing { + border: 1px solid #aeb7bd; + background-color: #fff; + padding: 10px; + margin-bottom: 10px; + &.--hold { + background-color: #f0f4f5; + border-style: dashed; + } + &.--merged-start { + border-bottom: 1px dashed #aeb7bd; + margin-bottom: 0 !important; + } + &.--merged-mid { + border-top: 0; + border-bottom: 1px dashed #aeb7bd; + margin-bottom: 0 !important; + min-height: 16px; + } + &.--merged-end { + border-top: 0; + min-height: 16px; + } +} - .app-slot-row { - display: flex; - flex-wrap: nowrap; - gap: 3rem; - align-items: top; - } - .app-slot-row-controls { - margin-left: auto; - } \ No newline at end of file +.app-slot-row { + display: flex; + flex-wrap: nowrap; + gap: 3rem; + align-items: top; +} +.app-slot-row-controls { + margin-left: auto; +} \ No newline at end of file diff --git a/app/assets/sass/components/_inline-detailed-search.scss b/app/assets/sass/components/_inline-detailed-search.scss new file mode 100644 index 0000000..e7d8b16 --- /dev/null +++ b/app/assets/sass/components/_inline-detailed-search.scss @@ -0,0 +1,31 @@ +.app-inline-detailed-search { + display: flex; + gap: 1rem; + + & > .nhsuk-form-group { + margin-bottom: 0; + + &:nth-child(4) { + width: 210px; + flex-shrink: 0; + } + &:last-child { + align-self: flex-end; + } + } + + & .nhsuk-button { + margin-bottom: 4px; + } + + .nhsuk-date-input__item { + margin-right: 8px; + &:last-child { + margin-right: 0; + } + } + + ::placeholder { + color: #aeb7bd; + } +} \ No newline at end of file diff --git a/app/assets/sass/components/_participant-table.scss b/app/assets/sass/components/_participant-table.scss new file mode 100644 index 0000000..1cb1606 --- /dev/null +++ b/app/assets/sass/components/_participant-table.scss @@ -0,0 +1,17 @@ +.app-participant-table { + + tbody tr:nth-child(odd) { + background-color: rgba(255,255,255,0.5); + } + + td:first-child { + padding-left: 12px; + } + + &.nhsuk-checkboxes--small { + .nhsuk-checkboxes__item { + margin-top: -8px; + } + } + +} \ No newline at end of file diff --git a/app/assets/sass/main.scss b/app/assets/sass/main.scss index 8d1a3a8..54712b2 100755 --- a/app/assets/sass/main.scss +++ b/app/assets/sass/main.scss @@ -7,14 +7,16 @@ @forward "components/calendar-table"; @forward "components/day-listing"; +@forward "components/inline-detailed-search"; @forward "components/secondary-navigation"; +@forward "components/participant-table"; //@forward "components/participant-search"; // Add your custom CSS/Sass styles below. .app-card-editable { display: flex; justify-content: space-between; - align-items: last baseline; + align-items: baseline; } // Batch (for now) view bar charts and legends diff --git a/app/views/clinics/day-slot-view.html b/app/views/clinics/day-slot-view.html index bdad299..c607d7a 100644 --- a/app/views/clinics/day-slot-view.html +++ b/app/views/clinics/day-slot-view.html @@ -42,7 +42,7 @@

- Day view + Tuesday 1 September 2026

{% set secondaryNavItems = [] %} diff --git a/app/views/index.html b/app/views/index.html index 26b9b29..ac0a368 100755 --- a/app/views/index.html +++ b/app/views/index.html @@ -101,7 +101,13 @@

Iteration 1: transactional journey

Batch detail
  • - Search participants + Search participants +
    • +
  • + Search results +
    • +
  • + Group
  • Pre-appointment confirmation diff --git a/app/views/z-september-transactional-journey/_includes/participant-search.html b/app/views/z-september-transactional-journey/_includes/participant-search.html new file mode 100644 index 0000000..ac89e4b --- /dev/null +++ b/app/views/z-september-transactional-journey/_includes/participant-search.html @@ -0,0 +1,64 @@ +
    +
    +

    + Find participants +

    + Use one or more fields +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    + + Date of birth + +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    +
    +
    \ 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 e45f073..a21cc91 100644 --- a/app/views/z-september-transactional-journey/appointing-complete.html +++ b/app/views/z-september-transactional-journey/appointing-complete.html @@ -16,7 +16,7 @@
    {% set html %}

    - All participants appointed successfully + 23 participants booked successfully

    {% endset %} {{ notificationBanner({ @@ -39,7 +39,7 @@

    - Day view + Tuesday 1 September 2026

    {{ actionLink({ diff --git a/app/views/z-september-transactional-journey/group.html b/app/views/z-september-transactional-journey/group.html index aa4f92f..47252fa 100644 --- a/app/views/z-september-transactional-journey/group.html +++ b/app/views/z-september-transactional-journey/group.html @@ -13,12 +13,90 @@
    -

    - Group -

    -

    - Next: pre-appoint -

    + {% set html %} +

    + Participant successfully added to group +

    + {% endset %} + {{ notificationBanner({ + html: html, + type: "success" + }) }} + + {% set html %} +

    + Participant successfully removed from group +

    + {% endset %} + {{ notificationBanner({ + html: html + }) }} +
    + +
    +
    +
    +
    +

    Test clinic group

    + 23 participants +
    + + Add more participants + +
    +
    +
    + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + NHS Number + + Name + + Date of birth + + Actions +
    628 334 7720Christine Thompson17 September 1967Remove
    628 334 7720Christine Thompson17 September 1967Remove
    628 334 7720Christine Thompson17 September 1967Remove
    628 334 7720Christine Thompson17 September 1967Remove
    + + + Book into slots +
    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 eb6492b..f65c2a6 100644 --- a/app/views/z-september-transactional-journey/pre-appoint-confirm.html +++ b/app/views/z-september-transactional-journey/pre-appoint-confirm.html @@ -1,6 +1,6 @@ {% extends 'layout.html' %} -{% set pageName = "Autoflow™ participants into slots" %} +{% set pageName = "Assign slots to participants" %} {% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} {% block header %} @@ -8,10 +8,6 @@ {% endblock %} {% block beforeContent %} - {{ backLink({ - href: "#", - text: "Back" - }) }} {% endblock %} {% block content %} @@ -62,7 +58,7 @@ } - +

    - Autoflow™ participants into slots + Book participants into slots

    -

    You’re about to automatically book:

    @@ -101,9 +96,9 @@

    - XX participants + 23 participants
    -
    +
    from NAME group
    @@ -116,10 +111,11 @@

    - XX slots + 48 available slots
    -
    - in CLINIC NAME on 1 September 2026 +
    + in CLINIC NAME
    + Tuesday 1 September 2026
    Unit name at location name @@ -136,7 +132,7 @@

    - Confirm and proceed + Confirm

    or @@ -144,19 +140,6 @@

    - - {% endblock %} 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 4bb175b..6717484 100644 --- a/app/views/z-september-transactional-journey/search-and-results.html +++ b/app/views/z-september-transactional-journey/search-and-results.html @@ -11,17 +11,97 @@ {% block content %} + {% include "z-september-transactional-journey/_includes/participant-search.html"%} +
    -

    - Search and results -

    -

    - Next: Group -

    +

    [X] participants found

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    + NHS Number + + Name + + Date of birth +
    +
    + + +
    +     		628 334 7720Christine Thompson17 September 1967
    +
    + + +
    +     		628 334 7720Christine Thompson17 September 1967
    +
    + + +
    +     		628 334 7720Christine Thompson17 September 1967
    +
    + + +
    +     		628 334 7720Christine Thompson17 September 1967
    + + + Add selected to group + +
    + + {% endblock %} {% block footer %} diff --git a/app/views/z-september-transactional-journey/search.html b/app/views/z-september-transactional-journey/search.html index 52d3dc8..4a502c9 100644 --- a/app/views/z-september-transactional-journey/search.html +++ b/app/views/z-september-transactional-journey/search.html @@ -10,18 +10,9 @@ {% block beforeContent %}{% endblock %} {% block content %} - -
    -
    -

    - Search page -

    -

    - Next: search and results -

    -
    -
    - +
    + {% include "z-september-transactional-journey/_includes/participant-search.html"%} +
    {% endblock %} {% block footer %} diff --git a/app/views/z-sketching/participant-search-alternatives.html b/app/views/z-sketching/participant-search-alternatives.html new file mode 100644 index 0000000..0b00d1f --- /dev/null +++ b/app/views/z-sketching/participant-search-alternatives.html @@ -0,0 +1,169 @@ +{% extends 'layout.html' %} + +{% set pageName = "" %} + +{% from "z-september-transactional-journey/_includes/min-primary-navigation.html" import primaryNavigation %} +{% block header %} + {{ primaryNavigation() }} +{% endblock %} + +{% block beforeContent %}{% endblock %} + +{% block content %} + + +
    +
    +

    + Search for participants +

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

    + Search for participants +

    +
    +
    + +
    +
    + +
    + + +
    + +
    + + + Search using personal details + + +
    + +
    + + +
    + +
    + + +
    + +
    +
    + + Date of birth + +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + +
    +
    +
    + +
    + + + Search + +
    +
    + + +{% endblock %} + +{% block footer %} + {{ footer() }} +{% endblock %}