[Mpuls-commits] r183 - in waska/trunk: . waskaweb/model waskaweb/templates/casemanagement/evaluation

[scm-commit@wald.intevation.org]

Author: teichmann
Date: 2008-09-19 18:19:16 +0200 (Fri, 19 Sep 2008)
New Revision: 183

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/model/logbook.py
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako
Log:
Fixed issue563


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-09-19 15:58:36 UTC (rev 182)
+++ waska/trunk/ChangeLog.txt	2008-09-19 16:19:16 UTC (rev 183)
@@ -23,7 +23,9 @@
 
 	Fixed issue563
 
-	* waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako:
+	* waskaweb/templates/casemanagement/evaluation/evaluation_avg_effort.mako
+	  waskaweb/model/logbook.py,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako:
 	  "Arbeit mit den Ditten" -> "Arbeit mit Dritten"
 
 2008-09-19	Torsten Irlaender  <torsten.irlaender at intevation.de>

Modified: waska/trunk/waskaweb/model/logbook.py
===================================================================
--- waska/trunk/waskaweb/model/logbook.py	2008-09-19 15:58:36 UTC (rev 182)
+++ waska/trunk/waskaweb/model/logbook.py	2008-09-19 16:19:16 UTC (rev 183)
@@ -53,10 +53,10 @@
 # sum_cat1 = 1,2,3,4,9,10, sum_cat2 = 5,6,7,8
 SUMKIND2TEXT = {
     'sum_cat1': u'unmittelbare Arbeit mit dem Jugendlichen',
-    'sum_cat2': u'Arbeit mit den Dritten',
+    'sum_cat2': u'Arbeit mit Dritten',
     'sum_cat3': u'Sonstiges',
     'sum_cat4': u'Keine Angabe',
-     'sum_all': u'Gesamt' }
+    'sum_all': u'Gesamt' }
 
 AVGKIND2TEXT = {
     'avg_cat1': u'unmittelbare Arbeit mit dem Jugendlichen',

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako	2008-09-19 15:58:36 UTC (rev 182)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_effort.mako	2008-09-19 16:19:16 UTC (rev 183)
@@ -27,7 +27,7 @@
     <td>&nbsp;&nbsp;&nbsp;&nbsp;Kompetenzfeststellung</td><td class="num">${c.eval_effort['10'][0]}</td><td class="num">${c.eval_effort['10'][1]}</td>
   </tr>
   <tr class="table_row_v_12">
-    <td><b>Arbeit mit den Dritten:</b></td><td class="num"><b>${c.eval_effort['sum_cat2'][0]}</td><td class="num"><b>${c.eval_effort['sum_cat2'][1]}</b></td>
+    <td><b>Arbeit mit Dritten:</b></td><td class="num"><b>${c.eval_effort['sum_cat2'][0]}</td><td class="num"><b>${c.eval_effort['sum_cat2'][1]}</b></td>
   </tr>
   <tr class="table_row_v_12">
     <td>&nbsp;&nbsp;&nbsp;&nbsp;Schriftverkehr</td><td class="num">${c.eval_effort['5'][0]}</td><td class="num">${c.eval_effort['5'][1]}</td>