Latest updates from IceHrmPro

core/src/Attendance/Admin/Api/AttendanceAdminManager.php

@@ -29,32 +29,32 @@ class AttendanceAdminManager extends AbstractModuleManager
 
     public function setupRestEndPoints()
     {
-        \Classes\Macaw::get(REST_API_PATH.'attendance/(:num)', function ($pathParams) {
+        \Classes\Macaw::get(REST_API_PATH.'attendance/(:num)', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('get', $pathParams);
         });
 
-        \Classes\Macaw::get(REST_API_PATH.'attendance', function ($pathParams) {
+        \Classes\Macaw::get(REST_API_PATH.'attendance', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('listAll', $pathParams);
         });
 
-        \Classes\Macaw::get(REST_API_PATH.'employee/(:num)/attendance', function ($pathParams) {
+        \Classes\Macaw::get(REST_API_PATH.'employee/(:num)/attendance', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('listEmployeeAttendance', $pathParams);
         });
 
-        \Classes\Macaw::post(REST_API_PATH.'attendance', function ($pathParams) {
+        \Classes\Macaw::post(REST_API_PATH.'attendance', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('post', $pathParams);
         });
 
-        \Classes\Macaw::delete(REST_API_PATH.'attendance/(:num)', function ($pathParams) {
+        \Classes\Macaw::delete(REST_API_PATH.'attendance/(:num)', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('delete', $pathParams);
         });
 
-        \Classes\Macaw::post(REST_API_PATH.'attendance/punch-in', function ($pathParams) {
+        \Classes\Macaw::post(REST_API_PATH.'attendance/punch-in', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('punchIn', $pathParams);
         });
@@ -64,7 +64,7 @@ class AttendanceAdminManager extends AbstractModuleManager
             $restEndPoint->process('getOpenPunch', [$employeeId, $date]);
         });
 
-        \Classes\Macaw::post(REST_API_PATH.'attendance/punch-out', function ($pathParams) {
+        \Classes\Macaw::post(REST_API_PATH.'attendance/punch-out', function ($pathParams = null) {
             $restEndPoint = new AttendanceRestEndPoint();
             $restEndPoint->process('punchOut', $pathParams);
         });
@@ -85,10 +85,10 @@ class AttendanceAdminManager extends AbstractModuleManager
     public function initQuickAccessMenu()
     {
         UIManager::getInstance()->addQuickAccessMenuItem(
-            "Clocked In Employees",
-            "fa-clock-o",
-            CLIENT_BASE_URL."?g=admin&n=attendance&m=admin_Employees#tabAttendanceStatus",
-            array("Admin","Manager")
+            'Clocked In Employees',
+            'fa-clock-o',
+            CLIENT_BASE_URL.'?g=admin&n=attendance&m=admin_Employees#tabAttendanceStatus',
+            array('Admin','Manager')
         );
     }
 

core/src/Attendance/Common/Model/Attendance.php

@@ -8,6 +8,7 @@
 
 namespace Attendance\Common\Model;
 
+use Classes\ModuleAccess;
 use Model\BaseModel;
 
 class Attendance extends BaseModel
@@ -33,4 +34,13 @@ class Attendance extends BaseModel
     {
         return array('element','save','delete');
     }
+
+    public function getModuleAccess()
+    {
+        return [
+            new ModuleAccess('attendance', 'admin'),
+            new ModuleAccess('attendance', 'user'),
+            new ModuleAccess('attendance_sheets', 'user'),
+        ];
+    }
 }

core/src/Attendance/Common/Model/AttendanceStatus.php

@@ -8,6 +8,7 @@
 
 namespace Attendance\Common\Model;
 
+use Classes\ModuleAccess;
 use Classes\SettingsManager;
 use Employees\Common\Model\Employee;
 use Model\BaseModel;
@@ -136,4 +137,12 @@ class AttendanceStatus extends BaseModel
     {
         return array("element","save","delete");
     }
+
+    public function getModuleAccess()
+    {
+        return [
+            new ModuleAccess('attendance', 'admin'),
+            new ModuleAccess('attendance', 'user'),
+        ];
+    }
 }

core/src/Attendance/Rest/AttendanceRestEndPoint.php

@@ -97,18 +97,16 @@ class AttendanceRestEndPoint extends RestEndPoint
             return new IceResponse(IceResponse::ERROR, self::RESPONSE_ERR_PERMISSION_DENIED, 403);
         }
 
-        $mapping = [
-            "employee" => ["Employee", "id", "first_name+last_name"],
-        ];
+        $mapping = '{"employee": [ "Employee", "id", "first_name+last_name" ]}';
 
         $emp = BaseService::getInstance()->getElement(
             self::ELEMENT_NAME,
             $parameter,
-            json_encode($mapping),
+            null,
             true
         );
 
-        $emp = $this->enrichElement($emp, $mapping);
+        $emp = $this->enrichElement($emp, json_decode($mapping));
         if (!empty($emp)) {
             $emp = $this->cleanObject($emp);
             return new IceResponse(IceResponse::SUCCESS, $emp);