[Mpuls-commits] r714 - in waska/trunk: . waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-11-30 11:39:42 +0100 (Mon, 30 Nov 2009)
New Revision: 714

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/evaluate.py
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
Log:
Fixed typeending in evaluation


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-11-30 08:54:23 UTC (rev 713)
+++ waska/trunk/ChangeLog.txt	2009-11-30 10:39:42 UTC (rev 714)
@@ -7,6 +7,8 @@
 	  waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo,
 	  waskaweb/lib/config.py: Updated translations. 
 
+	* waskaweb/controllers/evaluate.py: Fixed typeending in evaluation
+
 2009-11-27 	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Implemented new evaluations based on libmpuls

Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2009-11-30 08:54:23 UTC (rev 713)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2009-11-30 10:39:42 UTC (rev 714)
@@ -145,11 +145,12 @@
 
         # Type of ending
         ending = " TRUE " 
-        endingdate = " TRUE " 
+        endingdate = " TRUE "
+        typeendfield = g.mpuls_config.get('agency-fields-mapping', 'typeending')
         if params['ending'] and params.get('start_date') != 'None' and params.get('end_date') != 'None':
             enddatefield = g.mpuls_config.get('agency-fields-mapping', 'date_phase3_end')
             endingdate = "( '%s'::date <= %s AND %s <= '%s'::date )" % (params['start_date'], enddatefield, enddatefield, params['end_date'])
-            ending = "cm_end_art in ( %s )" % ", ".join(['%s' % e for e in params['ending']])
+            ending = "%s in ( %s )" % (typeendfield ,", ".join(['%s' % e for e in params['ending']]))
 
         params['sql'] = "SELECT %%(fields)s from master_tbl_eval_total_view m WHERE %s AND %s AND %s" % ("".join(dates), ending, endingdate)
 

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo
===================================================================
(Binary files differ)

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-11-30 08:54:23 UTC (rev 713)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-11-30 10:39:42 UTC (rev 714)
@@ -8,7 +8,7 @@
 "Project-Id-Version: waskaweb 0.0.0\n"
 "Report-Msgid-Bugs-To: EMAIL at ADDRESS\n"
 "POT-Creation-Date: 2009-11-30 09:38+0100\n"
-"PO-Revision-Date: 2009-11-30 09:51+0100\n"
+"PO-Revision-Date: 2009-11-30 11:21+0100\n"
 "Last-Translator: Torsten Irländer<torsten.irlaender at intevation.de>\n"
 "Language-Team: de <LL at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -418,7 +418,7 @@
 
 #: waskaweb/lib/validators.py:52
 msgid "Date is invalid"
-msgstr "Datum ist ungültig"
+msgstr "Datum ist ungueltig"
 
 #: waskaweb/model/case.py:1152 waskaweb/model/case.py:1153
 #: waskaweb/templates/casemanagement/caselist.mako:82