Weight taking the height value for a CSV upload

project/npda/forms/visit_form.py

@@ -363,7 +363,7 @@ def clean_height(self):
         return data
 
     def clean_weight(self):
-        data = self.cleaned_data["height"]
+        data = self.cleaned_data["weight"]
         if data is not None:
             if data < 1:
                 raise ValidationError(

project/npda/tests/form_tests/test_visit_form.py

@@ -0,0 +1,25 @@
+import pytest
+
+from project.npda.forms.visit_form import VisitForm
+from project.npda.tests.factories.patient_factory import PatientFactory
+
+# https://github.com/rcpch/national-paediatric-diabetes-audit/issues/359
+@pytest.mark.django_db
+def test_height_and_weight_set_correctly():
+    patient = PatientFactory()
+
+    form = VisitForm(
+        data={
+            "height": "60",
+            "weight": "50",
+        },
+        initial = {
+            "patient": patient
+        }
+    )
+
+    # Not passing all the data so it will have errors, just trigger the cleaners
+    form.is_valid()
+
+    assert form.cleaned_data["height"] == 60
+    assert form.cleaned_data["weight"] == 50