Changeset 13868 for main/waeup.kofa/trunk

Timestamp:

29 May 2016, 09:27:26 (8 years ago)

Author:

Henrik Bettermann

Message:

Fix level report (remove bug). Lists cannot be rendered. It seems that nobody has created level reports with failed courses so far.

Location:

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

Files:

• reports/tests/test_level_report.py (modified) (1 diff)
• studylevel.py (modified) (2 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/tests/test_level_report.py

@@ -27 +27 @@
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'Bob Tester', 30, 30, 5.0, [], 30, 30, 5.0)])
+            [(u'1234', u'Bob Tester', 30, 30, 5.0, '', 30, 30, 5.0)])
         return
 

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

@@ -152 +152 @@
         """
         passed = failed = 0
-        courses_failed = []
+        courses_failed = ''
         credits_failed = 0
         credits_passed = 0
@@ -160 +160 @@
                     failed += 1
                     credits_failed += ticket.credits
-                    courses_failed.append(ticket.code)
+                    courses_failed += '%s ' % ticket.code
                 else:
                     passed += 1

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

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