Changeset 14902 for main/waeup.uniben/trunk/src/waeup/uniben/students

Timestamp:

17 Nov 2017, 16:12:06 (7 years ago)

Author:

Henrik Bettermann

Message:

Add ´is_student´ property attribute to student objects.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• student.py (modified) (1 diff)
• tests/test_browser.py (modified) (1 diff)
• utils.py (modified) (2 diffs)
• viewlets.py (modified) (1 diff)

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

@@ -135 +135 @@
                        'phone', 'adm_code', 'email', 'date_of_birth',
                        'flash_notice')
-        if self.context.faccode == 'JUPEB':
+        if self.context.is_jupeb:
             omit_fields += ('faculty', 'department')
         return omit_fields
@@ -143 +143 @@
         portal_language = getUtility(IKofaUtils).PORTAL_LANGUAGE
         line0 = ''
-        if self.context.faccode == 'JUPEB':
+        if self.context.is_jupeb:
             line0 = 'Joint Universities Preliminary Examinations Board (JUPEB)\n'
         line1 = translate(_('Clearance Slip of'),
@@ -307 +307 @@
 
     def update(self):
-        if not self.context.flash_notice or self.context.faccode != 'JUPEB' \
+        if not self.context.flash_notice or not self.context.is_jupeb \
             or not 'results' in self.context.flash_notice.lower():
             self.flash(_('Forbidden'), type="warning")

main/waeup.uniben/trunk/src/waeup/uniben/students/student.py

@@ -41 +41 @@
     def transcript_enabled(self):
         user = get_current_principal()
-        if user.id in ('admin', 'isouaba', 'med', 'delejason', 'zope.mgr'):
+        if user.id in ('admin', 'isouaba', 'med', 'zope.mgr'):
+            return True
+        return False
+
+    @property
+    def is_jupeb(self):
+        if self.faccode.startswith('JUPEB'):
             return True
         return False

main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_browser.py

@@ -224 +224 @@
         cert = createObject('waeup.Certificate')
         cert.code = u'xyz'
-        self.app['faculties']['JUPEB'] = Faculty(code=u'JUPEB')
-        self.app['faculties']['JUPEB']['dep1'] = Department(code=u'dep1')
-        self.app['faculties']['JUPEB']['dep1'].certificates.addCertificate(cert)
+        self.app['faculties']['JUPEB123'] = Faculty(code=u'JUPEB123')
+        self.app['faculties']['JUPEB123']['dep1'] = Department(code=u'dep1')
+        self.app['faculties']['JUPEB123']['dep1'].certificates.addCertificate(cert)
         self.student['studycourse'].certificate = cert
         self.browser.open(self.student_path)

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

@@ -263 +263 @@
             if p_item is None:
                 return _('Study course data are incomplete.'), None
-            if student.faccode == 'JUPEB':
+            if student.is_jupeb:
                 amount = 50000.0
             elif student.faccode.startswith('FCETA'):
@@ -279 +279 @@
             except (AttributeError, TypeError):
                 return _('Study course data are incomplete.'), None
-
-            #####################################################
-            #if student.faccode == 'JUPEB':
-            #    return _('Payment temporarily disabled.'), None
-            #####################################################
-
-
             if previous_session:
                 # Students can pay for previous sessions in all workflow states.

main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py

@@ -122 +122 @@
     @property
     def target_url(self):
-        if self.context.flash_notice and self.context.faccode == 'JUPEB' \
+        if self.context.flash_notice and self.context.is_jupeb \
             and 'results' in self.context.flash_notice.lower():
             return self.view.url(self.view.context, self.target)