Merge pull request #872 from NHSDigital/DTOSS-11856-mastectomy-lumpectomy-card

Medical information: presenter updates to better align with prototype

Author: MatMoore

manage_breast_screening/core/utils/date_formatting.py

@@ -44,6 +44,42 @@ def format_relative_date(value: datetime | date):
         return f"in {amount}"
 
 
+def format_relative_year(value: int | None):
+    """
+    Format a year value relative to the current year.
+
+    Use it for approximate dates where only the year is known.
+    """
+    if value is None or not 1900 < value < 2100:
+        return ""
+
+    year_diff = date.today().year - value
+    if year_diff == 0:
+        return "this year"
+    elif year_diff == 1:
+        return "last year"
+    elif year_diff == -1:
+        return "next year"
+    elif year_diff > 1:
+        return f"{year_diff} years ago"
+    elif year_diff < 1:
+        return f"in {abs(year_diff)} years"
+
+
+def format_year_with_relative(value: int | None):
+    """
+    Format a year with the relative number of years in brackets
+    """
+    if value is None:
+        return ""
+
+    relative = format_relative_year(value)
+    if relative:
+        return f"{value} ({relative})"
+    else:
+        return str(value)
+
+
 def _format_date_difference(date1, date2):
     diff = relativedelta(date1, date2) if date1 > date2 else relativedelta(date2, date1)
 

manage_breast_screening/core/utils/tests/test_date_formatting.py

@@ -4,7 +4,12 @@
 import pytest
 import time_machine
 
-from ..date_formatting import format_approximate_date, format_relative_date
+from ..date_formatting import (
+    format_approximate_date,
+    format_relative_date,
+    format_relative_year,
+    format_year_with_relative,
+)
 
 
 @time_machine.travel(datetime(2025, 5, 2, 10, tzinfo=ZoneInfo("Europe/London")))
@@ -27,6 +32,29 @@ def test_relative_dates(dateiso, output):
     assert format_relative_date(datetime.fromisoformat(dateiso)) == output
 
 
+@time_machine.travel(datetime(2025, 5, 2, 10, tzinfo=ZoneInfo("Europe/London")))
+@pytest.mark.parametrize(
+    ("year", "output"),
+    (
+        (2025, "this year"),
+        (2026, "next year"),
+        (2027, "in 2 years"),
+        (2024, "last year"),
+        (2015, "10 years ago"),
+        (None, ""),
+    ),
+)
+def test_relative_years(year, output):
+    assert format_relative_year(year) == output
+
+
+@time_machine.travel(datetime(2025, 5, 2, 10, tzinfo=ZoneInfo("Europe/London")))
+def test_year_with_relative():
+    assert format_year_with_relative(2000) == "2000 (25 years ago)"
+    assert format_year_with_relative(1066) == "1066"
+    assert format_year_with_relative(None) == ""
+
+
 @pytest.mark.parametrize(
     ("today", "year", "month", "output"),
     (

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/medical_history/cards/breast_cancer_history_card.jinja

@@ -31,6 +31,12 @@
             "html": paragraph(presented_item.cancer_location)
           }
         },
+        {
+          "key": "Diagnosis year",
+          "value": {
+            "html": paragraph(presented_item.diagnosis_year)
+          }
+        } if presented_item.diagnosis_year,
         {
           "key": "Procedures",
           "value": {

manage_breast_screening/mammograms/presenters/medical_history/benign_lump_history_item_presenter.py

@@ -1,6 +1,7 @@
 from django.urls import reverse
 
 from manage_breast_screening.core.template_helpers import multiline_content, nl2br
+from manage_breast_screening.core.utils.date_formatting import format_year_with_relative
 from manage_breast_screening.participants.models.medical_history.benign_lump_history_item import (
     BenignLumpHistoryItem,
 )
@@ -10,13 +11,17 @@ class BenignLumpHistoryItemPresenter:
     def __init__(self, benign_lump_history_item, counter=None):
         self._item = benign_lump_history_item
         self.counter = counter
-        self.right_breast_procedures = self._format_multiple_choices(
-            self._item.right_breast_procedures, BenignLumpHistoryItem.Procedure
-        )
-        self.left_breast_procedures = self._format_multiple_choices(
-            self._item.left_breast_procedures, BenignLumpHistoryItem.Procedure
-        )
-        self.procedure_year = str(self._item.procedure_year)
+
+        self.right_breast_procedures = [
+            BenignLumpHistoryItem.Procedure(choice).label
+            for choice in self._item.right_breast_procedures
+        ]
+        self.left_breast_procedures = [
+            BenignLumpHistoryItem.Procedure(choice).label
+            for choice in self._item.left_breast_procedures
+        ]
+
+        self.procedure_year = format_year_with_relative(self._item.procedure_year)
         self.procedure_location = self._item.get_procedure_location_display()
         self.procedure_location_details = self._item.procedure_location_details
         self.additional_details = nl2br(self._item.additional_details)
@@ -30,8 +35,8 @@ def summary_list_params(self):
                     "value": {
                         "html": multiline_content(
                             [
-                                f"Right breast: {self.right_breast_procedures}",
-                                f"Left breast: {self.left_breast_procedures}",
+                                f"Right breast: {', '.join(self.right_breast_procedures)}",
+                                f"Left breast: {', '.join(self.left_breast_procedures)}",
                             ]
                         )
                     },
@@ -53,6 +58,13 @@ def summary_list_params(self):
             ]
         }
 
+    @property
+    def treatment_location(self):
+        return {
+            "type": self._item.get_procedure_location_display(),
+            "details": self._item.procedure_location_details,
+        }
+
     @property
     def change_link(self):
         return {
@@ -70,6 +82,3 @@ def change_link(self):
                 else " benign lump item"
             ),
         }
-
-    def _format_multiple_choices(self, choices, ChoiceClass):
-        return ", ".join(ChoiceClass(choice).label for choice in choices)

manage_breast_screening/mammograms/presenters/medical_history/breast_augmentation_history_item_presenter.py

@@ -1,6 +1,7 @@
 from django.urls import reverse
 
 from manage_breast_screening.core.template_helpers import multiline_content, nl2br
+from manage_breast_screening.core.utils.date_formatting import format_year_with_relative
 from manage_breast_screening.participants.models.medical_history.breast_augmentation_history_item import (
     BreastAugmentationHistoryItem,
 )
@@ -11,13 +12,16 @@ def __init__(self, breast_augmentation_history_item, counter=None):
         self._item = breast_augmentation_history_item
         self.counter = counter
 
-        self.right_breast_procedures = self._format_multiple_choices(
-            self._item.right_breast_procedures, BreastAugmentationHistoryItem.Procedure
-        )
-        self.left_breast_procedures = self._format_multiple_choices(
-            self._item.left_breast_procedures, BreastAugmentationHistoryItem.Procedure
-        )
-        self.procedure_year = str(self._item.procedure_year)
+        self.right_breast_procedures = [
+            BreastAugmentationHistoryItem.Procedure(choice).label
+            for choice in self._item.right_breast_procedures
+        ]
+        self.left_breast_procedures = [
+            BreastAugmentationHistoryItem.Procedure(choice).label
+            for choice in self._item.left_breast_procedures
+        ]
+
+        self.procedure_year = format_year_with_relative(self._item.procedure_year)
         self.implants_have_been_removed = (
             "Yes" if self._item.implants_have_been_removed else "No"
         )
@@ -31,8 +35,8 @@ def summary_list_params(self):
         # This is a placeholder until we have a properly formatted table.
 
         procedures = [
-            f"Right breast: {self.right_breast_procedures}",
-            f"Left breast: {self.left_breast_procedures}",
+            f"Right breast: {', '.join(self.right_breast_procedures)}",
+            f"Left breast: {', '.join(self.left_breast_procedures)}",
         ]
 
         return {
@@ -58,9 +62,6 @@ def summary_list_params(self):
             ],
         }
 
-    def _format_multiple_choices(self, choices, ChoiceClass):
-        return ", ".join(ChoiceClass(choice).label for choice in choices)
-
     @property
     def change_link(self):
         return {

manage_breast_screening/mammograms/presenters/medical_history/breast_cancer_history_item_presenter.py

@@ -1,6 +1,7 @@
 from django.urls import reverse
 
 from manage_breast_screening.core.template_helpers import nl2br
+from manage_breast_screening.core.utils.date_formatting import format_year_with_relative
 from manage_breast_screening.participants.models.medical_history.breast_cancer_history_item import (
     BreastCancerHistoryItem,
 )
@@ -16,26 +17,32 @@ def __init__(self, breast_cancer_history_item, counter=None):
         self.right_breast_procedure = self._item.get_right_breast_procedure_display()
         self.left_breast_procedure = self._item.get_left_breast_procedure_display()
 
-        self.right_breast_other_surgery = self._format_multiple_choices(
-            self._item.right_breast_other_surgery, BreastCancerHistoryItem.Surgery
-        )
-        self.left_breast_other_surgery = self._format_multiple_choices(
-            self._item.left_breast_other_surgery, BreastCancerHistoryItem.Surgery
-        )
-        self.right_breast_treatments = self._format_multiple_choices(
-            self._item.right_breast_treatment, BreastCancerHistoryItem.Treatment
-        )
-        self.left_breast_treatments = self._format_multiple_choices(
-            self._item.left_breast_treatment, BreastCancerHistoryItem.Treatment
-        )
-        self.systemic_treatments = self._format_multiple_choices(
-            self._item.systemic_treatments,
-            BreastCancerHistoryItem.SystemicTreatment,
-        )
-        self.additional_details = nl2br(self._item.additional_details)
+        self.diagnosis_year = format_year_with_relative(self._item.diagnosis_year)
+
+        self.right_breast_other_surgery = [
+            BreastCancerHistoryItem.Surgery(choice).label
+            for choice in self._item.right_breast_other_surgery
+        ]
+        self.left_breast_other_surgery = [
+            BreastCancerHistoryItem.Surgery(choice).label
+            for choice in self._item.left_breast_other_surgery
+        ]
+
+        self.right_breast_treatments = [
+            BreastCancerHistoryItem.Treatment(choice).label
+            for choice in self._item.right_breast_treatment
+        ]
+        self.left_breast_treatments = [
+            BreastCancerHistoryItem.Treatment(choice).label
+            for choice in self._item.left_breast_treatment
+        ]
 
-    def _format_multiple_choices(self, choices, ChoiceClass):
-        return [ChoiceClass(choice).label for choice in choices]
+        self.systemic_treatments = [
+            BreastCancerHistoryItem.SystemicTreatment(choice).label
+            for choice in self._item.systemic_treatments
+        ]
+
+        self.additional_details = nl2br(self._item.additional_details)
 
     @property
     def change_link(self):

manage_breast_screening/mammograms/presenters/medical_history/implanted_medical_device_history_item_presenter.py

@@ -1,7 +1,11 @@
 from django.urls import reverse
 
-from manage_breast_screening.core.template_helpers import (
-    nl2br,
+from manage_breast_screening.core.template_helpers import multiline_content, nl2br
+from manage_breast_screening.core.utils.date_formatting import (
+    format_year_with_relative,
+)
+from manage_breast_screening.participants.models.medical_history.implanted_medical_device_history_item import (
+    ImplantedMedicalDeviceHistoryItem,
 )
 
 
@@ -17,14 +21,32 @@ def __init__(self, implanted_medical_device_history_item, counter=None):
         self.other_medical_device_details = (
             self._item.other_medical_device_details or "N/A"
         )
-        self.procedure_year = str(self._item.procedure_year)
+
         self.device_has_been_removed = (
             "Yes" if self._item.device_has_been_removed else "No"
         )
         if self._item.device_has_been_removed and self._item.removal_year:
             self.device_has_been_removed += f" ({self._item.removal_year})"
         self.additional_details = nl2br(self._item.additional_details)
 
+    @property
+    def procedure_year(self):
+        return format_year_with_relative(self._item.procedure_year)
+
+    @property
+    def removal_year(self):
+        return format_year_with_relative(self._item.removal_year)
+
+    @property
+    def procedure_year_with_removal(self):
+        lines = [f"Implanted in {self.procedure_year}"]
+        if self._item.removal_year:
+            lines.append(f"Device removed in {self.removal_year}")
+        elif self._item.device_has_been_removed:
+            lines.append("Device removed")
+
+        return multiline_content(lines)
+
     @property
     def summary_list_params(self):
         # This is a placeholder until we have a properly formatted table.
@@ -55,6 +77,19 @@ def summary_list_params(self):
             ],
         }
 
+    @property
+    def type(self):
+        device = self._item.get_device_display()
+        details = self._item.other_medical_device_details
+        if (
+            self._item.device
+            == ImplantedMedicalDeviceHistoryItem.Device.OTHER_MEDICAL_DEVICE
+            and details
+        ):
+            return f"Other medical device: {details}"
+        else:
+            return device
+
     @property
     def change_link(self):
         return {

manage_breast_screening/mammograms/presenters/medical_history/mastectomy_or_lumpectomy_history_item_presenter.py

@@ -1,6 +1,7 @@
 from django.urls import reverse
 
 from manage_breast_screening.core.template_helpers import multiline_content, nl2br
+from manage_breast_screening.core.utils.date_formatting import format_year_with_relative
 from manage_breast_screening.participants.models.medical_history.mastectomy_or_lumpectomy_history_item import (
     MastectomyOrLumpectomyHistoryItem,
 )
@@ -17,16 +18,17 @@ def __init__(self, mastectomy_or_lumpectomy_history_item, counter=None):
         self.right_breast_procedure = self._item.get_right_breast_procedure_display()
         self.left_breast_procedure = self._item.get_left_breast_procedure_display()
 
-        self.right_breast_other_surgery = self._format_multiple_choices(
-            self._item.right_breast_other_surgery,
-            MastectomyOrLumpectomyHistoryItem.Surgery,
-        )
-        self.left_breast_other_surgery = self._format_multiple_choices(
-            self._item.left_breast_other_surgery,
-            MastectomyOrLumpectomyHistoryItem.Surgery,
-        )
+        self.right_breast_other_surgery = [
+            MastectomyOrLumpectomyHistoryItem.Surgery(choice).label
+            for choice in self._item.right_breast_other_surgery
+        ]
+        self.left_breast_other_surgery = [
+            MastectomyOrLumpectomyHistoryItem.Surgery(choice).label
+            for choice in self._item.left_breast_other_surgery
+        ]
+
         self.year_of_surgery = (
-            str(self._item.year_of_surgery)
+            format_year_with_relative(self._item.year_of_surgery)
             if self._item.year_of_surgery
             else "Not specified"
         )
@@ -46,9 +48,6 @@ def surgery_reason(self):
         else:
             return reason
 
-    def _format_multiple_choices(self, choices, ChoiceClass):
-        return [ChoiceClass(choice).label for choice in choices]
-
     @property
     def change_link(self):
         return {