Changeset 14536 for main/waeup.kofa/trunk/src/waeup/kofa/students/reports

Timestamp:

12 Feb 2017, 19:58:35 (8 years ago)

Author:

Henrik Bettermann

Message:

Hide all data if remark is set (requestd by AAUE, Nigeria).

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/reports/level_report.py (modified) (2 diffs)

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

@@ -71 +71 @@
         remark = getattr(level_obj, 'remark', '')
         end_level = getattr(stud['studycourse'].certificate, 'end_level', None)
+        credits_counted = level_obj.gpa_params[1]
+        credits_passed = passed_params[2]
+        level_gpa = format_float(level_obj.gpa, 3)
+        cum_credits_taken = level_obj.cumulative_params[1]
+        cum_credits_passed = level_obj.cumulative_params[4]
         if end_level and level >= end_level:
             cgpa = format_float(level_obj.cumulative_params[0], 2)
-            #cgpa = '%.2f' % (int(100*level_obj.cumulative_params[0])/100.0)
         else:
             cgpa = format_float(level_obj.cumulative_params[0], 3)
-            #cgpa = '%.3f' % (int(1000*level_obj.cumulative_params[0])/1000.0)
-        if remark in ('FRNS', 'NER'):  # requestd by AAUE, Nigeria
+        if remark in ('FRNS', 'NER'):
+            # hide all data (requestd by AAUE, Nigeria)
             cgpa = ''
+            credits_counted = ''
+            credits_passed = ''
+            level_gpa = ''
+            failed_courses = ''
+            not_taken_courses = ''
+            cum_credits_taken = ''
+            cum_credits_passed = ''
         line = (
-                #stud.student_id,
                 stud.matric_number,
                 fullname,
-                level_obj.gpa_params[1],
-                passed_params[2],
-                format_float(level_obj.gpa, 3),
-                #'%.3f' % (int(1000*level_obj.gpa)/1000.0),
+                credits_counted,
+                credits_passed,
+                level_gpa,
                 failed_courses,
                 not_taken_courses,
-                level_obj.cumulative_params[1],
-                level_obj.cumulative_params[4],
+                cum_credits_taken,
+                cum_credits_passed,
                 cgpa,
                 remark,
@@ -128 +137 @@
     result = []
     col_names = (
-            #'Student Id',
             'S/N',
             'Matric No.',