Show question asked and responses in response template

Author: Themitchell

lung_cancer_screening/core/tests/acceptance/test_participant_not_smoker.py

@@ -0,0 +1,43 @@
+import os
+from django.contrib.staticfiles.testing import StaticLiveServerTestCase
+from playwright.sync_api import sync_playwright, expect
+
+
+class TestParticipantNotSmoker(StaticLiveServerTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true"
+        super().setUpClass()
+        cls.playwright = sync_playwright().start()
+        cls.browser = cls.playwright.chromium.launch()
+
+    @classmethod
+    def tearDownClass(cls):
+        super().tearDownClass()
+        cls.browser.close()
+        cls.playwright.stop()
+
+    def test_participant_not_smoker(self):
+        participant_id = '123'
+
+        page = self.browser.new_page()
+        page.goto(f"{self.live_server_url}/start")
+
+        page.fill("input[name='participant_id']", participant_id)
+
+        page.click('text=Start now')
+
+        expect(page).to_have_url(f"{self.live_server_url}/have-you-ever-smoked")
+
+        expect(page.locator("legend")).to_have_text(
+            "Have you ever smoked?")
+
+        page.get_by_label('No').check()
+
+        page.click("text=Continue")
+
+        expect(page).to_have_url(f"{self.live_server_url}/non-smoker-exit")
+
+        expect(page.locator(".title")).to_have_text(
+            "You do not need an NHS lung health check")

…acceptance/test_user_out_of_age_range.py …nce/test_participant_out_of_age_range.pylung_cancer_screening/core/tests/acceptance/test_user_out_of_age_range.py renamed to lung_cancer_screening/core/tests/acceptance/test_participant_out_of_age_range.py lung_cancer_screening/core/tests/acceptance/test_user_out_of_age_range.py renamed to lung_cancer_screening/core/tests/acceptance/test_participant_out_of_age_range.py

@@ -5,7 +5,7 @@
 from dateutil.relativedelta import relativedelta
 
 
-class TestQuestionnaire(StaticLiveServerTestCase):
+class TestParticipantOutOfAgeRange(StaticLiveServerTestCase):
 
     @classmethod
     def setUpClass(cls):
@@ -30,6 +30,16 @@ def test_participant_out_of_age_range(self):
 
         page.click('text=Start now')
 
+        expect(page).to_have_url(
+            f"{self.live_server_url}/have-you-ever-smoked")
+
+        expect(page.locator("legend")).to_have_text(
+            "Have you ever smoked?")
+
+        page.get_by_label('Yes').check()
+
+        page.click("text=Continue")
+
         expect(page).to_have_url(f"{self.live_server_url}/date-of-birth")
 
         expect(page.locator("legend")).to_have_text(

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -29,6 +29,16 @@ def test_full_questionaire_user_journey(self):
 
         page.click('text=Start now')
 
+        expect(page).to_have_url(
+            f"{self.live_server_url}/have-you-ever-smoked")
+
+        expect(page.locator("legend")).to_have_text(
+            "Have you ever smoked?")
+
+        page.get_by_label('Yes').check()
+
+        page.click("text=Continue")
+
         expect(page).to_have_url(f"{self.live_server_url}/date-of-birth")
 
         expect(page.locator("legend")).to_have_text(
@@ -44,4 +54,6 @@ def test_full_questionaire_user_journey(self):
 
         expect(page).to_have_url(f"{self.live_server_url}/responses")
 
-        expect(page.locator(".responses")).to_have_text(age.strftime("%Y-%m-%d"))
+        expect(page.locator(".responses")).to_contain_text(
+            age.strftime("Have you ever smoked? True"))
+        expect(page.locator(".responses")).to_contain_text(age.strftime("What is your date of birth? %Y-%m-%d"))

lung_cancer_screening/questions/jinja2/date_of_birth.jinja

@@ -8,6 +8,7 @@
     <div class="nhsuk-grid-column-two-thirds">
       <form action="{{ request.path }}" method="POST">
         {{ csrf_input }}
+
         {{ dateInput({
           "fieldset": {
             "legend": {

lung_cancer_screening/questions/jinja2/have_you_ever_smoked.jinja

@@ -0,0 +1,40 @@
+{% extends 'layout.jinja' %}
+{% from 'button/macro.jinja' import button %}
+{% from 'radios/macro.jinja' import radios %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+      <form action="{{ request.path }}" method="POST">
+        {{ csrf_input }}
+
+        {{ radios({
+          "name": "value",
+          "fieldset": {
+            "legend": {
+              "text": "Have you ever smoked?",
+              "classes": "nhsuk-fieldset__legend--l",
+              "isPageHeading": true
+            }
+          },
+          "items": [
+            {
+              "value": "1",
+              "text": "Yes"
+            },
+            {
+              "value": "0",
+              "text": "No"
+            }
+          ]
+        }) }}
+
+        <input type="hidden" name="participant_id" value="{{ participant_id }}">
+
+        {{ button({
+            "text": "Continue"
+        }) }}
+      </form>
+    </div>
+  </div>
+{% endblock %}

lung_cancer_screening/questions/jinja2/non_smoker_exit.jinja

@@ -0,0 +1,13 @@
+{% extends 'layout.jinja' %}
+{% from 'button/macro.jinja' import button %}
+{% from 'input/macro.jinja' import input %}
+
+{% block content %}
+  <div class="nhsuk-grid-row">
+    <div class="nhsuk-grid-column-two-thirds">
+      <h2 class="title">You do not need an NHS lung health check</h2>
+
+      <p>The NHS lung health check is for people who have smoked or are current smokers.</p>
+    </div>
+  </div>
+{% endblock %}

lung_cancer_screening/questions/jinja2/responses.jinja

@@ -6,8 +6,8 @@
     <div class="nhsuk-grid-column-two-thirds">
       <h1 class="nhsuk-heading-l">Responses</h1>
       <ul class="responses">
-        {% for questionnaire_response in questionnaire_responses %}
-          <li>{{ questionnaire_response.value }}</li>
+        {% for response in responses %}
+          <li>{{ response.question }} {{ response.value }}</li>
         {% endfor %}
       </ul>
     </div>

lung_cancer_screening/questions/migrations/0002_booleanresponse.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.2.4 on 2025-09-03 16:03
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='BooleanResponse',
+            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()),
+                ('participant', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='questions.participant')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

lung_cancer_screening/questions/migrations/0003_booleanresponse_question_and_more.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.2.4 on 2025-09-04 10:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0002_booleanresponse'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='BooleanResponse',
+            name='question',
+            field=models.CharField(null='Have you ever smoked?', max_length=255),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='QuestionnaireResponse',
+            name='question',
+            field=models.CharField(default='What is your date of birth?', max_length=255),
+            preserve_default=False,
+        ),
+    ]

lung_cancer_screening/questions/migrations/0004_rename_questionnaireresponse_to_dateresponse.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2.4 on 2025-09-04 10:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('questions', '0003_booleanresponse_question_and_more'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='QuestionnaireResponse',
+            new_name='DateResponse',
+        ),
+
+    ]