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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-03-21 11:31:42 +0100 (Mon, 21 Mar 2011)
New Revision: 4803

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
issue1861: add a new evaluation showing how many objectives where reached

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-03-21 09:52:52 UTC (rev 4802)
+++ jmd/trunk/ChangeLog	2011-03-21 10:31:42 UTC (rev 4803)
@@ -1,5 +1,10 @@
 2011-03-21  Roland Geider <roland.geider at intevation.de>
 
+	* jmdweb/public/xml/eval_zielgruppe.xml: issue1861: add a
+	  new evaluation showing how many objectives where reached
+
+2011-03-21  Roland Geider <roland.geider at intevation.de>
+
 	* jmdweb/i18n/specific_translations_in_base.txt,
 	  jmdweb/i18n/de/LC_MESSAGES/jmdweb.po,
 	  jmdweb/i18n/de/LC_MESSAGES/mpulsweb.po: issue1804: use

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-03-21 09:52:52 UTC (rev 4802)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-03-21 10:31:42 UTC (rev 4803)
@@ -41,14 +41,14 @@
       </where>
     </ydim>
     <ydim>
-      <label>14 bis 18 Jahre</label>
+      <label>15 bis 18 Jahre</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(datum_ea_start, geburtsdatum)) &gt; 14 AND date_part('year', age(datum_ea_start, geburtsdatum)) &lt;= 18)</where>
     </ydim>
     <ydim>
-      <label>18 bis 27 Jahre</label>
+      <label>19 bis 27 Jahre</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>
@@ -590,4 +590,26 @@
       <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>