Author: pranayp
Date: Sat Jun 18 07:08:47 2016
New Revision: 1748925
URL: http://svn.apache.org/viewvc?rev=1748925&view=rev
Log:
[OFBIZ-7329] Fixed an exception being thrown when day links are clicked in the
Week and Month view of the Calendar widget. Changed the name of the 'start'
parameter to "startTime" as at the time of creating a valid context for
"getWorkEffortEventsByPeriod", the "start" parameter for the service was
expected to be in Timestamp format but was actually in String format.
Thanks Aditya Patwa for reporting the issue and providing patch.
Modified:
ofbiz/trunk/applications/workeffort/template/calendar/Day.ftl
ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl
ofbiz/trunk/applications/workeffort/template/calendar/Week.ftl
Modified: ofbiz/trunk/applications/workeffort/template/calendar/Day.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/calendar/Day.ftl?rev=1748925&r1=1748924&r2=1748925&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/template/calendar/Day.ftl (original)
+++ ofbiz/trunk/applications/workeffort/template/calendar/Day.ftl Sat Jun 18
07:08:47 2016
@@ -37,7 +37,7 @@ under the License.
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="label">
${period.start?time?string.short}<br />
- <a
href="<@ofbizUrl>${newCalEventUrl}?period=day&form=edit&parentTypeId=${parentTypeId!}&start=${parameters.start!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a
href="<@ofbizUrl>${newCalEventUrl}?period=day&form=edit&parentTypeId=${parentTypeId!}&startTime=${parameters.start!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate??>
Modified: ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl?rev=1748925&r1=1748924&r2=1748925&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl (original)
+++ ofbiz/trunk/applications/workeffort/template/calendar/Month.ftl Sat Jun 18
07:08:47 2016
@@ -39,12 +39,12 @@ under the License.
<#if indexMod7 = 0>
<tr>
<td class="label" ${styleTd}>
- <a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonWeek}
${period.start?date?string("w")}</a>
+ <a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&startTime=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonWeek}
${period.start?date?string("w")}</a>
</td>
</#if>
<td ${styleTd} <#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
- <span class="h1"><a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
- <a class="add-new"
href='<@ofbizUrl>${newCalEventUrl}?period=month&form=edit&start=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
+ <span class="h1"><a
href='<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&startTime=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>'>${period.start?date?string("d")?cap_first}</a></span>
+ <a class="add-new"
href='<@ofbizUrl>${newCalEventUrl}?period=month&form=edit&startTime=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${urlParam!}${addlParam!}</@ofbizUrl>'>${uiLabelMap.CommonAddNew}</a>
<br class="clear"/>
<#assign maxNumberOfPersons = 0/>
@@ -114,7 +114,7 @@ under the License.
<td valign="top">
<table width="100%" cellspacing="0" cellpadding="0" border="0">
<tr>
- <td nowrap="nowrap" class="monthdaynumber"><a
href='<@ofbizUrl>day?start=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam!}</@ofbizUrl>'
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
+ <td nowrap="nowrap" class="monthdaynumber"><a
href='<@ofbizUrl>day?startTime=${period.start.time?string("#")}<#if
eventsParam?has_content>&${eventsParam}</#if>${addlParam!}</@ofbizUrl>'
class="monthdaynumber">${period.start?date?string("d")?cap_first}</a></td>
<td align="right"><a
href='<@ofbizUrl>EditWorkEffort?workEffortTypeId=EVENT&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam!}</@ofbizUrl>'
class="add">${uiLabelMap.CommonAddNew}</a> </td>
</tr>
</table>
Modified: ofbiz/trunk/applications/workeffort/template/calendar/Week.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/template/calendar/Week.ftl?rev=1748925&r1=1748924&r2=1748925&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/template/calendar/Week.ftl (original)
+++ ofbiz/trunk/applications/workeffort/template/calendar/Week.ftl Sat Jun 18
07:08:47 2016
@@ -36,8 +36,8 @@ under the License.
<#if (nowTimestamp >= period.start) && (nowTimestamp <=
period.end)><#assign currentPeriod = true/></#if>
<tr<#if currentPeriod> class="current-period"<#else><#if
(period.calendarEntries?size > 0)> class="active-period"</#if></#if>>
<td class="centered" width="1%">
- <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br
/>
- <a
href="<@ofbizUrl>${newCalEventUrl}?period=week&form=edit&start=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam!}${urlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
+ <a
href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&startTime=${period.start.time?string("#")}${urlParam!}${addlParam!}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br
/>
+ <a
href="<@ofbizUrl>${newCalEventUrl}?period=week&form=edit&startTime=${parameters.start!}&parentTypeId=${parentTypeId!}&currentStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd
HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd
HH:mm:ss")}${addlParam!}${urlParam!}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a>
</td>
<#list period.calendarEntries as calEntry>
<#if calEntry.workEffort.actualStartDate??>
