Fix bst bug and misc

Author: edwardhorsford

app/lib/generators/clinic-generator.js

@@ -102,10 +102,12 @@ const determineClinicStatus = (date) => {
   if (clinicDate.isBefore(today)) {
     return 'closed'
   }
-  if (clinicDate.isAfter(today)) {
-    return 'scheduled'
+  if (clinicDate.isSame(today, 'day')) {
+    return 'in_progress'
   }
-  return 'in_progress' // it's today
+
+  return 'scheduled'
+
 }
 
 const generateMobileSiteName = () => {
@@ -151,15 +153,19 @@ const generateClinic = (date, location, breastScreeningUnit, sessionTimes, overr
   // Check if clinic is for today
   const today = dayjs().startOf('day')
   const clinicDate = dayjs(date).startOf('day')
-  const isToday = clinicDate.isSame(today)
+  const isToday = clinicDate.isSame(today, 'day')
+
+  if (isToday) {
+    console.log(`Generating clinic for today: ${clinicDate.format('YYYY-MM-DD')}, date: ${date}`)
+  }
 
   // Calculate total slots based on capacity
   const totalSlots = slots.length * (isToday && clinicType !== 'assessment' ? 2 : 1)
 
   return {
     id: generateId(),
     clinicCode: generateClinicCode(),
-    date: date.toISOString().split('T')[0],
+    date: clinicDate.format('YYYY-MM-DD'),
     breastScreeningUnitId: breastScreeningUnit.id,
     locationType: location.type,
     clinicType,

app/routes/events.js

@@ -259,34 +259,9 @@ module.exports = router => {
 
     req.flash('success', { wrapWithHeading: successMessage})
 
-    res.redirect(`/clinics/${clinicId}/`)
+    res.redirect(`/clinics/${clinicId}`)
 
     // res.redirect(`/clinics/${clinicId}/events/${eventId}/screening-complete`)
   })
 
-  router.get('/events/image-reading/result-complete', (req, res) => {
-    let participantName = "Jane Smith"
-
-    const successMessage = `
-    ${participantName} has been marked as normal. <a href="#" class="app-nowrap">Undo reading</a>`
-
-    req.flash('success', { wrapWithHeading: successMessage})
-
-    res.redirect(`/events/image-reading/result`)
-
-  })
-
-  router.get('/events/image-reading/result-recall', (req, res) => {
-    let participantName = "Jane Smith"
-
-    const successMessage = `
-    ${participantName} has been sent for recall. <a href="#" class="app-nowrap">Undo reading</a>`
-
-    req.flash('success', { wrapWithHeading: successMessage})
-
-    res.redirect(`/events/image-reading/result`)
-
-  })
-
-
 }

app/views/clinics/index.html

@@ -49,7 +49,7 @@ <h1>{{pageHeading}}</h1>
     items: secondaryNavItems
   }) }}
 
-  {{ filteredClinics | log }}
+  {{ filteredClinics | log("Filtered clinics") }}
 
   {% if filteredClinics | length === 0 %}
     <p>No clinics found.</p>