Latest updates from IceHrmPro

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
@@ -10,6 +10,7 @@ namespace TimeSheets\Common\Model;
use Attendance\Common\Model\Attendance;
use Classes\IceResponse;
use Classes\ModuleAccess;
use Classes\SettingsManager;
use Model\BaseModel;
@@ -54,4 +55,11 @@ class EmployeeTimeEntry extends BaseModel
}
return new IceResponse(IceResponse::SUCCESS, "");
}
public function getModuleAccess()
{
return [
new ModuleAccess('time_sheets', 'user'),
];
}
}
@@ -8,6 +8,7 @@
namespace TimeSheets\Common\Model;
use Classes\ModuleAccess;
use Model\BaseModel;
use Utils\CalendarTools;
@@ -59,7 +60,7 @@ class EmployeeTimeSheet extends BaseModel
}
$totMinutes = round($seconds / 60);
return $totMinutes;
}
@@ -88,4 +89,11 @@ class EmployeeTimeSheet extends BaseModel
}
return $entry;
}
public function getModuleAccess()
{
return [
new ModuleAccess('time_sheets', 'user'),
];
}
}
@@ -69,7 +69,7 @@ class TimeSheetsActionManager extends SubActionManager
$timeSheet->status = $req->status;
//Auto approve admin timesheets
if ($req->status == 'Submitted' && BaseService::getInstance()->getCurrentUser()->user_level == "Admin") {
if ($req->status == 'Submitted' && BaseService::getInstance()->getCurrentUser()->user_level == 'Admin') {
$timeSheet->status = 'Approved';
}