From efe6eea20c4895ef930fadf3cb4b6f6b8baf08d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 9 Jun 2010 22:22:35 +0200
Subject: [PATCH]  ItEr58S16RFAdaptacionInformesItEr55S14: Adapted the report
 'Completed estimated hours per task'.

Now it's implemented in the XXModel. The DAO operation has been removed.
---
 .../business/planner/daos/ITaskElementDAO.java |  4 ----
 .../business/planner/daos/TaskElementDAO.java  | 14 --------------
 .../CompletedEstimatedHoursPerTaskModel.java   | 18 +++++++++++++++---
 3 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ITaskElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ITaskElementDAO.java
index 7cd6a7570..0b21149e8 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ITaskElementDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/ITaskElementDAO.java
@@ -28,7 +28,6 @@ import org.navalplanner.business.common.daos.IGenericDAO;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.planner.entities.TaskGroup;
-import org.navalplanner.business.reports.dtos.CompletedEstimatedHoursPerTaskDTO;
 import org.navalplanner.business.reports.dtos.WorkingProgressPerTaskDTO;
 
 /**
@@ -41,9 +40,6 @@ public interface ITaskElementDAO extends IGenericDAO<TaskElement, Long> {
     List<WorkingProgressPerTaskDTO> getWorkingProgressPerTaskReport(
             Order order, LocalDate deadline);
 
-    List<CompletedEstimatedHoursPerTaskDTO> getCompletedEstimatedHoursPerTaskReport(
-            Order order, LocalDate deadline);
-
     List<TaskElement> listFilteredByDate(Date start, Date end);
 
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java
index 58d0f33bc..d8af486c0 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/daos/TaskElementDAO.java
@@ -36,7 +36,6 @@ import org.navalplanner.business.planner.entities.SpecificDayAssignment;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.planner.entities.TaskGroup;
-import org.navalplanner.business.reports.dtos.CompletedEstimatedHoursPerTaskDTO;
 import org.navalplanner.business.reports.dtos.WorkingProgressPerTaskDTO;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
@@ -141,19 +140,6 @@ public class TaskElementDAO extends GenericDAOHibernate<TaskElement, Long>
         return query.list();
     }
 
-    @Override
-    public List<CompletedEstimatedHoursPerTaskDTO> getCompletedEstimatedHoursPerTaskReport(
-            Order order, LocalDate deadline) {
-
-        List<CompletedEstimatedHoursPerTaskDTO> result = new ArrayList<CompletedEstimatedHoursPerTaskDTO>();
-
-        final List<Task> tasks = getTasksByOrderAndDate(order, deadline);
-        for (Task task: tasks) {
-            result.add(new CompletedEstimatedHoursPerTaskDTO(task, deadline));
-        }
-        return result;
-    }
-
     @Override
     @SuppressWarnings("unchecked")
     public List<TaskElement> listFilteredByDate(Date start, Date end) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
index 8bc5ff581..7fb28d4e1 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/CompletedEstimatedHoursPerTaskModel.java
@@ -20,6 +20,7 @@
 
 package org.navalplanner.web.reports;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -32,6 +33,8 @@ import org.navalplanner.business.orders.daos.IOrderDAO;
 import org.navalplanner.business.orders.entities.Order;
 import org.navalplanner.business.orders.entities.OrderElement;
 import org.navalplanner.business.planner.daos.ITaskElementDAO;
+import org.navalplanner.business.planner.entities.Task;
+import org.navalplanner.business.planner.entities.TaskElement;
 import org.navalplanner.business.reports.dtos.CompletedEstimatedHoursPerTaskDTO;
 import org.navalplanner.business.scenarios.IScenarioManager;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -83,10 +86,19 @@ public class CompletedEstimatedHoursPerTaskModel implements ICompletedEstimatedH
     public JRDataSource getCompletedEstimatedHoursReportPerTask(
             Order order, Date deadline) {
         reattachmentOrder(order);
-        final List<CompletedEstimatedHoursPerTaskDTO> completedEstimatedHoursPerTaskList =
-            taskDAO.getCompletedEstimatedHoursPerTaskReport(order, new LocalDate(deadline));
+        order.useSchedulingDataFor(scenarioManager.getCurrent());
+        LocalDate deadlineLocalDate = new LocalDate(deadline);
 
-        if (completedEstimatedHoursPerTaskList != null && !completedEstimatedHoursPerTaskList.isEmpty()) {
+        final List<TaskElement> tasks = order.getAllChildrenAssociatedTaskElements();
+        final List<CompletedEstimatedHoursPerTaskDTO> completedEstimatedHoursPerTaskList =
+            new ArrayList<CompletedEstimatedHoursPerTaskDTO>();
+        for (TaskElement task: tasks) {
+            if(task instanceof Task) {
+                completedEstimatedHoursPerTaskList.add(
+                        new CompletedEstimatedHoursPerTaskDTO((Task)task, deadlineLocalDate));
+            }
+        }
+        if (!completedEstimatedHoursPerTaskList.isEmpty()) {
             return new JRBeanCollectionDataSource(completedEstimatedHoursPerTaskList);
         } else {
             return new JREmptyDataSource();