[Mpuls-commits] r1563 - wasko/branches/2.0/waskaweb/lib

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-15 15:53:04 +0100 (Mon, 15 Feb 2010)
New Revision: 1563

Modified:
   wasko/branches/2.0/waskaweb/lib/evaluation.py
Log:
* waskaweb/lib/evaluation.py: Do not import SUMKIND2TEXT and KIND2TEXT
from model.logbook. Get them from mpuls_config or define them in
lib.evaluation as this is the only place where they are used.


Modified: wasko/branches/2.0/waskaweb/lib/evaluation.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-02-15 14:49:16 UTC (rev 1562)
+++ wasko/branches/2.0/waskaweb/lib/evaluation.py	2010-02-15 14:53:04 UTC (rev 1563)
@@ -31,11 +31,21 @@
 
 import psycopg2
 
+from pylons import app_globals as g
+
 from mpulsweb.lib.helpers import format_number, timedelta_in_minutes 
 from mpulsweb.lib.base import _, c, session
 from mpulsweb.lib.db import db
 
-from waskaweb.model.logbook import KIND2TEXT, SUMKIND2TEXT  
+KIND2TEXT = g.mpuls_config.get('logbook', 'descriptions')[0] 
+SUMKIND2TEXT = {
+    'sum_cat1': u'unmittelbare Arbeit mit dem Jugendlichen',
+    'sum_cat2': u'Arbeit mit Eltern/Personensorgeberechtigte',
+    'sum_cat3': u'Arbeit mit Dritten',
+    'sum_cat4': u'Sonstiges',
+    'sum_cat5': u'Keine Angabe',
+    'sum_all': u'Gesamt',
+    }
 
 def where_ids(compressed, idname="id"):
     if not compressed: