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

Fix issues in with StretchesFunction after removing date field

Browse source 
FEA: ItEr75S23FixAllocationModel
This commit is contained in:
Manuel Rego Casasnovas 2011-09-12 09:56:05 +02:00
parent 7da6dafc62
commit daae2bf5ff
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunction.java
View file

@ -140,7 +140,7 @@ public class StretchesFunction extends AssignmentFunction {
endDate = endDate.plusDays(1);
}
resourceAllocation.withPreviousAssociatedResources()
.onIntervalWithinTask(getStartFor(startInclusive), endDate)
.onInterval(getStartFor(startInclusive), endDate)
.allocateHours(intervalHours);
}

2
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/StretchesFunctionTypeEnum.java
View file

@ -215,7 +215,7 @@ public enum StretchesFunctionTypeEnum {
intervals.addAll(stretchesFunction.getIntervalsDefinedByStreches());
LocalDate startInclusive = resourceAllocation.getFirstNonConsolidatedDate();
LocalDate endExclusive = resourceAllocation.getTask().getEndAsLocalDate();
LocalDate endExclusive = resourceAllocation.getEndDate();
int totalHours = resourceAllocation.getNonConsolidatedHours();
apply(resourceAllocation, intervals, startInclusive, endExclusive, totalHours);
}

16
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/PlanningStateCreator.java
View file

@ -38,12 +38,14 @@ import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.TaskSource;
import org.navalplanner.business.planner.daos.ITaskElementDAO;
import org.navalplanner.business.planner.daos.ITaskSourceDAO;
import org.navalplanner.business.planner.entities.AssignmentFunction;
import org.navalplanner.business.planner.entities.DayAssignment;
import org.navalplanner.business.planner.entities.DerivedAllocation;
import org.navalplanner.business.planner.entities.GenericResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation;
import org.navalplanner.business.planner.entities.ResourceAllocation.IVisitor;
import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
import org.navalplanner.business.planner.entities.StretchesFunction;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.planner.entities.TaskElement;
import org.navalplanner.business.planner.entities.TaskGroup;
@ -200,7 +202,7 @@ public class PlanningStateCreator {
}
private static void forceLoadOfDataAssociatedTo(TaskElement each) {
forceLoadOfResourceAllocationsResources(each);
forceLoadOfResourceAllocationsResourcesAndAssignmentFunction(each);
forceLoadOfCriterions(each);
if (each.getCalendar() != null) {
BaseCalendarModel.forceLoadBaseCalendar(each.getCalendar());
@ -210,9 +212,9 @@ public class PlanningStateCreator {
/**
* Forcing the load of all resources so the resources at planning state and
* at allocations are the same
* at allocations are the same. It loads the assignment function too
*/
private static void forceLoadOfResourceAllocationsResources(
private static void forceLoadOfResourceAllocationsResourcesAndAssignmentFunction(
TaskElement taskElement) {
Set<ResourceAllocation<?>> resourceAllocations = taskElement
.getAllResourceAllocations();
@ -221,6 +223,14 @@ public class PlanningStateCreator {
for (DerivedAllocation eachDerived : each.getDerivedAllocations()) {
eachDerived.getResources();
}
forceLoadOfAssignmentFunction(each);
}
}
private static void forceLoadOfAssignmentFunction(ResourceAllocation<?> each) {
AssignmentFunction function = each.getAssignmentFunction();
if ((function != null) && (function instanceof StretchesFunction)) {
((StretchesFunction) function).getStretches().size();
}
}