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

ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #529] Fix bug by reverting the commit that introduced it.

Browse source 
Revert " ItEr59S04ValidacionEProbasFuncionaisItEr58S04: [Bug #497]
Resources are reloaded in order to show the load chart."

This reverts commit 75017c9fe8.

Conflicts:

	navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
This commit is contained in:
Óscar González Fernández 2010-06-22 10:10:15 +02:00
parent 60e4f47fa1
commit fa21d3e444
1 changed files with 1 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
navalplanner-webapp/src/main/java/org/navalplanner/web/planner/order/OrderPlanningModel.java
View file

@ -1178,7 +1178,7 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
SortedMap<LocalDate, Map<Resource, Integer>> orderDayAssignmentsGrouped = groupDayAssignmentsByDayAndResource(orderDayAssignments);
List<DayAssignment> resourcesDayAssignments = new ArrayList<DayAssignment>();
for (Resource resource : reloadResources(order.getResources())) {
for (Resource resource : order.getResources()) {
resourcesDayAssignments.addAll(assigmentsOnResourceCalculator
.getAssignments(resource));
}
@ -1232,17 +1232,6 @@ public abstract class OrderPlanningModel implements IOrderPlanningModel {
chart.setHeight("150px");
}
private List<Resource> reloadResources(
Collection<? extends Resource> resources) {
List<Resource> result = new ArrayList<Resource>();
for (Resource each : resources) {
Resource reloaded = resourceDAO
.findExistingEntity(each.getId());
result.add(reloaded);
}
return result;
}
private void resetMaps() {
mapOrderLoad.clear();
mapOrderOverload.clear();