Merge pull request #215 from NHSDigital/dtoss-9812-appointment-completed-page

DTOSS-9812 Appointment completed page

Author: MatMoore

manage_breast_screening/assets/sass/main.scss

@@ -31,7 +31,7 @@ h3 {
 Highlight in red links that don't get anywhere yet
 */
 a[href="#"] {
-  color: #c80000;
+  color: #c80000 !important;
 }
 
 // Status tag positioning within headers

manage_breast_screening/clinics/jinja2/clinics/show.jinja

@@ -46,7 +46,7 @@
   {% for presented_appointment in presented_appointment_list.appointments %}
     {% set details_html %}
       <p class="nhsuk-u-margin-bottom-1">
-        <a href="{{ url('mammograms:start_screening', kwargs={"pk": presented_appointment.pk}) }}" class="nhsuk-link">
+        <a href="{{ url('mammograms:show_appointment', kwargs={"pk": presented_appointment.pk}) }}" class="nhsuk-link">
           {{ presented_appointment.participant.full_name }}
         </a>
       </p>
@@ -111,4 +111,4 @@
     "classes": "nhsuk-table"
   }) }}
 
-{% endblock %}
+{% endblock %}

manage_breast_screening/core/jinja2/components/appointment-header/template.jinja

@@ -3,6 +3,6 @@
 
 <p class="app-text-grey"><span>NHS Number: {{ participant.nhs_number }}</span></p>
 
-<p>{{ clinic_slot.slot_time_and_clinic_date }}<span class="nhsuk-u-margin-left-3"><a href="#">Reschedule appointment</a></span></p>
+<p>{{ clinic_slot.slot_time_and_clinic_date }}{% if not appointment.current_status.is_screened %}<span class="nhsuk-u-margin-left-3"><a href="#">Reschedule appointment</a></span>{% endif %}</p>
 
 <p class="nhsuk-u-margin-bottom-4"><a href="{{ appointment.participant_url }}">View participant record</a></p>

manage_breast_screening/mammograms/jinja2/mammograms/show/appointment_details.jinja

@@ -0,0 +1,56 @@
+{% extends 'layout-app.jinja' %}
+{% from 'card/macro.jinja' import card %}
+{% from 'warning-callout/macro.jinja' import warningCallout %}
+{% from 'back-link/macro.jinja' import backLink %}
+{% from 'components/appointment-status/macro.jinja' import appointment_status %}
+{% from 'components/appointment-header/macro.jinja' import appointment_header %}
+{% from 'components/participant-details/macro.jinja' import participant_details %}
+{% from 'components/secondary-navigation/macro.jinja' import app_secondary_navigation %}
+
+{% block beforeContent %}
+{{ backLink({
+  "href": presented_appointment.clinic_url,
+  "text": "Back to clinic"
+}) }}
+{% endblock beforeContent %}
+
+{% block page_content %}
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-full">
+
+  <div class="app-header">
+    <h1 class="nhsuk-heading-l">
+      <span class="nhsuk-caption-l">
+        {{ caption }}
+      </span>
+      {{ title }}
+    </h1>
+
+    <div class="app-header__status-tag">
+      {{ appointment_status(
+        appointment=presented_appointment,
+        csrf_input=csrf_input
+      )}}
+    </div>
+  </div>
+
+  {{ appointment_header(presented_appointment) }}
+
+  {{ app_secondary_navigation({
+    "visuallyHiddenTitle": "Secondary menu",
+    "items": secondary_nav_items
+  }) }}
+
+  {{ card({
+    "headingHtml": " ",
+    "headingLevel": "2",
+    "descriptionHtml": participant_details(
+      presented_participant=presented_participant,
+      presented_mammograms=presented_mammograms,
+      return_url=request.path,
+      screening_protocol=presented_appointment.screening_protocol
+    )
+  }) }}
+  </div>
+</div>
+{% endblock %}

manage_breast_screening/mammograms/jinja2/mammograms/start_screening.jinja

@@ -21,18 +21,12 @@
         csrf_input=csrf_input
       )}}
     </div>
+  </div>
 {% endblock %}
 
 {% block step_content %}
   {{ appointment_header(presented_appointment) }}
 
-  {% if secondary_nav_items %}
-    {{ app_secondary_navigation({
-      "visuallyHiddenTitle": "Secondary menu",
-      "items": secondary_nav_items
-    }) }}
-  {% endif %}
-
   {% set special_appointment_html %}
     {% if presented_participant.extra_needs | length > 1 %}
       <ul>

manage_breast_screening/mammograms/presenters.py

@@ -15,7 +15,7 @@ def present_secondary_nav(pk):
         {
             "id": "all",
             "text": "Appointment details",
-            "href": reverse("mammograms:start_screening", kwargs={"pk": pk}),
+            "href": reverse("mammograms:show_appointment", kwargs={"pk": pk}),
             "current": True,
         },
         {"id": "medical_information", "text": "Medical information", "href": "#"},
@@ -39,6 +39,10 @@ def __init__(self, appointment):
     def participant_url(self):
         return self.participant.url
 
+    @cached_property
+    def clinic_url(self):
+        return self.clinic_slot.clinic_url
+
     @cached_property
     def start_time(self):
         return self.clinic_slot.starts_at
@@ -65,6 +69,7 @@ def current_status(self):
             "text": current_status.get_state_display(),
             "key": current_status.state,
             "is_confirmed": current_status.state == AppointmentStatus.CONFIRMED,
+            "is_screened": current_status.state == AppointmentStatus.SCREENED,
         }
 
 
@@ -149,6 +154,10 @@ def __init__(self, clinic_slot):
     def clinic_type(self):
         return self._clinic.get_type_display().capitalize()
 
+    @cached_property
+    def clinic_url(self):
+        return reverse("clinics:show", kwargs={"pk": self._clinic.pk})
+
     @cached_property
     def slot_time_and_clinic_date(self):
         clinic_slot = self._clinic_slot

manage_breast_screening/mammograms/tests/system/test_adding_previous_mammograms.py

@@ -24,7 +24,7 @@ def test_adding_a_mammogram_at_the_same_provider(self):
         """
         If a mammogram was taken at the same provider, but there is an error in the system, the participant can report that it was taken.
         """
-        self.given_i_am_on_the_start_screening_page()
+        self.given_i_am_on_the_appointment_show_page()
         self.then_i_should_see_no_reported_mammograms()
 
         self.when_i_click_on_add_mammogram()
@@ -43,7 +43,7 @@ def test_adding_a_mammogram_taken_elsewhere_with_a_different_name(self):
         If a mammogram was taken at another BSU, or elsewhere in the UK, the participant can report that it was taken
         If the mammogram was taken under a different name, the mammographer can record that name.
         """
-        self.given_i_am_on_the_start_screening_page()
+        self.given_i_am_on_the_appointment_show_page()
         self.then_i_should_see_no_reported_mammograms()
 
         self.when_i_click_on_add_mammogram()
@@ -61,11 +61,11 @@ def test_accessibility(self):
         self.given_i_am_on_the_add_previous_mammograms_page()
         self.then_the_accessibility_baseline_is_met()
 
-    def given_i_am_on_the_start_screening_page(self):
+    def given_i_am_on_the_appointment_show_page(self):
         self.page.goto(
             self.live_server_url
             + reverse(
-                "mammograms:start_screening",
+                "mammograms:show_appointment",
                 kwargs={"pk": self.appointment.pk},
             )
         )
@@ -94,7 +94,7 @@ def then_i_should_be_on_the_add_previous_mammogram_form(self):
 
     def then_i_should_be_back_on_the_appointment(self):
         path = reverse(
-            "mammograms:start_screening",
+            "mammograms:show_appointment",
             kwargs={"pk": self.appointment.pk},
         )
         expect(self.page).to_have_url(re.compile(path))

manage_breast_screening/mammograms/tests/system/test_recording_a_mammogram.py

@@ -23,7 +23,7 @@ def test_recording_a_mammogram_without_capturing_medical_information(self):
         """
         I can record a mammogram without entering any relevant medical information.
         """
-        self.given_i_am_on_the_start_screening_page()
+        self.given_i_am_on_the_appointment_show_page()
         self.then_i_should_see_the_demographic_banner()
         self.and_i_should_see_the_participant_details()
 
@@ -39,7 +39,7 @@ def test_filling_out_forms_incorrectly(self):
         At each step in the flow, when I fill out the forms incorrectly,
         then I should see the errors so I can fix them.
         """
-        self.given_i_am_on_the_start_screening_page()
+        self.given_i_am_on_the_appointment_show_page()
         self.when_i_submit_the_form()
         self.then_i_am_prompted_to_answer_can_the_screening_go_ahead()
 
@@ -56,7 +56,7 @@ def test_filling_out_forms_incorrectly(self):
         self.then_i_am_prompted_to_confirm_whether_imaging_can_go_ahead()
 
     def test_accessibility(self):
-        self.given_i_am_on_the_start_screening_page()
+        self.given_i_am_on_the_appointment_show_page()
         self.then_the_accessibility_baseline_is_met()
 
         self.when_i_check_the_participants_identity_and_confirm_the_last_mammogram_date()
@@ -68,11 +68,11 @@ def test_accessibility(self):
         self.when_i_mark_that_imaging_can_go_ahead()
         self.then_the_accessibility_baseline_is_met()
 
-    def given_i_am_on_the_start_screening_page(self):
+    def given_i_am_on_the_appointment_show_page(self):
         self.page.goto(
             self.live_server_url
             + reverse(
-                "mammograms:start_screening",
+                "mammograms:show_appointment",
                 kwargs={"pk": self.appointment.pk},
             )
         )

manage_breast_screening/mammograms/tests/system/test_viewing_a_completed_appointment.py

@@ -0,0 +1,56 @@
+import pytest
+from django.urls import reverse
+from playwright.sync_api import expect
+
+from manage_breast_screening.core.system_test_setup import SystemTestCase
+from manage_breast_screening.participants.models import AppointmentStatus
+from manage_breast_screening.participants.tests.factories import (
+    AppointmentFactory,
+    ParticipantFactory,
+    ScreeningEpisodeFactory,
+)
+
+
+class TestViewingACompletedAppointment(SystemTestCase):
+    @pytest.fixture(autouse=True)
+    def before(self):
+        self.participant = ParticipantFactory(first_name="Janet", last_name="Williams")
+        self.screening_episode = ScreeningEpisodeFactory(participant=self.participant)
+        self.appointment = AppointmentFactory(
+            screening_episode=self.screening_episode,
+            current_status=AppointmentStatus.SCREENED,
+        )
+
+    def test_viewing_a_completed_appointment(self):
+        """
+        The appointment page includes appointment details, medical information, and images tabs.
+        Only the first one is implemented yet.
+        """
+        self.given_i_am_on_the_appointment_show_page()
+        self.then_i_should_see_the_demographic_banner()
+        self.and_i_should_see_the_participant_details()
+        self.and_i_should_not_see_a_form()
+
+    def test_accessibility(self):
+        self.given_i_am_on_the_appointment_show_page()
+        self.then_the_accessibility_baseline_is_met()
+
+    def given_i_am_on_the_appointment_show_page(self):
+        self.page.goto(
+            self.live_server_url
+            + reverse(
+                "mammograms:show_appointment",
+                kwargs={"pk": self.appointment.pk},
+            )
+        )
+
+    def then_i_should_see_the_demographic_banner(self):
+        expect(self.page.get_by_text("NHS Number")).to_be_visible()
+
+    def and_i_should_see_the_participant_details(self):
+        expect(
+            self.page.locator(".nhsuk-summary-list__row", has_text="Full name")
+        ).to_contain_text("Janet Williams")
+
+    def and_i_should_not_see_a_form(self):
+        expect(self.page.get_by_role("form")).not_to_be_attached()