[Mpuls-commits] r2850 - jmd/trunk/jmdweb/public/formed
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Tue Jun 1 16:51:35 CEST 2010
Author: torsten
Date: 2010-06-01 16:51:35 +0200 (Tue, 01 Jun 2010)
New Revision: 2850
Modified:
jmd/trunk/jmdweb/public/formed/formedtree.xml
jmd/trunk/jmdweb/public/formed/laender.xml
jmd/trunk/jmdweb/public/formed/staatsangehoerigkeit.xml
Log:
New formed and country lists
Modified: jmd/trunk/jmdweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/formedtree.xml 2010-06-01 11:07:18 UTC (rev 2849)
+++ jmd/trunk/jmdweb/public/formed/formedtree.xml 2010-06-01 14:51:35 UTC (rev 2850)
@@ -12,7 +12,7 @@
<bool description="CM läuft" name="phase_2" value="2"/>
<bool description="CM beendet" name="phase_3" value="3"/>
<bool description="Beratung läuft" name="phase_4" value="4"/>
- <bool description="Beratung beendet" name="phase_%" value="5"/>
+ <bool description="Beratung beendet" name="phase_5" value="5"/>
</choice>
</group>
</group>
@@ -34,19 +34,21 @@
<bool description="Agentur für Arbeit" name="bool-28" target="01" value="6"/>
<bool description="Träger der Grundsicherung" name="bool-29" target="02" value="7"/>
<bool description="Jugendamt" name="bool-30" target="03" value="8"/>
- <bool description="Jugendhilfeeinrichtung" name="bool-31" target="04" value="9"/>
- <bool description="aufsuchende Arbeit" name="bool-32" target="05" value="10"/>
- <bool description="Bildungsträger" name="bool-33" target="06" value="11"/>
- <bool description="Beratungsstelle" name="bool-34" target="07" value="12"/>
- <bool description="Unternehmen" name="bool-35" target="08" value="13"/>
- <bool description="Schulverweigerung - die 2. Chance" name="bool-36" target="09" value="14"/>
- <bool description="Kompetenzagentur" name="bool-37" target="10" value="15"/>
- <bool description="anderer JMD" name="bool-38" target="11" value="16"/>
- <bool description="Stärken vor Ort" name="bool-39" target="12" value="17"/>
- <bool description="Bewährungshilfe / Jugendgerichtshilfe" name="bool-40" target="13" value="18"/>
- <bool description="allgemeinbildende Schule" name="bool-41" target="14" value="19"/>
- <bool description="andere Schule" name="bool-42" target="15" value="20"/>
- <bool description="Öffentlichkeitsarbeit" name="bool-247" target="16" value="21"/>
+ <bool description="Ausländeramt" name="bool-887" target="04" value="22"/>
+ <bool description="Jugendhilfeeinrichtung" name="bool-31" target="05" value="9"/>
+ <bool description="aufsuchende Arbeit" name="bool-32" target="06" value="10"/>
+ <bool description="Bildungsträger" name="bool-33" target="07" value="11"/>
+ <bool description="Sprachkursträger" name="bool-247" target="08" value="23"/>
+ <bool description="Beratungsstelle" name="bool-34" target="09" value="12"/>
+ <bool description="Unternehmen" name="bool-35" target="10" value="13"/>
+ <bool description="Schulverweigerung - die 2. Chance" name="bool-36" target="11" value="14"/>
+ <bool description="Kompetenzagentur" name="bool-37" target="12" value="15"/>
+ <bool description="anderer JMD" name="bool-38" target="13" value="16"/>
+ <bool description="Stärken vor Ort" name="bool-39" target="14" value="17"/>
+ <bool description="Bewährungshilfe / Jugendgerichtshilfe" name="bool-40" target="15" value="18"/>
+ <bool description="allgemeinbildende Schule" name="bool-41" target="16" value="19"/>
+ <bool description="andere Schule" name="bool-42" target="17" value="20"/>
+ <bool description="Öffentlichkeitsarbeit" name="bool-247" target="18" value="21"/>
</group>
<group description="offene Zugänge" name="offener_zugang" target="02">
<bool description="Eigenständiger Zugang" name="bool-23" target="01" value="1"/>
@@ -55,7 +57,7 @@
<bool description="Freunde" name="bool-26" target="04" value="4"/>
<bool description="andere Menschen aus dem sozialen Umfeld des Jugendlichen" name="bool-27" target="05" value="5"/>
</group>
- <bool description="Sonstiges" name="bool-43" target="03" value="21"/>
+ <bool description="Sonstiges" name="bool-43" target="03" value="-2"/>
<bool description="Unbekannt" name="bool-44" target="04" value="-3"/>
<bool description="Keine Angabe" name="bool-45" target="05" value="-1"/>
</choice>
@@ -65,6 +67,9 @@
<bool description="Unbekannt" name="bool-59" value="-3"/>
<bool description="Keine Angabe" name="bool-60" value="-1"/>
</choice>
+ <conditional description="Nur wenn bereits im CM" expr="$war_bereits_kunde 1 ==" name="conditional-34">
+ <text description="Nennung der Einrichtung in der der / die Jugendliche bereits im CM war" function="suppress_value" maxlength="256" name="nennung_einrichtung_cm" size="40" target="c"/>
+ </conditional>
<rule expr="$datum_ea_start isset" mark="warning:datum_ea_start" name="required-rule-2" value="Fehlende Pflichtfeldangabe"/>
<rule expr="$zugang -1 == not" mark="warning:zugang" name="required-rule-3" value="Fehlende Pflichtfeldangabe"/>
<rule description="'datum_ea_start' muss vor 'datum_ea_ende' liegen." expr="$datum_ea_start isset $datum_ea_start known and $datum_ea_ende isset $datum_ea_ende known and and $datum_ea_start $datum_ea_ende > and not" mark="error:datum_ea_start" name="date-sequence-rule-4" value="'Angaben zum Zugang / Datum Erstgespräch' darf zeitlich nicht nach 'Angaben zu weiteren Verlauf der Begleitung / Datum der Entscheidung' liegen."/>
@@ -275,7 +280,7 @@
<external-choice name="external-choice-1" value="staatsangehoerigkeit.xml"/>
</choice>
<choice description="Weitere Staatsangehörigkeit" flags="required:phase_3" name="staatsangehoerigkeit_weitere" size="1" target="a">
- <bool description="Keine weitere Staatsbürgerschaft" name="bool-886" value="193"/>
+ <bool description="Keine weitere Staatsbürgerschaft" name="bool-886" value="199"/>
<bool description="Sonstiges" name="bool-858" value="-2"/>
<bool description="Unbekannt" name="bool-864" value="-3"/>
<bool description="Keine Angabe" name="bool-747" value="-1"/>
@@ -512,6 +517,7 @@
<bool description="Arbeitslos" name="bool-355" value="7"/>
<bool description="Elternzeit" name="bool-356" value="8"/>
<bool description="Zivildienst / Wehrpflicht / Freiwilligenjahr" name="bool-357" value="9"/>
+ <bool description="Integrationssprachkurs" name="bool-888" value="10"/>
<bool description="Sonstiges" name="bool-358" value="-2"/>
<bool description="Unbekannt" name="bool-359" value="-3"/>
<bool checked="True" description="Keine Angabe" name="bool-360" value="-1"/>
Modified: jmd/trunk/jmdweb/public/formed/laender.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/laender.xml 2010-06-01 11:07:18 UTC (rev 2849)
+++ jmd/trunk/jmdweb/public/formed/laender.xml 2010-06-01 14:51:35 UTC (rev 2850)
@@ -23,13 +23,15 @@
<bool value="19" description="Bosnien und Herzegowina"/>
<bool value="20" description="Botsuana"/>
<bool value="21" description="Brasilien"/>
- <bool value="22" description="Brunei"/>
+ <bool value="22" description="Brunei Darussalam"/>
<bool value="23" description="Bulgarien"/>
<bool value="24" description="Burkina Faso"/>
<bool value="25" description="Burundi"/>
<bool value="26" description="Chile"/>
<bool value="27" description="China"/>
<bool value="28" description="Costa Rica"/>
+ <bool value="36" description="Côte d'Ivoire"/>
+ <bool value="193" description="Cookinseln"/>
<bool value="29" description="Deutschland" target="10"/>
<bool value="30" description="Dominica"/>
<bool value="31" description="Dominikanische Republik"/>
@@ -37,7 +39,6 @@
<bool value="33" description="Dänemark"/>
<bool value="34" description="Ecuador"/>
<bool value="35" description="El Salvador"/>
- <bool value="36" description="Elfenbeinküste"/>
<bool value="37" description="Eritrea"/>
<bool value="38" description="Estland"/>
<bool value="39" description="Fidschi"/>
@@ -49,13 +50,14 @@
<bool value="45" description="Ghana"/>
<bool value="46" description="Grenada"/>
<bool value="47" description="Griechenland"/>
- <bool value="48" description="Großbritannien"/>
+ <bool value="48" description="Großbritannien / Vereinigtes Königreich"/>
<bool value="49" description="Guatemala"/>
<bool value="50" description="Guinea"/>
<bool value="51" description="Guinea-Bissau"/>
<bool value="52" description="Guyana"/>
<bool value="53" description="Haiti"/>
<bool value="54" description="Honduras"/>
+ <bool value="194" description="Hongkong"/>
<bool value="55" description="Indien"/>
<bool value="56" description="Indonesien"/>
<bool value="57" description="Irak"/>
@@ -79,10 +81,11 @@
<bool value="75" description="Kiribati"/>
<bool value="76" description="Kolumbien"/>
<bool value="77" description="Komoren"/>
- <bool value="78" description="Kongo, Demokratische Republik"/>
- <bool value="79" description="Kongo, Republik"/>
- <bool value="80" description="Korea, Demokratische Volksrepublik"/>
- <bool value="81" description="Korea, Republik"/>
+ <bool value="78" description="Kongo (Demokratische Republik Kongo)"/>
+ <bool value="79" description="Kongo (Republik Kongo)"/>
+ <bool value="195" description="Kosovo"/>
+ <bool value="80" description="Korea (Demokratische Volksrepublik, Nordkorea)"/>
+ <bool value="81" description="Korea, (Republik Korea, Südkorea)"/>
<bool value="82" description="Kroatien"/>
<bool value="83" description="Kuba"/>
<bool value="84" description="Kuwait"/>
@@ -96,6 +99,7 @@
<bool value="92" description="Litauen"/>
<bool value="93" description="Luxemburg"/>
<bool value="94" description="Madagaskar"/>
+ <bool value="196" description="Macau"/>
<bool value="95" description="Malawi"/>
<bool value="96" description="Malaysia"/>
<bool value="97" description="Malediven"/>
@@ -105,10 +109,10 @@
<bool value="101" description="Marshallinseln"/>
<bool value="102" description="Mauretanien"/>
<bool value="103" description="Mauritius"/>
- <bool value="104" description="Mazedonien"/>
+ <bool value="104" description="Ehemalige jugoslawische Republik Mazedonien"/>
<bool value="105" description="Mexiko"/>
<bool value="106" description="Mikronesien"/>
- <bool value="107" description="Moldawien"/>
+ <bool value="107" description="Republik Moldau"/>
<bool value="108" description="Monaco"/>
<bool value="109" description="Mongolei"/>
<bool value="110" description="Montenegro"/>
@@ -124,9 +128,10 @@
<bool value="120" description="Nigeria"/>
<bool value="121" description="Norwegen"/>
<bool value="122" description="Oman"/>
- <bool value="123" description="Osttimor"/>
+ <bool value="123" description="Timor-Leste"/>
<bool value="124" description="Pakistan"/>
<bool value="125" description="Palau"/>
+ <bool value="197" description="Palästinensische Gebiete"/>
<bool value="126" description="Panama"/>
<bool value="127" description="Papua-Neuguinea"/>
<bool value="128" description="Paraguay"/>
@@ -136,7 +141,7 @@
<bool value="132" description="Portugal"/>
<bool value="133" description="Ruanda"/>
<bool value="134" description="Rumänien"/>
- <bool value="135" description="Russland"/>
+ <bool value="135" description="Russische Föderation"/>
<bool value="136" description="Salomonen"/>
<bool value="137" description="Sambia"/>
<bool value="138" description="Samoa"/>
@@ -166,12 +171,13 @@
<bool value="162" description="Südafrika"/>
<bool value="163" description="Tadschikistan"/>
<bool value="164" description="Tansania"/>
+ <bool value="198" description="Taiwan"/>
<bool value="165" description="Thailand"/>
<bool value="166" description="Togo"/>
<bool value="167" description="Tonga"/>
<bool value="168" description="Trinidad und Tobago"/>
<bool value="169" description="Tschad"/>
- <bool value="170" description="Tschechien"/>
+ <bool value="170" description="Tschechische Republik"/>
<bool value="171" description="Tunesien"/>
<bool value="172" description="Turkmenistan"/>
<bool value="173" description="Tuvalu"/>
@@ -182,12 +188,12 @@
<bool value="178" description="Uruguay"/>
<bool value="179" description="Usbekistan"/>
<bool value="180" description="Vanuatu"/>
- <bool value="181" description="Vatikanstadt"/>
+ <bool value="181" description="Vatikan / Heiliger Stuhl"/>
<bool value="182" description="Venezuela"/>
<bool value="183" description="Vereinigte Arabische Emirate"/>
<bool value="184" description="Vereinigte Staaten von Amerika"/>
<bool value="185" description="Vietnam"/>
- <bool value="186" description="Weißrussland"/>
+ <bool value="186" description="Weißrussland / Belarus"/>
<bool value="187" description="Zentralafrikanische Republik"/>
<bool value="188" description="Zypern"/>
<bool value="189" description="Ägypten"/>
Modified: jmd/trunk/jmdweb/public/formed/staatsangehoerigkeit.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/staatsangehoerigkeit.xml 2010-06-01 11:07:18 UTC (rev 2849)
+++ jmd/trunk/jmdweb/public/formed/staatsangehoerigkeit.xml 2010-06-01 14:51:35 UTC (rev 2850)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<document>
+<document xmlns:tmp="http://www.xfa.org/schema/xfa-template/2.5/">
<choice>
<bool value="0" description="Afghanistan"/>
<bool value="1" description="Albanien"/>
@@ -23,13 +23,15 @@
<bool value="19" description="Bosnien und Herzegowina"/>
<bool value="20" description="Botsuana"/>
<bool value="21" description="Brasilien"/>
- <bool value="22" description="Brunei"/>
+ <bool value="22" description="Brunei Darussalam"/>
<bool value="23" description="Bulgarien"/>
<bool value="24" description="Burkina Faso"/>
<bool value="25" description="Burundi"/>
<bool value="26" description="Chile"/>
<bool value="27" description="China"/>
<bool value="28" description="Costa Rica"/>
+ <bool value="36" description="Côte d'Ivoire"/>
+ <bool value="193" description="Cookinseln"/>
<bool value="29" description="Deutschland" alternative="deutsch" target="50"/>
<bool value="30" description="Dominica"/>
<bool value="31" description="Dominikanische Republik"/>
@@ -37,7 +39,6 @@
<bool value="33" description="Dänemark"/>
<bool value="34" description="Ecuador"/>
<bool value="35" description="El Salvador"/>
- <bool value="36" description="Elfenbeinküste"/>
<bool value="37" description="Eritrea"/>
<bool value="38" description="Estland"/>
<bool value="39" description="Fidschi"/>
@@ -49,13 +50,14 @@
<bool value="45" description="Ghana"/>
<bool value="46" description="Grenada"/>
<bool value="47" description="Griechenland"/>
- <bool value="48" description="Großbritannien"/>
+ <bool value="48" description="Großbritannien / Vereinigtes Königreich"/>
<bool value="49" description="Guatemala"/>
<bool value="50" description="Guinea"/>
<bool value="51" description="Guinea-Bissau"/>
<bool value="52" description="Guyana"/>
<bool value="53" description="Haiti"/>
<bool value="54" description="Honduras"/>
+ <bool value="194" description="Hongkong"/>
<bool value="55" description="Indien"/>
<bool value="56" description="Indonesien"/>
<bool value="57" description="Irak"/>
@@ -79,10 +81,11 @@
<bool value="75" description="Kiribati"/>
<bool value="76" description="Kolumbien"/>
<bool value="77" description="Komoren"/>
- <bool value="78" description="Kongo, Demokratische Republik"/>
- <bool value="79" description="Kongo, Republik"/>
- <bool value="80" description="Korea, Demokratische Volksrepublik"/>
- <bool value="81" description="Korea, Republik"/>
+ <bool value="78" description="Kongo (Demokratische Republik Kongo)"/>
+ <bool value="79" description="Kongo (Republik Kongo)"/>
+ <bool value="195" description="Kosovo"/>
+ <bool value="80" description="Korea (Demokratische Volksrepublik, Nordkorea)"/>
+ <bool value="81" description="Korea, (Republik Korea, Südkorea)"/>
<bool value="82" description="Kroatien"/>
<bool value="83" description="Kuba"/>
<bool value="84" description="Kuwait"/>
@@ -96,6 +99,7 @@
<bool value="92" description="Litauen"/>
<bool value="93" description="Luxemburg"/>
<bool value="94" description="Madagaskar"/>
+ <bool value="196" description="Macau"/>
<bool value="95" description="Malawi"/>
<bool value="96" description="Malaysia"/>
<bool value="97" description="Malediven"/>
@@ -105,10 +109,10 @@
<bool value="101" description="Marshallinseln"/>
<bool value="102" description="Mauretanien"/>
<bool value="103" description="Mauritius"/>
- <bool value="104" description="Mazedonien"/>
+ <bool value="104" description="Ehemalige jugoslawische Republik Mazedonien"/>
<bool value="105" description="Mexiko"/>
<bool value="106" description="Mikronesien"/>
- <bool value="107" description="Moldawien"/>
+ <bool value="107" description="Republik Moldau"/>
<bool value="108" description="Monaco"/>
<bool value="109" description="Mongolei"/>
<bool value="110" description="Montenegro"/>
@@ -124,9 +128,10 @@
<bool value="120" description="Nigeria"/>
<bool value="121" description="Norwegen"/>
<bool value="122" description="Oman"/>
- <bool value="123" description="Osttimor"/>
+ <bool value="123" description="Timor-Leste"/>
<bool value="124" description="Pakistan"/>
<bool value="125" description="Palau"/>
+ <bool value="197" description="Palästinensische Gebiete"/>
<bool value="126" description="Panama"/>
<bool value="127" description="Papua-Neuguinea"/>
<bool value="128" description="Paraguay"/>
@@ -136,7 +141,7 @@
<bool value="132" description="Portugal"/>
<bool value="133" description="Ruanda"/>
<bool value="134" description="Rumänien"/>
- <bool value="135" description="Russland"/>
+ <bool value="135" description="Russische Föderation"/>
<bool value="136" description="Salomonen"/>
<bool value="137" description="Sambia"/>
<bool value="138" description="Samoa"/>
@@ -166,12 +171,13 @@
<bool value="162" description="Südafrika"/>
<bool value="163" description="Tadschikistan"/>
<bool value="164" description="Tansania"/>
+ <bool value="198" description="Taiwan"/>
<bool value="165" description="Thailand"/>
<bool value="166" description="Togo"/>
<bool value="167" description="Tonga"/>
<bool value="168" description="Trinidad und Tobago"/>
<bool value="169" description="Tschad"/>
- <bool value="170" description="Tschechien"/>
+ <bool value="170" description="Tschechische Republik"/>
<bool value="171" description="Tunesien"/>
<bool value="172" description="Turkmenistan"/>
<bool value="173" description="Tuvalu"/>
@@ -182,12 +188,12 @@
<bool value="178" description="Uruguay"/>
<bool value="179" description="Usbekistan"/>
<bool value="180" description="Vanuatu"/>
- <bool value="181" description="Vatikanstadt"/>
+ <bool value="181" description="Vatikan / Heiliger Stuhl"/>
<bool value="182" description="Venezuela"/>
<bool value="183" description="Vereinigte Arabische Emirate"/>
<bool value="184" description="Vereinigte Staaten von Amerika"/>
<bool value="185" description="Vietnam"/>
- <bool value="186" description="Weißrussland"/>
+ <bool value="186" description="Weißrussland / Belarus"/>
<bool value="187" description="Zentralafrikanische Republik"/>
<bool value="188" description="Zypern"/>
<bool value="189" description="Ägypten"/>
More information about the Mpuls-commits
mailing list