Merge pull request #399 from NHSDigital/dtoss-10724-form-builder-refactor

[DTOSS-10724] form builder refactor

Author: MatMoore

manage_breast_screening/config/settings.py

@@ -64,6 +64,7 @@ def boolean_env(key, default=None):
     "manage_breast_screening.core",
     "manage_breast_screening.auth",
     "manage_breast_screening.clinics",
+    "manage_breast_screening.nhsuk_forms",
     "manage_breast_screening.notifications",
     "manage_breast_screening.participants",
     "manage_breast_screening.mammograms",

manage_breast_screening/core/jinja2/forms/split_date_field.jinja

@@ -1,6 +1,6 @@
 from django import forms
 
-from manage_breast_screening.core.form_fields import (
+from manage_breast_screening.nhsuk_forms.fields import (
     CharField,
     ChoiceField,
     MultipleChoiceField,
@@ -44,7 +44,6 @@ def __init__(self, *args, **kwargs):
 
     stopped_reasons = MultipleChoiceField(
         label="Why has this appointment been stopped?",
-        label_classes="nhsuk-fieldset__legend--m",
         hint="Select all that apply",
         choices=STOPPED_REASON_CHOICES,
         required=True,
@@ -55,7 +54,6 @@ def __init__(self, *args, **kwargs):
 
     decision = ChoiceField(
         label="Does the appointment need to be rescheduled?",
-        label_classes="nhsuk-fieldset__legend--m",
         choices=(
             ("True", "Yes, add participant to reinvite list"),
             ("False", "No"),

manage_breast_screening/mammograms/forms/appointment_cannot_go_ahead_form.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from manage_breast_screening.core.form_fields import ChoiceField
+from manage_breast_screening.nhsuk_forms.fields import ChoiceField
 
 
 class AskForMedicalInformationForm(forms.Form):

manage_breast_screening/mammograms/forms/ask_for_medical_information_form.py

@@ -1,6 +1,6 @@
 from django import forms
 
-from manage_breast_screening.core.form_fields import ChoiceField
+from manage_breast_screening.nhsuk_forms.fields import ChoiceField
 
 
 class RecordMedicalInformationForm(forms.Form):

manage_breast_screening/mammograms/forms/record_medical_information_form.py

@@ -1,12 +1,11 @@
 from django import forms
 
-from manage_breast_screening.core.form_fields import ChoiceField
+from manage_breast_screening.nhsuk_forms.fields import ChoiceField
 
 
 class ScreeningAppointmentForm(forms.Form):
     decision = ChoiceField(
         label="Can the appointment go ahead?",
-        label_classes="nhsuk-fieldset__legend--m",
         hint="Before you proceed, check the participant’s identity and confirm that their last mammogram was more than 6 months ago.",
         choices=(
             ("continue", "Yes, go to medical information"),

manage_breast_screening/mammograms/forms/screening_appointment_form.py

@@ -2,7 +2,7 @@
 from django.db.models import TextChoices
 from django.forms import Textarea
 
-from manage_breast_screening.core.form_fields import (
+from manage_breast_screening.nhsuk_forms.fields import (
     CharField,
     ChoiceField,
     MultipleChoiceField,
@@ -34,7 +34,6 @@ def __init__(self, *args, participant, **kwargs):
         # a special appointment.
         self.fields["support_reasons"] = MultipleChoiceField(
             label=f"Why does {participant.full_name} need additional support?",
-            label_classes="nhsuk-fieldset__legend--m",
             hint="Select all that apply. When describing support required, include any special requests made by the participant or their carer.",
             choices=self.SupportReasons,  # type: ignore
             required=("support_reasons" not in self.initial),
@@ -54,7 +53,6 @@ def __init__(self, *args, participant, **kwargs):
 
         self.fields["any_temporary"] = ChoiceField(
             label="Are any of these reasons temporary?",
-            label_classes="nhsuk-fieldset__legend--m",
             hint="This includes issues that are likely to be resolved by their next mammogram, for example a broken foot or a short-term eye problem.",
             choices=self.TemporaryChoices,  # type: ignore
             required=True,

manage_breast_screening/mammograms/forms/special_appointment_forms.py

@@ -0,0 +1,6 @@
+from django.db.models import TextChoices
+
+
+class YesNo(TextChoices):
+    YES = ("YES", "Yes")
+    NO = ("NO", "No")

manage_breast_screening/nhsuk_forms/__init__.py

@@ -0,0 +1,14 @@
+from .boolean_field import BooleanField
+from .char_field import CharField
+from .choice_fields import ChoiceField, MultipleChoiceField
+from .integer_field import IntegerField
+from .split_date_field import SplitDateField
+
+__all__ = [
+    "BooleanField",
+    "CharField",
+    "IntegerField",
+    "ChoiceField",
+    "MultipleChoiceField",
+    "SplitDateField",
+]