Add fullNameAndRelationship to parent model

Author: paulrobertlloyd

app/locales/en.js

@@ -1217,8 +1217,7 @@ export const en = {
     },
     invite: {
       label: 'Send consent request',
-      success:
-        'Consent request sent to {{parent.formatted.fullNameAndRelationship}}'
+      success: 'Consent request sent to {{parent.fullNameAndRelationship}}'
     },
     replies: {
       pending: 'Consent requests',
@@ -1390,7 +1389,7 @@ export const en = {
       label: 'Parent',
       title: {
         new: 'Details for parent or guardian',
-        edit: 'Details for {{parent.formatted.fullNameAndRelationship}}'
+        edit: 'Details for {{parent.fullNameAndRelationship}}'
       },
       notify: {
         title:

app/models/consent.js

@@ -25,7 +25,7 @@ export class Consent extends Reply {
     return {
       summary: formatLinkWithSecondaryText(
         this.uri,
-        this.parent.formatted.fullNameAndRelationship,
+        this.parent.fullNameAndRelationship,
         `for ${this.child.fullName}`
       )
     }

app/models/parent.js

@@ -47,6 +47,15 @@ export class Parent {
     }
   }
 
+  /**
+   * Get full name and relationship to child
+   *
+   * @returns {string} Full name and relationship
+   */
+  get fullNameAndRelationship() {
+    return formatParent(this, false)
+  }
+
   /**
    * Get formatted values
    *
@@ -57,7 +66,6 @@ export class Parent {
       contactPreference:
         this.contactPreferenceDetails || this.contactPreference,
       fullName: this.fullName || 'Name unknown',
-      fullNameAndRelationship: formatParent(this, false),
       relationship: formatOther(this.relationshipOther, this.relationship)
     }
   }

app/models/patient-session.js

@@ -213,7 +213,7 @@ export class PatientSession {
     return this.responses
       .filter((reply) => !reply.invalid)
       .filter((reply) => reply.declined)
-      .flatMap((reply) => reply.parent.formatted.fullNameAndRelationship)
+      .flatMap((reply) => reply.parent.fullNameAndRelationship)
   }
 
   /**

app/views/patient-session/_consent.njk

@@ -51,7 +51,7 @@
       {{ summaryList({
         card: {
           classes: "app-card--compact app-card--offset",
-          heading: reply.formatted.fullNameAndRelationship,
+          heading: reply.fullNameAndRelationship,
           headingLevel: 5,
           href: reply.uri if reply.delivered,
           clickable: true if reply.delivered
@@ -83,7 +83,7 @@
       {{ summaryList({
         card: {
           classes: "app-card--compact app-card--offset",
-          heading: parent.formatted.fullNameAndRelationship,
+          heading: parent.fullNameAndRelationship,
           headingLevel: 5
         },
         rows: summaryRows(parent, {

app/views/reply/form/follow-up.njk

@@ -13,7 +13,7 @@
     html: summaryList({
       rows: summaryRows(reply, {
         parent: {
-          value: reply.parent.formatted.fullNameAndRelationship
+          value: reply.parent.fullNameAndRelationship
         },
         email: {
           label: __("parent.email.label"),