[Mpuls-commits] r693 - in waska/trunk: . waskaweb/lib waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2009-11-16 15:34:40 +0100 (Mon, 16 Nov 2009)
New Revision: 693

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/lib/exportselection.py
   waska/trunk/waskaweb/lib/validators.py
   waska/trunk/waskaweb/templates/casemanagement/selectParts.mako
Log:
Added option to selective export 'nachbetreuung'.



Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-11-16 11:37:13 UTC (rev 692)
+++ waska/trunk/ChangeLog.txt	2009-11-16 14:34:40 UTC (rev 693)
@@ -1,3 +1,11 @@
+2009-11-16	Sascha L. Teichmann	<sascha.teichmann at intevation.de>
+
+	* waskaweb/templates/casemanagement/selectParts.mako: Added section
+	for 'nachbetreuung'.
+
+	* waskaweb/lib/validators.py, waskaweb/lib/exportselection.py: Made
+	'nachbetreuung' selectable, too.
+
 2009-11-16 	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Conditional required fields

Modified: waska/trunk/waskaweb/lib/exportselection.py
===================================================================
--- waska/trunk/waskaweb/lib/exportselection.py	2009-11-16 11:37:13 UTC (rev 692)
+++ waska/trunk/waskaweb/lib/exportselection.py	2009-11-16 14:34:40 UTC (rev 693)
@@ -67,7 +67,8 @@
     'form_section_14' : 'page_17', # Berufliche Integration
     'form_section_15' : 'page_18', # Soziale Integration
     'form_section_16' : 'page_19', # Einschätzung des Case-Managers, 
-    'form_section_17' : 'page_20'  # Freie Dokumentation
+    'form_section_17' : 'page_20', # Freie Dokumentation
+    'form_section_18' : 'page_nachbetreuung'  # Nachbetreuung
 }
 
 def form_section_sort(a, b):
@@ -105,7 +106,8 @@
             'form_section_14': 1, 
             'form_section_15': 1, 
             'form_section_16': 1, 
-            'form_section_17': 1 }
+            'form_section_17': 1,
+            'form_section_18': 1 }
 
     def numItems(self):
         return len(self.selections)

Modified: waska/trunk/waskaweb/lib/validators.py
===================================================================
--- waska/trunk/waskaweb/lib/validators.py	2009-11-16 11:37:13 UTC (rev 692)
+++ waska/trunk/waskaweb/lib/validators.py	2009-11-16 14:34:40 UTC (rev 693)
@@ -255,6 +255,7 @@
     form_section_15 = formencode.validators.Int(if_missing=0)
     form_section_16 = formencode.validators.Int(if_missing=0)
     form_section_17 = formencode.validators.Int(if_missing=0)
+    form_section_18 = formencode.validators.Int(if_missing=0)
 
 class NewCaseForm(BaseFormValidator):
     pass

Modified: waska/trunk/waskaweb/templates/casemanagement/selectParts.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/selectParts.mako	2009-11-16 11:37:13 UTC (rev 692)
+++ waska/trunk/waskaweb/templates/casemanagement/selectParts.mako	2009-11-16 14:34:40 UTC (rev 693)
@@ -117,6 +117,10 @@
             </li>
         </ul>
     </li>
+    <li>
+      <input type="checkbox" id="form_section_18" name="form_section_18" value="1">
+      <label for="form_section_18">Nachbetreuung</label>
+    </li>
 </ul>
 % if c.selectLogbook:
 <h2>Falltagebuch</h2>