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

Release note v15.3

Browse Source 
------------------
### 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 15:53:14 +05:30
parent 9ffa8617e9
commit 6fd9ba20c8
21 changed files with 1447 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/data.php
View File

@@ -90,7 +90,18 @@ if(in_array($table, BaseService::getInstance()->userTables) && !$skipProfileRest
}
$subordinatesIds.=$sub->id;
}
$subordinatesIds.="";
if($obj->allowIndirectMapping()){
$indeirectEmployees = $subordinate->Find("indirect_supervisors IS NOT NULL and indirect_supervisors <> '' and status = 'Active'", array());
foreach($indeirectEmployees as $ie){
$indirectSupervisors = json_decode($ie->indirect_supervisors, true);
if(in_array($cemp, $indirectSupervisors)){
if($subordinatesIds != ""){
$subordinatesIds.=",";
}
$subordinatesIds.=$ie->id;
}
}
}
$sql = "Select count(id) as count from ".$obj->_table." where ".SIGN_IN_ELEMENT_MAPPING_FIELD_NAME." in (".$subordinatesIds.") ".$countFilterQuery;
LogManager::getInstance()->debug("Count Filter Query 2:".$sql);
LogManager::getInstance()->debug("Count Filter Query Data 2:".json_encode($countFilterQueryData));