Changeset 15243 for main

Timestamp:

15 Nov 2018, 07:43:48 (6 years ago)

Author:

Henrik Bettermann

Message:

Fix get_student_payment_stats. Department codes are not unique. Use its path instead.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (2 diffs)
• src/waeup/kofa/students/reports/student_payment_statistics.py (modified) (3 diffs)
• src/waeup/kofa/students/reports/tests/test_student_payment_statistics.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Fix get_student_payment_stats. Department codes are not
+  unique. Use its path instead.
 
 * Implement study level 0 (Level Zero) option for storing

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

@@ -3298 +3298 @@
     def _searchCatalog(self, session):
         cat = queryUtility(ICatalog, name='coursetickets_catalog')
+        # Attention: Also tickets of previous studycourses are found
         coursetickets = cat.searchResults(
             session=(session, session),
@@ -3442 +3443 @@
     def data(self, session):
         cat = queryUtility(ICatalog, name='coursetickets_catalog')
+        # Attention: Also tickets of previous studycourses are found
         coursetickets = cat.searchResults(
             session=(session, session),

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

@@ -62 +62 @@
     payment_cats = tuple(sorted(payment_cats_dict.keys())) + ('Total',)
     if breakdown == 'faccode':
-        codes = tuple(sorted([x for x in site['faculties'].keys()],
+        paths = 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()))
         paths = tuple(sorted([x for x in deppaths],
                                  key=lambda x: x.lower()))
@@ -87 +82 @@
         result = cat.searchResults(current_session=(session, session))
     table = [[0 for x in xrange(2*len(payment_cats))]
-                for y in xrange(len(codes)+1)]
+                for y in xrange(len(paths)+1)]
     mode_groups = getUtility(IKofaUtils).MODE_GROUPS
     for stud in result:
@@ -97 +92 @@
         if entry_session != 0 and  stud.entry_session != entry_session:
             continue
-        if getattr(stud, breakdown) not in codes:
-            # studs can have a faccode ``None``
-            continue
-        row = codes.index(getattr(stud, breakdown))
+        if breakdown == 'faccode':
+            if getattr(stud, 'faccode') not in paths:
+                # studs can have a faccode ``None``
+                continue
+        # Dep codes are not unique.
+        if breakdown == 'depcode':
+            row = paths.index(
+                '%s/%s' % (getattr(stud, 'faccode'), getattr(stud, 'depcode')))
+        else:
+            row = paths.index(getattr(stud, breakdown))
         for key in stud['payments'].keys():
             ticket = stud['payments'][key]

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

@@ -53 +53 @@
         return
 
-    def test_create_pdf(self):
+    def test_create_pdf_1(self):
         report = StudentPaymentStatisticsReport(
             2010, 'Undergraduate Full-Time', 0, 0, 0, 'faccode')
         result = report.create_pdf('JOB_ID')
         self.assertTrue(result.startswith('%PDF-'))
-        path = os.path.join(samples_dir(), 'student_payment_statistics.pdf')
+        path = os.path.join(samples_dir(), 'student_payment_statistics_faccode.pdf')
         open(path, 'wb').write(result)
-        print "Sample PDF student_statistics.pdf written to %s" % path
+        print "Sample PDF student_statistics_faccode.pdf written to %s" % path
+        return
+
+    def test_create_pdf_2(self):
+        report = StudentPaymentStatisticsReport(
+            2010, 'Undergraduate Full-Time', 0, 0, 0, 'depcode')
+        result = report.create_pdf('JOB_ID')
+        self.assertTrue(result.startswith('%PDF-'))
+        path = os.path.join(samples_dir(), 'student_payment_statistics_depcode.pdf')
+        open(path, 'wb').write(result)
+        print "Sample PDF student_statistics_depcode.pdf written to %s" % path
         return