Commit 85283aa1 authored by Prayas Jain's avatar Prayas Jain

Fixed Projects details for employee in Employee Efforts scree

parent 5cc93893
......@@ -74,7 +74,7 @@ public class EmployeeEffortsService implements IEmployeeEffortsService {
employeeEfforts.setEmployeeName(resultSet.getString("FirstName"));
employeeEfforts.setTotalHoursSpentInWeek(resultSet.getString("TotalHoursInWeek") + ':' + resultSet.getString("TotalMinutesInWeek"));
List<Resource> resourceList = resourceService.getResourcesByEmployeeId(employeeEfforts.getEmployeeId()).stream().filter(r->
(r.getBillingStartDate().before(from) && r.getBillingEndDate().after(to))
(resourceService.isAllocationActiveToday(r))
).collect(Collectors.toList());
if (!resourceList.isEmpty()) {
Resource resource = resourceList.get(0);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment