svn commit: r663419 - /ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl

[adrianc]

Author: adrianc
Date: Wed Jun  4 16:44:07 2008
New Revision: 663419

URL: http://svn.apache.org/viewvc?rev=663419&view=rev
Log:
Small enhancement to the work effort task list. Eliminated redundant Edit button, changed column order.

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=663419&r1=663418&r2=663419&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl Wed Jun  4 16:44:07 2008
@@ -25,19 +25,17 @@
   <table class="basic-table hover-bar" cellspacing="0">
     <tr class="header-row-2">
       <td>${uiLabelMap.CommonStartDateTime}</td>
+      <td>${uiLabelMap.WorkEffortTaskName}</td>
       <td>${uiLabelMap.WorkEffortPriority}</td>
       <td>${uiLabelMap.WorkEffortStatus}</td>
-      <td>${uiLabelMap.WorkEffortTaskName}</td>
-      <td>${uiLabelMap.CommonEdit}</td>
     </tr>
     <#assign alt_row = false>
     <#list tasks as workEffort>
       <tr<#if alt_row> class="alternate-row"</#if>>
-        <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+        <td>${(workEffort.estimatedStartDate)?if_exists}</td>
+        <td><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
         <td>${workEffort.priority?if_exists}</td>
         <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
-        <td><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
-        <td class="button-col"><a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortId}</a></td>
       </tr>
       <#assign alt_row = !alt_row>
     </#list>
@@ -59,7 +57,7 @@
       <#assign alt_row = false>
       <#list activities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate)?if_exists}</td>
           <td>${workEffort.priority?if_exists}</td>
           <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
           <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId"))).get("description",locale))?if_exists}</td>
@@ -89,7 +87,7 @@
       <#assign alt_row = false>
       <#list roleActivities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate)?if_exists}</td>
           <td>${workEffort.priority?if_exists}</td>
           <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
           <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId"))).get("description",locale))?if_exists}</td>
@@ -119,7 +117,7 @@
       <#assign alt_row = false>
       <#list groupActivities as workEffort>
         <tr<#if alt_row> class="alternate-row"</#if>>
-          <td>${(workEffort.estimatedStartDate.toString())?if_exists}</td>
+          <td>${(workEffort.estimatedStartDate)?if_exists}</td>
           <td>${workEffort.priority?if_exists}</td>
           <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists}</td>
           <td>${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("statusId"))).get("description",locale))?if_exists}</td>