Misc bug fixes ahead of UR (#141)

Author: edwardhorsford

app/lib/utils/status.js

@@ -10,7 +10,7 @@ const STATUS_GROUPS = {
   not_started: ['event_scheduled', 'event_checked_in'],
   completed: ['event_complete', 'event_partially_screened'],
   final: ['event_complete', 'event_partially_screened', 'event_did_not_attend', 'event_attended_not_screened', 'event_cancelled'],
-  active: ['event_scheduled', 'event_checked_in', 'event_in_progress'],
+  active: ['event_scheduled', 'event_checked_in'],
   eligible_for_reading: ['event_complete', 'event_partially_screened'],
 }
 

app/lib/utils/summary-list.js

@@ -70,7 +70,9 @@ const handleSummaryListMissingInformation = (input, showNotProvidedText = false)
 
   // Check if input is a summary list (has rows property)
   if (input.rows && Array.isArray(input.rows)) {
-    const updatedRows = input.rows.map(processRow)
+    // Filter out any falsy/undefined rows that come from failed Nunjucks conditions
+    const validRows = input.rows.filter(row => row && typeof row === 'object')
+    const updatedRows = validRows.map(processRow)
 
     return {
       ...input,

app/views/_components/check-in/template.njk

@@ -17,6 +17,7 @@
 {% if confirmIdentityEnabled %}
   {% set modalId = "check-in-modal-" + params.event.id %}
    {% set statusTagId = params.statusTagId %}
+   {% set appointmentUrl = "/clinics/" + params.clinicId + "/events/" + params.event.id %}
   {% include "_includes/confirm-identity-modal.njk" %}
 {% endif %}
 

app/views/_includes/medical-information/index.njk

@@ -138,7 +138,7 @@
 {# -------------------------------------------------------------- #}
 {# Medical history #}
 
-{% set sectionHeading = "Medical history" %}
+{# {% set sectionHeading = "Medical history" %}
 {% set subHeading = "Including breast cancer, implants, prior proceedures and treatments" %}
 {% set scrollTo = 'medical-history' %}
 
@@ -170,7 +170,7 @@
       html: medicalHistoryHtml,
       status: "To review"
     }) }}
-{% endswitch %}
+{% endswitch %} #}
 
 {% set medicalHistoryHtml %}
   {% set rows = [

app/views/events/appointment.html

@@ -125,7 +125,7 @@
               }
             ]
           }
-        }
+        } if false
       ]
     } | handleSummaryListMissingInformation) }}
   {% endset %}

app/views/index.html

@@ -20,7 +20,20 @@ <h1>
   href: "/dashboard"
 }) }}
 
-<h2>Active screening appointment</h2>
+<h2>Clinics</h2>
+
+<ul>
+  <li>
+    <a href="/clinics">Clinics</a>
+    <ul>
+      <li><a href="/clinics/wtrl7jud">First clinic today</a></li>
+    </ul>
+  </li>
+
+</ul>
+
+
+<h2>Screening appointment</h2>
 
 {% set eventId = "5gpn41oi" %}
 
@@ -29,6 +42,21 @@ <h2>Active screening appointment</h2>
 {% set exampleParticipant = "/clinics/wtrl7jud/events/" + eventId %}
 {% set startUrl = exampleParticipant + "/start" %}
 
+<h3>Appointment pages</h3>
+<ul>
+  <li>
+    <a href="{{ exampleParticipant }}/appointment">Appointment tab</a>
+  </li>
+  <li>
+    <a href="{{ exampleParticipant }}/participant">Participant tab</a>
+  </li>
+  <li>
+    <a href="{{ exampleParticipant }}/medical-information">Medical information tab</a>
+  </li>
+</ul>
+
+<h3>Appointment during workflow</h3>
+
 <ul>
   <li>
     <a href="{{ startUrl }}?returnTo=identity">Participant</a>
@@ -82,7 +110,7 @@ <h2>Completed screening appointment</h2>
 
 <ul>
   <li>
-    <a href="{{ exampleParticipant }}">Main appointment page</a>
+    <a href="{{ exampleParticipant }}/appointment">Appointment tab</a>
   </li>
   <li>
     <a href="{{ exampleParticipant }}/medical-information">Medical information</a>
@@ -95,12 +123,6 @@ <h2>Completed screening appointment</h2>
 <h2>Other sections</h2>
 
 <ul>
-  <li>
-    <a href="/clinics">Clinics</a>
-    <ul>
-      <li><a href="/clinics/wtrl7jud">First clinic today</a></li>
-    </ul>
-  </li>
 
   <li>
     <a href="/reading">Image reading</a>