Changeset 12564 for main/waeup.kofa/trunk/src

Timestamp:

6 Feb 2015, 18:47:37 (10 years ago)

Author:

Henrik Bettermann

Message:

Configure reportable payment categories in KofaUtils?.

Format amount string, use thousands separator.

Location:

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

Files:

• students/reports/student_payment_statistics.py (modified) (4 diffs)
• students/reports/tests/test_student_payment_statistics.py (modified) (1 diff)
• students/tests/test_catalog.py (modified) (1 diff)
• utils/utils.py (modified) (1 diff)

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

@@ -54 +54 @@
     """
     site = grok.getSite()
-    payment_cats = ('clearance', 'gown', 'hostel_maintenance', 'schoolfee')
-    payment_cats = payment_cats + ('Total',)
+    payment_cats_dict = getUtility(IKofaUtils).REPORTABLE_PAYMENT_CATEGORIES
+    payment_cats = tuple(sorted(payment_cats_dict.keys())) + ('Total',)
     if breakdown == 'faccode':
         codes = tuple(sorted([x for x in site['faculties'].keys()],
@@ -108 +108 @@
 
     # Build table header
-    utils = getUtility(IKofaUtils)
-
-
     table_header = ['' for x in xrange(len(payment_cats))]
     for cat in payment_cats:
-        cat_title = utils.PAYMENT_CATEGORIES.get(cat, cat)
+        cat_title = payment_cats_dict.get(cat, cat)
         table_header[payment_cats.index(cat)] = cat_title
 
-    # Convert float into int
-    table = [[int(col) for col in row] for row in table]
     # Turn lists into tuples
     table = tuple([tuple(row) for row in table])
@@ -148 +143 @@
         i = 0
         while i < len(data[idx]):
-            row.append("%s (%s)" % (data[idx][i+1], data[idx][i]))
+            row.append("%s (%s)" % ("{:,}".format(data[idx][i+1]), data[idx][i]))
             i += 2
         row = [row_name] + row
@@ -160 +155 @@
     ('FONT', (0,-1), (-1,-1), 'Helvetica-Bold', 8),
     ('FONT', (-1,0), (-1,-1), 'Helvetica-Bold', 8),
-    ('ALIGN', (1,1), (-1,-1), 'RIGHT'),
+    ('ALIGN', (0,0), (-1,-1), 'RIGHT'),
     ('INNERGRID', (0,0), (-1,-1), 0.25, colors.black),
     ('LINEBELOW', (0,-1), (-1,-1), 0.25, colors.black),

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

@@ -37 +37 @@
               'Hostel Maintenance Fee', 'School Fee',
               'Total'],
-              ((0, 0, 0, 0, 0, 0, 1, 5, 1, 5),
-              (0, 0, 0, 0, 0, 0, 1, 5, 1, 5)))
+              ((0, 0, 0, 0, 0, 0, 1, 12345.678, 1, 12345.678),
+              (0, 0, 0, 0, 0, 0, 1, 12345.678, 1, 12345.678)))
             )
         self.assertEqual(

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

@@ -90 +90 @@
         payment.p_session = 2010
         payment.p_category = 'schoolfee'
-        payment.amount_auth = 5.678
+        payment.amount_auth = 12345.678
         payment.p_state = 'paid'
         self.student['payments'][payment.p_id] = payment

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -181 +181 @@
     PREVIOUS_PAYMENT_CATEGORIES = deepcopy(SELECTABLE_PAYMENT_CATEGORIES)
 
+    REPORTABLE_PAYMENT_CATEGORIES = {
+        'schoolfee': 'School Fee',
+        'clearance': 'Acceptance Fee',
+        'hostel_maintenance': 'Hostel Maintenance Fee',
+        'gown': 'Gown Hire Fee',
+        }
+
     BALANCE_PAYMENT_CATEGORIES = {
         'schoolfee': 'School Fee',