From 2dce2429df8d9f3b48e05ee01619ef7a12f81a22 Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Sat, 26 Dec 2009 11:52:27 +0100
Subject: [PATCH]  ItEr40S18CUInformeHorasEstimadasRealizadasItEr39S21: Fix bug
 show only workers and but not virtual workers

---
 .../navalplanner/business/resources/daos/IWorkerDAO.java   | 7 +++++++
 .../navalplanner/business/resources/daos/WorkerDAO.java    | 7 +++++++
 .../web/reports/HoursWorkedPerWorkerController.java        | 5 +++--
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
index 5f7146466..b3f44e0a7 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
@@ -61,6 +61,13 @@ public interface IWorkerDAO extends IGenericDAO<Worker, Long> {
     @Transactional(readOnly = true)
     Worker findUniqueByNif(String nif) throws InstanceNotFoundException;
 
+    /**
+     * Return list of workers and virtual workers
+     *
+     * @return
+     */
+    List<Worker> getAll();
+
     /**
      * Return list of workers
      *
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
index 011137ad1..2f9f39ea5 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
@@ -65,6 +65,13 @@ public class WorkerDAO extends GenericDAOHibernate<Worker, Long>
 
     @Override
     public List<Worker> getWorkers() {
+        return getSession().createQuery(
+                "FROM Worker worker WHERE worker NOT IN (FROM VirtualWorker)")
+                .list();
+    }
+
+    @Override
+    public List<Worker> getAll() {
         return list(Worker.class);
     }
 
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
index fa17cc765..3ef1863a7 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
@@ -69,8 +69,9 @@ public class HoursWorkedPerWorkerController extends NavalplannerReportController
 
     @Override
     protected JRDataSource getDataSource() {
-        return hoursWorkedPerWorkerModel.getWorkerReport(getSelectedWorkers(), getStartingDate(), getEndingDate());
-    }
+        return hoursWorkedPerWorkerModel.getWorkerReport(getSelectedWorkers(),
+                getStartingDate(), getEndingDate());
+ }
 
     private List<Worker> getSelectedWorkers() {
         List<Worker> result = new ArrayList<Worker>();