[Mpuls-commits] r211 - in waska/trunk: . waskaweb/controllers waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-10-24 15:01:02 +0200 (Fri, 24 Oct 2008)
New Revision: 211

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/case.py
   waska/trunk/waskaweb/lib/evaluation.py
   waska/trunk/waskaweb/lib/validators.py
Log:
Fixed issue 618


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-10-23 16:05:33 UTC (rev 210)
+++ waska/trunk/ChangeLog.txt	2008-10-24 13:01:02 UTC (rev 211)
@@ -1,3 +1,15 @@
+2008-10-24	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Fixed issue 618
+
+	* waskaweb/lib/evaluation.py: Fixed evalution query.
+
+	Enhancement to issue518
+
+	* waskaweb/lib/validators.py: fixed regular expression in formencode
+	validators
+	* waskaweb/controllers/case.py: code formatting issue.
+
 2008-10-23	Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	Another fix for issue518

Modified: waska/trunk/waskaweb/controllers/case.py
===================================================================
--- waska/trunk/waskaweb/controllers/case.py	2008-10-23 16:05:33 UTC (rev 210)
+++ waska/trunk/waskaweb/controllers/case.py	2008-10-24 13:01:02 UTC (rev 211)
@@ -916,7 +916,7 @@
         validator = EditLogbookForm()
 
         try:
-            c.ds_id           = session['case'].id
+            c.ds_id = session['case'].id
             form_result = validator.to_python(params)
         except formencode.Invalid, error:
             c.form_result = error.value

Modified: waska/trunk/waskaweb/lib/evaluation.py
===================================================================
--- waska/trunk/waskaweb/lib/evaluation.py	2008-10-23 16:05:33 UTC (rev 210)
+++ waska/trunk/waskaweb/lib/evaluation.py	2008-10-24 13:01:02 UTC (rev 211)
@@ -264,7 +264,7 @@
                     if (muttersprache == 18) and (staatsangehoerigkeit == 29) and (vater == 1) and (mutter == 1):
                         r[1][0] += 1
                     # Migrationshintergrund
-                    elif (muttersprache not in (18, -1)) or (staatsangehoerigkeit not in (29, -1)) or (vater not in (0, -1)) or (mutter not in (0, -1)):
+                    elif (muttersprache not in (18, -1)) or (staatsangehoerigkeit not in (29, -1)) or (vater not in (1, -1)) or (mutter not in (1, -1)):
                         r[0][0] += 1
                     # Keine Angabe möglich
                     else:

Modified: waska/trunk/waskaweb/lib/validators.py
===================================================================
--- waska/trunk/waskaweb/lib/validators.py	2008-10-23 16:05:33 UTC (rev 210)
+++ waska/trunk/waskaweb/lib/validators.py	2008-10-24 13:01:02 UTC (rev 211)
@@ -305,7 +305,7 @@
 
 class DateCheck(formencode.validators.FancyValidator):
 
-    valid_date = re.compile(r'^[0-9]{1,2}.[0-9]{1,2}.[0-9]{4}$')
+    valid_date = re.compile(r'^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{4}$')
 
     messages = {
         'invalid_format': u'Bitte geben Sie das Datum im Format "TT.MM.JJJJ" an.',