Changeset 14584 for main/waeup.kofa/trunk/src/waeup

Timestamp:

24 Feb 2017, 06:53:41 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace maxCreditsExceeded by warnCreditsOOR.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

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

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

@@ -146 +146 @@
     ticket.automatic = False
     ticket.carry_over = False
-    max_credits = students_utils.maxCreditsExceeded(view.context, course)
-    if max_credits:
-        view.flash(_('Total credits exceeded.'), type="warning")
+    warning = students_utils.warnCreditsOOR(view.context, course)
+    if warning:
+        view.flash(warning, type="warning")
         return False
     try:
@@ -2732 +2732 @@
             return
         students_utils = getUtility(IStudentsUtils)
-        max_credits = students_utils.maxCreditsExceeded(self.context)
-        if max_credits:
-            self.flash(_('Maximum credits exceeded.'), type="warning")
+        warning = students_utils.warnCreditsOOR(self.context)
+        if warning:
+            self.flash(warning, type="warning")
             return
         msg = self.context.course_registration_forbidden

main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py

@@ -154 +154 @@
         """
 
-    def maxCreditsExceeded(studylevel, course=None):
-        """Return True if maximum credits is exceeded.
+    def warnCreditsOOR(studylevel, course=None):
+        """Return message if credits are out of range. In the base
+        package only maximum credits is set.
         """
 

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

@@ -824 +824 @@
         self.browser.getControl("Add course ticket").click()
         self.assertMatches(
-            '...Total credits exceeded...', self.browser.contents)
+            '...Maximum credits exceeded...', self.browser.contents)
         self.course.credits = 10
         self.browser.getControl("Add course ticket").click()
@@ -2510 +2510 @@
         self.browser.getControl("Add course ticket").click()
         self.assertMatches(
-            '...Total credits exceeded...', self.browser.contents)
+            '...Maximum credits exceeded...', self.browser.contents)
         self.course.credits = 10
         self.browser.getControl("Add course ticket").click()
@@ -2605 +2605 @@
         # Carryover COURSE1 in level 200 already has 10 credits
         self.assertMatches(
-            '...Total credits exceeded...', self.browser.contents)
+            '...Maximum credits exceeded...', self.browser.contents)
         # If COURSE1 is outstanding, its credits won't be considered
         self.student['studycourse']['200']['COURSE1'].outstanding = True

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

@@ -1010 +1010 @@
         return pdf_stream
 
-    def maxCreditsExceeded(self, studylevel, course=None):
-        """Return True if maximum credits is exceeded.
+    def warnCreditsOOR(self, studylevel, course=None):
+        """Return message if credits are out of range. In the base
+        package only maximum credits is set.
         """
         if course and studylevel.total_credits + course.credits > 50:
-            return True
+            return _('Maximum credits exceeded.')
         elif studylevel.total_credits > 50:
-            return True
+            return _('Maximum credits exceeded.')
         return False