[Mpuls-commits] r1609 - in wasko/branches/2.0: . mpulsweb/templates mpulsweb/templates/logbook waskaweb/templates waskaweb/templates/evaluation

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-02-16 11:49:22 +0100 (Tue, 16 Feb 2010)
New Revision: 1609

Added:
   wasko/branches/2.0/mpulsweb/templates/logbook/
   wasko/branches/2.0/mpulsweb/templates/logbook/evaluation.mako
Removed:
   wasko/branches/2.0/waskaweb/templates/evaluation/logbook.mako
   wasko/branches/2.0/waskaweb/templates/logbook/
Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/mpulsweb/templates/logbook/overview.mako
Log:
Moved template for logbook and logbook evaluation.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-02-16 10:39:36 UTC (rev 1608)
+++ wasko/branches/2.0/ChangeLog	2010-02-16 10:49:22 UTC (rev 1609)
@@ -44,7 +44,15 @@
 
 	* mpulsweb/controllers/logbook.py, 
 	  waskaweb/controllers/logbook.py: Moved controller to base.
+	* mpulsweb/lib/validators.py: Expaned imports of validators.  
 
+	* mpulsweb/templates/logbook,
+	  waskaweb/templates/logbook: Moved templates for logbook to mpulsweb
+	* mpulsweb/templates/logbook/overview.mako,
+	  waskaweb/evaluation/logbook.mako,
+	  mpulsweb/templates/logbook/evaluation.mako: Moved template for
+	  logbook evelaution into mpulsweb.
+
 2010-02-15  Bernhard Herzog  <bh at intevation.de>
 
 	* waskaweb/controllers/evaluate.py: The base package is called

Copied: wasko/branches/2.0/mpulsweb/templates/logbook (from rev 1607, wasko/branches/2.0/waskaweb/templates/logbook)


Property changes on: wasko/branches/2.0/mpulsweb/templates/logbook
___________________________________________________________________
Name: svn:ignore
   + *.pyc

Name: svn:mergeinfo
   + 

Copied: wasko/branches/2.0/mpulsweb/templates/logbook/evaluation.mako (from rev 1607, wasko/branches/2.0/waskaweb/templates/evaluation/logbook.mako)


Property changes on: wasko/branches/2.0/mpulsweb/templates/logbook/evaluation.mako
___________________________________________________________________
Name: svn:mergeinfo
   + 

Modified: wasko/branches/2.0/mpulsweb/templates/logbook/overview.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/logbook/overview.mako	2010-02-16 10:32:41 UTC (rev 1607)
+++ wasko/branches/2.0/mpulsweb/templates/logbook/overview.mako	2010-02-16 10:49:22 UTC (rev 1609)
@@ -70,4 +70,4 @@
 % endif
 </table>
 <h3>Auswertung</h3>
-<%include file="/evaluation/logbook.mako"/>
+<%include file="/logbook/evaluation.mako"/>

Deleted: wasko/branches/2.0/waskaweb/templates/evaluation/logbook.mako
===================================================================
--- wasko/branches/2.0/waskaweb/templates/evaluation/logbook.mako	2010-02-16 10:39:36 UTC (rev 1608)
+++ wasko/branches/2.0/waskaweb/templates/evaluation/logbook.mako	2010-02-16 10:49:22 UTC (rev 1609)
@@ -1,45 +0,0 @@
-## -*- coding: utf-8 -*-
-<table class="evaluation">
-  <tr>
-    <th class="table_header_h ">Aktivität</th>
-    <th class="table_header_h table_width_mid_s num">Anzahl</th>
-    <th class="table_header_h table_width_mid_s num">Aufwand (Minuten)</th>
-  </tr>
-  % for num, category in enumerate(g.mpuls_config.get('logbook', 'categories')):
-    <tr>
-      <td>
-        <b>${h.escape(category.get('name'))}:</b>
-      </td>
-      <td class="num">
-        <b>${c.eval_effort['sum_cat%s' % num][0]}</b>
-      </td>
-      <td class="num">
-        <b>${c.eval_effort['sum_cat%s' % num][1]}</b>
-      </td>
-    </tr>
-    % for item in category.get('items'):
-      <tr>
-        <td style="padding-left:1em;">
-          ${h.escape(g.mpuls_config.get('logbook', 'descriptions')[0].get(item))}
-        </td>
-        <td class="num">
-          ${c.eval_effort[item][0]}
-        </td>
-        <td class="num">
-          ${c.eval_effort[item][1]}
-        </td>
-      </tr>
-    % endfor
-  % endfor
-  <tr class="table_row_v_12">
-    <td>
-      <b>GESAMT</b>
-    </td>
-    <td class="num">
-      <b>${c.eval_effort['sum_all'][0]}</b>
-    </td>
-    <td class="num">
-      <b>${c.eval_effort['sum_all'][1]}</b>
-    </td>
-  </tr>
-</table>