Skip to content

Commit 49e925f

Browse files
committed
surface eligibility in vaccine record
1 parent c3800e9 commit 49e925f

3 files changed

Lines changed: 17 additions & 4 deletions

File tree

app/locales/en.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1475,7 +1475,8 @@ export const en = {
14751475
},
14761476
ignored: {
14771477
label: 'Ignored'
1478-
}
1478+
},
1479+
eligibleFrom: 'Eligible from {date}'
14791480
},
14801481
status: {
14811482
label: 'Status'

app/models/patient-programme.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
} from '../enums.js'
99
import { AuditEvent, Patient, Programme, Vaccination } from '../models.js'
1010
import {
11+
formatDate,
1112
getCurrentAcademicYear,
1213
getDateValueDifference
1314
} from '../utils/date.js'
@@ -265,7 +266,10 @@ export class PatientProgramme {
265266
return {
266267
...summary,
267268
dosesComplete: summary.validDoses.length,
268-
dosesNeeded: this.dosesNeeded
269+
dosesNeeded: this.dosesNeeded,
270+
nextEligibleFromFormatted: summary.nextEligibleFrom
271+
? formatDate(summary.nextEligibleFrom, { dateStyle: 'long' })
272+
: null
269273
}
270274
}
271275

app/views/patient/_vaccination-record.njk

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@
5151
]) %}
5252
{% endfor %}
5353

54-
{% for sequence in range(summary.validDoses.length + 1, summary.dosesNeeded + 1) %}
54+
{% set firstEmptySequence = summary.validDoses.length + 1 %}
55+
{% for sequence in range(firstEmptySequence, summary.dosesNeeded + 1) %}
56+
{% set isFirstEmpty = sequence == firstEmptySequence %}
57+
{% set dateText = "" %}
58+
{% if isFirstEmpty and summary.nextEligibleFromFormatted %}
59+
{% set dateText = __mf("patientProgramme.vaccinationRecord.eligibleFrom", {
60+
date: summary.nextEligibleFromFormatted
61+
}) %}
62+
{% endif %}
5563
{% set rows = rows | push([
5664
{
5765
header: __("patientProgramme.vaccinationRecord.dose.label"),
@@ -61,7 +69,7 @@
6169
},
6270
{
6371
header: __("vaccination.createdAt.label"),
64-
text: ""
72+
text: dateText
6573
}
6674
]) %}
6775
{% endfor %}

0 commit comments

Comments
 (0)