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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-12-20 11:02:12 +0100 (Mon, 20 Dec 2010)
New Revision: 4403

Modified:
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
* jmdweb/public/xml/eval_zielgruppe.xml: Issue1407: Adapted
evaluation. Now "CM" and "Beratungskunden" are count. Sum of both may
be larger than 100%.


Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2010-12-17 10:11:50 UTC (rev 4402)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2010-12-20 10:02:12 UTC (rev 4403)
@@ -580,14 +580,14 @@
       <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>('%(edate)s'::date &gt;= datum_cm_start AND '%(sdate)s'::date &lt;= coalesce(datum_cm_ende, now()) and phase in (2,3))</where>
+      <where>('%(edate)s'::date &gt;= datum_cm_start AND '%(sdate)s'::date &lt;= coalesce(datum_cm_ende, now()))</where>
     </ydim>
     <ydim>
       <label>Beratung</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>('%(edate)s'::date &gt;= datum_ber_start AND '%(sdate)s'::date &lt;= coalesce(datum_ber_ende, now()) and phase in (4,5))</where>
+      <where>('%(edate)s'::date &gt;= datum_ber_start AND '%(sdate)s'::date &lt;= coalesce(datum_ber_ende, now()))</where>
     </ydim>
   </evaluation>
 </evaluationset>