Changeset 16726 for main/kofacustom.dspg

Timestamp:

25 Nov 2021, 22:26:32 (3 years ago)

Author:

Henrik Bettermann

Message:

Change carryover_courses_1 and carryover_courses_2 fields.

Location:

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants

Files:

• browser.py (modified) (1 diff)
• interfaces.py (modified) (2 diffs)

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/browser.py

@@ -238 +238 @@
     @property
     def form_fields(self):
-        if self.target in ('conv', 'special', 'hndfincl', 'ndfincl'):
+        if self.context.special:
+            return grok.AutoFields(ICustomSpecialApplicant)
+        if self.target in ('conv', 'hndfincl', 'ndfincl'):
             form_fields = grok.AutoFields(ICustomSpecialApplicant)
             form_fields = form_fields.omit(

main/kofacustom.dspg/trunk/src/kofacustom/dspg/applicants/interfaces.py

@@ -29 +29 @@
 from waeup.kofa.schema import FormattedDate, TextLineChoice, PhoneNumber
 from waeup.kofa.students.vocabularies import nats_vocab, GenderSource
+from waeup.kofa.university.vocabularies import CourseSource
 from waeup.kofa.applicants.interfaces import (
     contextual_reg_num_source, ISpecialApplicant)
@@ -302 +303 @@
         )
 
-    carryover_courses_1 = schema.Text(
-        title = _(u'1st Semseter Carry-Over Courses'),
-        required = False,
-        )
-
-    carryover_courses_2 = schema.Text(
+    carryover_courses_1 = schema.List(
+        title = _(u'1st Semester Carry-Over Courses'),
+        value_type = schema.Choice(
+            #title = _(u'YYY'),
+            source = CourseSource(),
+            required = True,
+            ),
+        required = False,
+        readonly = False,
+        defaultFactory=list,
+        )
+
+    carryover_courses_2 = schema.List(
         title = _(u'2nd Semester Carry-Over Courses'),
-        required = False,
-        )
+        value_type = schema.Choice(
+            #title = _(u'YYY'),
+            source = CourseSource(),
+            required = True,
+            ),
+        required = False,
+        readonly = False,
+        defaultFactory=list,
+        )
+
+    #carryover_courses_1 = schema.Text(
+    #    title = _(u'1st Semseter Carry-Over Courses'),
+    #    required = False,
+    #    )
+
+    #carryover_courses_2 = schema.Text(
+    #    title = _(u'2nd Semester Carry-Over Courses'),
+    #    required = False,
+    #    )
 
 class ICustomApplicant(ICustomUGApplicant, ICustomPGApplicant,