Start of imperial height

Author: jamiefalcus

lung_cancer_screening/core/tests/acceptance/helpers/user_interaction_helpers.py

@@ -23,9 +23,17 @@ def fill_in_and_submit_date_of_birth(page, age):
 
     page.click("text=Continue")
 
-def fill_in_and_submit_height(page, height):
+def fill_in_and_submit_height_metric(page, height):
     expect(page.locator("h1")).to_have_text("What is your height?")
 
     page.get_by_label("Centimetre").fill(str(height))
 
     page.click("text=Continue")
+
+def fill_in_and_submit_height_imperial(page, feet, inches):
+    expect(page.locator("h1")).to_have_text("What is your height?")
+
+    page.get_by_label("Feet").fill(str(feet))
+    page.get_by_label("Inches").fill(str(inches))
+
+    page.click("text=Continue")

lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py

@@ -5,7 +5,8 @@
 from dateutil.relativedelta import relativedelta
 
 from .helpers.user_interaction_helpers import (
-    fill_in_and_submit_height,
+    fill_in_and_submit_height_metric,
+    fill_in_and_submit_height_imperial,
     fill_in_and_submit_participant_id,
     fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth
@@ -38,7 +39,7 @@ def test_cannot_change_responses_once_checked_and_submitted(self):
         fill_in_and_submit_participant_id(page, participant_id)
         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")
+        fill_in_and_submit_height_metric(page, "170")
 
         page.click("text=Submit")
 

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -5,7 +5,8 @@
 from dateutil.relativedelta import relativedelta
 
 from .helpers.user_interaction_helpers import (
-    fill_in_and_submit_height,
+    fill_in_and_submit_height_imperial,
+    fill_in_and_submit_height_metric,
     fill_in_and_submit_participant_id,
     fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth
@@ -33,6 +34,8 @@ def test_full_questionnaire_user_journey(self):
         smoking_status = 'Yes, I used to smoke regularly'
         age = datetime.now() - relativedelta(years=55)
         height = "170"
+        feet = 5
+        inches = 7
 
         page = self.browser.new_page()
         page.goto(f"{self.live_server_url}/start")
@@ -51,10 +54,18 @@ def test_full_questionnaire_user_journey(self):
 
         expect(page).to_have_url(f"{self.live_server_url}/height")
 
-        fill_in_and_submit_height(page, height)
+        fill_in_and_submit_height_metric(page, height)
 
         expect(page).to_have_url(f"{self.live_server_url}/responses")
 
+        page.click("text=Back")
+
+        expect(page).to_have_url(f"{self.live_server_url}/height")
+
+        page.click("text=Switch to imperial")
+
+        fill_in_and_submit_height_imperial(page, feet, inches)
+
         responses = page.locator(".responses")
         expect(responses).to_contain_text("Have you ever smoked? Yes, I used to smoke regularly")
         expect(responses).to_contain_text(

lung_cancer_screening/questions/forms/imperial_height_form.py

@@ -0,0 +1,30 @@
+import decimal
+from django import forms
+
+from lung_cancer_screening.core.form_fields import DecimalField
+from ..models.response_set import ResponseSet
+
+class MetricHeightForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        self.participant = kwargs.pop('participant')
+        super().__init__(*args, **kwargs)
+        self.instance.participant = self.participant
+
+        self.fields["height_feet"] = DecimalField(
+             label="Feet",
+             classes="nhsuk-input--width-4",
+        )
+        
+        self.fields["height_inches"] = DecimalField(
+             label="Inches",
+             classes="nhsuk-input--width-4",
+        )
+
+    def clean_height(self):
+      data = self.cleaned_data['height_feet']*12 + self.cleaned_data['height_inches']
+      return data*2.54
+
+    class Meta:
+        model = ResponseSet
+        fields = ['height']

…screening/questions/forms/height_form.py …ng/questions/forms/metric_height_form.pylung_cancer_screening/questions/forms/height_form.py renamed to lung_cancer_screening/questions/forms/metric_height_form.py lung_cancer_screening/questions/forms/height_form.py renamed to lung_cancer_screening/questions/forms/metric_height_form.py

@@ -4,7 +4,7 @@
 from lung_cancer_screening.core.form_fields import DecimalField
 from ..models.response_set import ResponseSet
 
-class HeightForm(forms.ModelForm):
+class MetricHeightForm(forms.ModelForm):
 
     def __init__(self, *args, **kwargs):
         self.participant = kwargs.pop('participant')

lung_cancer_screening/questions/jinja2/height.jinja

@@ -27,7 +27,11 @@
             "classes": "nhsuk-label--m"
           }
         }) %}
+
         {{ form.height.as_field_group() }}
+        
+        <a href="?unit={{ switch_to_unit }}">Switch to {{ switch_to_unit }}</a>
+
         {% endcall %}
 
         {{ button({

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -1,7 +1,17 @@
 {% extends 'layout.jinja' %}
 {% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
 
-{% block content %}
+{% block beforeContent %}
+  {{
+    backLink({
+      "href": url("questions:height"),
+      "text": "Back"
+    })
+  }}
+{% endblock beforeContent %}
+
+{% block page_content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-l">Responses</h1>

…ons/tests/unit/forms/test_height_form.py …ts/unit/forms/test_metric_height_form.pylung_cancer_screening/questions/tests/unit/forms/test_height_form.py renamed to lung_cancer_screening/questions/tests/unit/forms/test_metric_height_form.py lung_cancer_screening/questions/tests/unit/forms/test_height_form.py renamed to lung_cancer_screening/questions/tests/unit/forms/test_metric_height_form.py

@@ -1,16 +1,16 @@
 from django.test import TestCase
 
 from ....models.participant import Participant
-from ....forms.height_form import HeightForm
+from ....forms.metric_height_form import MetricHeightForm
 
 
-class TestHeightForm(TestCase):
+class TestMetricHeightForm(TestCase):
     def setUp(self):
         self.participant = Participant.objects.create(unique_id="1234567890")
 
     def test_cm_to_mm(self):
         height = "170.4"
-        form = HeightForm(
+        form = MetricHeightForm(
             participant=self.participant,
             data={
                 "height": height
@@ -22,7 +22,7 @@ def test_cm_to_mm(self):
         self.assertEqual(form.cleaned_data["height"], 1704)
 
     def test_is_invalid(self):
-        form = HeightForm(
+        form = MetricHeightForm(
             participant=self.participant,
             data={
                 "height": "invalid"

lung_cancer_screening/questions/views/height.py

@@ -1,15 +1,15 @@
 from django.shortcuts import render, redirect
 from django.core.exceptions import ValidationError
 
-from lung_cancer_screening.questions.forms.height_form import HeightForm
+from lung_cancer_screening.questions.forms.metric_height_form import MetricHeightForm
 from lung_cancer_screening.questions.models import participant
 
 from .decorators.participant_decorators import require_participant
 
 @require_participant
 def height(request): 
   if request.method == "POST":
-    form = HeightForm(
+    form = MetricHeightForm(
       instance = request.participant.responseset_set.last(),
       data=request.POST, 
       participant=request.participant
@@ -26,9 +26,13 @@ def height(request):
         { "form" : form },
         status=422
       )
-
+  unit = request.GET.get('unit')
   return render(
         request,
         "height.jinja",
-        { "form" : HeightForm(participant=request.participant) }
+        { 
+          "form" : MetricHeightForm(participant=request.participant),
+          "unit" : unit,
+          "switch_to_unit" : "metric" if unit == "imperial" else "imperial"
+        }
     )