Changeset 14414

Timestamp:

17 Jan 2017, 08:11:04 (8 years ago)

Author:

Henrik Bettermann

Message:

FRNS criteria does not only apply to final levels.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py

@@ -67 +67 @@
         end_level = getattr(stud['studycourse'].certificate, 'end_level', None)
         if end_level and level >= end_level:
-            if remark == 'FRNS':  # Faculty Requirements Not Satisfied
-                cgpa = ''
-            else:
-                cgpa = '%.2f' % (int(100*level_obj.cumulative_params[0])/100.0)
+            cgpa = '%.2f' % (int(100*level_obj.cumulative_params[0])/100.0)
         else:
             cgpa = '%.3f' % (int(1000*level_obj.cumulative_params[0])/1000.0)
+        if remark == 'FRNS':  # Faculty Requirements Not Satisfied (AAUE)
+            cgpa = ''
         line = (
                 #stud.student_id,