Skip to content

Commit 84010f9

Browse files
michaelNetCompanymichaelNetCompany
committed
Sorting for research
1 parent bfb10af commit 84010f9

File tree

5 files changed

+679
-7
lines changed

5 files changed

+679
-7
lines changed

‎app/views/reg-portal/research-10-25/reg-table-v2-yes-no-page-2-minus-sam.html‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
4949
</button>
5050
</th>
5151

52+
<th role="columnheader" scope="col" class="govuk-table__header govuk-table__header--numeric" aria-sort="none">
53+
<button type="button" data-index="3">Alerts<svg width="22" height="22" focusable="false" aria-hidden="true" role="img" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
54+
<path d="M8.1875 9.5L10.9609 3.95703L13.7344 9.5H8.1875Z" fill="currentColor"></path>
55+
<path d="M13.7344 12.0781L10.9609 17.6211L8.1875 12.0781H13.7344Z" fill="currentColor"></path>
56+
</svg>
57+
</button>
58+
</th>
59+
5260
<th role="columnheader" class="" scope="col"></th>
5361

5462
</tr>
@@ -92,6 +100,9 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
92100
<td role="cell" class="nhsuk-table__cell">
93101
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
94102
</td>
103+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
104+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
105+
</td>
95106
<td role="cell" class="nhsuk-table__cell">
96107
<a href="reg-detail-multi-detail-child">View details</a>
97108
</td>
@@ -106,6 +117,9 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
106117
<td role="cell" class="nhsuk-table__cell">
107118
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
108119
</td>
120+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
121+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
122+
</td>
109123
<td role="cell" class="nhsuk-table__cell">
110124
<a href="#">View details</a>
111125
</td>
@@ -121,6 +135,12 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
121135
<td role="cell" class="nhsuk-table__cell">
122136
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
123137
</td>
138+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
139+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>
140+
<strong class="nhsuk-tag nhsuk-tag--yellow">
141+
1 Alert
142+
</strong>
143+
</td>
124144
<td role="cell" class="nhsuk-table__cell">
125145
<a href="#">View details</a>
126146
</td>

‎app/views/reg-portal/research-10-25/reg-table-v2-yes-no-page-2.html‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,14 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
4949
</button>
5050
</th>
5151

52+
<th role="columnheader" scope="col" class="govuk-table__header govuk-table__header--numeric" aria-sort="none">
53+
<button type="button" data-index="3">Alerts<svg width="22" height="22" focusable="false" aria-hidden="true" role="img" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
54+
<path d="M8.1875 9.5L10.9609 3.95703L13.7344 9.5H8.1875Z" fill="currentColor"></path>
55+
<path d="M13.7344 12.0781L10.9609 17.6211L8.1875 12.0781H13.7344Z" fill="currentColor"></path>
56+
</svg>
57+
</button>
58+
</th>
59+
5260
<th role="columnheader" class="" scope="col"></th>
5361

5462
</tr>
@@ -91,6 +99,9 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
9199
<td role="cell" class="nhsuk-table__cell">
92100
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
93101
</td>
102+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
103+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
104+
</td>
94105
<td role="cell" class="nhsuk-table__cell">
95106
<a href="reg-detail-multi-detail">View details</a>
96107
</td>
@@ -106,6 +117,9 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
106117
<td role="cell" class="nhsuk-table__cell">
107118
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
108119
</td>
120+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
121+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
122+
</td>
109123
<td role="cell" class="nhsuk-table__cell">
110124
<a href="reg-detail-multi-detail-child">View details</a>
111125
</td>
@@ -120,6 +134,9 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
120134
<td role="cell" class="nhsuk-table__cell">
121135
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
122136
</td>
137+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
138+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
139+
</td>
123140
<td role="cell" class="nhsuk-table__cell">
124141
<a href="#">View details</a>
125142
</td>
@@ -135,6 +152,12 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
135152
<td role="cell" class="nhsuk-table__cell">
136153
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
137154
</td>
155+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
156+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>
157+
<strong class="nhsuk-tag nhsuk-tag--yellow">
158+
1 Alert
159+
</strong>
160+
</td>
138161
<td role="cell" class="nhsuk-table__cell">
139162
<a href="#">View details</a>
140163
</td>

‎app/views/reg-portal/research-10-25/reg-table-v2-yes-no-sorted-reverse.html‎

Lines changed: 282 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,282 @@
1+
{% extends 'reg-portal/layout.html' %}
2+
3+
{% block pageTitle %}
4+
6 new registrations - GP registrations portal - NHS
5+
{% endblock %}
6+
7+
{% block content %}
8+
9+
<div class="nhsuk-grid-row">
10+
<div class="nhsuk-grid-column-full">
11+
12+
{{ backLink({
13+
text: "Return to dashboard",
14+
href: "dashboard"
15+
}) }}
16+
17+
18+
<h1 class="nhsuk-heading-xl">View patient details</h1>
19+
<p>View details of patient registration requests from the last 90 days.</p>
20+
21+
22+
<table role="table" class="nhsuk-table-responsive">
23+
<thead class="nhsuk-table__head">
24+
<tr role="row">
25+
26+
<th role="columnheader" scope="col" class="govuk-table__header" aria-sort="none">
27+
<button type="button" data-index="0">Name<svg width="22" height="22" focusable="false" aria-hidden="true" role="img" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
28+
<path d="M8.1875 9.5L10.9609 3.95703L13.7344 9.5H8.1875Z" fill="currentColor"></path>
29+
<path d="M13.7344 12.0781L10.9609 17.6211L8.1875 12.0781H13.7344Z" fill="currentColor"></path>
30+
</svg>
31+
</button>
32+
</th>
33+
34+
<th role="columnheader" scope="col" class="govuk-table__header" aria-sort="none">
35+
<button type="button" data-index="1">Matched<svg width="22" height="22" focusable="false" aria-hidden="true" role="img" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
36+
<path d="M8.1875 9.5L10.9609 3.95703L13.7344 9.5H8.1875Z" fill="currentColor"></path>
37+
<path d="M13.7344 12.0781L10.9609 17.6211L8.1875 12.0781H13.7344Z" fill="currentColor"></path>
38+
</svg>
39+
</button>
40+
</th>
41+
42+
<th role="columnheader" scope="col" class="govuk-table__header govuk-table__header--numeric" aria-sort="none">
43+
<button type="button" data-index="3">Catchment<svg width="22" height="22" focusable="false" aria-hidden="true" role="img" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
44+
<path d="M8.1875 9.5L10.9609 3.95703L13.7344 9.5H8.1875Z" fill="currentColor"></path>
45+
<path d="M13.7344 12.0781L10.9609 17.6211L8.1875 12.0781H13.7344Z" fill="currentColor"></path>
46+
</svg>
47+
</button>
48+
</th>
49+
50+
<th role="columnheader" scope="col" class="govuk-table__header govuk-table__header--numeric" aria-sort="none">
51+
<a href="reg-table-v2-yes-no">
52+
<button type="button" data-index="3">Alerts<svg width="22" height="22" focusable="false" aria-hidden="true" role="img" viewBox="0 0 22 22" fill="none" xmlns="http://www.w3.org/2000/svg">
53+
<path d="M6.5625 15.5L11 6.63125L15.4375 15.5H6.5625Z" fill="currentColor"></path>
54+
</svg>
55+
</button>
56+
</a>
57+
</th>
58+
59+
<th role="columnheader" class="" scope="col"></th>
60+
61+
</tr>
62+
</thead>
63+
64+
<style>
65+
.govuk-table__header {
66+
padding: 10px 20px 10px 0;
67+
text-align: left;
68+
vertical-align: top;
69+
}
70+
71+
[aria-sort] button, [aria-sort] button:hover {
72+
align-items: center;
73+
background-color: initial;
74+
border-width: 0;
75+
box-shadow: 0 0 0 0;
76+
color: #005ea5;
77+
cursor: pointer;
78+
display: inline-flex;
79+
font-family: inherit;
80+
font-size: inherit;
81+
font-size: 1em;
82+
font-weight: inherit;
83+
margin: 0;
84+
padding: 0;
85+
position: relative;
86+
text-align: inherit;
87+
}
88+
</style>
89+
90+
<tbody class="nhsuk-table__body">
91+
92+
<tr role="row" class="nhsuk-table__row">
93+
<td role="cell" class="nhsuk-table__cell">
94+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Thom Shirt
95+
</td>
96+
<td role="cell" class="nhsuk-table__cell">
97+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
98+
</td>
99+
<td role="cell" class="nhsuk-table__cell">
100+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
101+
</td>
102+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
103+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
104+
</td>
105+
<td role="cell" class="nhsuk-table__cell">
106+
<a href="reg-detail-multi-detail">View details</a>
107+
</td>
108+
</tr>
109+
110+
<tr role="row" class="nhsuk-table__row">
111+
<td role="cell" class="nhsuk-table__cell">
112+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Justin Girdler
113+
</td>
114+
<td role="cell" class="nhsuk-table__cell">
115+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
116+
</td>
117+
<td role="cell" class="nhsuk-table__cell">
118+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
119+
</td>
120+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
121+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
122+
</td>
123+
<td role="cell" class="nhsuk-table__cell">
124+
<a href="#">View details</a>
125+
</td>
126+
</tr>
127+
128+
<tr role="row" class="nhsuk-table__row">
129+
<td role="cell" class="nhsuk-table__cell">
130+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Louise Ednie
131+
</td>
132+
<td role="cell" class="nhsuk-table__cell">
133+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
134+
</td>
135+
<td role="cell" class="nhsuk-table__cell">
136+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
137+
</td>
138+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
139+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
140+
</td>
141+
<td role="cell" class="nhsuk-table__cell">
142+
<a href="#">View details</a>
143+
</td>
144+
</tr>
145+
<tr role="row" class="nhsuk-table__row">
146+
<td role="cell" class="nhsuk-table__cell">
147+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Victoria Shirt
148+
</td>
149+
<td role="cell" class="nhsuk-table__cell">
150+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
151+
</td>
152+
<td role="cell" class="nhsuk-table__cell">
153+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
154+
</td>
155+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
156+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
157+
</td>
158+
<td role="cell" class="nhsuk-table__cell">
159+
<a href="#">View details</a>
160+
</td>
161+
</tr>
162+
163+
<tr role="row" class="nhsuk-table__row">
164+
<td role="cell" class="nhsuk-table__cell">
165+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>James Briggs
166+
</td>
167+
<td role="cell" class="nhsuk-table__cell">
168+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
169+
</td>
170+
<td role="cell" class="nhsuk-table__cell">
171+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
172+
</td>
173+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
174+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
175+
</td>
176+
<td role="cell" class="nhsuk-table__cell">
177+
<a href="#">View details</a>
178+
</td>
179+
</tr>
180+
181+
<tr role="row" class="nhsuk-table__row">
182+
<td role="cell" class="nhsuk-table__cell">
183+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Michael Chambers
184+
</td>
185+
<td role="cell" class="nhsuk-table__cell">
186+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Matched
187+
</td>
188+
<td role="cell" class="nhsuk-table__cell">
189+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
190+
</td>
191+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
192+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
193+
</td>
194+
<td role="cell" class="nhsuk-table__cell">
195+
<a href="reg-detail-multi-detail-child">View details</a>
196+
</td>
197+
</tr>
198+
199+
<tr role="row" class="nhsuk-table__row">
200+
<td role="cell" class="nhsuk-table__cell">
201+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Gwyn West
202+
</td>
203+
<td role="cell" class="nhsuk-table__cell">
204+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
205+
</td>
206+
<td role="cell" class="nhsuk-table__cell">
207+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
208+
</td>
209+
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
210+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
211+
</td>
212+
<td role="cell" class="nhsuk-table__cell">
213+
<a href="#">View details</a>
214+
</td>
215+
</tr>
216+
217+
</tbody>
218+
</table>
219+
220+
<nav class="nhsuk-pagination" role="navigation" aria-label="Pagination">
221+
<ul class="nhsuk-list nhsuk-pagination__list">
222+
<!--<li class="gpreg-pagination-item--previous">
223+
<a class="nhsuk-pagination__link nhsuk-pagination__link--prev" href="#">
224+
<span class="nhsuk-pagination__title">Previous<span class="nhsuk-u-visually-hidden"> page</span></span>
225+
<svg class="nhsuk-icon gpreg-icon--arrow-left" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
226+
<path d="M10.7 6.3c.4.4.4 1 0 1.4L7.4 11H19a1 1 0 0 1 0 2H7.4l3.3 3.3c.4.4.4 1 0 1.4a1 1 0 0 1-1.4 0l-5-5A1 1 0 0 1 4 12c0-.3.1-.5.3-.7l5-5a1 1 0 0 1 1.4 0Z" />
227+
</svg>
228+
</a>
229+
</li>-->
230+
<li class="gpreg-pagination-item--next">
231+
{% if (data['name-approved'] === "Sam Smith") %}
232+
<a class="nhsuk-pagination__link nhsuk-pagination__link--next" href="reg-table-v2-yes-no-page-2-minus-sam">
233+
{% else %}
234+
<a class="nhsuk-pagination__link nhsuk-pagination__link--next" href="reg-table-v2-yes-no-page-2">
235+
{% endif %}
236+
<span class="nhsuk-pagination__title">Next<span class="nhsuk-u-visually-hidden"> page</span></span>
237+
<svg class="nhsuk-icon gpreg-icon--arrow-right" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="16" height="16" focusable="false" aria-hidden="true">
238+
<path d="m14.7 6.3 5 5c.2.2.3.4.3.7 0 .3-.1.5-.3.7l-5 5a1 1 0 0 1-1.4-1.4l3.3-3.3H5a1 1 0 0 1 0-2h11.6l-3.3-3.3a1 1 0 1 1 1.4-1.4Z" />
239+
</svg>
240+
</a>
241+
</li>
242+
</ul>
243+
</nav>
244+
245+
<h2 class="nhsuk-heading-l nhsuk-u-padding-top-6">Support</h2>
246+
<p>You can contact us by raising a Service Now ticket in NHS Profile Manager.</p>
247+
248+
</div>
249+
</div>
250+
251+
<style>
252+
.gpreg-pagination-item--previous {
253+
float: left;
254+
margin-right: 32px;
255+
padding-left: 32px;
256+
}
257+
258+
.gpreg-icon--arrow-left {
259+
position: absolute;
260+
top: -2px;
261+
left: -38px;
262+
}
263+
264+
.gpreg-pagination-item--next {
265+
float: left;
266+
}
267+
268+
.gpreg-icon--arrow-right {
269+
position: absolute;
270+
top: -2px;
271+
right: -38px;
272+
}
273+
</style>
274+
275+
276+
277+
{% endblock %}
278+
279+
{% block pageScripts %}
280+
281+
282+
{% endblock %}

0 commit comments

Comments
 (0)