Merge pull request #208 from NHSDigital/PPHA-484-age-range-dropout

PPHA-484: age range dropout

Author: Themitchell

lung_cancer_screening/questions/jinja2/_speak_to_a_gp_if.jinja

@@ -0,0 +1,19 @@
+<div class="nhsuk-do-dont-list">
+  <h3 class="nhsuk-do-dont-list__label">Speak to a GP if:</h3>
+    <p>You have any of the following symptoms:</p>
+
+    <ul class="nhsuk-list nhsuk-list--bullet" role="list">
+      <li>a <a href="https://www.nhs.uk/symptoms/cough/">cough</a> that does not go away after 3 weeks</li>
+      <li>a long-standing cough that gets worse</li>
+      <li><a href="https://www.nhs.uk/conditions/chest-infection/">chest infections</a> that keep coming back</li>
+      <li><a href="https://www.nhs.uk/symptoms/coughing-up-blood/">coughing up blood</a></li>
+      <li>an ache or pain when breathing or coughing</li>
+      <li>persistent <a href="https://www.nhs.uk/symptoms/shortness-of-breath/">breathlessness</a></li>
+      <li>persistent tiredness or lack of energy</li>
+      <li>loss of appetite or unexplained weight loss</li>
+    </ul>
+
+    <p>They could be <a href="https://www.nhs.uk/conditions/lung-cancer/symptoms/">symptoms of lung cancer</a>. Your GP will ask about your general health and your symptoms.</p>
+
+    <p>You may be asked to have a <a href="https://www.nhs.uk/tests-and-treatments/blood-tests/">blood test</a> to rule out some of the possible causes of your symptoms, such as a <a href="https://www.nhs.uk/conditions/chest-infection/">chest infection</a>.</p>
+</div>

lung_cancer_screening/questions/jinja2/age_range_exit.jinja

@@ -1,13 +1,26 @@
 {% extends 'layout.jinja' %}
-{% from 'nhsuk/components/button/macro.jinja' import button %}
-{% from 'nhsuk/components/input/macro.jinja' import input %}
+{% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
+
+{% block beforeContent %}
+<nav>
+  {{
+    backLink({
+    "href": url("questions:date_of_birth"),
+    "text": "Back"
+    })
+  }}
+</nav>
+{% endblock beforeContent %}
 
 {% 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>
+      <h2 class="title">You are not eligible for lung cancer screening</h2>
+
+      <p>NHS lung cancer screening is for people between the ages of 55 and 74.</p>
+      <p>According to the date of birth you have provided you are not in this age range.</p>
 
-      <p>The NHS lung health check is for people between the ages of 55 and 74.</p>
+      {% include '_speak_to_a_gp_if.jinja' %}
     </div>
   </div>
 {% endblock %}

lung_cancer_screening/questions/jinja2/non_smoker_exit.jinja

@@ -1,6 +1,4 @@
 {% extends 'layout.jinja' %}
-{% from 'nhsuk/components/button/macro.jinja' import button %}
-{% from 'nhsuk/components/input/macro.jinja' import input %}
 {% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
 
 {% block beforeContent %}
@@ -21,25 +19,7 @@
 
       <p>NHS lung cancer screening is for people who have smoked or are current smokers.</p>
 
-      <div class="nhsuk-do-dont-list">
-        <h3 class="nhsuk-do-dont-list__label">Speak to a GP if:</h3>
-          <p>You have any of the following symptoms:</p>
-
-          <ul class="nhsuk-list nhsuk-list--bullet" role="list">
-            <li>a <a href="https://www.nhs.uk/symptoms/cough/">cough</a> that does not go away after 3 weeks</li>
-            <li>a long-standing cough that gets worse</li>
-            <li><a href="https://www.nhs.uk/conditions/chest-infection/">chest infections</a> that keep coming back</li>
-            <li><a href="https://www.nhs.uk/symptoms/coughing-up-blood/">coughing up blood</a></li>
-            <li>an ache or pain when breathing or coughing</li>
-            <li>persistent <a href="https://www.nhs.uk/symptoms/shortness-of-breath/">breathlessness</a></li>
-            <li>persistent tiredness or lack of energy</li>
-            <li>loss of appetite or unexplained weight loss</li>
-          </ul>
-
-          <p>They could be <a href="https://www.nhs.uk/conditions/lung-cancer/symptoms/">symptoms of lung cancer</a>. Your GP will ask about your general health and your symptoms.</p>
-
-          <p>You may be asked to have a <a href="https://www.nhs.uk/tests-and-treatments/blood-tests/">blood test</a> to rule out some of the possible causes of your symptoms, such as a <a href="https://www.nhs.uk/conditions/chest-infection/">chest infection</a>.</p>
-      </div>
+      {% include '_speak_to_a_gp_if.jinja' %}
     </div>
   </div>
 {% endblock %}

tests/features/not_in_age_range.feature

@@ -5,4 +5,4 @@ Feature: Not in age range
     When I go to "/date-of-birth"
     And I fill in and submit my date of birth with "01-01-1900"
     Then I am on "/age-range-exit"
-    And I see a title "You do not need an NHS lung health check"
+    And I see a title "You are not eligible for lung cancer screening"