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

Upgrade to v26 (#172)

Browse Source 
* A bunch of new updates from icehrm pro

* Push changes to frontend
This commit is contained in:
Thilina Hasantha
2019-02-03 14:00:34 +01:00
committed by GitHub
parent a75325fb52
commit 16014bb38e
734 changed files with 131230 additions and 17430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/Employees/Common/Model/Employee.php
View File

@@ -4,6 +4,8 @@ namespace Employees\Common\Model;
use Classes\BaseService;
use Classes\FileService;
use Classes\IceResponse;
use Company\Common\Model\CompanyStructure;
use Metadata\Common\Model\Country;
use Model\BaseModel;
class Employee extends BaseModel
@@ -213,9 +215,25 @@ class Employee extends BaseModel
return $obj;
}
public function fieldValueMethods() {
public function fieldValueMethods()
{
return ['getActiveSubordinateEmployees'];
}
public static function getCurrentEmployeeCompanyStructureCountry()
{
$cemp = BaseService::getInstance()->getCurrentProfileId();
$employee = new Employee();
$employee->Load('id = ?', [$cemp]);
$companyStructure = new CompanyStructure();
$companyStructure->Load('id = ?', [$employee->department]);
$country = new Country();
$country->Load('code = ?', [$companyStructure->country]);
return $country->id;
}
public $table = 'Employees';
}

10
core/src/Employees/Rest/EmployeeRestEndPoint.php
View File

@@ -76,6 +76,16 @@ class EmployeeRestEndPoint extends RestEndPoint
);
$emp = $this->enrichElement($emp, $mapping);
//Get User for the employee
$user = new User();
$user->Load('employee = ?', [$emp->id]);
if (!empty($user->id)) {
$emp->user_name = $user->username;
$emp->user_email = $user->email;
$emp->user_level = $user->user_level;
}
if (!empty($emp)) {
$emp = $this->cleanObject($emp);
$emp = $this->removeNullFields($emp);

5
core/src/Employees/User/Api/EmployeesActionManager.php
View File

@@ -27,7 +27,10 @@ class EmployeesActionManager extends SubActionManager
$cempObj = new Employee();
$cempObj->Load("id = ?", array($cemp));
if ($obj->getUserOnlyMeAccessField() == 'id' &&
if ($this->user->user_level == 'Admin') {
$id = $req->id;
} elseif ($obj->getUserOnlyMeAccessField() == 'id' &&
SettingsManager::getInstance()->getSetting('System: Company Structure Managers Enabled') == 1 &&
CompanyStructure::isHeadOfCompanyStructure($cempObj->department, $cemp)) {
$subordinates = $obj->Find("supervisor = ?", array($cemp));