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

Timestamp:

9 Mar 2017, 17:10:29 (8 years ago)

Author:

Henrik Bettermann

Message:

Repeaters can register less credits.

Location:

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

Files:

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

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

@@ -8 +8 @@
 from waeup.fceokene.testing import FunctionalLayer
 
-class BedAllocationTests(StudentsFullSetup):
+class StudentsUtilsTests(StudentsFullSetup):
 
     layer = FunctionalLayer
@@ -58 +58 @@
         studylevel = grok.Container()
         studylevel.total_credits = 45
+        studylevel.__parent__ = self.student['studycourse']
         course = grok.Model()
         course.credits = 7

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

@@ -294 +294 @@
             elif student.current_level in (200, 210, 220):
                 amount += academic_session.penalty_nce3_ft
-        elif category == 'schoolfee' and student.current_mode in (
-            'nce_sw', 'nce_pt'):
+        elif category == 'schoolfee' and student.current_mode in ('nce_sw',
+            'nce_pt') and student['studycourse'].previous_verdict != 'O':
             # NCE I fresh
             if student.current_level == 100 and student.state == CLEARED:
@@ -395 +395 @@
             if studylevel.total_credits > 52:
                 return _('Maximum credits exceeded.')
+            if studylevel.__parent__.previous_verdict == 'O':
+                return
             if studylevel.total_credits_s1 < 18:
                 return _('Minimum credits in 1st semester not reached.')