[Mpuls-commits] r705 - in waska/trunk: . formed waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-11-25 17:39:42 +0100 (Wed, 25 Nov 2009)
New Revision: 705

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/formed/formedtree_web.xml
   waska/trunk/waskaweb/templates/casemanagement/phase.mako
Log:
Fixed check if CM can be startet. Further fixed phasename in rules


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-11-23 14:48:27 UTC (rev 704)
+++ waska/trunk/ChangeLog.txt	2009-11-25 16:39:42 UTC (rev 705)
@@ -1,3 +1,10 @@
+2009-11-25 	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	* waskaweb/templates/casemanagement/phase.mako: Fixed check if the cm
+	  can be started.
+	* formed/formedtree_web.xml: Fixed name in phase rule. -> lead to
+	  exception in inconsistency search
+
 2009-11-16	Sascha L. Teichmann	<sascha.teichmann at intevation.de>
 
 	* waskaweb/templates/casemanagement/selectParts.mako: Added section

Modified: waska/trunk/formed/formedtree_web.xml
===================================================================
--- waska/trunk/formed/formedtree_web.xml	2009-11-23 14:48:27 UTC (rev 704)
+++ waska/trunk/formed/formedtree_web.xml	2009-11-25 16:39:42 UTC (rev 705)
@@ -210,7 +210,7 @@
         </group>
         <group containers="a,b,c,d,e,f,g" description="Sonstige Angaben" name="sonstigeangaben" target="d">
           <text description="Zweiter Wohnort (Anschrift)" formularname="Zweiter_Wohnort" function="suppress_value" maxlength="120" modes="-mode1.1anon" name="zweiter_wohnort" size="100" target="a"/>
-          <choice description="Geburtsland" flags="evaluation;required:clearing_end" formularname="Geburtsland" name="geburtsland" size="1" target="b:50">
+          <choice description="Geburtsland" flags="evaluation;required:clearing_ende" formularname="Geburtsland" name="geburtsland" size="1" target="b:50">
             <bool checked="true" description="Keine Angabe" name="keineangabe" value="-1"/>
             <external-choice name="external-choice-1" value="laender.xml"/>
             <bool description="Sonstiges" name="sonstiges" value="-2"/>

Modified: waska/trunk/waskaweb/templates/casemanagement/phase.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/phase.mako	2009-11-23 14:48:27 UTC (rev 704)
+++ waska/trunk/waskaweb/templates/casemanagement/phase.mako	2009-11-25 16:39:42 UTC (rev 705)
@@ -45,7 +45,7 @@
       <td>${h.dd_mm_YYYY(p1.getTime(), '-/-')}</td>
       <td style="text-align:right">
         % if is_allowed:
-            % if (p1.isRecursiveComplete() and not p1.isRunning() and (p1.isNeighbor(c.current_phase) or c.current_phase.hasPredecessor(p1)) and (not c.disable_cm and c.current_phase.phase == 1)) or not session.get('case').isYoungerThan('2008-09-01'):
+            % if (p1.isRecursiveComplete() and not p1.isRunning()) and (p1.isNeighbor(c.current_phase) or c.current_phase.hasPredecessor(p1)) and not (c.disable_cm and c.current_phase.phase == 1) or not session.get('case').isYoungerThan('2008-09-01'):
                 <input type="submit" value="Start" name="${p1.getLabel()|h}">
             % else:
                 <input type="submit" value="Start" name="${p1.getLabel()|h}"