show breast cancer history cards on the medical info page

MatMoore · MatMoore · commit 80640443738a · 2025-12-18T11:48:09.000Z
This introduces the *card content* for the innermost cards that display
breast cancer history items within the medical history card.

When there is more than one of these cards, they have card headings,
Item 1, Item 2 etc, which affects the overall heading hierarchy.
If there is only one, this heading is left out.

In a future commit, I'll align the card part with the latest card from
the design system, and move the change links into the card.
At that point we may want to also remove the padding around the card
content.

The prototype is using a custom card design, so I'll see which
customisations are still necessary after the new design system version
is out.
diff --git a/manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja b/manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja
@@ -4,6 +4,7 @@
 {% from "nhsuk/components/inset-text/macro.jinja" import insetText %}
 {% from "nhsuk/components/summary-list/macro.jinja" import summaryList %}
 {% from "components/participant-details/summary_list_rows.jinja" import last_mammogram_html %}
+{% from "mammograms/medical_information/medical_history/cards/breast_cancer_history_card.jinja" import breast_cancer_history_card %}
 
 {% block step_content %}
 
@@ -64,15 +65,6 @@
 {% endcall %}
 
 {% set medical_history_card_html %}
-  {% set breast_cancer_history_html %}
-    {% for presented_item in presenter.breast_cancer_history %}
-      <a style="float: right" class="nhsuk-link nhsuk-link--no-visited-state" href="{{ presented_item.change_link.href}}">
-        {{ presented_item.change_link.text }}<span class="nhsuk-u-visually-hidden">{{ presented_item.change_link.visually_hidden_text }}</span>
-      </a><br>
-      {{ summaryList(presented_item.summary_list_params) }}
-    {% endfor %}
-  {% endset %}
-
   {% set mastectomy_or_lumpectomy_history_html %}
     {% for presented_item in presenter.mastectomy_or_lumpectomy_history %}
       <a style="float: right" class="nhsuk-link nhsuk-link--no-visited-state" href="{{ presented_item.change_link.href}}">
@@ -125,19 +117,10 @@
     {% endfor %}
   {% endset %}
 
+  {{ breast_cancer_history_card(presenter.breast_cancer_history) }}
+
   {{ summaryList({
     "rows": [
-     {
-       "key": {
-         "text": "Breast cancer history"
-       },
-       "value": {
-         "html": breast_cancer_history_html
-       },
-       "actions": {
-          "items": []
-       }
-     },
      {
        "key": {
          "text": "Implanted medical device history"
@@ -216,8 +199,8 @@
       }) }}
     {% endfor %}
   </div>
-
 {% endset %}
+
 {{ card({
   "heading": "Medical history",
   "descriptionHtml": medical_history_card_html
diff --git a/manage_breast_screening/mammograms/presenters/medical_history/breast_cancer_history_item_presenter.py b/manage_breast_screening/mammograms/presenters/medical_history/breast_cancer_history_item_presenter.py
@@ -1,6 +1,6 @@
 from django.urls import reverse
 
-from manage_breast_screening.core.template_helpers import multiline_content, nl2br
+from manage_breast_screening.core.template_helpers import nl2br
 from manage_breast_screening.participants.models.medical_history.breast_cancer_history_item import (
     BreastCancerHistoryItem,
 )
@@ -12,19 +12,20 @@ def __init__(self, breast_cancer_history_item, counter=None):
         self.counter = counter
 
         self.cancer_location = self._item.get_diagnosis_location_display()
-        self.right_breast_procedures = self._item.get_right_breast_procedure_display()
-        self.left_breast_procedures = self._item.get_left_breast_procedure_display()
+
+        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_treatment = self._format_multiple_choices(
+        self.right_breast_treatments = self._format_multiple_choices(
             self._item.right_breast_treatment, BreastCancerHistoryItem.Treatment
         )
-        self.left_breast_treatment = self._format_multiple_choices(
+        self.left_breast_treatments = self._format_multiple_choices(
             self._item.left_breast_treatment, BreastCancerHistoryItem.Treatment
         )
         self.systemic_treatments = self._format_multiple_choices(
@@ -33,66 +34,8 @@ def __init__(self, breast_cancer_history_item, counter=None):
         )
         self.additional_details = nl2br(self._item.additional_details)
 
-    @property
-    def summary_list_params(self):
-        # This is a placeholder until we have a properly formatted table.
-        return {
-            "rows": [
-                {
-                    "key": {"text": "Cancer location"},
-                    "value": {"html": self.cancer_location},
-                },
-                {
-                    "key": {"text": "Procedures"},
-                    "value": {
-                        "html": multiline_content(
-                            [
-                                f"Right breast: {self.right_breast_procedures}",
-                                f"Left breast: {self.left_breast_procedures}",
-                            ]
-                        )
-                    },
-                },
-                {
-                    "key": {"text": "Other surgery"},
-                    "value": {
-                        "html": multiline_content(
-                            [
-                                f"Right breast: {self.right_breast_other_surgery}",
-                                f"Left breast: {self.left_breast_other_surgery}",
-                            ]
-                        )
-                    },
-                },
-                {
-                    "key": {"text": "Treatment"},
-                    "value": {
-                        "html": multiline_content(
-                            [
-                                f"Right breast: {self.right_breast_treatment}",
-                                f"Left breast: {self.left_breast_treatment}",
-                                f"Systemic treatements: {self.systemic_treatments}",
-                            ]
-                        )
-                    },
-                },
-                {
-                    "key": {"text": "Treatment location"},
-                    "value": {
-                        "html": self._item.get_intervention_location_display()
-                        + ": "
-                        + self._item.intervention_location_details
-                    },
-                },
-                {
-                    "key": {"text": "Additional details"},
-                    "value": {"html": self.additional_details},
-                },
-            ],
-        }
-
     def _format_multiple_choices(self, choices, ChoiceClass):
-        return ", ".join(ChoiceClass(choice).label for choice in choices)
+        return [ChoiceClass(choice).label for choice in choices]
 
     @property
     def change_link(self):
@@ -111,3 +54,10 @@ def change_link(self):
                 else " breast cancer item"
             ),
         }
+
+    @property
+    def intervention_location(self):
+        return {
+            "type": self._item.get_intervention_location_display(),
+            "details": self._item.intervention_location_details,
+        }
diff --git a/manage_breast_screening/mammograms/tests/presenters/medical_history/test_breast_cancer_history_item_presenter.py b/manage_breast_screening/mammograms/tests/presenters/medical_history/test_breast_cancer_history_item_presenter.py
@@ -1,3 +1,5 @@
+import pytest
+
 from manage_breast_screening.mammograms.presenters.medical_history.breast_cancer_history_item_presenter import (
     BreastCancerHistoryItemPresenter,
 )
@@ -10,69 +12,30 @@
 
 
 class TestBreastCancerHistoryItemPresenter:
-    def test_single(self):
-        item = BreastCancerHistoryItemFactory.build(
+    @pytest.fixture
+    def item(self):
+        return BreastCancerHistoryItemFactory.build(
             diagnosis_location=BreastCancerHistoryItem.DiagnosisLocationChoices.RIGHT_BREAST,
             right_breast_procedure=BreastCancerHistoryItem.Procedure.LUMPECTOMY,
             intervention_location=BreastCancerHistoryItem.InterventionLocation.NHS_HOSPITAL,
             intervention_location_details="East Tester Hospital",
             additional_details="some details",
         )
 
-        presenter = BreastCancerHistoryItemPresenter(item)
-
-        assert presenter.summary_list_params == {
-            "rows": [
-                {
-                    "key": {
-                        "text": "Cancer location",
-                    },
-                    "value": {
-                        "html": "Right breast",
-                    },
-                },
-                {
-                    "key": {
-                        "text": "Procedures",
-                    },
-                    "value": {
-                        "html": "Right breast: Lumpectomy<br>Left breast: No procedure",
-                    },
-                },
-                {
-                    "key": {
-                        "text": "Other surgery",
-                    },
-                    "value": {
-                        "html": "Right breast: No other surgery<br>Left breast: No other surgery",
-                    },
-                },
-                {
-                    "key": {
-                        "text": "Treatment",
-                    },
-                    "value": {
-                        "html": "Right breast: No radiotherapy<br>Left breast: No radiotherapy<br>Systemic treatements: No systemic treatments",
-                    },
-                },
-                {
-                    "key": {
-                        "text": "Treatment location",
-                    },
-                    "value": {
-                        "html": "At an NHS hospital: East Tester Hospital",
-                    },
-                },
-                {
-                    "key": {
-                        "text": "Additional details",
-                    },
-                    "value": {
-                        "html": "some details",
-                    },
-                },
-            ],
-        }
+    @pytest.fixture
+    def presenter(self, item):
+        return BreastCancerHistoryItemPresenter(item)
+
+    def test_attributes(self, presenter):
+        assert presenter.cancer_location == "Right breast"
+        assert presenter.right_breast_procedure == "Lumpectomy"
+        assert presenter.left_breast_procedure == "No procedure"
+        assert presenter.right_breast_other_surgery == ["No other surgery"]
+        assert presenter.left_breast_other_surgery == ["No other surgery"]
+        assert presenter.right_breast_treatments == ["No radiotherapy"]
+        assert presenter.left_breast_treatments == ["No radiotherapy"]
+        assert presenter.systemic_treatments == ["No systemic treatments"]
+        assert presenter.additional_details == "some details"
 
     def test_change_link(self):
         item = BreastCancerHistoryItemFactory.build()
diff --git a/manage_breast_screening/tests/system/clinical/test_breast_cancer_history.py b/manage_breast_screening/tests/system/clinical/test_breast_cancer_history.py
@@ -115,11 +115,14 @@ def then_i_am_back_on_the_medical_information_page(self):
         self.expect_url("mammograms:record_medical_information", pk=self.appointment.pk)
 
     def and_the_history_item_is_added(self):
-        key = self.page.locator(
-            ".nhsuk-summary-list__key",
-            has=self.page.get_by_text("Breast cancer history", exact=True),
-        )
-        row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
+        heading = self.page.get_by_role("heading").filter(has_text="Breast cancer")
+        expect(heading).to_be_attached()
+
+        section = self.page.locator("section").filter(has=heading)
+        expect(section).to_be_attached()
+
+        row = section.locator(".app-nested-info__row", has_text="Cancer location")
+
         expect(row).to_contain_text("Right breast")
 
     def and_the_message_says_device_added(self):
@@ -203,11 +206,10 @@ def when_i_select_breast_radiotherapy_in_right_breast(self):
         fieldset.get_by_label("Breast radiotherapy").click()
 
     def and_the_history_item_shows_the_radiotherapy(self):
-        key = self.page.locator(
-            ".nhsuk-summary-list__key",
-            has=self.page.get_by_text("Breast cancer history", exact=True),
-        )
-        row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
+        heading = self.page.get_by_role("heading").filter(has_text="Breast cancer")
+        section = self.page.locator("section").filter(has=heading)
+        row = section.locator(".app-nested-info__row", has_text="Treatment").first
+
         expect(row).to_contain_text("Breast radiotherapy")
 
     def and_the_message_says_breast_cancer_history_updated(self):
@@ -223,10 +225,5 @@ def and_i_click_delete_item(self):
         self.page.get_by_text("Delete item").click()
 
     def and_the_history_item_is_gone(self):
-        key = self.page.locator(
-            ".nhsuk-summary-list__key",
-            has=self.page.get_by_text("Breast cancer history", exact=True),
-        )
-        row = self.page.locator(".nhsuk-summary-list__row").filter(has=key)
-        expect(row).not_to_contain_text("Cancer location")
-        expect(row.get_by_text("Change")).not_to_be_attached()
+        heading = self.page.get_by_role("heading").filter(has_text="Breast cancer")
+        expect(heading).not_to_be_attached()
