RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prevent losing precision in TaskElementAdapter.calculateLimitDateByHours()

Browse source 
FEA: ItEr76S04BugFixing
This commit is contained in:
Jacobo Aragunde Pérez 2012-08-21 17:49:11 +02:00
parent fb004e07c1
commit af2d856b32
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libreplan-webapp/src/main/java/org/libreplan/web/planner/TaskElementAdapter.java
View file

@ -21,7 +21,7 @@
package org.libreplan.web.planner;
import static org.libreplan.business.workingday.EffortDuration.hours;
import static org.libreplan.business.workingday.EffortDuration.fromHoursAsBigDecimal;
import static org.libreplan.business.workingday.EffortDuration.min;
import static org.libreplan.business.workingday.EffortDuration.seconds;
import static org.libreplan.business.workingday.EffortDuration.zero;
@ -564,7 +564,7 @@ public class TaskElementAdapter {
GanttDate result = null;
if (!(taskElement instanceof TaskGroup)) {
result = calculateLimitDateByHours(assignedEffort
.toHoursAsDecimalWithScale(2).intValue());
.toHoursAsDecimalWithScale(2));
}
if (result == null) {
@ -746,8 +746,8 @@ public class TaskElementAdapter {
}
// Calculate date according to advanceHours or advancePercentage
final Integer advanceHours = advancePercentage.multiply(
hours).intValue();
final BigDecimal advanceHours = advancePercentage
.multiply(hours);
GanttDate result = calculateLimitDateByHours(advanceHours);
if (result == null) {
result = calculateLimitDateByPercentage(advancePercentage);
@ -826,11 +826,11 @@ public class TaskElementAdapter {
return toGantt(end);
}
private GanttDate calculateLimitDateByHours(Integer hours) {
if (hours == null || hours == 0) {
private GanttDate calculateLimitDateByHours(BigDecimal hours) {
if (hours == null || hours.compareTo(BigDecimal.ZERO) == 0) {
return null;
}
EffortDuration hoursLeft = hours(hours);
EffortDuration hoursLeft = fromHoursAsBigDecimal(hours);
IntraDayDate result = null;
EffortDuration effortLastDayNotZero = zero();