svn commit: r1759141 - in /ofbiz/trunk/applications/workeffort/template: calendar/Month.ftl task/MyTasks.ftl

[ashish]

Author: ashish
Date: Sun Sep  4 05:01:37 2016
New Revision: 1759141

URL: http://svn.apache.org/viewvc?rev=1759141&view=rev
Log:
Applied patch from jira issue - OFBIZ-8065 - Clean up commented out code in 
Free Marker Template for WorkEffort. Thanks Aman for the contribution.

Modified:
    ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl
    ofbiz/trunk/applications/workeffort/template/task/MyTasks.ftl

Modified: ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl?rev=1759141&r1=1759140&r2=1759141&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl Sun Sep  4 
05:01:37 2016
@@ -110,35 +110,6 @@ under the License.
       </#if>
     </td>
 
-<#--
-    <td valign="top">
-      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-        <tr>
-          <td nowrap="nowrap" class="monthdaynumber"><a 
href='<@ofbizUrl>day?startTime=${period.start.time?string("#")}<#if 
eventsParam?has_content>&amp;${eventsParam}</#if>${addlParam!}</@ofbizUrl>' 
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
-          <td align="right"><a 
href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&amp;currentStatusId=CAL_TENTATIVE&amp;estimatedStartDate=${period.start?string("yyyy-MM-dd
 HH:mm:ss")}&amp;estimatedCompletionDate=${period.end?string("yyyy-MM-dd 
HH:mm:ss")}${addlParam!}</@ofbizUrl>' 
class="add">${uiLabelMap.CommonAddNew}</a>&nbsp;&nbsp;</td>
-        </tr>
-      </table>
-      <#list period.calendarEntries as calEntry>
-      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-        <tr width="100%">
-          <td class='monthcalendarentry' width="100%" valign='top'>
-            <#if 
(calEntry.workEffort.estimatedStartDate.compareTo(period.start)  <= 0 && 
calEntry.workEffort.estimatedCompletionDate.compareTo(period.end) >= 0)>
-              ${uiLabelMap.CommonAllDay}
-            <#elseif 
calEntry.workEffort.estimatedStartDate.before(period.start)>
-              ${uiLabelMap.CommonUntil} 
${calEntry.workEffort.estimatedCompletionDate?time?string.short}
-            <#elseif 
calEntry.workEffort.estimatedCompletionDate.after(period.end)>
-              ${uiLabelMap.CommonFrom} 
${calEntry.workEffort.estimatedStartDate?time?string.short}
-            <#else>
-              
${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short}
-            </#if>
-            <br />
-            <a 
href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}${addlParam!}</@ofbizUrl>"
 
class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a>&nbsp;
-          </td>
-        </tr>
-      </table>
-      </#list>
-    </td>
--->
     <#if !period_has_next && indexMod7 != 6>
     <td colspan='${6 - (indexMod7)}'>&nbsp;</td>
     </#if>

Modified: ofbiz/trunk/applications/workeffort/template/task/MyTasks.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/task/MyTasks.ftl?rev=1759141&r1=1759140&r2=1759141&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/template/task/MyTasks.ftl (original)
+++ ofbiz/trunk/applications/workeffort/template/task/MyTasks.ftl Sun Sep  4 
05:01:37 2016
@@ -49,7 +49,6 @@ under the License.
         <td>${uiLabelMap.WorkEffortPriority}</td>
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
-        <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
         <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
@@ -61,7 +60,6 @@ under the License.
           <td>${workEffort.priority!}</td>
           <td>${(delegator.findOne("StatusItem", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId", 
workEffort.getString("currentStatusId")), 
true).get("description",locale))!}</td>
           <td>${(delegator.findOne("StatusItem", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId", 
workEffort.getString("statusId")), true).get("description",locale))!}</td>
-          <#-- <td>${workEffort.partyId}</td> -->
           <td>${workEffort.roleTypeId}</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>
@@ -79,7 +77,6 @@ under the License.
         <td>${uiLabelMap.WorkEffortPriority}</td>
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
-        <#-- <td>${uiLabelMap.PartyPartyId}</td> -->
         <td>${uiLabelMap.PartyRole}</td>
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
@@ -91,7 +88,6 @@ under the License.
           <td>${workEffort.priority!}</td>
           <td>${(delegator.findOne("StatusItem", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId", 
workEffort.getString("currentStatusId")), 
true).get("description",locale))!}</td>
           <td>${(delegator.findOne("StatusItem", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId", 
workEffort.getString("statusId")), true).get("description",locale))!}</td>
-          <#-- <td>${workEffort.partyId}</td> -->
           <td>${workEffort.roleTypeId}</td>
           <td><a 
href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
           <td class="button-col"><a 
href="<@ofbizUrl>acceptRoleAssignment?workEffortId=${workEffort.workEffortId}&amp;partyId=${workEffort.partyId}&amp;roleTypeId=${workEffort.roleTypeId}&amp;fromDate=${workEffort.fromDate.toString()}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment}&nbsp;[${workEffort.workEffortId}]</a></td>
@@ -110,7 +106,6 @@ under the License.
         <td>${uiLabelMap.WorkEffortActivityStatus}</td>
         <td>${uiLabelMap.WorkEffortMyStatus}</td>
         <td>${uiLabelMap.PartyGroupPartyId}</td>
-        <#-- <td>${uiLabelMap.PartyRole}</td> -->
         <td>${uiLabelMap.WorkEffortActivityName}</td>
         <td>${uiLabelMap.CommonEdit}</td>
       </tr>
@@ -122,7 +117,6 @@ under the License.
           <td>${(delegator.findOne("StatusItem", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId", 
workEffort.getString("currentStatusId")), 
true).get("description",locale))!}</td>
           <td>${(delegator.findOne("StatusItem", 
Static["org.apache.ofbiz.base.util.UtilMisc"].toMap("statusId", 
workEffort.getString("statusId")), true).get("description",locale))!}</td>
           <td>${workEffort.groupPartyId}</td>
-          <#-- <td>${workEffort.roleTypeId}</td> -->
           <td><a 
href="<@ofbizUrl>WorkEffortSummary?workEffortId=${workEffort.workEffortId}</@ofbizUrl>">${workEffort.workEffortName}</a></td>
           <td class="button-col"><a 
href="<@ofbizUrl>acceptassignment?workEffortId=${workEffort.workEffortId}&amp;partyId=${workEffort.partyId}&amp;roleTypeId=${workEffort.roleTypeId}&amp;fromDate=${workEffort.fromDate}</@ofbizUrl>">${uiLabelMap.WorkEffortAcceptAssignment}&nbsp;[${workEffort.workEffortId}]</a></td>
         </tr>