Upgrades from IceHrm Pro v24

This commit is contained in:
gamonoid
2018-07-03 03:10:32 +02:00
parent 8b276d54e6
commit 9cee4e91df
8253 changed files with 659182 additions and 47489 deletions

View File

@@ -42,4 +42,14 @@ class OvertimeActionManager extends ApproveAdminActionManager
{
return "g=modules&n=overtime&m=module_Time_Management#tabEmployeeOvertimeApproval";
}
public function getLogs($req)
{
return parent::getLogs($req);
}
public function changeStatus($req)
{
return parent::changeStatus($req);
}
}

View File

@@ -8,6 +8,7 @@
namespace Overtime\Common\Model;
use Classes\IceResponse;
use Classes\SettingsManager;
use Model\ApproveModel;
@@ -66,4 +67,12 @@ class EmployeeOvertime extends ApproveModel
}
return false;
}
public function validateSave($obj)
{
if (strtotime($obj->start_time) >= strtotime($obj->end_time)) {
return new IceResponse(IceResponse::ERROR, 'Incorrect start and end time');
}
return new IceResponse(IceResponse::SUCCESS, "");
}
}

View File

@@ -24,11 +24,6 @@ class OvertimeCategory extends BaseModel
return array("get","element","save","delete");
}
public function getUserAccess()
{
return array("get");
}
public function getUserOnlyMeAccess()
{
return array("get","element");

View File

@@ -32,4 +32,14 @@ class OvertimeActionManager extends ApproveModuleActionManager
{
return "g=modules&n=overtime&m=module_Time_Management#SubordinateEmployeeOvertime";
}
public function getLogs($req)
{
return parent::getLogs($req);
}
public function cancel($req)
{
return parent::cancel($req);
}
}