diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index fe7ae6a..2a5f9cf 100755 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.php @@ -23,7 +23,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -36,7 +36,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeHistoryCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -47,7 +47,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeHistoryUpdate', 'verb' => RouteVerb::SET, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, @@ -60,7 +60,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeWorkHistoryCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -71,7 +71,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeWorkHistoryUpdate', 'verb' => RouteVerb::SET, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, @@ -84,7 +84,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeEducationHistoryCreate', 'verb' => RouteVerb::PUT, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::CREATE, @@ -95,7 +95,7 @@ return [ 'dest' => '\Modules\HumanResourceManagement\Controller\ApiController:apiEmployeeEducationHistoryUpdate', 'verb' => RouteVerb::SET, 'csrf' => true, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => ApiController::NAME, 'type' => PermissionType::MODIFY, diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 75c0f38..0aed58a 100755 --- a/Admin/Routes/Web/Backend.php +++ b/Admin/Routes/Web/Backend.php @@ -22,7 +22,7 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrStaffList', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -34,7 +34,7 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrStaffView', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -46,7 +46,7 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrStaffCreate', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::CREATE, @@ -58,7 +58,7 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrDepartmentList', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -70,7 +70,7 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrDepartmentView', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -82,7 +82,7 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrPositionList', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, @@ -94,12 +94,12 @@ return [ [ 'dest' => '\Modules\HumanResourceManagement\Controller\BackendController:viewHrPositionView', 'verb' => RouteVerb::GET, - 'active' => true, + 'active' => true, 'permission' => [ 'module' => BackendController::NAME, 'type' => PermissionType::READ, 'state' => PermissionCategory::POSITION, ], ], - ] + ], ]; diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b104690..f7d605a 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -158,7 +158,7 @@ final class BackendController extends Controller if ($this->app->moduleManager->isActive('HumanResourceTimeRecording')) { /** @var \Modules\HumanResourceTimeRecording\Models\Session $lastOpenSession */ - $lastOpenSession = SessionMapper::getMostPlausibleOpenSessionForEmployee( $view->data['employee']->id); + $lastOpenSession = SessionMapper::getMostPlausibleOpenSessionForEmployee($view->data['employee']->id); $start = new SmartDateTime('now'); $start = $start->getEndOfDay(); diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 8357d9c..56aba1d 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -27,7 +27,7 @@ return ['HumanResourceManagement' => [ 'Employee' => 'Mitarbeiter', 'Employees' => 'Angestellte', 'End' => 'Ende', - 'Score' => 'Note', + 'Score' => 'Note', 'Evaluations' => 'Beurteilungen', 'General' => 'Allgemein', 'History' => 'Geschichte', @@ -35,7 +35,7 @@ return ['HumanResourceManagement' => [ 'Name' => 'Name', 'Parent' => 'Elternteil', 'Phone' => 'Telefon', - 'Positions' => 'Positions', + 'Positions' => 'Positions', 'Position' => 'Position', 'ProfileImage' => 'Profilbild', 'Salary' => 'Gehalt', diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 8964df9..c0160a2 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -20,8 +20,8 @@ return ['HumanResourceManagement' => [ 'Contracts' => 'Contracts', 'CreateFromAccount' => 'Create from account', 'Department' => 'Department', - 'Position' => 'Position', - 'Positions' => 'Positions', + 'Position' => 'Position', + 'Positions' => 'Positions', 'Departments' => 'Departments', 'Documents' => 'Documents', 'Education' => 'Education', @@ -29,7 +29,7 @@ return ['HumanResourceManagement' => [ 'Employee' => 'Employee', 'Employees' => 'Employees', 'End' => 'End', - 'Score' => 'Score', + 'Score' => 'Score', 'Evaluations' => 'Evaluations', 'General' => 'General', 'History' => 'History',