[Mpuls-commits] r4428 - jmd/trunk/jmdweb/public/xml

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-12-27 12:17:00 +0100 (Mon, 27 Dec 2010)
New Revision: 4428

Modified:
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
Issue963


Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2010-12-27 11:10:39 UTC (rev 4427)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2010-12-27 11:17:00 UTC (rev 4428)
@@ -23,7 +23,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>((geburtsdatum = '0001-01-01'::date) or (geburtsdatum is NULL))</where>
+      <where>((datum_ea_start = '0001-01-01'::date) or (datum_ea_start is NULL) or (geburtsdatum = '0001-01-01'::date) or (geburtsdatum is NULL))</where>
     </ydim>
     <ydim>
       <label>jünger als 12 Jahre</label>
@@ -76,7 +76,7 @@
     <basequery>
       <table>master_tbl_eval_total_view</table>
       <template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
-      <where>((geburtsdatum = '0001-01-01'::date) or (geburtsdatum is NULL))</where>
+      <where>((datum_ea_start = '0001-01-01'::date) or (datum_ea_start is NULL) or (geburtsdatum = '0001-01-01'::date) or (geburtsdatum is NULL))</where>
     </basequery>
     <xdim>
       <label>Geschlecht</label>
@@ -223,7 +223,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>(((einreisedatum = '0001-01-01'::date) or (einreisedatum is NULL))and geburtsland != 29)</where>
+          <where>(((datum_ea_start = '0001-01-01'::date) or (datum_ea_start is NULL)) or ((einreisedatum = '0001-01-01'::date) or (einreisedatum is NULL)) and geburtsland != 29)</where>
       </ydim>
       <ydim>
           <label>Zuzug im letzten Jahr</label>