Changeset 14370 for main/waeup.aaue/trunk/src/waeup/aaue/students

Timestamp:

5 Jan 2017, 08:45:08 (8 years ago)

Author:

Henrik Bettermann

Message:

Add column.

Location:

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

Files:

• reports/tests/test_level_report.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.0, '', 30, 30, 5.0, 'Proceed')])
+            [(u'1234', u'TESTER, Bob', 30, 30, 0, 5.0, '', 30, 30, 5.0, 'Proceed')])
         return
 

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

@@ -95 +95 @@
         credits_failed = 0
         credits_passed = 0
+        no_courses_not_taken = 0
         for ticket in self.values():
             if None not in (ticket.score, ticket.ca):
@@ -107 +108 @@
                     passed += 1
                     credits_passed += ticket.credits
-        return passed, failed, credits_passed, credits_failed, courses_failed
+            else:
+                no_courses_not_taken += 1
+        return (passed, failed, credits_passed,
+                credits_failed, courses_failed,
+                no_courses_not_taken)
 
     @property