@@ -50,6 +50,18 @@ class ResponseForm(ModelForm):
50
50
mandatory_if_no = ["private_notes" ]
51
51
mandatory_if_response = ["public_notes" , "page_number" , "evidence" , "private_notes" ]
52
52
53
+ def get_mandatory_fields (self ):
54
+ mandatory_fields = settings .MANDATORY_FIELDS .get (self .session .label , {})
55
+
56
+ if mandatory_fields .get (self .question_obj .number_and_part ):
57
+ mandatory_fields = mandatory_fields [self .question_obj .number_and_part ]
58
+
59
+ if mandatory_fields .get ("mandatory_if_response" ) is not None :
60
+ self .mandatory_if_response = mandatory_fields ["mandatory_if_response" ]
61
+
62
+ if mandatory_fields .get ("mandatory_if_no" ) is not None :
63
+ self .mandatory_if_no = mandatory_fields ["mandatory_if_no" ]
64
+
53
65
def __init__ (self , * args , ** kwargs ):
54
66
super ().__init__ (* args , ** kwargs )
55
67
@@ -79,13 +91,7 @@ def __init__(self, *args, **kwargs):
79
91
if form_hints .get (field ):
80
92
self .fields [field ].help_text = form_hints [field ]
81
93
82
- mandatory_fields = settings .MANDATORY_FIELDS .get (self .session .label , {})
83
-
84
- if mandatory_fields .get ("mandatory_if_response" ) is not None :
85
- self .mandatory_if_response = mandatory_fields ["mandatory_if_response" ]
86
-
87
- if mandatory_fields .get ("mandatory_if_no" ) is not None :
88
- self .mandatory_if_no = mandatory_fields ["mandatory_if_no" ]
94
+ self .get_mandatory_fields ()
89
95
90
96
def clean_page_number (self ):
91
97
page_number = self .cleaned_data ["page_number" ]
0 commit comments