Changeset 16807 for main/waeup.uniben/trunk/src/waeup

Timestamp:

15 Feb 2022, 17:42:22 (3 years ago)

Author:

Henrik Bettermann

Message:

Change flc application form.

Location:

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

Files:

• applicants/browser.py (modified) (4 diffs)
• applicants/interfaces.py (modified) (3 diffs)
• applicants/utils.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -258 +258 @@
             #form_fields['perm_address'].custom_widget = BytesDisplayWidget
             return form_fields
-        if self.target is not None and self.target == 'french':
+        if self.target is not None and self.target == 'flc':
             form_fields = grok.AutoFields(IFrenchApplicant)
             for field in REGISTRATION_OMIT_DISPLAY_FIELDS:
@@ -458 +458 @@
                 form_fields['registration_cats'].for_display = True
             return form_fields
-        if self.target is not None and self.target == 'french':
+        if self.target is not None and self.target == 'flc':
             form_fields = grok.AutoFields(IFrenchApplicant)
             for field in REGISTRATION_OMIT_MANAGE_FIELDS:
@@ -543 +543 @@
                 form_fields['registration_cats'].for_display = True
             return form_fields
-        if self.target is not None and self.target == 'french':
+        if self.target is not None and self.target == 'flc':
             form_fields = grok.AutoFields(IFrenchApplicant)
             for field in REGISTRATION_OMIT_EDIT_FIELDS:
@@ -721 +721 @@
                 for field in PUDE_OMIT_PDF_FIELDS:
                     form_fields = form_fields.omit(field)
-        elif self.target is not None and self.target == 'french':
+        elif self.target is not None and self.target == 'flc':
             form_fields = grok.AutoFields(IFrenchApplicant)
             for field in REGISTRATION_OMIT_PDF_FIELDS:

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

@@ -146 +146 @@
     """
     def getValues(self):
-        return ['n', 'c', 'p']
+        return ['c', 'p']
 
     def getToken(self, value):
@@ -152 +152 @@
 
     def getTitle(self, value):
-        if value == 'n':
-            return _('none')
+        #if value == 'n':
+        #    return _('none')
         if value == 'c':
             return _('conversational')
-        if value == 'c':
+        if value == 'p':
             return _('professional')
+
+class PreferredSessionSource(BasicSourceFactory):
+    """
+    """
+    def getValues(self):
+        return ['m', 'e', 'w']
+
+    def getToken(self, value):
+        return value
+
+    def getTitle(self, value):
+        if value == 'm':
+            return _('morning')
+        if value == 'e':
+            return _('evening')
+        if value == 'w':
+            return _('weekend')
 
 class IUnibenRegistration(IKofaObject):
@@ -547 +564 @@
         show_year = True,
         )
+
+    pref_session = schema.Choice(
+        source = PreferredSessionSource(),
+        title = _(u'Preferred Session'),
+        required = False,
+        )
+
     proficiency = schema.Choice(
         source = ProficiencySource(),

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

@@ -68 +68 @@
         'tscf': ['Transcript (without student record)', 'TRF'],
         'tscs': ['Transcript (with student record)', 'TRS'],
-        'french': ['French Language Centre', 'FR'],
+        'flc': ['French Language Centre', 'FR'],
         }
 

main/waeup.uniben/trunk/src/waeup/uniben/utils/utils.py

@@ -57 +57 @@
         'special_ft': 'Special Full-Time',
         'cdl': 'Center For Distance Learning',
+        'french': 'French Language Center',
         }