galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix timesheet report issue

Browse Source
This commit is contained in:
Thilina Hasantha
2016-02-09 05:07:35 +05:30
parent 76b3aff37d
commit 953ae64f18
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/admin/reports/reportClasses/EmployeeTimeSheetData.php
View File

@@ -41,7 +41,7 @@ class EmployeeTimeSheetData implements ReportBuilderInterface{
$reportData = array(); $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){ foreach($timeSheets as $ts){
$employee = $employeeCache[$ts->employee]; $employee = $employeeCache[$ts->employee];
@@ -56,7 +56,9 @@ class EmployeeTimeSheetData implements ReportBuilderInterface{
$reportData[] = array( $reportData[] = array(
$employee->employee_id, $employee->employee_id,
$employee->first_name." ".$employee->last_name, $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->getTotalTime(),
$ts->status $ts->status
); );