Skip to content

Commit 53527c4

Browse files
Clean up index links and some other paths (#133)
1 parent 796e98c commit 53527c4

File tree

4 files changed

+66
-28
lines changed

4 files changed

+66
-28
lines changed

app/data/test-scenarios.js

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,33 @@ module.exports = [
3131
},
3232
scheduling: {
3333
whenRelativeToToday: 0,
34-
status: 'event_scheduled',
34+
status: 'event_checked_in',
3535
approximateTime: '10:30',
3636
},
3737
},
3838
},
3939
},
40+
{
41+
participant: {
42+
id: 'v0jt1us8',
43+
demographicInformation: {
44+
firstName: 'Angelina',
45+
middleName: null,
46+
lastName: 'Renner',
47+
ethnicGroup: null,
48+
ethnicBackground: null,
49+
},
50+
config: {
51+
eventId: '1fefyh1q',
52+
defaultRiskLevel: 'routine',
53+
scheduling: {
54+
whenRelativeToToday: 0,
55+
status: 'event_complete',
56+
approximateTime: '9:45',
57+
},
58+
},
59+
},
60+
},
4061
{
4162
participant: {
4263
id: 'aab45c3d',

app/views/events/images-completed-mammography.html

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919

2020
{% include "event-header.njk" %}
2121

22+
{% set activeTab = 'images' %}
23+
24+
{% include "event-navigation.njk" %}
2225

2326
{% include "fake-images.njk" %}
2427

app/views/events/images.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
{% set isCompleted = event | isCompleted %}
44

55
{% if isCompleted %}
6-
{% include "events/images-completed.html" %}
6+
{% include "events/images-completed-mammography.html" %}
77
{% else %}
88
{% set showWorkflowNav = true %}
99
{% set isAwaitingImages = event.workflowStatus['awaiting-images'] != 'completed' %}

app/views/index.html

Lines changed: 40 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,38 @@ <h1>
2020
href: "/dashboard"
2121
}) }}
2222

23-
<h2>Screening appointment</h2>
24-
{% set exampleParticipant = "/clinics/wtrl7jud/events/5gpn41oi" %}
23+
<h2>Active screening appointment</h2>
24+
25+
{% set eventId = "5gpn41oi" %}
26+
27+
{% set makeActiveAppointment -%}?event[workflowStatus][appointment]=started{%- endset %}
28+
29+
{% set exampleParticipant = "/clinics/wtrl7jud/events/" + eventId %}
30+
2531
<ul>
2632
<li>
27-
<a href="{{ exampleParticipant }}">Initial appointment</a>
28-
</li>
29-
<li>
30-
<a href="{{ exampleParticipant }}/appointment">Alternative appointment start</a>
31-
</li>
32-
<li>
33-
<a href="{{ exampleParticipant }}/special-appointment/edit">Manage special appointment</a>
34-
</li>
35-
<li>
36-
<a href="{{ exampleParticipant }}/personal-details/ethnicity">Ethnicity</a>
37-
</li>
38-
<li>
39-
<a href="{{ exampleParticipant }}/previous-mammograms/add">Add details of a previous mammogram</a>
40-
</li>
41-
<li>
42-
<a href="{{ exampleParticipant }}/attended-not-screened-reason">Appointment cannot go ahead</a>
43-
</li>
44-
<li>
45-
<a href="{{ exampleParticipant }}/medical-information">Medical information</a>
33+
<a href="{{ exampleParticipant }}/identity">Participant</a>
34+
<ul>
35+
<li>
36+
<a href="{{ exampleParticipant }}/special-appointment/edit">Manage special appointment</a>
37+
</li>
38+
<li>
39+
<a href="{{ exampleParticipant }}/personal-details/ethnicity">Ethnicity</a>
40+
</li>
41+
</ul>
4642
</li>
4743
<li>
48-
<a href="{{ exampleParticipant }}/record-medical-information">Record medical information</a>
44+
<a href="{{ exampleParticipant }}/record-medical-information">Review medical information</a>
4945
<ul>
5046
<li>
51-
<a href="{{ exampleParticipant }}/medical-information/record-breast-features">Record breast features</a>
47+
<a href="{{ exampleParticipant }}/previous-mammograms/add">Add details of a previous mammogram</a>
5248
</li>
5349
<li>
5450
<a href="{{ exampleParticipant }}/medical-information/symptoms/add?referrerChain={{ exampleParticipant }}/record-medical-information">Add a symptom</a>
5551
</li>
52+
<li>
53+
<a href="{{ exampleParticipant }}/medical-information/record-breast-features">Record breast features</a>
54+
</li>
5655
<li>
5756
<a href="{{ exampleParticipant }}/medical-information/hormone-replacement-therapy?referrerChain={{ exampleParticipant }}/record-medical-information">Hormone replacement therapy</a>
5857
</li>
@@ -62,13 +61,28 @@ <h2>Screening appointment</h2>
6261
</ul>
6362
</li>
6463
<li>
65-
<a href="{{ exampleParticipant }}/awaiting-images">Awaiting images</a>
64+
<a href="{{ exampleParticipant }}/images">Images</a>
6665
</li>
6766
<li>
68-
<a href="{{ exampleParticipant }}/imaging">Imaging</a>
67+
<a href="{{ exampleParticipant }}/review">Review</a>
68+
</li>
69+
</ul>
70+
71+
<h2>Completed screening appointment</h2>
72+
73+
{% set eventId = "1fefyh1q" %}
74+
75+
{% set exampleParticipant = "/clinics/wtrl7jud/events/" + eventId %}
76+
77+
<ul>
78+
<li>
79+
<a href="{{ exampleParticipant }}">Main appointment page</a>
80+
</li>
81+
<li>
82+
<a href="{{ exampleParticipant }}/medical-information">Medical information</a>
6983
</li>
7084
<li>
71-
<a href="{{ exampleParticipant }}/confirm">Confirm</a>
85+
<a href="{{ exampleParticipant }}/images">Images</a>
7286
</li>
7387
</ul>
7488

0 commit comments

Comments
 (0)