Filter only employees on vacation management

Igalia · Feb 2, 2022 · 7e7743f · 7e7743f
1 parent d33aac5
commit 7e7743f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/model/facade/UsersFacade.php b/model/facade/UsersFacade.php
@@ -158,8 +158,8 @@ static function GetAllUsers() {
 
     }
 
-    static function GetAllActiveUsers() {
-        $action = new GetAllActiveUsersAction();
+    static function GetAllActiveUsers($filterEmployees = false) {
+        $action = new GetAllActiveUsersAction($filterEmployees);
         return $action->execute();
     }
 

diff --git a/web/js/holidayManagement.js b/web/js/holidayManagement.js
@@ -200,7 +200,7 @@ var app = new Vue({
             }
         },
         async fetchUsers() {
-            const url = `services/getAllUsersService.php?active=true`;
+            const url = `services/getAllUsersService.php?active=true&filterEmployees=true`;
             const res = await fetch(url, {
                 method: 'GET',
                 mode: 'same-origin',

diff --git a/web/services/getAllUsersService.php b/web/services/getAllUsersService.php
@@ -34,6 +34,7 @@
 
     $sid = $_GET['sid'] ?? NULL;
     $active = $_GET['active'] ?? NULL;
+    $filterEmployees = $_GET['filterEmployees'] ?? false;
 
     do {
         /* We check authentication and authorization */
@@ -53,7 +54,7 @@
 
         if ($active == "true")
         {
-            $users = UsersFacade::GetAllActiveUsers();
+            $users = UsersFacade::GetAllActiveUsers($filterEmployees);
         }
         else
         {