-
Notifications
You must be signed in to change notification settings - Fork 4
Appointment status bar #783
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,6 +9,8 @@ | |
| @forward "components/secondary-navigation"; | ||
| @forward "components/special-appointment-banner"; | ||
|
|
||
| $color_app-dark-blue: #00386e; | ||
|
|
||
| h1 { | ||
| @extend %nhsuk-heading-l; | ||
| } | ||
|
|
@@ -80,3 +82,45 @@ a[href="#"] { | |
| } | ||
| } | ||
| } | ||
|
|
||
| .app-status-bar { | ||
| background-color: $color_app-dark-blue; | ||
| color: $color_nhsuk-white; | ||
| padding: nhsuk-spacing(2) 0; | ||
| border-bottom: 1px solid nhsuk-colour("grey-4"); | ||
| } | ||
|
|
||
| .app-status-bar a { | ||
| color: $color_nhsuk-white; | ||
| } | ||
| .app-status-bar a:hover, | ||
| .app-status-bar a:active { | ||
| color: $color_nhsuk-white; | ||
| } | ||
| .app-status-bar a:focus { | ||
| color: $color_nhsuk-black; | ||
| } | ||
|
|
||
| .app-status-bar__row { | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| gap: nhsuk-spacing(4); | ||
| align-items: center; | ||
| } | ||
|
|
||
| .app-status-bar__row + .app-status-bar__row { | ||
| margin-top: nhsuk-spacing(2); | ||
| padding-top: nhsuk-spacing(2); | ||
| border-top: 1px solid rgba($color_nhsuk-white, 0.2); | ||
| } | ||
|
|
||
| .app-status-bar__item { | ||
| display: flex; | ||
| gap: nhsuk-spacing(2); | ||
| align-items: center; | ||
| } | ||
|
|
||
| .app-status-bar__key { | ||
| @include nhsuk-typography-weight-bold(true); | ||
| opacity: 0.9; | ||
| } | ||
|
Comment on lines
+86
to
+126
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I imagine it might be good to put these in their own named file inside a folder like |
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| {% from 'nhsuk/components/tag/macro.jinja' import tag %} | ||
|
|
||
| {% macro appointment_status_bar(user, presented_status_bar) %} | ||
| {% if presented_status_bar and presented_status_bar.show_status_bar_for(user) %} | ||
| <div class="app-status-bar app-status-bar--rows-2"> | ||
| <div class="nhsuk-width-container"> | ||
| <div class="app-status-bar__row"> | ||
| <div class="app-status-bar__item"> | ||
| <span class="app-status-bar__key">Appointment:</span> | ||
| <span> | ||
| {{ presented_status_bar.clinic_slot.clinic_date_and_slot_time }} | ||
| {% if presented_status_bar.appointment.is_special_appointment %} | ||
| {{ tag(presented_status_bar.tag_properties) }} | ||
| {% endif %} | ||
| </span> | ||
|
Comment on lines
+9
to
+15
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I somewhat wonder if these and other items within the summary list should use a definition list. @colinrotherham any thoughts? |
||
| </div> | ||
| </div> | ||
| <div class="app-status-bar__row"> | ||
| <div class="app-status-bar__item"> | ||
| <strong>{{ presented_status_bar.participant.full_name }}</strong> | ||
| </div> | ||
| <div class="app-status-bar__item"> | ||
| <span class="app-status-bar__key" aria-label="Date of birth">DOB:</span> | ||
| <span>{{ presented_status_bar.participant.date_of_birth }} ({{ presented_status_bar.participant.age }})</span> | ||
| </div> | ||
| <div class="app-status-bar__item"> | ||
| <span class="app-status-bar__key">NHS:</span> | ||
| <span>{{ presented_status_bar.participant.nhs_number }}</span> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| {% endif %} | ||
| {% endmacro %} | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| {% from 'nhsuk/components/header/macro.jinja' import header %} | ||
| {% from "notification-banner/macro.jinja" import notificationBanner %} | ||
| {% from 'components/appointment-status-bar.jinja' import appointment_status_bar %} | ||
|
|
||
| {% set assetPath = STATIC_URL ~ "/assets" %} | ||
| {% extends "nhsuk/template.jinja" %} | ||
|
|
@@ -33,6 +34,10 @@ | |
| ] | ||
| } | ||
| }) }} | ||
|
|
||
| {{ | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Will having this in the header mean it's skipped by the skip link? This doesn't seem right to me for something that we want users to perceive for clinical safety reasons.
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Have asked about skip link in
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Here is a link to the slack conversation: https://screening-discovery.slack.com/archives/C082XV3GQVA/p1764595157468479?thread_ts=1764594205.836459&cid=C082XV3GQVA |
||
| appointment_status_bar(request.user, presented_appointment.status_bar) | ||
| }} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
|
|
@@ -71,4 +76,4 @@ | |
|
|
||
| {% block bodyEnd %} | ||
| <script type="module" src="{{ static('js/bundle.js' )}}"></script> | ||
| {% endblock %}} | ||
| {% endblock %} | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If you check the scss from the prototype, this was
background-color: nhsuk-shade($nhsuk-brand-colour, 40%);which is probably clearer for how we chose this number / where it came from.