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

29
ext/modules/employees/api/EmployeesActionManager.php
View File

@@ -23,8 +23,20 @@ Developer: Thilina Hasantha (thilina.hasantha[at]gmail.com / facebook.com/thilin
class EmployeesActionManager extends SubActionManager{
public function get($req){
$profileId = $this->getCurrentProfileId();
$subordinate = new Employee();
$subordinatesCount = $subordinate->Count("supervisor = ? and id = ?",array($profileId, $req->id));
if($this->user->user_level == 'Admin' || $subordinatesCount > 0){
$id = $req->id;
}
$employee = $this->baseService->getElement('Employee',$this->getCurrentProfileId(),$req->map,true);
if(empty($id)){
$id = $profileId;
}
$employee = $this->baseService->getElement('Employee',$id,$req->map,true);
$subordinate = new Employee();
$subordinates = $subordinate->Find("supervisor = ?",array($employee->id));
@@ -53,11 +65,19 @@ class EmployeesActionManager extends SubActionManager{
}
public function deleteProfileImage($req){
if($this->user->user_level == 'Admin' || $this->user->employee == $req->id){
$profileId = $this->getCurrentProfileId();
$subordinate = new Employee();
$subordinatesCount = $subordinate->Count("supervisor = ? and id = ?",array($profileId, $req->id));
if($this->user->user_level == 'Admin' || $this->user->employee == $req->id || $subordinatesCount == 1){
$fs = FileService::getInstance();
$res = $fs->deleteProfileImage($req->id);
return new IceResponse(IceResponse::SUCCESS,$res);
}
return new IceResponse(IceResponse::ERROR,"Not allowed to delete profile image");
}
public function changePassword($req){
@@ -65,8 +85,9 @@ class EmployeesActionManager extends SubActionManager{
if($this->getCurrentProfileId() != $this->user->employee || empty($this->user->employee)){
return new IceResponse(IceResponse::ERROR,"You are not allowed to change passwords of other employees");
}
$user = $this->baseService->getElement('User',$this->user->id);
$user = new User();
$user->Load("id = ?",array($this->user->id));
if(empty($user->id)){
return new IceResponse(IceResponse::ERROR,"Error occured while changing password");
}