Merge pull request #167 from NHSDigital/dtoss-9247-screening-history-section

[DTOSS-9247] Participant record appointments section

Author: MatMoore

manage_breast_screening/mammograms/presenters.py

@@ -4,27 +4,7 @@
 
 from ..core.utils.date_formatting import format_date, format_relative_date, format_time
 from ..participants.models import AppointmentStatus
-from ..participants.presenters import ParticipantPresenter
-
-
-def status_colour(status):
-    """
-    Color to render the status tag
-    """
-    match status:
-        case AppointmentStatus.CHECKED_IN:
-            return ""  # no colour will get solid dark blue
-        case AppointmentStatus.SCREENED:
-            return "green"
-        case AppointmentStatus.DID_NOT_ATTEND | AppointmentStatus.CANCELLED:
-            return "red"
-        case (
-            AppointmentStatus.ATTENDED_NOT_SCREENED
-            | AppointmentStatus.PARTIALLY_SCREENED
-        ):
-            return "orange"
-        case _:
-            return "blue"  # default blue
+from ..participants.presenters import ParticipantPresenter, status_colour
 
 
 def present_secondary_nav(id):

manage_breast_screening/participants/fixtures/participants.json

@@ -86,9 +86,7 @@
       "date_of_birth": "1959-07-22",
       "ethnic_group": null,
       "risk_level": "Routine",
-      "extra_needs": [
-        "Wheelchair user"
-      ]
+      "extra_needs": ["Wheelchair user"]
     }
   },
   {

manage_breast_screening/participants/jinja2/participants/show.jinja

@@ -1,7 +1,9 @@
 {% extends 'layout-app.jinja' %}
-{% from 'card/macro.jinja' import card %}
 {% from 'back-link/macro.jinja' import backLink %}
+{% from 'card/macro.jinja' import card %}
+{% from 'tag/macro.jinja' import tag %}
 {% from 'components/participant-details/macro.jinja' import participant_details %}
+{% from 'summary-list/macro.jinja' import summaryList %}
 
 {% block beforeContent %}
   {{ backLink({
@@ -18,14 +20,70 @@
       </h1>
 
       {% set personal_details_html %}
-        {{ participant_details(participant=participant, full_details=true, show_last_known_mammogram=false) }}
+        {{ participant_details(participant=presented_participant, full_details=true, show_last_known_mammogram=false) }}
       {% endset %}
 
       {{ card({
         "heading": "Personal details",
         "headingLevel": "2",
         "descriptionHtml": personal_details_html
       }) }}
+
+      {% macro appointment_table(presented_appointments, testid) %}
+          <table class="nhsuk-table" data-testid="{{ testid }}">
+          <thead>
+            <tr>
+              <th>Date</th>
+              <th>Type</th>
+              <th>Location</th>
+              <th>Status</th>
+              <th>Details</th>
+            </tr>
+          </thead>
+          <tbody>
+            {% for presented_appointment in presented_appointments %}
+              <tr data-testid="appointment-row">
+                <td>{{ presented_appointment.starts_at }}</td>
+                <td>{{ presented_appointment.clinic_type }}</td>
+                <td>{{ presented_appointment.setting_name }}</td>
+                <td>
+                  {{ tag({
+                    "text": presented_appointment.status.text,
+                    "classes": presented_appointment.status.classes
+                  }) }}
+                </td>
+                <td>
+                  <a href="{{ presented_appointment.url }}">
+                    View details
+                  </a>
+                </td>
+              </tr>
+            {% endfor %}
+          </tbody>
+          </table>
+      {% endmacro %}
+
+      {% set appointments_html %}
+        {% if presented_appointments.upcoming %}
+          <h3>Upcoming</h3>
+          {{ appointment_table(presented_appointments.upcoming, testid="upcoming-appointments-table") }}
+        {% endif %}
+
+        {% if presented_appointments.past %}
+          <h3>Previous</h3>
+          {{ appointment_table(presented_appointments.past, testid="past-appointments-table") }}
+        {% endif %}
+
+        {% if not presented_appointments.past and not presented_appointments.upcoming %}
+          <p>No screening history found</p>
+        {% endif %}
+      {% endset %}
+
+      {{ card({
+        "heading": "Appointments",
+        "headingLevel": "2",
+        "descriptionHtml": appointments_html
+      }) }}
     </div>
   </div>
 {% endblock page_content %}

manage_breast_screening/participants/models.py

@@ -149,6 +149,12 @@ def complete(self):
             AppointmentStatus.ATTENDED_NOT_SCREENED,
         )
 
+    def upcoming(self):
+        return self.filter(clinic_slot__starts_at__gte=date.today())
+
+    def past(self):
+        return self.filter(clinic_slot__starts_at__lt=date.today())
+
     def for_clinic_and_filter(self, clinic, filter):
         match filter:
             case "remaining":

manage_breast_screening/participants/presenters.py

@@ -1,3 +1,6 @@
+from dataclasses import dataclass
+from typing import Any
+
 from django.urls import reverse
 
 from ..core.utils.date_formatting import format_date, format_relative_date
@@ -7,6 +10,27 @@
     format_phone_number,
     sentence_case,
 )
+from .models import AppointmentStatus
+
+
+def status_colour(status):
+    """
+    Color to render the status tag
+    """
+    match status:
+        case AppointmentStatus.CHECKED_IN:
+            return ""  # no colour will get solid dark blue
+        case AppointmentStatus.SCREENED:
+            return "green"
+        case AppointmentStatus.DID_NOT_ATTEND | AppointmentStatus.CANCELLED:
+            return "red"
+        case (
+            AppointmentStatus.ATTENDED_NOT_SCREENED
+            | AppointmentStatus.PARTIALLY_SCREENED
+        ):
+            return "orange"
+        case _:
+            return "blue"  # default blue
 
 
 class ParticipantPresenter:
@@ -63,3 +87,45 @@ def last_known_screening(self):
             if self._last_known_screening
             else {}
         )
+
+
+class ParticipantAppointmentsPresenter:
+    @dataclass
+    class PresentedAppointment:
+        starts_at: str
+        clinic_type: str
+        setting_name: str
+        status: dict[str, Any]
+        url: str
+
+    def __init__(self, past_appointments, upcoming_appointments):
+        self.past = [
+            self._present_appointment(appointment) for appointment in past_appointments
+        ]
+        self.upcoming = [
+            self._present_appointment(appointment)
+            for appointment in upcoming_appointments
+        ]
+
+    def _present_appointment(self, appointment):
+        clinic_slot = appointment.clinic_slot
+        clinic = clinic_slot.clinic
+        setting = clinic.setting
+
+        return self.PresentedAppointment(
+            starts_at=format_date(clinic_slot.starts_at),
+            clinic_type=clinic.get_type_display().capitalize(),
+            setting_name=sentence_case(setting.name),
+            status=self._present_status(appointment),
+            url=reverse("mammograms:start_screening", kwargs={"id": appointment.pk}),
+        )
+
+    def _present_status(self, appointment):
+        current_status = appointment.current_status
+        colour = status_colour(current_status.state)
+
+        return {
+            "classes": f"nhsuk-tag--{colour} app-nowrap" if colour else "app-nowrap",
+            "text": current_status.get_state_display(),
+            "key": current_status.state,
+        }

manage_breast_screening/participants/tests/factories.py

@@ -59,6 +59,15 @@ class Meta:
     clinic_slot = SubFactory(ClinicSlotFactory)
     screening_episode = SubFactory(ScreeningEpisodeFactory)
 
+    @post_generation
+    def starts_at(obj, create, extracted, **kwargs):
+        if not create or not extracted:
+            return
+
+        obj.clinic_slot.starts_at = extracted
+        if create:
+            obj.clinic_slot.save()
+
     # Allow passing an explicit status
     # e.g. `current_status=AppointmentStatus.CHECKED_IN`
     @post_generation

manage_breast_screening/participants/tests/system/test_participant_record.py

@@ -1,9 +1,12 @@
 import re
+from datetime import datetime
+from datetime import timezone as tz
 
 import pytest
 from django.urls import reverse
 from playwright.sync_api import expect
 
+from manage_breast_screening.clinics.tests.factories import ClinicSlotFactory
 from manage_breast_screening.core.system_test_setup import SystemTestCase
 from manage_breast_screening.participants.tests.factories import (
     AppointmentFactory,
@@ -14,14 +17,15 @@
 
 class TestParticipantRecord(SystemTestCase):
     @pytest.fixture(autouse=True)
-    def before(self):
+    def before(self, time_machine):
         self.participant = ParticipantFactory(first_name="Janet", last_name="Williams")
-        self.screening_episode = ScreeningEpisodeFactory(participant=self.participant)
-        self.appointment = AppointmentFactory(screening_episode=self.screening_episode)
+
+        time_machine.move_to(datetime(2025, 1, 1, 10, tzinfo=tz.utc))
 
     @pytest.mark.skip("not implemented yet")
     def test_viewing_participant_record_from_an_appointment(self):
-        self.given_i_am_viewing_an_appointment()
+        self.given_the_participant_has_an_upcoming_appointment()
+        self.given_i_am_viewing_the_upcoming_appointment()
         self.when_i_click_on_view_participant_record()
         self.then_i_should_be_on_the_participant_record_page()
         self.and_i_should_see_the_participant_record()
@@ -32,12 +36,53 @@ def test_accessibility(self):
         self.given_i_am_on_the_participant_record_page()
         self.then_the_accessibility_baseline_is_met()
 
-    def given_i_am_viewing_an_appointment(self):
+    def test_viewing_upcoming_appointments(self):
+        self.given_the_participant_has_an_upcoming_appointment()
+        self.and_i_am_on_the_participant_record_page()
+        self.then_i_should_see_the_upcoming_appointment()
+        self.when_i_click_on_the_upcoming_appointment()
+        self.then_i_should_be_on_the_upcoming_appointment_page()
+
+    def test_viewing_past_appointments(self):
+        self.given_i_have_past_appointments()
+        self.and_i_am_on_the_participant_record_page()
+        self.then_i_should_see_the_past_appointments()
+        self.when_i_click_on_a_past_appointment()
+        self.then_i_should_be_on_the_past_appointment_page()
+
+    def given_the_participant_has_an_upcoming_appointment(self):
+        clinic_slot = ClinicSlotFactory(
+            starts_at=datetime(2025, 1, 2, 11, tzinfo=tz.utc)
+        )
+        screening_episode = ScreeningEpisodeFactory(participant=self.participant)
+        self.upcoming_appointment = AppointmentFactory(
+            clinic_slot=clinic_slot, screening_episode=screening_episode
+        )
+
+    def given_i_have_past_appointments(self):
+        clinic_slot_2022 = ClinicSlotFactory(
+            starts_at=datetime(2022, 1, 2, 11, tzinfo=tz.utc)
+        )
+        clinic_slot_2019 = ClinicSlotFactory(
+            starts_at=datetime(2019, 1, 2, 11, tzinfo=tz.utc)
+        )
+        self.past_appointments = [
+            AppointmentFactory(
+                clinic_slot=clinic_slot_2022,
+                screening_episode=ScreeningEpisodeFactory(participant=self.participant),
+            ),
+            AppointmentFactory(
+                clinic_slot=clinic_slot_2019,
+                screening_episode=ScreeningEpisodeFactory(participant=self.participant),
+            ),
+        ]
+
+    def given_i_am_viewing_the_upcoming_appointment(self):
         self.page.goto(
             self.live_server_url
             + reverse(
                 "mammograms:start_screening",
-                kwargs={"id": self.appointment.pk},
+                kwargs={"id": self.upcoming_appointment.pk},
             )
         )
 
@@ -50,6 +95,8 @@ def given_i_am_on_the_participant_record_page(self):
             )
         )
 
+    and_i_am_on_the_participant_record_page = given_i_am_on_the_participant_record_page
+
     def when_i_click_on_view_participant_record(self):
         self.page.get_by_text("View participant record").click()
 
@@ -71,6 +118,44 @@ def when_i_click_on_the_back_link(self):
     def then_i_should_be_back_on_the_appointment(self):
         path = reverse(
             "mammograms:start_screening",
-            kwargs={"id": self.appointment.pk},
+            kwargs={"id": self.upcoming_appointment.pk},
+        )
+        expect(self.page).to_have_url(re.compile(path))
+
+    def then_i_should_see_the_upcoming_appointment(self):
+        upcoming = self.page.get_by_test_id("upcoming-appointments-table")
+        expect(upcoming).to_be_visible()
+        appointment = upcoming.get_by_test_id("appointment-row")
+        expect(appointment).to_be_visible()
+        expect(appointment).to_contain_text("2 January 2025")
+
+    def then_i_should_see_the_past_appointments(self):
+        past = self.page.get_by_test_id("past-appointments-table")
+        expect(past).to_be_visible()
+        appointments = past.get_by_test_id("appointment-row").all()
+        assert len(appointments) == 2
+
+        expect(appointments[0]).to_contain_text("2 January 2022")
+        expect(appointments[1]).to_contain_text("2 January 2019")
+
+    def when_i_click_on_the_upcoming_appointment(self):
+        past = self.page.get_by_test_id("upcoming-appointments-table")
+        past.get_by_text("View details").click()
+
+    def when_i_click_on_a_past_appointment(self):
+        past = self.page.get_by_test_id("past-appointments-table")
+        past.get_by_text("View details").first.click()
+
+    def then_i_should_be_on_the_past_appointment_page(self):
+        path = reverse(
+            "mammograms:start_screening",
+            kwargs={"id": self.past_appointments[0].pk},
+        )
+        expect(self.page).to_have_url(re.compile(path))
+
+    def then_i_should_be_on_the_upcoming_appointment_page(self):
+        path = reverse(
+            "mammograms:start_screening",
+            kwargs={"id": self.upcoming_appointment.pk},
         )
         expect(self.page).to_have_url(re.compile(path))