[Mpuls-commits] r3878 - in waska/branches/1.7: . formed

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-10-04 15:29:43 +0200 (Mon, 04 Oct 2010)
New Revision: 3878

Modified:
   waska/branches/1.7/ChangeLog
   waska/branches/1.7/formed/formedtree_web.xml
Log:
issue1098: change the maximum to 1.9.2010

Modified: waska/branches/1.7/ChangeLog
===================================================================
--- waska/branches/1.7/ChangeLog	2010-10-04 13:24:49 UTC (rev 3877)
+++ waska/branches/1.7/ChangeLog	2010-10-04 13:29:43 UTC (rev 3878)
@@ -1,3 +1,8 @@
+2010-10-04 Roland Geider <roland.geider at intevation.de>
+
+	* formed/formedtree_web.xml: issue1098: change the maximum date from 
+	  1.1.2010 to 1.9.2010
+
 2010-10-01  Roland Geider <roland.geider at intevation.de>
 
 	* waskaweb/model/datapage.py: issue1098: change the maximum date from 

Modified: waska/branches/1.7/formed/formedtree_web.xml
===================================================================
--- waska/branches/1.7/formed/formedtree_web.xml	2010-10-04 13:24:49 UTC (rev 3877)
+++ waska/branches/1.7/formed/formedtree_web.xml	2010-10-04 13:29:43 UTC (rev 3878)
@@ -603,7 +603,7 @@
               <bool description="Ja" name="Ja" value="1"/>
               <bool description="Nein" name="Nein" value="0"/>
             </choice>
-            <conditional expr="$datum_feststellung isset not $datum_feststellung 1 1 2010 date &gt;= or" name="conditional-11" target="a">
+            <conditional expr="$datum_feststellung isset not $datum_feststellung 1 9 2010 date &gt;= or" name="conditional-11" target="a">
               <date description="Datum der Entscheidung" flags="required:clearing_ende,beratung_start,cm_start;time:clearing_ende,cm_start,beratung_start" name="datum_feststellung" target="b"/>
             </conditional>
           </group>
@@ -1549,7 +1549,7 @@
             <int description="Zeitraum CM (in Wochen)" flags="evaluation" formularname="Zeitraum_Fallmanagement" maxvalue="250" minvalue="0" name="zeitraum_fallmanagement" target="b"/>
           </group>
           <group containers="a,b,c" description="Angaben zur Beendigung des CM" name="angabenzurbeendigungdescm" target="c">
-            <conditional expr="$beendigung_5 isset not $beendigung_5 1 1 2010 date &gt;= or" name="conditional-12" target="a">
+            <conditional expr="$beendigung_5 isset not $beendigung_5 1 9 2010 date &gt;= or" name="conditional-12" target="a">
               <date description="Beendigung CM (Datum)" flags="required:cm_ende,nachbetreuung_start;time:cm_ende,nachbetreuung_start" formularname="Beendigung" name="beendigung_5" target="a"/>
             </conditional>
             <choice description="Art der Beendigung" flags="evaluation;required:cm_ende" formularname="Art_Beendigung" name="art_beendigung" size="1" target="a">