[Mpuls-commits] r4269 - in base/trunk: . mpulsweb/lib

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-11-26 15:49:34 +0100 (Fri, 26 Nov 2010)
New Revision: 4269

Modified:
   base/trunk/ChangeLog
   base/trunk/mpulsweb/lib/evaluation.py
Log:
issue1498: show logbook statistiks to substitutes

Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-11-26 12:25:25 UTC (rev 4268)
+++ base/trunk/ChangeLog	2010-11-26 14:49:34 UTC (rev 4269)
@@ -11,6 +11,11 @@
 
 2010-11-26  Roland Geider <roland.geider at intevation.de>
 
+	* mpulsweb/lib/evaluation.py: issue1498: show logbook statistiks to
+	  substitutes too (use master_tbl_view instead master_tbl_eval_total_view)
+
+2010-11-26  Roland Geider <roland.geider at intevation.de>
+
 	* mpulsweb/public/images/icons/validity-1-22.png: Change icon size to
 	  22x22
 

Modified: base/trunk/mpulsweb/lib/evaluation.py
===================================================================
--- base/trunk/mpulsweb/lib/evaluation.py	2010-11-26 12:25:25 UTC (rev 4268)
+++ base/trunk/mpulsweb/lib/evaluation.py	2010-11-26 14:49:34 UTC (rev 4269)
@@ -44,7 +44,7 @@
             sum(coalesce(l.dauer, '0 second'::interval)) AS dauer,
             count(l.id) AS anzahl, l.art, m.id
             FROM ka_logbuch_tbl_view l
-            JOIN master_tbl_eval_total_view m
+            JOIN master_tbl_view m
             ON m.id = l.master_id
             WHERE l.master_id = %(id)s
             AND l.art <> '0'
@@ -56,7 +56,7 @@
             sum(coalesce(l.dauer, '0 second'::interval)) AS dauer,
             count(l.id) AS anzahl, l.%(table)s, m.id
             FROM ka_logbuch_tbl_view l
-            JOIN master_tbl_eval_total_view m
+            JOIN master_tbl_view m
             ON m.id = l.master_id
             WHERE l.master_id = %(id)s
             GROUP BY l.%(table)s, m.id