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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-05-12 15:54:16 +0200 (Thu, 12 May 2011)
New Revision: 4965

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
Log:
issue1996: Commented evaluations

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-05-12 12:00:03 UTC (rev 4964)
+++ jmd/trunk/ChangeLog	2011-05-12 13:54:16 UTC (rev 4965)
@@ -1,5 +1,10 @@
 2011-05-12 Roland Geider  <roland.geider at intevation.de>
 
+	* jmdstrukturweb/public/xml/eval_struktur.xml: issue1996: Commented
+	  evaluations. A DB upadate is needed for 2 additional fields.
+
+2011-05-12 Roland Geider  <roland.geider at intevation.de>
+
 	* jmdstrukturweb/public/xml/eval_netzwerk.xml,
 	  jmdstrukturweb/public/xml/eval_struktur.xml: issue1996: Some fixes
 

Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-05-12 12:00:03 UTC (rev 4964)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-05-12 13:54:16 UTC (rev 4965)
@@ -49,28 +49,28 @@
       </ydim>
   </evaluation>
   
+  <!--
   <evaluation>
       <id>3</id>
       <name>Integrationskurträger - TODO</name>
       <desc>Der Träger vor Ort ist auch Integrationskurträger</desc>
       <basequery>
           <table>master_tbl_eval_total_view</table>
-          <template>SELECT t.id, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_kooperationsbezug_tbl_view r ON r.master_id = t.id WHERE %(where)s</template>
+          <template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
           <where>(TRUE)</where>
       </basequery>
       <xdim>
+          <label>Zuständigkeitsbereich</label>
+          <field>integrationskurstraeger</field>
+          <table>integrationskurstraeger_tbl</table>
+          <join>integrationskurstraeger</join>
+      </xdim>
+      <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>Gesamtzahl</label>
-          <field>institution_art</field>
-          <table>institution_art_tbl</table>
-          <join>institution_art</join>
-          <where>(institution_art = 20)</where>
-      </ydim>
   </evaluation>
   
   
@@ -80,23 +80,23 @@
       <desc>Der Träger ist auch Jugendsprachkurse an</desc>
       <basequery>
           <table>master_tbl_eval_total_view</table>
-          <template>SELECT t.id, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_kjp_gruppenangebote_tbl_view r ON r.master_id = t.id WHERE %(where)s</template>
+          <template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
           <where>(TRUE)</where>
       </basequery>
       <xdim>
+          <label>Jugendsprachkurse</label>
+          <field>jugendsprachkurse</field>
+          <table>jugendsprachkurse_tbl</table>
+          <join>jugendsprachkurse</join>
+      </xdim>
+      <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>Gesamtzahl</label>
-          <field>kjp_grp_art_angebot</field>
-          <table>kjp_grp_art_angebot_tbl</table>
-          <join>kjp_grp_art_angebot</join>
-          <where>(kjp_grp_art_angebot = 3)</where>
-      </ydim>
   </evaluation>
+  -->
   
   
   <evaluation>