[Mpuls-commits] r1586 - wasko/branches/2.0/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-16 10:04:16 +0100 (Tue, 16 Feb 2010)
New Revision: 1586

Modified:
   wasko/branches/2.0/waskaweb/lib/evaluation.py
Log:
* waskaweb/lib/evaluation.py (Evaluation.export): Deleted, as no
export will be done for logbook evaluation.


Modified: wasko/branches/2.0/waskaweb/lib/evaluation.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-02-16 09:01:50 UTC (rev 1585)
+++ wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-02-16 09:04:16 UTC (rev 1586)
@@ -37,16 +37,6 @@
 from mpulsweb.lib.base import _, c, session
 from mpulsweb.lib.db import db
 
-KIND2TEXT = g.mpuls_config.get('logbook', 'descriptions')[0] 
-SUMKIND2TEXT = {
-    'sum_cat1': u'unmittelbare Arbeit mit dem Jugendlichen',
-    'sum_cat2': u'Arbeit mit Eltern/Personensorgeberechtigte',
-    'sum_cat3': u'Arbeit mit Dritten',
-    'sum_cat4': u'Sonstiges',
-    'sum_cat5': u'Keine Angabe',
-    'sum_all': u'Gesamt',
-    }
-
 def where_ids(compressed, idname="id"):
     if not compressed:
         return "FALSE"
@@ -147,7 +137,6 @@
         """ % self.where_clause(self.compressed_ids, "l.master_id")
 
     def perform(self):
-        #{'art': [anzahl, dauer]}
         unique_cases = []
         result = {}
         for num, category in enumerate(g.mpuls_config.get('logbook', 'categories')):
@@ -195,15 +184,6 @@
         finally:
             db.recycleConnection(conn, cur)
 
-    def doExport(self, f):
-        p = self.perform()
-        f.write(u"#%s - %s Fälle (Auswertung: %s)\r\n" % (self.export_label, p['avg_all'][0], self.export_eval_what))
-        f.write(u"Aktivität;Anzahl;Dauer\r\n")
-        items = ['sum_cat1','1','2','3','4','9','10','sum_cat2','5','6','7','8','-1','-2','sum_all']
-        for key in items:
-            v = p.get(key)
-            f.write("%s;%s;%s\r\n" % (KIND2TEXT.get(key, SUMKIND2TEXT.get(key)), v[0], v[1]))
-
 class Evaluation_18(Evaluation_14):
     """Zeitaufwände aus dem Logbuch aller Fälle"""
     def __init__(self, compressed_ids):