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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-12-08 11:52:51 +0100 (Mon, 08 Dec 2008)
New Revision: 226

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
Log:
Fixed issue663


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-12-05 15:27:46 UTC (rev 225)
+++ waska/trunk/ChangeLog.txt	2008-12-08 10:52:51 UTC (rev 226)
@@ -1,3 +1,18 @@
+2008-12-08	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Fixed issue663
+
+	* waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:
+	  Changed labeling of the evaluation
+
+2008-12-05	Torsten Irlaender  <torsten.irlaender at intevation.de>
+
+	Fixed issue681
+
+	* waskaweb/model/case.py, 	  
+	  waskaweb/controllers/case.py: Added checks for inconsistencys and
+	  adjusted error message
+
 2008-12-04	Frank Koormann	<frank.koormann at intevation.de>
 
 	* waskaweb/controllers/case.py (CaseController.organisation):

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-12-05 15:27:46 UTC (rev 225)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-12-08 10:52:51 UTC (rev 226)
@@ -161,14 +161,14 @@
   </tr>
   <tr>
     <td>&nbsp;&nbsp;davon aus Regelkreis SGBII</td>
-    <td class="num">${c.eval_19['alg1'][0]| F.NA, h}</td>
-    <td class="num">(${c.eval_19['alg1'][1]| F.NA, h}%)</td>
+    <td class="num">${c.eval_19['alg2'][0]| F.NA, h}</td>
+    <td class="num">(${c.eval_19['alg2'][1]| F.NA, h}%)</td>
     <td></td>
   </tr>
   <tr>
     <td class="table_row_v_12">&nbsp;&nbsp;davon aus Regelkreis SGBIII</td>
-    <td class="table_row_v_12 num">${c.eval_19['alg2'][0]| F.NA, h}</td>
-    <td class="table_row_v_12 num">(${c.eval_19['alg2'][1]| F.NA, h}%)</td>
+    <td class="table_row_v_12 num">${c.eval_19['alg1'][0]| F.NA, h}</td>
+    <td class="table_row_v_12 num">(${c.eval_19['alg1'][1]| F.NA, h}%)</td>
     <td class="table_row_v_12"></td>
   </tr>
 </table>