4 July fixes (#114)

* Fix ethnicity answers not showing
* Make titles safe so html entities are escaped
* Remove reduntant logs from templates
* Dynamically route event routes
* Fix wrong path

Author: edwardhorsford

app/assets/javascript/mammogram-viewer.js

@@ -26,7 +26,7 @@ document.addEventListener('DOMContentLoaded', function() {
   const participantName = document.querySelector('meta[name="participant-name"]')?.getAttribute('content');
   const eventId = document.querySelector('meta[name="event-id"]')?.getAttribute('content');
 
-  console.log("Mammogram viewer check:", shouldShowViewer ? "SHOW" : "HIDE", "Event ID:", eventId);
+  // console.log("Mammogram viewer check:", shouldShowViewer ? "SHOW" : "HIDE", "Event ID:", eventId);
 
   // Update our reading context flag
   window.inReadingContext = shouldShowViewer;
@@ -58,7 +58,7 @@ document.addEventListener('DOMContentLoaded', function() {
     }
   } else if (!shouldShowViewer) {
     // We're on a page that should NOT show the viewer
-    console.log("Page lacks viewer meta tag or has it set to hide - closing viewer");
+    // console.log("Page lacks viewer meta tag or has it set to hide - closing viewer");
     MammogramViewer.close();
     currentEventId = '';
   }
@@ -205,7 +205,7 @@ const MammogramViewer = {
 
   // Close the viewer window - but only if it actually exists
   close: function() {
-    console.log("Attempting to close mammogram viewer");
+    // console.log("Attempting to close mammogram viewer");
 
     // Only close if we're not in the middle of navigation
     if (isNavigating) {

app/lib/utils/event-data.js

@@ -43,6 +43,7 @@ const updateEvent = (data, eventId, updatedEvent) => {
 
 /**
  * Update event status and add to history
+ * Also updates the temporary event data if it exists
  * @param {Object} data - Session data
  * @param {string} eventId - Event ID
  * @param {string} newStatus - New status
@@ -66,7 +67,14 @@ const updateEventStatus = (data, eventId, newStatus) => {
     ],
   }
 
+  // Update main data
   data.events[eventIndex] = updatedEvent
+
+  // Also update temp event data if it exists and matches this event
+  if (data.event && data.event.id === eventId) {
+    data.event = { ...updatedEvent }
+  }
+
   return updatedEvent
 }
 

app/routes/clinics.js

@@ -5,6 +5,7 @@ const { getFilteredClinics, getClinicEvents } = require('../lib/utils/clinics')
 const { filterEventsByStatus } = require('../lib/utils/status')
 const { getReturnUrl, urlWithReferrer, appendReferrer } = require('../lib/utils/referrers')
 const { getParticipant } = require('../lib/utils/participants')
+const { updateEventStatus } = require('../lib/utils/event-data')
 
 /**
  * Get clinic and its related data from id
@@ -236,17 +237,7 @@ module.exports = router => {
     }
 
     // Update the event
-    data.events[eventIndex] = {
-      ...event,
-      status: 'event_checked_in',
-      statusHistory: [
-        ...event.statusHistory,
-        {
-          status: 'event_checked_in',
-          timestamp: new Date().toISOString(),
-        },
-      ],
-    }
+    updateEventStatus(data, eventId, 'event_checked_in')
 
     // Save back to session
     req.session.data = data

app/routes/events.js

@@ -6,6 +6,8 @@ const { generateMammogramImages } = require('../lib/generators/mammogram-generat
 const { getEvent, saveTempEventToEvent, updateEventStatus } = require('../lib/utils/event-data')
 const generateId = require('../lib/utils/id-generator')
 const { getReturnUrl, urlWithReferrer, appendReferrer } = require('../lib/utils/referrers')
+const { createDynamicTemplateRoute } = require('../lib/utils/dynamic-routing')
+
 
 /**
  * Get single event and its related data
@@ -123,6 +125,8 @@ module.exports = router => {
     })
   })
 
+
+
   router.post('/clinics/:clinicId/events/:eventId/personal-details/ethnicity-answer', (req, res) => {
     const { clinicId, eventId } = req.params
     const data = req.session.data
@@ -217,7 +221,7 @@ module.exports = router => {
   // Main route in to starting an event - used to clear any temp data
   router.get('/clinics/:clinicId/events/:eventId/previous-mammograms/add', (req, res) => {
     delete req.session.data?.event?.previousMammogramTemp
-    res.render('events/mammography/previous-mammograms/edit')
+    res.render('events/previous-mammograms/edit')
   })
 
   // Save data about a mammogram
@@ -581,42 +585,6 @@ module.exports = router => {
     res.redirect(urlWithReferrer(`/clinics/${clinicId}/events/${eventId}/medical-information/symptoms/type`, req.query.referrerChain))
   })
 
-  const MAMMOGRAPHY_VIEWS = [
-    'medical-information-check',
-    'record-medical-information',
-    'ready-for-imaging',
-    'awaiting-images',
-
-    'confirm',
-    'screening-complete',
-    'attended-not-screened-reason',
-    'previous-mammograms/edit',
-    'previous-mammograms/appointment-should-not-proceed',
-    'previous-mammograms/proceed-anyway',
-    'medical-information/symptoms/type',
-    'medical-information/symptoms/details',
-    'personal-details/ethnicity',
-
-    // Completed screenings
-    'images',
-    'medical-information',
-  ]
-
-  // Event within clinic context
-  router.get('/clinics/:clinicId/events/:eventId/*', (req, res, next) => {
-    const view = req.params[0] // Gets the wildcard part
-
-    if (MAMMOGRAPHY_VIEWS.some(viewPath => viewPath === view)) {
-      res.render(`events/mammography/${view}`, {})
-    } else {
-      next()
-    }
-  })
-
-  // Event within clinic context
-  router.get('/clinics/:clinicId/events/:eventId/medical-information/:view', (req, res, next) => {
-    res.render(`events/mammography/medical-information/${req.params.view}`, {})
-  })
 
   // Specific route for imaging view
   router.get('/clinics/:clinicId/events/:eventId/imaging', (req, res) => {
@@ -637,7 +605,7 @@ module.exports = router => {
       res.locals.event = data.event
     }
 
-    res.render('events/mammography/imaging', {})
+    res.render('events/imaging', {})
   })
 
 
@@ -660,7 +628,7 @@ module.exports = router => {
   router.post('/clinics/:clinicId/events/:eventId/record-medical-information-answer', (req, res) => {
     const { clinicId, eventId } = req.params
     const data = req.session.data
-    const imagingCanProceed = data.event.appointment.imagingCanProceed
+    const imagingCanProceed = data?.event?.appointment?.imagingCanProceed
 
     if (!imagingCanProceed) {
       res.redirect(`/clinics/${clinicId}/events/${eventId}/record-medical-information`)
@@ -758,4 +726,12 @@ module.exports = router => {
     // res.redirect(`/clinics/${clinicId}/events/${eventId}/screening-complete`)
   })
 
+  // General purpose dynamic template route for events
+  // This should come after any more specific routes
+  router.get('/clinics/:clinicId/events/:eventId/*',
+    createDynamicTemplateRoute({
+      templatePrefix: 'events'
+    })
+  )
+
 }

app/views/_includes/reading/opinion-ui.njk

@@ -1,5 +1,5 @@
 {% set existingRead = event | getReadForUser %}
-{{ event | log("Existing Read")}}
+{{ existingRead | log("Existing Read")}}
 {% set existingResult = existingRead.result %}
 {% set hasSymptoms = event.medicalInformation.symptoms | length > 0 %}
 

app/views/_includes/summary-lists/rows/ethnicity.njk

@@ -10,6 +10,15 @@
   {%- endset %}
 {% endif %}
 
+{% set ethnicityHtml %}
+  {{ ethnicGroup if ethnicGroup }}
+  {% if ethnicBackground and ethnicBackground != 'Prefer not to say' %}
+    ({{ ethnicBackground | replace('Other', 'other') }})
+    {% elseif ethnicBackground == "Prefer not to say" %}
+      {{ ethnicBackground }}
+  {% endif %}
+{% endset %}
+
 
 {% set ethnicityRow = {
   key: {

app/views/_templates/layout-app.html

@@ -82,6 +82,18 @@
 
 {% block content %}
 
+{% if eventId and data.event %}
+  {{ data.event | log("Event data") }}
+{% endif %}
+
+{% if participantId and data.participant %}
+  {{ data.participant | log("Participant data") }}
+{% endif %}
+
+{% if clinicId and clinic %}
+  {{ clinic | log("Clinic data") }}
+{% endif %}
+
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-two-thirds">
 

app/views/_templates/layout-reading.html

@@ -22,8 +22,7 @@
 {# Custom header with image reading stats and participant name #}
 {% block header %}
   {{ super()}}
-  {{ participant | log("Participant") }}
-  {{ event | log("Event") }}
+
   {{ data.imageReadingTemp | log("ImageReadingTemp")}}
   {{ batch | log("Batch")}}
   <div class="app-reading-status">

app/views/_templates/layout.html

@@ -25,7 +25,7 @@
 <!-- Set the page title -->
 {% block pageTitle -%}
   {%- if pageHeading -%}
-    {{- pageHeading }} -
+    {{- pageHeading | safe }} -
   {%- endif -%}
   {{ " " + serviceName }} - NHS
 {%- endblock %}

app/views/clinics/show.html

@@ -13,8 +13,6 @@
   {# {% set events = data.events | getClinicEvents(clinicId) %} #}
   {% set events = allEvents %}
 
-  {{ clinic | log("Clinic") }}
-
   {# {% set clinicRiskType %}
     {% if clinic.riskLevels | length == 1 %}
       {{ clinic.riskLevels[0] }}