Merge pull request #459 from NHSDigital/symptom-form-fixes

Symptom form fixes

Author: MatMoore

manage_breast_screening/mammograms/forms/symptom_forms.py

@@ -58,6 +58,7 @@ class CommonFields:
         label="Describe when",
         hint="For example, 3 days ago",
         classes="nhsuk-u-width-two-thirds",
+        error_messages={"required": "Enter when the symptom was resolved"},
     )
     investigated = yes_no_field(
         label="Has this been investigated?",
@@ -205,7 +206,7 @@ def _model_values(self):
         investigation_details = self.cleaned_data.get("investigation_details", "")
         intermittent = self.cleaned_data.get("intermittent", False)
         recently_resolved = self.cleaned_data.get("recently_resolved", False)
-        when_resolved = self.cleaned_data.get("when_resolved")
+        when_resolved = self.cleaned_data.get("when_resolved", "")
         additional_information = self.cleaned_data.get("additional_information", "")
 
         return dict(
@@ -260,6 +261,11 @@ def __init__(self, instance=None, **kwargs):
             predicate_field="when_started",
             predicate_field_value=RelativeDateChoices.SINCE_A_SPECIFIC_DATE,
         )
+        self.set_conditionally_required(
+            conditionally_required_field="when_resolved",
+            predicate_field="recently_resolved",
+            predicate_field_value=True,
+        )
         self.set_conditionally_required(
             conditionally_required_field="investigation_details",
             predicate_field="investigated",
@@ -310,6 +316,11 @@ def __init__(self, instance=None, **kwargs):
             predicate_field="when_started",
             predicate_field_value=RelativeDateChoices.SINCE_A_SPECIFIC_DATE,
         )
+        self.set_conditionally_required(
+            conditionally_required_field="when_resolved",
+            predicate_field="recently_resolved",
+            predicate_field_value=True,
+        )
         self.set_conditionally_required(
             conditionally_required_field="investigation_details",
             predicate_field="investigated",

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

@@ -3,7 +3,7 @@
 {% from "nhsuk/components/fieldset/macro.jinja" import fieldset %}
 
 {% block form %}
-  {% do form.area.add_divider_after("LEFT", "or") %}
+  {% do form.area.add_divider_after("LEFT_BREAST", "or") %}
   {% do form.area.add_conditional_html(
     'OTHER',
     form.area_description.as_field_group()
@@ -29,6 +29,7 @@
     }
   }) %}
     {{ form.when_started.as_field_group() }}
+    <br>
     {{ form.intermittent.as_field_group() }}
     {{ form.recently_resolved.as_field_group() }}
   {% endcall %}

manage_breast_screening/mammograms/tests/forms/test_symptom_forms.py

@@ -44,6 +44,7 @@ def test_missing_conditionally_required_fields(self):
                 "area": RightLeftOtherChoices.OTHER,
                 "when_started": RelativeDateChoices.SINCE_A_SPECIFIC_DATE,
                 "investigated": YesNo.YES,
+                "recently_resolved": True,
             }
         )
 
@@ -54,6 +55,7 @@ def test_missing_conditionally_required_fields(self):
             ],
             "specific_date": ["Enter the date the symptom started"],
             "investigation_details": ["Enter details of any investigations"],
+            "when_resolved": ["Enter when the symptom was resolved"],
         }
 
     def test_valid_form_with_conditionally_required_fields(self):
@@ -66,6 +68,8 @@ def test_valid_form_with_conditionally_required_fields(self):
                 "specific_date_0": "2",
                 "specific_date_1": "2025",
                 "investigation_details": "def",
+                "recently_resolved": True,
+                "when_resolved": "3 months ago",
             }
         )
         assert form.is_valid()
@@ -191,6 +195,7 @@ def test_missing_conditionally_required_fields(self):
                 "area": RightLeftOtherChoices.OTHER,
                 "when_started": RelativeDateChoices.SINCE_A_SPECIFIC_DATE,
                 "investigated": YesNo.YES,
+                "recently_resolved": True,
             }
         )
 
@@ -201,6 +206,7 @@ def test_missing_conditionally_required_fields(self):
             ],
             "specific_date": ["Enter the date the symptom started"],
             "investigation_details": ["Enter details of any investigations"],
+            "when_resolved": ["Enter when the symptom was resolved"],
         }
 
     def test_valid_form_with_conditionally_required_fields(self):
@@ -213,6 +219,8 @@ def test_valid_form_with_conditionally_required_fields(self):
                 "specific_date_0": "2",
                 "specific_date_1": "2025",
                 "investigation_details": "def",
+                "recently_resolved": True,
+                "when_resolved": "3 months ago",
             }
         )
         assert form.is_valid()