[Mpuls-commits] r609 - in wasko/branches/1.0: . waskaweb/controllers waskaweb/public/xml

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-09-24 10:47:28 +0200 (Thu, 24 Sep 2009)
New Revision: 609

Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/controllers/evaluate.py
   wasko/branches/1.0/waskaweb/public/xml/eval_adele.xml
   wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml
Log:
Fixed evaluations for db without rg


Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2009-09-23 15:06:44 UTC (rev 608)
+++ wasko/branches/1.0/ChangeLog.txt	2009-09-24 08:47:28 UTC (rev 609)
@@ -1,3 +1,12 @@
+2009-09-24	Torsten Irlaender	<torsten.irlaender at intevation.de> 
+
+	Fixed evaluations on db without rg
+
+	* waskaweb/controllers/evaluate.py: Fixed start and end date parameter
+	* waskaweb/public/xml/eval_adele.xml,
+	  waskaweb/public/xml/eval_tagebuch.xml: Adopted evaluations for db
+	  without rg.
+
 2009-09-23	Torsten Irlaender	<torsten.irlaender at intevation.de> 
 
 	Perform evaluations in with default options (No integration with

Modified: wasko/branches/1.0/waskaweb/controllers/evaluate.py
===================================================================
--- wasko/branches/1.0/waskaweb/controllers/evaluate.py	2009-09-23 15:06:44 UTC (rev 608)
+++ wasko/branches/1.0/waskaweb/controllers/evaluate.py	2009-09-24 08:47:28 UTC (rev 609)
@@ -133,8 +133,8 @@
                     evalconfig   = EvaluationConfig(
                                     get_configfile(form_result['id']),
                                     conn,
-                                    form_result['start_date'], 
-                                    form_result['end_date'],
+                                    str(form_result['start_date']), 
+                                    str(form_result['end_date']),
                                     form_result['start_date_field'], 
                                     form_result['end_date_field'], 
                                     None,

Modified: wasko/branches/1.0/waskaweb/public/xml/eval_adele.xml
===================================================================
--- wasko/branches/1.0/waskaweb/public/xml/eval_adele.xml	2009-09-23 15:06:44 UTC (rev 608)
+++ wasko/branches/1.0/waskaweb/public/xml/eval_adele.xml	2009-09-24 08:47:28 UTC (rev 609)
@@ -230,7 +230,7 @@
     <desc>Zeigt die Anzahl der Menschen mit Behinderung. Ein Behinderung besteht, wenn in den Angaben zur Entwicklung des jungen Menschen eine anerkannte Behinderung dokumentiert wurde.</desc>
     <basequery>
       <table>master_tbl_view</table>
-      <template>SELECT t.id, r.entw_beh, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_kompetenz_tbl r ON t.id = r.master_id  WHERE %(where)s</template>
+      <template>SELECT t.id, t.entw_beh, %(xfield)s, %(yfield)s from %(from)s t WHERE %(where)s</template>
       <where>('%(edate)s'::date &gt;= datum_cm_start AND '%(sdate)s'::date &lt;= coalesce(datum_cm_ende, now()))</where>
     </basequery>
     <xdim>
@@ -244,7 +244,7 @@
       <field>(select count(id) from master_tbl_view) as anzahl</field>
       <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_view)</table>
       <join>anzahl</join>
-      <where>(r.entw_beh = 1)</where>
+      <where>(t.entw_beh = 1)</where>
     </ydim>
   </evaluation>
   <evaluation>
@@ -253,7 +253,7 @@
     <desc>Zeigt die Anzahl der Menschen mit sonstiger Benachteiligung. Ein Benachteiligung besteht, wenn in den Angaben zur Entwicklung des jungen Menschen eine a) physische, oder b) psychische Krankheit dokumentiert wurde (geringes Problem oder größer).</desc>
     <basequery>
       <table>master_tbl_view</table>
-      <template>SELECT t.id, r.entw_h, r.entw_i, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_kompetenz_tbl r ON t.id = r.master_id  WHERE %(where)s</template>
+      <template>SELECT t.id, t.entw_h_1, t.entw_i_1, %(xfield)s, %(yfield)s from %(from)s t WHERE %(where)s</template>
       <where>('%(edate)s'::date &gt;= datum_cm_start AND '%(sdate)s'::date &lt;= coalesce(datum_cm_ende, now()))</where>
     </basequery>
     <xdim>
@@ -267,7 +267,7 @@
       <field>(select count(id) from master_tbl_view) as anzahl</field>
       <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_view)</table>
       <join>anzahl</join>
-      <where>(r.entw_h > 1 or r.entw_i > 1)</where>
+      <where>(t.entw_h_1 > 1 or t.entw_i_1 > 1)</where>
     </ydim>
   </evaluation>
   <evaluation>

Modified: wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml
===================================================================
--- wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml	2009-09-23 15:06:44 UTC (rev 608)
+++ wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml	2009-09-24 08:47:28 UTC (rev 609)
@@ -16,7 +16,7 @@
       <phase>2</phase>
     </requirement>
     <basequery>
-      <table>(select p.id, p.geschlecht, l.art, l.dauer from ka_logbuch_tbl l join master_tbl_view p on l.master_id = p.id) zzz</table>
+      <table>(select p.id, p.geschlecht, l.art, l.dauer from ka_logbuch_tbl_view l join master_tbl_view p on l.master_id = p.id) zzz</table>
       <template>SELECT id, EXTRACT(epoch FROM dauer) as dauer, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
       <where>TRUE</where>
       <aggregate>sum(m.dauer)/60</aggregate>