jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arreglando grupos de usuarios

Browse Source
This commit is contained in:
imnavajas
2024-05-03 16:36:02 +02:00
parent 9858616b6e
commit c152cf699d
12 changed files with 186 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
ci4/app/Models/Usuarios/GroupModel.php Normal file
View File

@ -0,0 +1,103 @@
<?php
namespace App\Models\Usuarios;
class GroupModel extends \App\Models\BaseModel
{
protected $table = "auth_groups";
/**
* Whether primary key uses auto increment.
*
* @var bool
*/
protected $useAutoIncrement = true;
protected $primaryKey = "id";
protected $useTimestamps = true;
protected $dateFormat = 'datetime';
protected $createdField = 'created_at';
protected $updatedField = 'updated_at';
const SORTABLE = [
1 => "t1.id",
2 => "t1.keyword",
3 => "t1.name",
4 => "t1.description",
5 => "t1.rules",
6 => "t1.created_at",
7 => "t1.updated_at",
];
protected $allowedFields = ["id", "name", "description", "rules"];
protected $returnType = "App\Entities\Usuarios\UserGroupEntity";
public static $labelField = "name";
protected $validationRules = [
"description" => [
"label" => "UserGroups.description",
"rules" => "required|max_length[150]",
],
"name" => [
"label" => "UserGroups.name",
"rules" => "required|max_length[50]",
],
];
protected $validationMessages = [
"description" => [
"max_length" => "UserGroups.validation.description.max_length",
"required" => "UserGroups.validation.description.required",
],
"name" => [
"max_length" => "UserGroups.validation.name.max_length",
"required" => "UserGroups.validation.name.required",
],
];
/**
* Get resource data.
*
* @param string $search
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "")
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.keyword AS keyword, t1.name AS name, t1.description AS description, t1.rules AS rules,
t1.token AS token, t1.created_at AS created_at, t1.updated_at AS updated_at"
);
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.id", $search)
->orLike("t1.keyword", $search)
->orLike("t1.name", $search)
->orLike("t1.description", $search)
->orLike("t1.rules", $search)
->orLike("t1.created_at", $search)
->orLike("t1.updated_at", $search)
->groupEnd();
}
public function getUsersWithRol($groupKeyWord)
{
return $this->db
->table('auth_groups_users')
->select('user_id')
->where('group', $groupKeyWord)
->countAllResults();
}
}

9
ci4/app/Models/Usuarios/GroupUserModel.php → ci4/app/Models/Usuarios/GroupsUsersModel.php Executable file → Normal file
View File

@ -3,13 +3,10 @@ namespace App\Models\Usuarios;
use App\Models\BaseModel;
class GroupUserModel extends BaseModel
class GroupsUsersModel extends BaseModel
{
protected $table = 'group_user';
protected $allowedFields = [
'token_user',
'token_group'
];
protected $table = 'auth_groups_users';
protected $allowedFields = [ ];
public function getUsersWithRol($token_group){

90
ci4/app/Models/Usuarios/UserGroupModel.php
View File

@ -1,90 +0,0 @@
<?php
namespace App\Models\Usuarios;
class UserGroupModel extends \App\Models\BaseModel
{
protected $table = "auth_user_group";
/**
* Whether primary key uses auto increment.
*
* @var bool
*/
protected $useAutoIncrement = true;
protected $primaryKey = "id_group";
protected $useTimestamps = true;
protected $dateFormat = 'datetime';
protected $createdField = 'created_at';
protected $updatedField = 'updated_at';
const SORTABLE = [
1 => "t1.id_group",
2 => "t1.title",
3 => "t1.dashboard",
4 => "t1.rules",
5 => "t1.token",
6 => "t1.created_at",
7 => "t1.updated_at",
];
protected $allowedFields = ["id_group", "title", "dashboard", "rules", "token"];
protected $returnType = "App\Entities\Usuarios\UserGroupEntity";
public static $labelField = "title";
protected $validationRules = [
"dashboard" => [
"label" => "UserGroups.dashboard",
"rules" => "required|max_length[50]",
],
"title" => [
"label" => "UserGroups.title",
"rules" => "required|max_length[150]",
],
];
protected $validationMessages = [
"dashboard" => [
"max_length" => "UserGroups.validation.dashboard.max_length",
"required" => "UserGroups.validation.dashboard.required",
],
"title" => [
"max_length" => "UserGroups.validation.title.max_length",
"required" => "UserGroups.validation.title.required",
],
];
/**
* Get resource data.
*
* @param string $search
*
* @return \CodeIgniter\Database\BaseBuilder
*/
public function getResource(string $search = "")
{
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id_group AS id_group, t1.title AS title, t1.dashboard AS dashboard, t1.rules AS rules,
t1.token AS token, t1.created_at AS created_at, t1.updated_at AS updated_at"
);
return empty($search)
? $builder
: $builder
->groupStart()
->like("t1.id_group", $search)
->orLike("t1.title", $search)
->orLike("t1.dashboard", $search)
->orLike("t1.rules", $search)
->orLike("t1.token", $search)
->orLike("t1.created_at", $search)
->orLike("t1.updated_at", $search)
->groupEnd();
}
}

4
ci4/app/Models/Usuarios/UserModel.php
View File

@ -187,8 +187,8 @@ class UserModel extends \App\Models\BaseModel
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`
$sql = 'SELECT `auth_groups`.`title` FROM `auth_groups`
JOIN `group_user` ON `auth_groups`.`token` = `group_user`.`token_group`
JOIN `auth_user` ON `auth_user`.`token` = `group_user`.`token_user`
WHERE `auth_user`.`token` = \''. $user_token . '\'';