PPHA-262: Height form created and implemented

jamiefalcus · jamiefalcus · commit 914d98976e2c · 2025-10-16T08:40:44.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -17,3 +17,4 @@ __pycache__
 lung_cancer_screening/assets/compiled/*
 !lung_cancer_screening/assets/compiled/.gitkeep
 .DS_Store
+.venv
diff --git a/.tool-versions b/.tool-versions
@@ -1,5 +1,6 @@
 # This file is for you! Please, updated to the versions agreed by your team.
 
+python 3.13.8
 terraform 1.7.0
 pre-commit 4.3.0
 vale 3.6.0
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,9 +6,20 @@
   },
   "cSpell.words": [
     "dateutil",
+    "endcall",
+    "endset",
+    "fieldset",
+    "gunicorn",
+    "jinja",
+    "makemigrations",
     "nhsuk",
+    "novalidate",
+    "psycopg",
     "relativedelta",
     "responseset",
-    "unsubmitted"
+    "stylesheet",
+    "toplevel",
+    "unsubmitted",
+    "whitenoise"
   ]
 }
diff --git a/lung_cancer_screening/core/form_fields.py b/lung_cancer_screening/core/form_fields.py
@@ -252,7 +252,7 @@ def __init__(self, form: forms.Form, field: "ChoiceField", name: str):
     def add_conditional_html(self, value, html):
         if isinstance(self.field.widget, widgets.Select):
             raise ValueError(
-                "select comonent does not support conditional fields")
+                "select component does not support conditional fields")
 
         self._conditional_html[value] = html
 
diff --git a/lung_cancer_screening/core/jinja2/forms/input.jinja b/lung_cancer_screening/core/jinja2/forms/input.jinja
@@ -0,0 +1,34 @@
+{% from "nhsuk/components/input/macro.jinja" import input %}
+{% set unbound_field = field.field %}
+{% set widget = unbound_field.widget %}
+{% if unbound_field.visually_hidden_label_suffix %}
+  {% set label_html %}
+    {{ field.label }}<span class="nhsuk-u-visually-hidden">: {{ unbound_field.visually_hidden_label_suffix }}</span>
+  {% endset %}
+{% endif %}
+{% set input_params = {
+    "label": {
+      "text": field.label,
+      "html": label_html if label_html,
+      "classes": unbound_field.label_classes if unbound_field.label_classes
+    },
+    "hint": {
+      "text": unbound_field.hint
+    } if unbound_field.hint,
+    "id": field.auto_id,
+    "name": field.html_name,
+    "value": field.value() or "",
+    "classes": unbound_field.classes if unbound_field.classes,
+    "attributes": widget.attrs,
+    "type": widget.input_type
+  } %}
+  {% if field.errors %}
+    {% set error_params = {
+      "errorMessage": {
+        "text": field.errors | first
+      }
+    } %}
+    {% set input_params = dict(input_params, **error_params) %}
+  {% endif %}
+
+{{ input(input_params) }}
diff --git a/lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py b/lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py
@@ -5,7 +5,7 @@ def fill_in_and_submit_participant_id(page, participant_id):
     page.click('text=Start now')
 
 
-def fill_in_and_submit_smoking_elligibility(page, smoking_status):
+def fill_in_and_submit_smoking_eligibility(page, smoking_status):
     expect(page.locator("legend")).to_have_text(
         "Have you ever smoked?")
 
@@ -26,6 +26,6 @@ def fill_in_and_submit_date_of_birth(page, age):
 def fill_in_and_submit_height(page, height):
     expect(page.locator("h1")).to_have_text("What is your height?")
 
-    page.get_by_label("Centimeter").fill(str(height))
+    page.get_by_label("Centimetre").fill(str(height))
 
     page.click("text=Continue")
diff --git a/lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py b/lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py
@@ -5,8 +5,9 @@
 from dateutil.relativedelta import relativedelta
 
 from .helpers.user_interaction_helpers import (
+    fill_in_and_submit_height,
     fill_in_and_submit_participant_id,
-    fill_in_and_submit_smoking_elligibility,
+    fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth
 )
 
@@ -35,8 +36,9 @@ def test_cannot_change_responses_once_checked_and_submitted(self):
         page.goto(f"{self.live_server_url}/start")
 
         fill_in_and_submit_participant_id(page, participant_id)
-        fill_in_and_submit_smoking_elligibility(page, smoking_status)
+        fill_in_and_submit_smoking_eligibility(page, smoking_status)
         fill_in_and_submit_date_of_birth(page, age)
+        fill_in_and_submit_height(page, "170")
 
         page.click("text=Submit")
 
diff --git a/lung_cancer_screening/core/tests/acceptance/test_participant_not_smoker.py b/lung_cancer_screening/core/tests/acceptance/test_participant_not_smoker.py
@@ -5,7 +5,7 @@
 
 from .helpers.user_interaction_helpers import (
     fill_in_and_submit_participant_id,
-    fill_in_and_submit_smoking_elligibility
+    fill_in_and_submit_smoking_eligibility
 )
 
 
@@ -31,7 +31,7 @@ def test_participant_not_smoker(self):
         page.goto(f"{self.live_server_url}/start")
 
         fill_in_and_submit_participant_id(page, participant_id)
-        fill_in_and_submit_smoking_elligibility(page, 'No, I have never smoked')
+        fill_in_and_submit_smoking_eligibility(page, 'No, I have never smoked')
 
         expect(page).to_have_url(f"{self.live_server_url}/non-smoker-exit")
 
diff --git a/lung_cancer_screening/core/tests/acceptance/test_participant_out_of_age_range.py b/lung_cancer_screening/core/tests/acceptance/test_participant_out_of_age_range.py
@@ -6,7 +6,7 @@
 
 from .helpers.user_interaction_helpers import (
     fill_in_and_submit_participant_id,
-    fill_in_and_submit_smoking_elligibility,
+    fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth
 )
 
@@ -33,7 +33,7 @@ def test_participant_out_of_age_range(self):
         page.goto(f"{self.live_server_url}/start")
 
         fill_in_and_submit_participant_id(page, participant_id)
-        fill_in_and_submit_smoking_elligibility(page, 'Yes, I used to smoke regularly')
+        fill_in_and_submit_smoking_eligibility(page, 'Yes, I used to smoke regularly')
 
         age = datetime.now() - relativedelta(years=20)
         fill_in_and_submit_date_of_birth(page, age)
diff --git a/lung_cancer_screening/core/tests/acceptance/test_questionnaire.py b/lung_cancer_screening/core/tests/acceptance/test_questionnaire.py
@@ -7,7 +7,7 @@
 from .helpers.user_interaction_helpers import (
     fill_in_and_submit_height,
     fill_in_and_submit_participant_id,
-    fill_in_and_submit_smoking_elligibility,
+    fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth
 )
 
@@ -28,7 +28,7 @@ def tearDownClass(cls):
         cls.browser.close()
         cls.playwright.stop()
 
-    def test_full_questionaire_user_journey(self):
+    def test_full_questionnaire_user_journey(self):
         participant_id = '123'
         smoking_status = 'Yes, I used to smoke regularly'
         age = datetime.now() - relativedelta(years=55)
@@ -42,7 +42,7 @@ def test_full_questionaire_user_journey(self):
         expect(page).to_have_url(
             f"{self.live_server_url}/have-you-ever-smoked")
 
-        fill_in_and_submit_smoking_elligibility(page, smoking_status)
+        fill_in_and_submit_smoking_eligibility(page, smoking_status)
 
         expect(page).to_have_url(f"{self.live_server_url}/date-of-birth")
         expect_back_link_to_have_url(page, "/have-you-ever-smoked")
@@ -55,11 +55,11 @@ def test_full_questionaire_user_journey(self):
 
         expect(page).to_have_url(f"{self.live_server_url}/responses")
 
-        response = page.locator(".responses")
+        responses = page.locator(".responses")
         expect(responses).to_contain_text("Have you ever smoked? Yes, I used to smoke regularly")
         expect(responses).to_contain_text(
             age.strftime("What is your date of birth? %Y-%m-%d"))
-        expect(responses).to_contain_text(f"Height: {height}")
+        expect(responses).to_contain_text(f"What is your height? {height}")
 
         page.click("text=Submit")
 
diff --git a/lung_cancer_screening/core/tests/unit/not_test_form_fields.py b/lung_cancer_screening/core/tests/unit/not_test_form_fields.py
diff --git a/lung_cancer_screening/questions/forms/height_form.py b/lung_cancer_screening/questions/forms/height_form.py
@@ -11,15 +11,13 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.instance.participant = self.participant
 
-        self.fields["height_in_cm"] = DecimalField(
+        self.fields["height"] = DecimalField(
              label="Centimetres",
              classes="nhsuk-input--width-4",
         )
 
-
-
-    def clean_height_in_cm(self):
-      data = self.cleaned_data['height_in_cm']
+    def clean_height(self):
+      data = self.cleaned_data['height']
       return data*10
 
     class Meta:
diff --git a/lung_cancer_screening/questions/jinja2/height.jinja b/lung_cancer_screening/questions/jinja2/height.jinja
@@ -1,7 +1,6 @@
 {% extends 'layout.jinja' %}
 {% from 'nhsuk/components/button/macro.jinja' import button %}
 {% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
-{% from 'nhsuk/components/input/macro.jinja' import input %}
 {% from 'nhsuk/components/fieldset/macro.jinja' import fieldset %}
 
 {% block beforeContent %}
@@ -16,7 +15,7 @@
 {% block page_content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
-      <form action="{{ request.path }}" method="POST">
+      <form action="{{ request.path }}" method="POST" novalidate>
         {{ csrf_input }}
         <h1 class="nhsuk-heading-l">What is your height?</h1>
         <p>An accurate measurement is important.
@@ -28,7 +27,7 @@
             "classes": "nhsuk-label--m"
           }
         }) %}
-         {{ form }}
+        {{ form.height.as_field_group() }}
         {% endcall %}
 
         {{ button({
diff --git a/lung_cancer_screening/questions/jinja2/responses.jinja b/lung_cancer_screening/questions/jinja2/responses.jinja
@@ -8,6 +8,7 @@
       <ul class="responses">
         <li>Have you ever smoked? {{ response_set.get_have_you_ever_smoked_display() }}</li>
         <li>What is your date of birth? {{ response_set.date_of_birth }}</li>
+        <li>What is your height? {{ response_set.height // 10 if response_set.height else ""}}</li>
       </ul>
 
       <form action="{{ request.path }}" method="post">
diff --git a/lung_cancer_screening/questions/models/response_set.py b/lung_cancer_screening/questions/models/response_set.py
@@ -52,13 +52,3 @@ def clean(self):
             raise ValidationError(
                 "Responses have already been submitted for this participant"
             )
-        
-    @property
-    def height(self):
-        return self.height
-
-    @height.setter
-    def _height(self, value):
-        if value > 0 :
-            print("The date chosen was in the future.")
-        self._height = value
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_height_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_height_form.py
@@ -3,6 +3,7 @@
 from ....models.participant import Participant
 from ....forms.height_form import HeightForm
 
+
 class TestHeightForm(TestCase):
     def setUp(self):
         self.participant = Participant.objects.create(unique_id="1234567890")
@@ -12,19 +13,19 @@ def test_cm_to_mm(self):
         form = HeightForm(
             participant=self.participant,
             data={
-                "height_in_cm": height
+                "height": height
             }
         )
-        
+
         self.assertTrue(form.is_valid())
-        
-        self.assertEqual(form.cleaned_data["height_in_cm"], 1704)
+
+        self.assertEqual(form.cleaned_data["height"], 1704)
 
     def test_is_invalid(self):
         form = HeightForm(
             participant=self.participant,
             data={
-                "height_in_cm": "invalid"
+                "height": "invalid"
             }
         )
         self.assertFalse(form.is_valid())
diff --git a/lung_cancer_screening/questions/views/height.py b/lung_cancer_screening/questions/views/height.py
@@ -1,32 +1,34 @@
 from django.shortcuts import render, redirect
 from django.core.exceptions import ValidationError
-#from django.urls import reverse
+
+from lung_cancer_screening.questions.forms.height_form import HeightForm
+from lung_cancer_screening.questions.models import participant
 
 from .decorators.participant_decorators import require_participant
 
 @require_participant
 def height(request): 
   if request.method == "POST":
-    response_set = request.participant.responseset_set.last()
-    
-    height = request.POST.get("height")
+    form = HeightForm(
+      instance = request.participant.responseset_set.last(),
+      data=request.POST, 
+      participant=request.participant
+    )
+
+    if form.is_valid() :
+      form.save()
 
-    if height.isdigit() and int(height) > 0 :
-      height = int(height)*10
-    response_set.height = height
-    #response_set.height_type = request.POST.get("height_type")
-    try:
-      response_set.save()
       return redirect("questions:responses")
-    except ValidationError:
+    else :
       return render(
         request,
         "height.jinja",
+        { "form" : form },
         status=422
       )
 
   return render(
         request,
         "height.jinja",
-        {}
-    )
+        { "form" : HeightForm(participant=request.participant) }
+    )
diff --git a/scripts/tests/unit.sh b/scripts/tests/unit.sh
@@ -17,5 +17,4 @@ cd "$(git rev-parse --show-toplevel)"
 # tests from here. If you want to run other test suites, see the predefined
 # tasks in scripts/test.mk.
 
-docker compose run --rm --remove-orphans web poetry run python manage.py test lung_cancer_screening.questions.tests.unit
-
+docker compose run --rm --remove-orphans web poetry run python manage.py test --settings=lung_cancer_screening.settings_test
