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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-04-28 12:22:10 +0200 (Thu, 28 Apr 2011)
New Revision: 4930

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
issue2061: Auswertung: Dauer des Aufenthalts

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-04-27 15:33:00 UTC (rev 4929)
+++ jmd/trunk/ChangeLog	2011-04-28 10:22:10 UTC (rev 4930)
@@ -1,3 +1,8 @@
+2011-04-28  Roland Geider  <roland.geider at intevation.de>
+
+	* jmdweb/public/xml/eval_zielgruppe.xml: issue2061: Auswertung: Dauer
+	  des Aufenthalts
+
 2011-04-26  Roland Geider  <roland.geider at intevation.de>
 
 	* jmdweb/templates/error/error.mako: issue1982: add template to

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-04-27 15:33:00 UTC (rev 4929)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-04-28 10:22:10 UTC (rev 4930)
@@ -223,18 +223,18 @@
           <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>(((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>
+          <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>
           <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(datum_ea_start, einreisedatum)) &gt;= 1
+          <where>(date_part('year', age(datum_ea_start, einreisedatum)) &gt;= 0
               AND date_part('year', age(datum_ea_start, einreisedatum)) &lt; 3 and geburtsland != 29)</where>
       </ydim>
       <ydim>
-          <label>Zuzug zwischen 3 und 6 Jahren</label>
+          <label>Zuzug zwischen 3 und 5 Jahren</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>