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

Use new TypeOfWorkHours for monthly timesheets

Browse source 
FEA: ItEr76S28UserDashboard
This commit is contained in:
Manuel Rego Casasnovas 2012-05-28 17:34:38 +02:00
parent 00412428dd
commit 5e5cdeb7ec
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetModel.java
View file

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