Fix medical history bugs and prevent medical information editing outside of workflow (#183)

* Fix medical history bugs and prevent medical information editing by non clinicians or outside of workflow
* Clean up review page
* Fix sticky workflow nav
* Don't show resume link for completed appointments
* Show extra contact details on modal

Author: edwardhorsford

.gitignore

@@ -75,3 +75,7 @@ coverage
 
 # ESlint cache
 .cache
+
+# LLM instructions
+.github
+CLAUDE.md

app/assets/sass/_workflow.scss

@@ -14,15 +14,17 @@
   @include nhsuk-width-container(1200px);
 }
 
-.app-workflow-container .nhsuk-grid-column-one-quarter {
-  align-self: flex-start;
+@include nhsuk-media-query($from: desktop) {
+  .app-workflow-side-nav-wrapper {
+    position: relative;
+    min-height: 100vh; // Ensures it's tall enough for sticky to work
+  }
 }
 
-// Side navigation
 .app-workflow-side-nav {
   position: sticky;
   top: nhsuk-spacing(4);
-  align-self: flex-start; // Important for sticky in grid/flex
+  align-self: flex-start;
   padding-bottom: 15px;
 }
 

app/data/session-data-defaults.js

@@ -62,7 +62,7 @@ const defaultSettings = {
   darkMode: 'false',
   screening: {
     confirmIdentityOnCheckIn: 'true',
-    manualImageCollection: 'false',
+    manualImageCollection: 'true',
     showParticipantSection: 'false'
   },
   reading: {

app/lib/utils/status.js

@@ -17,7 +17,7 @@ const STATUS_GROUPS = {
     'event_attended_not_screened',
     'event_cancelled'
   ],
-  active: ['event_scheduled', 'event_checked_in'],
+  active: ['event_scheduled', 'event_checked_in', 'event_in_progress'],
   eligible_for_reading: ['event_complete', 'event_partially_screened']
 }
 
@@ -119,7 +119,12 @@ const isAppointmentWorkflow = function (event, currentUser) {
   currentUser = currentUser || this?.ctx?.data?.currentUser
 
   const startedBy = event?.sessionDetails?.startedBy
-  if (!currentUser || !startedBy) return false
+  if (!currentUser || !startedBy) {
+    console.log(
+      `User or event not found: currentuser: ${currentUser}, startedBy: ${startedBy}`
+    )
+    return false
+  }
 
   // Extract user ID whether currentUser is object or string
   const currentUserId =

app/routes/events.js

@@ -171,6 +171,10 @@ module.exports = (router) => {
     const currentUser = data.currentUser
     const returnTo = req.query.returnTo // Used by /index so we can 'start' an appointment but then go to a different page.
 
+    console.log(
+      `Starting appointment for event ${req.params.eventId} by user ${currentUser.id}`
+    )
+
     if (event?.status !== 'event_in_progress') {
       // Update status
       updateEventStatus(data, req.params.eventId, 'event_in_progress')

app/views/_components/summary-list/summary-list-row-template.njk

@@ -15,7 +15,7 @@ true unless told otherwise #}
 {%- set anyRowHasActions = row.anyRowHasActions | default(true) %}
 
 {% if row %}
-  <div class="nhsuk-summary-list__row {%- if anyRowHasActions and not row.actions.items %} nhsuk-summary-list__row--no-actions{% endif %} {%- if row.classes %} {{ row.classes }}{% endif %}">
+  <div class="nhsuk-summary-list__row {%- if not anyRowHasActions and not row.actions.items %} nhsuk-summary-list__row--no-actions{% endif %} {%- if row.classes %} {{ row.classes }}{% endif %}">
     <dt class="nhsuk-summary-list__key {%- if row.key.classes %} {{ row.key.classes }}{% endif %}">
       {{ row.key.html | safe if row.key.html else row.key.text }}
     </dt>

app/views/_includes/confirm-identity-modal.njk

@@ -18,8 +18,11 @@
     {% call summaryList() %}
       {% include "_includes/summary-lists/rows/full-name.njk" %}
       {% include "_includes/summary-lists/rows/date-of-birth.njk" %}
-      {% set noBorder = true %}
+      
       {% include "_includes/summary-lists/rows/address.njk" %}
+      {% include "_includes/summary-lists/rows/phone-numbers.njk" %}
+        {% set noBorder = true %}
+      {% include "_includes/summary-lists/rows/email.njk" %}
     {% endcall %}
   {% endset %}
 

app/views/_includes/medical-information/breast-features.njk

@@ -40,7 +40,15 @@
 {% endset %}
 
 {% if allowEdits %}
-  <p>
+  {# <p>
     <a href="{{ linkHref | safe }}" class="nhsuk-link--no-visited-state">{{ "Add a feature" if not hasBreastFeatures else "View or edit breast features" }}</a>
-  </p>
-{% endif %}
+  </p> #}
+
+  <div class="nhsuk-form-group">
+    {{ button({
+      text: "Add a feature" if not hasBreastFeatures else "View or edit breast features",
+      href: "./medical-information/record-breast-features" | urlWithReferrer(currentUrl, scrollTo),
+      classes: "nhsuk-button--secondary app-button--small"
+    }) }}
+  </div>
+{% endif %}

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

@@ -2,7 +2,7 @@
 
 {# Calling template sets variable `displayFormat` to one of card / expander / flat #}
 
-{% set allowEdits = true if currentUser | isClinician else false %}
+{% set allowEdits = true if (isAppointmentWorkflow and currentUser | isClinician) else false %}
 
 {# Explicitly set referrer chain to the current url #}
 {% set referrerChain = currentUrl %}
@@ -96,17 +96,20 @@
     <a href="{{ linkHref }}" class="nhsuk-link">{{ "Add another symptom" if hasSymptoms else "Add a symptom" }}</a>
   </p> #}
 
-  <h4>Add symptoms</h4>
-
-  <div class="nhsuk-button-group app-button-group--small">
-    {% for symptomType in data.symptomTypes %}
-      {{ button({
-        text: symptomType.name | sentenceCase,
-        href: ("./medical-information/symptoms/add?symptomType=" + symptomType.slug) | urlWithReferrer(currentUrl, scrollTo),
-        classes: "nhsuk-button--secondary app-button--small"
-      }) }}
-    {% endfor %}
-  </div>
+  {% if allowEdits %}
+    <h4>Add symptoms</h4>
+
+    <div class="nhsuk-button-group app-button-group--small">
+      {% for symptomType in data.symptomTypes %}
+        {{ button({
+          text: symptomType.name | sentenceCase,
+          href: ("./medical-information/symptoms/add?symptomType=" + symptomType.slug) | urlWithReferrer(currentUrl, scrollTo),
+          classes: "nhsuk-button--secondary app-button--small"
+        }) }}
+      {% endfor %}
+    </div>
+  {% endif %}
+  
 {% endset %}
 
 {% switch displayFormat %}

app/views/_includes/medical-information/medical-history/additional-details.njk

@@ -1,4 +1,4 @@
-{# app/views/_includes/medical-information/medical-history/additonal-details.njk #}
+{# app/views/_includes/medical-information/medical-history/additional-details.njk #}
 
 {{ textarea({
   name: "event[medicalHistoryTemp][additionalDetails]",