svn commit: r804640 - /ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl

[hansbak-2]

Author: hansbak
Date: Sun Aug 16 07:33:42 2009
New Revision: 804640

URL: http://svn.apache.org/viewvc?rev=804640&view=rev
Log:
corrected upcoming events screen

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=804640&r1=804639&r2=804640&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Sun Aug 16 07:33:42 2009
@@ -33,8 +33,8 @@
           <#list workEfforts as calendarEntry>
             <#assign workEffort = calendarEntry.workEffort>
             <tr<#if alt_row> class="alternate-row"</#if>>
-              <td>${workEffort.estimatedStartDate}</td>
-              <td>${workEffort.estimatedStartDate}</td>
+              <td><#if workEffort.actualStartDate?exists>${workEffort.actualStartDate}<#else>${workEffort.estimatedStartDate}</#if></td>
+              <td><#if workEffort.actualCompletionDate?exists>${workEffort.actualCompletionDate}<#else>${workEffort.estimatedCompletionDate}</#if></td>
               <td>${workEffort.getRelatedOne("WorkEffortType").get("description",locale)}</td>
               <td class="button-col"><a href="<@ofbizUrl>EditWorkEffort?workEffortId=${workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
             </tr>