General code cleanup

Author: edwardhorsford

app/config.js

@@ -42,6 +42,8 @@ module.exports = {
   },
   reading: {
     blindReading: 'true', // Enable blind reading
+    urgentThreshold: 10, // 10 days and over
+    priorityThreshold: 7, // 7 days and over
   },
   screening: {
     outcomes: {

app/lib/utils/dates.js

@@ -114,23 +114,28 @@ const formatDateTime = (dateString, format = 'D MMMM YYYY, HH:mm') => {
  */
 const formatRelativeDate = (dateString, withoutSuffix = false) => {
   if (!dateString) return ''
+
+  // Use the same calculation as daysSince for consistency
+  const daysDiff = daysSince(dateString)
+
+  // Special cases for today, yesterday, tomorrow
   const date = dayjs(dateString).startOf('day')
   const now = dayjs().startOf('day')
 
   if (date.isToday()) return 'today'
-  if (date.isTomorrow()) return 'tomorrow'
   if (date.isYesterday()) return 'yesterday'
+  if (date.isTomorrow()) return 'tomorrow'
 
-  // Calculate days difference for near dates
-  const daysDiff = date.diff(now, 'day')
-  if (daysDiff > 0 && daysDiff <= 6) {
-    return `in ${daysDiff} day${daysDiff > 1 ? 's' : ''}`
-  }
+  // Calculate near future/past dates using same logic as daysSince
   if (daysDiff < 0 && daysDiff >= -6) {
-    return `${Math.abs(daysDiff)} day${Math.abs(daysDiff) > 1 ? 's' : ''} ago`
+    return `in ${Math.abs(daysDiff)} day${Math.abs(daysDiff) > 1 ? 's' : ''}`
+  }
+  if (daysDiff > 0 && daysDiff <= 6) {
+    return `${daysDiff} day${daysDiff > 1 ? 's' : ''} ago`
   }
 
-  return date.fromNow(withoutSuffix)
+  // Avoiding date.fromNow() as it seems to use the time of day and not just the date
+  return date.from(now, withoutSuffix)
 }
 
 /**

app/lib/utils/status.js

@@ -119,17 +119,39 @@ const getStatusTagColour = (status) => {
     images_requested: 'orange',
     not_in_pacs: 'grey',
 
+    // Metadata
+    has_symptoms: 'yellow',
+    has_repeat: 'yellow',
+
     // Reading statuses
+    waiting_for_1st_read: 'grey',
+    waiting_for_2nd_read: 'grey',
     not_started: 'grey',
+    skipped: 'grey',
+    not_read: 'grey',
+    complete: 'green',
     partial_first_read: 'blue',
     first_read_complete: 'yellow',
     partial_second_read: 'blue',
     mixed_reads: 'yellow',
     mixed_with_arbitration: 'yellow',
-    needs_arbitration: 'orange',
-    complete: 'green',
+
+
     no_events: 'grey',
 
+    // Outcomes
+    normal: 'green',
+    recall_for_assessment: 'red',
+    technical_recall: 'grey',
+    arbitration: 'orange',
+    'completed_(blind)': 'grey',
+
+    first_read: 'blue',
+    second_read: 'blue',
+
+    urgent: 'red',
+    due_soon: 'orange',
+
   }
   return colourMap[status.toLowerCase()] || ''
 }