[Mpuls-commits] r209 - waska/trunk/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-10-23 15:56:34 +0200 (Thu, 23 Oct 2008)
New Revision: 209

Modified:
   waska/trunk/waskaweb/lib/evaluation.py
Log:
Anther fix for issue591


Modified: waska/trunk/waskaweb/lib/evaluation.py
===================================================================
--- waska/trunk/waskaweb/lib/evaluation.py	2008-10-23 12:55:05 UTC (rev 208)
+++ waska/trunk/waskaweb/lib/evaluation.py	2008-10-23 13:56:34 UTC (rev 209)
@@ -955,14 +955,14 @@
         Evaluation_14.__init__(self, compressed_ids)
         self.export_label = _('cm_eval_header_effort2')
         self.export_eval_what = u"abgeschlossene CM-Fälle"
-        self.sql  = """SELECT sum(l.dauer) AS dauer, count(l.dauer) AS anzahl, l.art 
+        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_eval_incm_view m
             ON m.id = l.master_id
             WHERE m.phase IN (3,4,5)
             AND %s
             AND l.dauer IS NOT NULL
-            GROUP BY l.art 
+            GROUP BY l.art, m.id 
             ORDER BY l.art
         """ % self.where_clause(self.compressed_ids, "l.master_id")
 
@@ -995,13 +995,13 @@
         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 
+        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_eval_total_view m
             ON m.id = l.master_id
             WHERE %s 
             AND l.dauer IS NOT NULL 
-            GROUP BY l.art 
+            GROUP BY l.art, m.id 
             ORDER BY l.art
         """ % self.where_clause(self.compressed_ids, "l.master_id")