[Mpuls-commits] r5071 - in jmd/trunk: . jmdweb/public/formed

[scm-commit@wald.intevation.org]

Author: roland
Date: 2011-06-06 15:42:20 +0200 (Mon, 06 Jun 2011)
New Revision: 5071

Modified:
   jmd/trunk/ChangeLog
   jmd/trunk/jmdweb/public/formed/formedtree.xml
Log:
issue2167: add two additional sub-goals

Modified: jmd/trunk/ChangeLog
===================================================================
--- jmd/trunk/ChangeLog	2011-06-06 13:34:30 UTC (rev 5070)
+++ jmd/trunk/ChangeLog	2011-06-06 13:42:20 UTC (rev 5071)
@@ -1,5 +1,10 @@
 2011-06-06 Roland Geider  <roland.geider at intevation.de>
 
+	* jmdweb/public/formed/formedtree.xml: issue2167: add
+	  two additional sub-goals
+
+2011-06-06 Roland Geider  <roland.geider at intevation.de>
+
 	* jmdstrukturweb/public/formed/formedtree.xml: issue2184:
 	  add new field 'amount of hours' to RGs
 

Modified: jmd/trunk/jmdweb/public/formed/formedtree.xml
===================================================================
--- jmd/trunk/jmdweb/public/formed/formedtree.xml	2011-06-06 13:34:30 UTC (rev 5070)
+++ jmd/trunk/jmdweb/public/formed/formedtree.xml	2011-06-06 13:42:20 UTC (rev 5071)
@@ -1422,7 +1422,7 @@
           <date description="Datum Vereinbart am" name="fp_datum_vereinbarung" target="c"/>
           <date description="Datum Umsetzung bis" name="fp_datum_umsetzung" target="c"/>
         </group>
-        <group containers="a,b,c" description="Konkretisierung Ziel " name="group-94" target="e">
+        <group containers="a,b,c,d,e" description="Konkretisierung Ziel " name="group-94" target="e">
           <group containers="a,b" description="Unterziel 1" name="group-43" target="a">
             <text description="Beschreibung" function="suppress_value" maxlength="60" name="fp_uziel1" size="40" target="a"/>
             <choice description="Erreicht" name="fp_uziel1_erreicht" size="1" target="a">
@@ -1501,6 +1501,58 @@
               </conditional>
             </group>
           </group>
+          <group containers="a,b" description="Unterziel 4" name="group-29" target="d">
+            <text description="Beschreibung" function="suppress_value" maxlength="60" name="fp_uziel4" size="40" target="a"/>
+            <choice description="Erreicht" name="fp_uziel4_erreicht" size="1" target="a">
+              <bool checked="True" description="Keine Angabe" name="bool-55" value="-1"/>
+              <bool description="Unbekannt" name="bool-213" value="-3"/>
+              <bool description="Ja" name="bool-827" value="1"/>
+              <bool description="Nein" name="bool-205" value="0"/>
+            </choice>
+            <group containers="a,b,c,d" description="Unterstützungsangebot" name="group-31" target="b">
+              <choice description="Passendes Angebot vorhanden " name="fp_uziel4_angebot" size="1" target="a">
+                <bool checked="True" description="Keine Angabe" name="bool-89" value="-1"/>
+                <bool description="Unbekannt" name="bool-255" value="-3"/>
+                <bool description="Ja" name="bool-831" value="1"/>
+                <bool description="Nein" name="bool-209" value="0"/>
+              </choice>
+              <conditional containers="Nur anzeigen wenn Angebot vorhanden" expr="$fp_uziel4_angebot 1 ==" name="conditional-53">
+                <text description="Art der Unterstützung" function="suppress_value" maxlength="180" name="ua_uziel4_art" size="40" target="b"/>
+                <date description="Datum Beginn" name="ua_uziel4_datum_start" target="c"/>
+                <date description="Datum vorauss. Ende" name="ua_uziel4_datum_ende" target="c"/>
+                <group containers="a" description="Externe Einrichtung" name="group-33">
+                  <text description="Nennung Einrichtung 4" function="suppress_value" maxlength="60" name="fp_externe_einrichtung_4_name" size="40" target="a"/>
+                  <date description="Datum Einbeziehung bis" name="fp_externe_einrichtung_4_datum" target="a"/>
+                </group>
+              </conditional>
+            </group>
+          </group>
+          <group containers="a,b" description="Unterziel 5" name="group-30" target="e">
+            <text description="Beschreibung" function="suppress_value" maxlength="60" name="fp_uziel5" size="40" target="a"/>
+            <choice description="Erreicht" name="fp_uziel5_erreicht" size="1" target="a">
+              <bool checked="True" description="Keine Angabe" name="bool-55" value="-1"/>
+              <bool description="Unbekannt" name="bool-213" value="-3"/>
+              <bool description="Ja" name="bool-827" value="1"/>
+              <bool description="Nein" name="bool-205" value="0"/>
+            </choice>
+            <group containers="a,b,c,d" description="Unterstützungsangebot" name="group-32" target="b">
+              <choice description="Passendes Angebot vorhanden " name="fp_uziel5_angebot" size="1" target="a">
+                <bool checked="True" description="Keine Angabe" name="bool-89" value="-1"/>
+                <bool description="Unbekannt" name="bool-255" value="-3"/>
+                <bool description="Ja" name="bool-831" value="1"/>
+                <bool description="Nein" name="bool-209" value="0"/>
+              </choice>
+              <conditional containers="Nur anzeigen wenn Angebot vorhanden" expr="$fp_uziel5_angebot 1 ==" name="conditional-54">
+                <text description="Art der Unterstützung" function="suppress_value" maxlength="180" name="ua_uziel5_art" size="40" target="b"/>
+                <date description="Datum Beginn" name="ua_uziel5_datum_start" target="c"/>
+                <date description="Datum vorauss. Ende" name="ua_uziel5_datum_ende" target="c"/>
+                <group containers="a" description="Externe Einrichtung" name="group-34">
+                  <text description="Nennung Einrichtung 5" function="suppress_value" maxlength="60" name="fp_externe_einrichtung_5_name" size="40" target="a"/>
+                  <date description="Datum Einbeziehung bis" name="fp_externe_einrichtung_5_datum" target="a"/>
+                </group>
+              </conditional>
+            </group>
+          </group>
         </group>
         <rule expr="$fp_ziel -1 == not" mark="warning:fp_ziel" name="required-rule-28" value="Fehlende Pflichtfeldangabe"/>
         <rule expr="$fp_ziel_erreicht -1 == not" mark="warning:fp_ziel_erreicht" name="required-rule-29" value="Fehlende Pflichtfeldangabe"/>