PPHA-403: Update to questionnaire framework

Author: jamiefalcus

.devcontainer/devcontainer.json

@@ -1,6 +1,8 @@
 {
   "name": "Ubuntu",
-  "image": "mcr.microsoft.com/devcontainers/base:noble",
+  "build": {
+    "dockerfile": "dockerfile"
+  },
   "features": {
     "ghcr.io/devcontainers/features/docker-in-docker:2": {
       "moby": true,
@@ -21,11 +23,14 @@
       "installOhMyZshConfig": true,
       "configureZshAsDefaultShell": true
     },
+    "ghcr.io/devcontainers/features/terraform:1": {},
     "ghcr.io/devcontainers-extra/features/zsh-plugins:0": {
       "plugins": "zsh-autosuggestions zsh-syntax-highlighting",
       "omzPlugins": "https://github.com/zsh-users/zsh-autosuggestions.git https://github.com/zsh-users/zsh-syntax-highlighting.git"
     }
   },
+  "workspaceMount": "source=./,target=/app,type=bind,consistency=cached",
+  "workspaceFolder": "/app",
   "postCreateCommand": "pipx install pre-commit && make config && echo 'export GPG_TTY=$TTY' | cat - ~/.zshrc > temp && mv temp ~/.zshrc",
   "mounts": [
     "source=${localEnv:HOME}/.gnupg,target=/home/vscode/.gnupg,type=bind,consistency=cached"

.devcontainer/dockerfile

@@ -0,0 +1,5 @@
+FROM mcr.microsoft.com/devcontainers/base:noble
+
+COPY *.crt /usr/local/share/ca-certificates/
+
+RUN update-ca-certificates

lung_cancer_screening/core/tests/acceptance/test_cannot_change_answers_after_submission.py

@@ -46,7 +46,11 @@ def test_cannot_change_responses_once_checked_and_submitted(self):
         fill_in_and_submit_sex_at_birth(page, "Male")
         fill_in_and_submit_gender(page, "Male")
         fill_in_and_submit_ethnicity(page, "White")
-
+        page.click("text=Continue")
+        page.click("text=Continue")
+        page.click("text=Continue")
+        page.click("text=Continue")
+        page.click("text=Continue")
         page.click("text=Submit")
 
         page.goto(f"{self.live_server_url}/start")

lung_cancer_screening/core/tests/acceptance/test_questionnaire.py

@@ -87,16 +87,34 @@ def test_full_questionnaire_user_journey(self):
 
         expect(page).to_have_url(f"{self.live_server_url}/ethnicity")
         expect_back_link_to_have_url(page, "/gender")
-
         fill_in_and_submit_ethnicity(page, "White")
 
-        expect(page).to_have_url(f"{self.live_server_url}/responses")
+        expect(page).to_have_url(f"{self.live_server_url}/education")
         expect_back_link_to_have_url(page, "/ethnicity")
+        page.click("text=Continue")
+
+        expect(page).to_have_url(f"{self.live_server_url}/respiratory-conditions")
+        expect_back_link_to_have_url(page, "/education")
+        page.click("text=Continue")
+
+        expect(page).to_have_url(f"{self.live_server_url}/asbestos-exposure")
+        expect_back_link_to_have_url(page, "/respiratory-conditions")
+        page.click("text=Continue")
+
+        expect(page).to_have_url(f"{self.live_server_url}/cancer-diagnosis")
+        expect_back_link_to_have_url(page, "/asbestos-exposure")
+        page.click("text=Continue")
+
+        expect(page).to_have_url(f"{self.live_server_url}/family-history-lung-cancer")
+        expect_back_link_to_have_url(page, "/cancer-diagnosis")
+        page.click("text=Continue")
+
+        expect(page).to_have_url(f"{self.live_server_url}/responses")
+        expect_back_link_to_have_url(page, "/family-history-lung-cancer")
 
         responses = page.locator(".responses")
         expect(responses).to_contain_text("Have you ever smoked? Yes, I used to smoke regularly")
-        expect(responses).to_contain_text(
-            age.strftime("What is your date of birth? %Y-%m-%d"))
+        expect(responses).to_contain_text(age.strftime("What is your date of birth? %Y-%m-%d"))
         expect(responses).to_contain_text(f"What is your height? {feet} feet {inches} inches")
         expect(responses).to_contain_text(f"What is your weight? {weight_stone} stone {weight_pound} pound")
         expect(responses).to_contain_text("What was your sex at birth? Male")

lung_cancer_screening/questions/forms/gender_form.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from ...nhsuk_forms.typed_choice_field import TypedChoiceField
+from ...nhsuk_forms.choice_field import ChoiceField
 from ..models.response_set import ResponseSet, GenderValues
 
 class GenderForm(forms.ModelForm):
@@ -10,7 +10,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.instance.participant = self.participant
 
-        self.fields["gender"] = TypedChoiceField(
+        self.fields["gender"] = ChoiceField(
             choices=GenderValues.choices,
             widget=forms.RadioSelect,
             label="Which of these best describes you?",

lung_cancer_screening/questions/forms/sex_at_birth_form.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from ...nhsuk_forms.typed_choice_field import TypedChoiceField
+from ...nhsuk_forms.choice_field import ChoiceField
 from ..models.response_set import ResponseSet, SexAtBirthValues
 
 class SexAtBirthForm(forms.ModelForm):
@@ -10,7 +10,7 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.instance.participant = self.participant
 
-        self.fields["sex_at_birth"] = TypedChoiceField(
+        self.fields["sex_at_birth"] = ChoiceField(
             choices=SexAtBirthValues.choices,
             widget=forms.RadioSelect,
             label="What was your sex at birth?",

lung_cancer_screening/questions/jinja2/date_of_birth.jinja

@@ -4,50 +4,47 @@
 {% from 'nhsuk/components/fieldset/macro.jinja' import fieldset %}
 
 {% block beforeContent %}
-  {{
-    backLink({
-      "href": url("questions:date_of_birth"),
-      "text": "Back"
-    })
-  }}
+{{
+backLink({
+"href": url("questions:date_of_birth"),
+"text": "Back"
+})
+}}
 {% endblock beforeContent %}
 
 {% block page_content %}
-  <div class="nhsuk-grid-row">
-    <div class="nhsuk-grid-column-two-thirds">
-      {% if unit %}
-        {% set action_url = request.path + '?unit=' + unit %}
-      {% else %}
-        {% set action_url = request.path %}
-      {% endif %}
-      <form action="{{ action_url }}" method="POST" novalidate>
-        {{ csrf_input }}
-        <h1 class="nhsuk-heading-l">What is your height?</h1>
-        <p>An accurate measurement is important.
-
-        <p>You can measure your height at home with a measuring tape. Some pharmacies and gyms have machines to measure your height.
+<div class="nhsuk-grid-row">
+  <div class="nhsuk-grid-column-two-thirds">
+    <form action="{{ request.get_full_path() }}" method="POST" novalidate>
+      {{ csrf_input }}
+      <h1 class="nhsuk-heading-l">What is your height?</h1>
+      <p>An accurate measurement is important.
+
+      <p>You can measure your height at home with a measuring tape. Some pharmacies and gyms have machines to measure
+        your height.
         {% call fieldset({
           "legend": {
             "text": "Enter your height",
             "classes": "nhsuk-label--m"
           }
-        }) %}
+        })
+        %}
 
-          {% if unit == "imperial" %}
-            {{ form.height_imperial.as_field_group() }}
-          {% else %}
-            {{ form.height.as_field_group() }}
-          {% endif %}
+        {% if unit == "imperial" %}
+          {{ form.height_imperial.as_field_group() }}
+        {% else %}
+          {{ form.height.as_field_group() }}
+        {% endif %}
 
 
-          <p><a href="?unit={{ switch_to_unit }}">Switch to {{ switch_to_unit }}</a></p>
+      <p><a href="?unit={{ switch_to_unit }}">Switch to {{ switch_to_unit }}</a></p>
 
-        {% endcall %}
+      {% endcall %}
 
-        {{ button({
-            "text": "Continue"
-        }) }}
-      </form>
-    </div>
+      {{ button({
+      "text": "Continue"
+      }) }}
+    </form>
   </div>
+</div>
 {% endblock %}

lung_cancer_screening/questions/jinja2/gender.jinja

@@ -1,11 +1,16 @@
 {% extends 'layout.jinja' %}
+
 {% from 'nhsuk/components/button/macro.jinja' import button %}
 {% from 'nhsuk/components/back-link/macro.jinja' import backLink %}
 
+{% if error %}
+  {% set error_message = { "text": error } %}
+{% endif %}
+
 {% block beforeContent %}
   {{
     backLink({
-      "href": url("questions:gender"),
+      "href": back_link_url,
       "text": "Back"
     })
   }}