[Mpuls-commits] r4120 - jmd/trunk/jmdweb/public/formed
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Nov 3 16:50:56 CET 2010
Author: torsten
Date: 2010-11-03 16:50:56 +0100 (Wed, 03 Nov 2010)
New Revision: 4120
Modified:
jmd/trunk/jmdweb/public/formed/formedtree.xml
Log:
Issue1326: Moved "Kontaktdaten" (Name, Address) from 2.1 to a new page "1.2 Kontaktdaten Person"
Modified: jmd/trunk/jmdweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/formedtree.xml 2010-11-03 15:12:29 UTC (rev 4119)
+++ jmd/trunk/jmdweb/public/formed/formedtree.xml 2010-11-03 15:50:56 UTC (rev 4120)
@@ -166,7 +166,43 @@
<rule expr="$art_begleitung -1 == not" mark="warning:art_begleitung" name="required-rule-6" value="Fehlende Pflichtfeldangabe"/>
</group>
</page>
- <page description="1.2 Kontaktdaten Institutionen" name="page-7">
+ <page containers="a,b" description="1.2 Kontaktdaten Person" name="page-26">
+ <group containers="a,b" description="Name des jungen Menschen" name="group-17" target="a">
+ <text description="Name" function="suppress_value" maxlength="256" name="name" size="40" target="a"/>
+ <text description="Vorname" function="suppress_value" maxlength="256" name="vorname" size="40" target="a"/>
+ <text description="Geburtsname" function="suppress_value" maxlength="256" name="geburtsname" size="40" target="b"/>
+ <text description="Name vor der Einbürgerung" function="suppress_value" maxlength="256" name="name_vor_einbuergerung" size="40" target="b"/>
+ </group>
+ <repeat containers="a,b" description="Kontaktdaten des jungen Menschen" min="1" name="rg_kontaktdaten" target="b">
+ <group containers="a,b" description="Anschrift" name="group-19" target="a">
+ <text description="Straße" function="suppress_value" maxlength="60" name="adresse_strasse" size="40" target="a"/>
+ <text description="Hausnummer" function="suppress_value" maxlength="60" name="adresse_strassenr" size="40" target="a"/>
+ <text description="PLZ" function="shorten_value:3" maxlength="5" name="adresse_plz" size="5" target="b"/>
+ <text description="Ort" function="suppress_value" maxlength="60" name="adresse_ort" size="40" target="b"/>
+ </group>
+ <group containers="a,b,c" description="Telefon / E-Mail" name="group-20" target="b">
+ <text description="Vorwahl" function="suppress_value" maxlength="60" name="vorwahl" size="40" target="a"/>
+ <text description="Telefon" function="suppress_value" maxlength="60" name="telefon" size="40" target="a"/>
+ <text description="Mobilfunknummer" function="suppress_value" maxlength="60" name="mobilfunknummer" size="40" target="b"/>
+ <text description="E-Mail" function="suppress_value" maxlength="60" name="email" size="40" target="d"/>
+ </group>
+ </repeat>
+ <conditional description="Nur wenn minderjährig" expr="$geburtsdatum isset not $geburtsdatum known not or $geburtsdatum today years 18 < or" name="conditional-15">
+ <repeat containers="a,b" description="Sorgeberechtigte/Bezugsperson" min="1" name="rg_kontaktdaten_sorgeberechtigte" target="c">
+ <group containers="a,b" description="Anschrift" name="group-0" target="a">
+ <text description="Name" function="suppress_value" maxlength="128" name="name_sorge" size="40" target="a"/>
+ <text description="Vorname" function="suppress_value" maxlength="128" name="vorname_sorge" size="40" target="a"/>
+ </group>
+ <group containers="a,b,c" description="Telefon / E-Mail" name="group-2" target="b">
+ <text description="Vorwahl" function="suppress_value" maxlength="60" name="vorwahl_sorge" size="40" target="a"/>
+ <text description="Telefon" function="suppress_value" maxlength="60" name="telefon_sorge" size="40" target="a"/>
+ <text description="Mobilfunknummer" function="suppress_value" maxlength="60" name="mobilfunknummer_sorge" size="40" target="b"/>
+ <text description="E-Mail" function="suppress_value" maxlength="60" name="email_sorge" size="40" target="d"/>
+ </group>
+ </repeat>
+ </conditional>
+ </page>
+ <page description="1.3 Kontaktdaten Institutionen" name="page-7">
<repeat containers="a,b,c,d" description="Institution" min="1" name="rg_institution">
<choice description="Art Institution" name="inst_art" size="1" target="a">
<bool checked="True" description="Keine Angabe" name="bool-22" value="-1"/>
@@ -210,53 +246,19 @@
</page>
</group>
<group description="2. Anamnese" name="grp_anamnese">
- <page containers="a,b,c,d,e,f,g,h" description="2.1 Persönliche Angaben" name="page-2">
- <group containers="a,b" description="Name des jungen Menschen" name="group-17" target="a">
- <text description="Name" function="suppress_value" maxlength="256" name="name" size="40" target="a"/>
- <text description="Vorname" function="suppress_value" maxlength="256" name="vorname" size="40" target="a"/>
- <text description="Geburtsname" function="suppress_value" maxlength="256" name="geburtsname" size="40" target="b"/>
- <text description="Name vor der Einbürgerung" function="suppress_value" maxlength="256" name="name_vor_einbuergerung" size="40" target="b"/>
- </group>
- <choice description="Geburtsland" flags="required:phase_3" name="geburtsland" size="1" target="b">
+ <page containers="a,b,c,d,e" description="2.1 Persönliche Angaben" name="page-2">
+ <choice description="Geburtsland" flags="required:phase_3" name="geburtsland" size="1" target="a">
<bool description="Keine Angabe" name="bool-64" value="-1"/>
<bool description="Unbekannt" name="bool-63" value="-3"/>
<bool description="Sonstiges" name="bool-265" value="-2"/>
<external-choice name="external-choice-4" value="laender.xml"/>
</choice>
<conditional description="nur wenn geburtsland sonstiges" expr="$geburtsland -2 ==" name="conditional-37">
- <text description="Nennung Sonstiges" function="suppress_value" maxlength="60" name="geburtsland_nennung" size="40" target="b"/>
+ <text description="Nennung Sonstiges" function="suppress_value" maxlength="60" name="geburtsland_nennung" size="40" target="a"/>
</conditional>
- <text description="Geburtsort" function="suppress_value" maxlength="60" name="geburtsort" size="40" target="c"/>
- <repeat containers="a,b" description="Kontaktdaten des jungen Menschen" min="1" name="rg_kontaktdaten" target="d">
- <group containers="a,b" description="Anschrift" name="group-19" target="a">
- <text description="Straße" function="suppress_value" maxlength="60" name="adresse_strasse" size="40" target="a"/>
- <text description="Hausnummer" function="suppress_value" maxlength="60" name="adresse_strassenr" size="40" target="a"/>
- <text description="PLZ" function="shorten_value:3" maxlength="5" name="adresse_plz" size="5" target="b"/>
- <text description="Ort" function="suppress_value" maxlength="60" name="adresse_ort" size="40" target="b"/>
- </group>
- <group containers="a,b,c" description="Telefon / E-Mail" name="group-20" target="b">
- <text description="Vorwahl" function="suppress_value" maxlength="60" name="vorwahl" size="40" target="a"/>
- <text description="Telefon" function="suppress_value" maxlength="60" name="telefon" size="40" target="a"/>
- <text description="Mobilfunknummer" function="suppress_value" maxlength="60" name="mobilfunknummer" size="40" target="b"/>
- <text description="E-Mail" function="suppress_value" maxlength="60" name="email" size="40" target="d"/>
- </group>
- </repeat>
- <conditional description="Nur wenn minderjährig" expr="$geburtsdatum isset not $geburtsdatum known not or $geburtsdatum today years 18 < or" name="conditional-15">
- <repeat containers="a,b" description="Sorgeberechtigte/Bezugsperson" min="1" name="rg_kontaktdaten_sorgeberechtigte" target="e">
- <group containers="a,b" description="Anschrift" name="group-0" target="a">
- <text description="Name" function="suppress_value" maxlength="128" name="name_sorge" size="40" target="a"/>
- <text description="Vorname" function="suppress_value" maxlength="128" name="vorname_sorge" size="40" target="a"/>
- </group>
- <group containers="a,b,c" description="Telefon / E-Mail" name="group-2" target="b">
- <text description="Vorwahl" function="suppress_value" maxlength="60" name="vorwahl_sorge" size="40" target="a"/>
- <text description="Telefon" function="suppress_value" maxlength="60" name="telefon_sorge" size="40" target="a"/>
- <text description="Mobilfunknummer" function="suppress_value" maxlength="60" name="mobilfunknummer_sorge" size="40" target="b"/>
- <text description="E-Mail" function="suppress_value" maxlength="60" name="email_sorge" size="40" target="d"/>
- </group>
- </repeat>
- </conditional>
- <text description="Führerscheinklasse" function="suppress_value" maxlength="60" name="fuehrerschein" size="40" target="f"/>
- <group containers="a,b,c" description="Familiäre Situation" name="group-21" target="g">
+ <text description="Geburtsort" function="suppress_value" maxlength="60" name="geburtsort" size="40" target="b"/>
+ <text description="Führerscheinklasse" function="suppress_value" maxlength="60" name="fuehrerschein" size="40" target="c"/>
+ <group containers="a,b,c" description="Familiäre Situation" name="group-21" target="d">
<choice description="Familienstand" name="familienstand" size="1" target="a">
<bool checked="True" description="Keine Angabe" name="bool-129" value="-1"/>
<bool description="Unbekannt" name="bool-128" value="-3"/>
@@ -285,7 +287,7 @@
</choice>
</repeat>
</group>
- <group containers="a,b,c,d,e,f" description="Migrationsbezogene Informationen zum Status" name="group-84" target="h">
+ <group containers="a,b,c,d,e,f" description="Migrationsbezogene Informationen zum Status" name="group-84" target="e">
<choice description="Staatsangehörigkeit" flags="required:phase_3" name="staatsangehoerigkeit" size="1" target="a">
<bool description="Keine Angabe" name="bool-136" value="-1"/>
<bool description="Unbekannt" name="bool-134" value="-3"/>
More information about the Mpuls-commits
mailing list