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

ItEr49S04ValidacionEProbasFuncionaisItEr48S04: [Bug #336] sort the tasks in the report WorkingProgressPerTask.

Browse source
This commit is contained in:
Susana Montes Pedreira 2010-02-23 16:31:14 +01:00 • committed by Javier Moran Rua
parent 850fa3dd00
commit dcb1b1aba5
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java
View file

@ -103,12 +103,35 @@ public class TaskElementDAO extends GenericDAOHibernate<TaskElement, Long>
List<WorkingProgressPerTaskDTO> result = new ArrayList<WorkingProgressPerTaskDTO>();
final List<Task> tasks = getTasksByOrderAndDate(order, deadline);
for (Task task: tasks) {
final List<Task> sortTasks = sortTasks(order, tasks);
for (Task task : sortTasks) {
result.add(new WorkingProgressPerTaskDTO(task, deadline));
}
return result;
}
private List<Task> sortTasks(Order order, List<Task> tasks) {
List<Task> sortTasks = new ArrayList<Task>();
final List<OrderElement> orderElements = order.getAllChildren();
for (OrderElement orderElement : orderElements) {
Task task = findOrderElementInTasks(orderElement, tasks);
if (task != null) {
sortTasks.add(task);
}
}
return sortTasks;
}
private Task findOrderElementInTasks(OrderElement orderElement,
List<Task> tasks) {
for (Task task : tasks) {
if (task.getOrderElement().getId().equals(orderElement.getId())) {
return task;
}
}
return null;
}
private List<Task> getTasksByOrderAndDate(Order order, LocalDate deadline) {
final List<OrderElement> orders = (order != null) ? order

2
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/WorkingProgressPerTaskModel.java
View file

@ -76,7 +76,7 @@ public class WorkingProgressPerTaskModel implements IWorkingProgressPerTaskModel
Date referenceDate) {
orderDAO.reattachUnmodifiedEntity(order);
initializeOrderElements(order.getAllOrderElements());
initializeOrderElements(order.getAllChildren());
final List<WorkingProgressPerTaskDTO> workingHoursPerWorkerList =
taskDAO.getWorkingProgressPerTaskReport(order, new LocalDate(referenceDate));