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

[scm-commit@wald.intevation.org]

Author: ludwig
Date: 2011-06-28 15:52:27 +0200 (Tue, 28 Jun 2011)
New Revision: 5136

Modified:
   wasko/trunk/ChangeLog
   wasko/trunk/waskoweb/controllers/caselifetime.py
   wasko/trunk/waskoweb/public/formed/formedtree.xml
Log:
I1201002 Changed to use cm_dok_end_verm_berufsschule in the case, 
a reopening is done for a into professional school reintegrated
youth.


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-06-28 10:11:45 UTC (rev 5135)
+++ wasko/trunk/ChangeLog	2011-06-28 13:52:27 UTC (rev 5136)
@@ -1,5 +1,13 @@
 2011-06-28  Ludwig Reiter <ludwig.reiter at intevation.de>
 
+	* waskoweb/controllers/caselifetime.py,
+	waskoweb/public/formed/formedtree.xml:
+	I1201002 Changed to use cm_dok_end_verm_berufsschule in the case, 
+	a reopening is done for a into professional school reintegrated
+	youth.
+
+2011-06-28  Ludwig Reiter <ludwig.reiter at intevation.de>
+
 	* tagging.xml,
 	waskoweb/public/formed/formedtree.xml:
 	I1201002 Improvments to rules/info fields.

Modified: wasko/trunk/waskoweb/controllers/caselifetime.py
===================================================================
--- wasko/trunk/waskoweb/controllers/caselifetime.py	2011-06-28 10:11:45 UTC (rev 5135)
+++ wasko/trunk/waskoweb/controllers/caselifetime.py	2011-06-28 13:52:27 UTC (rev 5136)
@@ -84,6 +84,7 @@
 
     data['cm_dok_end_art:%s' % to_id] = str(_get_value(oit, 'cm_end_art', id))
     data['cm_dok_end_verm:%s' % to_id] = str(_get_value(oit, 'cm_end_verm', id))
+    data['cm_dok_end_verm_berufsschule:%s' % to_id] = str(_get_value(oit, 'cm_end_verm_berufsschule', id))
     data['cm_dok_end_sonst:%s' % to_id] = str(_get_value(oit,'cm_end_sonst',id))
     data['cm_dok_datum_beendigung:%s' % to_id] = \
         h.dd_mm_YYYY(_get_value(oit, 'datum_cm_ende', id))

Modified: wasko/trunk/waskoweb/public/formed/formedtree.xml
===================================================================
--- wasko/trunk/waskoweb/public/formed/formedtree.xml	2011-06-28 10:11:45 UTC (rev 5135)
+++ wasko/trunk/waskoweb/public/formed/formedtree.xml	2011-06-28 13:52:27 UTC (rev 5136)
@@ -120,7 +120,7 @@
                 <bool description="sonstige Beendigung " name="bool-1117" value="2"/>
                 <bool description="Abbruch" name="bool-1118" value="3"/>
               </choice>
-              <conditional expr="$cm_dok_end_art isset $cm_dok_end_art 1 == $cm_dok_end_art 4 == or and" invisible="true" name="conditional-6" target="c">
+              <conditional expr="$cm_dok_end_art isset $cm_dok_end_art 1 == and" invisible="true" name="conditional-6" target="c">
                 <choice description="Wohin erfolgte die Reintegration?" name="cm_dok_end_verm" size="1" target="c">
                   <bool checked="true" description="keine Angabe" name="bool-1126" value="-1"/>
                   <bool description="unbekannt" name="bool-1387" value="-3"/>
@@ -130,6 +130,16 @@
                   <bool description="andere Schule" name="bool-346" value="3"/>
                 </choice>
               </conditional>
+              <conditional expr="$cm_dok_end_art isset $cm_dok_end_art 4 == and" invisible="true" name="conditional-6" target="c">
+                <choice description="Wohin erfolgte die Reintegration?" name="cm_dok_end_verm_berufsschule" size="1" target="c">
+                  <bool checked="true" description="keine Angabe" name="bool-1126" value="-1"/>
+                  <bool description="unbekannt" name="bool-1387" value="-3"/>
+                  <bool description="Sonstiges" name="bool-347" value="-2"/>
+                  <bool description="Ursprungsklasse" name="bool-344" value="1"/>
+                  <bool description="gleiche Berufliche Schule, neue Klasse" name="bool-1124" value="2"/>
+                  <bool description="andere Berufliche Schule" name="bool-1125" value="3"/>
+                </choice>
+              </conditional>
               <conditional expr="$cm_dok_end_art isset $cm_dok_end_art 2 == and" invisible="true" name="conditional-7" target="d">
                 <choice description="Gründe für sonstige Beendigung" name="cm_dok_end_sonst" size="1" target="d">
                   <bool checked="true" description="keine Angabe" name="bool-1136" value="-1"/>