From c45c18eae890ac609ced06c44cdbe035a7a66a39 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:05:17 +0100 Subject: [PATCH 01/29] Rename function for clarity on mammogram records --- app/lib/utils/prior-mammograms.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/lib/utils/prior-mammograms.js b/app/lib/utils/prior-mammograms.js index 86d753aa..7e268fd1 100644 --- a/app/lib/utils/prior-mammograms.js +++ b/app/lib/utils/prior-mammograms.js @@ -1,13 +1,13 @@ // app/lib/utils/prior-mammograms.js // -// Utility functions for working with prior mammograms (previously reported +// Utility functions for working with prior mammograms (previously recorded // mammograms from other facilities). These derive event-level state from // per-mammogram request tracking on event.previousMammograms[]. const { formatDate, formatRelativeDate } = require('./dates') -/** Returns true if the event has any previously reported mammograms */ -const hasReportedMammograms = (event) => { +/** Returns true if the event has any previously recorded mammograms */ +const hasRecordedMammograms = (event) => { if (!event) return false return ( Array.isArray(event.previousMammograms) && @@ -17,7 +17,7 @@ const hasReportedMammograms = (event) => { /** Returns true if any prior mammogram has requestStatus 'pending' or 'requested' (holds case from reading) */ const awaitingPriors = (event) => { - if (!hasReportedMammograms(event)) return false + if (!hasRecordedMammograms(event)) return false return event.previousMammograms.some( (m) => m.requestStatus === 'pending' || m.requestStatus === 'requested' ) @@ -25,7 +25,7 @@ const awaitingPriors = (event) => { /** Returns true if any prior mammogram has requestStatus 'not_requested' */ const hasUnrequestedPriors = (event) => { - if (!hasReportedMammograms(event)) return false + if (!hasRecordedMammograms(event)) return false return event.previousMammograms.some( (m) => m.requestStatus === 'not_requested' ) @@ -38,7 +38,7 @@ const hasUnrequestedPriors = (event) => { * @returns {{total: number, counts: object, hasAwaiting: boolean, hasUnrequested: boolean, allResolved: boolean}} */ const getPriorsSummary = (event) => { - if (!hasReportedMammograms(event)) { + if (!hasRecordedMammograms(event)) { return { total: 0, counts: {}, @@ -82,7 +82,7 @@ const getPriorsSummary = (event) => { /** Get priors with requestStatus 'not_requested' (for the request priors UI) */ const getUnrequestedPriors = (event) => { - if (!hasReportedMammograms(event)) return [] + if (!hasRecordedMammograms(event)) return [] return event.previousMammograms.filter( (m) => m.requestStatus === 'not_requested' ) @@ -90,7 +90,7 @@ const getUnrequestedPriors = (event) => { /** Get priors with requestStatus 'pending' or 'requested' (awaiting arrival) */ const getAwaitingPriors = (event) => { - if (!hasReportedMammograms(event)) return [] + if (!hasRecordedMammograms(event)) return [] return event.previousMammograms.filter( (m) => m.requestStatus === 'pending' || m.requestStatus === 'requested' ) @@ -101,7 +101,7 @@ const getAwaitingPriors = (event) => { * Only 'pending' is checked — once admin moves to 'requested', the reader can no longer undo. */ const userRequestedPriors = (event, userId) => { - if (!hasReportedMammograms(event)) return false + if (!hasRecordedMammograms(event)) return false return event.previousMammograms.some( (m) => m.requestStatus === 'pending' && m.requestedBy === userId ) @@ -179,14 +179,14 @@ const summarisePriorMammogram = (mammogram, options = {}) => { * @returns {Array} Array of summary strings */ const summarisePriorMammograms = (event, options = {}) => { - if (!hasReportedMammograms(event)) return [] + if (!hasRecordedMammograms(event)) return [] return event.previousMammograms .map((m) => summarisePriorMammogram(m, options)) .filter(Boolean) } module.exports = { - hasReportedMammograms, + hasRecordedMammograms, awaitingPriors, hasUnrequestedPriors, getPriorsSummary, From 6b6d5b5bd887fc30335c32b497edaed1a61f4ac3 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:06:36 +0100 Subject: [PATCH 02/29] Shorten warning callout heading in symptoms card --- app/views/_includes/symptomsWarningCard.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/_includes/symptomsWarningCard.njk b/app/views/_includes/symptomsWarningCard.njk index b85b45b6..081fd405 100644 --- a/app/views/_includes/symptomsWarningCard.njk +++ b/app/views/_includes/symptomsWarningCard.njk @@ -7,7 +7,7 @@ {% endset %} {{ warningCallout({ - heading: 'Significant symptoms reported', + heading: 'Significant symptoms', html: warningCalloutHtml, classes: "nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-4" }) }} From ffaa30a261ce85539d0ef638066b91ce7ca39d53 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:07:56 +0100 Subject: [PATCH 03/29] Update text for symptom acknowledgment message --- app/views/reading/workflow/normal-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/reading/workflow/normal-details.html b/app/views/reading/workflow/normal-details.html index bcfd7098..89460c21 100644 --- a/app/views/reading/workflow/normal-details.html +++ b/app/views/reading/workflow/normal-details.html @@ -52,7 +52,7 @@

items: [ { value: "true", - text: "I acknowledge that the reported symptoms have been considered in my decision" + text: "I acknowledge that the disclosed symptoms have been considered in my decision" } ], values: data.imageReadingTemp.symptomsAcknowledged From 74d3af5d00ed76e94ab6681c99a1ab2dc95846a8 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:09:10 +0100 Subject: [PATCH 04/29] Rename function hasReportedMammograms to hasRecordedMammograms --- docs/utils-filter-reference.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/utils-filter-reference.md b/docs/utils-filter-reference.md index a0213a6c..31ae84a8 100644 --- a/docs/utils-filter-reference.md +++ b/docs/utils-filter-reference.md @@ -248,7 +248,7 @@ Prior mammogram request state (awaiting, unrequested, resolved) and one-line sum | Function | Description | Line | |---|---|---| -| `hasReportedMammograms(event)` | Returns true if the event has any previously reported mammograms | 9 | +| `hasRecordedMammograms(event)` | Returns true if the event has any previously recorded mammograms | 9 | | `awaitingPriors(event)` | Returns true if any prior mammogram has requestStatus 'requested' (holds case from reading) | 18 | | `hasUnrequestedPriors(event)` | Returns true if any prior mammogram has requestStatus 'not_requested' | 24 | | `getPriorsSummary(event)` | Get a summary of prior mammogram statuses for display | 32 | From b4d870ed59a29b1456e9aa9da0552e0172b656ed Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:10:32 +0100 Subject: [PATCH 05/29] Update titleText in notification banner to 'Priors recorded' --- app/views/style-guide/notification-banner.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/style-guide/notification-banner.html b/app/views/style-guide/notification-banner.html index c9a78693..305c05ae 100644 --- a/app/views/style-guide/notification-banner.html +++ b/app/views/style-guide/notification-banner.html @@ -94,14 +94,14 @@

Warning

{{ appNotificationBanner({ size: "compact", type: "warning", - titleText: "Priors reported — not yet requested", + titleText: "Priors recorded — not yet requested", html: "

Most recent mammogram: St Thomas' Hospital, June 2022

Request priors

" }) }} 
{% raw %}{{ appNotificationBanner({
   size: "compact",
   type: "warning",
-  titleText: "Priors reported",
+  titleText: "Priors recorded",
   html: "
...
"
 }) }}{% endraw %}
From f90a1d41f471f8c218296cf5bc43f96f60f5c297 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:16:17 +0100 Subject: [PATCH 06/29] Update mammogram history subheading and summary text --- app/views/_includes/medical-information/index.njk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/_includes/medical-information/index.njk b/app/views/_includes/medical-information/index.njk index b0849ca3..71672c4e 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 = "Previous mammograms from screening records and any reported by the participant" %} +{% set subHeading = "Previous mammograms from screening records and any disclosed by the participant" %} {% set sectionId = sectionHeading | kebabCase %} {% set scrollTo = sectionId %} @@ -32,9 +32,9 @@ {% endset %} {% if hasAdditionalMammograms %} - {% set mammogramHistoryContentsSummary = (event.previousMammograms | length) ~ " reported " + ("mammogram" | pluralise(event.previousMammograms | length)) + " added" %} + {% set mammogramHistoryContentsSummary = (event.previousMammograms | length) ~ " " ~ ("mammogram" | pluralise(event.previousMammograms | length)) ~ " added" %} {% else %} - {% set mammogramHistoryContentsSummary = "No reported mammograms added" %} + {% set mammogramHistoryContentsSummary = "No mammograms added" %} {% endif %} From 1652276f17e632edda433b48863446af9ea72830 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:18:13 +0100 Subject: [PATCH 07/29] Update symptom references in reading-generator.js --- app/lib/generators/reading-generator.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/lib/generators/reading-generator.js b/app/lib/generators/reading-generator.js index 37a0211d..acdf40b7 100644 --- a/app/lib/generators/reading-generator.js +++ b/app/lib/generators/reading-generator.js @@ -23,11 +23,11 @@ const DEFAULT_READ_WEIGHTS = { // Normal opinion freetext reasons when participant has symptoms const NORMAL_DETAILS_WITH_SYMPTOMS = [ - 'Images reviewed carefully in the context of reported symptoms. No mammographic abnormality identified. Clinical follow-up recommended for symptoms.', + 'Images reviewed carefully in the context of disclosed symptoms. No mammographic abnormality identified. Clinical follow-up recommended for symptoms.', 'Thorough review of all views performed. No significant mammographic findings. Symptoms noted but no corresponding imaging abnormality detected.', 'Normal mammographic appearance bilaterally. Symptoms have been considered in this assessment. No imaging correlate found.', - 'Careful assessment undertaken given reported symptoms. Mammographic appearances are within normal limits. Clinical assessment advised.', - 'No mammographic abnormality detected on careful review. Reported symptoms do not have a mammographic correlate. Recommend clinical follow-up.' + 'Careful assessment undertaken given disclosed symptoms. Mammographic appearances are within normal limits. Clinical assessment advised.', + 'No mammographic abnormality detected on careful review. Disclosed symptoms do not have a mammographic correlate. Recommend clinical follow-up.' ] // Normal opinion freetext reasons without symptoms (used for a small proportion) From 4910cf8ff0d7ce2083f9f3f8c38464ef73754691 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:20:08 +0100 Subject: [PATCH 08/29] Change 'reported' to 'recorded' in opinion.html --- app/views/reading/workflow/opinion.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/reading/workflow/opinion.html b/app/views/reading/workflow/opinion.html index e5e4e659..f03a213f 100644 --- a/app/views/reading/workflow/opinion.html +++ b/app/views/reading/workflow/opinion.html @@ -114,7 +114,7 @@

{% endif %} {% if (data.settings.debugMode | falsify) %} - {% if event | hasReportedMammograms %} + {% if event | hasRecordedMammograms %} {{ "Has priors" | toTag }} {% endif %} {% if event.mammogramData.metadata.hasAdditionalImages %} @@ -138,10 +138,10 @@

- {# Reported mammograms banners - shown if there are unrequested or received priors #} + {# Recorded mammograms banners - shown if there are unrequested or received priors #} {% set priorsSummary = event | getPriorsSummary %} - {# Warning: priors reported but not yet requested #} + {# Warning: priors recorded but not yet requested #} {% if priorsSummary.hasUnrequested %}
@@ -160,7 +160,7 @@

{% call insetText({ classes: "app-inset-text--compact" if data.settings.compactMode in ["true", true] }) %} -

Recent mammograms reported

+

Recent mammograms recorded

{{ unrequestedHtml | safe }} {% endcall %}

From 9d733fac044ee09999cf412507e5a5003761c0e6 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:21:31 +0100 Subject: [PATCH 09/29] Change heading from 'Reported' to 'Recorded' mammograms --- app/views/_includes/medical-information/mammogram-history.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/_includes/medical-information/mammogram-history.njk b/app/views/_includes/medical-information/mammogram-history.njk index 46b52967..16f819de 100644 --- a/app/views/_includes/medical-information/mammogram-history.njk +++ b/app/views/_includes/medical-information/mammogram-history.njk @@ -31,7 +31,7 @@ {# User-added unverified mammograms #} {% if hasAdditionalMammograms %} -

Reported mammograms

+

Recorded mammograms

{% set userMammogramRows = [] %} {% for previousMammogram in event.previousMammograms %} @@ -113,7 +113,7 @@ { href: contextUrl + "/previous-mammograms/edit/" + previousMammogram.id | urlWithReferrer(referrerChain | appendReferrer(currentUrl), scrollTo), text: "Change", - visuallyHiddenText: "Participant reported mammogram" + visuallyHiddenText: "Participant disclosed mammogram" } ] } if allowEdits From 946ae8306209cfdc17695d175fa7e3335c234f06 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:22:42 +0100 Subject: [PATCH 10/29] Update comment for previous mammograms generation --- app/lib/generators/event-generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/generators/event-generator.js b/app/lib/generators/event-generator.js index 3867dc49..da305fe0 100644 --- a/app/lib/generators/event-generator.js +++ b/app/lib/generators/event-generator.js @@ -311,7 +311,7 @@ const generateEvent = ({ } } - // Generate previous mammograms (reported mammograms from other facilities) + // Generate previous mammograms (recorded mammograms from other facilities) const previousMammograms = generatePreviousMammograms({ eventDate: event.timing.actualEndTime || event.timing.actualStartTime, addedByUserId: event.sessionDetails.startedBy, From 7a4c8f2054a0d24b4bac539d183802f91d07ad12 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:23:26 +0100 Subject: [PATCH 11/29] Change 'reported' to 'recorded' in priors.html Updated comments and variable checks to reflect terminology changes from 'reported' to 'recorded' for mammograms. --- app/views/reading/priors.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/reading/priors.html b/app/views/reading/priors.html index c041ff73..60df5382 100644 --- a/app/views/reading/priors.html +++ b/app/views/reading/priors.html @@ -12,7 +12,7 @@ {% block pageContent %} - {# Get all eligible events with reported mammograms, sorted by screening date #} + {# Get all eligible events with recorded mammograms, sorted by screening date #} {% set eligibleEvents = data.events | filterEventsByEligibleForReading | sortEventsByScreeningDate %} {# Build flat list of mammogram rows with their parent event #} @@ -23,7 +23,7 @@ {% set resolvedRows = [] %} {% for thisEvent in eligibleEvents %} - {% if thisEvent | hasReportedMammograms %} + {% if thisEvent | hasRecordedMammograms %} {% for mammogram in thisEvent.previousMammograms %} {% set row = { event: thisEvent, mammogram: mammogram } %} {% if mammogram.requestStatus == "not_requested" %} From 262dd1644f75abb6c874364c874b984653f5a0a8 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:25:09 +0100 Subject: [PATCH 12/29] Change 'reported' to 'recorded' for mammograms --- app/views/_includes/summary-lists/medical-info-summary.njk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/_includes/summary-lists/medical-info-summary.njk b/app/views/_includes/summary-lists/medical-info-summary.njk index d452eb37..40d128ab 100644 --- a/app/views/_includes/summary-lists/medical-info-summary.njk +++ b/app/views/_includes/summary-lists/medical-info-summary.njk @@ -153,13 +153,13 @@ {% set mammogramsAction = { href: "./previous-mammograms/add" | urlWithReferrer(mammogramsAddReferrerChain), text: "Add a mammogram", - visuallyHiddenText: "reported mammograms" + visuallyHiddenText: "recorded mammograms" } | openInModal %} {% else %} {% set mammogramsAction = { href: "./confirm-information/previous-mammograms" | urlWithReferrer(currentUrl), text: "View or change", - visuallyHiddenText: "reported mammograms" + visuallyHiddenText: "recorded mammograms" } %} {% endif %} @@ -203,7 +203,7 @@ {% if not showOnlyPopulated or additionalMammogramsCount > 0 %} {% set rows = rows | push({ key: { - text: "Reported mammograms" + text: "Recorded mammograms" }, value: { html: previousMammogramsHtml From 6381a1ca858a9d23d425628929995569ddce482f Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:25:56 +0100 Subject: [PATCH 13/29] Update comment for clarity on mammogram reporting --- app/lib/generators/previous-mammogram-generator.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/generators/previous-mammogram-generator.js b/app/lib/generators/previous-mammogram-generator.js index 58ea3cb9..0366e3bc 100644 --- a/app/lib/generators/previous-mammogram-generator.js +++ b/app/lib/generators/previous-mammogram-generator.js @@ -259,7 +259,7 @@ const generatePreviousMammograms = ({ eventDate, addedByUserId, rate }) => { ? rate : (config.generation?.previousMammogramRate ?? 0.2) - // Decide whether this event has reported mammograms + // Decide whether this event has recorded mammograms if (Math.random() > effectiveRate) { return null } From c248d1c738fd6d6e34184ddaa4e73fb69a00cf59 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:28:06 +0100 Subject: [PATCH 14/29] Update wording from 'reported' to 'disclosed' --- app/views/_includes/summary-lists/questionnaire.njk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/_includes/summary-lists/questionnaire.njk b/app/views/_includes/summary-lists/questionnaire.njk index 38b4200f..a6eabec8 100644 --- a/app/views/_includes/summary-lists/questionnaire.njk +++ b/app/views/_includes/summary-lists/questionnaire.njk @@ -227,14 +227,14 @@
  • Details: {{questionnaire.skinChangeDetails}}
    • {% else %} - {{ questionnaire.skinChanges | formatAnswer({ noText: "No changes reported" }) }} + {{ questionnaire.skinChanges | formatAnswer({ noText: "No changes disclosed" }) }} {% endif %} {% endset %} {% set nippleSymptomsValue %} {% if questionnaire.nippleSymptoms %} {% if questionnaire.nippleSymptoms.includes("none") %} - No symptoms reported + No symptoms disclosed {% else %}
      {% for symptom in questionnaire.nippleSymptoms %} @@ -282,7 +282,7 @@ value: { text: questionnaire.lumpsNoticed | formatAnswer({ yesValue: questionnaire.lumpDetails, - noText: "No lumps reported" + noText: "No lumps disclosed" }) }, actions: { @@ -302,7 +302,7 @@ value: { text: questionnaire.shapeChanges | formatAnswer({ yesValue: questionnaire.shapeChangeDetails, - noText: "No changes reported" + noText: "No changes disclosed" }) }, actions: { From 1f533b697e48521304c24d9f197fd37519fc1dd7 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:28:53 +0100 Subject: [PATCH 15/29] Update comment for previous mammogram rate --- app/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/config.js b/app/config.js index 3f2ac515..8b00e2a3 100644 --- a/app/config.js +++ b/app/config.js @@ -78,6 +78,6 @@ module.exports = { generation: { numberOfParticipants: 1000, bookingProbability: 0.8, // 80% of slots are booked - previousMammogramRate: 0.05 // Rate of completed events with reported previous mammograms + previousMammogramRate: 0.05 // Rate of completed events with recorded previous mammograms } } From ad41a3e2620d734d45af82fd42dd6b9c6eb9117e Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:29:51 +0100 Subject: [PATCH 16/29] Update condition to check for recorded mammograms --- app/views/reading/batch.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/reading/batch.html b/app/views/reading/batch.html index 86a24871..f8e8e7d7 100644 --- a/app/views/reading/batch.html +++ b/app/views/reading/batch.html @@ -251,7 +251,7 @@

      Reading session cases

      {% endif %} {% if (data.settings.debugMode | falsify) %} - {% if event | hasReportedMammograms %} + {% if event | hasRecordedMammograms %}
      {{ "Has priors" | toTag }} {% endif %} {% if event.mammogramData.metadata.hasAdditionalImages %} @@ -440,7 +440,7 @@

      Reading session cases

      {{ "Awaiting priors" | toTag }} {% endif %} {% if (data.settings.debugMode | falsify) %} - {% if event | hasReportedMammograms %} + {% if event | hasRecordedMammograms %}
      {{ "Has priors" | toTag }} {% endif %} {% if event.mammogramData.metadata.hasAdditionalImages %} From 31717b312abb1fde36ee609cc2f56cdd65f01b48 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Tue, 23 Jun 2026 15:30:59 +0100 Subject: [PATCH 17/29] Update condition for mammogram reporting check --- app/views/reading/session.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/reading/session.html b/app/views/reading/session.html index 5356a2bf..583ad02e 100644 --- a/app/views/reading/session.html +++ b/app/views/reading/session.html @@ -259,7 +259,7 @@

      Reading session cases

      {% endif %} {% if (data.settings.debugMode | falsify) %} - {% if event | hasReportedMammograms %} + {% if event | hasRecordedMammograms %}
      {{ "Has priors" | toTag }} {% endif %} {% if event.mammogramData.metadata.hasAdditionalImages %} @@ -450,7 +450,7 @@

      Reading session cases

      {{ "Awaiting priors" | toTag }} {% endif %} {% if (data.settings.debugMode | falsify) %} - {% if event | hasReportedMammograms %} + {% if event | hasRecordedMammograms %}
      {{ "Has priors" | toTag }} {% endif %} {% if event.mammogramData.metadata.hasAdditionalImages %} From 2e12b4b8d74b60506f60a237d0389d201375344f Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Fri, 26 Jun 2026 10:02:23 +0100 Subject: [PATCH 18/29] Rename 'Recorded mammograms' to 'Disclosed mammograms' --- app/views/_includes/medical-information/mammogram-history.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/_includes/medical-information/mammogram-history.njk b/app/views/_includes/medical-information/mammogram-history.njk index 16f819de..1d2b1795 100644 --- a/app/views/_includes/medical-information/mammogram-history.njk +++ b/app/views/_includes/medical-information/mammogram-history.njk @@ -31,7 +31,7 @@ {# User-added unverified mammograms #} {% if hasAdditionalMammograms %} -

      Recorded mammograms

      +

      Disclosed mammograms

      {% set userMammogramRows = [] %} {% for previousMammogram in event.previousMammograms %} @@ -91,7 +91,7 @@ {% set mammogramValueHtml = mammogramValueLines | join('
      ') %} {% set keyHtml %} - Recorded {{ previousMammogram.dateAdded | formatDate }} + Added {{ previousMammogram.dateAdded | formatDate }} {% if previousMammogram.addedBy %} by {{ previousMammogram.addedBy | getUsername({ From 9e75d72746bc85d56004b026a0c16127f31d80aa Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Fri, 26 Jun 2026 10:08:15 +0100 Subject: [PATCH 19/29] Update messages from 'recorded' to 'added' --- .../_includes/summary-lists/medical-info-summary.njk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/_includes/summary-lists/medical-info-summary.njk b/app/views/_includes/summary-lists/medical-info-summary.njk index 40d128ab..2664f8f7 100644 --- a/app/views/_includes/summary-lists/medical-info-summary.njk +++ b/app/views/_includes/summary-lists/medical-info-summary.njk @@ -45,7 +45,7 @@ {# Build symptoms HTML #} {% set symptomsHtml %} {% if symptomsCount == 0 %} -

      No symptoms recorded

      +

      No symptoms added

      {% elif symptomsCount == 1 %}

      {{ symptomSummaries[0] }}

      {% else %} @@ -72,7 +72,7 @@ {# Build breast features HTML #} {% set breastFeaturesHtml %} {% if breastFeaturesCount == 0 %} -

      No breast features recorded

      +

      No breast features added

      {% elseif breastFeaturesCount == 1 %}

      {{ breastFeatureSummaries[0] }}

      {% else %} @@ -153,13 +153,13 @@ {% set mammogramsAction = { href: "./previous-mammograms/add" | urlWithReferrer(mammogramsAddReferrerChain), text: "Add a mammogram", - visuallyHiddenText: "recorded mammograms" + visuallyHiddenText: "mammograms added" } | openInModal %} {% else %} {% set mammogramsAction = { href: "./confirm-information/previous-mammograms" | urlWithReferrer(currentUrl), text: "View or change", - visuallyHiddenText: "recorded mammograms" + visuallyHiddenText: "mammograms added" } %} {% endif %} @@ -203,7 +203,7 @@ {% if not showOnlyPopulated or additionalMammogramsCount > 0 %} {% set rows = rows | push({ key: { - text: "Recorded mammograms" + text: "Mammograms added" }, value: { html: previousMammogramsHtml @@ -285,7 +285,7 @@ {% endif %} {% if rows | length == 0 %} -

      No medical information recorded.

      +

      No medical information added.

      {% else %} {{ summaryList({ rows: rows | removeLastRowBorder From a334d7a7a2fc994745b3e7de4a0dd8bd5b023226 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Fri, 26 Jun 2026 10:10:57 +0100 Subject: [PATCH 20/29] Update text for recent mammograms section --- app/views/reading/workflow/opinion.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/reading/workflow/opinion.html b/app/views/reading/workflow/opinion.html index f03a213f..16382bf1 100644 --- a/app/views/reading/workflow/opinion.html +++ b/app/views/reading/workflow/opinion.html @@ -160,7 +160,7 @@

      {% call insetText({ classes: "app-inset-text--compact" if data.settings.compactMode in ["true", true] }) %} -

      Recent mammograms recorded

      +

      Recent mammogram added

      {{ unrequestedHtml | safe }} {% endcall %}

    From db30e88b7d21413430af30b7b722863d0ab55306 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Fri, 26 Jun 2026 10:21:09 +0100 Subject: [PATCH 21/29] Update message for unrecorded symptoms --- app/views/_includes/cards/medical-information/symptoms.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/_includes/cards/medical-information/symptoms.njk b/app/views/_includes/cards/medical-information/symptoms.njk index 4ce615ab..218b3bfe 100644 --- a/app/views/_includes/cards/medical-information/symptoms.njk +++ b/app/views/_includes/cards/medical-information/symptoms.njk @@ -7,7 +7,7 @@ {% if not hasSymptoms %} {% set insetHtml %} -

    No symptoms have been recorded for this participant.

    +

    No symptoms have been added for this participant.

    {% endset %} {{ insetText({ html: insetHtml @@ -32,4 +32,4 @@ headingLevel: "2", feature: false, descriptionHtml: symptomsCardHtml -}) }} \ No newline at end of file +}) }} From 0c1d1aaac922e10c1cf36c41549472d33be7fc87 Mon Sep 17 00:00:00 2001 From: Danny Chadburn Date: Fri, 26 Jun 2026 10:22:13 +0100 Subject: [PATCH 22/29] Update text for breast features count display --- app/views/_includes/medical-information/breast-features.njk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/_includes/medical-information/breast-features.njk b/app/views/_includes/medical-information/breast-features.njk index f8333e1f..aa40dbc6 100644 --- a/app/views/_includes/medical-information/breast-features.njk +++ b/app/views/_includes/medical-information/breast-features.njk @@ -8,7 +8,7 @@ {% if hasBreastFeatures %}

    - {{ breastFeaturesCount }} breast {{ "feature" | pluralise(breastFeaturesCount) }} recorded + {{ breastFeaturesCount }} breast {{ "feature" | pluralise(breastFeaturesCount) }} added