Changeset 13309 for main/waeup.uniben/trunk

Timestamp:

12 Oct 2015, 07:43:56 (9 years ago)

Author:

Henrik Bettermann

Message:

It's the student's previous verdict which allows to book accommodation.

Location:

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

Files:

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

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

@@ -131 +131 @@
     def omit_fields(self):
         omit_fields = ('password', 'suspended', 'suspended_comment',
-                'phone', 'adm_code', 'email', 'date_of_birth')
+                       'phone', 'adm_code', 'email', 'date_of_birth')
         if self.context.faccode == 'JUPEB':
             omit_fields += ('faculty', 'department')
@@ -141 +141 @@
         line0 = ''
         if self.context.faccode == 'JUPEB':
-            line0 = 'Joint Universities Preliminary Examinations Board (JUPEB)\n'
+            line0 = 'Joint Universities Preliminary Examinations Board (JUPEB)'
         line1 = translate(_('Clearance Slip of'),
             'waeup.kofa', target_language=portal_language) \
             + ' %s' % self.context.display_fullname
-        return '%s%s' % (line0, line1)
+        return '%s\n%s' % (line0, line1)
 
     def _sigsInFooter(self):

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

@@ -967 +967 @@
         self.assertMatches('...Your are not eligible...',
             self.browser.contents)
-        self.student['studycourse'].current_verdict = 'A'
+        self.student['studycourse'].previous_verdict = 'A'
         self.browser.getLink("Book accommodation").click()
         self.assertMatches('...Activation Code:...',

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

@@ -77 +77 @@
         if stage not in ('fr', 'fi'):
             return _("Only fresh and final year students are allowed to book accommodation.")
-        if stage != 'fr' and not student.current_verdict in ('A', 'B'):
+        if stage != 'fr' and not student['studycourse'].previous_verdict in ('A', 'B'):
             return _("Your are not eligible to book accommodation.")
         if str(acc_details['booking_session']) in student['accommodation'].keys():
@@ -183 +183 @@
             if stage == 'fr':
                 amount += 500.0
-            elif stage == 'fi' and student.current_verdict in ('A', 'B'):
+            elif stage == 'fi' and student[
+                'studycourse'].previous_verdict in ('A', 'B'):
                 amount += 300.0
             else: