Changeset 16662 for main/waeup.kofa/trunk/src

Timestamp:

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

Author:

Henrik Bettermann

Message:

OutstandingCoursesExporter: Remove passed courses from outstanding courses lists.

Location:

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

Files:

• export.py (modified) (2 diffs)
• studylevel.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)
• tests/test_export.py (modified) (1 diff)

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(

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

@@ -164 +164 @@
         credits_passed = 0
         courses_not_taken = ''
+        courses_passed = ''
         for ticket in self.values():
             if ticket.total_score is not None:
@@ -176 +177 @@
                     passed += 1
                     credits_passed += ticket.credits
+                    courses_passed += '%s ' % ticket.code
             else:
                 courses_not_taken += '%s ' % ticket.code
         return (passed, failed, credits_passed,
                 credits_failed, courses_failed,
-                courses_not_taken)
+                courses_not_taken, courses_passed)
 
     @property

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -1062 +1062 @@
         self.assertEqual(
             self.student['studycourse']['100'].passed_params,
-            (1, 1, 13, 10, 'COURSE1 ', ''))
+            (1, 1, 13, 10, 'COURSE1 ', '', 'ANYCODE '))
         self.assertEqual(
             self.student['studycourse']['200'].passed_params,
-            (0, 0, 0, 0, '', 'COURSE1 '))
+            (0, 0, 0, 0, '', 'COURSE1 ', ''))
         # And also cumulative params can be calculated. Meanwhile we have the
         # following courses: COURSE1 and COURSE2 in level 100 and

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -890 +890 @@
             result,
             'student_id,matric_number,certcode,display_fullname,missed,failed,nottaken\r\n'
-            'A111111,234,CERT1,Anna M. Tester,C2_400 ,C3 ,C1 CRS1 \r\n'
+            'A111111,234,CERT1,Anna M. Tester,C2_400,C3,C1 CRS1\r\n'
             )
         return