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

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-10-08 10:15:07 +0200 (Fri, 08 Oct 2010)
New Revision: 3930

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/public/formed/formedtree.xml
Log:
issue1096: remove field duration

Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2010-10-08 07:38:14 UTC (rev 3929)
+++ wasko/trunk/ChangeLog	2010-10-08 08:15:07 UTC (rev 3930)
@@ -1,3 +1,9 @@
+2010-10-08  Roland Geider <roland.geider at intevation.de>
+
+	* waskoweb/public/formed/formedtree.xml: issue1096: remove field
+	  "Zeitraum des CM in Wochen" as the duration is shown already in
+	  the overview.
+
 2010-10-07  Roland Geider <roland.geider at intevation.de>
 
 	* Changes: Updated CHANGES

Modified: wasko/trunk/waskoweb/public/formed/formedtree.xml
===================================================================
--- wasko/trunk/waskoweb/public/formed/formedtree.xml	2010-10-08 07:38:14 UTC (rev 3929)
+++ wasko/trunk/waskoweb/public/formed/formedtree.xml	2010-10-08 08:15:07 UTC (rev 3930)
@@ -254,7 +254,7 @@
       <group description="3. Angaben zur Person" name="group-5">
         <page containers="a,b,c,d,e,f,g,h,i" description="3.1 Persönliche Angaben" name="page-2">
           <group containers="a,b" description="Aufnahme in das Case Management" name="aufnahme_cm" target="a">
-            <conditional expr="$datum_cm_start isset not $datum_cm_start 1 1 2010 date &gt;= or" name="conditional-11" target="a">
+            <conditional expr="$datum_cm_start isset not $datum_cm_start 1 9 2010 date &gt;= or" name="conditional-11" target="a">
               <date description="Datum Beginn der Umsetzung des Case Management in der Koordinierungsstelle" flags="required:phase_2,phase_1;time:phase_1,phase_2" name="datum_cm_start" order="erstgespraech;datum_bfplan" target="a"/>
               <rule expr="$datum_cm_start isset" mark="warning:datum_cm_start" name="required-rule-manual-72" value="Fehlende Pflichtfeldangabe"/>
               <rule description="phase cm nicht länger als 12 monate" expr="$datum_cm_start isset $datum_cm_ende isset and $datum_cm_start known $datum_cm_ende known and and $datum_cm_start $datum_cm_ende days 365 &gt; and not" mark="warning:datum_cm_ende" name="manual-rule-max-date-2" value='Bitte überprüfen Sie die eingetragenen Datumsangaben. Die Dauer der Phase "Case Management" überschreitet 12 Monate.'/>
@@ -2442,7 +2442,7 @@
                 </conditional>
               </group>
             </conditional>
-            <conditional expr="$datum_cm_ende isset not $datum_cm_ende 1 1 2010 date &gt;= or" name="conditional-12" target="b">
+            <conditional expr="$datum_cm_ende isset not $datum_cm_ende 1 9 2010 date &gt;= or" name="conditional-12" target="b">
               <date description="Datum Beendigung des Case Management" flags="required:phase_3;time:phase_3" name="datum_cm_ende" order="datum_bfplan;nbetr_start" target="b"/>
               <rule expr="$datum_cm_ende isset" mark="warning:datum_cm_ende" name="required-rule-98" value="Fehlende Pflichtfeldangabe"/>
               <rule description="'datum_bfplan' muss vor 'datum_cm_ende' liegen." expr="$datum_bfplan isset $datum_bfplan known and $datum_cm_ende isset $datum_cm_ende known and and $datum_bfplan $datum_cm_ende &gt; and not" mark="error:datum_cm_ende" name="date-sequence-rule-6-2" value="'Datum Beginn der Bildungs- und Förderplanung' darf zeitlich nicht nach 'Datum Beendigung des Case Management' liegen."/>
@@ -2455,7 +2455,6 @@
               <rule description="'datum_cm_ende' muss vor 'nbetr_start' liegen." expr="$datum_cm_ende isset $datum_cm_ende known and $nbetr_start isset $nbetr_start known and and $datum_cm_ende $nbetr_start &gt; and not" mark="error:datum_cm_ende" name="date-sequence-rule-61-1" value="'Datum Beendigung des Case Management' darf zeitlich nicht nach 'Datum Start der Nachbetreuung' liegen."/>
               <rule description="'datum_cm_start' muss vor 'datum_cm_ende' liegen." expr="$datum_cm_start isset $datum_cm_start known and $datum_cm_ende isset $datum_cm_ende known and and $datum_cm_start $datum_cm_ende &gt; and not" mark="error:datum_cm_ende" name="date-sequence-rule-69-2" value="'Datum Beginn der Umsetzung des Case Management in der Koordinierungsstelle' darf zeitlich nicht nach 'Datum Beendigung des Case Management' liegen."/>
             </conditional>
-            <int description="Zeitraum des CM in Wochen" maxvalue="999" minvalue="0" name="cm_zeit" target="b"/>
             <group containers="a,b,c,d,e" description="Angaben zum Verlauf des Case Management" name="group-65" target="c">
               <int description="Anzahl der Kontakte/Termine mit dem/der Jugendlichen" flags="required:phase_3" maxvalue="999" minvalue="0" name="cm_kontakt" target="a"/>
               <int alternative="cm_kontakt" description="Anzahl der Kontakte/Termine Sonstige" maxvalue="999" minvalue="0" name="cm_kontakt_sonstige" target="a"/>