Merge pull request #842 from NHSDigital/DTOSS-11597-appointment-should-not-proceed-refactor

Appointment can't proceed if had mammogram within the last 6 months.

Support updating of previous mammograms.

Author: swebberuk

manage_breast_screening/core/jinja2/layout-app.jinja

@@ -40,6 +40,12 @@
   }}
 {% endblock %}
 
+{% block beforeContent %}
+  {% if back_link_params %}
+  {{ backLink(back_link_params) }}
+  {% endif %}
+{% endblock beforeContent %}
+
 {% block content %}
   {% block flash_messages %}
     {% set info_notification_params = get_notification_banner_params(

manage_breast_screening/core/jinja2/layout-form.jinja

@@ -2,12 +2,6 @@
 {% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
 {% from 'django_form_helpers.jinja' import form_error_summary %}
 
-{% block beforeContent %}
-  {% if back_link_params %}
-  {{ backLink(back_link_params) }}
-  {% endif %}
-{% endblock beforeContent %}
-
 {% block page_content %}
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-two-thirds">

manage_breast_screening/core/views/generic.py

@@ -86,14 +86,18 @@ def form_valid(self, form):
         auditor = Auditor.from_request(self.request)
         auditor.audit_create(created_object)
 
-        messages.add_message(
-            self.request,
-            messages.SUCCESS,
-            self.get_success_message_content(created_object),
-        )
+        if self.should_add_message(form):
+            messages.add_message(
+                self.request,
+                messages.SUCCESS,
+                self.get_success_message_content(created_object),
+            )
 
         return super().form_valid(form)
 
+    def should_add_message(self, form) -> bool:
+        return True
+
 
 class UpdateWithAuditView(NamedThingMixin, SingleObjectMixin, FormView):
     """
@@ -159,14 +163,18 @@ def form_valid(self, form):
         auditor = Auditor.from_request(self.request)
         auditor.audit_update(created_object)
 
-        messages.add_message(
-            self.request,
-            messages.SUCCESS,
-            self.get_success_message_content(created_object),
-        )
+        if self.should_add_message(form):
+            messages.add_message(
+                self.request,
+                messages.SUCCESS,
+                self.get_success_message_content(created_object),
+            )
 
         return super().form_valid(form)
 
+    def should_add_message(self, form) -> bool:
+        return True
+
 
 class DeleteWithAuditView(NamedThingMixin, DeleteView):
     """

manage_breast_screening/mammograms/jinja2/mammograms/add_previous_mammogram.jinja

@@ -0,0 +1,22 @@
+{% extends "layout-form.jinja" %}
+{% from "nhsuk/components/button/macro.jinja" import button %}
+{% from "nhsuk/components/fieldset/macro.jinja" import fieldset %}
+
+{% block form %}
+  <input type="hidden" name="return_url" value="{{ return_url }}"/>
+
+  {% do form.location_type.add_divider_after("OUTSIDE_UK", "or") %}
+  {{ form.location_type.as_field_group() }}
+
+  {{ form.when_taken.as_field_group() }}
+
+  {{ form.name_is_the_same.as_field_group() }}
+
+  {{ form.additional_information.as_field_group() }}
+
+  <div class="nhsuk-button-group">
+    {{ button({
+      "text": "Save"
+    }) }}
+  </div>
+{% endblock %}

manage_breast_screening/mammograms/jinja2/mammograms/appointment_should_not_proceed.jinja

@@ -0,0 +1,36 @@
+{% extends 'layout-app.jinja' %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'django_form_helpers.jinja' import form_error_summary %}
+
+{% block page_content %}
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-two-thirds">
+    <h1 class="nhsuk-heading-l">
+      {% if caption %}
+      <span class="nhsuk-caption-l">
+        {{ caption }}
+      </span>
+      {% endif %}
+      {{ heading }}
+    </h1>
+
+    <p>The mammogram added took place {{ time_since_previous_mammogram }}. It is not recommended to take breast x-rays within 6 months of each other.</p>
+
+    <p>Advise the participant that they will be invited for their next scheduled mammogram based on the information provided.</p>
+
+    <form action="{{ url('mammograms:attended_not_screened', kwargs={'appointment_pk': appointment.pk}) }}" method="post">
+      <div class="nhsuk-button-group">
+        {{ csrf_input }}
+        {{ button({
+          "text": "End appointment and return to clinic"
+        }) }}
+      </div>
+    </form>
+
+    <p>
+    <a href="{{ change_previous_mammogram_url }}">Edit previous mammogram details</a>
+    </p>
+  </div>
+</div>
+{% endblock %}

manage_breast_screening/mammograms/presenters/last_known_mammogram_presenter.py

@@ -9,9 +9,9 @@
 
 
 class LastKnownMammogramPresenter:
-    def __init__(self, last_known_mammograms, participant_pk, current_url):
+    def __init__(self, last_known_mammograms, appointment_pk, current_url):
         self._last_known_mammograms = last_known_mammograms
-        self.participant_pk = participant_pk
+        self.appointment_pk = appointment_pk
         self.current_url = current_url
 
     @cached_property
@@ -66,8 +66,8 @@ def _present_mammogram(self, mammogram):
     def add_link(self):
         href = (
             reverse(
-                "participants:add_previous_mammogram",
-                kwargs={"pk": self.participant_pk},
+                "mammograms:add_previous_mammogram",
+                kwargs={"pk": self.appointment_pk},
             )
             + f"?return_url={self.current_url}"
         )

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -237,8 +237,8 @@ def medical_information_url(self):
     def add_mammogram_button(self):
         url = (
             reverse(
-                "participants:add_previous_mammogram",
-                kwargs={"pk": self.appointment.participant.pk},
+                "mammograms:add_previous_mammogram",
+                kwargs={"pk": self.appointment.pk},
             )
             + "?return_url="
             + quote(self.medical_information_url)

manage_breast_screening/mammograms/tests/presenters/test_last_known_mammogram_presenter.py

@@ -35,7 +35,7 @@ def reported_earlier(self):
     def test_no_last_known_mammograms(self, reported_today):
         result = LastKnownMammogramPresenter(
             [],
-            participant_pk=uuid4(),
+            appointment_pk=uuid4(),
             current_url="/mammograms/abc",
         )
 
@@ -45,7 +45,7 @@ def test_no_last_known_mammograms(self, reported_today):
     def test_last_known_mammograms_single(self, reported_today):
         result = LastKnownMammogramPresenter(
             [reported_today],
-            participant_pk=uuid4(),
+            appointment_pk=uuid4(),
             current_url="/mammograms/abc",
         )
 
@@ -67,7 +67,7 @@ def test_last_known_mammograms_single(self, reported_today):
     def test_last_known_mammograms_multiple(self, reported_today, reported_earlier):
         result = LastKnownMammogramPresenter(
             [reported_today, reported_earlier],
-            participant_pk=uuid4(),
+            appointment_pk=uuid4(),
             current_url="/mammograms/abc",
         )
 
@@ -95,17 +95,17 @@ def test_last_known_mammograms_multiple(self, reported_today, reported_earlier):
         ]
 
     def test_add_link(self, reported_today):
-        participant_id = uuid4()
+        appointment_pk = uuid4()
         current_url = "/mammograms/abc"
 
         result = LastKnownMammogramPresenter(
             [reported_today],
-            participant_pk=participant_id,
+            appointment_pk=appointment_pk,
             current_url=current_url,
         )
 
         assert result.add_link == {
-            "href": f"/participants/{participant_id}/previous-mammograms/add?return_url={current_url}",
+            "href": f"/mammograms/{appointment_pk}/previous-mammograms/add?return_url={current_url}",
             "text": "Add another",
             "visually_hidden_text": "mammogram",
         }

manage_breast_screening/mammograms/tests/presenters/test_medical_information_presenter.py

@@ -267,7 +267,7 @@ def test_add_mammogram_button(self):
 
         assert MedicalInformationPresenter(appointment).add_mammogram_button == {
             "href": (
-                f"/participants/{appointment.participant.pk}/previous-mammograms/add"
+                f"/mammograms/{appointment.pk}/previous-mammograms/add"
                 + f"?return_url=/mammograms/{appointment.pk}/record-medical-information/"
             ),
             "text": "Add another mammogram",