Merge pull request #474 from NHSDigital/dtos-10726-add-edit-skin-change

[DTOS-10726] add/edit skin change symptoms

Author: MatMoore

manage_breast_screening/mammograms/forms/symptom_forms.py

@@ -20,6 +20,7 @@
 from manage_breast_screening.participants.models.symptom import (
     RelativeDateChoices,
     SymptomAreas,
+    SymptomSubType,
     SymptomType,
 )
 
@@ -63,7 +64,7 @@ class CommonFields:
     investigated = yes_no_field(
         label="Has this been investigated?",
         error_messages={
-            "required": "Select whether the lump has been investigated or not"
+            "required": "Select whether the symptom has been investigated or not"
         },
     )
     investigation_details = CharField(
@@ -101,6 +102,8 @@ def __init__(self, symptom_type, instance=None, **kwargs):
             kwargs["initial"] = {
                 "area": instance.area,
                 "area_description": instance.area_description,
+                "symptom_sub_type": instance.symptom_sub_type_id,
+                "symptom_sub_type_details": instance.symptom_sub_type_details,
                 "when_started": instance.when_started,
                 "specific_date": (instance.month_started, instance.year_started),
                 "intermittent": instance.intermittent,
@@ -200,6 +203,8 @@ def _model_values(self):
         """
         area = self.cleaned_data["area"]
         area_description = self.cleaned_data.get("area_description", "")
+        symptom_sub_type = self.cleaned_data.get("symptom_sub_type")
+        symptom_sub_type_details = self.cleaned_data.get("symptom_sub_type_details", "")
         when_started = self.cleaned_data.get("when_started")
         specific_date = self.cleaned_data.get("specific_date")
         investigated = self.cleaned_data.get("investigated") == YesNo.YES
@@ -212,6 +217,8 @@ def _model_values(self):
         return dict(
             area=area,
             area_description=area_description,
+            symptom_sub_type_id=symptom_sub_type,
+            symptom_sub_type_details=symptom_sub_type_details,
             investigated=investigated,
             investigation_details=investigation_details,
             when_started=when_started,
@@ -326,3 +333,77 @@ def __init__(self, instance=None, **kwargs):
             predicate_field="investigated",
             predicate_field_value=YesNo.YES,
         )
+
+
+class SkinChangeForm(SymptomForm):
+    class SymptomSubTypeChoices(TextChoices):
+        SORES_OR_CYSTS = SymptomSubType.SORES_OR_CYSTS, "Sores or cysts"
+        DIMPLES_OR_INDENTATION = (
+            SymptomSubType.DIMPLES_OR_INDENTATION,
+            "Dimples or indentation",
+        )
+        RASH = SymptomSubType.RASH, "Rash"
+        COLOUR_CHANGE = SymptomSubType.COLOUR_CHANGE, "Colour change"
+        OTHER = SymptomSubType.OTHER, "Other"
+
+    area = ChoiceField(
+        choices=RightLeftOtherChoices,
+        label="Where is the skin change located?",
+        error_messages={"required": "Select the location of the skin change"},
+    )
+    area_description = CharField(
+        required=False,
+        label="Describe the specific area",
+        hint="For example, the left armpit",
+        error_messages={
+            "required": "Describe the specific area where the skin change is located"
+        },
+        classes="nhsuk-u-width-two-thirds",
+    )
+    symptom_sub_type = ChoiceField(
+        choices=SymptomSubTypeChoices,
+        label="How has the skin changed?",
+        error_messages={"required": "Select how the skin has changed"},
+    )
+    symptom_sub_type_details = CharField(
+        required=False,
+        label="Describe the change",
+        error_messages={"required": "Enter a description of the change"},
+        classes="nhsuk-u-width-two-thirds",
+    )
+    when_started = CommonFields.when_started
+    specific_date = CommonFields.specific_date
+    intermittent = CommonFields.intermittent
+    recently_resolved = CommonFields.recently_resolved
+    when_resolved = CommonFields.when_resolved
+    investigated = CommonFields.investigated
+    investigation_details = CommonFields.investigation_details
+    additional_information = CommonFields.additional_information
+
+    def __init__(self, instance=None, **kwargs):
+        super().__init__(
+            symptom_type=SymptomType.SKIN_CHANGE,
+            instance=instance,
+            **kwargs,
+        )
+
+        self.set_conditionally_required(
+            conditionally_required_field="area_description",
+            predicate_field="area",
+            predicate_field_value=RightLeftOtherChoices.OTHER,
+        )
+        self.set_conditionally_required(
+            conditionally_required_field="symptom_sub_type_details",
+            predicate_field="symptom_sub_type",
+            predicate_field_value=self.SymptomSubTypeChoices.OTHER,
+        )
+        self.set_conditionally_required(
+            conditionally_required_field="specific_date",
+            predicate_field="when_started",
+            predicate_field_value=RelativeDateChoices.SINCE_A_SPECIFIC_DATE,
+        )
+        self.set_conditionally_required(
+            conditionally_required_field="investigation_details",
+            predicate_field="investigated",
+            predicate_field_value=YesNo.YES,
+        )

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/skin_change.jinja

@@ -0,0 +1,59 @@
+{% extends "layout-form.jinja" %}
+{% from "nhsuk/components/button/macro.jinja" import button %}
+{% from "nhsuk/components/fieldset/macro.jinja" import fieldset %}
+
+{% block form %}
+  {% do form.area.add_divider_after("LEFT", "or") %}
+  {% do form.area.add_conditional_html(
+    'OTHER',
+    form.area_description.as_field_group()
+  ) %}
+
+  {% do form.symptom_sub_type.add_conditional_html('OTHER', form.symptom_sub_type_details.as_field_group()) %}
+
+
+  {% do form.when_started.add_divider_after("OVER_THREE_YEARS", "or") %}
+  {% do form.when_started.add_divider_after("SINCE_A_SPECIFIC_DATE", "or") %}
+  {% do form.when_started.add_conditional_html(
+    'SINCE_A_SPECIFIC_DATE',
+    form.specific_date.as_field_group()
+  ) %}
+
+  {% do form.recently_resolved.add_conditional_html('true', form.when_resolved.as_field_group()) %}
+
+  {% do form.investigated.add_conditional_html('YES', form.investigation_details.as_field_group()) %}
+
+  {{ form.area.as_field_group() }}
+
+  {{ form.symptom_sub_type.as_field_group() }}
+
+  {% call fieldset({
+    "legend": {
+      "text": form.when_started.label,
+      "classes": "nhsuk-fieldset__legend--m"
+    }
+  }) %}
+    {{ form.when_started.as_field_group() }}
+    <br>
+    {{ form.intermittent.as_field_group() }}
+    {{ form.recently_resolved.as_field_group() }}
+  {% endcall %}
+
+  {{ form.investigated.as_field_group() }}
+
+  {{ form.additional_information.as_field_group() }}
+
+  <div class="nhsuk-button-group">
+    {{ button({
+      "text": "Save symptom"
+    }) }}
+  </div>
+
+  {% if delete_link %}
+    <p class="nhsuk-u-margin-top-4">
+      <a href="{{ delete_link.href }}" class="{{ delete_link.class }}">
+        {{ delete_link.text }}
+      </a>
+    </p>
+  {% endif %}
+{% endblock %}

manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja

@@ -25,7 +25,8 @@
 
   <p class="nhsuk-u-margin-top-4 nhsuk-u-margin-bottom-0">
     <a href="{{ presenter.add_lump_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_lump_link.text }}</a><br>
-    <a href="{{ presenter.add_swelling_or_shape_change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_swelling_or_shape_change_link.text }}</a>
+    <a href="{{ presenter.add_swelling_or_shape_change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_swelling_or_shape_change_link.text }}</a><br>
+    <a href="{{ presenter.add_skin_change_link.href }}" class="nhsuk-link nhsuk-link--no-visited-state">{{ presenter.add_skin_change_link.text }}</a>
   </p>
 {% endcall %}
 

manage_breast_screening/mammograms/presenters/medical_information_presenter.py

@@ -17,6 +17,7 @@ class PresentedSymptom:
     symptom_type_name: str
     location_line: str
     started_line: str
+    change_type_line: str = ""
     investigated_line: str = ""
     intermittent_line: str = ""
     stopped_line: str = ""
@@ -46,12 +47,25 @@ def from_symptom(cls, symptom):
             else ""
         )
 
+        change_type_line = ""
+        if symptom.symptom_type_id == SymptomType.SKIN_CHANGE:
+            if (
+                symptom.symptom_sub_type_id == "OTHER"
+                and symptom.symptom_sub_type_details
+            ):
+                change_type_line = f"Change type: {symptom.symptom_sub_type_details}"
+            else:
+                change_type_line = (
+                    f"Change type: {symptom.symptom_sub_type.name.lower()}"
+                )
+
         return cls(
             id=symptom.id,
             appointment_id=symptom.appointment_id,
             symptom_type_id=symptom.symptom_type_id,
             symptom_type_name=symptom.symptom_type.name,
             location_line=location,
+            change_type_line=change_type_line,
             started_line=started,
             investigated_line=investigated,
             intermittent_line=intermittent,
@@ -65,6 +79,8 @@ def change_view(self):
                 return "mammograms:change_symptom_lump"
             case SymptomType.SWELLING_OR_SHAPE_CHANGE:
                 return "mammograms:change_symptom_swelling_or_shape_change"
+            case SymptomType.SKIN_CHANGE:
+                return "mammograms:change_symptom_skin_change"
             case _:
                 raise ValueError(self.symptom_type_id)
 
@@ -77,6 +93,7 @@ def build_summary_list_row(self, include_actions=True):
             [
                 line
                 for line in [
+                    self.change_type_line,
                     self.location_line,
                     self.started_line,
                     self.investigated_line,
@@ -154,7 +171,24 @@ def add_swelling_or_shape_change_link(self):
             "href": url,
             "text": (
                 "Add another swelling or shape change"
-                if SymptomType.LUMP in self.existing_symptom_type_ids
+                if SymptomType.SWELLING_OR_SHAPE_CHANGE
+                in self.existing_symptom_type_ids
                 else "Add a swelling or shape change"
             ),
         }
+
+    @property
+    def add_skin_change_link(self):
+        url = reverse(
+            "mammograms:add_symptom_skin_change",
+            kwargs={"pk": self.appointment.pk},
+        )
+
+        return {
+            "href": url,
+            "text": (
+                "Add another skin change"
+                if SymptomType.SKIN_CHANGE in self.existing_symptom_type_ids
+                else "Add a skin change"
+            ),
+        }