[Mpuls-commits] r720 - in waska/trunk: . waskaweb/public/xml

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-12-02 09:20:50 +0100 (Wed, 02 Dec 2009)
New Revision: 720

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/public/xml/eval_zusammenfassung.xml
Log:
Modified evaluation


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-12-02 08:11:18 UTC (rev 719)
+++ waska/trunk/ChangeLog.txt	2009-12-02 08:20:50 UTC (rev 720)
@@ -1,3 +1,9 @@
+2009-12-02 	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Modfied evaluation on Zugang (Übergangsprognose)
+
+	* waskaweb/public/xml/eval_zusammenfassung.xml: Modified evaluation
+
 2009-12-01 	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Last minutes changes 

Modified: waska/trunk/waskaweb/public/xml/eval_zusammenfassung.xml
===================================================================
--- waska/trunk/waskaweb/public/xml/eval_zusammenfassung.xml	2009-12-02 08:11:18 UTC (rev 719)
+++ waska/trunk/waskaweb/public/xml/eval_zusammenfassung.xml	2009-12-02 08:20:50 UTC (rev 720)
@@ -119,14 +119,14 @@
       <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
       <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
       <join>anzahl</join>
-      <where>(schulpflichtig=1)</where>
+      <where>(allgschulpflichtig=1)</where>
     </ydim>
     <ydim>
       <label>Davon allgemeinschulpflichtig mit Übergangsprognose</label>
       <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
       <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
       <join>anzahl</join>
-      <where>(schulpflichtig=1 AND FALSE)</where>
+      <where>(allgschulpflichtig=1 AND prognose_liegt_vor=1)</where>
     </ydim>
   </evaluation>
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->