make 'Year removed' optional for 'Implanted device has been removed'

Author: swebberuk

manage_breast_screening/data/east_tester_today_clinic_data.yml

@@ -47,6 +47,7 @@ clinic:
               device: OTHER_MEDICAL_DEVICE
               other_medical_device_details: Lorem ipsum dolor sit amet
               procedure_year: 2005
+              device_has_been_removed: true
               removal_year: 2010
               additional_details: Recalled device, removed in 2010
           other_procedure_history_items:

manage_breast_screening/mammograms/forms/implanted_medical_device_history_form.py

@@ -1,110 +1,73 @@
-import datetime
-
 from django import forms
-from django.db.models import TextChoices
 from django.forms.widgets import Textarea
 
 from manage_breast_screening.core.services.auditor import Auditor
 from manage_breast_screening.nhsuk_forms.fields import (
+    BooleanField,
     CharField,
     ChoiceField,
-    IntegerField,
-)
-from manage_breast_screening.nhsuk_forms.fields.choice_fields import (
-    MultipleChoiceField,
+    YearField,
 )
 from manage_breast_screening.nhsuk_forms.forms import FormWithConditionalFields
 from manage_breast_screening.participants.models.implanted_medical_device_history_item import (
     ImplantedMedicalDeviceHistoryItem,
 )
 
 
-class RemovalStatusChoices(TextChoices):
-    HAS_BEEN_REMOVED = "HAS_BEEN_REMOVED", "Implanted device has been removed"
-
-
 class ImplantedMedicalDeviceHistoryForm(FormWithConditionalFields):
+    other_medical_device_details = CharField(
+        required=False,
+        label="Provide details",
+        error_messages={"required": "Provide details of the device"},
+        classes="nhsuk-u-width-two-thirds",
+    )
+    procedure_year = YearField(
+        hint="Leave blank if unknown",
+        required=False,
+        label="Year of procedure (optional)",
+        label_classes="nhsuk-label--m",
+        classes="nhsuk-input--width-4",
+    )
+    device_has_been_removed = BooleanField(
+        required=False,
+        label="Implanted device has been removed",
+        classes="app-checkboxes",
+    )
+    removal_year = YearField(
+        required=False,
+        label="Year removed (if available)",
+        classes="nhsuk-input--width-4",
+    )
+    additional_details = CharField(
+        hint="Include any other relevant information about the device or procedure",
+        required=False,
+        label="Additional details (optional)",
+        label_classes="nhsuk-label--m",
+        widget=Textarea(attrs={"rows": 4}),
+        max_words=500,
+        error_messages={"max_words": "Additional details must be 500 words or less"},
+    )
+
     def __init__(self, *args, participant, **kwargs):
         super().__init__(*args, **kwargs)
 
-        # if entered, years should be between 80 years ago and this year
-        max_year = datetime.date.today().year
-        min_year = max_year - 80
-        year_outside_range_error_message = (
-            f"Year should be between {min_year} and {max_year}."
-        )
-        year_invalid_format_error_message = "Enter year as a number."
-
         self.fields["device"] = ChoiceField(
             choices=ImplantedMedicalDeviceHistoryItem.Device,
             label=f"What device does {participant.first_name} have?",
             error_messages={"required": "Select the device type"},
         )
-        self.fields["other_medical_device_details"] = CharField(
-            required=False,
-            label="Provide details",
-            error_messages={"required": "Provide details of the device"},
-            classes="nhsuk-u-width-two-thirds",
-        )
-        self.fields["procedure_year"] = IntegerField(
-            hint="Leave blank if unknown",
-            required=False,
-            label="Year of procedure (optional)",
-            label_classes="nhsuk-label--m",
-            classes="nhsuk-input--width-4",
-            min_value=min_year,
-            max_value=max_year,
-            error_messages={
-                "min_value": year_outside_range_error_message,
-                "max_value": year_outside_range_error_message,
-                "invalid": year_invalid_format_error_message,
-            },
-        )
-        self.fields["removal_status"] = MultipleChoiceField(
-            required=False,
-            choices=RemovalStatusChoices,
-            widget=forms.CheckboxSelectMultiple,
-            label="Removed implants",
-            classes="app-checkboxes",
-        )
-        self.fields["removal_year"] = IntegerField(
-            required=False,
-            label="Year removed",
-            classes="nhsuk-input--width-4",
-            min_value=min_year,
-            max_value=max_year,
-            error_messages={
-                "required": "Enter the year the device was removed",
-                "min_value": year_outside_range_error_message,
-                "max_value": year_outside_range_error_message,
-                "invalid": year_invalid_format_error_message,
-            },
-        )
-        self.fields["additional_details"] = CharField(
-            hint="Include any other relevant information about the device or procedure",
-            required=False,
-            label="Additional details (optional)",
-            label_classes="nhsuk-label--m",
-            widget=Textarea(attrs={"rows": 4}),
-            max_words=500,
-            error_messages={
-                "max_words": "Additional details must be 500 words or less"
-            },
-        )
 
         self.given_field_value(
             "device", ImplantedMedicalDeviceHistoryItem.Device.OTHER_MEDICAL_DEVICE
         ).require_field("other_medical_device_details")
-        self.given_field_value(
-            "removal_status", RemovalStatusChoices.HAS_BEEN_REMOVED
-        ).require_field("removal_year")
 
     def model_values(self):
         return dict(
             device=self.cleaned_data.get("device", ""),
             other_medical_device_details=self.cleaned_data.get(
                 "other_medical_device_details", ""
             ),
+            device_has_been_removed=self.cleaned_data.get("device_has_been_removed"),
             removal_year=self.cleaned_data.get("removal_year", ""),
             procedure_year=self.cleaned_data.get("procedure_year", ""),
             additional_details=self.cleaned_data.get("additional_details", ""),
@@ -125,6 +88,19 @@ def create(self, appointment, request):
 
         return implanted_medical_device_history
 
+    def full_clean(self):
+        # if a removal_year is provided then remove it if device_has_been_removed is False
+        if self.data.get("removal_year") and not self.data.get(
+            "device_has_been_removed"
+        ):
+            # makes QueryDict mutable
+            self.data = self.data.copy()
+            self.data["removal_year"] = None
+            if hasattr(self.data, "_mutable"):
+                self.data._mutable = False
+
+        super().full_clean()
+
     def clean(self):
         cleaned_data = super().clean()
         procedure_year = cleaned_data.get("procedure_year")

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/medical_history/forms/implanted_medical_device_history.jinja

@@ -3,15 +3,19 @@
 {% from "nhsuk/components/fieldset/macro.jinja" import fieldset %}
 
 {% block form %}
-  {% do form.device.add_conditional_html('OTHER_MEDICAL_DEVICE', form.other_medical_device_details.as_field_group()) %}
-
-  {% do form.removal_status.add_conditional_html('HAS_BEEN_REMOVED', form.removal_year.as_field_group()) %}
-
   {{ form.device.as_field_group() }}
 
   {{ form.procedure_year.as_field_group() }}
 
-  {{ form.removal_status.as_field_group() }}
+  {% do form.device_has_been_removed.add_conditional_html('true', form.removal_year.as_field_group()) %}
+  {% call fieldset({
+    "legend": {
+      "text": "Removed implants",
+      "classes": "nhsuk-fieldset__legend--m"
+    }
+  }) %}
+    {{ form.device_has_been_removed.as_field_group() }}
+  {% endcall %}
 
   {{ form.additional_details.as_field_group() }}
 

manage_breast_screening/mammograms/presenters/implanted_medical_device_history_item_presenter.py

@@ -12,7 +12,11 @@ def __init__(self, implanted_medical_device_history_item):
             self._item.other_medical_device_details or "N/A"
         )
         self.procedure_year = str(self._item.procedure_year)
-        self.removal_year = str(self._item.removal_year) or "N/A"
+        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
@@ -33,8 +37,10 @@ def summary_list_params(self):
                     "value": {"html": self.procedure_year},
                 },
                 {
-                    "key": {"text": "Removal year"},
-                    "value": {"html": self.removal_year},
+                    "key": {"text": "Device has been removed"},
+                    "value": {
+                        "html": self.device_has_been_removed,
+                    },
                 },
                 {
                     "key": {"text": "Additional details"},