Move BoundFormField to nhsuk_forms

Author: Themitchell

lung_cancer_screening/core/form_fields.py

@@ -33,102 +33,6 @@ def widget_attrs(self, widget):
         return attrs
 
 
-class BoundChoiceField(forms.BoundField):
-    """
-    Specialisation of BoundField that can deal with conditionally shown fields,
-    and divider content between choices.
-    This can be used to render a set of radios or checkboxes with text boxes to capture
-    more details.
-    """
-
-    def __init__(self, form: forms.Form, field: "ChoiceField", name: str):
-        super().__init__(form, field, name)
-
-        self._conditional_html = {}
-        self.dividers = {}
-
-    def add_conditional_html(self, value, html):
-        if isinstance(self.field.widget, widgets.Select):
-            raise ValueError(
-                "select component does not support conditional fields")
-
-        self._conditional_html[value] = html
-
-    def conditional_html(self, value):
-        return self._conditional_html.get(value)
-
-    def add_divider_after(self, previous, divider):
-        self.dividers[previous] = divider
-
-    def get_divider_after(self, previous):
-        return self.dividers.get(previous)
-
-
-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,
-        *args,
-        hint=None,
-        label_classes=None,
-        classes=None,
-        **kwargs,
-    ):
-        kwargs["template_name"] = ChoiceField._template_name(
-            kwargs.get("widget", self.widget)
-        )
-
-        self.hint = hint
-        self.classes = classes
-        self.label_classes = label_classes
-
-        super().__init__(*args, **kwargs)
-
-    @staticmethod
-    def _template_name(widget):
-        if (isinstance(widget, type) and widget is widgets.RadioSelect) or isinstance(
-            widget, widgets.RadioSelect
-        ):
-            return "forms/radios.jinja"
-        elif (isinstance(widget, type) and widget is widgets.Select) or isinstance(
-            widget, widgets.Select
-        ):
-            return "forms/select.jinja"
-
-
-class MultipleChoiceField(forms.MultipleChoiceField):
-    """
-    A MultipleChoiceField that renders using the NHS.UK design system checkboxes
-    component.
-    """
-
-    widget = widgets.CheckboxSelectMultiple
-    bound_field_class = BoundChoiceField
-
-    def __init__(
-        self,
-        *args,
-        hint=None,
-        label_classes=None,
-        classes=None,
-        **kwargs,
-    ):
-        kwargs["template_name"] = "forms/checkboxes.jinja"
-
-        self.hint = hint
-        self.classes = classes
-        self.label_classes = label_classes
-
-        super().__init__(*args, **kwargs)
-
-
 class ImperialHeightWidget(widgets.MultiWidget):
     """
     A widget that splits height into feet and inches inputs.

lung_cancer_screening/core/tests/unit/not_test_form_fields.py

@@ -0,0 +1,34 @@
+from django import forms
+from django.forms import widgets
+from django.utils.translation import gettext_lazy as _
+
+
+class BoundChoiceField(forms.BoundField):
+    """
+    Specialisation of BoundField that can deal with conditionally shown fields,
+    and divider content between choices.
+    This can be used to render a set of radios or checkboxes with text boxes to capture
+    more details.
+    """
+
+    def __init__(self, form: forms.Form, field: "ChoiceField", name: str):
+        super().__init__(form, field, name)
+
+        self._conditional_html = {}
+        self.dividers = {}
+
+    def add_conditional_html(self, value, html):
+        if isinstance(self.field.widget, widgets.Select):
+            raise ValueError(
+                "select component does not support conditional fields")
+
+        self._conditional_html[value] = html
+
+    def conditional_html(self, value):
+        return self._conditional_html.get(value)
+
+    def add_divider_after(self, previous, divider):
+        self.dividers[previous] = divider
+
+    def get_divider_after(self, previous):
+        return self.dividers.get(previous)

lung_cancer_screening/nhsuk_forms/bound_choice_field.py

@@ -2,7 +2,7 @@
 from django.forms import widgets
 from django.utils.translation import gettext_lazy as _
 
-from lung_cancer_screening.core.form_fields import BoundChoiceField
+from .bound_choice_field import BoundChoiceField
 
 class ChoiceField(forms.ChoiceField):
     """

lung_cancer_screening/nhsuk_forms/choice_field.py

@@ -3,7 +3,7 @@
 from django.forms import widgets
 from django.utils.translation import gettext_lazy as _
 
-from lung_cancer_screening.core.form_fields import BoundChoiceField
+from .bound_choice_field import BoundChoiceField
 
 class TypedChoiceField(forms.TypedChoiceField):
     """