[Mpuls-commits] r5119 - in wasko/trunk: . waskoweb/public/formed

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-06-21 16:02:16 +0200 (Tue, 21 Jun 2011)
New Revision: 5119

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/public/formed/formedtree.xml
Log:
Conditionals set for I1201002.

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-06-21 13:11:16 UTC (rev 5118)
+++ wasko/trunk/ChangeLog	2011-06-21 14:02:16 UTC (rev 5119)
@@ -1,6 +1,11 @@
 2011-06-21  Ludwig Reiter <ludwig.reiter at intevation.de>
 
 	* waskoweb/public/formed/formedtree.xml:
+	Conditionals set for I1201002.
+
+2011-06-21  Ludwig Reiter <ludwig.reiter at intevation.de>
+
+	* waskoweb/public/formed/formedtree.xml:
 	A bundle for changes for the "Berufsschule" 
 	I1201001, I1201002, I1201004, I1201006, I1201007, I1201008
 	I1201009, I1201012, I1201014, I1201015

Modified: wasko/trunk/waskoweb/public/formed/formedtree.xml
===================================================================
--- wasko/trunk/waskoweb/public/formed/formedtree.xml	2011-06-21 13:11:16 UTC (rev 5118)
+++ wasko/trunk/waskoweb/public/formed/formedtree.xml	2011-06-21 14:02:16 UTC (rev 5119)
@@ -120,7 +120,7 @@
                 <bool description="sonstige Beendigung " name="bool-1117" value="2"/>
                 <bool description="Abbruch" name="bool-1118" value="3"/>
               </choice>
-              <conditional expr="$cm_dok_end_art isset $cm_dok_end_art 1 == and" invisible="true" name="conditional-6" target="c">
+              <conditional expr="$cm_dok_end_art isset $cm_dok_end_art 1 == $cm_dok_end_art 4 == or and" invisible="true" name="conditional-6" target="c">
                 <choice description="Wohin erfolgte die Reintegration?" name="cm_dok_end_verm" size="1" target="c">
                   <bool checked="true" description="keine Angabe" name="bool-1126" value="-1"/>
                   <bool description="unbekannt" name="bool-1387" value="-3"/>
@@ -2590,7 +2590,7 @@
             </choice>
             <rule expr="$cm_end_art -1 == not" mark="warning:cm_end_art" name="required-rule-manual-75" value="Fehlende Pflichtfeldangabe"/>
             <group containers="a,b,c,d" description="Angaben zur erfolgreichen Reintegration in die Schule" name="group-67" target="b">
-              <conditional expr="$cm_end_art isset $cm_end_art 1 == and" name="conditional-18" target="a">
+              <conditional expr="$cm_end_art isset $cm_end_art 1 == $cm_end_art 4 == or and" name="conditional-18" target="a">
                 <choice description="Wohin erfolgte die Reintegration?" flags="required:phase_3" name="cm_end_verm" size="1" target="a">
                   <bool checked="true" description="keine Angabe" name="bool-1128" value="-1"/>
                   <bool description="unbekannt" name="bool-1436" value="-3"/>