[Mpuls-commits] r708 - in waska/trunk: . waskaweb/templates/casemanagement

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2009-11-26 08:58:22 +0100 (Thu, 26 Nov 2009)
New Revision: 708

Modified:
   waska/trunk/ChangeLog.txt
   waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
Log:
issue880


Modified: waska/trunk/ChangeLog.txt
===================================================================
--- waska/trunk/ChangeLog.txt	2009-11-26 07:46:23 UTC (rev 707)
+++ waska/trunk/ChangeLog.txt	2009-11-26 07:58:22 UTC (rev 708)
@@ -3,6 +3,11 @@
 	* waskaweb/lib/renderer.py: If formfields are disabled. Render
 	  additionale hidden fields to not loose any formdata.
 
+	Issue880:
+
+	* waskaweb/templates/casemanagement/digest_body.mako: Only show dates
+	on phases up to the current phase.
+
 2009-11-25 	Torsten Irlaender  <torsten.irlaender at intevation.de>
 
 	* waskaweb/templates/casemanagement/phase.mako: Fixed check if the cm

Modified: waska/trunk/waskaweb/templates/casemanagement/digest_body.mako
===================================================================
--- waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2009-11-26 07:46:23 UTC (rev 707)
+++ waska/trunk/waskaweb/templates/casemanagement/digest_body.mako	2009-11-26 07:58:22 UTC (rev 708)
@@ -71,7 +71,10 @@
     <td class="label table_header_v">${_('Start- Enddaten')}</td>
     <td class="table_row_v">
     % for phase_pair in c.phase_pairs:
-      ${phase_pair.getDescription()} (${h.dd_mm_YYYY(phase_pair.getStart().getTime(), '-/-')} bis ${h.dd_mm_YYYY(phase_pair.getEnd().getTime(), '-/-')})<br>
+      ## only show dates up to the current phase
+      % if phase_pair.getStart().phase <= c.phase or phase_pair.getEnd().phase <= c.phase:
+        ${phase_pair.getDescription()} (${h.dd_mm_YYYY(phase_pair.getStart().getTime(), '-/-')} bis ${h.dd_mm_YYYY(phase_pair.getEnd().getTime(), '-/-')})<br>
+      % endif
     % endfor
     </td>
   </tr>