Updates after P1 (#48)

Author: edwardhorsford

app/lib/generators/event-generator.js

@@ -153,7 +153,7 @@ const generateEvent = ({ slot, participant, clinic, outcomeWeights, forceStatus
 
       // Higher chance of symptoms in assessment clinics
       // const symptomProbability = clinic.clinicType === 'assessment' ? 0.4 : 0.15
-      const symptomProbability = 0.25
+      const symptomProbability = 0.15
       event.currentSymptoms = generateSymptoms({
         probabilityOfSymptoms: symptomProbability
       })

app/lib/generators/mammogram-generator.js

@@ -30,7 +30,7 @@ const REPEAT_REASONS = [
 // Default probability settings
 const DEFAULT_PROBABILITIES = {
   viewMissing: 0.05, // 5% chance of a view being missing
-  needsRepeat: 0.25, // 25% chance of needing a repeat
+  needsRepeat: 0.10, // 10% chance of needing a repeat
   repeatsPerRound: [1, 2] // When repeating, how many views to repeat (min, max)
 }
 

app/lib/generators/symptoms-generator.js

@@ -158,9 +158,9 @@ const generateSymptoms = (options = {}) => {
 
   // Determine how many symptoms (weighted towards fewer)
   const numberOfSymptoms = weighted.select({
-    1: 0.6,
-    2: 0.3,
-    3: 0.1
+    1: 0.8,
+    2: 0.15,
+    3: 0.05
   })
 
   // Track used types to avoid duplicates

app/routes/reading.js

@@ -147,6 +147,20 @@ module.exports = router => {
     const hasRepeatImages = event?.mammogramData?.metadata?.hasRepeat
     // const hasAcknowledgedItems = data?.acknowledgeItems?.includes('true')
 
+    const existingResult = event.reads?.[0]?.result
+    console.log({existingResult})
+    if (existingResult && existingResult === result) {
+      const events = getReadableEvents(data, clinicId)
+      const progress = getReadingProgress(events, eventId)
+
+      // Redirect to next participant if available
+      if (progress.hasNextUnread) {
+        return res.redirect(`/reading/clinics/${clinicId}/events/${progress.nextUnreadId}`)
+      } else {
+        return res.redirect(`/reading/clinics/${clinicId}`)
+      }
+    }
+
     // if ((hasSymptoms || hasRepeatImages) && !hasAcknowledgedItems) {
     //   console.log('still with the errors')
     //   req.flash('error', {

app/views/reading/assessment.html

@@ -207,7 +207,7 @@ <h3>Partial mammography</h3>
       }) }}
 
       {{ button({
-        text: "Update assessment"
+        text: "Update opinion"
       }) }}
   {% else %}
 

app/views/reading/recall-for-assessment-details.html

@@ -82,16 +82,6 @@
   ] | removeEmpty
   }) }}
 
-  {{ input({
-    label: {
-      text: (params.side + " breast comment (optional)") | sentenceCase,
-      classes: "nhsuk-label--s"
-    },
-    classes: "nhsuk-u-width-two-thirds",
-    id: "comment-" + params.side,
-    name: "comment-" + params.side
-  }) }}
-
   <h3 class="nhsuk-heading-s">Image annotations</h3>
 
   {% if data['annotatedSide' + params.side] == 'true' %}
@@ -124,18 +114,34 @@ <h3 class="nhsuk-heading-s">Image annotations</h3>
       ]
     }) }}
   {% else %}
-    {% set insetHtml %}
+    {# {% set insetHtml %}
       <p>No image annotations have been added.</p>
     {% endset %}
 
     {{ insetText({
       html: insetHtml
-    }) }}
+    }) }} #}
   {% endif %}
 
+  {{ button({
+    text: "Add an annotation",
+    classes: "nhsuk-button--secondary",
+    href: "./annotation?side=" + params.side
+  }) }}
+
+  {# <p><a href="./annotation?side={{ params.side }}">Add an annotation</a></p> #}
+
+  {{ input({
+    label: {
+      text: (params.side + " breast comment (optional)") | sentenceCase,
+      classes: "nhsuk-label--s"
+    },
+    classes: "nhsuk-u-width-two-thirds",
+    id: "comment-" + params.side,
+    name: "comment-" + params.side
+  }) }}
 
 
-  <p><a href="./annotation?side={{ params.side }}">Add an annotation</a></p>
 
 {% endset %}