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

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2008-11-03 10:35:33 +0100 (Mon, 03 Nov 2008)
New Revision: 213

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:
Commented out evaluation of ESF Stammblatt


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2008-10-30 09:28:33 UTC (rev 212)
+++ waska/trunk/ChangeLog.txt	2008-11-03 09:35:33 UTC (rev 213)
@@ -1,3 +1,13 @@
+2008-11-03	Sascha L. Teichmann <sascha.teichmann at intevation.de>
+
+	Commented out evaluation of ESF Stammblatt. 
+
+	* waskaweb/controllers/evaluate.py,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako,
+	  waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako:
+	  Because currently the specifications for this evaluation are not
+	  confirmed this function will be commented out for 1.4.1 release.
+
 2008-10-30	Sascha L. Teichmann <sascha.teichmann at intevation.de>
 
 	Removed PDF import.

Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2008-10-30 09:28:33 UTC (rev 212)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2008-11-03 09:35:33 UTC (rev 213)
@@ -198,8 +198,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	2008-10-30 09:28:33 UTC (rev 212)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_navigation.mako	2008-11-03 09:35:33 UTC (rev 213)
@@ -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	2008-10-30 09:28:33 UTC (rev 212)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_result_2.mako	2008-11-03 09:35:33 UTC (rev 213)
@@ -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>