[Mpuls-commits] r2476 - wasko/branches/2.0/jmdweb/public/formed

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Thu Apr 22 11:55:45 CEST 2010


Author: torsten
Date: 2010-04-22 11:55:45 +0200 (Thu, 22 Apr 2010)
New Revision: 2476

Modified:
   wasko/branches/2.0/jmdweb/public/formed/formedtree.xml
Log:
New formedtree


Modified: wasko/branches/2.0/jmdweb/public/formed/formedtree.xml
===================================================================
--- wasko/branches/2.0/jmdweb/public/formed/formedtree.xml	2010-04-22 09:42:46 UTC (rev 2475)
+++ wasko/branches/2.0/jmdweb/public/formed/formedtree.xml	2010-04-22 09:55:45 UTC (rev 2476)
@@ -252,7 +252,7 @@
             <bool checked="True" description="Keine Angabe" name="bool-351" value="-1"/>
           </choice>
           <int description="Anzahl der Geschwister" maxvalue="99" minvalue="0" name="anzahl_geschwister" target="b"/>
-          <repeat containers="a" description="Kinder" min="1" name="rg_kinder" target="c">
+          <repeat containers="a" description="Kinder" min="0" name="rg_kinder" target="c">
             <date description="Geburtsdatum" name="kind_geburtsdatum" target="a"/>
             <choice description="Lebt im Haushalt des / der Jugendlichen" name="kind_haushalt" size="1" target="a">
               <bool description="Ja" name="bool-130" value="1"/>
@@ -1065,58 +1065,60 @@
           </radio-matrix>
           <group containers="a,b,c" description="Weitere Sprache" name="group-58" target="c">
             <text description="Nennung weitere Sprache" function="suppress_value" maxlength="60" name="kf_erg_weiteresprache_nennung" size="40" target="a"/>
-            <radio-matrix description="Weitere Sprache" name="radio-matrix-10" target="b">
-              <radio description="Hörverständnis" name="kf_erg_weiteresprache_a">
-                <bool description="A1" name="bool-623" value="1"/>
-                <bool description="A2" name="bool-273" value="2"/>
-                <bool description="B1" name="bool-345" value="3"/>
-                <bool description="B2" name="bool-309" value="4"/>
-                <bool description="C1" name="bool-297" value="5"/>
-                <bool description="C2" name="bool-333" value="6"/>
-                <bool alternative="?" description="Unbekannt" name="bool-321" value="-3"/>
-                <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-285" value="-1"/>
-              </radio>
-              <radio description="Leseverständnis" name="kf_erg_weiteresprache_b">
-                <bool description="A1" name="bool-624" value="1"/>
-                <bool description="A2" name="bool-274" value="2"/>
-                <bool description="B1" name="bool-346" value="3"/>
-                <bool description="B2" name="bool-310" value="4"/>
-                <bool description="C1" name="bool-298" value="5"/>
-                <bool description="C2" name="bool-334" value="6"/>
-                <bool alternative="?" description="Unbekannt" name="bool-322" value="-3"/>
-                <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-286" value="-1"/>
-              </radio>
-              <radio description="Schreiben" name="kf_erg_weiteresprache_c">
-                <bool description="A1" name="bool-625" value="1"/>
-                <bool description="A2" name="bool-275" value="2"/>
-                <bool description="B1" name="bool-347" value="3"/>
-                <bool description="B2" name="bool-311" value="4"/>
-                <bool description="C1" name="bool-299" value="5"/>
-                <bool description="C2" name="bool-335" value="6"/>
-                <bool alternative="?" description="Unbekannt" name="bool-323" value="-3"/>
-                <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-287" value="-1"/>
-              </radio>
-              <radio description="Sprechen" name="kf_erg_weiteresprache_d">
-                <bool description="A1" name="bool-626" value="1"/>
-                <bool description="A2" name="bool-276" value="2"/>
-                <bool description="B1" name="bool-348" value="3"/>
-                <bool description="B2" name="bool-312" value="4"/>
-                <bool description="C1" name="bool-300" value="5"/>
-                <bool description="C2" name="bool-336" value="6"/>
-                <bool alternative="?" description="Unbekannt" name="bool-324" value="-3"/>
-                <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-288" value="-1"/>
-              </radio>
-            </radio-matrix>
-            <choice description="Beherrschung weiterer Sprache insgesamt auf dem Niveau" name="kf_erg_weiteresprache_gesamt" size="1" target="c">
-              <bool description="A1" name="bool-627" value="1"/>
-              <bool description="A2" name="bool-277" value="2"/>
-              <bool description="B1" name="bool-349" value="3"/>
-              <bool description="B2" name="bool-313" value="4"/>
-              <bool description="C1" name="bool-301" value="5"/>
-              <bool description="C2" name="bool-337" value="6"/>
-              <bool alternative="?" description="Unbekannt" name="bool-325" value="-3"/>
-              <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-289" value="-1"/>
-            </choice>
+            <conditional description="Nur wenn weitere Sprache" expr="$kf_erg_weiteresprache_nennung isset" name="conditional-33">
+              <radio-matrix description="Weitere Sprache" name="radio-matrix-10" target="b">
+                <radio description="Hörverständnis" name="kf_erg_weiteresprache_a">
+                  <bool description="A1" name="bool-623" value="1"/>
+                  <bool description="A2" name="bool-273" value="2"/>
+                  <bool description="B1" name="bool-345" value="3"/>
+                  <bool description="B2" name="bool-309" value="4"/>
+                  <bool description="C1" name="bool-297" value="5"/>
+                  <bool description="C2" name="bool-333" value="6"/>
+                  <bool alternative="?" description="Unbekannt" name="bool-321" value="-3"/>
+                  <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-285" value="-1"/>
+                </radio>
+                <radio description="Leseverständnis" name="kf_erg_weiteresprache_b">
+                  <bool description="A1" name="bool-624" value="1"/>
+                  <bool description="A2" name="bool-274" value="2"/>
+                  <bool description="B1" name="bool-346" value="3"/>
+                  <bool description="B2" name="bool-310" value="4"/>
+                  <bool description="C1" name="bool-298" value="5"/>
+                  <bool description="C2" name="bool-334" value="6"/>
+                  <bool alternative="?" description="Unbekannt" name="bool-322" value="-3"/>
+                  <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-286" value="-1"/>
+                </radio>
+                <radio description="Schreiben" name="kf_erg_weiteresprache_c">
+                  <bool description="A1" name="bool-625" value="1"/>
+                  <bool description="A2" name="bool-275" value="2"/>
+                  <bool description="B1" name="bool-347" value="3"/>
+                  <bool description="B2" name="bool-311" value="4"/>
+                  <bool description="C1" name="bool-299" value="5"/>
+                  <bool description="C2" name="bool-335" value="6"/>
+                  <bool alternative="?" description="Unbekannt" name="bool-323" value="-3"/>
+                  <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-287" value="-1"/>
+                </radio>
+                <radio description="Sprechen" name="kf_erg_weiteresprache_d">
+                  <bool description="A1" name="bool-626" value="1"/>
+                  <bool description="A2" name="bool-276" value="2"/>
+                  <bool description="B1" name="bool-348" value="3"/>
+                  <bool description="B2" name="bool-312" value="4"/>
+                  <bool description="C1" name="bool-300" value="5"/>
+                  <bool description="C2" name="bool-336" value="6"/>
+                  <bool alternative="?" description="Unbekannt" name="bool-324" value="-3"/>
+                  <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-288" value="-1"/>
+                </radio>
+              </radio-matrix>
+              <choice description="Beherrschung weiterer Sprache insgesamt auf dem Niveau" name="kf_erg_weiteresprache_gesamt" size="1" target="c">
+                <bool description="A1" name="bool-627" value="1"/>
+                <bool description="A2" name="bool-277" value="2"/>
+                <bool description="B1" name="bool-349" value="3"/>
+                <bool description="B2" name="bool-313" value="4"/>
+                <bool description="C1" name="bool-301" value="5"/>
+                <bool description="C2" name="bool-337" value="6"/>
+                <bool alternative="?" description="Unbekannt" name="bool-325" value="-3"/>
+                <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-289" value="-1"/>
+              </choice>
+            </conditional>
           </group>
         </group>
         <group description="Sozialkompetenzen" name="group-57" target="d">



More information about the Mpuls-commits mailing list