From b21686c78a0591f023f787749d3d43052d17767d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Tue, 2 May 2023 14:32:27 +0200 Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20lenguaje=20a=20los=20roles.=20Or?= =?UTF-8?q?den=20por=20grupos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci4/app/Controllers/Activity.php | 2 +- ci4/app/Controllers/Ajax.php | 22 ++--- .../{Pedido.php => Pedidoproduccion.php} | 2 +- ci4/app/Helpers/general_helper.php | 88 ++++++++++++++++--- ci4/app/Language/en/App.php | 81 +++++++++++++++++ ci4/app/Language/es/App.php | 81 +++++++++++++++++ .../themes/backend/focus2/form/group/form.php | 26 +++++- 7 files changed, 276 insertions(+), 26 deletions(-) rename ci4/app/Controllers/Produccion/{Pedido.php => Pedidoproduccion.php} (87%) diff --git a/ci4/app/Controllers/Activity.php b/ci4/app/Controllers/Activity.php index 8b0b9da5..95b695e8 100644 --- a/ci4/app/Controllers/Activity.php +++ b/ci4/app/Controllers/Activity.php @@ -41,7 +41,7 @@ class Activity extends BaseController SUM( IF( browser LIKE "%Safari%", 1, 0 ) ) AS safari, SUM( IF( browser LIKE "%Internet Explorer%", 1, 0 ) ) AS ie, SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge, - SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('activity.user',$session->get('token'))->first(); + SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('auth_activity.user',$session->get('token'))->first(); $data['all'] = ""; echo view(getenv('theme.path').'main/header'); echo view(getenv('theme.path').'form/activity/index',$data); diff --git a/ci4/app/Controllers/Ajax.php b/ci4/app/Controllers/Ajax.php index 0de78ad5..e044c218 100644 --- a/ci4/app/Controllers/Ajax.php +++ b/ci4/app/Controllers/Ajax.php @@ -231,41 +231,41 @@ class Ajax extends ResourceController //Total number of records without filtering if($session->get('dashboard')=='admin' && !empty($all)){ $totalRecords = $this->activity_model->select('id_activity') - ->join('user','user.token = activity.user') + ->join('auth_user','auth_user.token = auth_activity.user') ->countAllResults(); }else{ $totalRecords = $this->activity_model->select('id_activity') - ->join('user','user.token = activity.user') - ->where('activity.user',$session->get('token')) + ->join('auth_user','auth_user.token = auth_activity.user') + ->where('auth_activity.user',$session->get('token')) ->countAllResults(); } //Total number of records with filtering if($session->get('dashboard')=='admin' && !empty($all)){ $totalRecordwithFilter = $this->activity_model->select('id_activity') - ->join('user','user.token = activity.user') + ->join('auth_user','auth_user.token = auth_activity.user') ->orLike('first_name', $searchValue) ->countAllResults(); }else{ $totalRecordwithFilter = $this->activity_model->select('id_activity') - ->join('user','user.token = activity.user') + ->join('auth_user','auth_user.token = auth_activity.user') ->orLike('first_name', $searchValue) - ->where('activity.user',$session->get('token')) + ->where('auth_activity.user',$session->get('token')) ->countAllResults(); } //Fetch records if($session->get('dashboard')=='admin' && !empty($all)){ - $records = $this->activity_model->select('activity.*,concat(first_name, " (",email, ")") AS name') - ->join('user','user.token = activity.user') + $records = $this->activity_model->select('auth_activity.*,concat(first_name, " (",email, ")") AS name') + ->join('auth_user','auth_user.token = auth_activity.user') ->orLike('first_name', $searchValue) ->orderBy($columnName,$columnSortOrder) ->findAll($rowperpage, $start); }else{ - $records = $this->activity_model->select('activity.*,concat(first_name, " (",email, ")") AS name') - ->join('user','user.token = activity.user') + $records = $this->activity_model->select('auth_activity.*,concat(first_name, " (",email, ")") AS name') + ->join('auth_user','auth_user.token = auth_activity.user') ->orLike('first_name', $searchValue) - ->where('activity.user',$session->get('token')) + ->where('auth_activity.user',$session->get('token')) ->orderBy($columnName,$columnSortOrder) ->findAll($rowperpage, $start); } diff --git a/ci4/app/Controllers/Produccion/Pedido.php b/ci4/app/Controllers/Produccion/Pedidoproduccion.php similarity index 87% rename from ci4/app/Controllers/Produccion/Pedido.php rename to ci4/app/Controllers/Produccion/Pedidoproduccion.php index 83a4ff16..4963db91 100644 --- a/ci4/app/Controllers/Produccion/Pedido.php +++ b/ci4/app/Controllers/Produccion/Pedidoproduccion.php @@ -4,7 +4,7 @@ namespace App\Controllers\Produccion; use App\Controllers\BaseController; -class Pedido extends BaseController +class Pedidoproduccion extends BaseController { function __construct() { diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php index 22a38641..dd9bc3e0 100644 --- a/ci4/app/Helpers/general_helper.php +++ b/ci4/app/Helpers/general_helper.php @@ -146,23 +146,87 @@ function getIgnoreMethod($method) function getDictionary($word=''){ try { $dictionary = [ - 'Group' => lang("App.group_rules_label_group"), - 'User' => lang("App.group_rules_label_user"), - 'Settings' => lang("App.group_rules_label_settings"), - 'index' => lang("App.group_rules_label_index"), - 'add' => lang("App.group_rules_label_add"), - 'edit' => lang("App.group_rules_label_edit"), - 'delete' => lang("App.group_rules_label_delete"), - 'store' => lang("App.group_rules_label_store"), + 'index' => lang("App.permisos_index"), + 'view' => lang("App.permisos_view"), + 'add' => lang("App.permisos_add"), + 'edit' => lang("App.permisos_editar"), + 'delete' => lang("App.permisos_del"), + 'store' => lang("App.permisos_save"), + 'import' => lang("App.permisos_import"), + 'export' => lang("App.permisos_export"), + + 'Profile' => lang("App.permisos_perfil"), + 'Activity' => lang("App.permisos_actividad"), + 'Settings' => lang("App.permisos_configuracion"), + 'my' => lang("App.permisos_my"), + 'Notification' => lang("App.permisos_notificacion"), + + 'Usuarios' => lang("App.permisos_usuarios"), + 'Usuario' => lang("App.permisos_usuario"), + 'Group' => lang("App.permisos_roles"), + + 'Logistica' => lang("App.permisos_logistica"), + + 'Tarifas' => lang("App.permisos_tarifas"), + 'Tarifapreimpresion' => lang("App.permisos_tarifapreimpresion"), + 'Tarifamanipulado' => lang("App.permisos_tarifamanipulado"), + 'Tarifapapelcompra' => lang("App.permisos_tarifapapelcompra"), + 'Tarifaacabado' => lang("App.permisos_tarifaacabado"), + 'Tarifapapeldefecto' => lang("App.permisos_tarifapapeldefecto"), + 'Tarifaenvio' => lang("App.permisos_tarifaenvio"), + 'Tarifaimpresion' => lang("App.permisos_tarifaimpresion"), + + 'Configuracion' => lang("App.permisos_configuracion"), + 'Tareaservicio' => lang("App.permisos_tareasservicio"), + 'Formaspago' => lang("App.permisos_formaspago"), + 'Papelgenerico' => lang("App.permisos_papelgenerico"), + 'Tiposimpresion' => lang("App.permisos_tiposimpresion"), + 'Trabajo' => lang("App.permisos_trabajo"), + 'Maquina' => lang("App.permisos_maquina"), + 'Tamaniolibros' => lang("App.permisos_tamaniolibros"), + 'Imposiciones' => lang("App.permisos_imposiciones"), + 'Serie' => lang("App.permisos_serie"), + 'Tamanioformatos' => lang("App.permisos_tamanioformatos"), + 'Serviciocliente' => lang("App.permisos_serviciocliente"), + 'Calendario' => lang("App.permisos_calendario"), + 'Correo' => lang("App.permisos_correo"), + + 'Presupuestos' => lang("App.permisos_presupuestos"), + 'Presupuesto' => lang("App.permisos_presupuestos"), + 'Presupuestomaquetacion' => lang("App.permisos_presupuestomaquetacion"), + + 'Catalogo' => lang("App.permisos_catalogo"), + + 'Clientes' => lang("App.permisos_clientes"), + 'Tarifacliente' => lang("App.permisos_tarifacliente"), + + 'Proveedores' => lang("App.permisos_proveedores"), + 'Proveedor' => lang("App.permisos_proveedores"), + + 'Informes' => lang("App.permisos_informes"), + 'Informe' => lang("App.permisos_informes"), + + 'Facturacion' => lang("App.permisos_facturación"), + 'Albaran' => lang("App.permisos_albaran"), + 'Factura' => lang("App.permisos_facturas"), + + 'Pedidos' => lang("App.permisos_pedidos"), + 'Pedido' => lang("App.permisos_pedidos"), + + 'Digitalizacion' => lang("App.permisos_digitalización"), + + 'Produccion' => lang("App.permisos_produccion"), + 'Ordentrabajomaquetacion' => lang("App.permisos_ordentrabajomaquetacion"), + 'Ordenmaquina' => lang("App.permisos_ordenmaquina"), + 'Pedidoproduccion' => lang("App.permisos_pedidoproduccion"), + 'Ordentrabajo' => lang("App.permisos_ordentrabajo"), + 'oauth' => lang("App.group_rules_label_oauth"), 'template' => lang("App.group_rules_label_template"), 'all' => lang("App.group_rules_label_all"), - 'my' => lang("App.group_rules_label_my"), - 'view' => lang("App.group_rules_label_view"), 'oauth_store' => lang("App.group_rules_label_oauth_store"), 'template_store' => lang("App.group_rules_label_template_store"), - 'Tarifas' => 'Tarifas', - 'ImpresionCliente' => 'Cliente' + ]; return array_key_exists($word,$dictionary)?$dictionary[$word] : $word; } catch (Exception $e) { diff --git a/ci4/app/Language/en/App.php b/ci4/app/Language/en/App.php index 78bd2f17..58628bc5 100644 --- a/ci4/app/Language/en/App.php +++ b/ci4/app/Language/en/App.php @@ -323,6 +323,7 @@ return [ "group_rules_dashboard_r" => "The panel field is mandatory!", // GROUP - Rules Name + /* JJO "group_rules_label_group" => "Group Permission", "group_rules_label_user" => "User", "group_rules_label_settings" => "Settings", @@ -338,6 +339,7 @@ return [ "group_rules_label_view" => "View Notification", "group_rules_label_oauth_store" => "Save oAuth", "group_rules_label_template_store" => "Save Templates", + */ // AUTH - index "oauth_title" => "oAuth Authentication", @@ -599,4 +601,83 @@ return [ // v1.2.1 "global_select" => "Select an item", + + /** + * + * SAFEKAT + * + */ + + // NOMBRES DE LOS PERMISOS + "permisos_index" => "List", + "permisos_view" => "View", + "permisos_add" => "Add", + "permisos_editar" => "Edit", + "permisos_save" => "Save", + "permisos_del" => "Delete", + "permisos_export" => "Export", + "permisos_import" => "Import", + + "permisos_general" => "General", + "permisos_perfil" => "Profile", + "permisos_actividad" => "Activity", + "permisos_configuracion" => "Configuration", + "permisos_my" => "My", + "permisos_notificacion" => "Notification", + + "permisos_usuarios" => "Users", + "permisos_usuario" => "User", + "permisos_roles" => "Roles", + + "permisos_logistica" => "Logistics", + + "permisos_tarifas" => "Rates", + "permisos_tarifapreimpresion" => "Preprinting", + "permisos_tarifamanipulado" => "Handling", + "permisos_tarifapapelcompra" => "Paper", + "permisos_tarifaacabado" => "Finish", + "permisos_tarifapapeldefecto" => "Default paper", + "permisos_tarifaenvio" => "Shipping", + "permisos_tarifaimpresion" => "Printing", + + "permisos_configuracion" => "Configuration", + "permisos_tareasservicio" => "Service tasks", + "permisos_formaspago" => "Payment methods", + "permisos_papelgenerico" => "Generic paper", + "permisos_tiposimpresion" => "Printing types", + "permisos_trabajo" => "Work", + "permisos_maquina" => "Machine", + "permisos_tamaniolibros" => "Books size", + "permisos_imposiciones" => "Impositions", + "permisos_serie" => "Serie", + "permisos_tamanioformatos" => "Format size", + "permisos_serviciocliente" => "Customer service", + "permisos_calendario" => "Calendar", + "permisos_correo" => "Mail", + + "permisos_presupuestos" => "Budgets", + "permisos_presupuestomaquetacion" => "Layout", + + "permisos_catalogo" => "Catalogue", + + "permisos_clientes" => "Customers", + "permisos_tarifacliente" => "Customer fee", + + "permisos_proveedores" => "Providers", + + "permisos_informes" => "Reports", + + "permisos_facturación" => "Billing", + "permisos_albaran" => "Deluvery note", + "permisos_facturas" => "Invoices", + + "permisos_pedidos" => "Orders", + + "permisos_digitalización" => "Digitalisation", + + "permisos_produccion" => "Production", + "permisos_ordentrabajomaquetacion" => "Layout work order", + "permisos_ordenmaquina" => "Machine order", + "permisos_pedidoproduccion" => "Orders", + "permisos_ordentrabajo" => "Work order", ]; \ No newline at end of file diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index 6789e99d..0226a819 100644 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -323,6 +323,7 @@ return [ "group_rules_dashboard_r" => "¡El campo del panel es obligatorio!", // GROUP - Rules Name + /* JJO "group_rules_label_group" => "Permiso de grupo", "group_rules_label_user" => "Usuario", "group_rules_label_settings" => "Configuración", @@ -338,6 +339,7 @@ return [ "group_rules_label_view" => "Ver notificación", "group_rules_label_oauth_store" => "Guardar oAuth", "group_rules_label_template_store" => "Guardar plantillas", + */ // AUTH - index "oauth_title" => "Autenticación oAuth", @@ -599,4 +601,83 @@ return [ // v1.2.1 "global_select" => "Selecciona un artículo", + + /** + * + * SAFEKAT + * + */ + + // NOMBRES DE LOS PERMISOS + "permisos_index" => "Listar", + "permisos_view" => "Ver", + "permisos_add" => "Añadir", + "permisos_editar" => "Editar", + "permisos_save" => "Guardar", + "permisos_del" => "Eliminar", + "permisos_export" => "Exportar", + "permisos_import" => "Importar", + + "permisos_general" => "General", + "permisos_perfil" => "Perfil", + "permisos_actividad" => "Actividad", + "permisos_configuracion" => "Configuración", + "permisos_my" => "My", + "permisos_notificacion" => "Notificacion", + + "permisos_usuarios" => "Usuarios", + "permisos_usuario" => "Usuario", + "permisos_roles" => "Roles", + + "permisos_logistica" => "Logística", + + "permisos_tarifas" => "Tarifas", + "permisos_tarifapreimpresion" => "Preimpresión", + "permisos_tarifamanipulado" => "Manipulado", + "permisos_tarifapapelcompra" => "Papel compra", + "permisos_tarifaacabado" => "Acabado", + "permisos_tarifapapeldefecto" => "Papel defecto", + "permisos_tarifaenvio" => "Envío", + "permisos_tarifaimpresion" => "Impresión", + + "permisos_configuracion" => "Configuración", + "permisos_tareasservicio" => "Tareas servicio", + "permisos_formaspago" => "Formas de pago", + "permisos_papelgenerico" => "Papel genérico", + "permisos_tiposimpresion" => "Tipos de impresión", + "permisos_trabajo" => "Trabajo", + "permisos_maquina" => "Máquina", + "permisos_tamaniolibros" => "Tamaño libros", + "permisos_imposiciones" => "Imposiciones", + "permisos_serie" => "Serie", + "permisos_tamanioformatos" => "Tamaño de formatos", + "permisos_serviciocliente" => "Servicio cliente", + "permisos_calendario" => "Calendario", + "permisos_correo" => "Correo", + + "permisos_presupuestos" => "Presupuestos", + "permisos_presupuestomaquetacion" => "Maquetación", + + "permisos_catalogo" => "Catálogo", + + "permisos_clientes" => "Clientes", + "permisos_tarifacliente" => "Tarifas cliente", + + "permisos_proveedores" => "Proveedores", + + "permisos_informes" => "Informes", + + "permisos_facturación" => "Facturación", + "permisos_albaran" => "Albarán", + "permisos_facturas" => "Facturas", + + "permisos_pedidos" => "Pedidos", + + "permisos_digitalización" => "Digitalización", + + "permisos_produccion" => "Producción", + "permisos_ordentrabajomaquetacion" => "Orden de trabajo maquetación", + "permisos_ordenmaquina" => "Orden máquina", + "permisos_pedidoproduccion" => "Pedidos", + "permisos_ordentrabajo" => "Orden de trabajo", ]; \ No newline at end of file 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 795eb819..00f7dd80 100644 --- a/ci4/app/Views/themes/backend/focus2/form/group/form.php +++ b/ci4/app/Views/themes/backend/focus2/form/group/form.php @@ -61,10 +61,34 @@
+
+
+

+
+
+
+ + +
+

+ + +
+ + +
+ + +
+ + +
+
+
-

+