Changeset 14588 for main

Timestamp:

24 Feb 2017, 09:29:33 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace maxCreditsExceeded by warnCreditsOOR.

Location:

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

Files:

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

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

@@ -763 +763 @@
         self.app['faculties']['fac1']['dep1'].courses['COURSE1'].credits = 51
         self.browser.getControl("Add course ticket").click()
-        self.assertMatches('...Total credits exceed 50...',
+        self.assertMatches('...Maximum credits exceeded...',
                            self.browser.contents)
         # Final year students can't add ticket with 52 credits ...
@@ -769 +769 @@
         self.student['studycourse'].certificate.end_level = 700
         self.browser.getControl("Add course ticket").click()
-        self.assertMatches('...Total credits exceed 51...',
+        self.assertMatches('...Maximum credits exceeded...',
                            self.browser.contents)
         # ... but with 51 credits
@@ -780 +780 @@
         self.student['studycourse'].certificate.end_level = 800
         self.browser.getControl("Register course list").click()
-        self.assertMatches('...Maximum credits of 50 exceeded...',
+        self.assertMatches('...Maximum credits exceeded...',
             self.browser.contents)
         # ... but final year students can

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

@@ -370 +370 @@
         return None, payment
 
-    def maxCredits(self, studylevel):
-        """Return maximum credits.
-
-        """
+    def warnCreditsOOR(self, studylevel, course=None):
         studycourse = studylevel.__parent__
         certificate = getattr(studycourse,'certificate', None)
         current_level = studycourse.current_level
         if None in (current_level, certificate):
-            return 0
+            return
         end_level = certificate.end_level
         if current_level >= end_level:
-            return 51
-        return 50
+            limit = 51
+        else:
+            limit = 50
+        if course and studylevel.total_credits + course.credits > limit:
+            return _('Maximum credits exceeded.')
+        elif studylevel.total_credits > limit:
+            return _('Maximum credits exceeded.')
+        return
 
     def clearance_disabled_message(self, student):