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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-07-27 11:59:53 +0200 (Tue, 27 Jul 2010)
New Revision: 3249

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/public/formed/formedtree.xml
Log:
Issue783: drop downs 'cm_end_sonst' and 'cm_dok_end_sonst' now have the same options

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-07-27 09:53:20 UTC (rev 3248)
+++ wasko/trunk/ChangeLog	2010-07-27 09:59:53 UTC (rev 3249)
@@ -1,9 +1,13 @@
 2010-07-26 Roland Geider <roland.geider at intevation.de>
 
+	* waskoweb/public/formed/formedtree.xml: Issue783: drop downs
+	  "cm_end_sonst" and "cm_dok_end_sonst" now have the same options
+
+2010-07-26 Roland Geider <roland.geider at intevation.de>
+
 	* waskoweb/public/formed/formedtree.xml: removed option from
 	  unterstuetzungsangebote
 
-
 2010-07-23 Roland Geider <roland.geider at intevation.de>
 
 	* waskoweb/public/formed/formedtree.xml: issue352: incorrect numbering

Modified: wasko/trunk/waskoweb/public/formed/formedtree.xml
===================================================================
--- wasko/trunk/waskoweb/public/formed/formedtree.xml	2010-07-27 09:53:20 UTC (rev 3248)
+++ wasko/trunk/waskoweb/public/formed/formedtree.xml	2010-07-27 09:59:53 UTC (rev 3249)
@@ -130,7 +130,15 @@
                   <bool description="Krankheit" name="bool-1130" value="3"/>
                   <bool description="Überschreitung Förderzeitraum" name="bool-1131" value="4"/>
                   <bool description="Haft/Strafvollzug" name="bool-1132" value="5"/>
-                  <bool description="Ausbildung, Arbeit" name="bool-1133" value="6"/>
+                  <bool description="Ausbildung (duale Berufsausbildung, auch Verbundausbildung)" name="bool-1160" value="11"/>
+                  <bool description="Ausbildung (schulische Berufsausbildung)" name="bool-1161" value="12"/>
+                  <bool description="Ausbildung (geförderte Berufsausbildung, BaE)" name="bool-1162" value="13"/>
+                  <bool description="Arbeit" name="bool-1163" value="14"/>
+                  <bool description="Vermittlung: Berufsvorbereitung (BVJ/AVJ/BVB)" name="bool-1164" value="7"/>
+                  <bool description="Vermittlung: Schulformwechsel / Schulwechsel" name="bool-1165" value="8"/>
+                  <bool description="Vermittlung: Stationäre Unterbringung / Heim / WG" name="bool-1166" value="9"/>
+                  <bool description="Schulpflichterfüllung" name="bool-1167" value="10"/>
+                  <bool description='Alteintrag "Ausbildung, Arbeit"' name="bool-1142" value="6"/>
                   <bool description="unbekannt" name="bool-1134" value="-3"/>
                   <bool description="Sonstiges" name="bool-1135" value="-2"/>
                   <bool checked="true" description="keine Angabe" name="bool-1136" value="-1"/>