Get new image views working

Author: edwardhorsford

app/assets/sass/_misc.scss

@@ -1,7 +1,7 @@
 .app-mammogram-image--placeholder {
   background-color: black;
-  width: 150px;
-  height:200px;
+  width: 75px;
+  height:100px;
 
   p {
     color: white;

app/lib/generators/mammogram-generator.js

@@ -16,14 +16,13 @@ const REPEAT_REASONS = [
   'patient movement',
   'positioning issue',
   'exposure issue',
-  'breast not fully imaged',
   'blurred image',
   'technical fault'
 ]
 
 // Probability settings for repeats
 const REPEAT_PROBABILITIES = {
-  needsRepeat: 0.15, // 15% chance of needing any repeat
+  needsRepeat: 0.35, // 15% chance of needing any repeat
   multipleRepeats: 0.2 // 20% chance of needing more than one repeat if already repeating
 }
 
@@ -63,8 +62,8 @@ const generateViewImages = ({ side, view, accessionBase, startIndex, startTime,
     url: generateImageUrl(side, view, `${accessionBase}/${currentIndex}`)
   })
 
-  // Generate repeats if needed (and if we're in seed mode or randomly need them)
-  if (needsRepeat && isSeedData) {
+  // Generate repeats if needed
+  if (needsRepeat) {
     const repeatCount = Math.random() < REPEAT_PROBABILITIES.multipleRepeats ? 2 : 1
 
     for (let i = 0; i < repeatCount; i++) {
@@ -82,6 +81,8 @@ const generateViewImages = ({ side, view, accessionBase, startIndex, startTime,
   return {
     side,
     view,
+    viewShort: view === 'mediolateral oblique' ? 'MLO' : 'CC',
+    viewShortWithSide: `${side === 'right' ? 'R' : 'L'}${view === 'mediolateral oblique' ? 'MLO' : 'CC'}`,
     images,
     isRepeat: needsRepeat && isSeedData,
     repeatReason: needsRepeat && isSeedData ? faker.helpers.arrayElement(REPEAT_REASONS) : null

app/lib/utils/objects.js

@@ -0,0 +1,56 @@
+// app/lib/utils/objects.js
+
+const _ = require('lodash')
+
+/**
+ * Extract all values from an object into a flat array
+ * @param {Object} obj - The object to extract values from
+ * @param {Object} [options] - Options for value extraction
+ * @param {boolean} [options.recursive=false] - Whether to recursively extract values from nested objects
+ * @param {boolean} [options.includeArrays=true] - Whether to include array values
+ * @param {boolean} [options.removeEmpty=false] - Whether to remove null/undefined values
+ * @returns {Array} Array of all values from the object
+ * @example
+ * getObjectValues({ name: 'Jane', age: 30 }) // Returns ['Jane', 30]
+ * getObjectValues({ user: { name: 'Jane' }}, { recursive: true }) // Returns ['Jane']
+ */
+const getObjectValues = (obj, options = {}) => {
+  const {
+    recursive = false,
+    includeArrays = true,
+    removeEmpty = false
+  } = options
+
+  if (!obj || typeof obj !== 'object') {
+    return []
+  }
+
+  // Get initial values
+  let values = Object.values(obj)
+
+  if (recursive) {
+    values = values.reduce((acc, val) => {
+      // If value is an object, recursively get its values
+      if (val && typeof val === 'object' && !Array.isArray(val)) {
+        return [...acc, ...getObjectValues(val, options)]
+      }
+      return [...acc, val]
+    }, [])
+  }
+
+  // Handle arrays based on options
+  if (!includeArrays) {
+    values = values.filter(val => !Array.isArray(val))
+  }
+
+  // Remove empty values if specified
+  if (removeEmpty) {
+    values = values.filter(val => val !== null && val !== undefined)
+  }
+
+  return values
+}
+
+module.exports = {
+  getObjectValues
+}

app/lib/utils/strings.js

@@ -1,5 +1,8 @@
 // app/lib/utils/strings.js
 
+const pluralizeLib = require('pluralize')
+
+
 /**
  * Convert string to sentence case, removing leading/trailing whitespace
  * @param {string} input - String to convert
@@ -240,6 +243,28 @@ const formatNhsNumber = (input) => {
 // formatNhsNumber(4857773456)   // returns '485 777 3456'
 // formatNhsNumber('485 777 3456') // returns '485 777 3456'
 
+/**
+ * Make a word plural based on a count
+ * @param {string} word - Word to pluralise
+ * @param {...*} args - Additional arguments (e.g. count) passed to pluralise
+ * @returns {string} Pluralized word
+ * @example
+ * pluralise('cat') // returns 'cats'
+ * pluralise('cat', 1) // returns 'cat'
+ * pluralise('cat', '2') // returns 'cats'
+ */
+const pluralise = (word, ...args) => {
+  if (!word) return ''
+  if (typeof word !== 'string') return word
+
+  // Convert first arg to number if it looks like one
+  if (args.length && !isNaN(args[0])) {
+    args[0] = Number(args[0])
+  }
+
+  return pluralizeLib(word, ...args)
+}
+
 module.exports = {
   addIndefiniteArticle,
   formatCurrency,
@@ -260,4 +285,5 @@ module.exports = {
   startsWith,
   stringLiteral,
   formatPhoneNumber,
+  pluralise
 }

app/routes/events.js

@@ -1,5 +1,8 @@
 // app/routes/events.js
+const dayjs = require('dayjs')
+
 const { getFullName } = require('../lib/utils/participants')
+const { generateMammogramImages } = require('../lib/generators/mammogram-generator')
 
 /**
  * Get single event and its related data
@@ -111,7 +114,7 @@ module.exports = router => {
     }
   })
 
-  const MAMMOGRAPHY_VIEWS = ['medical-information', 'record-medical-information', 'ready-for-imaging', 'awaiting-images', 'images', 'imaging', 'confirm', 'screening-complete', 'attended-not-screened-reason']
+  const MAMMOGRAPHY_VIEWS = ['medical-information', 'record-medical-information', 'ready-for-imaging', 'awaiting-images', 'images', 'confirm', 'screening-complete', 'attended-not-screened-reason']
 
   // Event within clinic context
   router.get('/clinics/:clinicId/events/:eventId/:view', (req, res, next) => {
@@ -121,6 +124,35 @@ module.exports = router => {
     } else next()
   })
 
+  // Specific route for imaging view
+  router.get('/clinics/:clinicId/events/:eventId/imaging', (req, res) => {
+    const { eventId } = req.params
+    const event = req.session.data.events.find(e => e.id === eventId)
+
+    // If no mammogram data exists, generate it
+    if (!event.mammogramData) {
+      const eventIndex = req.session.data.events.findIndex(e => e.id === eventId)
+      // Set start time to 3 minutes ago to simulate an in-progress screening
+      const startTime = dayjs().subtract(3, 'minutes').toDate()
+      const mammogramData = generateMammogramImages({
+        startTime,
+        isSeedData: false
+      })
+
+      // Update both session data and locals
+      const updatedEvent = {
+        ...event,
+        mammogramData
+      }
+
+      req.session.data.events[eventIndex] = updatedEvent
+      res.locals.event = updatedEvent
+    }
+
+    res.render('events/mammography/imaging', {})
+  })
+
+
   // Handle medical information answer
   router.post('/clinics/:clinicId/events/:eventId/medical-information-answer', (req, res) => {
     const { clinicId, eventId } = req.params