[Mpuls-commits] r4274 - jmd/trunk/jmdweb/public/xml
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Nov 30 12:00:40 CET 2010
Author: torsten
Date: 2010-11-30 12:00:38 +0100 (Tue, 30 Nov 2010)
New Revision: 4274
Modified:
jmd/trunk/jmdweb/public/xml/eval_analyse.xml
jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
Issue963
Modified: jmd/trunk/jmdweb/public/xml/eval_analyse.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_analyse.xml 2010-11-30 10:20:43 UTC (rev 4273)
+++ jmd/trunk/jmdweb/public/xml/eval_analyse.xml 2010-11-30 11:00:38 UTC (rev 4274)
@@ -47,6 +47,7 @@
<join>phase</join>
</ydim>
</evaluation>
+ <!--
<evaluation>
<id>3</id>
<name>Validität in Phasen</name>
@@ -69,4 +70,5 @@
<join>tag_id</join>
</ydim>
</evaluation>
+ -->
</evaluationset>
Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml 2010-11-30 10:20:43 UTC (rev 4273)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml 2010-11-30 11:00:38 UTC (rev 4274)
@@ -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 in (NULL, '0001-01-01'::date))</where>
+ <where>((geburtsdatum = '0001-01-01'::date) or (geburtsdatum is NULL))</where>
</ydim>
<ydim>
<label>jünger als 12 Jahre</label>
@@ -59,7 +59,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('%(edate)s'::date, geburtsdatum)) > 27)</where>
+ <where>(date_part('year', age('%(edate)s'::date, geburtsdatum)) > 27 and geburtsdatum != '0001-01-01'::date)</where>
</ydim>
<ydim>
<label>Gesamt</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 in (NULL, '0001-01-01'::date))</where>
+ <where>((geburtsdatum = '0001-01-01'::date) or (geburtsdatum is NULL))</where>
</basequery>
<xdim>
<label>Geschlecht</label>
@@ -186,7 +186,7 @@
<basequery>
<table>master_tbl_eval_total_view</table>
<template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
- <where>(date_part('year', age('%(edate)s'::date, geburtsdatum)) > 27)</where>
+ <where>(date_part('year', age('%(edate)s'::date, geburtsdatum)) > 27 and geburtsdatum != '0001-01-01'::date)</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 in (NULL, '0001-01-01'::date))</where>
+ <where>(((einreisedatum = '0001-01-01'::date) or (einreisedatum is NULL))and geburtsland != 29)</where>
</ydim>
<ydim>
<label>Zuzug im letzten Jahr</label>
@@ -231,7 +231,7 @@
<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('%(edate)s'::date, einreisedatum)) >= 1
- AND date_part('year', age('%(edate)s'::date, einreisedatum)) < 3)</where>
+ AND date_part('year', age('%(edate)s'::date, einreisedatum)) < 3 and geburtsland != 29)</where>
</ydim>
<ydim>
<label>Zuzug zwischen 3 und 6 Jahren</label>
@@ -239,7 +239,7 @@
<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('%(edate)s'::date, einreisedatum)) >= 3
- AND date_part('year', age('%(edate)s'::date, einreisedatum)) < 6)</where>
+ AND date_part('year', age('%(edate)s'::date, einreisedatum)) < 6 and geburtsland != 29)</where>
</ydim>
<ydim>
<label>Zuzug zwischen 6 und 10 Jahren</label>
@@ -247,14 +247,14 @@
<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('%(edate)s'::date, einreisedatum)) >= 6
- AND date_part('year', age('%(edate)s'::date, einreisedatum)) < 10)</where>
+ AND date_part('year', age('%(edate)s'::date, einreisedatum)) < 10 and geburtsland != 29)</where>
</ydim>
<ydim>
<label>Zuzug vor mehr als 10 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>
- <where>(date_part('year', age('%(edate)s'::date, einreisedatum)) >= 10)</where>
+ <where>(date_part('year', age('%(edate)s'::date, einreisedatum)) >= 10 and einreisedatum != '0001-01-01'::date and geburtsland != 29)</where>
</ydim>
<ydim>
<label>Seit der Geburt in Deutschland</label>
@@ -283,23 +283,23 @@
</xdim>
<ydim>
<label>Muttersprache</label>
- <field>sprache_zuhause</field>
+ <field>muttersprache</field>
<table>(SELECT * FROM muttersprache_tbl WHERE id IN (3,11,115,14,18,19,23,29,33,71,38,39,52,76,77,80,81,86,91,104,107,111))</table>
- <join>sprache_zuhause</join>
+ <join>muttersprache</join>
</ydim>
<ydim>
<label>Andere</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>(sprache_zuhause NOT IN (-1,-3,3,11,115,14,18,19,23,29,33,71,38,39,52,76,77,80,81,86,91,104,107,111))</where>
+ <where>(muttersprache NOT IN (-1,-3,3,11,115,14,18,19,23,29,33,71,38,39,52,76,77,80,81,86,91,104,107,111))</where>
</ydim>
<ydim>
<label>unbekannt/keine Angabe</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>(sprache_zuhause IN (-3,-1))</where>
+ <where>(muttersprache IN (-3,-1))</where>
</ydim>
</evaluation>
More information about the Mpuls-commits
mailing list