From 1116d8c43511ddc3114c8a44bcd4c1095c074b62 Mon Sep 17 00:00:00 2001
From: Jaime Jimenez <jaime.jimenez@csic.es>
Date: Tue, 2 May 2023 07:59:52 +0200
Subject: [PATCH] Permisos agrupados

---
 ci4/app/Controllers/Ajax.php                  |   4 +-
 ci4/app/Controllers/Catalogo/Catalogo.php     |  30 +++
 ci4/app/Controllers/Clientes/Cliente.php      |  35 ++++
 .../Controllers/Clientes/Tarifacliente.php    |  34 ++++
 .../Controllers/Configuracion/Calendario.php  |  25 +++
 .../Correo.php}                               |   5 +-
 .../Controllers/Configuracion/Formaspago.php  |  35 ++++
 .../Configuracion/Imposiciones.php            |  35 ++++
 ci4/app/Controllers/Configuracion/Maquina.php |  35 ++++
 .../Configuracion/Papelgenerico.php           |  35 ++++
 ci4/app/Controllers/Configuracion/Serie.php   |  21 +++
 .../Configuracion/Serviciocliente.php         |  35 ++++
 .../Configuracion/Tamanioformatos.php         |  35 ++++
 .../Configuracion/Tamaniolibros.php           |  35 ++++
 .../Configuracion/Tareaservicio.php           |  35 ++++
 .../Configuracion/Tiposimpresion.php          |  35 ++++
 ci4/app/Controllers/Configuracion/Trabajo.php |  35 ++++
 .../Digitalizacion/Digitalizacion.php         |  21 +++
 ci4/app/Controllers/Facturacion/Albaran.php   |  30 +++
 ci4/app/Controllers/Facturacion/Factura.php   |  30 +++
 ci4/app/Controllers/Informes/Informe.php      |  22 +++
 ci4/app/Controllers/Logistica/Logistica.php   |  22 +++
 ci4/app/Controllers/Pedidos/Pedido.php        |  35 ++++
 .../Controllers/Presupuestos/Presupuesto.php  |  35 ++++
 .../Presupuestos/Presupuestomaquetacion.php   |  35 ++++
 .../Controllers/Produccion/Ordenmaquina.php   |  35 ++++
 .../Controllers/Produccion/Ordentrabajo.php   |  35 ++++
 .../Produccion/Ordentrabajomaquetacion.php    |  35 ++++
 ci4/app/Controllers/Produccion/Pedido.php     |  35 ++++
 ci4/app/Controllers/Proveedores/Proveedor.php |  30 +++
 ci4/app/Controllers/Tarifas/Tarifaacabado.php |  35 ++++
 ci4/app/Controllers/Tarifas/Tarifaenvio.php   |  35 ++++
 .../Controllers/Tarifas/Tarifaimpresion.php   |  35 ++++
 .../Controllers/Tarifas/Tarifamanipulado.php  |  35 ++++
 .../Controllers/Tarifas/Tarifapapelcompra.php |  35 ++++
 .../Tarifas/Tarifapapeldefecto.php            |  35 ++++
 .../Tarifas/Tarifapreimpresion.php            |  35 ++++
 ci4/app/Controllers/Test.php                  | 171 +-----------------
 ci4/app/Controllers/{ => Usuarios}/Group.php  |  19 +-
 ci4/app/Controllers/{ => Usuarios}/User.php   |   3 +-
 ci4/app/Filters/LoginAuthFilter.php           |  43 +++--
 ci4/app/Helpers/general_helper.php            |   6 +
 .../backend/focus2/form/activity/index.php    |   2 +-
 .../themes/backend/focus2/form/group/form.php |  39 ++--
 .../backend/focus2/form/group/index.php       |   2 +-
 .../themes/backend/focus2/form/user/index.php |   2 +-
 .../Views/themes/backend/focus2/main/menu.php |   8 +-
 47 files changed, 1227 insertions(+), 217 deletions(-)
 create mode 100644 ci4/app/Controllers/Catalogo/Catalogo.php
 create mode 100644 ci4/app/Controllers/Clientes/Cliente.php
 create mode 100644 ci4/app/Controllers/Clientes/Tarifacliente.php
 create mode 100644 ci4/app/Controllers/Configuracion/Calendario.php
 rename ci4/app/Controllers/{Impresion/Impresioncliente.php => Configuracion/Correo.php} (67%)
 create mode 100644 ci4/app/Controllers/Configuracion/Formaspago.php
 create mode 100644 ci4/app/Controllers/Configuracion/Imposiciones.php
 create mode 100644 ci4/app/Controllers/Configuracion/Maquina.php
 create mode 100644 ci4/app/Controllers/Configuracion/Papelgenerico.php
 create mode 100644 ci4/app/Controllers/Configuracion/Serie.php
 create mode 100644 ci4/app/Controllers/Configuracion/Serviciocliente.php
 create mode 100644 ci4/app/Controllers/Configuracion/Tamanioformatos.php
 create mode 100644 ci4/app/Controllers/Configuracion/Tamaniolibros.php
 create mode 100644 ci4/app/Controllers/Configuracion/Tareaservicio.php
 create mode 100644 ci4/app/Controllers/Configuracion/Tiposimpresion.php
 create mode 100644 ci4/app/Controllers/Configuracion/Trabajo.php
 create mode 100644 ci4/app/Controllers/Digitalizacion/Digitalizacion.php
 create mode 100644 ci4/app/Controllers/Facturacion/Albaran.php
 create mode 100644 ci4/app/Controllers/Facturacion/Factura.php
 create mode 100644 ci4/app/Controllers/Informes/Informe.php
 create mode 100644 ci4/app/Controllers/Logistica/Logistica.php
 create mode 100644 ci4/app/Controllers/Pedidos/Pedido.php
 create mode 100644 ci4/app/Controllers/Presupuestos/Presupuesto.php
 create mode 100644 ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php
 create mode 100644 ci4/app/Controllers/Produccion/Ordenmaquina.php
 create mode 100644 ci4/app/Controllers/Produccion/Ordentrabajo.php
 create mode 100644 ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php
 create mode 100644 ci4/app/Controllers/Produccion/Pedido.php
 create mode 100644 ci4/app/Controllers/Proveedores/Proveedor.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifaacabado.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifaenvio.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifaimpresion.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifamanipulado.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifapapelcompra.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifapapeldefecto.php
 create mode 100644 ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
 rename ci4/app/Controllers/{ => Usuarios}/Group.php (93%)
 rename ci4/app/Controllers/{ => Usuarios}/User.php (99%)

diff --git a/ci4/app/Controllers/Ajax.php b/ci4/app/Controllers/Ajax.php
index 0c4d1982..0de78ad5 100644
--- a/ci4/app/Controllers/Ajax.php
+++ b/ci4/app/Controllers/Ajax.php
@@ -82,7 +82,7 @@ class Ajax extends ResourceController
                 if($records[$key]['email_confirmed'] == 1){
                     $records[$key]['email'] = $records[$key]['email'].' '.'<span class="text-success"><i class="fas fa-check-circle"></i></span>';
                 }
-                $editLink = site_url('user/edit/').$records[$key]['token'];
+                $editLink = site_url('usuarios/user/edit/').$records[$key]['token'];
                 $records[$key]['options'] = ''.
                     '<div class="btn-group mr-1 mb-1" xmlns="http://www.w3.org/1999/html">
                     <button type="button" class="btn btn-primary btn-block dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -172,7 +172,7 @@ class Ajax extends ResourceController
 
             //Format records
             foreach ($records as $key => $value){
-                $editLink = site_url('group/edit/').$records[$key]['token'];
+                $editLink = site_url('usuarios/group/edit/').$records[$key]['token'];
                 $records[$key]['options'] = ''.
                     '<div class="btn-group mr-1 mb-1" xmlns="http://www.w3.org/1999/html">
                     <button type="button" class="btn btn-primary btn-block dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/ci4/app/Controllers/Catalogo/Catalogo.php b/ci4/app/Controllers/Catalogo/Catalogo.php
new file mode 100644
index 00000000..d1e9bd0b
--- /dev/null
+++ b/ci4/app/Controllers/Catalogo/Catalogo.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers\Catalogo;
+use App\Controllers\BaseController;
+
+
+class Catalogo extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function import()
+    {
+
+    }
+
+    public function delete()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Clientes/Cliente.php b/ci4/app/Controllers/Clientes/Cliente.php
new file mode 100644
index 00000000..f3184a20
--- /dev/null
+++ b/ci4/app/Controllers/Clientes/Cliente.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Clientes;
+use App\Controllers\BaseController;
+
+
+class Cliente extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Clientes/Tarifacliente.php b/ci4/app/Controllers/Clientes/Tarifacliente.php
new file mode 100644
index 00000000..345f239a
--- /dev/null
+++ b/ci4/app/Controllers/Clientes/Tarifacliente.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Controllers\Clientes;
+use App\Controllers\BaseController;
+
+
+class Tarifacliente extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Calendario.php b/ci4/app/Controllers/Configuracion/Calendario.php
new file mode 100644
index 00000000..acb93eae
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Calendario.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Calendario extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Impresion/Impresioncliente.php b/ci4/app/Controllers/Configuracion/Correo.php
similarity index 67%
rename from ci4/app/Controllers/Impresion/Impresioncliente.php
rename to ci4/app/Controllers/Configuracion/Correo.php
index 76b259c4..f935718e 100644
--- a/ci4/app/Controllers/Impresion/Impresioncliente.php
+++ b/ci4/app/Controllers/Configuracion/Correo.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\Controllers\Impresion;
+namespace App\Controllers\Configuracion;
 use App\Controllers\BaseController;
 
 
-class Impresioncliente extends BaseController
+class Correo extends BaseController
 { 
     function __construct()
     { 
@@ -16,5 +16,6 @@ class Impresioncliente extends BaseController
         echo 'Hola2';
     } 
 
+    
 }
  
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Formaspago.php b/ci4/app/Controllers/Configuracion/Formaspago.php
new file mode 100644
index 00000000..f4b8e09a
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Formaspago.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Formaspago extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Imposiciones.php b/ci4/app/Controllers/Configuracion/Imposiciones.php
new file mode 100644
index 00000000..2b9f27be
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Imposiciones.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Imposiciones extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Maquina.php b/ci4/app/Controllers/Configuracion/Maquina.php
new file mode 100644
index 00000000..b8576303
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Maquina.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Maquina extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Papelgenerico.php b/ci4/app/Controllers/Configuracion/Papelgenerico.php
new file mode 100644
index 00000000..a402faae
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Papelgenerico.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Papelgenerico extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Serie.php b/ci4/app/Controllers/Configuracion/Serie.php
new file mode 100644
index 00000000..5f185e00
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Serie.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Serie extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Serviciocliente.php b/ci4/app/Controllers/Configuracion/Serviciocliente.php
new file mode 100644
index 00000000..925471a5
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Serviciocliente.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Serviciocliente extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Tamanioformatos.php b/ci4/app/Controllers/Configuracion/Tamanioformatos.php
new file mode 100644
index 00000000..5076a27f
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Tamanioformatos.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Tamanioformatos extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Tamaniolibros.php b/ci4/app/Controllers/Configuracion/Tamaniolibros.php
new file mode 100644
index 00000000..3769b718
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Tamaniolibros.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Tamaniolibros extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Tareaservicio.php b/ci4/app/Controllers/Configuracion/Tareaservicio.php
new file mode 100644
index 00000000..7bfc2302
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Tareaservicio.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Tareaservicio extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Tiposimpresion.php b/ci4/app/Controllers/Configuracion/Tiposimpresion.php
new file mode 100644
index 00000000..6432df84
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Tiposimpresion.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Tiposimpresion extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Configuracion/Trabajo.php b/ci4/app/Controllers/Configuracion/Trabajo.php
new file mode 100644
index 00000000..603d455b
--- /dev/null
+++ b/ci4/app/Controllers/Configuracion/Trabajo.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Configuracion;
+use App\Controllers\BaseController;
+
+
+class Trabajo extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function edit()
+    {
+
+    }
+
+    public function add()
+    {
+        
+    }
+
+    public function delete()
+    {
+        
+    }
+    
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Digitalizacion/Digitalizacion.php b/ci4/app/Controllers/Digitalizacion/Digitalizacion.php
new file mode 100644
index 00000000..b08f8351
--- /dev/null
+++ b/ci4/app/Controllers/Digitalizacion/Digitalizacion.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Controllers\Digitalizacion;
+use App\Controllers\BaseController;
+
+
+class Digitalizacion extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+
+
+}
diff --git a/ci4/app/Controllers/Facturacion/Albaran.php b/ci4/app/Controllers/Facturacion/Albaran.php
new file mode 100644
index 00000000..28dc5a2f
--- /dev/null
+++ b/ci4/app/Controllers/Facturacion/Albaran.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers\Facturacion;
+use App\Controllers\BaseController;
+
+
+class Albaran extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function export()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Facturacion/Factura.php b/ci4/app/Controllers/Facturacion/Factura.php
new file mode 100644
index 00000000..d7cdec82
--- /dev/null
+++ b/ci4/app/Controllers/Facturacion/Factura.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers\Facturacion;
+use App\Controllers\BaseController;
+
+
+class Factura extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function export()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Informes/Informe.php b/ci4/app/Controllers/Informes/Informe.php
new file mode 100644
index 00000000..5fed1b7e
--- /dev/null
+++ b/ci4/app/Controllers/Informes/Informe.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Controllers\Informes;
+use App\Controllers\BaseController;
+
+
+class Informe extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+   
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Logistica/Logistica.php b/ci4/app/Controllers/Logistica/Logistica.php
new file mode 100644
index 00000000..1083b02a
--- /dev/null
+++ b/ci4/app/Controllers/Logistica/Logistica.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Controllers\Logistica;
+use App\Controllers\BaseController;
+
+
+class Logistica extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Pedidos/Pedido.php b/ci4/app/Controllers/Pedidos/Pedido.php
new file mode 100644
index 00000000..b683fa85
--- /dev/null
+++ b/ci4/app/Controllers/Pedidos/Pedido.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Pedidos;
+use App\Controllers\BaseController;
+
+
+class Pedido extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete_files()
+    {
+
+    }
+
+    public function pedidos_maquetacion()
+    {
+
+    }
+
+    public function pedidos_prestashop()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Presupuestos/Presupuesto.php b/ci4/app/Controllers/Presupuestos/Presupuesto.php
new file mode 100644
index 00000000..c46a48d2
--- /dev/null
+++ b/ci4/app/Controllers/Presupuestos/Presupuesto.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Presupuestos;
+use App\Controllers\BaseController;
+
+
+class Presupuesto extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php b/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php
new file mode 100644
index 00000000..4026f3d9
--- /dev/null
+++ b/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Presupuestos;
+use App\Controllers\BaseController;
+
+
+class Presupuestomaquetacion extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Produccion/Ordenmaquina.php b/ci4/app/Controllers/Produccion/Ordenmaquina.php
new file mode 100644
index 00000000..497a258e
--- /dev/null
+++ b/ci4/app/Controllers/Produccion/Ordenmaquina.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Produccion;
+use App\Controllers\BaseController;
+
+
+class Ordenmaquina extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Produccion/Ordentrabajo.php b/ci4/app/Controllers/Produccion/Ordentrabajo.php
new file mode 100644
index 00000000..d0a1bddc
--- /dev/null
+++ b/ci4/app/Controllers/Produccion/Ordentrabajo.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Produccion;
+use App\Controllers\BaseController;
+
+
+class Ordentrabajo extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php b/ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php
new file mode 100644
index 00000000..ed5308cb
--- /dev/null
+++ b/ci4/app/Controllers/Produccion/Ordentrabajomaquetacion.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Produccion;
+use App\Controllers\BaseController;
+
+
+class Ordentrabajomaquetacion extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Produccion/Pedido.php b/ci4/app/Controllers/Produccion/Pedido.php
new file mode 100644
index 00000000..83a4ff16
--- /dev/null
+++ b/ci4/app/Controllers/Produccion/Pedido.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Produccion;
+use App\Controllers\BaseController;
+
+
+class Pedido extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Proveedores/Proveedor.php b/ci4/app/Controllers/Proveedores/Proveedor.php
new file mode 100644
index 00000000..3537cd83
--- /dev/null
+++ b/ci4/app/Controllers/Proveedores/Proveedor.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Controllers\Proveedores;
+use App\Controllers\BaseController;
+
+
+class Proveedor extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function export()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php
new file mode 100644
index 00000000..f9cf0217
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifaacabado extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifaenvio.php b/ci4/app/Controllers/Tarifas/Tarifaenvio.php
new file mode 100644
index 00000000..fc8df69d
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifaenvio.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifaenvio extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifaimpresion.php b/ci4/app/Controllers/Tarifas/Tarifaimpresion.php
new file mode 100644
index 00000000..c8dd80f5
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifaimpresion.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifaimpresion extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifamanipulado.php b/ci4/app/Controllers/Tarifas/Tarifamanipulado.php
new file mode 100644
index 00000000..f3894166
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifamanipulado.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifamanipulado extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifapapelcompra.php b/ci4/app/Controllers/Tarifas/Tarifapapelcompra.php
new file mode 100644
index 00000000..d57e7351
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifapapelcompra.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifapapelcompra extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifapapeldefecto.php b/ci4/app/Controllers/Tarifas/Tarifapapeldefecto.php
new file mode 100644
index 00000000..5b5ff44d
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifapapeldefecto.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifapapeldefecto extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
new file mode 100644
index 00000000..141ef5a5
--- /dev/null
+++ b/ci4/app/Controllers/Tarifas/Tarifapreimpresion.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Controllers\Tarifas;
+use App\Controllers\BaseController;
+
+
+class Tarifapreimpresion extends BaseController
+{ 
+    function __construct()
+    { 
+            
+    }
+
+    public function index()
+    {
+        echo 'Hola2';
+    } 
+
+    public function delete()
+    {
+
+    }
+
+    public function add()
+    {
+
+    }
+
+    public function edit()
+    {
+
+    }
+
+}
+ 
\ No newline at end of file
diff --git a/ci4/app/Controllers/Test.php b/ci4/app/Controllers/Test.php
index a921f855..ef3af4fc 100644
--- a/ci4/app/Controllers/Test.php
+++ b/ci4/app/Controllers/Test.php
@@ -13,172 +13,7 @@ class Test extends BaseController
 
     public function index()
     {
-        $request = \Config\Services::request();
-        $uri = new \CodeIgniter\HTTP\URI('https://sk-jjo.imnavajas.es/impresion/impresioncliente');
-
-        
-        $language = \Config\Services::language();
-        $language->setLocale(session()->lang);
-
-        $getWhiteList = $this->whiteListController();
-
-        foreach ($getWhiteList as $item){
-            if(strtolower($item) == $uri->getSegment(1)){
-                
-           
-                echo '<pre>';
-                var_dump('1');
-                echo '</pre>';
-                dd();
-
-                return true;
-            }
-        }
-
-        $getRules = json_decode(session()->get('rules')??'[]');
-
-        foreach ($this->whiteListMethod() as $item){
-            if(strtolower($item) == $uri->getSegment(2)){
-
-                echo '<pre>';
-                var_dump('2');
-                echo '</pre>';
-                dd();
-
-                return true;
-            }
-        }
-
-        foreach ($getRules as $key=>$value){
-            if(strtolower($key) == $uri->getSegment(1)){
-                if($uri->getTotalSegments() <= 1){
-                    
-                    echo '<pre>';
-                    var_dump('3');
-                    echo '</pre>';
-                    dd();
-                    
-                    return true;
-                }
-                
-                foreach ($value as $item){
-                    if(strtolower($item) == $uri->getSegment(2)){
-
-                        echo '<pre>';
-                        var_dump('4');
-                        echo '</pre>';
-                        dd();
-                        
-                        return true;
-                    }
-                }
-                
-            }
-            else{
-                foreach($this->controllerFolderList() as $folder){
-                    if(strtolower($folder) == $uri->getSegment(1)){
-                        var_dump($key);
-                        if(strtolower($key) == $uri->getSegment(2)){
-                            if($uri->getTotalSegments() <= 2){
-
-                                echo '<pre>';
-                                var_dump('5');
-                                echo '</pre>';
-                                dd();
-
-                                return true;
-                            }
-                            
-                            foreach ($value as $item){
-                                if(strtolower($item) == $uri->getSegment(3)){
-
-                                    echo '<pre>';
-                                    var_dump('6');
-                                    echo '</pre>';
-                                    dd();
-
-                                    return true;
-                                }
-                            }
-                            
-                        }
-                    }
-                }
-                
-            }
-        }
-        
-        echo '<pre>';
-        var_dump($uri->getSegment(1));
-        var_dump($uri->getSegment(2));
-        var_dump($uri->getSegment(3));
-        echo '</pre>';
-        dd();
-        
+        helper('general');
+        var_dump( getAllClass());
     }
-
-
-    /**
-     * Returns the white list of allowed controllers.
-     */
-    public function whiteListController(){
-        return [
-            '',
-            'BaseController',
-            'Home',
-            'Login',
-            'Oauth',
-            'Language',
-            'Api',
-            'Cron',
-            'lang',
-            'Ajax',
-            'Integration',
-            'Migrate',
-            'Test',
-            
-        ];
-    }
-
-    /**
-     * JJO
-     * Returns the controller folder list
-     */
-    public function controllerFolderList(){
-        return [
-            'impresion',
-        ];
-    } 
-
-
-    /**
-     * Returns the whitelist of public controllers.
-     */
-    public function ignoreListController(){
-        return [
-        ];
-    }
-
-    public function validateIgnoreControllerAccess(){
-        $request = \Config\Services::request();
-        $uri = $request->uri;
-
-        $getList = $this->ignoreListController();
-        foreach ($getList as $item){
-            if(strtolower($item) == $uri->getSegment(1)){
-                return true;
-            }
-        }
-        return false;
-    }
-
-    public function whiteListMethod(){
-        return [
-            'initController',
-            '__construct',
-            'validateControllerAccess',
-            'whiteListController',
-            'whiteListMethod'
-        ];
-    }
-}
+}
\ No newline at end of file
diff --git a/ci4/app/Controllers/Group.php b/ci4/app/Controllers/Usuarios/Group.php
similarity index 93%
rename from ci4/app/Controllers/Group.php
rename to ci4/app/Controllers/Usuarios/Group.php
index 4c52769c..3b61aa07 100644
--- a/ci4/app/Controllers/Group.php
+++ b/ci4/app/Controllers/Usuarios/Group.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace App\Controllers;
+namespace App\Controllers\Usuarios;
+use App\Controllers\BaseController;
 
 use App\Models\UserModel;
 use App\Models\UserGroupModel;
@@ -59,7 +60,7 @@ class Group extends BaseController
 
         $data['btn_return'] = [
             'title' => lang("App.global_come_back"),
-            'route'   => '/group',
+            'route'   => 'usuarios/group',
             'class'   => 'btn btn-dark mr-1',
             'icon'  => 'fas fa-angle-left'
         ];
@@ -94,7 +95,7 @@ class Group extends BaseController
 
         $data['btn_return'] = [
             'title' => lang("App.global_come_back"),
-            'route'   => '/group',
+            'route'   => 'usuarios/group',
             'class'   => 'btn btn-dark mr-1',
             'icon'  => 'fas fa-angle-left'
         ];
@@ -108,7 +109,7 @@ class Group extends BaseController
 
         $data['obj'] = $this->group_model->where('token', $id)->first();
         if($data['obj']==null){
-            return redirect()->to('/group');
+            return redirect()->to('/usuarios/group');
         }
 
         echo view(getenv('theme.path').'main/header');
@@ -121,7 +122,7 @@ class Group extends BaseController
         //Demo Mode
         if(env('demo.mode')??false){
             session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
-            return redirect()->to('/group');
+            return redirect()->to('/usuarios/group');
         }
 
         $session = session();
@@ -181,13 +182,13 @@ class Group extends BaseController
 
                 if(empty($listPost['id_group'])){
                     $session->setFlashdata('sweet', ['success',lang("App.group_alert_add")]);
-                    return redirect()->to('/group');
+                    return redirect()->to('/usuarios/group');
                 }else{
                     if($session->get('group') == $this->request->getPost('token')){
                         $session->set('rules', $listPost['rules']);
                     }
                     $session->setFlashdata('sweet', ['success',lang("App.group_alert_edit")]);
-                    return redirect()->to('/group');
+                    return redirect()->to('/usuarios/group');
                 }
             }
         }else{
@@ -201,7 +202,7 @@ class Group extends BaseController
         //Demo Mode
         if(env('demo.mode')??false){
             session()->setFlashdata('sweet', ['warning',lang("App.general_demo_mode")]);
-            return redirect()->to('/group');
+            return redirect()->to('/usuarios/group');
         }
 
         $session = session();
@@ -211,6 +212,6 @@ class Group extends BaseController
         }else{
             $session->setFlashdata('sweet', ['error',lang("App.group_alert_error")]);
         }
-        return redirect()->to('/group');
+        return redirect()->to('/usuarios/group');
     }
 }
diff --git a/ci4/app/Controllers/User.php b/ci4/app/Controllers/Usuarios/User.php
similarity index 99%
rename from ci4/app/Controllers/User.php
rename to ci4/app/Controllers/Usuarios/User.php
index 922339c6..55ecb977 100644
--- a/ci4/app/Controllers/User.php
+++ b/ci4/app/Controllers/Usuarios/User.php
@@ -1,6 +1,7 @@
 <?php
 
-namespace App\Controllers;
+namespace App\Controllers\Usuarios;
+use App\Controllers\BaseController;
 
 use App\Libraries\PasswordHash;
 use App\Models\ActivityModel;
diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php
index d014012f..fb508a47 100644
--- a/ci4/app/Filters/LoginAuthFilter.php
+++ b/ci4/app/Filters/LoginAuthFilter.php
@@ -41,7 +41,7 @@ class LoginAuthFilter implements FilterInterface
     public function validateControllerAccess(){
         $request = \Config\Services::request();
         $uri = $request->uri;
-
+        
         $language = \Config\Services::language();
         $language->setLocale(session()->lang);
 
@@ -66,16 +66,14 @@ class LoginAuthFilter implements FilterInterface
                 if($uri->getTotalSegments() <= 1){
                     return true;
                 }
-                
                 foreach ($value as $item){
                     if(strtolower($item) == $uri->getSegment(2)){
                         return true;
                     }
                 }
-                
             }
             else{
-                foreach($this->controllerFolderList() as $folder){
+                foreach($this->controllerFolderWhiteList() as $folder){
                     if(strtolower($folder) == $uri->getSegment(1)){
                         if(strtolower($key) == $uri->getSegment(2)){
                             if($uri->getTotalSegments() <= 2){
@@ -93,12 +91,36 @@ class LoginAuthFilter implements FilterInterface
                 }
                 
             }
-        }
+        } 
         session()->setFlashdata('sweet', ['error',lang("App.dashboard_alert_rules")]);
         header('Location: /home');
         exit();
     }
 
+    /**
+     * JJO
+     * Returns the controller folder list
+     */
+    public function controllerFolderWhiteList(){
+        return [
+            'Catalogo',
+            'Clientes',
+            'Configuracion',
+            'Digitalizacion',
+            'Facturacion',
+            'Informes',
+            'Logistica',
+            'Pedidos',
+            'Presupuestos',
+            'Produccion',
+            'Proveedores',
+            'Tarifas',
+            'Usuarios',
+        ];
+    } 
+
+
+
     /**
      * Returns the white list of allowed controllers.
      */
@@ -121,17 +143,6 @@ class LoginAuthFilter implements FilterInterface
         ];
     }
 
-    /**
-     * JJO
-     * Returns the controller folder list
-     */
-    public function controllerFolderList(){
-        return [
-            'impresion',
-        ];
-    } 
-
-
     /**
      * Returns the whitelist of public controllers.
      */
diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php
index a75ddd2f..22a38641 100644
--- a/ci4/app/Helpers/general_helper.php
+++ b/ci4/app/Helpers/general_helper.php
@@ -54,6 +54,10 @@ function getAllClass($controller = null){
     }
 }
 
+
+
+
+
 function getAllClassFolder($folder = null){
     try {
         helper('filesystem');
@@ -107,6 +111,8 @@ function getAllFolder(){
     }
 }
 
+
+
 function getIgnoreController($controller)
 {
     try {
diff --git a/ci4/app/Views/themes/backend/focus2/form/activity/index.php b/ci4/app/Views/themes/backend/focus2/form/activity/index.php
index 85886c92..b3625cf5 100644
--- a/ci4/app/Views/themes/backend/focus2/form/activity/index.php
+++ b/ci4/app/Views/themes/backend/focus2/form/activity/index.php
@@ -34,7 +34,7 @@
                     </div>
                 </div>
             </div>
-            <div class="col-lg-3 col-sm-6">
+            <div class="col-12">
                 <div class="card">
                     <div class="stat-widget-one card-body">
                         <div class="d-inline-block">
diff --git a/ci4/app/Views/themes/backend/focus2/form/group/form.php b/ci4/app/Views/themes/backend/focus2/form/group/form.php
index dd113010..795eb819 100644
--- a/ci4/app/Views/themes/backend/focus2/form/group/form.php
+++ b/ci4/app/Views/themes/backend/focus2/form/group/form.php
@@ -60,19 +60,34 @@
                                     </div>
                                 </div>
                                 <div class="row">
-                                    <?php foreach(getAllClass() as $item): ?>
-                                        <div class="col-md-3 col-lg-2">
-                                            <h4 class="danger"><?=getDictionary($item['name'])?></h4>
-                                            <?php foreach($item['methods'] as $subitem): ?>
-                                                <?php if(!getIgnoreMethod($subitem)): ?>
-                                                    <div class="custom-control custom-switch">
-                                                        <input type="checkbox" id="<?=$item['name'].'_'.$subitem?>" name="<?=$item['name'].'_'.$subitem?>" class="custom-control-input">
-                                                        <label for="<?=$item['name'].'_'.$subitem?>" class="custom-control-label"><?=getDictionary($subitem)?></label>
+                                    <div class="col-md-12 right">
+                                        <?php foreach(getAllFolder() as $folder): ?>
+                                            <div class="card">
+                                                <div class="card-header">
+                                                    <h4 class="card-title"><?= $folder??'' ?></h4>
+                                                </div>
+                                                <div class="card-body">
+                                                    <div class="row">
+                                                        <?php foreach(getAllClass() as $item): ?>
+                                                            <?php if (str_contains($item['path'], $folder)): ?>
+                                                            <div class="col-md-3 col-lg-2">
+                                                                <h4 class="danger"><?=getDictionary($item['name'])?></h4>
+                                                                <?php foreach($item['methods'] as $subitem): ?>
+                                                                    <?php if(!getIgnoreMethod($subitem)): ?>
+                                                                        <div class="custom-control custom-switch">
+                                                                            <input type="checkbox" id="<?=$item['name'].'_'.$subitem?>" name="<?=$item['name'].'_'.$subitem?>" class="custom-control-input">
+                                                                            <label for="<?=$item['name'].'_'.$subitem?>" class="custom-control-label"><?=getDictionary($subitem)?></label>
+                                                                        </div>
+                                                                    <?php endif; ?>
+                                                                <?php endforeach; ?>
+                                                            </div>
+                                                            <?php endif; ?>
+                                                        <?php endforeach; ?>
                                                     </div>
-                                                <?php endif; ?>
-                                            <?php endforeach; ?>
-                                        </div>
-                                    <?php endforeach; ?>
+                                                </div>
+                                            </div>
+                                        <?php endforeach; ?>
+                                    </div>
                                 </div>
                             </div>
                             <div class="form-actions mt-2">
diff --git a/ci4/app/Views/themes/backend/focus2/form/group/index.php b/ci4/app/Views/themes/backend/focus2/form/group/index.php
index bfae4df2..4d233d31 100644
--- a/ci4/app/Views/themes/backend/focus2/form/group/index.php
+++ b/ci4/app/Views/themes/backend/focus2/form/group/index.php
@@ -110,7 +110,7 @@
         }).then(function(isConfirm) {
             console.log(isConfirm);
             if (isConfirm.value) {
-                window.location.href = '<?=site_url("group/delete/")?>'+id;
+                window.location.href = '<?=site_url("usuarios/group/delete/")?>'+id;
             }
         })
     }
diff --git a/ci4/app/Views/themes/backend/focus2/form/user/index.php b/ci4/app/Views/themes/backend/focus2/form/user/index.php
index 32e64a25..c29315e5 100644
--- a/ci4/app/Views/themes/backend/focus2/form/user/index.php
+++ b/ci4/app/Views/themes/backend/focus2/form/user/index.php
@@ -112,7 +112,7 @@
         }).then(function(isConfirm) {
             console.log(isConfirm);
             if (isConfirm.value) {
-                window.location.href = '<?=site_url("user/delete/")?>'+id;
+                window.location.href = '<?=site_url("usuarios/user/delete/")?>'+id;
             }
         })
     }
diff --git a/ci4/app/Views/themes/backend/focus2/main/menu.php b/ci4/app/Views/themes/backend/focus2/main/menu.php
index 6e5b1ee5..5f53a38c 100644
--- a/ci4/app/Views/themes/backend/focus2/main/menu.php
+++ b/ci4/app/Views/themes/backend/focus2/main/menu.php
@@ -9,10 +9,10 @@
             <li><a class="has-arrow" href="Javascript:void()" aria-expanded="false"><i class="fas fa-user-friends"></i><span class="nav-text"><?= lang("App.menu_users") ?></span></a>
                 <ul aria-expanded="false">
                     <?php if (count(getArrayItem($menus,'methods','index',true)) > 0): ?>
-                    <li><a href="<?= site_url("user")?>"><?= lang("App.menu_list") ?></a></li>
+                        <li><a href="<?= site_url("usuarios/user")?>"><?= lang("App.menu_list") ?></a></li>
                     <?php endif; ?>
                     <?php if (count(getArrayItem($menus,'methods','add',true)) > 0): ?>
-                    <li><a href="<?= site_url("user/add")?>"><?= lang("App.menu_add") ?></a></li>
+                    <li><a href="<?= site_url("usuarios/user/add")?>"><?= lang("App.menu_add") ?></a></li>
                     <?php endif; ?>
                 </ul>
             </li>
@@ -21,10 +21,10 @@
             <li><a class="has-arrow" href="Javascript:void()" aria-expanded="false"><i class="fas fa-user-lock"></i><span class="nav-text"><?= lang("App.menu_permission_group") ?></span></a>
                 <ul aria-expanded="false">
                     <?php if (count(getArrayItem($menus,'methods','index',true)) > 0): ?>
-                    <li><a href="<?= site_url("group")?>"><?= lang("App.menu_list") ?></a></li>
+                    <li><a href="<?= site_url("usuarios/group")?>"><?= lang("App.menu_list") ?></a></li>
                     <?php endif; ?>
                     <?php if (count(getArrayItem($menus,'methods','add',true)) > 0): ?>
-                    <li><a href="<?= site_url("group/add")?>"><?= lang("App.menu_add") ?></a></li>
+                    <li><a href="<?= site_url("usuarios/group/add")?>"><?= lang("App.menu_add") ?></a></li>
                     <?php endif; ?>
                 </ul>
             </li>