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

ItEr48S04ValidacionEProbasFuncionaisItEr47S04 : [Bug #328] Fixes report the completed estimated hours to show also the hours of the task groups.

Browse source
This commit is contained in:
Susana Montes Pedreira 2010-02-17 11:15:40 +01:00 • committed by Javier Moran Rua
parent aca5d4f34b
commit 45685793f4
2 changed files with 8 additions and 6 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/daos/TaskElementDAO.java
View file

@ -112,7 +112,7 @@ public class TaskElementDAO extends GenericDAOHibernate<TaskElement, Long>
private List<Task> getTasksByOrderAndDate(Order order, LocalDate deadline) {
final List<OrderElement> orders = (order != null) ? order
.getOrderElements() : new ArrayList<OrderElement>();
.getAllOrderElements() : new ArrayList<OrderElement>();
// Prepare query
String strQuery =

12
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
View file

@ -56,11 +56,7 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
@Override
@Transactional(readOnly = true)
public List<Order> getOrders() {
List<Order> result = orderDAO.getOrders();
for (Order each: result) {
initializeOrderElements(each.getOrderElements());
}
return result;
return orderDAO.getOrders();
}
private void initializeOrderElements(List<OrderElement> orderElements) {
@ -73,10 +69,16 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
orderElement.getName();
}
private void reattachmentOrder(Order order) {
orderDAO.reattachUnmodifiedEntity(order);
initializeOrderElements(order.getAllOrderElements());
}
@Override
@Transactional(readOnly = true)
public JRDataSource getCompletedEstimatedHoursReportPerTask(
Order order, Date deadline) {
reattachmentOrder(order);
final List<CompletedEstimatedHoursPerTaskDTO> completedEstimatedHoursPerTaskList =
taskDAO.getCompletedEstimatedHoursPerTaskReport(order, new LocalDate(deadline));