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

Provide EffortDurations instead of the more coarse hours

Browse source 
FEA: ItEr74S04BugFixing
This commit is contained in:
Óscar González Fernández 2011-05-12 19:48:02 +02:00
parent b2c38242fd
commit ed7c26d8f5
3 changed files with 24 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/SpecificResourceAllocation.java
View file

@ -310,22 +310,19 @@ public class SpecificResourceAllocation extends
}
public void allocateKeepingProportions(LocalDate start,
LocalDate endExclusive, int newHoursForInterval) {
LocalDate endExclusive, EffortDuration effortForInterval) {
AllocationIntervalInsideTask interval = new AllocationIntervalInsideTask(
start, endExclusive);
EffortDuration durationForInterval = EffortDuration
.hours(newHoursForInterval);
EffortDuration sumConsolidated = DayAssignment
.sum(interval
.getConsolidatedAssignmentsOnInterval());
if (sumConsolidated.compareTo(durationForInterval) >= 0) {
if (sumConsolidated.compareTo(effortForInterval) >= 0) {
return;
}
EffortDuration pendingToReassign = durationForInterval
EffortDuration pendingToReassign = effortForInterval
.minus(sumConsolidated);
List<DayAssignment> nonConsolidatedAssignments = interval

4
navalplanner-business/src/test/java/org/navalplanner/business/test/planner/entities/SpecificResourceAllocationTest.java
View file

@ -782,8 +782,8 @@ public class SpecificResourceAllocationTest {
assertThat(specificResourceAllocation.getAssignments(), haveHours(2, 4,
8, 6));
specificResourceAllocation.allocateKeepingProportions(start, start
.plusDays(2), 9);
specificResourceAllocation.allocateKeepingProportions(start,
start.plusDays(2), EffortDuration.hours(9));
assertThat(specificResourceAllocation.getAssignments(), haveHours(3, 6,
8, 6));

37
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/consolidations/AdvanceConsolidationModel.java
View file

@ -21,7 +21,6 @@
package org.navalplanner.web.planner.consolidations;
import static org.navalplanner.business.workingday.EffortDuration.hours;
import static org.navalplanner.web.I18nHelper._;
import java.math.BigDecimal;
@ -240,8 +239,8 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
.getIntendedTotalAssigment()
.getSeconds()))
.intValue();
int pendingHours = EffortDuration.seconds(pendingSeconds)
.roundToHours();
EffortDuration pendingEffort = EffortDuration
.seconds(pendingSeconds);
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
@ -252,12 +251,12 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
IntraDayDate date = ResourceAllocation.allocating(
Arrays.asList(resourceAllocation
.asResourcesPerDayModification()))
.untilAllocating(hours(pendingHours));
.untilAllocating(pendingEffort);
task.setIntraDayEndDate(date.nextDayAtStart());
}
} else {
reassign(resourceAllocation, startInclusive, endExclusive,
pendingHours);
pendingEffort);
}
}
}
@ -265,14 +264,15 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
private void reassign(ResourceAllocation<?> resourceAllocation,
LocalDate startInclusive, LocalDate endExclusive,
Integer pendingHours) {
EffortDuration pendingEffort) {
if (resourceAllocation instanceof SpecificResourceAllocation) {
((SpecificResourceAllocation) resourceAllocation)
.allocateKeepingProportions(startInclusive, endExclusive,
pendingHours);
pendingEffort);
} else {
resourceAllocation.withPreviousAssociatedResources().onIntervalWithinTask(
startInclusive, endExclusive).allocateHours(pendingHours);
resourceAllocation.withPreviousAssociatedResources()
.onIntervalWithinTask(startInclusive, endExclusive)
.allocate(pendingEffort);
}
}
@ -331,34 +331,35 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
resourceAllocation
.setOnDayAssignmentRemoval(new DetachDayAssignmentOnRemoval());
int pendingHours = resourceAllocation
.getIntendedTotalAssigment().roundToHours();
EffortDuration pendingEffort = resourceAllocation
.getIntendedTotalAssigment();
if (!consolidation.getConsolidatedValues().isEmpty()) {
BigDecimal lastConslidation = task.getConsolidation()
.getConsolidatedValues().last().getValue();
pendingHours = BigDecimal.ONE
pendingEffort = EffortDuration.seconds(BigDecimal.ONE
.subtract(
lastConslidation.setScale(2).divide(
new BigDecimal(100),
RoundingMode.DOWN)).multiply(
new BigDecimal(pendingHours))
.intValue();
RoundingMode.DOWN))
.multiply(
new BigDecimal(pendingEffort
.getSeconds())).intValue());
}
if (!taskEndDate.equals(endExclusive)) {
if ((taskEndDate != null) && (endExclusive != null)
&& (taskEndDate.compareTo(endExclusive) <= 0)) {
reassign(resourceAllocation, taskEndDate,
endExclusive, 0);
endExclusive, EffortDuration.zero());
} else {
reassign(resourceAllocation, endExclusive,
taskEndDate, 0);
taskEndDate, EffortDuration.zero());
}
task.setEndDate(endExclusive.toDateTimeAtStartOfDay()
.toDate());
}
reassign(resourceAllocation, firstDayNotConsolidated,
endExclusive, pendingHours);
endExclusive, pendingEffort);
}
// delete the assignments with posterior date than endDate