Content fixes (#274)

* Clean up mammogram data bugs and data display

* Make hint dates dynamic

Author: edwardhorsford

app/lib/utils/dates.js

@@ -704,13 +704,15 @@ const calculateDurationMinutes = (startTime, endTime) => {
   if (!startTime || !endTime) return 0
 
   // If it looks like just a time (contains no date), prefix with dummy date
-  const startDatetime = startTime.includes('T') || startTime.includes('-')
-    ? startTime
-    : `2000-01-01T${startTime}`
-  
-  const endDatetime = endTime.includes('T') || endTime.includes('-')
-    ? endTime
-    : `2000-01-01T${endTime}`
+  const startDatetime =
+    startTime.includes('T') || startTime.includes('-')
+      ? startTime
+      : `2000-01-01T${startTime}`
+
+  const endDatetime =
+    endTime.includes('T') || endTime.includes('-')
+      ? endTime
+      : `2000-01-01T${endTime}`
 
   const start = dayjs(startDatetime)
   const end = dayjs(endDatetime)
@@ -790,6 +792,34 @@ const remove = (dateInput, amount, unit) => {
   return add(dateInput, -amount, unit)
 }
 
+/**
+ * Get the season name and year for a given date
+ *
+ * @param {string} dateInput - ISO date string
+ * @returns {string} Season and year, e.g. 'winter 2025', 'summer 2026'
+ * @example
+ * toSeason('2025-12-01') // 'winter 2025'
+ * toSeason('2026-06-15') // 'summer 2026'
+ */
+const toSeason = (dateInput) => {
+  if (!dateInput) return ''
+
+  const date = dayjs(dateInput)
+  if (!date.isValid()) return ''
+
+  // dayjs month() is 0-based, convert to 1-based
+  const month = date.month() + 1
+  const year = date.year()
+
+  let season
+  if (month >= 3 && month <= 5) season = 'spring'
+  else if (month >= 6 && month <= 8) season = 'summer'
+  else if (month >= 9 && month <= 11) season = 'autumn'
+  else season = 'winter'
+
+  return `${season} ${year}`
+}
+
 module.exports = {
   arrayOrObjectToDateObject,
   monthYearToDateObject,
@@ -818,7 +848,8 @@ module.exports = {
   isWithinDayRange,
   calculateDurationMinutes,
   add,
-  remove
+  remove,
+  toSeason
 }
 
 /**

app/routes/events.js

@@ -679,9 +679,34 @@ module.exports = (router) => {
 
       // Helper function to build mammogram object with ID and metadata
       const buildMammogramObject = (tempData, additionalFields = {}) => {
+        const cleaned = { ...tempData }
+
+        // approximateDate can arrive as an array if both conditional inputs
+        // (moreThanSixMonths and lessThanSixMonths) are submitted together.
+        // Pick the first non-empty value.
+        if (Array.isArray(cleaned.approximateDate)) {
+          cleaned.approximateDate = cleaned.approximateDate.find(v => v) || ''
+        }
+
+        // Clear date fields not relevant to the selected dateType
+        if (cleaned.dateType === 'dateKnown') {
+          delete cleaned.approximateDate
+        }
+        else {
+          delete cleaned.dateTaken
+        }
+
+        // Clear location-specific fields that weren't selected
+        if (cleaned.location !== 'bsu') delete cleaned.bsu
+        if (cleaned.location !== 'otherUk') delete cleaned.otherUk
+        if (cleaned.location !== 'otherNonUk') delete cleaned.otherNonUk
+
+        // Clear previousName if the same name was used
+        if (cleaned.sameName !== 'differentName') delete cleaned.previousName
+
         const mammogram = {
-          id: tempData.id || generateId(),
-          ...tempData,
+          id: cleaned.id || generateId(),
+          ...cleaned,
           ...additionalFields
         }
 

app/views/_includes/medical-information/mammogram-history.njk

@@ -46,13 +46,13 @@
         previousMammogram.dateTaken | formatDate + " (" + (previousMammogram.dateTaken | formatDate | formatRelativeDate | asHint) + ")"
       ) %}
     {% elseif previousMammogram.dateType == 'moreThanSixMonths' %}
-      {% set dateText = "Approximately taken 6 months or more ago" %}
+      {% set dateText = "Taken 6 months or more ago" %}
       {% if previousMammogram.approximateDate %}
         {% set dateText = dateText + ": " + previousMammogram.approximateDate %}
       {% endif %}
       {% set mammogramValueLines = mammogramValueLines | push(dateText) %}
     {% elseif previousMammogram.dateType == 'lessThanSixMonths' %}
-      {% set dateText = "Approximately taken less than 6 months ago" %}
+      {% set dateText = "Taken less than 6 months ago" %}
       {% if previousMammogram.approximateDate %}
         {% set dateText = dateText + ": " + previousMammogram.approximateDate %}
       {% endif %}
@@ -65,7 +65,7 @@
     {% if previousMammogram.location == "currentBsu" %}
       {% set mammogramValueLines = mammogramValueLines | push(unit.name) %}
     {% elseif previousMammogram.location == "bsu" %}
-      {% set mammogramValueLines = mammogramValueLines | push(previousMammogram.bsu) %}
+      {% set mammogramValueLines = mammogramValueLines | push("NHS BSU: " + previousMammogram.bsu) %}
     {% elseif previousMammogram.location == "otherUk" %}
       {% set mammogramValueLines = mammogramValueLines | push("In the UK: " + (previousMammogram.otherUk | nl2br | safe)) %}
     {% elseif previousMammogram.location == "otherNonUk" %}

app/views/events/previous-mammograms/form.html

@@ -174,7 +174,7 @@ <h1 class="nhsuk-heading-l">
         text: "Approximate date"
       },
       hint: {
-        text: "For example, April 2018 or summer 2021"
+        text: "For example, " + (now() | remove(1, 'year') | formatDate('MMMM YYYY')) + " or " + (now() | remove(1, 'year') | toSeason)
       },
       classes: "nhsuk-u-width-two-thirds",
       value: event.previousMammogramTemp.approximateDate
@@ -191,7 +191,7 @@ <h1 class="nhsuk-heading-l">
         text: "Approximate date"
       },
       hint: {
-        text: "For example, April 2018 or summer 2021"
+        text: "For example, " + (now() | remove(3, 'months') | formatDate('MMMM YYYY')) + " or " + (now() | remove(3, 'months') | toSeason)
       },
       classes: "nhsuk-u-width-two-thirds",
       value: event.previousMammogramTemp.approximateDate

docs/IMAGE-READING-TECHNICAL-SUMMARY.md

@@ -6,31 +6,6 @@ This document provides a technical overview of the image reading section of the
 
 ## Refactoring Plan
 
-### Completed
-
-- [x] Created `reading/workflow/opinion.html` - main entry point with opinion UI inline
-- [x] Moved workflow pages to `reading/workflow/` folder
-- [x] Updated routes to render from `workflow/` subfolder
-- [x] Deleted `_includes/reading/opinion-ui.njk` (now inline in opinion.html)
-- [x] Removed opinion-ui include from layout
-- [x] Added `isReadingWorkflow` flag in routes middleware
-- [x] Extracted status bar to `_includes/reading/reading-status-bar.njk`
-- [x] Extracted navigation to `_includes/reading/workflow-navigation.njk`
-- [x] Simplified `layout-reading.html` (204 → 51 lines)
-- [x] Primary nav swap - shows "Batch list" link when in reading workflow
-- [x] Deleted legacy files: assessment.html, medical-information.html, images.html, participant-details.html, awaiting-annotations.html
-- [x] Removed legacy steps array from routes
-- [x] Deleted unused `_includes/reading/secondary-navigation.njk`
-- [x] Navigation refactor: `showWorkflowNav` flag for opinion page, back link default for child pages
-- [x] Removed `hideSecondaryNavigation` from child pages (replaced by unified back link logic)
-- [x] Created `review.html` - confirmation page before saving opinion
-- [x] Created `existing-read.html` - view saved read with option to change
-- [x] Route renamed: `/assessment-answer` → `/opinion-answer`
-- [x] Route renamed: `/result-:resultType` → `/save-opinion`
-- [x] Form data now saves directly to `imageReadingTemp` via form binding
-- [x] Base event route auto-redirects to `existing-read` or `opinion` based on read status
-- [x] Simplified workflow navigation - all links go to base event URL
-
 ### Future Work
 
 - [ ] Make sure fields correctly save to data.imageReadingTemp