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

Release note v16.0

Browse Source 
------------------
### Features
 * Advanced Employee Management Module is now included in IceHrm Open Source Edition
 * LDAP Module which was only available in IceHrm Enterprise is now included in open source also
 * Initial implementation of icehrm REST Api for reading employee details
 * Improvements to data filtering
 * Multiple tabs for settings module
 * Overtime reports - now its possible to calculate overtime for employees.compatible with US overtime rules
 * Logout the user if tried accessing an unauthorized module
 * Setting for updating module names

### Fixes
 * Fix issue: classes should be loaded even the module is disabled
 * Deleting the only Admin user is not allowed
 * Fixes for handling non UTF-8
 * Fix for non-mandatory select boxes are shown as mandatory
This commit is contained in:
Thilina Hasantha
2016-04-15 20:24:39 +05:30
parent 301ea64832
commit 31bb455d6f
71 changed files with 7322 additions and 2813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ext/admin/reports/reportClasses/EmployeeLeavesReport.php
View File

@@ -32,33 +32,49 @@ from EmployeeLeaves lv";
if(in_array("NULL", $employeeList) ){
$employeeList = array();
}
if($request['department'] != "NULL" && empty($employeeList)){
$empTmp = new Employee();
$empTemps = $empTmp->Find("department = ? and status = Active",array($request['department']));
foreach($empTemps as $empTmp){
$employeeList[] = $empTmp->id;
}
}
if(!empty($employeeList) && ($request['status'] != "NULL" && !empty($request['status']))){
$query = "where employee in (".implode(",", $employeeList).") and date_start >= ? and date_end <= ? and status = ?;";
$query = "where employee in (".implode(",", $employeeList).") and ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?)) and status = ?;";
$params = array(
$request['date_start'],
$request['date_end'],
$request['date_end'],
$request['date_start'],
$request['date_end'],
$request['status']
);
}else if(!empty($employeeList)){
$query = "where employee in (".implode(",", $employeeList).") and date_start >= ? and date_end <= ?;";
$query = "where employee in (".implode(",", $employeeList).") and ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?));";
$params = array(
$request['date_start'],
$request['date_end'],
$request['date_start'],
$request['date_end']
);
}else if(($request['status'] != "NULL" && !empty($request['status']))){
$query = "where status = ? and date_start >= ? and date_end <= ?;";
$query = "where status = ? and ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?));";
$params = array(
$request['status'],
$request['date_start'],
$request['date_end']
$request['date_end'],
$request['date_start'],
$request['date_end']
);
}else{
$query = "where date_start >= ? and date_end <= ?;";
$query = "where ((date_start >= ? and date_start <= ?) or (date_end >= ? and date_end <= ?));";
$params = array(
$request['date_start'],
$request['date_end']
$request['date_end'],
$request['date_start'],
$request['date_end']
);
}