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 { @Transactional(readOnly = true) Worker findUniqueByNif(String nif) throws InstanceNotFoundException; + /** + * Return list of workers and virtual workers + * + * @return + */ + List 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 @Override public List getWorkers() { + return getSession().createQuery( + "FROM Worker worker WHERE worker NOT IN (FROM VirtualWorker)") + .list(); + } + + @Override + public List 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 getSelectedWorkers() { List result = new ArrayList();