Merge pull request #118 from NHSDigital/PPHA-263-weight-page

PPHA-263: Metric weight page

Author: miriam-z

lung_cancer_screening/core/form_fields.py

@@ -441,3 +441,83 @@ def compress(self, data_list):
             total_inches = feet * 12 + inches
             return int(total_inches)
         return None
+
+
+class ImperialWeightWidget(widgets.MultiWidget):
+    """
+    A widget that splits weight into stone and pounds inputs.
+    """
+
+    def __init__(self, attrs=None):
+        weight_widgets = (
+            widgets.NumberInput(attrs=attrs),
+            widgets.NumberInput(attrs=attrs),
+        )
+        super().__init__(weight_widgets, attrs)
+
+    def decompress(self, value):
+        """
+        Convert total pounds back to stone and pounds for display.
+        """
+        if value:
+            stone = int(value // 14)
+            pounds = value % 14
+            return [stone, pounds]
+        return [None, None]
+
+    def subwidgets(self, name, value, attrs=None):
+        """
+        Expose data for each subwidget, so that we can render them separately in the template.
+        """
+        context = self.get_context(name, value, attrs)
+        for subwidget in context["widget"]["subwidgets"]:
+            yield subwidget
+
+
+class ImperialWeightField(forms.MultiValueField):
+    """
+    A field that combines stone and pounds into a single weight value in total pounds.
+    """
+
+    widget = ImperialWeightWidget
+
+    def __init__(self, *args, **kwargs):
+        error_messages = kwargs.get("error_messages", {})
+
+        stone_kwargs = {
+            "min_value": 0,
+            "max_value": 50,
+            "error_messages": {
+                'invalid': 'Stone must be in whole numbers.',
+                'min_value': 'Weight must be between 4 stone and 50 stone.',
+                'max_value': 'Weight must be between 4 stone and 50 stone.',
+                **error_messages,
+            },
+        }
+        pounds_kwargs = {
+            "min_value": 0,
+            "max_value": 13,
+            "error_messages": {
+                'invalid': 'Pounds must be in whole numbers.',
+                'min_value': 'Pounds must be between 0 and 13.',
+                'max_value': 'Pounds must be between 0 and 13.',
+                **error_messages,
+            },
+        }
+        fields = (
+            IntegerField(**stone_kwargs),
+            IntegerField(**pounds_kwargs),
+        )
+        kwargs["template_name"] = "forms/imperial-weight-input.jinja"
+
+        super().__init__(fields, *args, **kwargs)
+
+    def compress(self, data_list):
+        """
+        Convert stone and pounds to total pounds.
+        """
+        if data_list and all(item is not None for item in data_list):
+            stone, pounds = data_list
+            total_pounds = stone * 14 + pounds
+            return int(total_pounds)
+        return None

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

@@ -37,3 +37,10 @@ def fill_in_and_submit_height_imperial(page, feet, inches):
     page.get_by_label("Inches").fill(str(inches))
 
     page.click("text=Continue")
+
+def fill_in_and_submit_weight_metric(page, kilograms):
+    expect(page.locator("h1")).to_have_text("Enter your weight")
+
+    page.get_by_label("Kilograms").fill(str(kilograms))
+
+    page.click("text=Continue")

lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py

@@ -6,12 +6,12 @@
 
 from .helpers.user_interaction_helpers import (
     fill_in_and_submit_height_metric,
+    fill_in_and_submit_weight_metric,
     fill_in_and_submit_participant_id,
     fill_in_and_submit_smoking_eligibility,
     fill_in_and_submit_date_of_birth
 )
 
-
 class TestQuestionnaire(StaticLiveServerTestCase):
 
     @classmethod
@@ -39,6 +39,7 @@ def test_cannot_change_responses_once_checked_and_submitted(self):
         fill_in_and_submit_smoking_eligibility(page, smoking_status)
         fill_in_and_submit_date_of_birth(page, age)
         fill_in_and_submit_height_metric(page, "170")
+        fill_in_and_submit_weight_metric(page, "25.4")
 
         page.click("text=Submit")
 

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -9,7 +9,8 @@
     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
+    fill_in_and_submit_date_of_birth,
+    fill_in_and_submit_weight_metric
 )
 
 from .helpers.assertion_helpers import expect_back_link_to_have_url
@@ -36,6 +37,9 @@ def test_full_questionnaire_user_journey(self):
         height = "170"
         feet = 5
         inches = 7
+        weight_metric = 70
+        # weight_stone = 5
+        # weight_pound = 10
 
         page = self.browser.new_page()
         page.goto(f"{self.live_server_url}/start")
@@ -56,7 +60,7 @@ def test_full_questionnaire_user_journey(self):
 
         fill_in_and_submit_height_metric(page, height)
 
-        expect(page).to_have_url(f"{self.live_server_url}/responses")
+        expect(page).to_have_url(f"{self.live_server_url}/weight")
 
         page.click("text=Back")
 
@@ -66,14 +70,22 @@ def test_full_questionnaire_user_journey(self):
 
         fill_in_and_submit_height_imperial(page, feet, inches)
 
+        expect(page).to_have_url(f"{self.live_server_url}/weight")
+
+        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)
         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")
 
         page.click("text=Submit")
 
-
-
         expect(page).to_have_url(f"{self.live_server_url}/your-results")

lung_cancer_screening/core/tests/acceptance/test_questionnaire_validation_errors.py

@@ -83,3 +83,22 @@ def test_height_validation_errors(self):
         expect(page.locator(".nhsuk-error-message")).to_contain_text(
             "Inches must be in whole numbers"
         )
+
+    def test_weight_validation_errors(self):
+        participant_id = '123'
+
+        page = self.browser.new_page()
+        page.goto(f"{self.live_server_url}/start")
+        fill_in_and_submit_participant_id(page, participant_id)
+        page.goto(f"{self.live_server_url}/weight")
+
+        page.click("text=Continue")
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Enter your weight."
+        )
+        # Test weight below minimum
+        page.get_by_label("Kilograms").fill('25.3')
+        page.click('text=Continue')
+        expect(page.locator(".nhsuk-error-message")).to_contain_text(
+            "Weight must be between 25.4kg and 317.5kg"
+        )

lung_cancer_screening/questions/forms/metric_weight_form.py

@@ -0,0 +1,26 @@
+from django import forms
+
+from lung_cancer_screening.core.form_fields import DecimalField
+from ..models.response_set import ResponseSet
+
+class MetricWeightForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        self.participant = kwargs.pop('participant')
+        super().__init__(*args, **kwargs)
+        self.instance.participant = self.participant
+
+        self.fields["weight_metric"] = DecimalField(
+            label="Kilograms",
+            classes="nhsuk-input--width-4",
+            required=True,
+            error_messages={
+                'required': 'Enter your weight.',
+            }
+        )
+    def clean_weight_metric(self):
+        return self.cleaned_data['weight_metric'] * 10
+
+    class Meta:
+        model = ResponseSet
+        fields = ['weight_metric']

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -19,6 +19,7 @@
         <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.formatted_height }}</li>
+        <li>What is your weight? {{ response_set.formatted_weight }}</li>
       </ul>
 
       <form action="{{ request.path }}" method="post">

lung_cancer_screening/questions/jinja2/weight.jinja

@@ -0,0 +1,43 @@
+{% extends 'layout.jinja' %}
+{% from 'nhsuk/components/button/macro.jinja' import button %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+{% from 'nhsuk/components/fieldset/macro.jinja' import fieldset %}
+
+{% 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">
+      <form action="{{request.path}}" method="POST" novalidate>
+        {{ csrf_input }}
+        <h1 class="nhsuk-heading-l">Enter your weight</h1>
+
+        <p>An accurate measurement is important.
+
+        <p>If you have digital scales, use these to check your weight. Some pharmacies and gyms have scales where you can check for free.
+
+        {% call fieldset({
+          "legend": {
+            "text": "What is your weight",
+            "classes": "nhsuk-label--m"
+          }
+        }) %}
+
+          {{form.weight_metric.as_field_group()}}
+
+        {% endcall %}
+
+        {{ button({
+            "text": "Continue"
+        }) }}
+      </form>
+    </div>
+  </div>
+{% endblock %}

lung_cancer_screening/questions/migrations/0011_responseset_weight_metric_and_more.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.2.7 on 2025-10-21 13:13
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0010_responseset_height_imperial_alter_responseset_height_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='responseset',
+            name='weight_metric',
+            field=models.PositiveIntegerField(blank=True, null=True),
+        ),
+        migrations.AlterField(
+            model_name='responseset',
+            name='height_imperial',
+            field=models.PositiveIntegerField(blank=True, null=True, validators=[django.core.validators.MinValueValidator(55, message='Height must be between 4 feet 7 inches and 8 feet'), django.core.validators.MaxValueValidator(96, message='Height must be between 4 feet 7 inches and 8 feet')]),
+        ),
+    ]

lung_cancer_screening/questions/models/response_set.py

@@ -39,6 +39,14 @@ class ResponseSet(BaseModel):
             MAX_HEIGHT_IMPERIAL, message="Height must be between 4 feet 7 inches and 8 feet"),
     ])
 
+    MIN_WEIGHT_METRIC = 254
+    MAX_WEIGHT_METRIC = 3175
+
+    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"),
+    ])
+
     submitted_at = models.DateTimeField(null=True, blank=True)
 
     class Meta:
@@ -70,3 +78,12 @@ def formatted_height(self):
             value = Decimal(self.height_imperial)
             return f"{value // 12} feet {value % 12} inches"
 
+    @property
+    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"
+
+