Skip to content

Commit fc004af

Browse files
johnrimmer2frankieroberto
johnrimmer2
and
frankieroberto
authored
90-day-inactivity (#347)
This work includes: - a change to the /patient-details when in excess of 10 vaccination records, to add pagination - changes to the /user-admin section to update the designs in order to help the lead administrators in RAVS manage their users as needed, specifically identifying which users have been time-out sue to 90 days of not having logged in and how/if they may need to reactivate them --------- Co-authored-by: Frankie Roberto <[email protected]> Co-authored-by: Frankie Roberto <[email protected]>
1 parent 728be5c commit fc004af

17 files changed

+1613
-132
lines changed

‎app/views/_notification-90-days.html‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
2+
{% block head %}
3+
<script src="/js/feedback-panel.js"></script>
4+
{% endblock %}
5+
6+
{% from 'checkboxes/macro.njk' import checkboxes %}
7+
<div class="app-feedback-panel" data-module="feedback-panel">
8+
<div data-module="feedback-panel__initial-question">
9+
<h2 class="app-feedback-panel__title">It's now easier to manage users</h2>
10+
11+
12+
<fieldset class="nhsuk-fieldset">
13+
<legend class="nhsuk-fieldset__legend nhsuk-u-margin-bottom-4">Users deactivated due to 90 dyas of not logging in can now be reactivated all together.</legend>
14+
15+
<div class="app-button-group nhsuk-u-margin-bottom-0">
16+
17+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Manage users</a>
18+
19+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Close</a>
20+
21+
22+
</div>
23+
</fieldset>
24+
</div>
25+
26+
<div class="app-feedback-panel__comments" data-module="feedback-panel__comments" hidden>
27+
28+
<h2 class="app-feedback-panel__title">Thank you.</h2>
29+
{{ textarea({
30+
name: "example",
31+
id: "example",
32+
rows: 3,
33+
label: {
34+
text: "Feedback (optional)"
35+
}
36+
}) }}
37+
38+
{{ checkboxes({
39+
items: [
40+
{
41+
value: "contactable",
42+
text: "I’m happy to be contacted about my feedback"
43+
}
44+
]
45+
})}}
46+
47+
48+
<div class="app-button-group nhsuk-u-margin-bottom-0">
49+
{{ button({
50+
text: "Send feedback",
51+
classes: "nhsuk-button--secondary app-button--small"
52+
}) }}
53+
54+
55+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Close</a>
56+
</div>
57+
58+
</div>
59+
</div>

‎app/views/_notification-user-admin.html‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
2+
{% block head %}
3+
<script src="/js/feedback-panel.js"></script>
4+
{% endblock %}
5+
6+
{% from 'checkboxes/macro.njk' import checkboxes %}
7+
<div class="app-feedback-panel" data-module="feedback-panel">
8+
<div data-module="feedback-panel__initial-question">
9+
<h2 class="app-feedback-panel__title">Action may be needed</h2>
10+
11+
12+
<fieldset class="nhsuk-fieldset">
13+
<legend class="nhsuk-fieldset__legend nhsuk-u-margin-bottom-4">You have 101 deactivated users. If these users still need access, you can reactivate them at any time.</legend>
14+
15+
<div class="app-button-group nhsuk-u-margin-bottom-0">
16+
17+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Close</a>
18+
19+
20+
</div>
21+
</fieldset>
22+
</div>
23+
24+
<div class="app-feedback-panel__comments" data-module="feedback-panel__comments" hidden>
25+
26+
<h2 class="app-feedback-panel__title">Thank you.</h2>
27+
{{ textarea({
28+
name: "example",
29+
id: "example",
30+
rows: 3,
31+
label: {
32+
text: "Feedback (optional)"
33+
}
34+
}) }}
35+
36+
{{ checkboxes({
37+
items: [
38+
{
39+
value: "contactable",
40+
text: "I’m happy to be contacted about my feedback"
41+
}
42+
]
43+
})}}
44+
45+
46+
<div class="app-button-group nhsuk-u-margin-bottom-0">
47+
{{ button({
48+
text: "Send feedback",
49+
classes: "app-button--outlined app-button--small"
50+
}) }}
51+
52+
53+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Close</a>
54+
</div>
55+
56+
</div>
57+
</div>

app/views/_test.html renamed to app/views/_notification.html

File renamed without changes.

‎app/views/_report-notification.html‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
2+
{% block head %}
3+
<script src="/js/feedback-panel.js"></script>
4+
{% endblock %}
5+
6+
{% from 'checkboxes/macro.njk' import checkboxes %}
7+
<div class="app-feedback-panel" data-module="feedback-panel">
8+
<div data-module="feedback-panel__initial-question">
9+
<h2 class="app-feedback-panel__title">Extra column in reports</h2>
10+
11+
12+
<fieldset class="nhsuk-fieldset">
13+
<legend class="nhsuk-fieldset__legend nhsuk-u-margin-bottom-4">We've separated the patient's first and last names in the reports.</legend>
14+
15+
16+
<div class="app-button-group nhsuk-u-margin-bottom-0">
17+
18+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Close</a>
19+
20+
21+
</div>
22+
</fieldset>
23+
</div>
24+
25+
<div class="app-feedback-panel__comments" data-module="feedback-panel__comments" hidden>
26+
27+
<h2 class="app-feedback-panel__title">Thank you.</h2>
28+
{{ textarea({
29+
name: "example",
30+
id: "example",
31+
rows: 3,
32+
label: {
33+
text: "Feedback (optional)"
34+
}
35+
}) }}
36+
37+
{{ checkboxes({
38+
items: [
39+
{
40+
value: "contactable",
41+
text: "I’m happy to be contacted about my feedback"
42+
}
43+
]
44+
})}}
45+
46+
47+
<div class="app-button-group nhsuk-u-margin-bottom-0">
48+
{{ button({
49+
text: "Send feedback",
50+
classes: "app-button--outlined app-button--small"
51+
}) }}
52+
53+
54+
<a href="#" class="nhsuk-link nhsuk-link--no-visited-state" data-module="feedback-panel__close">Close</a>
55+
</div>
56+
57+
</div>
58+
</div>

‎app/views/alerts/notification-90-days.html‎

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
{% extends 'layout.html' %}
2+
3+
{% block pageTitle %}
4+
{{ currentOrganisation.name }} – Home
5+
{% endblock %}
6+
7+
{% set currentSection = "home" %}
8+
9+
10+
11+
12+
{% block content %}
13+
14+
15+
<div class="nhsuk-grid-row">
16+
<div class="nhsuk-grid-column-two-thirds">
17+
18+
{% include "_notification-90-days.html" %}
19+
20+
21+
22+
<h1 class="nhsuk-heading-l nhsuk-u-margin-bottom-6">{{ currentOrganisation.name }}</h1>
23+
24+
<p>You have not yet recorded a vaccination.</p>
25+
26+
<p class="nhsuk-body"><a href="/vaccines/choose-site">Add vaccines</a></p>
27+
28+
<p class="nhsuk-body"><a href="/user-admin/add-user">Add users</a></p>
29+
30+
<p class="nhsuk-body"><a href="/record-vaccinations">Record vaccinations</a></p>
31+
32+
<p>Find help and guidance at <a href="/reports">guide.ravs.england.nhs.uk</a></p>
33+
34+
35+
36+
<h2 class="nhsuk-heading-m">Total vaccinations</h2>
37+
38+
</div>
39+
</div>
40+
41+
42+
<ul class="nhsuk-grid-row nhsuk-card-group">
43+
44+
<li class="nhsuk-grid-column-one-quarter nhsuk-card-group__item">
45+
{% set cardHtml %}
46+
<p class="nhsuk-heading-xl nhsuk-u-font-size-64 nhsuk-u-margin-bottom-1">0</p>
47+
Today
48+
{% endset %}
49+
50+
{{ card({
51+
headingHtml: cardHtml
52+
}) }}
53+
</li>
54+
55+
<li class="nhsuk-grid-column-one-quarter nhsuk-card-group__item">
56+
{% set cardHtml %}
57+
<p class="nhsuk-heading-xl nhsuk-u-font-size-64 nhsuk-u-margin-bottom-1">0</p>
58+
Past 7 days
59+
{% endset %}
60+
61+
{{ card({
62+
headingHtml: cardHtml
63+
}) }}
64+
</li>
65+
66+
67+
<li class="nhsuk-grid-column-one-quarter nhsuk-card-group__item">
68+
{% set cardHtml %}
69+
<p class="nhsuk-heading-xl nhsuk-u-font-size-64 nhsuk-u-margin-bottom-1">0</p>
70+
November so far
71+
{% endset %}
72+
73+
{{ card({
74+
headingHtml: cardHtml
75+
}) }}
76+
</li>
77+
78+
</ul>
79+
80+
81+
</div>
82+
</div>
83+
{% endblock %}

‎app/views/alerts/notification.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="nhsuk-grid-row">
1616
<div class="nhsuk-grid-column-two-thirds">
1717

18-
{% include "_test.html" %}
18+
{% include "_notification.html" %}
1919

2020
<h1 class="nhsuk-heading-xl">{{ pageName }}</h1>
2121

‎app/views/appointments/add.html‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<div class="nhsuk-form-group">
2020

21-
21+
2222
</div>
2323

2424

@@ -27,10 +27,10 @@
2727
<fieldset class="nhsuk-fieldset" aria-describedby="contact-hint">
2828
<legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
2929
<h1 class="nhsuk-fieldset__heading">
30-
Select the date for your booked appointments
30+
Which date are your booked appointments?
3131
</h1>
3232
</legend>
33-
33+
3434

3535
<div class="nhsuk-radios nhsuk-radios--conditional">
3636
<div class="nhsuk-radios__item">
@@ -39,7 +39,7 @@ <h1 class="nhsuk-fieldset__heading">
3939
Today (Monday 2 June 2025)
4040
</label>
4141
</div>
42-
42+
4343
<div class="nhsuk-radios__item">
4444
<input class="nhsuk-radios__input" id="contact-2" name="contact" type="radio" value="phone" aria-controls="conditional-contact-2" aria-expanded="false">
4545
<label class="nhsuk-label nhsuk-radios__label" for="contact-2">
@@ -87,12 +87,12 @@ <h1 class="nhsuk-fieldset__heading">
8787
<div class="nhsuk-radios__item">
8888
<input class="nhsuk-radios__input" id="contact-3" name="contact" type="radio" value="" aria-controls="conditional-contact-3" aria-expanded="false">
8989
<label class="nhsuk-label nhsuk-radios__label" for="contact-3">
90-
Other
90+
Choose a different date
9191
</label>
9292
</div>
9393
<div class="nhsuk-radios__conditional nhsuk-radios__conditional--hidden" id="conditional-contact-3">
94-
95-
94+
95+
9696

9797
<fieldset class="nhsuk-fieldset" aria-describedby="example-hint" role="group">
9898
<legend class="nhsuk-fieldset__legend nhsuk-label--s">
@@ -127,7 +127,18 @@ <h1 class="nhsuk-fieldset__heading">
127127
</fieldset>
128128

129129
</div>
130-
</div>
130+
131+
132+
<div class="nhsuk-radios">
133+
<div class="nhsuk-radios__item">
134+
<input class="nhsuk-radios__input" id="example-hints-1" name="example-hints" type="radio" value="mobile" aria-describedby="example-hints-1-item-hint">
135+
<label class="nhsuk-label nhsuk-radios__label" for="example-hints-1">
136+
Not applicable
137+
</label>
138+
<div class="nhsuk-hint nhsuk-radios__hint" id="example-hints-1-item-hint">
139+
For bookings with no date, such as staff lists
140+
</div>
141+
</div>
131142
</fieldset>
132143
</div>
133144

0 commit comments

Comments
 (0)