Merge pull request #215 from NHSDigital/PPHA-482-check-if-you-need-appointment-page

Themitchell · web-flow · commit 80c8a2f309b5 · 2026-01-12T15:52:45.000Z
PPHA-482: Check if you need an appointment page
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,4 @@ lung_cancer_screening/assets/compiled/*
 .devcontainer/ca.crt
 tests/TEST-*.xml
 node_modules
+screenshots
diff --git a/features/check_need_appointment.feature b/features/check_need_appointment.feature
@@ -0,0 +1,30 @@
+@CheckNeedAppointment
+Feature: Check if you need an appointment page
+  Scenario: The page is accessible
+    Given I am logged in
+    When I go to "/check-if-you-need-an-appointment"
+    Then there are no accessibility violations
+
+  Scenario: Form errors
+    Given I am logged in
+    When I go to "/check-if-you-need-an-appointment"
+    And I click "Continue"
+    Then I am on "/check-if-you-need-an-appointment"
+    And I see a form error "Select if you can continue online"
+    And there are no accessibility violations
+
+  Scenario: Eligibility exit if needs face to face appointment
+    Given I am logged in
+    When I go to "/check-if-you-need-an-appointment"
+    Then I see a back link to "/date-of-birth"
+    When I check "Yes, one or more of these things applies to me and I need a face-to-face appointment" and submit
+    Then I am on "/call-us-to-book-an-appointment"
+
+  Scenario: Navigating backwards and forwards
+    Given I am logged in
+    When I go to "/check-if-you-need-an-appointment"
+    Then I see a back link to "/date-of-birth"
+    When I check "No, I can continue online" and submit
+    Then I am on "/height"
+
+
diff --git a/features/date_of_birth_page.feature b/features/date_of_birth_page.feature
@@ -34,4 +34,4 @@ Feature: Date of birth page
     When I go to "/date-of-birth"
     Then I see a back link to "/have-you-ever-smoked"
     When I fill in and submit my date of birth as 55 years ago
-    Then I am on "/height"
+    Then I am on "/check-if-you-need-an-appointment"
diff --git a/features/environment.py b/features/environment.py
@@ -3,6 +3,7 @@
 behave-django handles test database setup automatically.
 We just need to add live server and Playwright setup.
 """
+from datetime import datetime
 import os
 from django.contrib.staticfiles.testing import StaticLiveServerTestCase  # noqa: E402
 from playwright.sync_api import sync_playwright  # noqa: E402
@@ -63,3 +64,8 @@ def after_scenario(context, _scenario):
         del context.page
 
     # behave-django automatically rolls back database transactions
+
+def after_step(context, step):
+    if step.status == "failed":
+        print(f"Error on step: {step.name}")
+        context.page.screenshot(full_page=True, path=f"screenshots/{datetime.now()}-screenshot.png")
diff --git a/features/height.feature b/features/height.feature
@@ -40,7 +40,7 @@ Feature: Height page
   Scenario: Navigating backwards and forwards
     Given I am logged in
     When I go to "/height"
-    Then I see a back link to "/date-of-birth"
+    Then I see a back link to "/check-if-you-need-an-appointment"
     When I fill in and submit my height with "170"
     Then I am on "/weight"
     When I click "Back"
diff --git a/features/questionnaire.feature b/features/questionnaire.feature
@@ -3,20 +3,23 @@ Feature: Questionnaire
     Given I am logged in
     And I have already submitted my responses
     When I go to "/start"
-    And I click "Start"
+    And I click "Start now"
     Then I am on "/start"
 
   Scenario: The user can complete the full questionnaire
     Given I am logged in
     When I go to "/start"
-    And I click "Start"
+    And I click "Start now"
 
     Then I am on "/have-you-ever-smoked"
     When I fill in and submit my smoking status with "Yes, I used to smoke"
 
     Then I am on "/date-of-birth"
     When I fill in and submit my date of birth as 55 years ago
 
+    Then I am on "/check-if-you-need-an-appointment"
+    When I check "No, I can continue online" and submit
+
     Then I am on "/height"
     When I click "Switch to feet and inches"
     And I fill in and submit my height with "5" feet and "7" inches
diff --git a/features/steps/form_steps.py b/features/steps/form_steps.py
@@ -2,6 +2,17 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 
+from features.steps.navigation_steps import when_i_click
+
+@when('I check "{value}" and submit')
+def when_i_check_value_and_submit(context, value):
+    context.page.get_by_label(value, exact=True).check()
+    when_i_submit_the_form(context)
+
+@when("I take a screenshot")
+@when("I take a screenshot {value}")
+def screenshot(context, value=""):
+    context.page.screenshot(full_page=True, path=f"screenshots/{datetime.now()}-{value}-screenshot.png")
 
 @when('I fill in and submit my smoking status with "{smoking_status}"')
 def when_i_fill_in_and_submit_my_smoking_status(context, smoking_status):
@@ -91,4 +102,4 @@ def when_i_fill_in_and_submit_my_cancer_diagnosis(context, relatives_age_when_di
 
 @when('I submit the form')
 def when_i_submit_the_form(context):
-    context.page.click("text=Continue")
+    when_i_click(context, "Continue")
diff --git a/features/steps/navigation_steps.py b/features/steps/navigation_steps.py
@@ -8,7 +8,7 @@ def given_i_go_to(context, path):
 
 @when('I click "{text}"')
 def when_i_click(context, text):
-    context.page.click(f"text={text}")
+    context.page.get_by_text(text, exact=True).click()
 
 @then('I am on "{path}"')
 def then_i_am_on(context, path):
diff --git a/lung_cancer_screening/questions/forms/check_need_appointment_form.py b/lung_cancer_screening/questions/forms/check_need_appointment_form.py
@@ -0,0 +1,29 @@
+from django import forms
+from ...nhsuk_forms.typed_choice_field import TypedChoiceField
+from ..models.check_need_appointment_response import CheckNeedAppointmentResponse
+
+
+class CheckNeedAppointmentForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+
+        self.fields["value"] = TypedChoiceField(
+            choices=[
+                (True, 'Yes, one or more of these things applies to me and I need a face-to-face appointment'),
+                (False, 'No, I can continue online')
+            ],
+            widget=forms.RadioSelect,
+            label="Do you need to leave the online service and ask for a face-to-face appointment?",
+            label_classes="nhsuk-fieldset__legend--m",
+            coerce=do_coerce,
+            error_messages={
+                'required': 'Select if you can continue online'
+            }
+        )
+
+    class Meta:
+        model = CheckNeedAppointmentResponse
+        fields = ['value']
+
+def do_coerce(value) :
+    return value == "True"
diff --git a/lung_cancer_screening/questions/jinja2/book_an_appointment.jinja b/lung_cancer_screening/questions/jinja2/book_an_appointment.jinja
@@ -0,0 +1,27 @@
+{% extends 'layout.jinja' %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+
+{% block beforeContent %}
+<nav>
+  {{
+    backLink({
+    "href": url("questions:check_need_appointment"),
+    "text": "Back"
+    })
+  }}
+</nav>
+{% endblock beforeContent %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+      <h1 class="nhsuk-heading-l">Call us to book an appointment</h1>
+
+      <p>A healthcare professional will check if you need a lung scan at your appointment.</p>
+      <p>They will take your height and weight measurements to calculate your body mass index (BMI).</p>
+      <p>Call us on 020 0000 0000 to book an appointment. If we do not hear from you in 2 weeks we will call you.</p>
+
+      {% include '_speak_to_a_gp_if.jinja' %}
+    </div>
+  </div>
+{% endblock %}
diff --git a/lung_cancer_screening/questions/jinja2/check_need_appointment.jinja b/lung_cancer_screening/questions/jinja2/check_need_appointment.jinja
@@ -0,0 +1,19 @@
+{% extends 'question_form.jinja' %}
+
+{% block prelude %}
+
+  <h1 class="nhsuk-heading-l">Check if you need a face-to-face appointment</h1>
+
+  <p>This online service uses automatic calculations based on your height and weight. This means it is not suitable for everyone.
+
+  <p>You need to do your questionnaire in person, not online, if you:
+
+  <div class="nhsuk-inset-text">
+    <ul>
+      <li>have a condition that affects your height
+      <li>have had a limb amputation, or were born with a limb difference
+      <li>have been diagnosed with an eating disorder, or think you may have one
+      <li>are pregnant
+  </div>
+
+{% endblock prelude %}
diff --git a/lung_cancer_screening/questions/jinja2/height.jinja b/lung_cancer_screening/questions/jinja2/height.jinja
@@ -12,7 +12,7 @@
 <nav>
   {{
     backLink({
-    "href": url("questions:date_of_birth"),
+    "href": url("questions:check_need_appointment"),
     "text": "Back"
     })
   }}
diff --git a/lung_cancer_screening/questions/migrations/0039_checkneedappointmentresponse.py b/lung_cancer_screening/questions/migrations/0039_checkneedappointmentresponse.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.2.9 on 2026-01-08 12:11
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0038_relativesagewhendiagnosedresponse_and_more'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CheckNeedAppointmentResponse',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('value', models.BooleanField()),
+                ('response_set', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='check_need_appointment_response', to='questions.responseset')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]
diff --git a/lung_cancer_screening/questions/models/__init__.py b/lung_cancer_screening/questions/models/__init__.py
@@ -1,15 +1,17 @@
 # Required to make migrations correctly generate.
 from .response_set import ResponseSet # noqa: F401
 from .user import User # noqa: F401
-from .have_you_ever_smoked_response import HaveYouEverSmokedResponse # noqa: F401
+
 from .asbestos_exposure_response import AsbestosExposureResponse # noqa: F401
+from .cancer_diagnosis_response import CancerDiagnosisResponse # noqa: F401
+from .check_need_appointment_response import CheckNeedAppointmentResponse # noqa: F401
 from .date_of_birth_response import DateOfBirthResponse # noqa: F401
 from .ethnicity_response import EthnicityResponse # noqa: F401
+from .family_history_lung_cancer_response import FamilyHistoryLungCancerResponse # noqa: F401
 from .gender_response import GenderResponse # noqa: F401
+from .have_you_ever_smoked_response import HaveYouEverSmokedResponse # noqa: F401
 from .height_response import HeightResponse # noqa: F401
+from .relatives_age_when_diagnosed_response import RelativesAgeWhenDiagnosedResponse # noqa: F401
 from .respiratory_conditions_response import RespiratoryConditionsResponse # noqa: F401
 from .sex_at_birth_response import SexAtBirthResponse # noqa: F401
 from .weight_response import WeightResponse # noqa: F401
-from .cancer_diagnosis_response import CancerDiagnosisResponse # noqa: F401
-from .family_history_lung_cancer_response import FamilyHistoryLungCancerResponse # noqa: F401
-from .relatives_age_when_diagnosed_response import RelativesAgeWhenDiagnosedResponse # noqa: F401
diff --git a/lung_cancer_screening/questions/models/check_need_appointment_response.py b/lung_cancer_screening/questions/models/check_need_appointment_response.py
@@ -0,0 +1,9 @@
+from django.db import models
+
+from .base import BaseModel
+from .response_set import ResponseSet
+
+
+class CheckNeedAppointmentResponse(BaseModel):
+    response_set = models.OneToOneField(ResponseSet, on_delete=models.CASCADE, related_name='check_need_appointment_response')
+    value = models.BooleanField()
diff --git a/lung_cancer_screening/questions/tests/factories/check_need_appointment_response_factory.py b/lung_cancer_screening/questions/tests/factories/check_need_appointment_response_factory.py
@@ -0,0 +1,12 @@
+import factory
+
+from .response_set_factory import ResponseSetFactory
+from ...models.check_need_appointment_response import CheckNeedAppointmentResponse
+
+
+class CheckNeedAppointmentResponseFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = CheckNeedAppointmentResponse
+
+    response_set = factory.SubFactory(ResponseSetFactory)
+    value = factory.Faker('boolean')
diff --git a/lung_cancer_screening/questions/tests/unit/forms/test_check_need_appointment_form.py b/lung_cancer_screening/questions/tests/unit/forms/test_check_need_appointment_form.py
@@ -0,0 +1,54 @@
+from django.test import TestCase, tag
+
+from ...factories.response_set_factory import ResponseSetFactory
+from ....models.check_need_appointment_response import CheckNeedAppointmentResponse
+from ....forms.check_need_appointment_form import CheckNeedAppointmentForm
+
+@tag("CheckNeedAppointment")
+class TestCheckNeedAppointmentForm(TestCase):
+    def setUp(self):
+        self.response_set = ResponseSetFactory()
+        self.response = CheckNeedAppointmentResponse.objects.create(
+            response_set=self.response_set,
+            value=False
+        )
+
+
+    def test_is_valid_with_a_valid_value(self):
+        form = CheckNeedAppointmentForm(
+            instance=self.response,
+            data={
+                "value": False
+            }
+        )
+        self.assertTrue(form.is_valid())
+        self.assertEqual(
+            form.cleaned_data["value"],
+            False
+        )
+
+    def test_is_invalid_with_an_invalid_value(self):
+        form = CheckNeedAppointmentForm(
+            instance=self.response,
+            data={
+                "value": "invalid"
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["value"],
+            ["Select a valid choice. invalid is not one of the available choices."]
+        )
+
+    def test_is_invalid_when_no_option_is_selected(self):
+        form = CheckNeedAppointmentForm(
+            instance=self.response,
+            data={
+                "value": None
+            }
+        )
+        self.assertFalse(form.is_valid())
+        self.assertEqual(
+            form.errors["value"],
+            ["Select if you can continue online"]
+        )
diff --git a/lung_cancer_screening/questions/tests/unit/models/test_check_need_appointment_response.py b/lung_cancer_screening/questions/tests/unit/models/test_check_need_appointment_response.py
@@ -0,0 +1,34 @@
+from django.test import TestCase, tag
+
+from ...factories.response_set_factory import ResponseSetFactory
+from ...factories.check_need_appointment_response_factory import CheckNeedAppointmentResponseFactory
+
+from ....models.check_need_appointment_response import CheckNeedAppointmentResponse
+
+@tag("CheckNeedAppointment")
+class TestCheckNeedAppointmentResponse(TestCase):
+    def setUp(self):
+        self.response_set = ResponseSetFactory()
+
+    def test_has_a_valid_factory(self):
+        model = CheckNeedAppointmentResponseFactory.build(response_set=self.response_set)
+        model.full_clean()
+
+
+    def test_has_response_set_as_foreign_key(self):
+        response_set = ResponseSetFactory()
+        response = CheckNeedAppointmentResponse.objects.create(
+            response_set=response_set,
+            value=True
+        )
+
+        self.assertEqual(response.response_set, response_set)
+
+    def test_has_value_as_bool(self):
+        response_set = ResponseSetFactory()
+        response = CheckNeedAppointmentResponse.objects.create(
+            response_set=response_set,
+            value=False
+        )
+
+        self.assertIsInstance(response.value, bool)
diff --git a/lung_cancer_screening/questions/tests/unit/views/test_check_need_appointment.py b/lung_cancer_screening/questions/tests/unit/views/test_check_need_appointment.py
diff --git a/lung_cancer_screening/questions/tests/unit/views/test_date_of_birth.py b/lung_cancer_screening/questions/tests/unit/views/test_date_of_birth.py
diff --git a/lung_cancer_screening/questions/urls.py b/lung_cancer_screening/questions/urls.py
diff --git a/lung_cancer_screening/questions/views/book_an_appointment.py b/lung_cancer_screening/questions/views/book_an_appointment.py
diff --git a/lung_cancer_screening/questions/views/check_need_appointment.py b/lung_cancer_screening/questions/views/check_need_appointment.py
diff --git a/lung_cancer_screening/questions/views/date_of_birth.py b/lung_cancer_screening/questions/views/date_of_birth.py
diff --git a/scripts/tests/ui.sh b/scripts/tests/ui.sh
