Changeset 17597

Timestamp:

28 Sep 2023, 07:36:15 (15 months ago)

Author:

Henrik Bettermann

Message:

Set required fields in views not in interfaces.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• browser.py (modified) (2 diffs)
• interfaces.py (modified) (8 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser.py

@@ -572 +572 @@
             form_fields['courier_tno'].for_display = True
             form_fields['proc_date'].for_display = True
-            for field in TRANS_OMIT_EDIT_FIELDS:
-                form_fields = form_fields.omit(field)
             if state == PAID:
                 form_fields['order'].for_display = True
             form_fields = form_fields.omit('locked')
+
+            form_fields['date_of_birth'].field.required = True
+            #form_fields['nationality'].field.required = True
+            form_fields['email'].field.required = True
+            form_fields['phone'].field.required = True
+            form_fields['dispatch_address'].field.required = True
+            form_fields['entry_mode'].field.required = True
+            form_fields['entry_session'].field.required = True
+            form_fields['end_session'].field.required = True
+            form_fields['course_studied'].field.required = True
+            form_fields['collected'].field.required = True
+            form_fields['order'].field.required = True
+            form_fields['charge'].field.required = True
+            form_fields['no_copies'].field.required = True
+
+            for field in TRANS_OMIT_EDIT_FIELDS:
+                form_fields = form_fields.omit(field)
             return form_fields
         if self.target is not None and self.target == 'tscs':
@@ -582 +597 @@
             form_fields['courier_tno'].for_display = True
             form_fields['proc_date'].for_display = True
+
+            form_fields['date_of_birth'].field.required = True
+            #form_fields['nationality'].field.required = True
+            form_fields['email'].field.required = True
+            form_fields['phone'].field.required = True
+            form_fields['dispatch_address'].field.required = True
+            form_fields['entry_mode'].field.required = True
+            form_fields['entry_session'].field.required = True
+            form_fields['end_session'].field.required = True
+            form_fields['course_studied'].field.required = True
+            form_fields['collected'].field.required = True
+            form_fields['order'].field.required = True
+            form_fields['charge'].field.required = True
+            form_fields['no_copies'].field.required = True
+
             for field in TRANS_SHORT_OMIT_EDIT_FIELDS:
                 form_fields = form_fields.omit(field)

main/waeup.uniben/trunk/src/waeup/uniben/applicants/interfaces.py

@@ -335 +335 @@
     date_of_birth = FormattedDate(
         title = _(u'Date of Birth'),
-        required = True,
+        required = False,
         #date_format = u'%d/%m/%Y', # Use grok-instance-wide default
         show_year = True,
@@ -373 +373 @@
         title = _(u'Have you collected transcript before?'),
         default = False,
-        required = True,
+        required = False,
         )
 
@@ -379 +379 @@
         title = _(u'Academic Session of Entry'),
         source = academic_sessions_vocab,
-        required = True,
+        required = False,
         readonly = False,
         )
@@ -386 +386 @@
         title = _(u'Academic Session of Graduation'),
         source = academic_sessions_vocab,
-        required = True,
+        required = False,
         readonly = False,
         )
@@ -393 +393 @@
         title = _(u'Mode of Entry'),
         source = StudyModeSource(),
-        required = True,
+        required = False,
         readonly = False,
         )
@@ -429 +429 @@
         source = OrderSource(),
         title = _(u'Type of Order'),
-        required = True,
+        required = False,
         )
 
@@ -444 +444 @@
         title = _(u'Transcript Charge'),
         source = DestinationCostSource(),
-        required = True,
+        required = False,
         readonly = False,
         )
@@ -452 +452 @@
         description = u'Must correspond with the number of dispatch addresses above.',
         values=[1, 2, 3, 4],
-        required = True,
+        required = False,
         readonly = False,
         default = 1,