2 dec 2025 bugfixes (#206)

* Default standard views on manual details

* Remove buttons which don't allow multiple

* Use referrers to return to the page we were on and persist flash messages

Author: edwardhorsford

app/routes/events.js

@@ -286,9 +286,15 @@ module.exports = (router) => {
   // Event within clinic context
   router.get('/clinics/:clinicId/events/:eventId', (req, res) => {
     const { clinicId, eventId } = req.params
-    // res.render('events/show', {
-    // })
-    res.redirect(`/clinics/${clinicId}/events/${eventId}/appointment`)
+
+    // Preserve query parameters when redirecting
+    const queryString = Object.keys(req.query).length
+      ? '?' + new URLSearchParams(req.query).toString()
+      : ''
+
+    res.redirect(
+      `/clinics/${clinicId}/events/${eventId}/appointment${queryString}`
+    )
   })
 
   router.post(
@@ -2699,7 +2705,12 @@ module.exports = (router) => {
       req.flash('success', 'Appointment cancellation undone')
     }
 
-    res.redirect(`/clinics/${clinicId}/events/${eventId}`)
+    // Use referrer system to return to originating page
+    const returnUrl = getReturnUrl(
+      `/clinics/${clinicId}/events/${eventId}/appointment`,
+      req.query.referrerChain
+    )
+    res.redirect(returnUrl)
   })
 
   // Handle undo reschedule appointment
@@ -2724,33 +2735,48 @@ module.exports = (router) => {
         req.flash('success', 'Reschedule request undone')
       }
 
-      res.redirect(`/clinics/${clinicId}/events/${eventId}`)
+      // Use referrer system to return to originating page
+      const returnUrl = getReturnUrl(
+        `/clinics/${clinicId}/events/${eventId}/appointment`,
+        req.query.referrerChain
+      )
+      res.redirect(returnUrl)
     }
   )
 
   // Handle undo check in
-  router.get(
-    '/clinics/:clinicId/events/:eventId/undo-check-in',
-    (req, res) => {
-      const { clinicId, eventId } = req.params
-      const data = req.session.data
-      const event = getEvent(data, eventId)
+  router.get('/clinics/:clinicId/events/:eventId/undo-check-in', (req, res) => {
+    const { clinicId, eventId } = req.params
+    const data = req.session.data
+    const event = getEvent(data, eventId)
 
-      if (event && event.status === 'event_checked_in') {
-        const participantName = getFullName(data.participant)
+    if (event && event.status === 'event_checked_in') {
+      const participantName = getFullName(data.participant)
 
-        // Save changes
-        saveTempEventToEvent(data)
+      // Save changes
+      saveTempEventToEvent(data)
 
-        // Revert to scheduled status
-        updateEventStatus(data, eventId, 'event_scheduled')
+      // Revert to scheduled status
+      updateEventStatus(data, eventId, 'event_scheduled')
 
-        req.flash('success', `${participantName} is no longer checked in for their appointment`)
-        
-        return res.redirect(`/clinics/${clinicId}`)
-      }
+      req.flash(
+        'success',
+        `${participantName} is no longer checked in for their appointment`
+      )
 
-      res.redirect(`/clinics/${clinicId}/events/${eventId}`)
+      // Use referrer system to return to originating page
+      const returnUrl = getReturnUrl(
+        `/clinics/${clinicId}`,
+        req.query.referrerChain
+      )
+      return res.redirect(returnUrl)
     }
-  )
-}
+
+    // Use referrer system for fallback too
+    const returnUrl = getReturnUrl(
+      `/clinics/${clinicId}/events/${eventId}/appointment`,
+      req.query.referrerChain
+    )
+    res.redirect(returnUrl)
+  })
+}

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

@@ -608,13 +608,17 @@
 
   <div class="nhsuk-button-group app-button-group--small">
     {% for typeData in data.medicalHistoryTypes %}
-      {# {% if typeData.canHaveMultiple %} #}
+      {% set existingItems = data.event.medicalInformation.medicalHistory[typeData.type] %}
+      {% set hasExistingItem = existingItems and existingItems | length > 0 %}
+      {% set canAdd = typeData.canHaveMultiple or not hasExistingItem %}
+      
+      {% if canAdd %}
         {{ button({
           text: typeData.name,
           href: contextUrl + "/medical-information/medical-history/" + typeData.slug + "/add" | urlWithReferrer(referrerChain | appendReferrer(currentUrl), scrollTo),
           classes: "nhsuk-button--secondary app-button--small"
         }) }}
-     {# {% endif %} #}
+      {% endif %}
 
     {% endfor %}
   </div>

app/views/events/appointment.html

@@ -175,19 +175,19 @@
           actions: {
             items: [
               {
-                href: "./undo-cancel",
+                href: "./undo-cancel" | urlWithReferrer(currentUrl),
                 text: "Undo cancel appointment",
                 visuallyHiddenText: "appointment"
               }
             ] if event.status == "event_cancelled" else ([
               {
-                href: "./undo-reschedule",
+                href: "./undo-reschedule" | urlWithReferrer(currentUrl),
                 text: "Undo reschedule request",
                 visuallyHiddenText: "appointment"
               }
             ] if event.status == "event_rescheduled" else ([
               {
-                href: "./undo-check-in",
+                href: "./undo-check-in" | urlWithReferrer(currentUrl),
                 text: "Undo check in",
                 visuallyHiddenText: "appointment"
               }

app/views/events/cancel-or-reschedule-appointment/details.html

@@ -8,8 +8,6 @@
 
 {% block pageContent %}
 
-  {% set unit = data.breastScreeningUnits | findById(clinic.breastScreeningUnitId) %}
-
   <h1 class="nhsuk-heading-l">
     <span class="nhsuk-caption-l">
       {{ participant | getFullName }}

app/views/events/images-manual-details.html

@@ -27,12 +27,12 @@ <h1>{{ pageHeading }}</h1>
   {% set mammogramTemp = event.mammogramDataTemp or {} %}
   {% set mammogramViews = event.mammogramData.views or {} %}
 
-  {% set viewsRightBreastCCCount = mammogramTemp.viewsRightBreastCCCount or mammogramViews.rightCraniocaudal.count or "" %}
-  {% set viewsRightBreastMLOCount = mammogramTemp.viewsRightBreastMLOCount or mammogramViews.rightMediolateralOblique.count or "" %}
-  {% set viewsRightBreastEklundCount = mammogramTemp.viewsRightBreastEklundCount or mammogramViews.rightEklund.count or "" %}
-  {% set viewsLeftBreastCCCount = mammogramTemp.viewsLeftBreastCCCount or mammogramViews.leftCraniocaudal.count or "" %}
-  {% set viewsLeftBreastMLOCount = mammogramTemp.viewsLeftBreastMLOCount or mammogramViews.leftMediolateralOblique.count or "" %}
-  {% set viewsLeftBreastEklundCount = mammogramTemp.viewsLeftBreastEklundCount or mammogramViews.leftEklund.count or "" %}
+  {% set viewsRightBreastCCCount = mammogramTemp.viewsRightBreastCCCount or mammogramViews.rightCraniocaudal.count or "1" %}
+  {% set viewsRightBreastMLOCount = mammogramTemp.viewsRightBreastMLOCount or mammogramViews.rightMediolateralOblique.count or "1" %}
+  {% set viewsRightBreastEklundCount = mammogramTemp.viewsRightBreastEklundCount or mammogramViews.rightEklund.count or "0" %}
+  {% set viewsLeftBreastCCCount = mammogramTemp.viewsLeftBreastCCCount or mammogramViews.leftCraniocaudal.count or "1" %}
+  {% set viewsLeftBreastMLOCount = mammogramTemp.viewsLeftBreastMLOCount or mammogramViews.leftMediolateralOblique.count or "1" %}
+  {% set viewsLeftBreastEklundCount = mammogramTemp.viewsLeftBreastEklundCount or mammogramViews.leftEklund.count or "0" %}
   {% set additionalDetails = mammogramTemp.additionalDetails or event.mammogramData.additionalDetails or "" %}
 
   {# Set mammogramSource for partial mammography question - prefer temp data, fall back to final data #}