From e591a50a22a88e799797d6a82d2b385541edeb51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= <jjimenez@iaa.es>
Date: Tue, 9 May 2023 13:11:42 +0200
Subject: [PATCH] modificada la forma de obtener la lista de grupos para el
 index de los usuarios

---
 ci4/app/Controllers/Test.php                  |  8 +++++++-
 ci4/app/Controllers/Usuarios/Users.php        | 18 ++---------------
 ci4/app/Models/Usuarios/UserModel.php         | 20 +++++++++++++++++++
 .../backend/focus2/form/user/viewUserList.php |  2 +-
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/ci4/app/Controllers/Test.php b/ci4/app/Controllers/Test.php
index 8762bfd9..e8c30101 100644
--- a/ci4/app/Controllers/Test.php
+++ b/ci4/app/Controllers/Test.php
@@ -2,6 +2,9 @@
 
 namespace App\Controllers;
 
+
+use App\Models\Usuarios\UserModel;
+
 class Test extends BaseController
 {
     
@@ -13,9 +16,12 @@ class Test extends BaseController
 
     public function index()
     {
+        
+        $user_model = new UserModel();
         echo '<pre>';
-        var_dump($this->validateControllerAccess());
+        var_dump($user_model->getGroupsTitles('c0bf18621f78cb2ffc4a67cf8d5173c7'));
         echo '</pre>';
+
     }
 
     public function validateControllerAccess(){
diff --git a/ci4/app/Controllers/Usuarios/Users.php b/ci4/app/Controllers/Usuarios/Users.php
index 496792b5..3e68b70e 100644
--- a/ci4/app/Controllers/Usuarios/Users.php
+++ b/ci4/app/Controllers/Usuarios/Users.php
@@ -48,7 +48,8 @@ class Users extends \App\Controllers\GoBaseController {
         
 		$this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Users.user')]);
         
-        $this->viewData['groupsPerUser'] = $this->getGroupsPerUser();
+        $this->viewData['user_model'] = $this->user_model;
+
         parent::index();
 
     }
@@ -301,20 +302,5 @@ class Users extends \App\Controllers\GoBaseController {
 
 		return $registers;
 	}
-
-    protected function getGroupsPerUser() { 
-		$tokens = $this->user_model->select('token')->findAll();
-        $data = [];
-        foreach($tokens as $token){
-            $groups = $this->group_user_model->select('token_group')->where('token_user', $token->token)->findAll();
-            $groups_title = [];
-            foreach($groups as $group_token){
-                array_push($groups_title, $this->group_model->select('title')->where('token', $group_token)->first()->title);
-            }
-
-            $data[$token->token] = implode(',',$groups_title);     
-        }
-        return $data;
-	}
         
 }
diff --git a/ci4/app/Models/Usuarios/UserModel.php b/ci4/app/Models/Usuarios/UserModel.php
index bdf48715..2827b709 100644
--- a/ci4/app/Models/Usuarios/UserModel.php
+++ b/ci4/app/Models/Usuarios/UserModel.php
@@ -184,4 +184,24 @@ class UserModel extends \App\Models\GoBaseModel
             "max_length" => "Users.validation.zip_code.max_length",
         ],
     ];
+
+    public function getGroupsTitles($user_token){
+        
+        $sql = 'SELECT `auth_user_group`.`title`   FROM `auth_user_group` 
+        JOIN `group_user` ON `auth_user_group`.`token` = `group_user`.`token_group`
+        JOIN `auth_user` ON `auth_user`.`token` = `group_user`.`token_user`
+        WHERE `auth_user`.`token` = \''. $user_token . '\'';
+        
+
+        $query = $this->db->query($sql);
+        $result = $query->getResultObject();
+        $data = [];
+        foreach($result as $r){
+            array_push($data, $r->title);
+        }
+        return implode(',', $data);
+        
+        
+        
+    }
 }
diff --git a/ci4/app/Views/themes/backend/focus2/form/user/viewUserList.php b/ci4/app/Views/themes/backend/focus2/form/user/viewUserList.php
index e88e30c5..d0242207 100644
--- a/ci4/app/Views/themes/backend/focus2/form/user/viewUserList.php
+++ b/ci4/app/Views/themes/backend/focus2/form/user/viewUserList.php
@@ -53,7 +53,7 @@
 								</td>
 								
 								<td class="align-middle">
-									<?= empty($	[$item->token]) || strlen($groupsPerUser[$item->token]) < 51 ? esc($groupsPerUser[$item->token]) : character_limiter(esc($groupsPerUser[$item->token]), 50)   ?>
+									<?= empty($user_model->getGroupsTitles($item->token)) || strlen($user_model->getGroupsTitles($item->token)) < 51 ? esc($user_model->getGroupsTitles($item->token)) : character_limiter($user_model->getGroupsTitles($item->token), 50)   ?>
 								</td>
 
 								<td class="align-middle">