Remove bound choice from choice field

Author: jamiefalcus

lung_cancer_screening/nhsuk_forms/choice_field.py

@@ -1,16 +1,13 @@
 from django import forms
 from django.forms import widgets
 
-from .bound_choice_field import BoundChoiceField
-
 class ChoiceField(forms.ChoiceField):
     """
     A ChoiceField that renders using NHS.UK design system radios/select
     components.
     """
 
     widget = widgets.RadioSelect
-    bound_field_class = BoundChoiceField
 
     def __init__(
         self,

lung_cancer_screening/nhsuk_forms/jinja2/radios.jinja

@@ -5,20 +5,12 @@
 {% endif %}
 {% set ns = namespace(items=[]) %}
 {% for value, text in unbound_field.choices %}
-  {% set conditional_html = field.conditional_html(value) %}
   {% set ns.items = ns.items + [{
     "id": field.auto_id if loop.first,
     "value": value,
     "text": text,
-    "checked": field.value() == value,
-    "conditional": {
-      "html": conditional_html
-    } if conditional_html else undefined
+    "checked": field.value() == value
   }] %}
-  {% set divider = field.get_divider_after(value) %}
-  {% if divider %}
-    {% set ns.items = ns.items + [{"divider": divider}] %}
-  {% endif %}
 {% endfor %}
 {{ radios({
   "name": field.html_name,

lung_cancer_screening/nhsuk_forms/tests/unit/test_choice_field.py

@@ -38,41 +38,3 @@ def test_renders_nhs_radios(self):
             </div>
             """,
         )
-
-    def test_renders_radios_with_conditional_html(self):
-        form = TestForm()
-        form["field"].add_conditional_html("b", "<p>Hello</p>")
-
-        self.assertHTMLEqual(
-            form["field"].as_field_group(),
-            """
-            <div class="nhsuk-form-group">
-                <fieldset aria-describedby="id_field-hint" class="nhsuk-fieldset">
-                    <legend class="nhsuk-fieldset__legend app-abc">
-                        Abc
-                    </legend>
-                    <div class="nhsuk-hint" id="id_field-hint">
-                        Pick either one
-                    </div>
-                    <div class="nhsuk-radios nhsuk-radios--conditional" data-module="nhsuk-radios">
-                        <div class="nhsuk-radios__item">
-                            <input class="nhsuk-radios__input" id="id_field" name="field" type="radio" value="a">
-                            <label class="nhsuk-label nhsuk-radios__label" for="id_field">A</label>
-                        </div>
-                        <div class="nhsuk-radios__item">
-                            <input aria-controls="conditional-id_field-2" aria-expanded="false" class="nhsuk-radios__input" id="id_field-2" name="field" type="radio" value="b">
-                            <label class="nhsuk-label nhsuk-radios__label" for="id_field-2">B</label>
-                        </div>
-                        <div class="nhsuk-radios__conditional nhsuk-radios__conditional--hidden" id="conditional-id_field-2">
-                            <p>Hello</p>
-                        </div>
-                    </div>
-                </fieldset>
-            </div>
-            """,
-        )
-
-    def test_adding_dividers_via_boundfield(self):
-        bound_field = TestForm()["field"]
-        bound_field.add_divider_after("a", "or")
-        assert bound_field.get_divider_after("a") == "or"

lung_cancer_screening/nhsuk_forms/tests/unit/test_typed_choice_field.py

@@ -3,7 +3,6 @@
 
 from ...typed_choice_field import TypedChoiceField
 
-
 class TestForm(Form):
     field = TypedChoiceField(
         label="Abc",
@@ -39,41 +38,3 @@ def test_renders_nhs_radios(self):
             </div>
             """,
         )
-
-    def test_renders_radios_with_conditional_html(self):
-        form = TestForm()
-        form["field"].add_conditional_html("b", "<p>Hello</p>")
-
-        self.assertHTMLEqual(
-            form["field"].as_field_group(),
-            """
-            <div class="nhsuk-form-group">
-                <fieldset aria-describedby="id_field-hint" class="nhsuk-fieldset">
-                    <legend class="nhsuk-fieldset__legend app-abc">
-                        Abc
-                    </legend>
-                    <div class="nhsuk-hint" id="id_field-hint">
-                        Pick either one
-                    </div>
-                    <div class="nhsuk-radios nhsuk-radios--conditional" data-module="nhsuk-radios">
-                        <div class="nhsuk-radios__item">
-                            <input class="nhsuk-radios__input" id="id_field" name="field" type="radio" value="a">
-                            <label class="nhsuk-label nhsuk-radios__label" for="id_field">A</label>
-                        </div>
-                        <div class="nhsuk-radios__item">
-                            <input aria-controls="conditional-id_field-2" aria-expanded="false" class="nhsuk-radios__input" id="id_field-2" name="field" type="radio" value="b">
-                            <label class="nhsuk-label nhsuk-radios__label" for="id_field-2">B</label>
-                        </div>
-                        <div class="nhsuk-radios__conditional nhsuk-radios__conditional--hidden" id="conditional-id_field-2">
-                            <p>Hello</p>
-                        </div>
-                    </div>
-                </fieldset>
-            </div>
-            """,
-        )
-
-    def test_adding_dividers_via_boundfield(self):
-        bound_field = TestForm()["field"]
-        bound_field.add_divider_after("a", "or")
-        assert bound_field.get_divider_after("a") == "or"

lung_cancer_screening/questions/tests/unit/views/test_sex_at_birth.py

@@ -14,7 +14,7 @@ def setUp(self):
         session['participant_id'] = self.participant.unique_id
         session.save()
 
-    def test_get_redirects_if_the_particpant_does_not_exist(self):
+    def test_get_redirects_if_the_participant_does_not_exist(self):
         session = self.client.session
         session['participant_id'] = "somebody none existant participant"
         session.save()
@@ -35,7 +35,7 @@ def test_get_contains_the_correct_form_fields(self):
 
         self.assertContains(response, "What was your sex at birth?")
 
-    def test_post_redirects_if_the_particpant_does_not_exist(self):
+    def test_post_redirects_if_the_participant_does_not_exist(self):
         session = self.client.session
         session['participant_id'] = "somebody none existant participant"
         session.save()