Update screened appointment state (#208)

* Update screened appointment state

* Update app/views/events/appointment.html

Co-authored-by: Ed Horsford <[email protected]>

* Add duration for other end points where appointment is started and stopped, get data saving on attended not screened, small fixes

* Fix bug

* Update comment for record-keeping

---------

Co-authored-by: Ed Horsford <[email protected]>

Author: rivalee

app/lib/utils/dates.js

@@ -678,6 +678,44 @@ const isWithinDayRange = (
   return isOlderThanMin && isYoungerThanMax
 }
 
+/**
+ * Calculate duration between two times in minutes (rounded up)
+ *
+ * @param {string} startTime - Start time (e.g. "09:00", "2024-01-01T09:00:00")
+ * @param {string} endTime - End time (e.g. "10:30", "2024-01-01T10:30:00")
+ * @returns {number} Duration in minutes (rounded up), or 0 if invalid
+ * @example
+ * calculateDurationMinutes("09:00", "10:30") // returns 90
+ * calculateDurationMinutes("09:15", "09:45") // returns 30
+ */
+const calculateDurationMinutes = (startTime, endTime) => {
+  if (!startTime || !endTime) return 0
+
+  // If it looks like just a time (contains no date), prefix with dummy date
+  const startDatetime = startTime.includes('T') || startTime.includes('-')
+    ? startTime
+    : `2000-01-01T${startTime}`
+  
+  const endDatetime = endTime.includes('T') || endTime.includes('-')
+    ? endTime
+    : `2000-01-01T${endTime}`
+
+  const start = dayjs(startDatetime)
+  const end = dayjs(endDatetime)
+
+  // Validate both times are valid
+  if (!start.isValid() || !end.isValid()) return 0
+
+  // Calculate difference in minutes
+  const minutes = end.diff(start, 'minute', true)
+
+  // Return 0 for negative durations (end before start)
+  if (minutes < 0) return 0
+
+  // Round up to nearest minute
+  return Math.ceil(minutes)
+}
+
 /**
  * Add or subtract time from a date
  *
@@ -766,6 +804,7 @@ module.exports = {
   dayjs,
   daysSince,
   isWithinDayRange,
+  calculateDurationMinutes,
   add,
   remove
 }

app/routes/events.js

@@ -63,6 +63,23 @@ function getEventData(data, clinicId, eventId) {
   }
 }
 
+/**
+ * Capture session end time for an event
+ * @param {object} data - Session data
+ * @param {string} eventId - Event ID
+ * @param {string} userId - User ID ending the session
+ */
+function captureSessionEndTime(data, eventId, userId) {
+  const event = getEvent(data, eventId)
+  updateEventData(data, eventId, {
+    sessionDetails: {
+      ...event.sessionDetails,
+      endedAt: new Date().toISOString(),
+      endedBy: userId
+    }
+  })
+}
+
 // // Update event status and add to history
 // function updateEventStatus (event, newStatus) {
 //   return {
@@ -1389,6 +1406,12 @@ module.exports = (router) => {
         )
       }
 
+      // Capture session end time only if appointment was started
+      const event = getEvent(data, eventId)
+      if (event?.sessionDetails?.startedAt) {
+        captureSessionEndTime(data, eventId, data.currentUser.id)
+      }
+
       // Save the data
       saveTempEventToEvent(data)
       saveTempParticipantToParticipant(data)
@@ -2396,8 +2419,19 @@ module.exports = (router) => {
         return
       }
 
+      // Capture session end time only if appointment was started
+      const event = getEvent(data, eventId)
+      if (event?.sessionDetails?.startedAt) {
+        captureSessionEndTime(data, eventId, data.currentUser.id)
+      }
+
       // If yes, redirect to reschedule page
       if (needsReschedule === 'yes') {
+        // Save the appointmentStopped data before redirecting
+        saveTempEventToEvent(data)
+        saveTempParticipantToParticipant(data)
+        updateEventStatus(data, eventId, 'event_attended_not_screened')
+
         res.redirect(
           `/clinics/${clinicId}/events/${eventId}/cancel-or-reschedule-appointment/reschedule`
         )
@@ -2430,9 +2464,19 @@ module.exports = (router) => {
     const { clinicId, eventId } = req.params
 
     const data = req.session.data
+    const currentUser = data.currentUser
     const participantName = getFullName(data.participant)
     const participantEventUrl = `/clinics/${clinicId}/events/${eventId}`
 
+    // Store session end details
+    updateEventData(data, eventId, {
+      sessionDetails: {
+        ...getEvent(data, eventId).sessionDetails,
+        endedAt: new Date().toISOString(),
+        endedBy: currentUser.id
+      }
+    })
+
     saveTempEventToEvent(data)
     saveTempParticipantToParticipant(data)
     updateEventStatus(data, eventId, 'event_complete')
@@ -2606,6 +2650,12 @@ module.exports = (router) => {
           `/clinics/${clinicId}/events/${eventId}/cancel-or-reschedule-appointment/reschedule`
         )
       } else {
+        // Capture session end time only if appointment was started
+        const event = getEvent(data, eventId)
+        if (event?.sessionDetails?.startedAt) {
+          captureSessionEndTime(data, eventId, data.currentUser.id)
+        }
+
         // Save the cancellation data
         saveTempEventToEvent(data)
         saveTempParticipantToParticipant(data)
@@ -2653,6 +2703,12 @@ module.exports = (router) => {
         )
       }
 
+      // Capture session end time only if appointment was started (appointments might be rescheduled over the phone or that never started)
+      const event = getEvent(data, eventId)
+      if (event?.sessionDetails?.startedAt) {
+        captureSessionEndTime(data, eventId, data.currentUser.id)
+      }
+
       // Save the reschedule data
       saveTempEventToEvent(data)
       saveTempParticipantToParticipant(data)
@@ -2763,4 +2819,4 @@ module.exports = (router) => {
     )
     res.redirect(returnUrl)
   })
-}
+}

app/views/events/appointment.html

@@ -6,7 +6,7 @@
 {% set showNavigation = true %}
 {% set activeTab = 'appointment' %}
 {% set formAction = "./start" %}
-{% set allowEdits = event.status != "event_cancelled" and event.status != "event_rescheduled" %}
+{% set allowEdits = not (event | isFinal) %}
 
 
 {% block pageContent %}
@@ -29,6 +29,13 @@
       })}}
     {% endif %}
 
+    {% if event | isFinal and event.sessionDetails %}
+      {% set durationMinutes = event.sessionDetails.startedAt | calculateDurationMinutes(event.sessionDetails.endedAt) %}
+      <p class="nhsuk-u-margin-top-2">
+        Started at {{ event.sessionDetails.startedAt | formatDate('h:mma') }} and ended at {{ event.sessionDetails.endedAt | formatDate('h:mma') }}<br>({{ durationMinutes }} minutes)
+      </p>
+    {% endif %}
+
     {% if event.status === "event_attended_not_screened" and event.appointmentStopped %}
       <p class="nhsuk-u-margin-top-2">
         <strong>Reason for stopping:</strong> {% for reason in event.appointmentStopped.stoppedReason -%}
@@ -121,8 +128,8 @@
   {% endset %}
 
   {% set appointmentTimeHtml -%}
-    <p>{{ clinic.date | formatDate }} ({{ clinic.date | formatRelativeDate }})</p>
-    <p>{{ event.timing.startTime | formatTimeString }} ({{ event.timing.duration }} minutes)</p>
+    {{ clinic.date | formatDate }} ({{ clinic.date | formatRelativeDate }})<br>
+    {{ event.timing.startTime | formatTimeString }} ({{ event.timing.duration }} minutes)
   {% endset %}
 
   {% set specialAppointmentHtml %}
@@ -141,15 +148,13 @@
       rows: [
         {
           key: {
-            text: "Date"
+            text: "Scheduled date and time"
           },
           value: {
             html: appointmentTimeHtml
           },
           actions: {
-            items: [
-
-            ]
+            items: []
           }
         },
         {
@@ -160,9 +165,7 @@
             text: clinic.clinicType | formatWords | sentenceCase
           },
           actions: {
-            items: [
-
-            ]
+            items: []
           }
         },
         {
@@ -208,26 +211,9 @@
                 text: "Change",
                 visuallyHiddenText: "special appointment"
               }
-            ]
-          }
-        },
-        {
-          key: {
-            text: "Appointment notes"
-          },
-          value: {
-            html: ''
-          },
-          actions: {
-            items: [
-              {
-                href: "#",
-                text: "Change",
-                visuallyHiddenText: "appointment notes"
-              }
-            ]
+            ] if event.status != "event_complete" else []
           }
-        } if false
+        }
       ]
     } | handleSummaryListMissingInformation) }}
   {% endset %}