[DTOSS-10296] split participant details into multiple sections #250
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,3 +21,5 @@ manage_breast_screening/static | |
| # Files that aren't checked in | ||
| .pytest_cache | ||
| .terraform | ||
| htmlcov/ | ||
| .mypy_cache/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -20,10 +20,6 @@ h3 { | |
| @extend %nhsuk-heading-s; | ||
| } | ||
|
|
||
| [hidden] { | ||
| display: none; | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| {% from "card/macro.jinja" import card %} | ||
| {% from "tag/macro.jinja" import tag %} | ||
|
|
||
| {% macro appointment_table(presented_appointments, testid) %} | ||
| <table class="nhsuk-table" data-testid="{{ testid }}"> | ||
| <thead> | ||
| <tr> | ||
| <th>Date</th> | ||
| <th>Type</th> | ||
| <th>Location</th> | ||
| <th>Status</th> | ||
| <th>Details</th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for presented_appointment in presented_appointments %} | ||
| <tr data-testid="appointment-row"> | ||
| <td>{{ presented_appointment.starts_at }}</td> | ||
| <td>{{ presented_appointment.clinic_type }}</td> | ||
| <td>{{ presented_appointment.setting_name }}</td> | ||
| <td> | ||
| {{ tag({ | ||
| "text": presented_appointment.status.text, | ||
| "classes": presented_appointment.status.classes | ||
| }) }} | ||
| </td> | ||
| <td> | ||
| <a href="{{ presented_appointment.url }}"> | ||
| View details | ||
| </a> | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
| {% endmacro %} | ||
|
|
||
| {% macro appointments(presented_appointments) %} | ||
| {% call card({ | ||
| "heading": "Appointments", | ||
| "headingLevel": "2" | ||
| }) %} | ||
| {% if presented_appointments.upcoming %} | ||
| <h3>Upcoming</h3> | ||
| {{ appointment_table(presented_appointments.upcoming, testid="upcoming-appointments-table") }} | ||
| {% endif %} | ||
|
|
||
| {% if presented_appointments.past %} | ||
| <h3>Previous</h3> | ||
| {{ appointment_table(presented_appointments.past, testid="past-appointments-table") }} | ||
| {% endif %} | ||
|
|
||
| {% if not presented_appointments.past and not presented_appointments.upcoming %} | ||
| <p>No screening history found</p> | ||
| {% endif %} | ||
| {% endcall %} | ||
| {% endmacro %} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| {% from "card/macro.jinja" import card %} | ||
| {% from "summary-list/macro.jinja" import summaryList %} | ||
|
|
||
| {% macro contact_details(presented_participant) %} | ||
| {% set address_html %} | ||
| {% if presented_participant.address %} | ||
| {% for line in presented_participant.address.lines %} | ||
| {{ line }}{% if not loop.last %}<br>{% endif %} | ||
| {% endfor %} | ||
| {% if presented_participant.address.postcode %} | ||
| <br>{{ presented_participant.address.postcode }} | ||
| {% endif %} | ||
| {% endif %} | ||
| {% endset %} | ||
| {% call card({ | ||
| "heading": "Contact details" | ||
| }) %} | ||
| {{ summaryList({ | ||
| "rows": [ | ||
| { | ||
| "key": { | ||
| "text": "Address" | ||
| }, | ||
| "value": { | ||
| "html": address_html | ||
| } | ||
| }, | ||
|
Comment on lines
+20
to
+27
Contributor
There was a problem hiding this comment. The NHS summary list guidance wasn't updated with Showing missing information (GOV.UK) but what if the address is empty here?
Contributor
There was a problem hiding this comment. Same for phone and email I suppose
Contributor
Author
There was a problem hiding this comment. Think I'll park this one as well, we've got tickets to add the edit forms, so when that is done we will be linking to those. |
||
| { | ||
| "key": { | ||
| "text": "Phone" | ||
| }, | ||
| "value": { | ||
| "html": presented_participant.phone | ||
| } | ||
| }, | ||
| { | ||
| "key": { | ||
| "text": "Email" | ||
| }, | ||
| "value": { | ||
| "html": presented_participant.email | ||
| } | ||
| } | ||
| ] | ||
| }) }} | ||
| {% endcall %} | ||
| {% endmacro %} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.