Skip to content

Sketching out One Day #56

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

Draft
Demotive wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Sketching out One Day #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
53b41e4
Update clinic progress bars to progress elements with new css styling
Demotive Aug 12, 2026
2615133
a day, first punt
Demotive Aug 13, 2026
949d991
Match heights
Demotive Aug 13, 2026
bdbd2b8
Mellowing out a bit
Demotive Aug 13, 2026
6f8baf0
Work in progress elements and styles (a bit)
Demotive Aug 14, 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
34 changes: 0 additions & 34 deletions app/assets/sass/components/_day-listing.scss
View file
Open in desktop

This file was deleted.

53 changes: 37 additions & 16 deletions app/assets/sass/components/_participant-table.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,45 @@
// Import NHS.UK frontend library
@use "nhsuk-frontend/dist/nhsuk/core" as *;

.app-participant-table {

.nhsuk-table__body {
tr:nth-child(odd) {
background-color: rgba(224,228,230,.5);
}
tr:nth-child(even) {
background-color: transparent;
}
tbody td {
height: 116px;
}
tbody tr.--double td {
height: 232px;
background-image:
repeating-linear-gradient(to right, nhsuk-colour("grey-4"), nhsuk-colour("grey-4") 6px, transparent 6px, transparent 12px);
background-position: 0 116px;
background-size: 100% 1px;
background-repeat: repeat-x;
}
tbody tr.--triple td {
height: 348px;
background-image:
repeating-linear-gradient(to right, nhsuk-colour("grey-4"), nhsuk-colour("grey-4") 6px, transparent 6px, transparent 12px),
repeating-linear-gradient(to right, nhsuk-colour("grey-4"), nhsuk-colour("grey-4") 6px, transparent 6px, transparent 12px);
background-position: 0 116px, 0 232px;
background-size: 100% 1px;
background-repeat: repeat-x;
}

tbody tr:nth-child(odd) {
background-color: rgba(224,228,230,.5);
}
tbody tr:nth-child(even) {
background-color: transparent;
}
// tbody tr.app-container-available {
// background: nhsuk-colour("white");
// }
tbody tr.app-container-staff-break {
background: repeating-linear-gradient(130deg, nhsuk-colour("grey-4"), nhsuk-colour("grey-4") 1px, transparent 1px, transparent 12px);
}

th:first-child,
td:first-child {
//padding-left: 6px;
padding-left: 6px;
}

td:has( > .nhsuk-checkboxes__item) {
Expand All @@ -20,12 +48,5 @@
width: 62px;
}

.app-column-time {
width: 5rem;
}
.app-column-nhs-number {
text-align: right;
width: 10rem;
}
}

}
81 changes: 81 additions & 0 deletions app/assets/sass/components/_progress-bar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
@use "nhsuk-frontend/dist/nhsuk/core" as *;

:root {
--generic-chart-hatch: repeating-linear-gradient(130deg, #005eb8, #005eb8 1px, #ccdff1 1px, #ccdff1 12px);
--standard-chart-hatch: repeating-linear-gradient(130deg, #004c23, #004c23 1px, #cce5d8 1px, #cce5d8 12px);
--special-chart-hatch: repeating-linear-gradient(130deg, #4d3708, #4d3708 1px, #ffdc8e 1px, #ffdc8e 12px);
--ceased-chart-hatch: repeating-linear-gradient(130deg, #354550, #354550 1px, #dbe0e3 1px, #dbe0e3 12px);
--vhr-chart-hatch: repeating-linear-gradient(130deg, #6b140e, #6b140e 1px, #f7d4d1 1px, #f7d4d1 12px);

--vhr-chart-hatch-1: repeating-linear-gradient(-45deg, #6b140e, #6b140e 1px, transparent 1px, transparent 12px);
--vhr-chart-hatch-2: repeating-linear-gradient(45deg, #6b140e, #6b140e 1px, #f7d4d1 1px, #f7d4d1 12px);
}

.app-simple-progress-bar {
width: 100%;
min-width: nhsuk-px-to-rem(200px);
outline: 1px solid $nhsuk-input-border-colour;

&.--thin {
min-height: 19px;
}

&.--generic {
background: var(--generic-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}

&.--standard {
background: var(--standard-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
&.--special {
background: var(--special-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
&.--ceased {
background: var(--ceased-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
&.--vhr {
background: var(--vhr-chart-hatch-1) 0 0 / var(--percentage) 100% no-repeat, var(--vhr-chart-hatch-2) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
}


.app-progress-bar {
width: 100%;
min-width: nhsuk-px-to-rem(200px);
border: 1px solid $nhsuk-input-border-colour;;
background: #fff;
box-sizing: border-box;
appearance: none;
-webkit-appearance: none;
}
.app-progress-bar::-webkit-progress-bar {
background: #fff;
}
.app-progress-bar::-moz-progress-bar {
background: transparent;
}

.app-progress-bar.--generic::-webkit-progress-value,
.app-progress-bar.--generic::-moz-progress-bar {
background: var(--generic-chart-hatch);
}

.app-progress-bar.--standard::-webkit-progress-value,
.app-progress-bar.--standard::-moz-progress-bar {
background: var(--standard-chart-hatch);
}

.app-progress-bar.--special::-webkit-progress-value,
.app-progress-bar.--special::-moz-progress-bar {
background: var(--special-chart-hatch);
}

.app-progress-bar.--ceased::-webkit-progress-value,
.app-progress-bar.--ceased::-moz-progress-bar {
background: var(--ceased-chart-hatch);
}

.app-progress-bar.--vhr::-webkit-progress-value,
.app-progress-bar.--vhr::-moz-progress-bar {
background: var(--vhr-chart-hatch);
}
38 changes: 1 addition & 37 deletions app/assets/sass/main.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
// https://github.com/NHSDigital/manage-breast-screening-prototype

@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";
@forward "components/progress-bar";
@forward "components/workflow";

//{% set containerClasses = "nhsuk-width-container-fluid" %}
Expand All @@ -30,15 +30,6 @@

// Batch (for now) view bar charts and legends

:root {
--generic-chart-hatch: repeating-linear-gradient(45deg, #005eb8, #005eb8 1px, #ccdff1 1px, #ccdff1 12px);
--standard-chart-hatch: repeating-linear-gradient(45deg, #004c23, #004c23 1px, #cce5d8 1px, #cce5d8 12px);
--special-chart-hatch: repeating-linear-gradient(-45deg, #4d3708, #4d3708 1px, #ffdc8e 1px, #ffdc8e 12px);
--ceased-chart-hatch: repeating-linear-gradient(90deg, #354550, #354550 1px, #dbe0e3 1px, #dbe0e3 12px);
--vhr-chart-hatch-1: repeating-linear-gradient(-45deg, #6b140e, #6b140e 1px, transparent 1px, transparent 12px);
--vhr-chart-hatch-2: repeating-linear-gradient(45deg, #6b140e, #6b140e 1px, #f7d4d1 1px, #f7d4d1 12px);
}

.hatching--standard {
background: var(--standard-chart-hatch)
}
Expand Down Expand Up @@ -124,30 +115,3 @@
align-items: center;
width: 100%;
}

.app-simple-progress-bar {
width: 100%;
min-width: 200px;
outline: 1px solid #aeb7bd;

&.--thin {
min-height: 19px;
}

&.--generic {
background: var(--generic-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}

&.--standard {
background: var(--standard-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
&.--special {
background: var(--special-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
&.--ceased {
background: var(--ceased-chart-hatch) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
&.--vhr {
background: var(--vhr-chart-hatch-1) 0 0 / var(--percentage) 100% no-repeat, var(--vhr-chart-hatch-2) 0 0 / var(--percentage) 100% no-repeat,#fff;
}
}
4 changes: 2 additions & 2 deletions app/views/_includes/clinics/clinic-listing-table.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
html: 'Alpha van<br><span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">HWO-mobile-1</span> '
},
{
html: '<div class="app-simple-progress-bar --generic --thin nhsuk-u-padding-1 nhsuk-u-margin-bottom-1" style="--percentage: 99%;"></div><span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">10 slots available of 1360</div>'
html: '<progress class="app-progress-bar --generic" value="99" max="100">99%</progress><span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">10 slots available of 1360</div>'
}
],
[
Expand All @@ -40,7 +40,7 @@
html: 'Home base<br><span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">HWO-static-1</span> '
},
{
html: '<div class="app-simple-progress-bar --generic --thin nhsuk-u-padding-1 nhsuk-u-margin-bottom-1" style="--percentage: 60%;"></div><span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">40 slots available of 100</div>'
html: '<progress class="app-progress-bar --generic" value="60" max="100">60%</progress><span class="nhsuk-u-font-size-16 nhsuk-u-secondary-text-colour">40 slots available of 100</div>'
}
]
]
Expand Down
38 changes: 34 additions & 4 deletions app/views/batches/batch-detail-in-progress.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,12 @@ <h3 class="nhsuk-heading-xs nhsuk-u-font-weight-normal">
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<h2 class="nhsuk-heading-l">Batch progress</h2>
<progress class="app-progress-bar --generic" value="97" max="100">
{{ tag({
text: "1306 of 1352 dealt with",
classes: "nhsuk-tag--blue"
}) }}
</progress>
<div class="app-simple-progress-bar --generic nhsuk-u-padding-2" style="--percentage: 97%;">
{{ tag({
text: "1306 of 1352 dealt with",
Expand All @@ -181,6 +187,12 @@ <h2 class="nhsuk-heading-s nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-2">Appoint
</div>
<div class="nhsuk-grid-row nhsuk-u-margin-bottom-3">
<div class="nhsuk-grid-column-two-thirds">
<progress class="app-progress-bar --standard" value="100" max="100">
{{ tag({
text: "1330 of 1330 appointed",
classes: "nhsuk-tag--green"
}) }}
</progress>
<div class="app-simple-progress-bar --standard nhsuk-u-padding-2" style="--percentage: 100%;">
{{ tag({
text: "1330 of 1330 appointed",
Expand All @@ -197,6 +209,12 @@ <h2 class="nhsuk-heading-s nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-2">Appoint
</div>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<progress class="app-progress-bar --special" value="50" max="100">
{{ tag({
text: "6 of 12 appointed",
classes: "nhsuk-tag--yellow"
}) }}
</progress>
<div class="app-simple-progress-bar --special nhsuk-u-padding-2" style="--percentage: 50%;">
{{ tag({
text: "6 of 12 appointed",
Expand All @@ -214,9 +232,15 @@ <h2 class="nhsuk-heading-s nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-2">Reconci
</div>
<div class="nhsuk-grid-row nhsuk-u-margin-bottom-3">
<div class="nhsuk-grid-column-two-thirds">
<div class="app-simple-progress-bar --ceased nhsuk-u-padding-2" style="--percentage: 0%;">
<progress class="app-progress-bar --ceased" value="40" max="100">
{{ tag({
text: "2 of 5 reconciled",
classes: "nhsuk-tag--grey"
}) }}
</progress>
<div class="app-simple-progress-bar --ceased nhsuk-u-padding-2" style="--percentage: 40%;">
{{ tag({
text: "0 of 5 reconciled",
text: "2 of 5 reconciled",
classes: "nhsuk-tag--grey"
}) }}
</div>
Expand All @@ -230,9 +254,15 @@ <h2 class="nhsuk-heading-s nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-2">Reconci
</div>
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-two-thirds">
<div class="app-simple-progress-bar --vhr nhsuk-u-padding-2" style="--percentage: 0%;">
<progress class="app-progress-bar --vhr" value="60" max="100">
{{ tag({
text: "3 of 5 reconciled",
classes: "nhsuk-tag--red"
}) }}
</progress>
<div class="app-simple-progress-bar --vhr nhsuk-u-padding-2" style="--percentage: 60%;">
{{ tag({
text: "0 of 5 reconciled",
text: "3 of 5 reconciled",
classes: "nhsuk-tag--red"
}) }}
</div>
Expand Down
Loading