Skip to content

Commit 69d8740

Browse files
michaelNetCompanymichaelNetCompany
committed
Alert sorting
1 parent 20247a8 commit 69d8740

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
107107
<a href="reg-detail-multi-detail-child">View details</a>
108108
</td>
109109
</tr>
110+
110111
<tr role="row" class="nhsuk-table__row">
111112
<td role="cell" class="nhsuk-table__cell">
112113
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Gwyn West

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
4848
</th>
4949

5050
<th role="columnheader" scope="col" class="govuk-table__header govuk-table__header--numeric" aria-sort="none">
51-
<a href="reg-table-v2-yes-no">
51+
<a href="reg-table-v2-yes-no-2">
5252
<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">
5353
<path d="M6.5625 15.5L11 6.63125L15.4375 15.5H6.5625Z" fill="currentColor"></path>
5454
</svg>
@@ -127,21 +127,22 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
127127

128128
<tr role="row" class="nhsuk-table__row">
129129
<td role="cell" class="nhsuk-table__cell">
130-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Louise Ednie
130+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Philip Muggeridge
131131
</td>
132132
<td role="cell" class="nhsuk-table__cell">
133-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
133+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Not matched
134134
</td>
135135
<td role="cell" class="nhsuk-table__cell">
136-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
136+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
137137
</td>
138138
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
139139
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
140140
</td>
141141
<td role="cell" class="nhsuk-table__cell">
142-
<a href="reg-detail-multi-detail-louise">View details</a>
142+
<a href="#">View details</a>
143143
</td>
144144
</tr>
145+
145146
<tr role="row" class="nhsuk-table__row">
146147
<td role="cell" class="nhsuk-table__cell">
147148
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Victoria Shirt

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

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -190,24 +190,25 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
190190

191191
<tr role="row" class="nhsuk-table__row">
192192
<td role="cell" class="nhsuk-table__cell">
193-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Louise Ednie
193+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Victoria Shirt
194194
</td>
195195
<td role="cell" class="nhsuk-table__cell">
196196
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
197197
</td>
198198
<td role="cell" class="nhsuk-table__cell">
199-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
199+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
200200
</td>
201201
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
202202
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
203203
</td>
204204
<td role="cell" class="nhsuk-table__cell">
205-
<a href="reg-detail-multi-detail-louise">View details</a>
205+
<a href="#">View details</a>
206206
</td>
207207
</tr>
208+
208209
<tr role="row" class="nhsuk-table__row">
209210
<td role="cell" class="nhsuk-table__cell">
210-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Victoria Shirt
211+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>James Briggs
211212
</td>
212213
<td role="cell" class="nhsuk-table__cell">
213214
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
@@ -225,19 +226,19 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
225226

226227
<tr role="row" class="nhsuk-table__row">
227228
<td role="cell" class="nhsuk-table__cell">
228-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>James Briggs
229+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Name</span>Michael Chambers
229230
</td>
230231
<td role="cell" class="nhsuk-table__cell">
231232
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Matched</span>Yes
232233
</td>
233234
<td role="cell" class="nhsuk-table__cell">
234-
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Yes
235+
<span class="nhsuk-table-responsive__heading" aria-hidden="true">In catchment</span>Out of catchment
235236
</td>
236237
<td role="cell" class="nhsuk-table__cell" style="color: #4c6272!important;">
237238
<span class="nhsuk-table-responsive__heading" aria-hidden="true">Alerts</span>No alerts
238239
</td>
239240
<td role="cell" class="nhsuk-table__cell">
240-
<a href="#">View details</a>
241+
<a href="reg-detail-multi-detail-child">View details</a>
241242
</td>
242243
</tr>
243244

@@ -255,11 +256,7 @@ <h1 class="nhsuk-heading-xl">View patient details</h1>
255256
</a>
256257
</li>-->
257258
<li class="gpreg-pagination-item--next">
258-
{% if (data['name-approved'] === "Sam Smith") %}
259-
<a class="nhsuk-pagination__link nhsuk-pagination__link--next" href="reg-table-v2-yes-no-page-2-minus-sam">
260-
{% else %}
261-
<a class="nhsuk-pagination__link nhsuk-pagination__link--next" href="reg-table-v2-yes-no-page-2">
262-
{% endif %}
259+
<a class="nhsuk-pagination__link nhsuk-pagination__link--next" href="#">
263260
<span class="nhsuk-pagination__title">Next<span class="nhsuk-u-visually-hidden"> page</span></span>
264261
<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">
265262
<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" />

0 commit comments

Comments
 (0)