[Mpuls-commits] r2839 - in wasko/branches/1.0: . waskaweb/model waskaweb/public/images/icons waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: roland
Date: 2010-05-31 15:55:57 +0200 (Mon, 31 May 2010)
New Revision: 2839

Added:
   wasko/branches/1.0/waskaweb/public/images/icons/validity-0-22.png
   wasko/branches/1.0/waskaweb/public/images/icons/validity-1-22.png
   wasko/branches/1.0/waskaweb/public/images/icons/validity-2-22.png
   wasko/branches/1.0/waskaweb/public/images/icons/validity-3-22.png
   wasko/branches/1.0/waskaweb/public/images/icons/validity-4-22.png
   wasko/branches/1.0/waskaweb/public/images/icons/validity-5-22.png
Modified:
   wasko/branches/1.0/ChangeLog.txt
   wasko/branches/1.0/waskaweb/model/case.py
   wasko/branches/1.0/waskaweb/templates/casemanagement/caselist.mako
Log:
added validity icons to case overview

Modified: wasko/branches/1.0/ChangeLog.txt
===================================================================
--- wasko/branches/1.0/ChangeLog.txt	2010-05-31 13:40:22 UTC (rev 2838)
+++ wasko/branches/1.0/ChangeLog.txt	2010-05-31 13:55:57 UTC (rev 2839)
@@ -1,12 +1,19 @@
 2010-05-31	Roland Geider <roland.geider at intevation.de>
 
+	* waskaweb/model/case.py:
+	* waskaweb/templates/casemanagement/caselist.mako: added validity status to
+        case overview
+	* waskaweb/public/images/icons/validity-*-22.png: copied validity icons from WASKA
+
+2010-05-31	Roland Geider <roland.geider at intevation.de>
+
 	* waskaweb/i18n/waskaweb.pot:
 	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.po:
 	* waskaweb/i18n/de/LC_MESSAGES/waskaweb.mo: actualized translation
 	* waskaweb/model/case.py:
 	* waskaweb/lib/helpers.py:
         * waskaweb/templates/casemanagement/digest_body.mako: added validity to
-        case overview
+        case digest
 
 2010-05-28	Roland Geider <roland.geider at intevation.de>
 

Modified: wasko/branches/1.0/waskaweb/model/case.py
===================================================================
--- wasko/branches/1.0/waskaweb/model/case.py	2010-05-31 13:40:22 UTC (rev 2838)
+++ wasko/branches/1.0/waskaweb/model/case.py	2010-05-31 13:55:57 UTC (rev 2839)
@@ -914,6 +914,7 @@
         self.state         = None
         self.first_meeting = None
         self.cm_end        = None
+        self.tags          = []
 
         self.digest                   = None
         self.page                     = None

Copied: wasko/branches/1.0/waskaweb/public/images/icons/validity-0-22.png (from rev 2834, waska/branches/1.7/waskaweb/public/images/icons/validity-0-22.png)


Property changes on: wasko/branches/1.0/waskaweb/public/images/icons/validity-0-22.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Copied: wasko/branches/1.0/waskaweb/public/images/icons/validity-1-22.png (from rev 2834, waska/branches/1.7/waskaweb/public/images/icons/validity-1-22.png)


Property changes on: wasko/branches/1.0/waskaweb/public/images/icons/validity-1-22.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Copied: wasko/branches/1.0/waskaweb/public/images/icons/validity-2-22.png (from rev 2834, waska/branches/1.7/waskaweb/public/images/icons/validity-2-22.png)


Property changes on: wasko/branches/1.0/waskaweb/public/images/icons/validity-2-22.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Copied: wasko/branches/1.0/waskaweb/public/images/icons/validity-3-22.png (from rev 2834, waska/branches/1.7/waskaweb/public/images/icons/validity-3-22.png)


Property changes on: wasko/branches/1.0/waskaweb/public/images/icons/validity-3-22.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Copied: wasko/branches/1.0/waskaweb/public/images/icons/validity-4-22.png (from rev 2834, waska/branches/1.7/waskaweb/public/images/icons/validity-4-22.png)


Property changes on: wasko/branches/1.0/waskaweb/public/images/icons/validity-4-22.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Copied: wasko/branches/1.0/waskaweb/public/images/icons/validity-5-22.png (from rev 2834, waska/branches/1.7/waskaweb/public/images/icons/validity-5-22.png)


Property changes on: wasko/branches/1.0/waskaweb/public/images/icons/validity-5-22.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
Name: svn:mergeinfo
   + 

Modified: wasko/branches/1.0/waskaweb/templates/casemanagement/caselist.mako
===================================================================
--- wasko/branches/1.0/waskaweb/templates/casemanagement/caselist.mako	2010-05-31 13:40:22 UTC (rev 2838)
+++ wasko/branches/1.0/waskaweb/templates/casemanagement/caselist.mako	2010-05-31 13:55:57 UTC (rev 2839)
@@ -55,6 +55,8 @@
         <td>
         <img src="/images/icons/status${case.getState().getPhase()}.png" border="0" alt="${case.getState().getPhaseDescription()}" title="${case.getState().getPhaseDescription()}">
         
+        ${self.show_case_validity(case.tags)}
+        
           % if h.hasRole(['cm_ka']):
             % if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
               <img src="/images/icons/editor_grey.gif" border="0" alt="${_('cm_overview_img_editor')}" title="${_('cm_overview_img_editor')}">
@@ -115,6 +117,9 @@
         % endif
         <td class="table_row_h">
         <img src="/images/icons/status${case.getState().getPhase()}.png" border="0" alt="${case.getState().getPhaseDescription()}" title="${case.getState().getPhaseDescription()}">
+        
+        ${self.show_case_validity(case.tags)}
+        
           % if h.hasRole(['cm_ka']):
             % if str(case.getEditor().id) == str(session.get('USER_AUTHORIZED').id):
               <img src="/images/icons/editor_grey.gif" border="0" alt="${_('cm_overview_img_editor')}" title="${_('cm_overview_img_editor')}">
@@ -163,3 +168,9 @@
   </tr>
   % endif
 </table>
+
+
+<%def name="show_case_validity(tags)">
+  <% validity = h.get_validity(tags) %>
+  <img src="/images/icons/validity-${validity}-22.png" border="0" alt="${_('Validity')}" title="${_('Validity')}">
+</%def>
\ No newline at end of file