[Mpuls-commits] r622 - in wasko/branches/1.0: . waskaweb/public/xml
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Oct 6 12:24:28 CEST 2009
Author: torsten
Date: 2009-10-06 12:24:26 +0200 (Tue, 06 Oct 2009)
New Revision: 622
Modified:
wasko/branches/1.0/ChangeLog.txt
wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml
wasko/branches/1.0/waskaweb/public/xml/eval_zusammenfassung.xml
Log:
Fixed evaluations
Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt 2009-10-06 08:54:03 UTC (rev 621)
+++ wasko/branches/1.0/ChangeLog.txt 2009-10-06 10:24:26 UTC (rev 622)
@@ -23,6 +23,12 @@
* waskaweb/controllers/evaluate.py: Added controllers for XML and CSV
Export.
+ Fixed evaluations
+
+ * waskaweb/public/xml/eval_tagebuch.xml,
+ waskaweb/public/xml/eval_zusammenfassung.xml: Do evaluation on views
+ instead on tables
+
2009-10-05 Torsten Irlaender <torsten.irlaender at intevation.de>
Fixed logbuch evalauation
Modified: wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml
===================================================================
--- wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml 2009-10-06 08:54:03 UTC (rev 621)
+++ wasko/branches/1.0/waskaweb/public/xml/eval_tagebuch.xml 2009-10-06 10:24:26 UTC (rev 622)
@@ -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_eval_total_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_eval_total_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>
Modified: wasko/branches/1.0/waskaweb/public/xml/eval_zusammenfassung.xml
===================================================================
--- wasko/branches/1.0/waskaweb/public/xml/eval_zusammenfassung.xml 2009-10-06 08:54:03 UTC (rev 621)
+++ wasko/branches/1.0/waskaweb/public/xml/eval_zusammenfassung.xml 2009-10-06 10:24:26 UTC (rev 622)
@@ -16,7 +16,7 @@
<phase>2</phase>
</requirement>
<basequery>
- <table>( %(table)s )</table>
+ <table>master_tbl_eval_total_view</table>
<template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>('%(edate)s'::date >= datum_cm_start AND '%(sdate)s'::date <= coalesce(datum_cm_ende, now()))</where>
</basequery>
@@ -42,8 +42,8 @@
</xdim>
<ydim>
<label>Gesamtzahl Teilnehmer</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
</ydim>
</evaluation>
@@ -55,7 +55,7 @@
<phase>2</phase>
</requirement>
<basequery>
- <table>( %(table)s )</table>
+ <table>master_tbl_eval_total_view</table>
<template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>('%(sdate)s'::date <= datum_cm_start AND '%(edate)s'::date >= datum_cm_start)</where>
</basequery>
@@ -81,21 +81,21 @@
</xdim>
<ydim>
<label>Gesamtzahl Teilnehmer</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
</ydim>
<ydim>
<label>Davon Wiederaufnahmen</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
<where>(cm2c=1 AND cm_wiederauf_genehm_1 = 1 OR cm_wiederauf_genehm_2 = 1)</where>
</ydim>
<ydim>
<label>Davon Neuaufnahmen</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
<where>(cm2c=1 AND cm_neuauf_genehm = 1)</where>
</ydim>
@@ -105,7 +105,7 @@
<name>Gesamtzahl der Austritte</name>
<desc>Zeigt die Gesamtanzahl der Austritte innerhalb des Auswertungszeitraums.</desc>
<basequery>
- <table>( %(table)s )</table>
+ <table>master_tbl_eval_total_view</table>
<template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>('%(edate)s'::date >= coalesce(datum_cm_ende, now()) AND '%(sdate)s'::date <= coalesce(datum_cm_ende, now()))</where>
</basequery>
@@ -134,28 +134,28 @@
</xdim>
<ydim>
<label>Gesamtzahl Teilnehmer</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
</ydim>
<ydim>
<label>davon erfolgreiche Beendigung</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
<where>cm_end_art = 1</where>
</ydim>
<ydim>
<label>davon mit sonst. Beendigung</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
<where>cm_end_art = 2</where>
</ydim>
<ydim>
<label>davon Abbrüche</label>
- <field>(select count(id) from ( %(table)s )) as anzahl</field>
- <table>(select DISTINCT count(id) as id, 'Gesamt' as value from ( %(table)s ))</table>
+ <field>(select count(id) from master_tbl_eval_total_view) as anzahl</field>
+ <table>(select DISTINCT count(id) as id, 'Gesamt' as value from master_tbl_eval_total_view)</table>
<join>anzahl</join>
<where>cm_end_art = 3</where>
</ydim>
More information about the Mpuls-commits
mailing list