Update date question to be explicit about whether it's within 6 months (#210)

* Update date question to be explicit about whether it's within 6 months

Author: edwardhorsford

app/routes/events.js

@@ -694,41 +694,25 @@ module.exports = (router) => {
   function checkIfRecentMammogram(mammogram) {
     if (!mammogram) return false
 
-    const now = dayjs()
-    const sixMonthsAgo = now.subtract(6, 'month')
-
     // Check based on date type
-    if (mammogram.dateType === 'dateKnown' && mammogram.dateTaken) {
+    if (mammogram.dateType === 'lessThanSixMonths') {
+      // User explicitly indicated mammogram was less than 6 months ago
+      return true
+    } else if (mammogram.dateType === 'moreThanSixMonths') {
+      // User explicitly indicated mammogram was more than 6 months ago
+      return false
+    } else if (mammogram.dateType === 'dateKnown' && mammogram.dateTaken) {
+      // Calculate from exact date
+      const now = dayjs()
+      const sixMonthsAgo = now.subtract(6, 'month')
       const date = mammogram.dateTaken
+
       if (date.year && date.month && date.day) {
         const mammogramDate = dayjs(
           `${date.year}-${String(date.month).padStart(2, '0')}-${String(date.day).padStart(2, '0')}`
         )
         return mammogramDate.isAfter(sixMonthsAgo)
       }
-    } else if (
-      mammogram.dateType === 'approximateDate' &&
-      mammogram.approximateDate
-    ) {
-      // Try to parse approximate date text
-      const approxText = mammogram.approximateDate.toLowerCase()
-
-      // Check for common time patterns that would indicate recent mammogram
-      if (
-        approxText.includes('month ago') ||
-        approxText.includes('1 month') ||
-        approxText.includes('2 month') ||
-        approxText.includes('3 month') ||
-        approxText.includes('4 month') ||
-        approxText.includes('5 month') ||
-        approxText.includes('last month') ||
-        approxText.includes('weeks ago') ||
-        approxText.includes('few weeks') ||
-        approxText.includes('last week') ||
-        approxText.includes('days ago')
-      ) {
-        return true
-      }
     }
 
     return false

app/views/_includes/medical-information/mammogram-history.njk

@@ -45,8 +45,18 @@
       {% set mammogramValueLines = mammogramValueLines | push(
         previousMammogram.dateTaken | formatDate + " (" + (previousMammogram.dateTaken | formatDate | formatRelativeDate | asHint) + ")"
       ) %}
-    {% elseif previousMammogram.dateType == 'approximateDate' %}
-      {% set mammogramValueLines = mammogramValueLines | push("Approximate date: " + previousMammogram.approximateDate) %}
+    {% elseif previousMammogram.dateType == 'moreThanSixMonths' %}
+      {% set dateText = "Approximately taken 6 months or more ago" %}
+      {% if previousMammogram.approximateDate %}
+        {% set dateText = dateText + ": " + previousMammogram.approximateDate %}
+      {% endif %}
+      {% set mammogramValueLines = mammogramValueLines | push(dateText) %}
+    {% elseif previousMammogram.dateType == 'lessThanSixMonths' %}
+      {% set dateText = "Approximately taken less than 6 months ago" %}
+      {% if previousMammogram.approximateDate %}
+        {% set dateText = dateText + ": " + previousMammogram.approximateDate %}
+      {% endif %}
+      {% set mammogramValueLines = mammogramValueLines | push(dateText) %}
     {% else %}
       {% set mammogramValueLines = mammogramValueLines | push("Date unknown") %}
     {% endif %}

app/views/events/previous-mammograms/appointment-should-not-proceed.html

@@ -22,12 +22,23 @@ <h1 class="nhsuk-heading-l">
   </h1>
 
   {% set previousMammogram = event.previousMammogramTemp %}
-  {% set mammogramDate = previousMammogram.dateTaken %}
-  {% set timeAgo = mammogramDate | formatRelativeDate %}
 
-  <p>
-    The mammogram added took place {{ timeAgo }}. It is not recommended to take breast x-rays within 6 months of each other.
-  </p> 
+  {% if previousMammogram.dateType == 'dateKnown' %}
+    {% set mammogramDate = previousMammogram.dateTaken %}
+    {% set timeAgo = mammogramDate | formatRelativeDate %}
+    <p>
+      The mammogram added took place {{ timeAgo }}. Breast x-rays should not be taken within 6 months of a previous mammogram.
+    </p>
+  {% else %}
+    <p>
+      The mammogram added was less than 6 months ago. Breast x-rays should not be taken within 6 months of a previous mammogram.
+    </p>
+    {% if previousMammogram.approximateDate %}
+      <p>
+        Approximate date provided: {{ previousMammogram.approximateDate }}
+      </p>
+    {% endif %}
+  {% endif %} 
 
   {{ radios({
     name: "event[appointmentStopped][needsReschedule]",

app/views/events/previous-mammograms/form.html

@@ -166,23 +166,40 @@ <h1 class="nhsuk-heading-l">
     }) }}
   {% endset %}
 
-  {% set approximateDateHtml %}
+  {% set moreThanSixMonthsHtml %}
     {{ input({
-      id: "approximateDate",
+      id: "approximateDateMoreThan",
       name: "event[previousMammogramTemp][approximateDate]",
       label: {
-        text: "Enter an approximate date",
-        classes: "nhsuk-u-visually-hidden"
+        text: "Approximate date"
       },
       hint: {
-        text: "For example, 9 months ago"
+        text: "For example, April 2018 or summer 2021"
       },
       classes: "nhsuk-u-width-two-thirds",
       value: event.previousMammogramTemp.approximateDate
     }) }}
   {% endset %}
 
-  {# Radios for when were they taken - choices 'Date known' and 'Enter approximate date' and 'Not sure'  #}
+  {% set lessThanSixMonthsHtml %}
+    <p>This appointment will need to stop and you will be prompted to reschedule once 6 months has passed.</p>
+
+    {{ input({
+      id: "approximateDateLessThan",
+      name: "event[previousMammogramTemp][approximateDate]",
+      label: {
+        text: "Approximate date"
+      },
+      hint: {
+        text: "For example, April 2018 or summer 2021"
+      },
+      classes: "nhsuk-u-width-two-thirds",
+      value: event.previousMammogramTemp.approximateDate
+    }) }}
+
+  {% endset %}
+
+  {# Radios for when were they taken #}
   {{ radios({
     idPrefix: "dateType",
     name: "event[previousMammogramTemp][dateType]",
@@ -203,15 +220,18 @@ <h1 class="nhsuk-heading-l">
         }
       },
       {
-        value: "approximateDate",
-        text: "Enter an approximate date",
+        value: "moreThanSixMonths",
+        text: "Not sure (6 months or more ago)",
         conditional: {
-          html: approximateDateHtml
+          html: moreThanSixMonthsHtml
         }
       },
       {
-        value: "notSure",
-        text: "Not sure"
+        value: "lessThanSixMonths",
+        text: "Not sure (less than 6 months ago)",
+        conditional: {
+          html: lessThanSixMonthsHtml
+        }
       }
     ]
   }) }}