Create body of smoking page and update options

Author: jamiefalcus

lung_cancer_screening/questions/forms/have_you_ever_smoked_form.py

@@ -15,8 +15,11 @@ def __init__(self, *args, **kwargs):
             widget=forms.RadioSelect,
             label="Have you ever smoked?",
             label_classes="nhsuk-fieldset__legend--m",
-            label_is_page_heading=True,
-            coerce=int
+            hint="This includes social smoking",
+            coerce=int,
+            error_messages={
+                'required': 'Select if you have ever smoked'
+            }
         )
 
     class Meta:

lung_cancer_screening/questions/jinja2/have_you_ever_smoked.jinja

@@ -1,29 +1,19 @@
-{% extends 'layout.jinja' %}
-{% from 'nhsuk/components/button/macro.jinja' import button %}
-{% from 'nhsuk/components/radios/macro.jinja' import radios %}
-{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+{% extends 'question_form.jinja' %}
 
-{% block beforeContent %}
-    {{
-      backLink({
-        "href": url("questions:start"),
-        "text": "Back"
-      })
-    }}
-{% endblock beforeContent %}
+{% block prelude %}
 
-{% block content %}
-  <div class="nhsuk-grid-row">
-    <div class="nhsuk-grid-column-two-thirds">
-      <form action="{{ request.path }}" method="POST">
-        {{ csrf_input }}
+  <h1 class="nhsuk-heading-l">Tobacco smoking</h1>
 
-        {{ form.have_you_ever_smoked.as_field_group() }}
+  <p>We will ask you questions about your smoking habits. This includes different types of tobacco smoking such as:
 
-        {{ button({
-            "text": "Continue"
-        }) }}
-      </form>
-    </div>
-  </div>
-{% endblock %}
+  <ul>
+    <li>cigarettes from a packet</li>
+    <li>rolled cigarettes, or roll ups</li>
+    <li>a pipe</li>
+    <li>cigars</li>
+    <li>hookah or shisha</li>
+  </ul>
+
+  <p>It does not currently include vaping or e-cigarettes.
+
+{% endblock prelude %}

lung_cancer_screening/questions/jinja2/question_form.jinja

@@ -13,6 +13,9 @@
       <form action="{{ request.path }}" method="POST">
         {{ csrf_input }}
 
+        {% block prelude %}
+        {% endblock%}
+
         {{ form }}
 
         {{ button({

lung_cancer_screening/questions/models/response_set.py

@@ -11,8 +11,8 @@
 
 class HaveYouEverSmokedValues(models.IntegerChoices):
     YES_I_CURRENTLY_SMOKE = 0, 'Yes, I currently smoke'
-    YES_I_USED_TO_SMOKE_REGULARLY = 1, 'Yes, I used to smoke regularly'
-    YES_BUT_ONLY_A_FEW_TIMES = 2, 'Yes, but only a few times'
+    YES_I_USED_TO_SMOKE_REGULARLY = 1, 'Yes, I used to smoke'
+    YES_BUT_ONLY_A_FEW_TIMES = 2, 'Yes, but I have smoked fewer than 100 cigarettes in my lifetime'
     NO_I_HAVE_NEVER_SMOKED = 3, 'No, I have never smoked'
 
 class SexAtBirthValues(models.TextChoices):

lung_cancer_screening/questions/views/have_you_ever_smoked.py

@@ -40,11 +40,10 @@ def post(self, request):
                 status=422
             )
 
-
 def render_template(request, form, status=200):
     return render(
         request,
-        "question_form.jinja",
+        "have_you_ever_smoked.jinja",
         {
             "form": form,
             "back_link_url": reverse("questions:start")

tests/features/questionnaire.feature

@@ -4,7 +4,7 @@ Feature: Questionnaire
     And I submit my participant id
     Then I am on "/have-you-ever-smoked"
     And I see a back link to "/start"
-    When I fill in and submit my smoking status with "Yes, I used to smoke regularly"
+    When I fill in and submit my smoking status with "Yes, I used to smoke"
     Then I am on "/date-of-birth"
     And I see a back link to "/have-you-ever-smoked"
     When I fill in and submit my date of birth as 55 years ago
@@ -46,7 +46,7 @@ Feature: Questionnaire
     When I click "Continue"
     Then I am on "/responses"
     And I see a back link to "/family-history-lung-cancer"
-    And I see responses "Have you ever smoked? Yes, I used to smoke regularly"
+    And I see responses "Have you ever smoked? Yes, I used to smoke"
     And I see responses "What is your date of birth?" with a date 55 years ago
     And I see responses "What is your height? 5 feet 7 inches"
     And I see responses "What is your weight? 5 stone 10 pounds"