[Mpuls-commits] r4730 - in jmd/trunk: . jmdweb/public/formed
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Mar 1 10:47:02 CET 2011
Author: roland
Date: 2011-03-01 10:47:01 +0100 (Tue, 01 Mar 2011)
New Revision: 4730
Modified:
jmd/trunk/ChangeLog
jmd/trunk/jmdweb/public/formed/formedtree.xml
Log:
issue1830: Put language radio-matrix in 1st place
Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog 2011-03-01 08:58:47 UTC (rev 4729)
+++ jmd/trunk/ChangeLog 2011-03-01 09:47:01 UTC (rev 4730)
@@ -1,3 +1,8 @@
+2011-03-01 Roland Geider <roland.geider at intevation.de>
+
+ * jmdweb/public/formed/formedtree.xml: issue1830: Put language
+ radio-matrix in 1st place
+
2011-02-28 Ludwig Reiter <ludwig.reiter at intevation.de>
* jmdweb/i18n/de/LC_MESSAGES/jmdweb.po
Modified: jmd/trunk/jmdweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/formedtree.xml 2011-03-01 08:58:47 UTC (rev 4729)
+++ jmd/trunk/jmdweb/public/formed/formedtree.xml 2011-03-01 09:47:01 UTC (rev 4730)
@@ -840,8 +840,105 @@
<conditional description="Anzeigen so lange keine KF durchegführt wird" expr="$kompetenzfeststellung 1 !=" invisible="true" name="conditional-49">
<info name="info-1" target="a" value="Diese Seite kann nur auszufüllt werden, wenn im Abschnitt 3.1 angegeben wurde das eine Kompetenzfeststellung durchgeführt wurde."/>
</conditional>
+ <group containers="a,b" description="Sprache und Kommunikation" name="group-52" target="b">
+ <radio-matrix description="Deutsch" name="radio-matrix-8" target="a">
+ <radio description="Hörverständnis" name="kf_erg_deutsch_a">
+ <bool description="A1" name="bool-197" value="1"/>
+ <bool description="A2" name="bool-198" value="2"/>
+ <bool description="B1" name="bool-199" value="3"/>
+ <bool description="B2" name="bool-200" value="4"/>
+ <bool description="C1" name="bool-201" value="5"/>
+ <bool description="C2" name="bool-202" value="6"/>
+ <bool alternative="?" description="Unbekannt" name="bool-203" value="-3"/>
+ <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-204" value="-1"/>
+ </radio>
+ <radio description="Leseverständnis" name="kf_erg_deutsch_b">
+ <bool description="A1" name="bool-616" value="1"/>
+ <bool description="A2" name="bool-266" value="2"/>
+ <bool description="B1" name="bool-338" value="3"/>
+ <bool description="B2" name="bool-302" value="4"/>
+ <bool description="C1" name="bool-290" value="5"/>
+ <bool description="C2" name="bool-326" value="6"/>
+ <bool alternative="?" description="Unbekannt" name="bool-314" value="-3"/>
+ <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-278" value="-1"/>
+ </radio>
+ <radio description="Schreiben" name="kf_erg_deutsch_c">
+ <bool description="A1" name="bool-617" value="1"/>
+ <bool description="A2" name="bool-267" value="2"/>
+ <bool description="B1" name="bool-339" value="3"/>
+ <bool description="B2" name="bool-303" value="4"/>
+ <bool description="C1" name="bool-291" value="5"/>
+ <bool description="C2" name="bool-327" value="6"/>
+ <bool alternative="?" description="Unbekannt" name="bool-315" value="-3"/>
+ <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-279" value="-1"/>
+ </radio>
+ <radio description="Sprechen" name="kf_erg_deutsch_d">
+ <bool description="A1" name="bool-618" value="1"/>
+ <bool description="A2" name="bool-268" value="2"/>
+ <bool description="B1" name="bool-340" value="3"/>
+ <bool description="B2" name="bool-304" value="4"/>
+ <bool description="C1" name="bool-292" value="5"/>
+ <bool description="C2" name="bool-328" value="6"/>
+ <bool alternative="?" description="Unbekannt" name="bool-316" value="-3"/>
+ <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-280" value="-1"/>
+ </radio>
+ </radio-matrix>
+ <repeat containers="a,b,c" description="Weitere Sprache" min="0" name="rg_weitere_sprache" target="b">
+ <choice description="Weitere Sprache" name="kf_erg_weiteresprache_nennung" size="1" target="a">
+ <bool description="Keine Angabe" name="bool-229" value="-1"/>
+ <bool description="Unbekannt" name="bool-228" value="-3"/>
+ <bool description="Sonstiges" name="bool-230" value="-2"/>
+ <external-choice name="external-choice-2" value="sprachen.xml"/>
+ </choice>
+ <conditional description="nur wenn weitere Sprache sonstige" expr="$kf_erg_weiteresprache_nennung -2 ==" name="conditional-36">
+ <text description="Nennung Sonstige" function="suppress_value" maxlength="60" name="kf_erg_weiteresprache_nennung_sonstiges" size="256" target="b"/>
+ </conditional>
+ <radio-matrix description="Weitere Sprache" name="radio-matrix-10" target="c">
+ <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>
+ </repeat>
+ </group>
<conditional description="Nur Bearbeitbar, wenn eine KF vorgenommen wurde" expr="$kompetenzfeststellung 1 ==" name="conditional-48">
- <group containers="a,b,c" description="Fachkompetenzen" name="group-50" target="b">
+ <group containers="a,b,c" description="Fachkompetenzen" name="group-50" target="c">
<radio-matrix description="Naturwissenschaftlich-technischer und wirtschaftlicher Bereich" name="radio-matrix-1" target="a">
<radio description="rechnerisches Denken (Rechenfähigkeit)" name="kf_erg_natur_a">
<bool alternative="++" description="stark ausgeprägt" name="bool-191" value="1"/>
@@ -961,7 +1058,7 @@
</radio>
</radio-matrix>
</group>
- <group description="Methodenkompetenz" name="group-51" target="c">
+ <group description="Methodenkompetenz" name="group-51" target="d">
<radio-matrix description="Methodenkompetenz" name="radio-matrix-4" target="c">
<radio description="Methoden der Informationsgewinnung" name="kf_erg_methode_a">
<bool alternative="++" description="stark ausgeprägt" name="bool-419" value="1"/>
@@ -1021,103 +1118,6 @@
</radio>
</radio-matrix>
</group>
- <group containers="a,b" description="Sprache und Kommunikation" name="group-52" target="d">
- <radio-matrix description="Deutsch" name="radio-matrix-8" target="a">
- <radio description="Hörverständnis" name="kf_erg_deutsch_a">
- <bool description="A1" name="bool-197" value="1"/>
- <bool description="A2" name="bool-198" value="2"/>
- <bool description="B1" name="bool-199" value="3"/>
- <bool description="B2" name="bool-200" value="4"/>
- <bool description="C1" name="bool-201" value="5"/>
- <bool description="C2" name="bool-202" value="6"/>
- <bool alternative="?" description="Unbekannt" name="bool-203" value="-3"/>
- <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-204" value="-1"/>
- </radio>
- <radio description="Leseverständnis" name="kf_erg_deutsch_b">
- <bool description="A1" name="bool-616" value="1"/>
- <bool description="A2" name="bool-266" value="2"/>
- <bool description="B1" name="bool-338" value="3"/>
- <bool description="B2" name="bool-302" value="4"/>
- <bool description="C1" name="bool-290" value="5"/>
- <bool description="C2" name="bool-326" value="6"/>
- <bool alternative="?" description="Unbekannt" name="bool-314" value="-3"/>
- <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-278" value="-1"/>
- </radio>
- <radio description="Schreiben" name="kf_erg_deutsch_c">
- <bool description="A1" name="bool-617" value="1"/>
- <bool description="A2" name="bool-267" value="2"/>
- <bool description="B1" name="bool-339" value="3"/>
- <bool description="B2" name="bool-303" value="4"/>
- <bool description="C1" name="bool-291" value="5"/>
- <bool description="C2" name="bool-327" value="6"/>
- <bool alternative="?" description="Unbekannt" name="bool-315" value="-3"/>
- <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-279" value="-1"/>
- </radio>
- <radio description="Sprechen" name="kf_erg_deutsch_d">
- <bool description="A1" name="bool-618" value="1"/>
- <bool description="A2" name="bool-268" value="2"/>
- <bool description="B1" name="bool-340" value="3"/>
- <bool description="B2" name="bool-304" value="4"/>
- <bool description="C1" name="bool-292" value="5"/>
- <bool description="C2" name="bool-328" value="6"/>
- <bool alternative="?" description="Unbekannt" name="bool-316" value="-3"/>
- <bool alternative="k.A." checked="True" description="Keine Angabe" name="bool-280" value="-1"/>
- </radio>
- </radio-matrix>
- <repeat containers="a,b,c" description="Weitere Sprache" min="0" name="rg_weitere_sprache" target="b">
- <choice description="Weitere Sprache" name="kf_erg_weiteresprache_nennung" size="1" target="a">
- <bool description="Keine Angabe" name="bool-229" value="-1"/>
- <bool description="Unbekannt" name="bool-228" value="-3"/>
- <bool description="Sonstiges" name="bool-230" value="-2"/>
- <external-choice name="external-choice-2" value="sprachen.xml"/>
- </choice>
- <conditional description="nur wenn weitere Sprache sonstige" expr="$kf_erg_weiteresprache_nennung -2 ==" name="conditional-36">
- <text description="Nennung Sonstige" function="suppress_value" maxlength="60" name="kf_erg_weiteresprache_nennung_sonstiges" size="256" target="b"/>
- </conditional>
- <radio-matrix description="Weitere Sprache" name="radio-matrix-10" target="c">
- <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>
- </repeat>
- </group>
<group description="Sozialkompetenzen" name="group-57" target="e">
<radio-matrix description="Sozialkompetenzen" name="radio-matrix-5" target="c">
<radio description="Kommunikationsfähigkeit" name="kf_erg_sozial_a">
More information about the Mpuls-commits
mailing list