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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-09-29 16:00:35 +0200 (Thu, 29 Sep 2011)
New Revision: 5400

Modified:
   jmd/trunk/jmdweb/public/xml/eval_cm.xml
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
issue2070: add a new 'total' row to some evaluations


Modified: jmd/trunk/jmdweb/public/xml/eval_cm.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-09-29 13:30:01 UTC (rev 5399)
+++ jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-09-29 14:00:35 UTC (rev 5400)
@@ -64,6 +64,13 @@
           <join>anzahl</join>
           <where>(kompetenzfeststellung not in (0,1))</where>
       </ydim>
+       <ydim>
+          <label>Gesamt</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>(TRUE)</where>
+      </ydim>
   </evaluation>
   
   <evaluation>

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-09-29 13:30:01 UTC (rev 5399)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-09-29 14:00:35 UTC (rev 5400)
@@ -263,6 +263,13 @@
           <join>anzahl</join>
           <where>(geburtsland = 29)</where>
       </ydim>
+      <ydim>
+          <label>Gesamt</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>(TRUE)</where>
+      </ydim>
   </evaluation>
   
   
@@ -301,6 +308,13 @@
           <join>anzahl</join>
           <where>(muttersprache IN (-3,-1))</where>
       </ydim>
+      <ydim>
+          <label>Gesamt</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>(TRUE)</where>
+      </ydim>
   </evaluation>
   
   <evaluation>
@@ -346,6 +360,13 @@
           <join>anzahl</join>
           <where>(staatsangehoerigkeit in (-1, -3))</where>
       </ydim>
+      <ydim>
+          <label>Gesamt</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>(TRUE)</where>
+      </ydim>
   </evaluation>
   
   <evaluation>
@@ -566,5 +587,13 @@
       <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>
     </ydim>
+    <ydim>
+      <label>Gesamt</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)) 
+           OR ('%(edate)s'::date &gt;= datum_cm_start AND '%(sdate)s'::date &lt;= coalesce(datum_cm_ende, now()) AND phase in (2,3)) )</where>
+    </ydim>
   </evaluation>
 </evaluationset>