PPHA-262: Ensure all validation errors are correct for height form

Author: Themitchell

lung_cancer_screening/core/form_fields.py

@@ -410,9 +410,23 @@ class ImperialHeightField(forms.MultiValueField):
     widget = ImperialHeightWidget
 
     def __init__(self, *args, **kwargs):
+        error_messages = kwargs.get("error_messages", {})
+
+        feet_kwargs = {
+            "error_messages": {
+                'invalid': 'Feet must be in whole numbers.',
+                **error_messages,
+            },
+        }
+        inches_kwargs = {
+            "error_messages": {
+                'invalid': 'Inches must be in whole numbers.',
+                **error_messages,
+            },
+        }
         fields = (
-            IntegerField(label="Feet"),
-            IntegerField(label="Inches"),
+            IntegerField(**feet_kwargs),
+            IntegerField(**inches_kwargs),
         )
         kwargs["template_name"] = "forms/imperial-height-input.jinja"
 

lung_cancer_screening/core/jinja2/forms/imperial-height-input.jinja

@@ -27,7 +27,7 @@
       "hint": {
         "text": unbound_field.hint
       } if unbound_field.hint,
-      "id": field.auto_id,
+      "id": field.auto_id + "_0",
       "name": field.html_name + "_0",
       "value": field.subwidgets.0.data.value,
       "classes": "nhsuk-input--width-2" + field_error_classes,

lung_cancer_screening/core/tests/acceptance/test_questionnaire_validation_errors.py

@@ -47,16 +47,39 @@ def test_height_validation_errors(self):
         page.goto(f"{self.live_server_url}/height")
 
         page.click("text=Continue")
-
         expect(page.locator(".nhsuk-error-message")).to_contain_text(
             "Enter your height."
         )
 
+        page.get_by_label("Centimetre").fill('139.6')
+        page.click('text=Continue')
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Height must be between 139.7cm and 243.8 cm"
+        )
+
+        page.get_by_label("Centimetre").fill('243.9')
+        page.click('text=Continue')
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Height must be between 139.7cm and 243.8 cm"
+        )
+
         page.click("text=Switch to imperial")
 
         page.click("text=Continue")
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Enter your height."
+        )
 
-        for error in page.locator(".nhsuk-error-message").all():
-            expect(error).to_contain_text(
-                "Enter your height."
-            )
+        page.get_by_label("Feet").fill('5.2')
+        page.get_by_label("Inches").fill('2')
+        page.click('text=Continue')
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Feet must be in whole numbers"
+        )
+
+        page.get_by_label("Feet").fill('5')
+        page.get_by_label("Inches").fill('2.2')
+        page.click('text=Continue')
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Inches must be in whole numbers"
+        )

lung_cancer_screening/questions/forms/imperial_height_form.py

@@ -15,7 +15,8 @@ def __init__(self, *args, **kwargs):
             required=True,
             require_all_fields=False,
             error_messages={
-                'required': 'Enter your height.'
+                'required': 'Enter your height.',
+                'incomplete': 'Enter your height.'
             }
         )
 

lung_cancer_screening/questions/jinja2/height.jinja

@@ -39,7 +39,8 @@
             {{ form.height.as_field_group() }}
           {% endif %}
 
-          <a href="?unit={{ switch_to_unit }}">Switch to {{ switch_to_unit }}</a>
+
+          <p><a href="?unit={{ switch_to_unit }}">Switch to {{ switch_to_unit }}</a></p>
 
         {% endcall %}
 

lung_cancer_screening/questions/tests/unit/forms/test_imperial_height_form.py

@@ -58,3 +58,22 @@ def test_is_invalid_with_missing_data(self):
             }
         )
         self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Enter your height."]
+        )
+
+    def test_is_invalid_when_given_a_decimal_feet_value(self):
+        form = ImperialHeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "height_imperial_0": "5.2",
+                "height_imperial_1": "0"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["height_imperial"],
+            ["Feet must be in whole numbers."]
+        )