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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: Fixing problems calculating ResourcesPerDay value for ResourceAllocation.

Browse source
This commit is contained in:
Manuel Rego Casasnovas 2010-06-16 15:09:08 +02:00 • committed by Javier Moran Rua
parent ddb26229fe
commit 056bcfddc3
3 changed files with 15 additions and 11 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/GenericResourceAllocation.java
View file

@ -132,7 +132,7 @@ public class GenericResourceAllocation extends
Collection<? extends Criterion> criterions) {
GenericResourceAllocation result = new GenericResourceAllocation(task);
result.criterions = new HashSet<Criterion>(criterions);
result.setResourcesPerDay(ResourcesPerDay.amount(1));
result.updateResourcesPerDay();
return create(result);
}

22
navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/ResourceAllocation.java
View file

@ -214,8 +214,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
ResourceAllocation<?> allocation,
ResourcesPerDay resourcesPerDay,
List<DayAssignment> dayAssignments) {
allocation.setResourcesPerDay(resourcesPerDay);
allocation.resetGenericAssignmentsTo(dayAssignments);
allocation.updateResourcesPerDay();
}
@Override
@ -375,9 +375,13 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
}
}
protected void setResourcesPerDay(ResourcesPerDay resourcesPerDay) {
Validate.notNull(resourcesPerDay);
this.resourcesPerDay = resourcesPerDay;
protected void updateResourcesPerDay() {
ResourcesPerDay resourcesPerDay = calculateResourcesPerDayFromAssignments(getAssignments());
if (resourcesPerDay == null) {
this.resourcesPerDay = ResourcesPerDay.amount(0);
} else {
this.resourcesPerDay = resourcesPerDay;
}
}
public ResourceAllocation(Task task) {
@ -440,8 +444,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
LocalDate endExclusive = new LocalDate(currentTask.getEndDate());
List<T> assignmentsCreated = createAssignments(resourcesPerDay,
startInclusive, endExclusive);
setResourcesPerDay(resourcesPerDay);
resetAssignmentsTo(assignmentsCreated);
updateResourcesPerDay();
}
private List<T> createAssignments(ResourcesPerDay resourcesPerDay,
@ -471,7 +475,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
List<T> assignmentsCreated = createAssignments(
resourcesPerDay, startInclusive, endExclusive);
resetAssignmentsTo(assignmentsCreated);
setResourcesPerDay(calculateResourcesPerDayFromAssignments());
updateResourcesPerDay();
}
};
@ -535,7 +539,7 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
List<T> assignmentsCreated = createAssignments(startInclusive, end,
hours);
resetAssignmentsTo(assignmentsCreated);
setResourcesPerDay(calculateResourcesPerDayFromAssignments());
updateResourcesPerDay();
}
private void allocate(LocalDate startInclusive, LocalDate endExclusive,
@ -662,8 +666,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
removingAssignments(removeConsolidated(getAssignments(startInclusive,
endExclusive)));
addingAssignments(assignmentsCreated);
setResourcesPerDay(calculateResourcesPerDayFromAssignments(getAssignments()));
updateOriginalTotalAssigment();
updateResourcesPerDay();
}
private List<? extends DayAssignment> removeConsolidated(
@ -1098,8 +1102,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
}
switchToScenario(scenario);
mergeAssignments(modifications);
setResourcesPerDay(modifications.getResourcesPerDay());
updateOriginalTotalAssigment();
updateResourcesPerDay();
setWithoutApply(modifications.getAssignmentFunction());
mergeDerivedAllocations(scenario, modifications.getDerivedAllocations());
}

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

@ -78,7 +78,7 @@ public class SpecificResourceAllocation extends
SpecificResourceAllocation result = create(new SpecificResourceAllocation(
task));
result.setResource(resource);
result.setResourcesPerDay(ResourcesPerDay.amount(1));
result.updateResourcesPerDay();
return result;
}