Changeset 14393 for main/waeup.aaue/trunk

Timestamp:

13 Jan 2017, 12:33:16 (8 years ago)

Author:

Henrik Bettermann

Message:

Adjust passed_params.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

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

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

@@ -30 +30 @@
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [(u'1234', u'TESTER, Bob', 30, 30, '5.00', 'nil', 0, 30, 30, '5.000', 'Proceed')])
+            [(u'1234', u'TESTER, Bob', 30, 30, '5.000', 'nil', '', 30, 30, '5.000', 'Proceed')])
         return
 

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_session_results_presentation.py

@@ -31 +31 @@
         result = get_students('fac1', 'dep1', 2010, 100)
         self.assertEqual(result,
-            [[], [], [], [], [], [], [(u'E1000000', u'1234', u'TESTER, Bob')]])
+            [[(u'E1000000', u'1234', u'TESTER, Bob')], [], [], [], [], [], []])
         self.student['studycourse']['100']['Course1'].score = 60
         self.student['studycourse']['100']['Course1'].ca = 10

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

@@ -92 +92 @@
         credits_failed = 0
         credits_passed = 0
-        no_courses_not_taken = 0
+        courses_not_taken = ''
         for ticket in self.values():
             if None not in (ticket.score, ticket.ca):
@@ -106 +106 @@
                     credits_passed += ticket.credits
             else:
-                no_courses_not_taken += 1
+                courses_not_taken += '%s ' % ticket.code
         if not len(courses_failed):
             courses_failed = 'nil'
         return (passed, failed, credits_passed,
                 credits_failed, courses_failed,
-                no_courses_not_taken)
+                courses_not_taken)
 
     @property