From 5e5cdeb7ecf4d1de87d2e584cbdf60aed3f58260 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Mon, 28 May 2012 17:34:38 +0200
Subject: [PATCH] Use new TypeOfWorkHours for monthly timesheets

FEA: ItEr76S28UserDashboard
---
 .../web/users/dashboard/MonthlyTimesheetModel.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetModel.java
index 1e24214f9..c7949b875 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetModel.java
@@ -24,8 +24,8 @@ import java.util.List;
 
 import org.hibernate.NonUniqueResultException;
 import org.joda.time.LocalDate;
+import org.libreplan.business.common.daos.IConfigurationDAO;
 import org.libreplan.business.common.exceptions.InstanceNotFoundException;
-import org.libreplan.business.costcategories.daos.ITypeOfWorkHoursDAO;
 import org.libreplan.business.costcategories.entities.TypeOfWorkHours;
 import org.libreplan.business.orders.daos.ISumChargedEffortDAO;
 import org.libreplan.business.orders.entities.OrderElement;
@@ -83,7 +83,7 @@ public class MonthlyTimesheetModel implements IMonthlyTimesheetModel {
     private ISumChargedEffortDAO sumChargedEffortDAO;
 
     @Autowired
-    private ITypeOfWorkHoursDAO typeOfWorkHoursDAO;
+    private IConfigurationDAO configurationDAO;
 
     @Override
     @Transactional(readOnly = true)
@@ -204,8 +204,8 @@ public class MonthlyTimesheetModel implements IMonthlyTimesheetModel {
     }
 
     private TypeOfWorkHours getTypeOfWorkHours() {
-        // FIXME using the first type of hours for the moment
-        return typeOfWorkHoursDAO.findAll().get(0);
+        return configurationDAO.getConfiguration()
+                .getMonthlyTimesheetsTypeOfWorkHours();
     }
 
     @Override