Changeset 14733

Timestamp:

30 Jul 2017, 07:34:57 (7 years ago)

Author:

Henrik Bettermann

Message:

Final year students maximum credit units = 52

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -19 +19 @@
 from hurry.workflow.interfaces import IWorkflowState
 from zope.component import getUtility, createObject
+from waeup.kofa.students.studylevel import StudentStudyLevel
 from waeup.kofa.students.tests.test_browser import StudentsFullSetup
 from waeup.kofa.students.interfaces import IStudentsUtils
@@ -139 +140 @@
 
     def test_maxCreditsExceeded(self):
+        # non-final-year student
         students_utils = getUtility(IStudentsUtils)
         studylevel = grok.Container()
         studylevel.total_credits = 30
+        studylevel.level = 100
+        self.student['studycourse']['100'] = studylevel
         course = grok.Model()
         course.credits = 18

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

@@ -447 +447 @@
 
     def warnCreditsOOR(self, studylevel, course=None):
-        if course and studylevel.total_credits + course.credits > 48:
+        studycourse = studylevel.__parent__
+        certificate = getattr(studycourse,'certificate', None)
+        current_level = studycourse.current_level
+        if None in (current_level, certificate):
+            return
+        end_level = certificate.end_level
+        if current_level >= end_level:
+            limit = 52
+        else:
+            limit = 48
+        if course and studylevel.total_credits + course.credits > limit:
             return  _('Maximum credits exceeded.')
-        elif studylevel.total_credits > 48:
+        elif studylevel.total_credits > limit:
             return _('Maximum credits exceeded.')
         return