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

Latest updates from IceHrmPro

Browse Source
This commit is contained in:
Thilina Pituwala
2020-05-20 18:47:29 +02:00
parent 60c92d7935
commit 7453a58aad
18012 changed files with 2089245 additions and 10173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/src/Employees/Admin/Api/EmployeesActionManager.php
View File

@@ -25,6 +25,7 @@ use Salary\Common\Model\EmployeeSalary;
use TimeSheets\Common\Model\EmployeeTimeEntry;
use TimeSheets\Common\Model\EmployeeTimeSheet;
use Travel\Common\Model\EmployeeTravelRecord;
use Utils\LogManager;
class EmployeesActionManager extends SubActionManager
{
@@ -63,7 +64,6 @@ class EmployeesActionManager extends SubActionManager
$employee->termination_date = null;
$employee->status = 'Active';
$ok = $employee->Save();
if (!$ok) {
return new IceResponse(IceResponse::ERROR, "Error occurred while activating employee");
@@ -113,7 +113,13 @@ class EmployeesActionManager extends SubActionManager
$data->timesheets = $this->getEmployeeData($employee->id, new EmployeeTimeSheet());
$data->timesheetEntries = $this->getEmployeeData($employee->id, new EmployeeTimeEntry());
$data->attendance = $this->getEmployeeData($employee->id, new Attendance());
$attendnace = $this->getEmployeeData($employee->id, new Attendance());
$data->attendance = array_map(function ($item) {
$item->image_in = '';
$item->image_out = '';
}, $attendnace);
if (class_exists('\Documents\Common\Model\EmployeeDocument')) {
$data->documents = $this->getEmployeeData($employee->id, new \Documents\Common\Model\EmployeeDocument());
}
@@ -131,12 +137,14 @@ class EmployeesActionManager extends SubActionManager
$ok = $archived->Save();
if (!$ok) {
LogManager::getInstance()->error('Error occurred while archiving employee :'.$archived->ErrorMsg());
return new IceResponse(IceResponse::ERROR, "Error occurred while archiving employee");
}
$ok = $employee->Delete();
if (!$ok) {
LogManager::getInstance()->error('Error occurred while deleting employee :'.$employee->ErrorMsg());
return new IceResponse(IceResponse::ERROR, "Error occurred while deleting employee");
}