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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-06-08 16:17:49 +0200 (Wed, 08 Jun 2011)
New Revision: 5087

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/xml/eval_cm.xml
Log:
issue2190: require more sensible phases, move evaluation to front

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-06-08 14:12:19 UTC (rev 5086)
+++ jmd/trunk/ChangeLog	2011-06-08 14:17:49 UTC (rev 5087)
@@ -1,5 +1,10 @@
 2011-06-08 Roland Geider  <roland.geider at intevation.de>
 
+	* jmdweb/public/xml/eval_cm.xml: issue2190: require more sensible
+	  phases, move evaluation to front
+
+2011-06-08 Roland Geider  <roland.geider at intevation.de>
+
 	* jmd.json,
 	  jmdweb/lib/search.py: issue2059: add gender to search options
 

Modified: jmd/trunk/jmdweb/public/xml/eval_cm.xml
===================================================================
--- jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-06-08 14:12:19 UTC (rev 5086)
+++ jmd/trunk/jmdweb/public/xml/eval_cm.xml	2011-06-08 14:17:49 UTC (rev 5087)
@@ -67,7 +67,59 @@
   </evaluation>
   
   <evaluation>
+      <id>14</id>
       <requirement>
+          <phase>2, 3</phase>
+      </requirement>
+      <name>Anzahl der vereinbarten Ziele</name>
+      <desc>Anzahl der vereinbarten Ziele</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>Gesamt</label>
+          <field>(SELECT count(id) FROM rg_ziele_tbl_view) as anzahl</field>
+          <table>(select DISTINCT count(id) as id, 'Gesamt' as value from rg_ziele_tbl_view)</table>
+          <join>anzahl</join>
+      </ydim>
+  </evaluation>
+  
+  <evaluation>
+      <id>15</id>
+      <requirement>
+          <phase>2,3</phase>
+      </requirement>
+      <name>Anzahl der erreichten Ziele</name>
+      <desc>Anzahl der erreichten Ziele</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>
+  
+  <evaluation>
+      <requirement>
           <phase>3</phase>
       </requirement>
       <id>4</id>
@@ -358,57 +410,5 @@
           <join>verbleib_jugendliche</join>
       </ydim>
   </evaluation>
-  
-  <evaluation>
-      <id>14</id>
-      <requirement>
-          <phase>3</phase>
-      </requirement>
-      <name>Anzahl der vereinbarten Ziele</name>
-      <desc>Anzahl der vereinbarten Ziele</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>Gesamt</label>
-          <field>(SELECT count(id) FROM rg_ziele_tbl_view) as anzahl</field>
-          <table>(select DISTINCT count(id) as id, 'Gesamt' as value from rg_ziele_tbl_view)</table>
-          <join>anzahl</join>
-      </ydim>
-  </evaluation>
-  
-  <evaluation>
-      <id>15</id>
-      <requirement>
-          <phase>3</phase>
-      </requirement>
-      <name>Anzahl der erreichten Ziele</name>
-      <desc>Anzahl der erreichten Ziele</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>