[Mpuls-commits] r102 - in waska/trunk: . waskaweb/i18n/de/LC_MESSAGES waskaweb/lib waskaweb/model

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-08-28 16:08:46 +0200 (Thu, 28 Aug 2008)
New Revision: 102

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   waska/trunk/waskaweb/lib/renderer.py
   waska/trunk/waskaweb/model/repeatgroup.py
Log:
Changed Version String to "1.2.0 alpha" Prepared renderer for evaluation icons at formfields.


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-08-28 11:54:51 UTC (rev 101)
+++ waska/trunk/ChangeLog.txt	2008-08-28 14:08:46 UTC (rev 102)
@@ -49,6 +49,14 @@
 	  workflow to print case after changing a phase. make site for
 	  changing the phase more dynamic.
 
+	Changed Version String to "1.2.0 alpha" Prepared renderer for
+	evaluation icons at formfields.
+
+	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po,
+	  waskaweb/model/repeatgroup.py,
+	  waskaweb/lib/renderer.py: New Versionstring, rendering evaluation
+	  icons.
+
 2008-08-28  Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	* waskaweb/lib/needed.py: Sort nc lists by description.

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-28 11:54:51 UTC (rev 101)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2008-08-28 14:08:46 UTC (rev 102)
@@ -530,7 +530,7 @@
 
 #: waskaweb/templates/main.mako:197
 msgid "footer_version"
-msgstr "21.08.2008 | Version 1.1.0 beta2"
+msgstr "28.08.2008 | Version 1.2.0 alpha1"
 
 #: waskaweb/templates/main_login.mako:38
 #: waskaweb/templates/start/responsible.mako:149

Modified: waska/trunk/waskaweb/lib/renderer.py
===================================================================
--- waska/trunk/waskaweb/lib/renderer.py	2008-08-28 11:54:51 UTC (rev 101)
+++ waska/trunk/waskaweb/lib/renderer.py	2008-08-28 14:08:46 UTC (rev 102)
@@ -51,6 +51,10 @@
 '''<span class="help"> <a href="%s" target="_blank">
 <img src="/images/icons/required_12x12.png" border="0" alt="Pflichtfeld"></a></span>'''
 
+EVALUATION = \
+'''<span class="help"> <a href="%s" target="_blank">
+<img src="/images/icons/needed_12x12.png" border="0" alt="Auswertungsrelevant"></a></span>'''
+
 WEIGHTS = (15, 25, 30, 40, 45, 50, 55, 60, 75)
 
 SET_MODIFICATION = ' onchange="setModification();" '
@@ -74,6 +78,9 @@
         if self.help.hasAnnotations(dataID):
             out.append(REQUIRED % h.url_for('required', help_id=escape(dataID)))
 
+        if self.help.hasAnnotations(dataID, ('evaluation',)):
+            out.append(EVALUATION % h.url_for('required', help_id=escape(dataID)))
+
         if self.help.hasHelp(dataID):
             out.append(HELP % h.url_for('formhelp', help_id=escape(dataID)))
 

Modified: waska/trunk/waskaweb/model/repeatgroup.py
===================================================================
--- waska/trunk/waskaweb/model/repeatgroup.py	2008-08-28 11:54:51 UTC (rev 101)
+++ waska/trunk/waskaweb/model/repeatgroup.py	2008-08-28 14:08:46 UTC (rev 102)
@@ -7,6 +7,7 @@
 # Sascha L. Teichmann <teichmann at intevation.de>
 
 import sys
+import traceback 
 import time
 import datetime
 import traceback
@@ -67,12 +68,22 @@
                 conn = db.getConnection()
                 c = conn.cursor()
                 sql = FETCH_AID_LIST_SQL % (table, case_id)
+                print >> sys.stderr, "%s" % str("VOR SQL")
+                print >> sys.stderr, "%s" % str(sql)
                 c.execute(sql)
-                return [id[0] for id in c.fetchall()]
+                print c.query
+                print >> sys.stderr, "%s" % str("NACH SQL")
+                result = c.fetchall()
+                print >> sys.stderr, "%s" % result
+                return [id[0] for id in result]
             finally:
                 db.recycleConnection(conn, c)
-        except StandardError, err:
-            print >> sys.stderr, "%s" % str(err)
+        except:
+            print >> sys.stderr, "%s" % str("HIER LAUFT WAS SCHIEF!!!!")
+            traceback.print_exc(file=sys.stderr)
+            print c.query
+            #print >> sys.stderr, "%s" % str(err)
+            return []
 
     def numDatasets(self):
         return len(self.aid_list)