Improve workflow

Author: edwardhorsford

app/lib/generators/address-generator.js

@@ -94,15 +94,20 @@ const generateNearbyAreas = (bsu) => {
  * @returns {Object} Generated address object
  */
 const generateBSUAppropriateAddress = (bsu) => {
-  const nearbyAreas = generateNearbyAreas(bsu);
+  const nearbyAreas = generateNearbyAreas(bsu)
 
+  // Helper to capitalize first letter of each word
+  const capitalise = (str) => str.split(' ')
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ')
+
   return {
     line1: `${faker.number.int({ min: 1, max: 300 })} ${faker.helpers.arrayElement(STREETS)}`,
-    line2: Math.random() < 0.3 ? `${faker.word.adjective()} House` : null,
+    line2: Math.random() < 0.3 ? `${capitalise(faker.word.adjective())} House` : null,
     city: faker.helpers.arrayElement(nearbyAreas),
     postcode: generateNearbyPostcode(bsu.address.postcode)
-  };
-};
+  }
+}
 
 module.exports = {
   generateBSUAppropriateAddress

app/lib/generators/participant-generator.js

@@ -7,7 +7,7 @@ const { generateBSUAppropriateAddress } = require('./address-generator');
 // List of possible extra needs
 const EXTRA_NEEDS = [
   'Agoraphobia',
-  'Implants',
+  'Breast implants',
   'Learning difficulties',
   'Physical restriction',
   'Registered disabled',

app/views/dashboard.html

@@ -47,7 +47,7 @@ <h1>
       clickable: true,
       heading: "Messages",
       headingClasses: "nhsuk-heading-m",
-      href: "/patients",
+      href: "#",
       descriptionHtml: false
     }) }}
   </li>

app/views/events/mammography/attended-not-screened-reason.html

@@ -2,7 +2,7 @@
 {% extends 'layout-app.html' %}
 
 
-{% set pageHeading = "Screening suspended" %}
+{% set pageHeading = "Screening cannot proceed" %}
 
 {# {% set gridColumn = "nhsuk-grid-column-full" %} #}
 

app/views/events/mammography/imaging.html

@@ -205,7 +205,7 @@ <h1 class="nhsuk-heading-l">
         }) }}
 
         {{ button({
-          text: "Confirm all images and complete imaging"
+          text: "Confirm all images and complete screening"
         }) }}
       </div>
     </div>
@@ -221,35 +221,32 @@ <h1 class="nhsuk-heading-l">
   const loadingSpinner = document.getElementById('loading-spinner')
   const imageCards = document.querySelectorAll('.app-image-card')
   const imagingForm = document.getElementById('imaging-form')
-  let lastLoadTime = 0
 
   // Hide spinner after initial delay
   setTimeout(() => {
     loadingSpinner.classList.add('app-hidden')
 
     // Show each image sequentially
     imageCards.forEach((card, index) => {
-      const loadTime = 1000 + (index * 1600)
+      // Increased time between images to 2 seconds
+      const loadTime = 1000 + (index * 2000)
 
       setTimeout(() => {
         card.classList.remove('app-hidden')
-        // Add fade-in effect
         card.style.opacity = 0
         card.style.transition = 'opacity 0.5s ease-in'
         setTimeout(() => card.style.opacity = 1, 50)
 
-        // Show form after first image is loaded
+        // Show form at same time as first image
         if (index === 0) {
-          setTimeout(() => {
-            imagingForm.classList.remove('app-hidden')
-            imagingForm.style.opacity = 0
-            imagingForm.style.transition = 'opacity 0.5s ease-in'
-            setTimeout(() => imagingForm.style.opacity = 1, 50)
-          }, 400) // Show form slightly after first image
+          imagingForm.classList.remove('app-hidden')
+          imagingForm.style.opacity = 0
+          imagingForm.style.transition = 'opacity 0.5s ease-in'
+          setTimeout(() => imagingForm.style.opacity = 1, 50)
         }
       }, loadTime)
     })
-  }, 2000)
+  }, 1000)
 })
 </script>
 {% endblock %}

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

@@ -4,7 +4,7 @@
 
 {% set pageHeading = "Medical information" %}
 
-{% set gridColumn = "nhsuk-grid-column-full" %}
+{% set gridColumn = "nhsuk-grid-column-two-thirds" %}
 
 {% set formAction = './imaging' %}
 
@@ -14,6 +14,15 @@
 } %}
  #}
 
+{% macro makeRow(params) %}
+<h3>{{ params.title }}</h3>
+
+<p>{{params.content}}</p>
+
+<p><a href="#">Provide details</a></p>
+  
+{% endmacro %}
+
 
 {% block pageContent %}
 
@@ -55,46 +64,9 @@ <h1 class="nhsuk-heading-l">
 
   {% endif %}
 
-  {# {{ taskList({
-    idPrefix: "your-health",
-    items: [
-      {
-        title: {
-          text: "History of breast cancer"
-        },
-        href: "#",
-        status: taskStatus
-      },
-      {
-        title: {
-          text: "Other breast diagnosis or proceedures"
-        },
-        href: "#",
-        status: taskStatus
-      },
-      {
-        title: {
-          text: "Scars"
-        },
-        href: "#",
-        status: taskStatus
-      },
-      {
-        title: {
-          text: "Current health status"
-        },
-        href: "#",
-        status: taskStatus
-      },
-      {
-        title: {
-          text: "Breast symptoms"
-        },
-        href: "#",
-        status: taskStatus
-      }
-    ]
-  }) }} #}
+{#   {{ makeRow({
+  title: "Breast implants"
+})}} #}
 
   {{ summaryList({
   rows: [
@@ -117,10 +89,12 @@ <h1 class="nhsuk-heading-l">
     },
     {
       key: {
-        text: "Implanted medical devices and pacemakers"
+        text: "Implanted medical devices and pacemakers",
+        classes: "nhsuk-u-width-one-half"
       },
       value: {
-        html: valueHtml
+        html: valueHtml,
+        classes: "nhsuk-u-width-one-half"
       },
       actions: {
         items: [
@@ -148,7 +122,7 @@ <h1 class="nhsuk-heading-l">
           }
         ]
       }
-    },
+    } if false,
     {
       key: {
         text: "Pregnancy and breastfeeding"
@@ -202,7 +176,7 @@ <h1 class="nhsuk-heading-l">
     },
     {
       key: {
-        text: "Scars"
+        text: "Scars and other visual features"
       },
       value: {
         html: valueHtml
@@ -234,6 +208,23 @@ <h1 class="nhsuk-heading-l">
         ]
       }
     },
+    {
+      key: {
+        text: "Hormone replacement therapy (HRT)"
+      },
+      value: {
+        html: valueHtml
+      },
+      actions: {
+        items: [
+          {
+            href: "#",
+            text: "Change",
+            visuallyHiddenText: "contact details"
+          }
+        ]
+      }
+    },
     {
       key: {
         text: "Breast symptoms"
@@ -274,7 +265,7 @@ <h1 class="nhsuk-heading-l">
   {% if query.taskStatus !== 'complete' %}
     <div class="nhsuk-form-group">
       {{ button({
-        text: "Answer incomplete as 'No' / 'None'",
+        text: "Answer all incomplete as 'No' / 'None'",
         classes: "nhsuk-button--secondary",
         href: "./medical-information?taskStatus=complete"
       }) }}

app/views/events/show.html

@@ -15,7 +15,7 @@
 
 {% block pageContent %}
 
-  {{ participant | log }}
+  {{ participant | log("Participant:") }}
 
   {% include "event-header.njk" %}
 
@@ -203,7 +203,7 @@ <h3>Last known mammogram</h3>
       <p>{{ "No details" | asHint }}</p>
     {% endif %}
 
-    {{clinicHistory | log("clinic history") }}
+    {{clinicHistory | log("Clinic history") }}
 
     {{ button({
       text: "Record additional screening history",
@@ -263,7 +263,7 @@ <h3>Last known mammogram</h3>
 
   {% set screeningHtml %}
 
-  <h3>Confirm the following before continuing</h3>
+  <h3 class="nhsuk-heading-s">Confirm the following before continuing</h3>
 
   <ul>
     <li>Identity has been confirmed</li>
@@ -275,20 +275,23 @@ <h3>Confirm the following before continuing</h3>
     </li>
   </ul>
 
-{#   <h3>Special status reviewed</h3>
-
-  <ul>
-    <li>Breast implants</li>
-    <li>Date of last mammogram</li>
-  </ul> #}
     <form action="./{{eventId}}/start" method="post">
+
+      {# {{ input({
+        label: {
+          text: "Full name"
+        },
+        id: "example",
+        name: "save[participant--" + participantId + "][first-name]"
+      }) }} #}
+
       {{ radios({
         idPrefix: "beginScreening",
         name: "beginScreening",
         fieldset: {
           legend: {
             text: "Can screening proceed?",
-            classes: "nhsuk-fieldset__legend--m",
+            classes: "nhsuk-fieldset__legend--s",
             isPageHeading: false
           }
         },