Cleanup

Author: edwardhorsford

app/filters/nunjucks.js

@@ -8,9 +8,12 @@ const log = (a, description = null) => {
 }
 
 /**
- * Get user name by user ID
+ * Get user name by user ID with format options
  * @param {string} userId - ID of the user
- * @returns {string} User's name
+ * @param {Object} options - Display options
+ * @param {boolean} [options.identifyCurrentUser=false] - Whether to add "(you)" for current user
+ * @param {string} [options.format='full'] - Name format: 'full', 'short', or 'initial'
+ * @returns {string} User's name in requested format
  */
 const getUsername = function(userId, options={}) {
   if (!userId) return '';
@@ -21,12 +24,28 @@ const getUsername = function(userId, options={}) {
   const user = users.find(u => u.id === userId);
   if (!user) return userId;
 
+  // Format options: full (default), short (initial + surname), initial (just initials)
+  const format = options.format || 'full';
+
+  let formattedName;
+  switch (format) {
+    case 'short':
+      formattedName = `${user.firstName.charAt(0)}. ${user.lastName}`;
+      break;
+    case 'initial':
+      formattedName = `${user.firstName.charAt(0)}${user.lastName.charAt(0)}`;
+      break;
+    case 'full':
+    default:
+      formattedName = `${user.firstName} ${user.lastName}`;
+  }
+
   const currentUser = this.ctx.data.currentUser;
   if (options.identifyCurrentUser && user.id === currentUser.id) {
-    return `${user.firstName} ${user.lastName} (you)`;
+    return `${formattedName} (you)`;
   }
 
-  else return `${user.firstName} ${user.lastName}`;
+  return formattedName;
 }
 
 /**

app/lib/generators/reading-generator.js

@@ -138,10 +138,90 @@ const generateReadingData = (events, users) => {
     console.log(`Added first and second reads to ${count} events in the 2 oldest clinics`)
   }
 
+  // NEW: Add clinic where both reads are completed, but neither by the current user
+  if (clinics.length >= 3) {
+    let count = 0
+    // Use the next clinic for this scenario
+    const clinic = clinics[2]
+    console.log(`Adding a clinic with both reads completed by users other than current user to clinic ${clinic.id}`)
+
+    // Use the same base time for all reads in this clinic, then advance by 1 minute for each event
+    let baseReadTime = dayjs(generateRecentTimestamp(clinic.date, 30, 48))
+
+    // Add full first reads by third user
+    clinic.events.forEach(event => {
+      // Skip if already updated
+      if (updatedEventIds.has(event.id)) return
+
+      // Find the event in our array
+      const eventIndex = updatedEvents.findIndex(e => e.id === event.id)
+      if (eventIndex === -1) return
+
+      // Ensure the imageReading structure exists
+      if (!updatedEvents[eventIndex].imageReading) {
+        updatedEvents[eventIndex].imageReading = { reads: {} }
+      }
+
+      // Advance time by 1 minute for each read
+      baseReadTime = baseReadTime.add(1, 'minute')
+
+      // First read (by third user)
+      const firstResult = weighted.select(readResults)
+      const firstReadTime = baseReadTime.toISOString()
+
+      updatedEvents[eventIndex].imageReading.reads[thirdReader.id] = {
+        result: firstResult,
+        readerId: thirdReader.id,
+        readerType: thirdReader.role,
+        timestamp: firstReadTime
+      }
+
+      updatedEventIds.add(event.id)
+      count++
+    })
+
+    // Add second reads by second user to 60% of events
+    const eventsForSecondRead = clinic.events
+      .filter(event => updatedEventIds.has(event.id))
+      .slice(0, Math.ceil(clinic.events.length * 0.6)) // Take 60% of events for second read
+
+    baseReadTime = dayjs(generateRecentTimestamp(clinic.date, 12, 24)) // More recent timestamp for second reads
+
+    eventsForSecondRead.forEach(event => {
+      const eventIndex = updatedEvents.findIndex(e => e.id === event.id)
+      if (eventIndex === -1) return
+
+      // Get the first read result
+      const firstRead = updatedEvents[eventIndex].imageReading.reads[thirdReader.id]
+      if (!firstRead) return
+
+      // Second read (by second user) - 80% chance of agreement
+      let secondResult = firstRead.result
+      if (Math.random() > 0.8) {
+        // Different result for disagreement
+        const otherResults = Object.keys(readResults).filter(r => r !== firstRead.result)
+        secondResult = otherResults[Math.floor(Math.random() * otherResults.length)]
+      }
+
+      // Advance time by 1-2 minutes for each read
+      baseReadTime = baseReadTime.add(1 + Math.floor(Math.random() * 2), 'minute')
+      const secondReadTime = baseReadTime.toISOString()
+
+      updatedEvents[eventIndex].imageReading.reads[secondReader.id] = {
+        result: secondResult,
+        readerId: secondReader.id,
+        readerType: secondReader.role,
+        timestamp: secondReadTime
+      }
+    })
+
+    console.log(`Added a clinic with ${clinic.events.length} first reads and ${eventsForSecondRead.length} second reads, both done by users other than current user`)
+  }
+
   // NEXT TWO CLINICS: First user (current user) reads all first, but no second reads
-  if (clinics.length >= 4) {
+  if (clinics.length >= 5) {
     let count = 0
-    for (let i = 2; i < 4 && i < clinics.length; i++) {
+    for (let i = 3; i < 5 && i < clinics.length; i++) {
       const clinic = clinics[i]
       console.log(`Adding first reads by current user to clinic ${clinic.id}`)
 
@@ -183,9 +263,9 @@ const generateReadingData = (events, users) => {
   }
 
   // NEXT TWO CLINICS: Second user reads all first, waiting for first user (current user) to do second reads
-  if (clinics.length >= 6) {
+  if (clinics.length >= 7) {
     let count = 0
-    for (let i = 4; i < 6 && i < clinics.length; i++) {
+    for (let i = 5; i < 7 && i < clinics.length; i++) {
       const clinic = clinics[i]
       console.log(`Adding first reads by second user to clinic ${clinic.id}`)
 
@@ -227,9 +307,9 @@ const generateReadingData = (events, users) => {
   }
 
   // NEXT TWO OLDEST CLINICS: 75% first read by third user
-  if (clinics.length >= 8) {
+  if (clinics.length >= 9) {
     let count = 0
-    for (let i = 6; i < 8 && i < clinics.length; i++) {
+    for (let i = 7; i < 9 && i < clinics.length; i++) {
       const clinic = clinics[i]
       console.log(`Adding partial first reads to clinic ${clinic.id}`)
 

app/routes/reading.js

@@ -407,8 +407,18 @@ module.exports = router => {
 
   // Route for viewing a batch
   router.get('/reading/batch/:batchId', (req, res) => {
+    // Default to "your-reads" view
+    res.redirect(`/reading/batch/${req.params.batchId}/your-reads`)
+  })
+
+  // Route for viewing a batch with specific view
+  router.get('/reading/batch/:batchId/:view', (req, res) => {
     const data = req.session.data
-    const { batchId } = req.params
+    const { batchId, view } = req.params
+    const validViews = ['your-reads', 'all-reads']
+
+    // Validate view parameter
+    const selectedView = validViews.includes(view) ? view : 'your-reads'
 
     // Get the batch
     const batch = getReadingBatch(data, batchId)
@@ -450,9 +460,58 @@ module.exports = router => {
       events: enhancedEvents,
       readingStatus,
       firstUserReadableEvent,
-      clinic
+      clinic,
+      view: selectedView
     })
   })
+  // Route for viewing a batch
+  // router.get('/reading/batch/:batchId', (req, res) => {
+  //   const data = req.session.data
+  //   const { batchId } = req.params
+
+  //   // Get the batch
+  //   const batch = getReadingBatch(data, batchId)
+  //   if (!batch) {
+  //     // req.flash('error', 'Batch not found')
+  //     return res.redirect('/reading')
+  //   }
+
+  //   // Get enhanced events with reading metadata
+  //   const enhancedEvents = batch.eventIds
+  //     .map(eventId => data.events.find(e => e.id === eventId))
+  //     .filter(Boolean)
+  //     .map(event => {
+  //       // Add participant data and reading metadata
+  //       const participant = data.participants.find(p => p.id === event.participantId)
+  //       const metadata = getReadingMetadata(event)
+
+  //       return {
+  //         ...event,
+  //         participant,
+  //         readingMetadata: metadata
+  //       }
+  //     })
+
+  //   // Get reading status for the batch
+  //   const readingStatus = getReadingStatusForEvents(enhancedEvents, data.currentUser.id)
+
+  //   // Find first event user can read
+  //   const firstUserReadableEvent = getFirstUserReadableEvent(enhancedEvents, data.currentUser.id)
+
+  //   // Get clinic data if this is a clinic batch
+  //   let clinic = null
+  //   if (batch.clinicId) {
+  //     clinic = data.clinics.find(c => c.id === batch.clinicId)
+  //   }
+
+  //   res.render('reading/batch', {
+  //     batch,
+  //     events: enhancedEvents,
+  //     readingStatus,
+  //     firstUserReadableEvent,
+  //     clinic
+  //   })
+  // })
 
   // Add middleware for batch-based events similar to the clinic-based ones
   router.use('/reading/batch/:batchId/events/:eventId', (req, res, next) => {