diff --git a/app/controllers/patient-session.js b/app/controllers/patient-session.js index ddc47e133..ca5e830b9 100644 --- a/app/controllers/patient-session.js +++ b/app/controllers/patient-session.js @@ -113,9 +113,7 @@ export const patientSessionController = { canRecord: account.vaccineMethods?.includes(patientSession.vaccine?.method) && record && - session.isActive, - canRecordPrevious: - !session.isActive && report !== PatientStatus.Vaccinated + session.isActive } // Vaccinator has permission to record using the alternative vaccine diff --git a/app/locales/en.js b/app/locales/en.js index 84535ee6c..a2b30b97b 100644 --- a/app/locales/en.js +++ b/app/locales/en.js @@ -1149,7 +1149,7 @@ export const en = { label: 'Session note' }, patientProgramme: { - label: 'View %s record' + label: 'View child’s %s record' }, consent: { label: 'Consent status', diff --git a/app/views/patient-session/_record-previous.njk b/app/views/patient-session/_record-previous.njk deleted file mode 100644 index e2fbbb553..000000000 --- a/app/views/patient-session/_record-previous.njk +++ /dev/null @@ -1,11 +0,0 @@ -{% call card({ - heading: __("patientSession.recordPrevious.title", { session: session }), - headingLevel: 3, - headingSize: "m" -}) %} - {{ button({ - classes: "nhsuk-button--secondary", - text: __("vaccination.new.alreadyVaccinated.title"), - href: patientProgramme.uri + "/new/vaccination" - }) }} -{% endcall %} diff --git a/app/views/patient-session/_report.njk b/app/views/patient-session/_report.njk index 4aabbb72d..9422d3a89 100644 --- a/app/views/patient-session/_report.njk +++ b/app/views/patient-session/_report.njk @@ -33,4 +33,10 @@ ], rows: vaccinationRows }) if patientSession.vaccinationOutcomes | length }} + + {# Actions #} + {{ actionLink({ + text: __("patientSession.patientProgramme.label", programme.nameSentenceCase), + href: patient.uri + "/programmes/" + programme.id + "?referrer=" + referrer + }) }} {% endcall %} diff --git a/app/views/patient-session/show.njk b/app/views/patient-session/show.njk index 07bc694c1..97bb4d81b 100644 --- a/app/views/patient-session/show.njk +++ b/app/views/patient-session/show.njk @@ -42,8 +42,6 @@ address: {} }) }) }} - - {{ link(patient.uri + "/programmes/" + programme.id + "?referrer=" + referrer, __("patientSession.patientProgramme.label", programme.nameSentenceCase)) | nhsukMarkdown }}
@@ -89,8 +87,6 @@ {% if options.canRecord %} {% include "patient-session/_record.njk" %} - {% elif options.canRecordPrevious %} - {% include "patient-session/_record-previous.njk" %} {% endif %}