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

ItEr41S05ValidacionEProbasFuncionaisItEr40S05 : Virtual Workers should not be able to introduce work reports

Browse source
This commit is contained in:
Susana Montes Pedreira 2009-12-30 14:11:05 +01:00 • committed by Javier Moran Rua
parent 2932701d5b
commit ea9aed314c
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/IResourceDAO.java
View file

@ -26,6 +26,7 @@ import java.util.List;
import org.navalplanner.business.common.daos.IGenericDAO;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.Machine;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.resources.entities.Worker;
@ -43,6 +44,7 @@ public interface IResourceDAO extends IGenericDAO<Resource, Long> {
public List<Worker> getVirtualWorkers();
public List<Machine> getMachines();
/**
* Returns all {@link Resource} which satisfy a set of {@link Criterion}
*/
@ -51,4 +53,6 @@ public interface IResourceDAO extends IGenericDAO<Resource, Long> {
List<Resource> findResourcesRelatedTo(List<Task> tasks);
List<Resource> getResources();
List<Resource> getRealResources();
}

14
navalplanner-business/src/main/java/org/navalplanner/business/resources/daos/ResourceDAO.java
View file

@ -32,6 +32,7 @@ import org.hibernate.Query;
import org.navalplanner.business.common.daos.GenericDAOHibernate;
import org.navalplanner.business.planner.entities.Task;
import org.navalplanner.business.resources.entities.Criterion;
import org.navalplanner.business.resources.entities.Machine;
import org.navalplanner.business.resources.entities.Resource;
import org.navalplanner.business.resources.entities.Worker;
import org.springframework.beans.factory.config.BeanDefinition;
@ -154,4 +155,17 @@ public class ResourceDAO extends GenericDAOHibernate<Resource, Long> implements
public List<Resource> getResources() {
return list(Resource.class);
}
@Override
public List<Machine> getMachines() {
return list(Machine.class);
}
@Override
public List<Resource> getRealResources() {
List<Resource> list = new ArrayList<Resource>();
list.addAll(getRealWorkers());
list.addAll(getMachines());
return list;
}
}

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/ResourceFinder.java
View file

@ -41,7 +41,7 @@ public class ResourceFinder extends Finder implements IFinder {
@Transactional(readOnly = true)
public List<Resource> getAll() {
return resourceDAO.getResources();
return resourceDAO.getRealResources();
}
@Override