Changeset 14586 for main/waeup.fceokene/trunk/src

Timestamp:

24 Feb 2017, 09:25:22 (8 years ago)

Author:

Henrik Bettermann

Message:

Replace maxCreditsExceeded by warnCreditsOOR.

Location:

main/waeup.fceokene/trunk/src/waeup/fceokene/students

Files:

• tests/test_utils.py (modified) (1 diff)
• utils.py (modified) (1 diff)

main/waeup.fceokene/trunk/src/waeup/fceokene/students/tests/test_utils.py

@@ -37 +37 @@
         course = grok.Model()
         course.credits = 18
-        max_credits = students_utils.maxCreditsExceeded(studylevel, course)
-        self.assertEqual(max_credits, 0)
+        warning = students_utils.warnCreditsOOR(studylevel, course)
+        self.assertEqual(warning, None)
         course.credits = 19
-        max_credits = students_utils.maxCreditsExceeded(studylevel, course)
-        self.assertEqual(max_credits, 58)
+        warning = students_utils.warnCreditsOOR(studylevel, course)
+        self.assertEqual(warning, 'Maximum credits exceeded.')
         return
 

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

@@ -361 +361 @@
         return d
 
-    def maxCredits(self, studylevel):
-        """Return maximum credits.
-
-        """
-        return 58
+    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 > 58:
+            return _('Maximum credits exceeded.')
+        elif studylevel.total_credits > 58:
+            return _('Maximum credits exceeded.')
+        return
 
     def getPDFCreator(self, context):