Swap to 'complete' status

Author: edwardhorsford

app/lib/generators/event-generator.js

@@ -29,7 +29,7 @@ const determineEventStatus = (slotDateTime, currentDateTime, attendanceWeights)
   }
 
   if (slotDate.isBefore(currentDate)){
-    const finalStatuses = ['attended', 'did_not_attend', 'attended_not_screened'];
+    const finalStatuses = ['complete', 'did_not_attend', 'attended_not_screened'];
     return weighted.select(finalStatuses, attendanceWeights);
   }
 
@@ -41,14 +41,14 @@ const determineEventStatus = (slotDateTime, currentDateTime, attendanceWeights)
     // Within 30 mins of appointment
     return weighted.select({
       'checked_in': 0.6,
-      'attended': 0.1,
+      'complete': 0.1,
       'attended_not_screened': 0.1,
       'scheduled': 0.2,
     });
   } else {
     // More than 30 mins after appointment
     return weighted.select({
-      'attended': 0.6,
+      'complete': 0.6,
       'attended_not_screened': 0.1,
       'scheduled': 0.2,
     });
@@ -120,15 +120,15 @@ const generateEvent = ({ slot, participant, clinic, outcomeWeights }) => {
     status,
     details: {
       ...eventBase.details,
-      imagesTaken: status === 'attended' ? 
+      imagesTaken: status === 'complete' ? 
         ['RCC', 'LCC', 'RMLO', 'LMLO'] : null,
       notScreenedReason: status === 'attended_not_screened' ?
         faker.helpers.arrayElement(NOT_SCREENED_REASONS) : null
     },
     statusHistory: generateStatusHistory(status, slotDateTime)
   };
 
-  if (status === 'attended') {
+  if (status === 'complete') {
     const actualStartOffset = faker.number.int({ min: -5, max: 5 });
 
     // For special events, allow more time variation
@@ -161,7 +161,7 @@ const generateStatusHistory = (finalStatus, dateTime) => {
  });
 
  // Add intermediate statuses based on final status
- if (finalStatus === 'attended') {
+ if (finalStatus === 'complete') {
    history.push(
      {
        status: 'checked_in',

app/lib/utils/status.js

@@ -15,7 +15,7 @@ const getStatusTagColour = (status) => {
 
     // Event statuses
     checked_in: 'yellow',
-    attended: 'green',
+    complete: 'green',
     did_not_attend: 'red',
     attended_not_screened: 'orange'
   };
@@ -38,7 +38,7 @@ const getStatusDescription = (status) => {
     scheduled: 'Appointment is booked',
     pre_screening: 'Patient is completing pre-screening',
     in_progress: 'Screening in progress',
-    attended: 'Patient attended and was screened',
+    complete: 'Patient attended and was screened',
     did_not_attend: 'Patient did not attend',
     attended_not_screened: 'Patient attended but was not screened'
   };
@@ -52,8 +52,8 @@ const getStatusDescription = (status) => {
         return events.filter(e => e.status === 'scheduled');
       case 'checked-in':
         return events.filter(e => e.status === 'checked_in');
-      case 'attended':
-        return events.filter(e => ['attended', 'attended_not_screened'].includes(e.status));
+      case 'complete':
+        return events.filter(e => ['complete', 'attended_not_screened'].includes(e.status));
       default:
         return events;
     }

app/routes/clinics.js

@@ -261,15 +261,15 @@ module.exports = router => {
       case 'checked-in':
         console.log('filtering checked in')
         return events.filter(e => e.status === 'checked_in');
-      case 'attended':
-        return events.filter(e => ['attended', 'attended_not_screened'].includes(e.status));
+      case 'complete':
+        return events.filter(e => ['complete', 'attended_not_screened'].includes(e.status));
       default:
         return events;
     }
   }
 
   // Single clinic view
-  const VALID_FILTERS = ['scheduled', 'checked-in', 'attended', 'all'];
+  const VALID_FILTERS = ['scheduled', 'checked-in', 'complete', 'all'];
 
   // Support both /clinics/:id and /clinics/:id/:filter
   router.get(['/clinics/:id', '/clinics/:id/:filter'], (req, res) => {

app/routes/events.js

@@ -47,6 +47,7 @@ module.exports = router => {
 
   // Set clinics to active in nav for all urls starting with /clinics
   router.use('/clinics/:clinicId/events/:eventId', (req, res, next) => {
+    const data = req.session.data
     const eventData = getEventData(req.session.data, req.params.clinicId, req.params.eventId)
 
     if (!eventData) {
@@ -55,6 +56,20 @@ module.exports = router => {
       return
     }
 
+    // An idea for how we could automate saving back to participant
+    // if (data.saveToParticipant){
+    //   const participantIndex = data.participants.findIndex(p => p.id === eventData.participant.id);
+    //   if (participantIndex !== -1) {
+    //     // Update participant record with questionnaire data
+    //     data.participants[participantIndex] = {
+    //       ...data.participants[participantIndex],
+    //       ...data.saveToParticipant
+    //     };
+
+    //     delete data.saveToParticipant
+    //   }
+    // }
+
     res.locals.eventData = eventData
     res.locals.clinic = eventData.clinic,
     res.locals.event = eventData.event,
@@ -116,7 +131,7 @@ module.exports = router => {
   })
 
   // // Advance status to attened / complete
-  // router.post('/clinics/:clinicId/events/:eventId/attended', (req, res) => {
+  // router.post('/clinics/:clinicId/events/:eventId/complete', (req, res) => {
 
   //   res.redirect(`/clinics/${req.params.clinicId}/events/${req.params.eventId}`, {
   //   })
@@ -144,7 +159,7 @@ module.exports = router => {
     const eventIndex = req.session.data.events.findIndex(e => e.id === eventId)
     req.session.data.events[eventIndex] = updateEventStatus(
       req.session.data.events[eventIndex],
-      'attended'
+      'complete'
     )
 
     res.redirect(`/clinics/${clinicId}/events/${eventId}`)

app/views/clinics/index.html

@@ -87,7 +87,7 @@ <h1>{{pageHeading}}</h1>
             <td>{{ clinic.clinicType | sentenceCase }}</td>
             <td class="nhsuk-table__cell--numeric">
               {{ tag({
-                text: clinic.status | formatWords | sentenceCase,
+                html: clinic.status | formatWords | sentenceCase | noWrap,
                 classes: "nhsuk-tag--" + clinic.status | getStatusTagColour
               })}}
             </td>

app/views/clinics/show.html

@@ -28,7 +28,7 @@ <h1 class="nhsuk-heading-l">
     { id: 'all', label: 'All participants' },
     { id: 'scheduled', label: 'Scheduled' },
     { id: 'checked-in', label: 'Checked in' },
-    { id: 'attended', label: 'Attended' }
+    { id: 'complete', label: 'Complete' }
   ] %}
     {% set href -%}
       /clinics/{{ clinicId }}/{{ filter.id if filter.id !== 'all' }}

app/views/events/show.html

@@ -21,7 +21,7 @@
 
   {% set activeTab = 'all' %}
 
-  {% if event.status == "attended" %}
+  {% if event.status == "complete" %}
     {% include "event-navigation.njk" %}
   {% endif %}
 
@@ -45,7 +45,7 @@
 
   {% set appointmentTimeHtml -%}
     <p>{{ clinic.date | formatDate }} ({{ clinic.date | formatRelativeDate }})</p>
-    <p>{{ event.timing | formatTimeRange }} ({{ event.timing.duration }} minutes)</p>
+    <p>{{ event.timing.startTime | formatTime }} ({{ event.timing.duration }} minutes)</p>
 
   {% endset %}
 
@@ -163,7 +163,7 @@
     {% set lastMammogram = null %}
 
     {% for record in clinicHistory %}
-       {% if record.event.status === 'attended' and (not lastMammogram or record.event.timing.startTime > lastMammogram.event.timing.startTime) %}
+       {% if record.event.status === 'complete' and (not lastMammogram or record.event.timing.startTime > lastMammogram.event.timing.startTime) %}
          {% set lastMammogram = record %}
        {% endif %}
     {% endfor %}