Skip to content

Tweaks to september flow #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Demotive wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Tweaks to september flow #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ddaf51d
search and results but after a git add lol
Demotive Jun 25, 2026
73359a1
Tweaks to group views
Demotive Jun 25, 2026
73f83c2
Error around a table
Demotive Jun 25, 2026
c403f4c
Tweaks and more tweaks. Revisited confirmation page
Demotive Jun 26, 2026
64e0fc2
Move csv link
Demotive Jun 29, 2026
d2eb32f
Delete older page
Demotive Jun 29, 2026
55e03f4
What if the csv was trimmed down alreaady
Demotive Jun 29, 2026
3ce29fb
Promote the trimmed csv journey to first choice
Demotive Jun 29, 2026
9d99584
Shuffle the participant order in the first table
Demotive Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions app/assets/sass/components/_participant-table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
21 changes: 14 additions & 7 deletions app/views/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,27 @@ <h2 class="nhsuk-heading-m">March 2026</h2>
<hr>

<h3 class="nhsuk-heading-m">Work for September Test</h3>
<h4 class="nhsuk-heading-s">Iteration 1: transactional journey</h4>
<h4 class="nhsuk-heading-s">Iteration 1</h4>
<p>Users upload a csv containing the participants they wish to book into a prearranged single day clinic.</p>
<p>
<a href="/z-september-transactional-journey/upload-a-batch">Simple click through journey</a>
</p>
<ol>
<li>
<a href="/z-september-transactional-journey/upload-a-batch">Upload a batch</a>
</li>
<li>
<a href="/z-september-transactional-journey/batch-detail-trimmed-csv">Batch detail for trimmed csv</a>
</li>
<li>
<a href="/z-september-transactional-journey/pre-appoint-confirm">Pre-appointment confirmation</a>
</li>
<li>
<a href="/z-september-transactional-journey/appointing-complete">Single day of appointments</a>
</li>
</ol>
<p>Defunct work on finding and grouping participants. Components to be reused elsewhere.</p>
<ol>
<li>
<a href="/z-september-transactional-journey/batch-detail">Batch detail</a>
</li>
Expand All @@ -109,15 +122,9 @@ <h4 class="nhsuk-heading-s">Iteration 1: transactional journey</h4>
<li>
<a href="/z-september-transactional-journey/group">Group</a>
</li>
<li>
<a href="/z-september-transactional-journey/pre-appoint-confirm">Pre-appointment confirmation</a>
</li>
<li>
<a href="/z-september-transactional-journey/spinner">[Utility] "appointing" spinner</a>
</li>
<li>
<a href="/z-september-transactional-journey/appointing-complete">Single day of appointments</a>
</li>
</ol>

<hr>
Expand Down
76 changes: 39 additions & 37 deletions app/views/z-september-transactional-journey/_includes/participant-search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h1 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">
Find participants in Test batch 1
Find participants
</h1>
<span class="nhsuk-caption-m nhsuk-caption--bottom">Use one or more fields</span>
</div>
Expand Down Expand Up @@ -64,52 +64,54 @@ <h1 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">
</div>
</search>

<hr>

<h1><code style="color: red;">Error states</code></h1>

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<div class="nhsuk-error-summary" data-module="nhsuk-error-summary">
<div role="alert">
<h2 class="nhsuk-error-summary__title">
There is a problem
</h2>
<div class="nhsuk-error-summary__body">
<p>
Is an empty submission an error or a "no results" return?
</p>
<p>
Bad formatting on NHS number. Non-numeric entry on NHS number. Anything else?
</p>
<p>
Missing date element (day, month or year). Non-numeric entry on dates. DOB mnust be in the past. Anything else?
</p>
<ul class="nhsuk-list nhsuk-error-summary__list">
<li>
<a href="#empty-search-error">Empty error</a>
</li>
<li>
<a href="#nhs-number-error">NHS number error</a>
</li>
<li>
<a href="#dob-error">Date of birth error</a>
</li>
</ul>
</div>
<!--
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<div class="nhsuk-error-summary" data-module="nhsuk-error-summary">
<div role="alert">
<h2 class="nhsuk-error-summary__title">
There is a problem
</h2>
<div class="nhsuk-error-summary__body">
<p>
Is an empty submission an error or a "no results" return?
</p>
<p>
Bad formatting on NHS number. Non-numeric entry on NHS number. Anything else?
</p>
<p>
Missing date element (day, month or year). Non-numeric entry on dates. DOB mnust be in the past. Anything else?
</p>
<p>
Select one or more participants
</p>
<ul class="nhsuk-list nhsuk-error-summary__list">
<li>
<a href="#empty-search-error">Empty error</a>
</li>
<li>
<a href="#nhs-number-error">NHS number error</a>
</li>
<li>
<a href="#dob-error">Date of birth error</a>
</li>
<li>
<a href="#search-results">Unselected error</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>

<search>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h1 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">
Find participants in Test batch 1
Find participants
</h1>
<span class="nhsuk-caption-m nhsuk-caption--bottom">Use one or more fields</span>
<!-- replaces the hint text on error -->
<span class="nhsuk-caption-m nhsuk-caption--bottom nhsuk-error-message" id="empty-search-error">
<span class="nhsuk-u-visually-hidden">Error:</span> Use one or more fields
</span>
Expand Down Expand Up @@ -176,4 +178,4 @@ <h1 class="nhsuk-heading-m nhsuk-u-margin-bottom-2">
</button>
</div>
</div>
</search>
</search> -->
34 changes: 17 additions & 17 deletions app/views/z-september-transactional-journey/appointing-complete.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,30 +23,30 @@
html: html,
type: "success"
}) }}
<h1 class="nhsuk-heading-m nhsuk-u-margin-bottom-1">
<span class="nhsuk-caption-m">CLINC-ID</span>
Test Clinic 1
</h1>
<div class="nhsuk-caption-m">
Unit name at location name
<div class="nhsuk-u-reading-width">
<h1 class="nhsuk-heading-m nhsuk-u-margin-bottom-1">
<span class="nhsuk-caption-m">CLINC-ID</span>
Test Clinic 1
</h1>
<div class="nhsuk-caption-m nhsuk-u-margin-bottom-3">
Unit name at location name
</div>
{{ actionLink({
text: "Download .csv",
href: "#"
}) }}
</div>
</div>
</div>

<hr class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-4">
<hr class="nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4">

<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<div class="app-card-editable">
<h2 class="nhsuk-heading-l">
<span class="nhsuk-caption-l">Tuesday</span>
1 September 2026
</h2>
{{ actionLink({
text: "Download .csv",
href: "#"
}) }}
</div>
<h2 class="nhsuk-heading-l">
<span class="nhsuk-caption-l">Tuesday</span>
1 September 2026
</h2>
</div>
</div>

Expand Down
Loading