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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-02-05 16:09:26 +0100 (Thu, 05 Feb 2009)
New Revision: 243

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/evaluate.py
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
Log:
Fixed issue 726


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-02-05 14:16:53 UTC (rev 242)
+++ waska/trunk/ChangeLog.txt	2009-02-05 15:09:26 UTC (rev 243)
@@ -32,6 +32,13 @@
 	* waskaweb/lib/search.py: Chaged definition of the timeframe in search
 	strings.
 
+	Fixed issue 726
+
+	* waskaweb/controllers/evaluate.py,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:
+	  Removed again old version of WASKA-Stammblatt evaluation
+
 2009-02-04	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Added new evalution adele stammblatt. 

Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2009-02-05 14:16:53 UTC (rev 242)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2009-02-05 15:09:26 UTC (rev 243)
@@ -210,8 +210,8 @@
                 e20 = Evaluation_20(self._getCompressedIds(reset))
                 c.eval_20 = e20.perform()
                 # ESF-Stammblatt 
-                e21 = Evaluation_21(self._getCompressedIds(reset))
-                c.eval_21 = e21.perform()
+                #e21 = Evaluation_21(self._getCompressedIds(reset))
+                #c.eval_21 = e21.perform()
                 page = render('casemanagement/evaluation/evaluation_result_2.mako')
             elif id == '3':
                 # Verweildauer CM

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako	2009-02-05 14:16:53 UTC (rev 242)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako	2009-02-05 15:09:26 UTC (rev 243)
@@ -45,7 +45,7 @@
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_6">${_('cm_eval_summary_header_6')}</a></li>
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_19">${_('cm_eval_summary_header_19')}</a></li>
   <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_20">${_('cm_eval_summary_header_20')}</a></li>
-  <li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_21">${_('cm_eval_summary_header_21')}</a></li>
+  ##<li><a href="${h.url_for(controller="/evaluate", action="evaluate", id=2)}#eval_21">${_('cm_eval_summary_header_21')}</a></li>
 </ul>
 <h2>${_('eval_group_header_finished')}</h2>
 <ul>

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2009-02-05 14:16:53 UTC (rev 242)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2009-02-05 15:09:26 UTC (rev 243)
@@ -198,8 +198,8 @@
 </table>
 <a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_20/auswertung_2_5.csv">${_('cm_eval_table_export_analysis')}</a>
 </div>
-<div class="evaluation odd-row">
-<h3><a name="eval_21">${_('cm_eval_summary_header_21')}</a></h3>
-  <%include file="/casemanagement/evaluation/evaluation_esfstammblatt.mako"/>
-<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_21/auswertung_2_6.csv">${_('cm_eval_table_export_analysis')}</a>
-</div>
+##<div class="evaluation odd-row">
+##<h3><a name="eval_21">${_('cm_eval_summary_header_21')}</a></h3>
+##  <%include file="/casemanagement/evaluation/evaluation_esfstammblatt.mako"/>
+##<a href="#top">${_('cm_eval_table_to_overview')}</a> | <a href="/evaluate/exportEvaluation_21/auswertung_2_6.csv">${_('cm_eval_table_export_analysis')}</a>
+##</div>