Changeset 9830

Timestamp:

5 Jan 2013, 18:41:35 (12 years ago)

Author:

Henrik Bettermann

Message:

Ease customization of max_credits. In some universities maximum credits is not constant, it
depends on the student's study level.

Location:

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

Files:

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

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

@@ -2237 +2237 @@
         'level_session', 'level_verdict')
     pnav = 4
-    max_credits = 50
 
     def update(self):
@@ -2306 +2305 @@
             self.redirect(self.url(self.context))
             return
-        if self.context.total_credits > self.max_credits:
+        students_utils = getUtility(IStudentsUtils)
+        max_credits = students_utils.maxCredits(self.context)
+        if self.context.total_credits > max_credits:
             self.flash(_('Maximum credits of ${a} exceeded.',
-                mapping = {'a':self.max_credits}))
+                mapping = {'a':max_credits}))
             return
         IWorkflowInfo(self.context.student).fireTransition(

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

@@ -755 +755 @@
         self.browser.getControl("Add course ticket").click()
         self.assertMatches(
-            '...Total credits exceed 58...', self.browser.contents)
+            '...Total credits exceed 50...', self.browser.contents)
         self.course.credits = 10
         self.browser.getControl("Add course ticket").click()
@@ -2029 +2029 @@
         self.browser.getControl("Add course ticket").click()
         self.assertMatches(
-            '...Your total credits exceed 58...', self.browser.contents)
+            '...Your total credits exceed 50...', self.browser.contents)
         self.course.credits = 10
         self.browser.getControl("Add course ticket").click()

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

@@ -586 +586 @@
         return pdf_stream
 
-    TOTAL_CREDITS = 58
+    def maxCredits(self, studylevel):
+        """Return maximum credits.
+
+        In some universities maximum credits is not constant, it
+        depends on the student's study level.
+        """
+        return 50
 
     def maxCreditsExceeded(self, studylevel, course):
-        if self.TOTAL_CREDITS and \
-            studylevel.total_credits + course.credits > self.TOTAL_CREDITS:
-            return self.TOTAL_CREDITS
+        max_credits = self.maxCredits(studylevel)
+        if max_credits and \
+            studylevel.total_credits + course.credits > max_credits:
+            return max_credits
         return 0