[Mpuls-commits] r2685 - in wasko/branches/2.0: . jmdweb/public/formed jmdweb/public/xml

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-05-07 09:29:09 +0200 (Fri, 07 May 2010)
New Revision: 2685

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/jmdweb/public/formed/sprachen.xml
   wasko/branches/2.0/jmdweb/public/xml/eval_zielgruppe.xml
Log:
New rules for analysis. Added missing languages

Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-05-06 15:17:39 UTC (rev 2684)
+++ wasko/branches/2.0/ChangeLog	2010-05-07 07:29:09 UTC (rev 2685)
@@ -1,3 +1,8 @@
+2010-05-07  Roland Geider <roland.geider at intevation.de>
+
+	* jmdweb/public/xml/eval_zielgruppe.xml: New rules for analysis
+        * jmdweb/public/formed/sprachen.xml: added two missing languages
+
 2010-05-06  Torsten Irländer <torsten.irlaender at intevation.de>
 
 	* mpulsweb/lib/helpers.py (get_phasesuccessors): Method now used phase

Modified: wasko/branches/2.0/jmdweb/public/formed/sprachen.xml
===================================================================
--- wasko/branches/2.0/jmdweb/public/formed/sprachen.xml	2010-05-06 15:17:39 UTC (rev 2684)
+++ wasko/branches/2.0/jmdweb/public/formed/sprachen.xml	2010-05-07 07:29:09 UTC (rev 2685)
@@ -13,6 +13,7 @@
         <bool value="9" description="Azeri"/>
         <bool value="10" description="Baskisch"/>
         <bool value="11" description="Bengali"/>
+        <bool value="115" description="Bosnisch"/>
         <bool value="12" description="Bulgarisch"/>
         <bool value="13" description="Burmesisch"/>
         <bool value="14" description="Chinesisch"/>
@@ -70,6 +71,7 @@
         <bool value="66" description="Moabitisch"/>
         <bool value="67" description="Moldawisch"/>
         <bool value="68" description="Mongolisch"/>
+        <bool value="116" description="Montenegrinisch (Montenegro)"/>
         <bool value="69" description="Nabatäisch"/>
         <bool value="70" description="Nepalesisch"/>
         <bool value="71" description="Niederländisch"/>

Modified: wasko/branches/2.0/jmdweb/public/xml/eval_zielgruppe.xml
===================================================================
--- wasko/branches/2.0/jmdweb/public/xml/eval_zielgruppe.xml	2010-05-06 15:17:39 UTC (rev 2684)
+++ wasko/branches/2.0/jmdweb/public/xml/eval_zielgruppe.xml	2010-05-07 07:29:09 UTC (rev 2685)
@@ -423,4 +423,27 @@
           <join>zugang</join>
       </ydim>
   </evaluation>
+  
+  <evaluation>
+      <id>16</id>
+      <name>Förderbedarf des/r Jugendlichen</name>
+      <desc>Förderbedarf des/r Jugendlichen</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>
 </evaluationset>