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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-06-09 12:21:37 +0200 (Thu, 09 Jun 2011)
New Revision: 5097

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
Log:
issue2201: write new evaluations

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-06-09 10:16:50 UTC (rev 5096)
+++ jmd/trunk/ChangeLog	2011-06-09 10:21:37 UTC (rev 5097)
@@ -1,5 +1,10 @@
 2011-06-09 Roland Geider  <roland.geider at intevation.de>
 
+	* jmdstrukturweb/public/xml/eval_struktur.xml: issue2201: write new
+	  evaluations
+
+2011-06-09 Roland Geider  <roland.geider at intevation.de>
+
 	* jmdstrukturweb/public/formed/formedtree.xml: issue2201: add
 	  new dropdown
 

Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-06-09 10:16:50 UTC (rev 5096)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-06-09 10:21:37 UTC (rev 5097)
@@ -49,10 +49,10 @@
       </ydim>
   </evaluation>
   
-  <!--
+
   <evaluation>
       <id>3</id>
-      <name>Integrationskurträger - TODO</name>
+      <name>Integrationskurträger</name>
       <desc>Der Träger vor Ort ist auch Integrationskurträger</desc>
       <basequery>
           <table>master_tbl_eval_total_view</table>
@@ -60,20 +60,19 @@
           <where>(TRUE)</where>
       </basequery>
       <xdim>
-          <label>Zuständigkeitsbereich</label>
-          <field>integrationskurstraeger</field>
-          <table>integrationskurstraeger_tbl</table>
-          <join>integrationskurstraeger</join>
+          <label>Integrationskurträger</label>
+          <field>traeger_integrationskurs</field>
+          <table>traeger_integrationskurs_tbl</table>
+          <join>traeger_integrationskurs</join>
       </xdim>
-      <xdim>
+      <ydim>
           <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>
+          <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>
+      </ydim>
   </evaluation>
-  
-  
+<!--  
   <evaluation>
       <id>4</id>
       <name>Jugendsprachkurse - TODO</name>