[Mpuls-commits] r5116 - in jmd/trunk: . jmdstrukturweb/public/xml

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-06-21 11:18:26 +0200 (Tue, 21 Jun 2011)
New Revision: 5116

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
Log:
issue1802: add evaluations for new fields

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-06-20 12:30:43 UTC (rev 5115)
+++ jmd/trunk/ChangeLog	2011-06-21 09:18:26 UTC (rev 5116)
@@ -1,5 +1,10 @@
 2011-06-20 Roland Geider <roland.geider at intevation.de>
 
+	* jmdstrukturweb/public/xml/eval_struktur.xml: issue1802: add evaluations
+	  for new fields
+
+2011-06-20 Roland Geider <roland.geider at intevation.de>
+
 	* jmdweb/public/formed/formedtree.xml: issue2074: change wording
 
 2011-06-20 Roland Geider <roland.geider at intevation.de>

Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-06-20 12:30:43 UTC (rev 5115)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-06-21 09:18:26 UTC (rev 5116)
@@ -838,4 +838,60 @@
       <where>(TRUE)</where>
     </ydim>
   </evaluation>
+  
+  <evaluation>
+      <id>32</id>
+      <requirement>
+          <phase>1</phase>
+      </requirement>
+      <name>Elternberatung</name>
+      <desc>Anzahl der Beratungsfälle</desc>
+      <basequery>
+          <table>master_tbl_eval_total_view</table>
+          <template>SELECT id, elternberatung_anzahl, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+          <where>(TRUE)</where>
+          <aggregate>(SUM(elternberatung_anzahl))</aggregate>
+      </basequery>
+      <xdim>
+          <label>Anzahl</label>
+          <field>(select DISTINCT 1 from master_tbl_eval_total_view) as anzahl2</field>
+          <table>(select DISTINCT 1 as id, 'gesamt' as value from master_tbl_eval_total_view)</table>
+          <join>anzahl2</join>
+      </xdim>
+      <ydim>
+          <label>Anzahl</label>
+          <field>(select DISTINCT 1 from master_tbl_eval_total_view) as anzahl</field>
+          <table>(select DISTINCT 1 as id, 'gesamt' as value from master_tbl_eval_total_view)</table>
+          <join>anzahl</join>
+          <where>(TRUE)</where>
+      </ydim>
+  </evaluation>
+  
+  <evaluation>
+      <id>33</id>
+      <requirement>
+          <phase>1</phase>
+      </requirement>
+      <name>Elternberatung</name>
+      <desc>Zeitlicher Beratungsumfang in Stunden</desc>
+      <basequery>
+          <table>master_tbl_eval_total_view</table>
+          <template>SELECT id, elternberatung_stunden, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+          <where>(TRUE)</where>
+          <aggregate>(SUM(elternberatung_stunden))</aggregate>
+      </basequery>
+      <xdim>
+          <label>Anzahl</label>
+          <field>(select DISTINCT 1 from master_tbl_eval_total_view) as anzahl2</field>
+          <table>(select DISTINCT 1 as id, 'gesamt' as value from master_tbl_eval_total_view)</table>
+          <join>anzahl2</join>
+      </xdim>
+      <ydim>
+          <label>Anzahl</label>
+          <field>(select DISTINCT 1 from master_tbl_eval_total_view) as anzahl</field>
+          <table>(select DISTINCT 1 as id, 'gesamt' as value from master_tbl_eval_total_view)</table>
+          <join>anzahl</join>
+          <where>(TRUE)</where>
+      </ydim>
+  </evaluation>
 </evaluationset>