[Mpuls-commits] r4862 - in jmd/trunk: . jmdweb/public/xml

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-04-05 11:43:21 +0200 (Tue, 05 Apr 2011)
New Revision: 4862

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
 Fixed calculation of total ammount of cases in age-evaluation -> now matches "grundmenge". Fixed evaluation of "staatsb?\195?\188rgerschaft" -> now matches "grundmenge"


Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-04-05 09:28:32 UTC (rev 4861)
+++ jmd/trunk/ChangeLog	2011-04-05 09:43:21 UTC (rev 4862)
@@ -1,3 +1,9 @@
+2011-04-05  Torsten Irlaender <torsten at intevation.de>
+
+	* jmdweb/public/xml/eval_zielgruppe.xml: Fixed calculation of total
+	ammount of cases in age-evaluation -> now matches "grundmenge".
+	Fixed evaluation of "staatsbürgerschaft" -> now matches "grundmenge" 
+
 2011-04-05  Roland Geider  <roland.geider at intevation.de>
 
 	* jmdstruktur.json: issue1993: Add "Bennenung der

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-04-05 09:28:32 UTC (rev 4861)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-04-05 09:43:21 UTC (rev 4862)
@@ -66,7 +66,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>(date_part('year', age((select CASE WHEN phase in (3) THEN datum_cm_ende WHEN phase in (5) THEN datum_ber_ende  ELSE '%(edate)s'::date END from master_tbl_eval_total_view where id = x.id), geburtsdatum)) &gt;= 12 AND date_part('year', age((select CASE WHEN phase in (3) THEN datum_cm_ende WHEN phase in (5) THEN datum_ber_ende  ELSE '%(edate)s'::date END from master_tbl_eval_total_view where id = x.id), geburtsdatum)) &lt;= 27)</where>
+      <where>TRUE</where>
     </ydim>
   </evaluation>
   <evaluation>
@@ -323,7 +323,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>(staatsangehoerigkeit = 29 AND staatsangehoerigkeit_weitere = 193)</where>
+          <where>(staatsangehoerigkeit = 29 AND staatsangehoerigkeit_weitere in (-1, -3, 193))</where>
       </ydim>
       <ydim>
           <label>Andere</label>