diff --git a/app/lib/utils/prior-mammograms.js b/app/lib/utils/prior-mammograms.js index 2dc56105..86d753aa 100644 --- a/app/lib/utils/prior-mammograms.js +++ b/app/lib/utils/prior-mammograms.js @@ -129,21 +129,19 @@ const summarisePriorMammogram = (mammogram, options = {}) => { let location = '' switch (mammogram.location) { case 'bsu': - location = mammogram.bsu || 'NHS breast screening unit' + location = 'At another BSU' break case 'otherUk': - location = mammogram.otherUk || 'Other UK location' + location = 'Elsewhere in the UK' break case 'otherNonUk': - location = mammogram.otherNonUk - ? `Outside UK: ${mammogram.otherNonUk}` - : 'Outside UK' + location = 'Outside the UK' break case 'currentBsu': - location = unitName || 'Current BSU' + location = `At ${unitName || 'this BSU'}` break case 'preferNotToSay': - location = 'Location not given' + location = 'Location not provided' break default: location = '' @@ -152,14 +150,14 @@ const summarisePriorMammogram = (mammogram, options = {}) => { // Date detail — combine formatted date and relative time into parenthesised suffix const dateParts = [] if (mammogram.dateType === 'dateKnown' && mammogram.dateTaken) { - dateParts.push(formatDate(mammogram.dateTaken, 'MMMM YYYY')) + dateParts.push(formatDate(mammogram.dateTaken, 'MMM YYYY')) if (mammogram._rawDate) { dateParts.push(formatRelativeDate(mammogram._rawDate)) } } else if (mammogram.dateType === 'moreThanSixMonths') { - dateParts.push(mammogram.approximateDate || 'over 6 months ago') + dateParts.push('over 6 months ago') } else if (mammogram.dateType === 'lessThanSixMonths') { - dateParts.push(mammogram.approximateDate || 'less than 6 months ago') + dateParts.push('less than 6 months ago') } const dateDetail = dateParts.length > 0 ? `(${dateParts.join(', ')})` : '' diff --git a/app/views/_includes/medical-information/index.njk b/app/views/_includes/medical-information/index.njk index eedbcb8e..b0849ca3 100644 --- a/app/views/_includes/medical-information/index.njk +++ b/app/views/_includes/medical-information/index.njk @@ -12,7 +12,7 @@ {# Mammogram history #} {% set sectionHeading = "Mammogram history" %} -{% set subHeading = "The last confirmed mammogram and any added manually since then" %} +{% set subHeading = "Previous mammograms from screening records and any reported by the participant" %} {% set sectionId = sectionHeading | kebabCase %} {% set scrollTo = sectionId %} @@ -275,4 +275,4 @@ html: otherRelevantInformationHtml, status: "To review" }) }} -{% endswitch %} \ No newline at end of file +{% endswitch %} diff --git a/app/views/_includes/medical-information/mammogram-history.njk b/app/views/_includes/medical-information/mammogram-history.njk index da6e6e47..46b52967 100644 --- a/app/views/_includes/medical-information/mammogram-history.njk +++ b/app/views/_includes/medical-information/mammogram-history.njk @@ -3,9 +3,6 @@ {% set hasAdditionalMammograms = event.previousMammograms | length > 0 %} {# System record - last known mammogram from BSU records #} -{% if hasAdditionalMammograms %} -

From screening records

-{% endif %} {% set systemRecordHtml %} {% set mostRecentClinic = data | getParticipantMostRecentClinic(participant.id) %} @@ -15,7 +12,7 @@ {{ mostRecentClinic.location.name }}
{{ mostRecentClinic.event.type | sentenceCase }} {% else %} - {{ "Not known" | asHint }} + {{ "No information" | asHint }} {% endif %} {% endset %} @@ -23,7 +20,7 @@ rows: [ { key: { - text: "Last known mammogram" + text: "Most recent mammogram on record" }, value: { html: systemRecordHtml @@ -126,4 +123,4 @@ {{ summaryList({ rows: userMammogramRows } | openInModal | removeLastRowBorder) }} -{% endif %} \ No newline at end of file +{% endif %} diff --git a/app/views/events/previous-mammograms/form.html b/app/views/events/previous-mammograms/form.html index e1a9f166..78098e9b 100644 --- a/app/views/events/previous-mammograms/form.html +++ b/app/views/events/previous-mammograms/form.html @@ -289,7 +289,7 @@

}, value: event.previousMammogramTemp.otherDetails, hint: { - text: "For example, the reason for the mammograms and the outcome of the assessment" + text: "For example, the reason for the mammogram, the participant's previous address, and the outcome of the assessment" } }) }}