Merge pull request #820 from NHSDigital/DTOSS-11781-cleanup-2

Medical history - more cleanup

Author: MatMoore

manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja

@@ -190,17 +190,6 @@
           "items": []
        }
      },
-     {
-       "key": {
-         "text": "Non-cancerous lump diagnosis"
-       },
-       "value": {
-         "html": non_cancerous_lump_diagnosis_link
-       },
-       "actions": {
-          "items": []
-       }
-     },
      {
        "key": {
          "text": "Mastectomy or lumpectomy history"
@@ -211,17 +200,6 @@
        "actions": {
           "items": []
        }
-     },
-     {
-       "key": {
-         "text": "Other breast or chest procedures"
-       },
-       "value": {
-         "html": chest_procedures_link
-       },
-       "actions": {
-          "items": []
-       }
      }
     ]
   }) }}

manage_breast_screening/mammograms/presenters/appointment_presenters.py

@@ -93,9 +93,9 @@ def current_status(self):
         colour = status_colour(current_status.state)
 
         return {
-            "classes": f"nhsuk-tag--{colour} app-u-nowrap"
-            if colour
-            else "app-u-nowrap",
+            "classes": (
+                f"nhsuk-tag--{colour} app-u-nowrap" if colour else "app-u-nowrap"
+            ),
             "text": current_status.get_state_display(),
             "key": current_status.state,
             "is_confirmed": current_status.state == AppointmentStatus.CONFIRMED,

manage_breast_screening/mammograms/presenters/medical_history/__init__.py

@@ -7,8 +7,9 @@
 
 
 class BenignLumpHistoryItemPresenter:
-    def __init__(self, benign_lump_history_item):
+    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
         )
@@ -63,6 +64,11 @@ def change_link(self):
                 },
             ),
             "text": "Change",
+            "visually_hidden_text": (
+                f" benign lump item {self.counter}"
+                if self.counter
+                else " benign lump item"
+            ),
         }
 
     def _format_multiple_choices(self, choices, ChoiceClass):