Author: adrianc
Date: Tue Dec 27 19:54:19 2011
New Revision: 1224994
URL: http://svn.apache.org/viewvc?rev=1224994&view=rev
Log:
Fixed a bug in the getWorkEffortEventsByPeriod service, where the period span
calculation was incorrect under certain conditions.
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Modified:
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1224994&r1=1224993&r2=1224994&view=diff
==============================================================================
---
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
(original)
+++
ofbiz/trunk/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
Tue Dec 27 19:54:19 2011
@@ -723,6 +723,9 @@ public class WorkEffortServices {
calEntry.put("workEffort", workEffort);
long length = ((weRange.end().after(endStamp) ?
endStamp.getTime() : weRange.end().getTime()) -
(weRange.start().before(startStamp) ? startStamp.getTime() :
weRange.start().getTime()));
int periodSpan = (int) Math.ceil((double) length /
periodLen);
+ if (length % periodLen == 0 && startDate.getTime() >
periodRange.start().getTime()) {
+ periodSpan++;
+ }
calEntry.put("periodSpan",
Integer.valueOf(periodSpan));
DateRange calEntryRange = new
DateRange((weRange.start().before(startStamp) ? startStamp : weRange.start()),
(weRange.end().after(endStamp) ? endStamp : weRange.end()));
calEntry.put("calEntryRange", calEntryRange);
