[Mpuls-commits] r4964 - in jmd/trunk: . jmdstrukturweb/public/xml
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Thu May 12 14:00:05 CEST 2011
Author: roland
Date: 2011-05-12 14:00:03 +0200 (Thu, 12 May 2011)
New Revision: 4964
Modified:
jmd/trunk/ChangeLog
jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml
jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
Log:
issue1996: Some fixes
Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog 2011-05-11 16:56:12 UTC (rev 4963)
+++ jmd/trunk/ChangeLog 2011-05-12 12:00:03 UTC (rev 4964)
@@ -1,3 +1,8 @@
+2011-05-12 Roland Geider <roland.geider at intevation.de>
+
+ * jmdstrukturweb/public/xml/eval_netzwerk.xml,
+ jmdstrukturweb/public/xml/eval_struktur.xml: issue1996: Some fixes
+
2011-05-11 Roland Geider <roland.geider at intevation.de>
* jmdstruktur.json,
Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml 2011-05-11 16:56:12 UTC (rev 4963)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_netzwerk.xml 2011-05-12 12:00:03 UTC (rev 4964)
@@ -91,7 +91,7 @@
<ydim>
<label>Netzwerk</label>
<field>mitarbeit_netzwerk</field>
- <table>zielgruppen_netzwerk_tbl</table>
+ <table>mitarbeit_netzwerk_tbl</table>
<join>mitarbeit_netzwerk</join>
</ydim>
</evaluation>
@@ -151,13 +151,24 @@
<template>SELECT t.id, %(xfield)s, %(yfield)s from %(from)s t JOIN rg_kooperationsbezug_tbl_view r ON r.master_id = t.id WHERE %(where)s</template>
<where>(TRUE)</where>
</basequery>
+ <!--
<xdim>
<label>Vorhandensein der Institution</label>
<field>bildungsberatung_garantiefonds</field>
<table>bildungsberatung_garantiefonds_tbl</table>
<join>bildungsberatung_garantiefonds</join>
</xdim>
+ -->
+
<xdim>
+ <label>Vorhandensein der Institution - ZU KLAEREN</label>
+ <field>(CASE WHEN (institution_ist NOT IN (-3, -1) OR institution_angaben NOT IN (-3, -1))
+ THEN 0
+ ELSE 1 END) AS bildungsberatung_garantiefonds</field>
+ <table>bildungsberatung_garantiefonds_tbl</table>
+ <join>bildungsberatung_garantiefonds</join>
+ </xdim>
+ <xdim>
<label>Kooperationsbezüge</label>
<field>institution_ist</field>
<table>institution_ist_tbl</table>
Modified: jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml
===================================================================
--- jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml 2011-05-11 16:56:12 UTC (rev 4963)
+++ jmd/trunk/jmdstrukturweb/public/xml/eval_struktur.xml 2011-05-12 12:00:03 UTC (rev 4964)
@@ -196,7 +196,7 @@
</ydim>
</evaluation>
<evaluation>
- <id>12</id>
+ <id>13</id>
<name>Personelle Austattung</name>
<desc>Hauptamtliche - mit Migrationshintergrund</desc>
<basequery>
@@ -457,7 +457,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_begleitung_cm, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_begleitung_cm))</aggregate>
+ <aggregate>(SUM(verteilung_aa_begleitung_cm) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -482,7 +482,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_betreuung, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_betreuung))</aggregate>
+ <aggregate>(SUM(verteilung_aa_betreuung) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -507,7 +507,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_gruppenangebote, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_gruppenangebote))</aggregate>
+ <aggregate>(SUM(verteilung_aa_gruppenangebote) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -532,7 +532,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_netzwerkarbeit, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_netzwerkarbeit))</aggregate>
+ <aggregate>(SUM(verteilung_aa_netzwerkarbeit) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -557,7 +557,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_oeffentlichkeit, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_oeffentlichkeit))</aggregate>
+ <aggregate>(SUM(verteilung_aa_oeffentlichkeit) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -582,7 +582,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_evaluation, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_evaluation))</aggregate>
+ <aggregate>(SUM(verteilung_aa_evaluation) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -601,13 +601,13 @@
<evaluation>
<id>26</id>
- <name>Dokumentation</name>
- <desc>Sozialpädagogische Angebote</desc>
+ <name>Prozentuale Aufteilung der Arbeit</name>
+ <desc>Dokumentation</desc>
<basequery>
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_dokumentation, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_dokumentation))</aggregate>
+ <aggregate>(SUM(verteilung_aa_dokumentation) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -632,7 +632,7 @@
<table>master_tbl_eval_total_view</table>
<template>SELECT id, verteilung_aa_sonstiges, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
<where>(TRUE)</where>
- <aggregate>(SUM(verteilung_aa_sonstiges))</aggregate>
+ <aggregate>(SUM(verteilung_aa_sonstiges) / count(DISTINCT m.id))</aggregate>
</basequery>
<xdim>
<label>Anzahl</label>
@@ -649,8 +649,83 @@
</ydim>
</evaluation>
+ <evaluation>
+ <id>28</id>
+ <name>Prozentuale Aufteilung der Arbeit</name>
+ <desc>Management/Leitungsaufgaben</desc>
+ <basequery>
+ <table>master_tbl_eval_total_view</table>
+ <template>SELECT id, verteilung_aa_leitung, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+ <where>(TRUE)</where>
+ <aggregate>(SUM(verteilung_aa_leitung) / count(DISTINCT m.id))</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>30</id>
+ <name>Prozentuale Aufteilung der Arbeit</name>
+ <desc>Elternarbeit</desc>
+ <basequery>
+ <table>master_tbl_eval_total_view</table>
+ <template>SELECT id, verteilung_aa_elternarbeit, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+ <where>(TRUE)</where>
+ <aggregate>(SUM(verteilung_aa_elternarbeit) / count(DISTINCT m.id))</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>31</id>
+ <name>Prozentuale Aufteilung der Arbeit</name>
+ <desc>Freiwilligenarbeit</desc>
+ <basequery>
+ <table>master_tbl_eval_total_view</table>
+ <template>SELECT id, verteilung_aa_freiwilligenarbeit, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
+ <where>(TRUE)</where>
+ <aggregate>(SUM(verteilung_aa_freiwilligenarbeit) / count(DISTINCT m.id))</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>9</id>
<name>Bildungsberatung Garantiefonds Hochschule</name>
<desc>Angaben zu Bildungsberatung Garantiefonds Hochschule</desc>
More information about the Mpuls-commits
mailing list