-
{{ pageName }}
+ {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %}
+
+ {{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old, {{ data.vaccine }}{{ pageName }}
{{ summaryList({
rows: [
diff --git a/app/views/record-vaccinations/vaccination-date.html b/app/views/record-vaccinations/vaccination-date.html
index f7085bc0..cbcec9c0 100644
--- a/app/views/record-vaccinations/vaccination-date.html
+++ b/app/views/record-vaccinations/vaccination-date.html
@@ -61,12 +61,15 @@
}) }}
{% endset -%}
+ {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %}
+ {% set legendHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} oldIs the vaccination today?{% endset %}
+
{{ radios({
idPrefix: "vaccinationToday",
name: "vaccinationToday",
fieldset: {
legend: {
- text: "Is the vaccination today?",
+ html: legendHtml,
classes: "nhsuk-fieldset__legend--l",
isPageHeading: "true"
}
diff --git a/app/views/record-vaccinations/vaccinator.html b/app/views/record-vaccinations/vaccinator.html
index 5637a542..80809176 100644
--- a/app/views/record-vaccinations/vaccinator.html
+++ b/app/views/record-vaccinations/vaccinator.html
@@ -47,12 +47,15 @@
}), items) %}
{% endfor %}
+ {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %}
+ {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old{% endset %}
+
{{ radios({
idPrefix: "vaccinator",
name: "vaccinatorId",
fieldset: {
legend: {
- text: ("Who is the vaccinator?" if data.vaccinationToday == 'yes' else "Who was the vaccinator?"),
+ html: captionHtml + ("Who is the vaccinator?" if data.vaccinationToday == 'yes' else "Who was the vaccinator?"),
size: "l",
isPageHeading: "true"
}
diff --git a/app/views/record-vaccinations/vaccine.html b/app/views/record-vaccinations/vaccine.html
index df7366bb..dba06692 100644
--- a/app/views/record-vaccinations/vaccine.html
+++ b/app/views/record-vaccinations/vaccine.html
@@ -99,12 +99,15 @@
}), items) %}
{% endfor %}
+ {% set patientAge = data.dateOfBirth | isoDateFromDateInput | age if data.dateOfBirth.day else data.dateOfBirth | age %}
+ {% set captionHtml %}{{ data.firstName }} {{ data.lastName }}, {{ patientAge }} old{% endset %}
+
{{ radios({
"idPrefix": "vaccine",
"name": "vaccine",
"fieldset": {
"legend": {
- "text": question,
+ "html": captionHtml + question,
"size": "l",
"isPageHeading": true
}