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

ItEr37S12CUAdministracionCategoriaCosteItEr36S14: only active TypesOfWorkHours are listed when creating HourCosts.

Browse source
This commit is contained in:
Jacobo Aragunde Pérez 2009-12-02 20:58:41 +01:00 • committed by Javier Moran Rua
parent 9ab5742382
commit 698a43a819
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/costcategories/daos/ITypeOfWorkHoursDAO.java
View file

@ -20,6 +20,8 @@
package org.navalplanner.business.costcategories.daos;
import java.util.List;
import org.navalplanner.business.common.daos.IGenericDAO;
import org.navalplanner.business.common.exceptions.InstanceNotFoundException;
import org.navalplanner.business.costcategories.entities.TypeOfWorkHours;
@ -36,4 +38,6 @@ public interface ITypeOfWorkHoursDAO extends IGenericDAO<TypeOfWorkHours, Long>
throws InstanceNotFoundException;
boolean existsByCode(TypeOfWorkHours typeOfWorkHours);
List<TypeOfWorkHours> findActive();
}

14
navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
View file

@ -20,6 +20,9 @@
package org.navalplanner.business.costcategories.daos;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang.Validate;
import org.hibernate.Criteria;
import org.hibernate.criterion.Restrictions;
@ -59,6 +62,17 @@ public class TypeOfWorkHoursDAO extends GenericDAOHibernate<TypeOfWorkHours, Lon
return found;
}
@Override
public List<TypeOfWorkHours> findActive() {
Criteria c = getSession().createCriteria(TypeOfWorkHours.class);
c.add(Restrictions.eq("enabled", true));
List<TypeOfWorkHours> list = new ArrayList<TypeOfWorkHours>();
list.addAll(c.list());
return list;
}
@Override
public boolean existsByCode(TypeOfWorkHours typeOfWorkHours) {
try {

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

@ -44,7 +44,7 @@ public class TypeOfWorkHoursFinder extends Finder implements IFinder {
@Transactional(readOnly = true)
public List<TypeOfWorkHours> getAll() {
return dao.list(TypeOfWorkHours.class);
return dao.findActive();
}
@Override