WIP

Author: miriam-z

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

@@ -0,0 +1,15 @@
+def check_labels(page, answers):
+    if answers is None:
+        return
+
+    if isinstance(answers, str):
+        page.get_by_label(answers, exact=True).check()
+        return
+
+    if isinstance(answers, list, tuple):
+        for answer in answers:
+            page.get_by_label(answer, exact=True).check()
+        return
+
+    raise TypeError("answers must be a string, list, or tuple")
+

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

@@ -1,4 +1,5 @@
 from playwright.sync_api import expect
+from .test_helpers import check_labels
 
 def fill_in_and_submit_participant_id(page, participant_id):
     page.fill("input[name='participant_id']", participant_id)
@@ -84,3 +85,12 @@ def fill_in_and_submit_asbestos_exposure(page, answer):
     page.get_by_label(answer, exact=True).check()
 
     page.click("text=Continue")
+
+def fill_in_and_submit_respiratory_conditions(page, answer):
+    expect(page.locator("legend")).to_have_text(
+        "Have you ever been diagnosed with any of the following respiratory conditions?")
+
+    check_labels(page, answer)
+
+    page.click("text=Continue")
+

lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py

@@ -13,7 +13,8 @@
     fill_in_and_submit_sex_at_birth,
     fill_in_and_submit_gender,
     fill_in_and_submit_ethnicity,
-    fill_in_and_submit_asbestos_exposure
+    fill_in_and_submit_asbestos_exposure,
+    fill_in_and_submit_respiratory_conditions
 )
 
 class TestQuestionnaire(StaticLiveServerTestCase):
@@ -48,7 +49,7 @@ def test_cannot_change_responses_once_checked_and_submitted(self):
         fill_in_and_submit_gender(page, "Male")
         fill_in_and_submit_ethnicity(page, "White")
         page.click("text=Continue") # education
-        page.click("text=Continue") # respiratory conditions
+        fill_in_and_submit_respiratory_conditions(page, "None of the above")
         fill_in_and_submit_asbestos_exposure(page, "No")
         page.click("text=Continue") # cancer diagnosis
         page.click("text=Continue") # family history

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -15,7 +15,8 @@
     fill_in_and_submit_sex_at_birth,
     fill_in_and_submit_gender,
     fill_in_and_submit_ethnicity,
-    fill_in_and_submit_asbestos_exposure
+    fill_in_and_submit_asbestos_exposure,
+    fill_in_and_submit_respiratory_conditions
 )
 
 from .helpers.assertion_helpers import expect_back_link_to_have_url
@@ -96,7 +97,7 @@ def test_full_questionnaire_user_journey(self):
 
         expect(page).to_have_url(f"{self.live_server_url}/respiratory-conditions")
         expect_back_link_to_have_url(page, "/education")
-        page.click("text=Continue")
+        fill_in_and_submit_respiratory_conditions(page, "None of the above")
 
         expect(page).to_have_url(f"{self.live_server_url}/asbestos-exposure")
         expect_back_link_to_have_url(page, "/respiratory-conditions")

lung_cancer_screening/nhsuk_forms/choice_field.py

@@ -20,6 +20,7 @@ def __init__(self, form: forms.Form, field: "ChoiceField", name: str):
 
         self._conditional_html = {}
         self.dividers = {}
+        self.choice_hints = {}
 
     def add_conditional_html(self, value, html):
         if isinstance(self.field.widget, widgets.Select):
@@ -36,6 +37,12 @@ def add_divider_after(self, previous, divider):
     def get_divider_after(self, previous):
         return self.dividers.get(previous)
 
+    def add_hint_for_choice(self, value, hint):
+        self.choice_hints[value] = hint
+
+    def get_hint_for_choice(self, value):
+        return self.choice_hints.get(value)
+
 
 class ChoiceField(forms.ChoiceField):
     """

lung_cancer_screening/nhsuk_forms/jinja2/checkboxes.jinja

@@ -0,0 +1,38 @@
+{% from 'nhsuk/components/checkboxes/macro.jinja' import checkboxes %}
+{% set unbound_field = field.field %}
+{% if field.errors %}
+  {% set error_message = {"text": field.errors | first} %}
+{% endif %}
+{% set ns = namespace(items=[]) %}
+{% for value, text in unbound_field.choices %}
+  {% set hint_text = field.get_hint_for_choice(value) %}
+  {% set ns.items = ns.items + [{
+    "id": field.auto_id ~ '_' ~ loop.index0,
+    "value": value,
+    "text": text,
+    "checked": value in (field.value() or []),
+    "hint": {
+      "text": hint_text
+    } if hint_text else undefined
+  }] %}
+  {% set divider = field.get_divider_after(value) %}
+  {% if divider %}
+    {% set ns.items = ns.items + [{"divider": divider}] %}
+  {% endif %}
+{% endfor %}
+{{ checkboxes({
+  "name": field.html_name,
+  "idPrefix": field.auto_id,
+  "fieldset": {
+    "legend": {
+      "text": field.label,
+      "classes": unbound_field.label_classes
+    }
+  } if field.use_fieldset else none,
+  "errorMessage": error_message,
+  "classes": unbound_field.classes if unbound_field.classes,
+  "hint": {
+    "html": unbound_field.hint|e
+  } if unbound_field.hint,
+  "items": ns.items
+}) }}

lung_cancer_screening/questions/forms/respiratory_conditions_form.py

@@ -0,0 +1,56 @@
+from django import forms
+
+from ...nhsuk_forms.choice_field import MultipleChoiceField
+from ..models.response_set import ResponseSet, RespiratoryConditionValues
+
+
+class RespiratoryConditionsForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        self.participant = kwargs.pop('participant')
+        super().__init__(*args, **kwargs)
+        self.instance.participant = self.participant
+
+        self.fields["respiratory_conditions"] = MultipleChoiceField(
+            choices=RespiratoryConditionValues.choices,
+            widget=forms.CheckboxSelectMultiple,
+            label="Have you ever been diagnosed with any of the following respiratory conditions?",
+            label_classes="nhsuk-fieldset__legend--l",
+            hint="Select all that apply",
+            error_messages={
+                'required': 'Select if you have had any respiratory conditions'
+            }
+        )
+
+        # Add hints for each choice
+        respiratory_conditions_field = self["respiratory_conditions"]
+        respiratory_conditions_field.add_hint_for_choice(
+            RespiratoryConditionValues.PNEUMONIA,
+            "An infection of the lungs, usually diagnosed by a chest x-ray"
+        )
+        respiratory_conditions_field.add_hint_for_choice(
+            RespiratoryConditionValues.EMPHYSEMA,
+            "Damage to the air sacs in the lungs"
+        )
+        respiratory_conditions_field.add_hint_for_choice(
+            RespiratoryConditionValues.BRONCHITIS,
+            "An ongoing inflammation of the airways in the lungs that is usually caused by an infection"
+        )
+        respiratory_conditions_field.add_hint_for_choice(
+            RespiratoryConditionValues.TUBERCULOSIS,
+            "An infection that usually affects the lungs, but can affect any part of the body"
+        )
+        respiratory_conditions_field.add_hint_for_choice(
+            RespiratoryConditionValues.COPD,
+            "A group of lung conditions that cause breathing difficulties"
+        )
+
+        # Add divider before "None of the above"
+        respiratory_conditions_field.add_divider_after(
+            RespiratoryConditionValues.COPD,
+            "or"
+        )
+
+    class Meta:
+        model = ResponseSet
+        fields = ['respiratory_conditions']

lung_cancer_screening/questions/migrations/0018_responseset_respiratory_conditions.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.2.8 on 2025-11-14 11:20
+
+import django.contrib.postgres.fields
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0017_alter_responseset_asbestos_exposure'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='responseset',
+            name='respiratory_conditions',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.CharField(choices=[('P', 'Pneumonia'), ('E', 'Emphysema'), ('B', 'Chronic bronchitis'), ('T', 'Tuberculosis (TB)'), ('C', 'Chronic obstructive pulmonary disease (COPD)'), ('N', 'None of the above')], max_length=1), blank=True, null=True, size=None),
+        ),
+    ]

lung_cancer_screening/questions/models/response_set.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.contrib.postgres.fields import ArrayField
 from django.core.exceptions import ValidationError
 from django.core.validators import MaxValueValidator, MinValueValidator
 from dateutil.relativedelta import relativedelta
@@ -33,6 +34,14 @@ class EthnicityValues(models.TextChoices):
     OTHER = "O", "Other ethnic group"
     PREFER_NOT_TO_SAY = "N", "I'd prefer not to say"
 
+class RespiratoryConditionValues(models.TextChoices):
+    PNEUMONIA = "P", "Pneumonia"
+    EMPHYSEMA = "E", "Emphysema"
+    BRONCHITIS = "B", "Chronic bronchitis"
+    TUBERCULOSIS = "T", "Tuberculosis (TB)"
+    COPD = "C", "Chronic obstructive pulmonary disease (COPD)"
+    NONE = "N", "None of the above"
+
 class ResponseSet(BaseModel):
     participant = models.ForeignKey(Participant, on_delete=models.CASCADE)
 
@@ -95,6 +104,12 @@ class ResponseSet(BaseModel):
         blank=True
     )
 
+    respiratory_conditions = ArrayField(
+        models.CharField(max_length=1, choices=RespiratoryConditionValues.choices),
+        null=True,
+        blank=True
+    )
+
     asbestos_exposure = models.BooleanField(
         null=True,
         blank=True

lung_cancer_screening/questions/tests/unit/forms/test_respiratory_conditions_form.py

@@ -0,0 +1,90 @@
+from django.test import TestCase
+
+from ....models.participant import Participant
+from ....forms.respiratory_conditions_form import RespiratoryConditionsForm
+
+
+class TestRespiratoryConditionsForm(TestCase):
+    def setUp(self):
+        self.participant = Participant.objects.create(unique_id="1234567890")
+
+    def test_is_valid_with_single_condition(self):
+        form = RespiratoryConditionsForm(
+            participant=self.participant,
+            data={
+                "respiratory_conditions": ["P"]
+            }
+        )
+        self.assertTrue(form.is_valid())
+        self.assertEqual(
+            form.cleaned_data["respiratory_conditions"],
+            ["P"]
+        )
+
+    def test_is_valid_with_multiple_conditions(self):
+        form = RespiratoryConditionsForm(
+            participant=self.participant,
+            data={
+                "respiratory_conditions": ["P", "E", "C"]
+            }
+        )
+        self.assertTrue(form.is_valid())
+        self.assertEqual(
+            form.cleaned_data["respiratory_conditions"],
+            ["P", "E", "C"]
+        )
+
+    def test_is_valid_with_none_of_the_above(self):
+        form = RespiratoryConditionsForm(
+            participant=self.participant,
+            data={
+                "respiratory_conditions": ["N"]
+            }
+        )
+        self.assertTrue(form.is_valid())
+        self.assertEqual(
+            form.cleaned_data["respiratory_conditions"],
+            ["N"]
+        )
+
+    def test_is_invalid_with_an_invalid_value(self):
+        form = RespiratoryConditionsForm(
+            participant=self.participant,
+            data={
+                "respiratory_conditions": ["INVALID"]
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["respiratory_conditions"],
+            ["Select a valid choice. INVALID is not one of the available choices."]
+        )
+
+    def test_is_invalid_when_no_option_is_selected(self):
+        form = RespiratoryConditionsForm(
+            participant=self.participant,
+            data={
+                "respiratory_conditions": []
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["respiratory_conditions"],
+            ["Select if you have had any respiratory conditions"]
+        )
+
+    # TODO: Add test for when none of the above is selected and other options are selected
+    # def test_is_invalid_with_none_of_the_above_selected_and_other_options_selected(self):
+    #     form = RespiratoryConditionsForm(
+    #         participant=self.participant,
+    #         data={
+    #             "respiratory_conditions": ["N", "P", "E", "C"]
+    #         }
+    #     )
+    #     self.assertFalse(form.is_valid())
+    #     self.assertEqual(
+    #         form.errors["respiratory_conditions"],
+    #         ["Select if you have had any respiratory conditions"]
+    #     )
+
+