[Mpuls-commits] r261 - in waska/trunk: . waskaweb/lib waskaweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-02-13 16:07:32 +0100 (Fri, 13 Feb 2009)
New Revision: 261

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/evaluation.py
   waska/trunk/waskaweb/model/logbook.py
Log:
Fixed issue 738


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-02-13 09:43:02 UTC (rev 260)
+++ waska/trunk/ChangeLog.txt	2009-02-13 15:07:32 UTC (rev 261)
@@ -1,5 +1,13 @@
 2009-02-12	Torsten Irlaender  <torsten.irlaender at intevation.de>
+	
+	Fixed issue 738
 
+	* waskaweb/model/logbook.py,
+	  waskaweb/lib/evaluation.py: Added new evaluation for time efforts in
+	  logbook. Now the standin sees the times too.
+
+2009-02-12	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
 	Modified adele evaluation. 
 
 	* waskaweb/lib/adelexml.py,

Modified: waska/trunk/waskaweb/lib/evaluation.py
===================================================================
--- waska/trunk/waskaweb/lib/evaluation.py	2009-02-13 09:43:02 UTC (rev 260)
+++ waska/trunk/waskaweb/lib/evaluation.py	2009-02-13 15:07:32 UTC (rev 261)
@@ -1008,6 +1008,22 @@
             ORDER BY l.art
         """ % self.where_clause(self.compressed_ids, "l.master_id")
 
+class Evaluation_24(Evaluation_14):
+    """Aufschluesselung der Zeitaufwaende im Tagebuch"""
+    def __init__(self, compressed_ids):
+        Evaluation.__init__(self, compressed_ids)
+        self.export_label = _('cm_eval_header_effort')
+        self.export_eval_what = u"alle Jugendliche"
+        self.sql  = """SELECT sum(l.dauer) AS dauer, count(l.dauer) AS anzahl, l.art, m.id
+            FROM ka_logbuch_tbl_view l
+            JOIN master_tbl_view m
+            ON m.id = l.master_id
+            WHERE %s 
+            AND l.dauer IS NOT NULL 
+            GROUP BY l.art, m.id 
+            ORDER BY l.art
+        """ % self.where_clause(self.compressed_ids, "l.master_id")
+
 class Evaluation_19(Evaluation):
     """Anzahl gemeldeter Arbeitsloser"""
     def __init__(self, compressed_ids):

Modified: waska/trunk/waskaweb/model/logbook.py
===================================================================
--- waska/trunk/waskaweb/model/logbook.py	2009-02-13 09:43:02 UTC (rev 260)
+++ waska/trunk/waskaweb/model/logbook.py	2009-02-13 15:07:32 UTC (rev 261)
@@ -303,9 +303,9 @@
 
     def getEvaluation(self):
         # Build casebundle with on single case
-        from waskaweb.lib.evaluation import Evaluation_18
+        from waskaweb.lib.evaluation import Evaluation_24
         cb = CaseBundle([self.mid])
-        eval = Evaluation_18(range_compress(cb.listDatasetIds()))
+        eval = Evaluation_24(range_compress(cb.listDatasetIds()))
         return eval.perform()
 
 class LogbookEntryChecker: