Changeset 14411 for main/waeup.aaue/trunk/src/waeup

Timestamp:

17 Jan 2017, 06:13:10 (8 years ago)

Author:

Henrik Bettermann

Message:

Extend getDegreeClassNumber.

File:

• main/waeup.aaue/trunk/src/waeup/aaue/students/utils.py (modified) (2 diffs)

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

@@ -43 +43 @@
 
     def getDegreeClassNumber(self, level_obj):
+        if level_obj.gpa_params[1] == 0:
+            return 0
         certificate = getattr(level_obj.__parent__,'certificate',None)
         end_level = getattr(certificate, 'end_level', None)
         if end_level and level_obj.student.current_level >= end_level:
             failed_courses = level_obj.passed_params[4]
+            not_taken_courses = level_obj.passed_params[5]
             if '_m' in failed_courses:
+                return 0
+            if len(not_taken_courses):
+                return 0
+            if level_obj.level_verdict == 'FRNS':
                 return 0
         # use gpa_boundaries above
@@ -219 +226 @@
                 and category != 'clearance_incl':
                     return _("Additional fees must be included."), None
-            if student.faccode == 'FP':
+            if student.faccode == 'FP':  # includes IJMBE
                 amount = academic_session.clearance_fee_fp
             elif student.current_mode.endswith('_pt'):