Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions app/controllers/patient-session.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
11 changes: 0 additions & 11 deletions app/views/patient-session/_record-previous.njk

This file was deleted.

6 changes: 6 additions & 0 deletions app/views/patient-session/_report.njk
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
4 changes: 0 additions & 4 deletions app/views/patient-session/show.njk
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
address: {}
})
}) }}

{{ link(patient.uri + "/programmes/" + programme.id + "?referrer=" + referrer, __("patientSession.patientProgramme.label", programme.nameSentenceCase)) | nhsukMarkdown }}
</div>

<div class="app-grid-column-patient-session">
Expand Down Expand Up @@ -89,8 +87,6 @@

{% if options.canRecord %}
{% include "patient-session/_record.njk" %}
{% elif options.canRecordPrevious %}
{% include "patient-session/_record-previous.njk" %}
{% endif %}
</div>
</div>
Expand Down