Misc fixes (#167)

Author: edwardhorsford

app/lib/generators/mammogram-generator.js

@@ -185,6 +185,16 @@ const generateMammogramImages = ({
     (sum, view) => sum + view.images.length,
     0
   )
+
+  // Calculate images per breast
+  const rightBreastImages = Object.values(views)
+    .filter((view) => view.side === 'right')
+    .reduce((sum, view) => sum + view.images.length, 0)
+
+  const leftBreastImages = Object.values(views)
+    .filter((view) => view.side === 'left')
+    .reduce((sum, view) => sum + view.images.length, 0)
+
   const allTimestamps = Object.values(views)
     .flatMap((view) => view.images.map((img) => img.timestamp))
     .sort()
@@ -202,7 +212,11 @@ const generateMammogramImages = ({
       standardViewsCompleted: Object.keys(views).length === 4,
       startTime: allTimestamps[0],
       endTime: allTimestamps[allTimestamps.length - 1],
-      hasRepeat
+      hasRepeat,
+      imagesByBreast: {
+        right: rightBreastImages,
+        left: leftBreastImages
+      }
     }
   }
 }

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

@@ -23,15 +23,16 @@
 {% endset %}
 
 {% set mammogramHistoryContentsSummary %}
-  Last mammogrogram {{ "2022-03-23" | formatDate | formatRelativeDate | asHint }}
+  {# Last mammogrogram {{ "2022-03-23" | formatDate | formatRelativeDate | asHint }} #}
 {% endset %}
 
 {% set hasAdditionalMammograms = event.previousMammograms | length > 0 %}
 
 {% if hasAdditionalMammograms %}
-  {% set mammogramHistoryContentsSummary = ((event.previousMammograms | length) + 1) ~ " mammograms added" %}
+  {% set mammogramHistoryContentsSummary = ((event.previousMammograms | length)) ~ " new " + ("mammogram" | pluralise(event.previousMammograms | length)) + " added" %}
 {% endif %}
 
+
 {% switch displayFormat %}
   {% case 'flat' %}
     <h2 id="{{ sectionId }}">{{ sectionHeading }}</h2>
@@ -53,7 +54,7 @@
       id: sectionId,
       classes: "nhsuk-expander js-expandable-section",
       summaryText: "Mammogram history",
-      _contentsSummary: mammogramHistoryContentsSummary,
+      contentsSummary: mammogramHistoryContentsSummary,
       subtitle: "The last confirmed mammogram and any added manually since then",
       html: mammogramHistoryHtml,
       status: "To review",
@@ -156,6 +157,25 @@
   {% include "medical-information/medical-history/index.njk" %}
 {% endset %}
 
+{% set medicalInfoCount = 0 %}
+{% if event.medicalInformation.medicalHistory %}
+  {% for type, historyGroup in event.medicalInformation.medicalHistory %}
+    {% for item in historyGroup %}
+      {% set medicalInfoCount = medicalInfoCount + 1 %}
+    {% endfor %}
+  {% endfor %}
+{% endif %}
+
+{{ medicalInfoCount | log("Medical info count") }}
+
+{% set contentsSummary %}
+  {% if medicalInfoCount > 0 %}
+    {{ medicalInfoCount }} {{ "item" | pluralise(medicalInfoCount) }} added
+  {% else %}
+    No information added
+  {% endif %}
+{% endset %}
+
 {% switch displayFormat %}
   {% case 'flat' %}
     <h2>{{ sectionHeading }}</h2>
@@ -174,7 +194,7 @@
       id: "medical-history",
       classes: "nhsuk-expander js-expandable-section",
       summaryText: sectionHeading,
-      contentsSummary: "No information added",
+      contentsSummary: contentsSummary,
       subtitle: subHeading,
       html: medicalHistoryHtml,
       status: "To review"

app/views/_templates/layout-app.html

@@ -128,7 +128,8 @@
       {% if flashSuccess | isString %}
         {{ notificationBanner({
           text: flashSuccess,
-          type: "success"
+          type: "success",
+          disableAutoFocus: true if disableAutoFocus else false
         }) }}
       {% else %}
         {% set html = flashSuccess.html %}
@@ -143,7 +144,8 @@
           title: flashSuccess.title,
           html: html,
           text: flashSuccess.text,
-          type: "success"
+          type: "success",
+          disableAutoFocus: true if disableAutoFocus else false
         }) }}
       {% endif %}
     {% endif %}

app/views/events/record-medical-information.html

@@ -16,6 +16,7 @@
 {% set showWorkflowNav = true %}
 
 {% set activeTab = 'record-medical-information' %}
+{% set disableAutoFocus = true %}
 
 {% block pageContent %}
 

app/views/events/review.html

@@ -1,4 +1,3 @@
-
 {% extends 'layout-app.html' %}
 
 
@@ -36,17 +35,19 @@
 
   {% set valueHtml = "No" %}
 
+  {% set imageCount = event.mammogramData.metadata.totalImages %}
+
   {% set imagesCardHtml %}
     <ul class="nhsuk-list nhsuk-list--bullet">
-      <li>2 right breast images</li>
-      <li>3 left breast images (one repeat)</li>
+      <li>{{ event.mammogramData.metadata.imagesByBreast.right }} right breast {{ "image" | pluralise(event.mammogramData.metadata.imagesByBreast.right) }}</li>
+      <li>{{ event.mammogramData.metadata.imagesByBreast.left }} left breast {{ "image" | pluralise(event.mammogramData.metadata.imagesByBreast.left) }}</li>
     </ul>
 
     <p><a href="./imaging">View or update imaging information</a></p>
   {% endset %}
 
   {{ card({
-    heading: "5 images taken",
+    heading: imageCount ~ " images taken",
     headingLevel: "2",
     feature: true,
     descriptionHtml: imagesCardHtml
@@ -124,4 +125,4 @@
 
   {# <p><a href="./attended-not-screened-reason">Screening cannot proceed</a></p> #}
 
-{% endblock %}
+{% endblock %}