Upgrade to v26 (#172)

* 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

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';
}