[Mpuls-commits] r650 - in waska/trunk: . waskaweb/controllers waskaweb/i18n/de/LC_MESSAGES waskaweb/templates waskaweb/templates/casemanagement/evaluation

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-10-22 10:44:44 +0200 (Thu, 22 Oct 2009)
New Revision: 650

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/controllers/evaluate.py
   waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
   waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako
   waska/trunk/waskaweb/templates/main.mako
Log:
Added new timeframe for evaluation


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-10-22 08:06:49 UTC (rev 649)
+++ waska/trunk/ChangeLog.txt	2009-10-22 08:44:44 UTC (rev 650)
@@ -4,6 +4,14 @@
 
 	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po: Set version
 
+	Added new timeframe to adele-evaluation
+
+	* waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako,
+	  waskaweb/controllers/evaluate.py: Added new timeframe
+	* waskaweb/templates/main.mako: 
+	  - Renamed "Zwischenbericht" to "Verwendungsnachweis"
+	  - Removed "Fortschreibung" 
+
 2009-09-21 	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	Fixed helptext

Modified: waska/trunk/waskaweb/controllers/evaluate.py
===================================================================
--- waska/trunk/waskaweb/controllers/evaluate.py	2009-10-22 08:06:49 UTC (rev 649)
+++ waska/trunk/waskaweb/controllers/evaluate.py	2009-10-22 08:44:44 UTC (rev 650)
@@ -138,18 +138,22 @@
 
     def evaluateAdele(self):
         params = {}
-        params['start_date'] = '2009-01-01'
-        params['end_date']   = '2009-03-31'
-        c.select = 2
+        params['start_date'] = '2008-09-01'
+        params['end_date']   = '2009-08-31'
+        c.select = 3
         if request.params:
             if request.params.get('timeframe') == '1':
                 params['start_date'] = '2008-09-01'
                 params['end_date']   = '2008-12-31'
                 c.select = 1
-            else:
+            elif request.params.get('timeframe') == '2':
                 params['start_date'] = '2009-01-01'
                 params['end_date']   = '2009-03-31'
                 c.select = 2
+            elif request.params.get('timeframe') == '3':
+                params['start_date'] = '2008-09-01'
+                params['end_date']   = '2009-08-31'
+                c.select = 3
 
         params['agencyid']   = 'inte0002'
 

Modified: waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po
===================================================================
--- waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-10-22 08:06:49 UTC (rev 649)
+++ waska/trunk/waskaweb/i18n/de/LC_MESSAGES/waskaweb.po	2009-10-22 08:44:44 UTC (rev 650)
@@ -552,7 +552,7 @@
 
 #: waskaweb/templates/main.mako:197
 msgid "footer_version"
-msgstr "22.10.2009 | Version 1.5.7-beta1"
+msgstr "22.10.2009 | Version 1.5.6-beta1"
 
 #: waskaweb/templates/main_login.mako:38
 msgid "main_login_bmf_phrase"

Modified: waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako	2009-10-22 08:06:49 UTC (rev 649)
+++ waska/trunk/waskaweb/templates/casemanagement/evaluation/evaluation_adele.mako	2009-10-22 08:44:44 UTC (rev 650)
@@ -16,9 +16,15 @@
   % if c.select == 1: 
     <option value="1" selected>01.09.2008 - 31.12.2008</option>
     <option value="2">01.01.2009 - 31.03.2009</option>
-  % else:
+    <option value="3">01.09.2008 - 31.08.2009</option>
+  % elif c.select == 2:
     <option value="1">01.09.2008 - 31.12.2008</option>
     <option value="2" selected>01.01.2009 - 31.03.2009</option>
+    <option value="3">01.09.2008 - 31.08.2009</option>
+  % elif c.select == 3:
+    <option value="1">01.09.2008 - 31.12.2008</option>
+    <option value="2">01.01.2009 - 31.03.2009</option>
+    <option value="3" selected>01.09.2008 - 31.08.2009</option>
   % endif
 </select>
 <input type="submit" value="Auswerten">

Modified: waska/trunk/waskaweb/templates/main.mako
===================================================================
--- waska/trunk/waskaweb/templates/main.mako	2009-10-22 08:06:49 UTC (rev 649)
+++ waska/trunk/waskaweb/templates/main.mako	2009-10-22 08:44:44 UTC (rev 650)
@@ -73,8 +73,8 @@
       % endif
       <h1>${_('Auswertungen')}</h1>
       <ul>
-        <li><a href="${h.url_for(controller='/evaluate', action='evaluateBasic')}">Fortschreibung</a></li>
-        <li><a href="${h.url_for(controller='/evaluate', action='evaluateAdele')}">Zwischenbericht</a></li>
+        ##<li><a href="${h.url_for(controller='/evaluate', action='evaluateBasic')}">Fortschreibung</a></li>
+        <li><a href="${h.url_for(controller='/evaluate', action='evaluateAdele')}">Verwendungsnachweis</a></li>
         <li><a href="${h.url_for(controller='/evaluate', action='evaluate', id=1, reset=1)}"> ${_('cm_actions_link_evaluate')}</a></li>
         %if session.get('hascaseerrors'):
         <li><a href="${h.url_for(controller='/case_overview', action='listBadCases')}">Inkonsistente Fallakten</a></li>