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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-03-22 14:57:54 +0100 (Tue, 22 Mar 2011)
New Revision: 4807

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_cm.xml
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
issue1861: expand evaluation to sucessful objectives and move it to 'eval_cm.xml'

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-03-22 12:51:20 UTC (rev 4806)
+++ jmd/trunk/ChangeLog	2011-03-22 13:57:54 UTC (rev 4807)
@@ -1,3 +1,9 @@
+2011-03-22  Roland Geider <roland.geider at intevation.de>
+
+	* jmdweb/public/xml/eval_cm.xml,
+	  jmdweb/public/xml/eval_zielgruppe.xml:  issue1861: expand evaluation to
+	  sucessful objectives and move it to 'eval_cm.xml'
+
 2011-03-21  Roland Geider <roland.geider at intevation.de>
 
 	* jmdweb/public/xml/eval_zielgruppe.xml: fix evaluation so that ages

Modified: jmd/trunk/jmdweb/public/xml/eval_cm.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-03-22 12:51:20 UTC (rev 4806)
+++ jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-03-22 13:57:54 UTC (rev 4807)
@@ -336,4 +336,51 @@
           <join>verbleib_jugendliche</join>
       </ydim>
   </evaluation>
+
+  <evaluation>
+    <id>14</id>
+    <name>Erreichte Ziele</name>
+    <desc>Erfolgreich erreichte Ziele</desc>
+    <basequery>
+        <table>master_tbl_eval_total_view</table>
+        <template>SELECT t.id, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_ziele_tbl_view r ON r.master_id = t.id WHERE %(where)s</template>
+        <where>(r.fp_ziel_erreicht = 1)</where>
+    </basequery>
+    <xdim>
+        <label>Geschlecht</label>
+        <field>geschlecht</field>
+        <table>geschlecht_tbl</table>
+        <join>geschlecht</join>
+    </xdim>
+    <ydim>
+        <label>Ziel</label>
+        <field>(SELECT count(id) FROM rg_ziele_tbl_view) as anzahl</field>
+        <table>(select DISTINCT count(id) as id, 'Gesamt' as value from rg_ziele_tbl_view)</table>
+        <join>anzahl</join>
+    </ydim>
+  </evaluation>
+  
+  <evaluation>
+    <id>15</id>
+    <name>Vereinbarte Ziele</name>
+    <desc>Alle vereinbarte Ziele</desc>
+    <basequery>
+        <table>master_tbl_eval_total_view</table>
+        <template>SELECT t.id, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_ziele_tbl_view r ON r.master_id = t.id 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>Ziel</label>
+        <field>fp_ziel_erreicht</field>
+        <table>war_bereits_kunde_tbl</table>
+        <join>fp_ziel_erreicht</join>
+    </ydim>
+  </evaluation>
+
 </evaluationset>

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-03-22 12:51:20 UTC (rev 4806)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-03-22 13:57:54 UTC (rev 4807)
@@ -590,26 +590,4 @@
       <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>
-  <evaluation>
-    <id>21</id>
-    <name>Zielerreichung</name>
-    <desc>Zielerreichung</desc>
-    <basequery>
-        <table>master_tbl_eval_total_view</table>
-        <template>SELECT t.id, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_ziele_tbl_view r ON r.master_id = t.id 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>Ziel</label>
-        <field>fp_ziel_erreicht</field>
-        <table>war_bereits_kunde_tbl</table>
-        <join>fp_ziel_erreicht</join>
-    </ydim>
-  </evaluation>
 </evaluationset>