Merge pull request #119 from NHSDigital/PPHA-263--Weight-imperial-page

miriam-z · web-flow · commit 8bcb602e5d1d · 2025-10-27T15:26:41.000Z
Add weight unit switching in acceptance test
diff --git a/lung_cancer_screening/core/jinja2/forms/imperial-weight-input.jinja b/lung_cancer_screening/core/jinja2/forms/imperial-weight-input.jinja
@@ -0,0 +1,52 @@
+{% from 'nhsuk/components/input/macro.jinja' import input %}
+{% from 'nhsuk/components/error-message/macro.jinja' import errorMessage %}
+
+{% if field.errors | length > 0 %}
+  {% set error_message = field.errors | first %}
+{% endif %}
+{% set unbound_field = field.field %}
+{% set hint = unbound_field.hint %}
+{% set form_group_error_classes = ' nhsuk-form-group--error' if error_message else '' %}
+{% set field_error_classes = ' nhsuk-input--error' if error_message else '' %}
+
+<div id="{{ field.html_name }}" class="multi-field-input nhsuk-form-group{{ form_group_error_classes }}">
+  {% if error_message %}
+    {{ errorMessage({
+      "id": field.auto_id,
+      "text": error_message
+    }) }}
+  {% endif %}
+
+  <div class="multi-field-input__item">
+    {{ input({
+      "label": {
+        "text": "Stone",
+        "classes": "nhsuk-fieldset__legend--m",
+        "isPageHeading": false
+      },
+      "hint": {
+        "text": unbound_field.hint
+      } if unbound_field.hint,
+      "id": field.auto_id + "_0",
+      "name": field.html_name + "_0",
+      "value": field.subwidgets.0.data.value,
+      "classes": "nhsuk-input--width-2" + field_error_classes,
+      "type": "number"
+    }) }}
+  </div>
+
+  <div class="multi-field-input__item">
+    {{ input({
+      "label": {
+        "text": "Pounds",
+        "classes": "nhsuk-fieldset__legend--m",
+        "isPageHeading": false
+      },
+      "id": field.auto_id + "_1",
+      "name": field.html_name + "_1",
+      "value": field.subwidgets.1.data.value,
+      "classes": "nhsuk-input--width-2" + field_error_classes,
+      "type": "number"
+    }) }}
+  </div>
+</div>
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
@@ -44,3 +44,11 @@ def fill_in_and_submit_weight_metric(page, kilograms):
     page.get_by_label("Kilograms").fill(str(kilograms))
 
     page.click("text=Continue")
+
+def fill_in_and_submit_weight_imperial(page, stone, pounds):
+    expect(page.locator("h1")).to_have_text("Enter your weight")
+
+    page.get_by_label("Stone").fill(str(stone))
+    page.get_by_label("Pounds").fill(str(pounds))
+
+    page.click("text=Continue")
diff --git a/lung_cancer_screening/core/tests/acceptance/test_questionnaire.py b/lung_cancer_screening/core/tests/acceptance/test_questionnaire.py
@@ -10,7 +10,8 @@
     fill_in_and_submit_participant_id,
     fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth,
-    fill_in_and_submit_weight_metric
+    fill_in_and_submit_weight_metric,
+    fill_in_and_submit_weight_imperial
 )
 
 from .helpers.assertion_helpers import expect_back_link_to_have_url
@@ -38,8 +39,8 @@ def test_full_questionnaire_user_journey(self):
         feet = 5
         inches = 7
         weight_metric = 70
-        # weight_stone = 5
-        # weight_pound = 10
+        weight_stone = 5
+        weight_pound = 10
 
         page = self.browser.new_page()
         page.goto(f"{self.live_server_url}/start")
@@ -75,16 +76,16 @@ def test_full_questionnaire_user_journey(self):
         fill_in_and_submit_weight_metric(page, weight_metric)
 
         expect(page).to_have_url(f"{self.live_server_url}/responses")
-        # page.click("text=Back")
-        # page.click("text=Switch to imperial")
-        # fill_in_and_submit_weight_imperial(page, weight_stone, weight_pound)
+        page.click("text=Back")
+        page.get_by_role("link", name="Switch to stone and pounds").click()
+        fill_in_and_submit_weight_imperial(page, weight_stone, weight_pound)
+        expect(page).to_have_url(f"{self.live_server_url}/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"What is your height? {feet} feet {inches} inches")
-        expect(responses).to_contain_text(f"What is your weight? {weight_metric}kg")
-        # expect(responses).to_contain_text(f"What is your weight? {weight_stone} stone {weight_pound} pound")
+        expect(responses).to_contain_text(f"What is your weight? {weight_stone} stone {weight_pound} pound")
 
         page.click("text=Submit")
 
diff --git a/lung_cancer_screening/questions/forms/imperial_weight_form.py b/lung_cancer_screening/questions/forms/imperial_weight_form.py
@@ -0,0 +1,28 @@
+from django import forms
+
+from lung_cancer_screening.core.form_fields import ImperialWeightField
+from ..models.response_set import ResponseSet
+
+class ImperialWeightForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        self.participant = kwargs.pop('participant')
+        super().__init__(*args, **kwargs)
+        self.instance.participant = self.participant
+
+        self.fields["weight_imperial"] = ImperialWeightField(
+            label="Weight",
+            required=True,
+            require_all_fields=False,
+            error_messages={
+                'required': 'Enter your weight.',
+                'incomplete': 'Enter your weight.'
+            }
+        )
+
+    def clean_weight_metric(self):
+        return None
+
+    class Meta:
+        model = ResponseSet
+        fields = ['weight_imperial', 'weight_metric']
diff --git a/lung_cancer_screening/questions/jinja2/responses.jinja b/lung_cancer_screening/questions/jinja2/responses.jinja
@@ -5,7 +5,7 @@
 {% block beforeContent %}
   {{
     backLink({
-      "href": url("questions:height"),
+      "href": url("questions:weight"),
       "text": "Back"
     })
   }}
diff --git a/lung_cancer_screening/questions/jinja2/weight.jinja b/lung_cancer_screening/questions/jinja2/weight.jinja
@@ -3,6 +3,11 @@
 {% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
 {% from 'nhsuk/components/fieldset/macro.jinja' import fieldset %}
 
+{% set WEIGHT_UNIT = {
+    'imperial': 'stone and pounds',
+    'metric': 'kilograms'
+} %}
+
 {% block beforeContent %}
   {{
     backLink({
@@ -15,7 +20,12 @@
 {% block page_content %}
   <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-two-thirds">
-      <form action="{{request.path}}" method="POST" novalidate>
+      {% if unit %}
+        {% set action_url = request.path + '?unit=' + unit %}
+      {% else %}
+        {% set action_url = request.path %}
+      {% endif %}
+      <form action="{{ action_url }}" method="POST" novalidate>
         {{ csrf_input }}
         <h1 class="nhsuk-heading-l">Enter your weight</h1>
 
@@ -30,8 +40,13 @@
           }
         }) %}
 
-          {{form.weight_metric.as_field_group()}}
+        {% if unit == "imperial" %}
+          {{ form.weight_imperial.as_field_group() }}
+        {% else %}
+          {{ form.weight_metric.as_field_group() }}
+        {% endif %}
 
+          <p><a href="?unit={{ switch_to_unit }}">Switch to {{ WEIGHT_UNIT[switch_to_unit] }}</a></p>
         {% endcall %}
 
         {{ button({
diff --git a/lung_cancer_screening/questions/migrations/0012_responseset_weight_imperial_and_more.py b/lung_cancer_screening/questions/migrations/0012_responseset_weight_imperial_and_more.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.2.7 on 2025-10-27 12:36
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0011_responseset_weight_metric_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='responseset',
+            name='weight_imperial',
+            field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(56, message='Weight must be between 4 stone and 50 stone'), django.core.validators.MaxValueValidator(700, message='Weight must be between 4 stone and 50 stone')]),
+        ),
+        migrations.AlterField(
+            model_name='responseset',
+            name='weight_metric',
+            field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(254, message='Weight must be between 25.4kg and 317.5kg'), django.core.validators.MaxValueValidator(3175, message='Weight must be between 25.4kg and 317.5kg')]),
+        ),
+    ]
diff --git a/lung_cancer_screening/questions/models/response_set.py b/lung_cancer_screening/questions/models/response_set.py
@@ -41,12 +41,19 @@ class ResponseSet(BaseModel):
 
     MIN_WEIGHT_METRIC = 254
     MAX_WEIGHT_METRIC = 3175
+    MAX_WEIGHT_IMPERIAL = 700
+    MIN_WEIGHT_IMPERIAL = 56
 
     weight_metric = models.PositiveIntegerField(null=True, blank=True, validators=[
         MinValueValidator(MIN_WEIGHT_METRIC, message="Weight must be between 25.4kg and 317.5kg"),
         MaxValueValidator(MAX_WEIGHT_METRIC, message="Weight must be between 25.4kg and 317.5kg"),
     ])
-
+    weight_imperial = models.PositiveIntegerField(null=True, blank=True, validators=[
+        MinValueValidator(
+            MIN_WEIGHT_IMPERIAL, message="Weight must be between 4 stone and 50 stone"),
+        MaxValueValidator(
+            MAX_WEIGHT_IMPERIAL, message="Weight must be between 4 stone and 50 stone"),
+    ])
     submitted_at = models.DateTimeField(null=True, blank=True)
 
     class Meta:
@@ -82,8 +89,8 @@ def formatted_height(self):
     def formatted_weight(self):
         if self.weight_metric:
             return f"{Decimal(self.weight_metric) / 10}kg"
-        # elif self.height_imperial:
-        #     value = Decimal(self.weight_imperial)
-        #     return f"{value // 12} feet {value % 12} inches"
+        elif self.weight_imperial:
+            value = Decimal(self.weight_imperial)
+            return f"{value // 14} stone {value % 14} pounds"
 
 
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_imperial_weight_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_imperial_weight_form.py
@@ -0,0 +1,78 @@
+from django.test import TestCase
+
+from ....models.participant import Participant
+from ....forms.imperial_weight_form import ImperialWeightForm
+
+class TestImperialWeightForm(TestCase):
+    def setUp(self):
+        self.participant = Participant.objects.create(unique_id="1234567890")
+        self.response_set = self.participant.responseset_set.create(
+            weight_metric=1704
+        )
+
+    def test_is_valid_with_valid_input(self):
+        form = ImperialWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_imperial_0": "5",  # stone
+                "weight_imperial_1": "9"   # pounds
+            }
+        )
+
+        self.assertTrue(form.is_valid())
+
+    def test_converts_stone_and_pounds_to_kilograms_integer(self):
+        form = ImperialWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_imperial_0": "5",  # stone
+                "weight_imperial_1": "9"   # pounds
+            }
+        )
+
+        self.assertTrue(form.is_valid(), f"Form errors: {form.errors}")
+        self.assertEqual(form.cleaned_data['weight_imperial'], 79)
+
+    def test_setting_weight_imperial_clears_weight_metric(self):
+        form = ImperialWeightForm(
+            instance=self.response_set,
+            participant=self.participant,
+            data={
+                "weight_imperial_0": "5",  # stone
+                "weight_imperial_1": "9"   # pounds
+            }
+        )
+        form.save()
+        self.assertEqual(self.response_set.weight_metric, None)
+
+    def test_is_invalid_with_missing_data(self):
+        form = ImperialWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_imperial_0": "5",
+                # missing pounds
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["weight_imperial"],
+            ["Enter your weight."]
+        )
+
+    def test_is_invalid_when_given_a_decimal_stone_value(self):
+        form = ImperialWeightForm(
+            participant=self.participant,
+            instance=self.response_set,
+            data={
+                "weight_imperial_0": "5.2",
+                "weight_imperial_1": "0"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["weight_imperial"],
+            ["Stone must be in whole numbers."]
+        )
diff --git a/lung_cancer_screening/questions/views/weight.py b/lung_cancer_screening/questions/views/weight.py
@@ -1,12 +1,16 @@
 from django.shortcuts import render, redirect
 
 from lung_cancer_screening.questions.forms.metric_weight_form import MetricWeightForm
+from lung_cancer_screening.questions.forms.imperial_weight_form import ImperialWeightForm
 from .decorators.participant_decorators import require_participant
 
 @require_participant
 def weight(request):
+    unit = request.GET.get('unit')
+    form_klass = ImperialWeightForm if unit == "imperial" else MetricWeightForm
+
     if request.method == "POST":
-        form=MetricWeightForm(
+        form = form_klass(
             instance=request.participant.responseset_set.last(),
             data=request.POST,
             participant=request.participant
@@ -19,14 +23,18 @@ def weight(request):
                 request,
                 "weight.jinja",
                 {
-                    "form": form
+                    "form": form,
+                    "unit": unit,
+                    "switch_to_unit": "metric" if unit == "imperial" else "imperial"
                 },
                 status=422
             )
     return render(
         request,
         "weight.jinja",
         {
-            "form": MetricWeightForm(participant=request.participant)
+            "form": form_klass(participant=request.participant),
+            "unit": unit,
+            "switch_to_unit": "metric" if unit == "imperial" else "imperial"
         }
     )
