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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-07-15 11:07:50 +0200 (Fri, 15 Jul 2011)
New Revision: 5171

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdstruktur.json
   jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
Log:
add evaluation for non full-time employees in 'stellenanteile'

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-07-15 07:52:17 UTC (rev 5170)
+++ jmd/trunk/ChangeLog	2011-07-15 09:07:50 UTC (rev 5171)
@@ -1,3 +1,8 @@
+2011-07-15 Roland Geider <roland.geider at intevation.de>
+
+	* jmdstrukturweb/public/xml/eval_struktur.xml: add evaluation for non
+	  full-time employees in 'stellenanteile'
+
 2011-07-14 Roland Geider <roland.geider at intevation.de>
 
 	* jmdstrukturweb/public/formed/formedtree.xml: typo

Modified: jmd/trunk/jmdstruktur.json
===================================================================
--- jmd/trunk/jmdstruktur.json	2011-07-15 07:52:17 UTC (rev 5170)
+++ jmd/trunk/jmdstruktur.json	2011-07-15 09:07:50 UTC (rev 5171)
@@ -2,7 +2,7 @@
 	"module": {
 		"casemanagement": "1",
 		"appointments": "0",
-		"evaluation": "1",
+		"evaluation": "0",
 		"documents": "0",
 		"news": "0"
 	},

Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-07-15 07:52:17 UTC (rev 5170)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml	2011-07-15 09:07:50 UTC (rev 5171)
@@ -271,6 +271,33 @@
     </ydim>
   </evaluation>
   <evaluation>
+      <id>34</id>
+      <requirement>
+          <phase>1</phase>
+      </requirement>
+      <name>Personelle Ausstattung</name>
+      <desc>Honorarkräfte - in Stellenanteile</desc>
+      <basequery>
+          <table>master_tbl_eval_total_view</table>
+          <template>SELECT id, anzahl_nha_stellenteile, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+          <where>(TRUE)</where>
+          <aggregate>(SUM(anzahl_nha_stellenteile))</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>14</id>
     <requirement>
       <phase>1</phase>