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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-04-13 15:57:11 +0200 (Wed, 13 Apr 2011)
New Revision: 4904

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_cm.xml
   jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
Log:
issue2033: move evaluation

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-04-12 14:50:17 UTC (rev 4903)
+++ jmd/trunk/ChangeLog	2011-04-13 13:57:11 UTC (rev 4904)
@@ -1,3 +1,8 @@
+2011-04-13  Roland Geider  <roland.geider at intevation.de>
+
+	* jmdweb/public/xml/eval_cm.xml,
+	  jmdweb/public/xml/eval_zielgruppe.xml: issue2033: move evaluation
+
 2011-04-12  Roland Geider  <roland.geider at intevation.de>
 	
 	* jmdstrukturweb/public/formed/formedtree.xml: Issue1991: change

Modified: jmd/trunk/jmdweb/public/xml/eval_cm.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-04-12 14:50:17 UTC (rev 4903)
+++ jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-04-13 13:57:11 UTC (rev 4904)
@@ -7,6 +7,28 @@
       <phase>2,3</phase>
   </requirement>
   <evaluation>
+      <id>1</id>
+      <name>Förderbedarf des jungen Menschen</name>
+      <desc>Förderbedarf des jungen Menschen</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</field>
+          <table>fp_ziel_tbl</table>
+          <join>fp_ziel</join>
+      </ydim>
+  </evaluation>
+  <evaluation>
       <id>3</id>
       <name>Kompetenzfeststellung</name>
       <desc>Kompetenzfeststellung</desc>

Modified: jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-04-12 14:50:17 UTC (rev 4903)
+++ jmd/trunk/jmdweb/public/xml/eval_zielgruppe.xml	2011-04-13 13:57:11 UTC (rev 4904)
@@ -534,30 +534,7 @@
           <join>zugang</join>
       </ydim>
   </evaluation>
-  
   <evaluation>
-      <id>16</id>
-      <name>Förderbedarf des jungen Menschen</name>
-      <desc>Förderbedarf des jungen Menschen</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</field>
-          <table>fp_ziel_tbl</table>
-          <join>fp_ziel</join>
-      </ydim>
-  </evaluation>
-  <evaluation>
     <id>20</id>
     <requirement>
       <phase>2,3,4,5</phase>