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

Making code PSR2 compliant

Browse Source
This commit is contained in:
gamonoid
2017-09-24 19:23:30 +02:00
parent 05b57e0236
commit 6c61577583
160 changed files with 1432 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Employees/Common/Model/ArchivedEmployee.php
View File

@@ -31,5 +31,5 @@ class ArchivedEmployee extends BaseModel
return "id";
}
var $_table = 'ArchivedEmployees';
public $table = 'ArchivedEmployees';
}

22
src/Employees/Common/Model/Employee.php
View File

@@ -9,10 +9,10 @@ use Model\BaseModel;
class Employee extends BaseModel
{
var $oldObj = null;
var $oldObjOrig = null;
var $historyUpdateList = array();
var $historyFieldsToTrack = array(
public $oldObj = null;
public $oldObjOrig = null;
public $historyUpdateList = array();
public $historyFieldsToTrack = array(
"employee_id"=>"employee_id",
"first_name"=>"first_name",
"middle_name"=>"middle_name",
@@ -78,7 +78,11 @@ class Employee extends BaseModel
$oldObjOrig->Load("id = ?", array($obj->id));
$this->oldObjOrig = $oldObjOrig;
$mapping = '{"nationality":["Nationality","id","name"],"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],"province":["Province","id","name"],"department":["CompanyStructure","id","title"],"supervisor":["Employee","id","first_name+last_name"]}';
$mapping = '{"nationality":["Nationality","id","name"],'
.'"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],'
.'"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],'
.'"province":["Province","id","name"],"department":["CompanyStructure","id","title"],'
.'"supervisor":["Employee","id","first_name+last_name"]}';
$this->oldObj = BaseService::getInstance()->getElement('Employee', $obj->id, $mapping, true);
}
@@ -89,7 +93,11 @@ class Employee extends BaseModel
$oldObj = $this->oldObj;
$oldObjOrig = $this->oldObjOrig;
$mapping = '{"nationality":["Nationality","id","name"],"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],"province":["Province","id","name"],"department":["CompanyStructure","id","title"],"supervisor":["Employee","id","first_name+last_name"]}';
$mapping = '{"nationality":["Nationality","id","name"],'
.'"employment_status":["EmploymentStatus","id","name"],"job_title":["JobTitle","id","name"],'
.'"pay_grade":["PayGrade","id","name"],"country":["Country","code","name"],'
.'"province":["Province","id","name"],"department":["CompanyStructure","id","title"],'
.'"supervisor":["Employee","id","first_name+last_name"]}';
$objEnriched = BaseService::getInstance()->getElement('Employee', $obj->id, $mapping, true);
@@ -205,5 +213,5 @@ class Employee extends BaseModel
return $obj;
}
var $_table = 'Employees';
public $table = 'Employees';
}

2
src/Employees/Common/Model/EmployeeApproval.php
View File

@@ -13,7 +13,7 @@ use Model\BaseModel;
class EmployeeApproval extends BaseModel
{
var $_table = 'EmployeeApprovals';
public $table = 'EmployeeApprovals';
public function getAdminAccess()
{

2
src/Employees/Common/Model/EmploymentStatus.php
View File

@@ -13,7 +13,7 @@ use Model\BaseModel;
class EmploymentStatus extends BaseModel
{
var $_table = 'EmploymentStatus';
public $table = 'EmploymentStatus';
public function getAdminAccess()
{