Refactor PatientSession

Author: paulrobertlloyd

app/models/patient-session.js

@@ -252,7 +252,7 @@ export class Session {
   /**
    * Get consent window
    *
-   * @returns {object} Consent window
+   * @returns {string} Consent window
    */
   get consentWindow() {
     return getConsentWindow(this)

app/models/session.js

@@ -58,7 +58,7 @@ export function getRepliesWithHealthAnswers(replies) {
  * Get combined answers to health questions
  *
  * @param {import('../models.js').PatientSession} patientSession - Patient session
- * @returns {object|boolean} Combined answers to health questions
+ * @returns {object|undefined} Combined answers to health questions
  */
 export function getConsentHealthAnswers(patientSession) {
   const consentHealthAnswers = {}
@@ -69,7 +69,7 @@ export function getConsentHealthAnswers(patientSession) {
   ).filter((reply) => reply.healthAnswers)
 
   if (responsesWithHealthAnswers.length === 0) {
-    return false
+    return
   }
 
   for (const response of responsesWithHealthAnswers) {

app/utils/reply.js

@@ -16,7 +16,7 @@ import { today } from './date.js'
  * Get consent window (is it open, opening or closed)
  *
  * @param {import('../models.js').Session} session - Session
- * @returns {object} Consent window key and value
+ * @returns {string} Consent window key and value
  */
 export const getConsentWindow = (session) => {
   const nowAt = today()

app/utils/session.js

@@ -8,7 +8,7 @@
 }) %}
   {# Description #}
   {% if not isVaccinated %}
-    {{ patientSession.consentNotes | nhsukMarkdown }}
+    {{ patientSession.consentDescription | nhsukMarkdown }}
 
     {% if patientSession.patient.lastReminderDate %}
       {{ patientSession.patient.formatted.lastReminderDate | nhsukMarkdown }}

app/views/patient-session/_consent.njk

@@ -3,7 +3,7 @@
   headingSize: "m"
 }) %}
   {# Description #}
-  {{ patientSession.registerNotes | nhsukMarkdown }}
+  {{ patientSession.registerDescription | nhsukMarkdown }}
 
   {# Actions #}
   {% if patientSession.register == RegistrationOutcome.Pending %}

app/views/patient-session/_register.njk

@@ -6,7 +6,7 @@
   headingSize: "m"
 }) %}
   {# Description #}
-  {{ patientSession.reportNotes | nhsukMarkdown }}
+  {{ patientSession.reportDescription | nhsukMarkdown }}
 
   {# Decision table #}
   {% set vaccinationRows = [] %}

app/views/patient-session/_report.njk

@@ -5,7 +5,7 @@
   headingSize: "m"
 }) %}
   {# Description #}
-  {{ patientSession.screenNotes | nhsukMarkdown }}
+  {{ patientSession.screenDescription | nhsukMarkdown }}
 
   {# Actions #}
   {{ actionLink({