[Mpuls-commits] r4975 - in wasko/trunk: . waskoweb/public/xml

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-05-19 11:10:15 +0200 (Thu, 19 May 2011)
New Revision: 4975

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/public/xml/eval_analyse.xml
Log:
Issue1385: Adapet descriptions and labels for evaluation.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-05-18 14:48:20 UTC (rev 4974)
+++ wasko/trunk/ChangeLog	2011-05-19 09:10:15 UTC (rev 4975)
@@ -1,3 +1,8 @@
+2011-05-19  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* waskoweb/public/xml/eval_analyse.xml: Issue1385: Adapet descriptions
+	and labels for evaluation.
+
 2011-05-11  Bernhard Herzog  <bh at intevation.de>
 
 	* waskoweb/public/formed/formedtree.xml: Port db_xml2 revision
@@ -35,6 +40,7 @@
 	* waskoweb/public/formed/formedtree.xml: Port db_xml2 revision
 	588:a94ddc47172f. This removes the obsolete modes attributes.
 
+>>>>>>> .r4974
 2011-04-27 Katharina Schütze <katharina at intevation.de>
 	* waskoweb/public/formed/annotations.xhtml:
 	issue 2013 annotations for "migrationshintergrund" adapted

Modified: wasko/trunk/waskoweb/public/xml/eval_analyse.xml
===================================================================
--- wasko/trunk/waskoweb/public/xml/eval_analyse.xml	2011-05-18 14:48:20 UTC (rev 4974)
+++ wasko/trunk/waskoweb/public/xml/eval_analyse.xml	2011-05-19 09:10:15 UTC (rev 4975)
@@ -2,7 +2,7 @@
   <id>4</id>
   <version>1.0</version>
   <name>Fallaktenanalyse</name>
-  <desc>Analyse der Fallakten nach Phasen und Validität</desc>
+  <desc>Analyse der Fallakten nach Phasen und Auswertbarkeit</desc>
   <evaluation>
     <id>1</id>
     <name>Gesamtzahl</name>
@@ -49,8 +49,8 @@
   </evaluation>
   <evaluation>
     <id>3</id>
-    <name>Validität in Phasen</name>
-    <desc>Zeigt Verteilung Validitäten in den verschiedenen Phasen auf.</desc>
+    <name>Auswertbarkeit in Phasen</name>
+    <desc>Zeigt Verteilung der Auswertbarkeit in den verschiedenen Phasen auf.</desc>
     <basequery>
       <table>(select DISTINCT p.id, p.phase, p.geschlecht, l.tag_id from nm_tags_cases_view l join master_tbl_eval_total_view p on l.case_id = p.id) zzz</table>
       <template>SELECT id, %(xfield)s, %(yfield)s from %(from)s WHERE %(where)s</template>
@@ -63,7 +63,7 @@
       <join>phase</join>
     </xdim>
     <ydim>
-      <label>Validität</label>
+      <label>Auswertbarkeit</label>
       <field>tag_id</field>
       <table>(select id, label as value from tags_view where id in (1,2))</table>
       <join>tag_id</join>