Changeset 12619 for main

Timestamp:

15 Feb 2015, 08:06:25 (10 years ago)

Author:

Henrik Bettermann

Message:

Show department paths. Department codes are not unique!

Location:

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

Files:

• student_payment_statistics.py (modified) (3 diffs)
• student_statistics.py (modified) (3 diffs)
• tests/test_student_statistics.py (modified) (2 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_payment_statistics.py

@@ -59 +59 @@
         codes = tuple(sorted([x for x in site['faculties'].keys()],
                                  key=lambda x: x.lower()))
+        paths = codes
     elif breakdown == 'depcode':
         faculties = site['faculties']
         depcodes = []
+        deppaths = []
         for fac in faculties.values():
             for dep in fac.values():
                 depcodes.append(dep.code)
+                deppaths.append('%s/%s' % (fac.code, dep.code))
         codes = tuple(sorted([x for x in depcodes],
                                  key=lambda x: x.lower()))
-    codes = codes + (u'Total',)
+        paths = tuple(sorted([x for x in deppaths],
+                                 key=lambda x: x.lower()))
     # XXX: Here we do _one_ query and then examine the single
     #   students. One could also do multiple queries and just look for
@@ -74 +78 @@
     cat = queryUtility(ICatalog, name="students_catalog")
     result = cat.searchResults(current_session=(session, session))
-    table = [[0 for x in xrange(2*len(payment_cats))] for y in xrange(len(codes))]
+    table = [[0 for x in xrange(2*len(payment_cats))] for y in xrange(len(codes)+1)]
     mode_groups = getUtility(IKofaUtils).MODE_GROUPS
     for stud in result:
@@ -115 +119 @@
     # Turn lists into tuples
     table = tuple([tuple(row) for row in table])
-    return (codes, table_header, table)
+
+    paths = paths + (u'Total',)
+    return (paths, table_header, table)
 
 from reportlab.lib import colors

main/waeup.kofa/trunk/src/waeup/kofa/students/reports/student_statistics.py

@@ -57 +57 @@
         codes = tuple(sorted([x for x in site['faculties'].keys()],
                                  key=lambda x: x.lower()))
+        paths = codes
     elif breakdown == 'depcode':
         faculties = site['faculties']
         depcodes = []
+        deppaths = []
         for fac in faculties.values():
             for dep in fac.values():
                 depcodes.append(dep.code)
+                deppaths.append('%s/%s' % (fac.code, dep.code))
         codes = tuple(sorted([x for x in depcodes],
                                  key=lambda x: x.lower()))
-    codes = codes + (u'Total',)
+        paths = tuple(sorted([x for x in deppaths],
+                                 key=lambda x: x.lower()))
     # XXX: Here we do _one_ query and then examine the single
     #   students. One could also do multiple queries and just look for
@@ -72 +76 @@
     cat = queryUtility(ICatalog, name="students_catalog")
     result = cat.searchResults(current_session=(session, session))
-    table = [[0 for x in xrange(len(states))] for y in xrange(len(codes))]
+    table = [[0 for x in xrange(len(states))] for y in xrange(len(codes)+1)]
     mode_groups = getUtility(IKofaUtils).MODE_GROUPS
     for stud in result:
@@ -88 +92 @@
     # turn lists into tuples
     table = tuple([tuple(row) for row in table])
-    return (codes, states, table)
+
+    paths = paths + (u'Total',)
+    return (paths, states, table)
 
 from reportlab.lib import colors

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

@@ -76 +76 @@
         self.assertEqual(
             result1,
-            ((u'dep1', u'dep2', u'Total'),
+            ((u'fac1/dep1', u'fac2/dep2', u'Total'),
              self.states,
              ((1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1),
@@ -83 +83 @@
         self.assertEqual(
             result2,
-            ((u'dep1', u'dep2', u'Total'),
+            ((u'fac1/dep1', u'fac2/dep2', u'Total'),
              self.states,
              ((0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),