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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-11-24 18:05:23 +0100 (Wed, 24 Nov 2010)
New Revision: 4260

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/public/xml/eval_adele.xml
   wasko/trunk/waskoweb/public/xml/eval_aktiv.xml
   wasko/trunk/waskoweb/public/xml/eval_analyse.xml
   wasko/trunk/waskoweb/public/xml/eval_tagebuch.xml
   wasko/trunk/waskoweb/public/xml/eval_zusammenfassung.xml
Log:
New evaluations with adapted tagging


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-11-24 07:51:18 UTC (rev 4259)
+++ wasko/trunk/ChangeLog	2010-11-24 17:05:23 UTC (rev 4260)
@@ -1,3 +1,14 @@
+2010-11-24  Torsten Irlaender <torsten at intevation.de>
+
+	* Changes: Adapted Changes.
+
+	* waskoweb/public/xml/eval_adele.xml,
+	  waskoweb/public/xml/eval_analyse.xml,
+	  waskoweb/public/xml/eval_aktiv.xml,
+	  waskoweb/public/xml/eval_tagebuch.xml,
+	  waskoweb/public/xml/eval_zusammenfassung.xml: New evaluations with
+	  adapted tagging.
+
 2010-11-23  Roland Geider <roland.geider at intevation.de>
 
 	* waskoweb/templates/caselifetime/neuaufnahme.mako,

Modified: wasko/trunk/waskoweb/public/xml/eval_adele.xml
===================================================================
--- wasko/trunk/waskoweb/public/xml/eval_adele.xml	2010-11-24 07:51:18 UTC (rev 4259)
+++ wasko/trunk/waskoweb/public/xml/eval_adele.xml	2010-11-24 17:05:23 UTC (rev 4260)
@@ -6,8 +6,7 @@
   <requirement>
     <phase>2,3,4,5</phase>
     <validity>1</validity>
-    <validity>3</validity>
-    <validity>4</validity>
+    <validity>2</validity>
   </requirement>
   <evaluation>
     <id>1</id>

Modified: wasko/trunk/waskoweb/public/xml/eval_aktiv.xml
===================================================================
--- wasko/trunk/waskoweb/public/xml/eval_aktiv.xml	2010-11-24 07:51:18 UTC (rev 4259)
+++ wasko/trunk/waskoweb/public/xml/eval_aktiv.xml	2010-11-24 17:05:23 UTC (rev 4260)
@@ -6,7 +6,6 @@
   <requirement>
     <phase>0</phase>
     <validity>1</validity>
-    <validity>3</validity>
   </requirement>
   <evaluation>
     <id>1</id>

Modified: wasko/trunk/waskoweb/public/xml/eval_analyse.xml
===================================================================
--- wasko/trunk/waskoweb/public/xml/eval_analyse.xml	2010-11-24 07:51:18 UTC (rev 4259)
+++ wasko/trunk/waskoweb/public/xml/eval_analyse.xml	2010-11-24 17:05:23 UTC (rev 4260)
@@ -65,7 +65,7 @@
     <ydim>
       <label>Validität</label>
       <field>tag_id</field>
-      <table>(select id, label as value from tags_view where id in (1,2,3,4,0))</table>
+      <table>(select id, label as value from tags_view where id in (1,2))</table>
       <join>tag_id</join>
     </ydim>
   </evaluation>

Modified: wasko/trunk/waskoweb/public/xml/eval_tagebuch.xml
===================================================================
--- wasko/trunk/waskoweb/public/xml/eval_tagebuch.xml	2010-11-24 07:51:18 UTC (rev 4259)
+++ wasko/trunk/waskoweb/public/xml/eval_tagebuch.xml	2010-11-24 17:05:23 UTC (rev 4260)
@@ -6,7 +6,6 @@
   <requirement>
     <phase>2</phase>
     <validity>1</validity>
-    <validity>3</validity>
   </requirement>
   <evaluation>
     <id>1</id>

Modified: wasko/trunk/waskoweb/public/xml/eval_zusammenfassung.xml
===================================================================
--- wasko/trunk/waskoweb/public/xml/eval_zusammenfassung.xml	2010-11-24 07:51:18 UTC (rev 4259)
+++ wasko/trunk/waskoweb/public/xml/eval_zusammenfassung.xml	2010-11-24 17:05:23 UTC (rev 4260)
@@ -6,7 +6,6 @@
   <requirement>
     <phase>2</phase>
     <validity>1</validity>
-    <validity>3</validity>
   </requirement>
   <evaluation>
     <id>1</id>