Changeset 16662 for main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

Timestamp:

5 Oct 2021, 10:30:09 (3 years ago)

Author:

Henrik Bettermann

Message:

OutstandingCoursesExporter: Remove passed courses from outstanding courses lists.

File:

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

main/waeup.kofa/trunk/src/waeup/kofa/students/export.py

@@ -148 +148 @@
             student.get('studycourse', None), 'certificate', None)
         if certificate:
-            allticketcodes = []
-            failedticketcodes = '' # taken but failed
-            nottakenticketcodes = '' # registered but not taken
-            missedticketcodes = '' # not registered
+            allticketcodes = list()
+            failedticketcodes = list() # taken but failed
+            nottakenticketcodes = list() # registered but not taken
+            missedticketcodes = list() # not registered
+            # collect failed, not taken and all courses
             for level in student['studycourse'].values():
-                failedticketcodes += level.passed_params[4]
-                nottakenticketcodes += level.passed_params[5]
+                failedticketcodes += level.passed_params[4].split()
+                nottakenticketcodes += level.passed_params[5].split()
                 for ticket in level.values():
                     allticketcodes.append(ticket.code)
+            # check if failed or not taken courses have been passed later
+            for code in failedticketcodes:
+                if code in level.passed_params[6]:
+                    failedticketcodes.remove(code) 
+            for code in nottakenticketcodes:
+                if code in level.passed_params[6]:
+                    nottakenticketcodes.remove(code)
+            # collect missed tickets
             for certcourse in certificate.values():
                 if certcourse.getCourseCode() not in allticketcodes:
-                    missedticketcodes += '%s ' % certcourse.__name__
+                    missedticketcodes.append(certcourse.__name__)
             student_wo = (student, missedticketcodes,
                           failedticketcodes, nottakenticketcodes)
@@ -602 +611 @@
                 value = getattr(context[0], name, None)
             elif name == 'missed':
-                value = context[1]
+                value = ' '.join(context[1])
             elif name == 'failed':
-                value = context[2]
+                value = ' '.join(context[2])
             elif name == 'nottaken':
-                value = context[3]
+                value = ' '.join(context[3])
         return super(
             OutstandingCoursesExporter, self).mangle_value(