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

[Bug #620] Updating the current scenary for each order and its children when the report is shown.

Browse source 
FEA: ItEr60S04ValidacionEProbasFuncionaisItEr59S04
This commit is contained in:
Susana Montes Pedreira 2010-09-06 17:52:05 +02:00
parent 1ab627e485
commit 3f8e06e7cf
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/TimeLineRequiredMaterialModel.java
View file

@ -106,9 +106,6 @@ public class TimeLineRequiredMaterialModel implements
private void loadAllOrders() {
allOrders = orderDAO.getOrdersByScenario(scenarioManager.getCurrent());
for (Order each : allOrders) {
initializeOrderElements(each.getAllChildren());
}
}
@Override
@ -145,11 +142,22 @@ public class TimeLineRequiredMaterialModel implements
return selectedOrders;
}
private void reattachmentOrder(Order order) {
orderDAO.reattachUnmodifiedEntity(order);
initializeOrderElements(order.getAllOrderElements());
}
@Override
@Transactional(readOnly = true)
public JRDataSource getTimeLineRequiredMaterial(Date startingDate,
Date endingDate, MaterialStatusEnum status, List<Order> listOrders,
List<MaterialCategory> categories, List<Material> materials) {
for (Order order : listOrders) {
reattachmentOrder(order);
order.useSchedulingDataFor(scenarioManager.getCurrent());
}
List<TimeLineRequiredMaterialDTO> result = filterConsult(startingDate,
endingDate, status, listOrders, categories, materials);