From e2368e526b8f07f3e0441d9a2485e955f45cded4 Mon Sep 17 00:00:00 2001 From: Thilina Hasantha Date: Tue, 9 Feb 2016 05:07:35 +0530 Subject: [PATCH] Fix timesheet report issue --- ext/admin/reports/reportClasses/EmployeeTimeSheetData.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ext/admin/reports/reportClasses/EmployeeTimeSheetData.php b/ext/admin/reports/reportClasses/EmployeeTimeSheetData.php index eb48973b..36792b0c 100644 --- a/ext/admin/reports/reportClasses/EmployeeTimeSheetData.php +++ b/ext/admin/reports/reportClasses/EmployeeTimeSheetData.php @@ -41,7 +41,7 @@ class EmployeeTimeSheetData implements ReportBuilderInterface{ $reportData = array(); - $reportData[] = array("Employee ID","Employee","Time Sheet","Total Time","Status"); + $reportData[] = array("Employee ID","Employee","Name","Start","End","Total Time","Status"); foreach($timeSheets as $ts){ $employee = $employeeCache[$ts->employee]; @@ -56,7 +56,9 @@ class EmployeeTimeSheetData implements ReportBuilderInterface{ $reportData[] = array( $employee->employee_id, $employee->first_name." ".$employee->last_name, - $ts->name, + date("F j, Y",strtotime($ts->date_start))." - ".date("F j, Y",strtotime($ts->date_end)), + $ts->date_start, + $ts->date_end, $ts->getTotalTime(), $ts->status );