Commit 5258a233 authored by vikram singh's avatar vikram singh

added onBehalfof Field in reports

parent df61f94d
...@@ -467,6 +467,8 @@ public class ReportsController { ...@@ -467,6 +467,8 @@ public class ReportsController {
report.setBillableStatus(e.getBillableStatus()); report.setBillableStatus(e.getBillableStatus());
report.setBillingStartDate(e.getBillingStartDate()); report.setBillingStartDate(e.getBillingStartDate());
report.setBillingEndDate(e.getBillingEndDate()); report.setBillingEndDate(e.getBillingEndDate());
report.setOnBehalfOf(e.getOnBehalfOf()!=null?employeeService.getEmployeeById(e.getOnBehalfOf()).getEmployeeName():"");
reports.add(report); reports.add(report);
......
...@@ -26,5 +26,6 @@ public class Reports implements Serializable { ...@@ -26,5 +26,6 @@ public class Reports implements Serializable {
private Date billingStartDate; private Date billingStartDate;
private Date billingEndDate; private Date billingEndDate;
private String functionalGroup; private String functionalGroup;
private String onBehalfOf;
} }
...@@ -189,6 +189,7 @@ public class ReportService implements IReportService { ...@@ -189,6 +189,7 @@ public class ReportService implements IReportService {
if(resourceObj!=null) { if(resourceObj!=null) {
Project project=projectService.getProjectByProjectId(resourceObj.getProjectId()); Project project=projectService.getProjectByProjectId(resourceObj.getProjectId());
Reports.setProjectName(project.getProjectName()); Reports.setProjectName(project.getProjectName());
Reports.setOnBehalfOf(resourceObj.getOnBehalfOf()!=null?employeeService.getEmployeeById(resourceObj.getOnBehalfOf()).getEmployeeName():"");
Reports.setBillingStartDate(resourceObj.getBillingStartDate()); Reports.setBillingStartDate(resourceObj.getBillingStartDate());
Reports.setBillableStatus(resourceObj.getBillableStatus()); Reports.setBillableStatus(resourceObj.getBillableStatus());
Reports.setBillingEndDate(resourceObj.getBillingEndDate()); Reports.setBillingEndDate(resourceObj.getBillingEndDate());
......
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