Use ID suffix for Eklund views BreastImplantPresent tag

Author: steventux

manage_breast_screening/dicom/models.py

@@ -140,11 +140,11 @@ class Meta:
 
     @property
     def laterality_and_view(self):
-        if self.laterality and self.implant_present:
-            laterality = "Left" if self.laterality == "L" else "Right"
-            return f"{laterality} Eklund"
-        elif self.laterality and self.view_position:
-            return f"{self.laterality}{self.view_position}".upper()
+        if self.laterality and self.view_position:
+            result = f"{self.laterality}{self.view_position}".upper()
+            if self.implant_present:
+                result = f"{result}ID"
+            return result
         return ""
 
     def __str__(self):

manage_breast_screening/dicom/study_service.py

@@ -62,10 +62,12 @@ def images_by_laterality_and_view(
         grouped_images = {
             "LCC": [],
             "LMLO": [],
-            "Left Eklund": [],
+            "LCCID": [],
+            "LMLOID": [],
             "RCC": [],
             "RMLO": [],
-            "Right Eklund": [],
+            "RCCID": [],
+            "RMLOID": [],
         }
         for image in images:
             if image.laterality_and_view in grouped_images:

manage_breast_screening/dicom/tests/test_study_service.py

@@ -82,8 +82,10 @@ def test_images_by_laterality_and_view(self):
         assert StudyService.images_by_laterality_and_view(series.images.all()) == {
             "LCC": [image1],
             "LMLO": [image3],
-            "Left Eklund": [image6],
+            "LCCID": [],
+            "LMLOID": [image6],
             "RCC": [image2],
             "RMLO": [image4, image5],
-            "Right Eklund": [image7],
+            "RCCID": [image7],
+            "RMLOID": [],
         }

manage_breast_screening/mammograms/forms/images/gateway_image_details_form.py

@@ -1,163 +1,20 @@
-from django.db.models import TextChoices
-from django.forms.widgets import Textarea
-
 from manage_breast_screening.dicom.study_service import StudyService
+from manage_breast_screening.mammograms.forms.images.gateway_images_form_fields_mixin import (
+    GatewayImagesFormFieldsMixin,
+)
 from manage_breast_screening.mammograms.services.appointment_services import (
     RecallService,
 )
 from manage_breast_screening.manual_images.models import (
-    IncompleteImagesReason,
     StudyCompleteness,
 )
-from manage_breast_screening.nhsuk_forms.fields import (
-    BooleanField,
-    CharField,
-    IntegerField,
-)
-from manage_breast_screening.nhsuk_forms.fields.choice_fields import (
-    ChoiceField,
-    MultipleChoiceField,
-)
 from manage_breast_screening.nhsuk_forms.forms import FormWithConditionalFields
 from manage_breast_screening.participants.models.appointment import (
     AppointmentWorkflowStepCompletion,
 )
 
 
-class GatewayImageDetailsForm(FormWithConditionalFields):
-    class RecallChoices(TextChoices):
-        TO_BE_RECALLED = "TO_BE_RECALLED", "Yes, record as 'to be recalled'"
-        PARTIAL_MAMMOGRAPHY = (
-            "PARTIAL_MAMMOGRAPHY",
-            "No, record as 'partial mammography'",
-        )
-
-    rmlo_count = IntegerField(
-        required=True,
-        min_value=0,
-        max_value=20,
-        initial=1,
-        error_messages={
-            "min_value": "Number of RMLO images must be at least 0",
-            "max_value": "Number of RMLO images must be at most 20",
-            "invalid": "Enter a valid number of RMLO images",
-            "required": "Enter the number of RMLO images",
-        },
-    )
-    rcc_count = IntegerField(
-        required=True,
-        min_value=0,
-        max_value=20,
-        initial=1,
-        error_messages={
-            "min_value": "Number of RCC images must be at least 0",
-            "max_value": "Number of RCC images must be at most 20",
-            "invalid": "Enter a valid number of RCC images",
-            "required": "Enter the number of RCC images",
-        },
-    )
-    right_eklund_count = IntegerField(
-        required=False,
-        min_value=0,
-        max_value=20,
-        initial=0,
-        error_messages={
-            "min_value": "Number of right Eklund images must be at least 0",
-            "max_value": "Number of right Eklund images must be at most 20",
-            "invalid": "Enter a valid number of right Eklund images",
-            "required": "Enter the number of right Eklund images",
-        },
-    )
-    lmlo_count = IntegerField(
-        required=True,
-        min_value=0,
-        max_value=20,
-        initial=1,
-        error_messages={
-            "min_value": "Number of LMLO images must be at least 0",
-            "max_value": "Number of LMLO images must be at most 20",
-            "invalid": "Enter a valid number of LMLO images",
-            "required": "Enter the number of LMLO images",
-        },
-    )
-    lcc_count = IntegerField(
-        required=True,
-        min_value=0,
-        max_value=20,
-        initial=1,
-        error_messages={
-            "min_value": "Number of LCC images must be at least 0",
-            "max_value": "Number of LCC images must be at most 20",
-            "invalid": "Enter a valid number of LCC images",
-            "required": "Enter the number of LCC images",
-        },
-    )
-    left_eklund_count = IntegerField(
-        required=False,
-        min_value=0,
-        max_value=20,
-        initial=0,
-        error_messages={
-            "min_value": "Number of left Eklund images must be at least 0",
-            "max_value": "Number of left Eklund images must be at most 20",
-            "invalid": "Enter a valid number of left Eklund images",
-            "required": "Enter the number of left Eklund images",
-        },
-    )
-
-    imperfect_but_best_possible = BooleanField(
-        label="Imperfect, but best possible images",
-        hint="Image readers will be advised not to request a technical recall",
-        required=False,
-    )
-
-    not_all_mammograms_taken = BooleanField(
-        label="Not all mammograms taken", required=False
-    )
-
-    reasons_incomplete = MultipleChoiceField(
-        label="Why could you not take all the images?",
-        choices=IncompleteImagesReason,
-        required=False,
-        label_classes="nhsuk-label--s",
-        error_messages={
-            "required": "Select a reason why you could not take all the images"
-        },
-        choice_hints={
-            IncompleteImagesReason.UNABLE_TO_SCAN_TISSUE: "For example, large breasts or implanted device"
-        },
-    )
-
-    reasons_incomplete_details = CharField(
-        label="Provide details (optional)",
-        required=False,
-        label_classes="nhsuk-label--s",
-        widget=Textarea(attrs={"rows": 2}),
-        max_words=500,
-        threshold=0,
-        error_messages={"max_words": "Details must be 500 words or less"},
-    )
-
-    should_recall = ChoiceField(
-        label="Should the participant be recalled to take more images?",
-        label_classes="nhsuk-label--s",
-        required=False,
-        choices=RecallChoices,
-        error_messages={
-            "required": "Select whether the participant should be recalled to take more images"
-        },
-    )
-
-    additional_details = CharField(
-        hint="Provide information for image readers when reviewing",
-        required=False,
-        label="Notes for reader (optional)",
-        label_classes="nhsuk-label--s",
-        widget=Textarea(attrs={"rows": 2}),
-        max_words=500,
-        error_messages={"max_words": "Notes for reader must be 500 words or less"},
-    )
-
+class GatewayImageDetailsForm(GatewayImagesFormFieldsMixin, FormWithConditionalFields):
     def __init__(self, *args, instance=None, **kwargs):
         if instance:
             match instance.completeness:
@@ -180,10 +37,12 @@ def __init__(self, *args, instance=None, **kwargs):
                 "additional_details": instance.additional_details,
                 "lmlo_count": len(grouped_images["LMLO"]),
                 "lcc_count": len(grouped_images["LCC"]),
-                "left_eklund_count": len(grouped_images["Left Eklund"]),
+                "lccid_count": len(grouped_images["LCCID"]),
+                "lmloid_count": len(grouped_images["LMLOID"]),
                 "rmlo_count": len(grouped_images["RMLO"]),
                 "rcc_count": len(grouped_images["RCC"]),
-                "right_eklund_count": len(grouped_images["Right Eklund"]),
+                "rccid_count": len(grouped_images["RCCID"]),
+                "rmloid_count": len(grouped_images["RMLOID"]),
             }
 
         super().__init__(*args, **kwargs)