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

ItEr40S18CUInformeHorasEstimadasRealizadasItEr39S21: Fix bug show only workers and but not virtual workers

Browse source
This commit is contained in:
Diego Pino Garcia 2009-12-26 11:52:27 +01:00 • committed by Javier Moran Rua
parent 8e7a0ce7cb
commit 2dce2429df
3 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IWorkerDAO.java
View file

@ -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
*

7
navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/WorkerDAO.java
View file

@ -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);
}

5
navalplanner-webapp/src/main/java/org/navalplanner/web/reports/HoursWorkedPerWorkerController.java
View file

@ -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>();