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

[scm-commit@wald.intevation.org]

Author: bh
Date: 2011-06-09 12:16:50 +0200 (Thu, 09 Jun 2011)
New Revision: 5096

Modified:
   waska/trunk/ChangeLog
   waska/trunk/waskaweb/public/xml/eval_adele.xml
Log:
* waskaweb/public/xml/eval_adele.xml: Fix evaluation
"Nicht-Erwerbspersonen in Ausbildung": more values of the field
bei_eintritt_ist_der_jugendliche have to be allowed for a case to
be counted. Fixes mpuls/issue1979


Modified: waska/trunk/ChangeLog
===================================================================
--- waska/trunk/ChangeLog	2011-06-09 10:05:37 UTC (rev 5095)
+++ waska/trunk/ChangeLog	2011-06-09 10:16:50 UTC (rev 5096)
@@ -1,3 +1,10 @@
+2011-06-09  Bernhard Herzog  <bh at intevation.de>
+
+	* waskaweb/public/xml/eval_adele.xml: Fix evaluation
+	"Nicht-Erwerbspersonen in Ausbildung": more values of the field
+	bei_eintritt_ist_der_jugendliche have to be allowed for a case to
+	be counted. Fixes mpuls/issue1979
+
 2011-06-08  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/public/xml/eval_weitere.xml: Add comment about the

Modified: waska/trunk/waskaweb/public/xml/eval_adele.xml
===================================================================
--- waska/trunk/waskaweb/public/xml/eval_adele.xml	2011-06-09 10:05:37 UTC (rev 5095)
+++ waska/trunk/waskaweb/public/xml/eval_adele.xml	2011-06-09 10:16:50 UTC (rev 5096)
@@ -404,7 +404,7 @@
       <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>(erwerbstaetigkeit_job = 0 and arbeitslosigkeit_1 = 0 and bei_eintritt_ist_der_jugendliche = 1)</where> 
+      <where>(erwerbstaetigkeit_job = 0 and arbeitslosigkeit_1 = 0 and bei_eintritt_ist_der_jugendliche in (1, 8, 9, 16))</where> 
     </ydim>
   </evaluation>
 <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->