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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-12-02 12:47:23 +0100 (Thu, 02 Dec 2010)
New Revision: 4307

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
Issue1407: Added new Evaluation to calculate "CM" and "Beratung"



Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2010-12-02 11:16:45 UTC (rev 4306)
+++ jmd/trunk/ChangeLog	2010-12-02 11:47:23 UTC (rev 4307)
@@ -6,6 +6,8 @@
 	jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.mo,
 	jmdstrukturweb/i18n/de/LC_MESSAGES/mpulsweb.po: Issue 1424: Added
 	specific translations for jmdstrukturteil. 
+	* jmdweb/public/xml/eval_zielgruppe.xml: Issue1407: Added new
+	Evaluation to calculate "CM" and "Beratung"
 
 2010-12-01  Torsten Irlaender <torsten at intevation.de>
 

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2010-12-02 11:16:45 UTC (rev 4306)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2010-12-02 11:47:23 UTC (rev 4307)
@@ -557,4 +557,37 @@
           <join>fp_ziel</join>
       </ydim>
   </evaluation>
+  <evaluation>
+    <id>20</id>
+    <requirement>
+      <phase>2,3,4,5</phase>
+    </requirement>
+    <name>Verteilung Art der Begleitung insgesamt</name>
+    <desc>Zeigt die Gesamtzahl der begleiteten jungen Menschen aufgeteilt nach der Art der Begeleitung.</desc>
+    <basequery>
+      <table>master_tbl_eval_total_view</table>
+      <template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+      <where>(TRUE)</where>
+    </basequery>
+    <xdim>
+      <label>Geschlecht</label>
+      <field>geschlecht</field>
+      <table>geschlecht_tbl</table>
+      <join>geschlecht</join>
+    </xdim>
+    <ydim>
+      <label>CM</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_cm_start AND '%(sdate)s'::date &lt;= coalesce(datum_cm_ende, now()) and phase in (2,3))</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>
+    </ydim>
+  </evaluation>
 </evaluationset>