Changeset 2366 for WAeUP_SRP/base

Timestamp:

16 Oct 2007, 06:43:01 (17 years ago)

Author:

joachim

Message:

add counted prefixes

File:

• WAeUP_SRP/base/skins/waeup_utilities/getPaymentStatistic.py (modified) (4 diffs)

WAeUP_SRP/base/skins/waeup_utilities/getPaymentStatistic.py

@@ -54 +54 @@
                  'fee': 500,
                  'title': 'Hostel Maintainance',
+                  'prefixes': hostel_pbs,
                  }
 #ac = [pin for pin in aq_pins(In('prefix_batch', clearance_pbs)) if pin.student]
 ac = aq_pins(In('prefix_batch', clearance_pbs)& missing_query)
 fees['clearance'] = {'anz': len(ac),
-                 'fee': 250,
-                 'title': 'Clearance',
+                     'fee': 250,
+                     'title': 'Clearance',
+                     'prefixes': clearance_pbs,
                  }
 #aa = [pin for pin in aq_pins(In('prefix_batch', application_pbs)) if pin.student]
@@ -66 +68 @@
                  'fee': 200,
                  'title': 'Application',
+                  'prefixes': application_pbs,
                  }
 aso = aq_portal(Eq('portal_type','Payment') & In("SearchableText",("successful",)))
@@ -71 +74 @@
                  'fee': 1000,
                  'title': 'Schoolfee (online)',
+                  'prefixes': (),
                  }
 #assc = [pin for pin in aq_pins(In('prefix_batch', schoolfee_pbs)) if pin.student]
@@ -77 +81 @@
                  'fee': 1000,
                  'title': 'Schoolfee (Scratchcard)',
+                  'prefixes': schoolfee_pbs,
                  }
 rwrite("Payed fees")
 total = 0
-for fee in fees.values():
+keys = fees.keys()
+keys.sort()
+for key in keys:
+    fee = fees[key]
     t = fee['value'] = fee['anz'] * fee['fee']
     total += t
-    rwrite("%(title)s fees %(anz)d = %(value)d (%(fee)d N)" % fee)
+    rwrite("%(title)s fees %(anz)d = %(value)d (%(fee)d N %(prefixes)s)" % fee)
 gt = float(total)/1000000
 rwrite("Total %10.2f Million N" % gt)