Changeset 2387 for WAeUP_SRP

Timestamp:

18 Oct 2007, 17:46:56 (17 years ago)

Author:

joachim

Message:

da waren es nur noch 4

File:

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

WAeUP_SRP/base/skins/waeup_utilities/getPaymentStatistic.py

@@ -55 +55 @@
 application_pbs = [pb for pb in pbs if pb.startswith('APP')]
 
+newschoolfee_pbs = [pb for pb in pbs if pb.endswith('NEW1')]
+
 schoolfee_pbs = list(pbs)[:]
-for pb in application_pbs + hostel_pbs + clearance_pbs + ['HOS1','HOS2']:
+for pb in application_pbs + hostel_pbs + clearance_pbs + newschoolfee_pbs +['HOS1','HOS2']:
     schoolfee_pbs.remove(pb)
 fees = {}
@@ -92 +94 @@
 aspaysc = aq_portal(Eq('portal_type','Payment') &\
                     Eq("SearchableText","payment") &\
-                    Eq("SearchableText","successful"))
-rwrite("*"*80)
+                    Eq("SearchableText","successful") &\
+                    ~ Eq("SearchableText","transfer")
+                   )
+#rwrite("*"*80)
 # for pp in aspaysc:
     # indexdata = portal.getIndexDataForRID(pp.getRID())
@@ -101 +105 @@
                  'title': 'Schoolfee (sc in payments)',
                   'prefixes': (),
+                 }
+anewschool = aq_pins(In('prefix_batch', newschoolfee_pbs) & missing_query)
+fees['newschoolfee_sc'] = {'anz' : len(anewschool),
+                 'fee': 1000,
+                 'title': 'Schoolfee (..NEW SC)',
+                  'prefixes': newschoolfee_pbs,
                  }
 #assc = [pin for pin in aq_pins(In('prefix_batch', schoolfee_pbs)) if pin.student]