From 698a43a81913e0d87490766fa2d7efef22a5b0cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Wed, 2 Dec 2009 20:58:41 +0100
Subject: [PATCH]  ItEr37S12CUAdministracionCategoriaCosteItEr36S14: only
 active TypesOfWorkHours are listed when creating HourCosts.

---
 .../costcategories/daos/ITypeOfWorkHoursDAO.java   |  4 ++++
 .../costcategories/daos/TypeOfWorkHoursDAO.java    | 14 ++++++++++++++
 .../components/finders/TypeOfWorkHoursFinder.java  |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
index 5e1c852fb..cacb97552 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/ITypeOfWorkHoursDAO.java
@@ -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();
 }
diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
index ae3a04d6b..d810ffd10 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/costcategories/daos/TypeOfWorkHoursDAO.java
@@ -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 {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TypeOfWorkHoursFinder.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TypeOfWorkHoursFinder.java
index 5a33ae48a..50b45b8c4 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TypeOfWorkHoursFinder.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/finders/TypeOfWorkHoursFinder.java
@@ -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