From 96d53f4b6a556d4c443b1c58958f6265f0db41d3 Mon Sep 17 00:00:00 2001
From: Sami Mokaddem <mokaddem.sami@gmail.com>
Date: Tue, 2 Apr 2024 14:06:25 +0200
Subject: [PATCH] chg: [users:filtering] Added dropdown for users filtering

---
 src/Controller/UsersController.php | 10 +++++++++-
 src/Model/Table/UsersTable.php     |  5 +++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/Controller/UsersController.php b/src/Controller/UsersController.php
index 6fdbcdc..863af88 100644
--- a/src/Controller/UsersController.php
+++ b/src/Controller/UsersController.php
@@ -11,7 +11,15 @@ use Cake\Http\Exception\NotFoundException;
 
 class UsersController extends AppController
 {
-    public $filterFields = ['Individuals.uuid', 'username', 'Individuals.email', 'Individuals.first_name', 'Individuals.last_name', 'Organisations.name', 'Organisations.nationality'];
+    public $filterFields = [
+        'Individuals.uuid',
+        'username',
+        'Individuals.email',
+        'Individuals.first_name',
+        'Individuals.last_name',
+        ['name' => 'Organisations.id', 'multiple' => true, 'options' => 'getAllOrganisations', 'select2' => true],
+        'Organisations.nationality'
+    ];
     public $quickFilterFields = ['Individuals.uuid', ['username' => true], ['Individuals.first_name' => true], ['Individuals.last_name' => true], 'Individuals.email'];
     public $containFields = ['Individuals', 'Roles', 'UserSettings', 'Organisations', 'OrgGroups'];
 
diff --git a/src/Model/Table/UsersTable.php b/src/Model/Table/UsersTable.php
index e7bcb1f..4cb2dde 100644
--- a/src/Model/Table/UsersTable.php
+++ b/src/Model/Table/UsersTable.php
@@ -292,4 +292,9 @@ class UsersTable extends AppTable
         }
         return true;
     }
+
+    public function getAllOrganisations($currentUser) {
+        $this->Individuals = TableRegistry::get('Individuals');
+        return $this->Individuals->getAllOrganisations($currentUser);
+    }
 }