From b3cc82636d8cbf4b05e488ed14f3a75f0f2f99fa Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Fri, 14 Feb 2025 12:14:23 +0100 Subject: [PATCH 1/9] empezada la estructura de tickets --- ci4/app/Config/Routes.php | 16 ++ .../Controllers/Soporte/Ticketcontroller.php | 189 ++++++++++++++++++ ...025-02-14-114500_create_tickets_system.php | 80 ++++++++ ci4/app/Entities/Soporte/TicketEntity.php | 52 +++++ ci4/app/Language/es/App.php | 4 + ci4/app/Language/es/Tickets.php | 9 + ci4/app/Models/Soporte/ticketModel.php | 26 +++ .../vuexy/form/soporte/viewTicketForm.php | 50 +++++ .../vuexy/form/soporte/viewTicketList.php | 0 .../themes/vuexy/main/menu_impresion.php | 2 + .../themes/vuexy/main/menus/soporte_menu.php | 22 ++ 11 files changed, 450 insertions(+) create mode 100644 ci4/app/Controllers/Soporte/Ticketcontroller.php create mode 100644 ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php create mode 100644 ci4/app/Entities/Soporte/TicketEntity.php create mode 100644 ci4/app/Language/es/Tickets.php create mode 100644 ci4/app/Models/Soporte/ticketModel.php create mode 100644 ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php create mode 100644 ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php create mode 100644 ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 3b03dfa2..264e3ad3 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -909,6 +909,22 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route }); +$routes->group('messages', ['namespace' => 'App\Controllers\Chat'], function ($routes) { + $routes->get('datatable', 'ChatController::datatable_messages', ['as' => 'getDatatableMessages']); + $routes->get('datatable/presupuesto', 'ChatController::datatable_presupuesto_messages', ['as' => 'getDatatablePresupuestoMessages']); + $routes->get('datatable/pedido', 'ChatController::datatable_pedido_messages', ['as' => 'getDatatablePedidoMessages']); + $routes->get('datatable/factura', 'ChatController::datatable_factura_messages', ['as' => 'getDatatableFacturaMessages']); + + $routes->post('direct', 'ChatController::store_new_direct_message', ['as' => 'storeNewDirectMessage']); + $routes->post('direct/client', 'ChatController::store_new_direct_message_client', ['as' => 'storeNewDirectMessageClient']); +}); + + +$routes->group('soporte', ['namespace' => 'App\Controllers\Soporte'], function ($routes) { + $routes->get('', 'Ticketcontroller::index', ['as' => 'TicketIndex']); + $routes->get('add', 'Ticketcontroller::add', ['as' => 'NewTicket']); +}); + $routes->group('produccion', ['namespace' => 'App\Controllers\Produccion'], function ($routes) { $routes->group('ordentrabajo', ['namespace' => 'App\Controllers\Produccion'], function ($routes) { diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php new file mode 100644 index 00000000..7e47dbe1 --- /dev/null +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -0,0 +1,189 @@ +viewData['pageTitle'] = lang('Tickets.moduleTitle'); + + // Breadcrumbs + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_soporte"), 'route' => "javascript:void(0);", 'active' => false], + ['title' => lang("App.menu_ticket_list"), 'route' => route_to('TicketIndex'), 'active' => true] + ]; + + parent::initController($request, $response, $logger); + + } + + public function index() + { + //checkPermission('tickets.menu'); + + $this->viewData['usingClientSideDataTable'] = true; + + $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tarifaextra.tarifaextra')]); + parent::index(); + + } + + public function add() + { + + //checkPermission('tickets.create', $this->indexRoute); + + if ($this->request->getPost()) : + + $nullIfEmpty = false; // !(phpversion() >= '8.1'); + + $postData = $this->request->getPost(); + $sanitizedData = $this->sanitized($postData, $nullIfEmpty); + + + $noException = true; + if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : + + + if ($this->canValidate()) : + try { + $successfulResult = $this->model->skipValidation(true)->save($sanitizedData); + } catch (\Exception $e) { + $noException = false; + $this->dealWithException($e); + } + else: + $this->viewData['errorMessage'] = lang('Basic.global.formErr1', [lang('Basic.global.record')]); + $this->session->setFlashdata('formErrors', $this->model->errors()); + endif; + + $thenRedirect = true; // Change this to false if you want your user to stay on the form after submission + endif; + if ($noException && $successfulResult) : + + $id = $this->model->db->insertID(); + + $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.'; + + if ($thenRedirect) : + if (!empty($this->indexRoute)) : + return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message); + else: + return $this->redirect2listView('successMessage', $message); + endif; + else: + $this->session->setFlashData('sweet-success', $message); + endif; + + endif; // $noException && $successfulResult + + endif; // ($requestMethod === 'post') + + $this->viewData['ticketEntity'] = isset($sanitizedData) ? new TicketEntity($sanitizedData) : new TicketEntity(); + + $this->viewData['formAction'] = route_to('NewTicket'); + + $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaextra.tarifaextra') . ' ' . lang('Basic.global.addNewSuffix'); + + + return $this->displayForm(__METHOD__); + } // end function add() + + public function edit($requestedId = null) + { + /* + checkPermission('tarifa-extra.edit', $this->indexRoute); + + if ($requestedId == null) : + return $this->redirect2listView(); + endif; + $id = filter_var($requestedId, FILTER_SANITIZE_URL); + $tarifaextraEntity = $this->model->find($id); + + if ($tarifaextraEntity == false) : + $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Tarifaextra.tarifaextra')), $id]); + return $this->redirect2listView('errorMessage', $message); + endif; + + if ($this->request->getPost()) : + + $postData = $this->request->getPost(); + $sanitizedData = $this->sanitized($postData, true); + + // JJO + if (isset($this->model->user_updated_id)) { + $sanitizedData['user_updated_id'] = auth()->user()->id; + } + if ($this->request->getPost('mostrar_en_presupuesto') == null) { + $sanitizedData['mostrar_en_presupuesto'] = false; + } + + $noException = true; + if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : + if ($this->canValidate()) : + try { + $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData); + } catch (\Exception $e) { + $noException = false; + $this->dealWithException($e); + } + else: + $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Tarifaextra.tarifaextra'))]); + $this->session->setFlashdata('formErrors', $this->model->errors()); + + endif; + + $tarifaextraEntity->fill($sanitizedData); + + $thenRedirect = false; + endif; + if ($noException && $successfulResult) : + $id = $tarifaextraEntity->id ?? $id; + $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.'; + + if ($thenRedirect) : + if (!empty($this->indexRoute)) : + return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message); + else: + return $this->redirect2listView('successMessage', $message); + endif; + else: + $this->session->setFlashData('sweet-success', $message); + endif; + + endif; // $noException && $successfulResult + endif; // ($requestMethod === 'post') + + $this->viewData['tarifaextraEntity'] = $tarifaextraEntity; + + $this->viewData['formAction'] = route_to('updateTarifaextra', $id); + + $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Tarifaextra.tarifaextra') . ' ' . lang('Basic.global.edit3'); + + + return $this->displayForm(__METHOD__, $id); + */ + } // end function edit(...) + +} diff --git a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php new file mode 100644 index 00000000..bfcd870e --- /dev/null +++ b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php @@ -0,0 +1,80 @@ +forge->addField([ + 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], + 'nombre' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], + ]); + $this->forge->addPrimaryKey('id'); + $this->forge->createTable('categorias'); + + // Tabla de Estados + $this->forge->addField([ + 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], + 'nombre' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], + ]); + $this->forge->addPrimaryKey('id'); + $this->forge->createTable('estados'); + + // Tabla de Tickets + $this->forge->addField([ + 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], + 'usuario_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'categoria_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'estado_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'prioridad' => ['type' => 'ENUM', 'constraint' => ['alta', 'media', 'baja'], 'default' => 'media'], + 'titulo' => ['type' => 'VARCHAR', 'constraint' => 255], + 'descripcion' => ['type' => 'TEXT'], + 'created_at' => ['type' => 'DATETIME', 'null' => true], + 'updated_at' => ['type' => 'DATETIME', 'null' => true], + ]); + $this->forge->addPrimaryKey('id'); + $this->forge->addForeignKey('usuario_id', 'users', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('categoria_id', 'categorias', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('estado_id', 'estados', 'id', 'CASCADE', 'CASCADE'); + $this->forge->createTable('tickets'); + + // Tabla de Respuestas + $this->forge->addField([ + 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], + 'ticket_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'usuario_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'mensaje' => ['type' => 'TEXT'], + 'created_at' => ['type' => 'DATETIME', 'null' => true], + ]); + $this->forge->addPrimaryKey('id'); + $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('usuario_id', 'users', 'id', 'CASCADE', 'CASCADE'); + $this->forge->createTable('respuestas'); + + // Tabla de Adjuntos + $this->forge->addField([ + 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], + 'ticket_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'null' => true], + 'respuesta_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'null' => true], + 'archivo' => ['type' => 'VARCHAR', 'constraint' => 255], + 'created_at' => ['type' => 'DATETIME', 'null' => true], + ]); + $this->forge->addPrimaryKey('id'); + $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('respuesta_id', 'respuestas', 'id', 'CASCADE', 'CASCADE'); + $this->forge->createTable('adjuntos'); + } + + public function down() + { + $this->forge->dropTable('adjuntos'); + $this->forge->dropTable('respuestas'); + $this->forge->dropTable('tickets'); + $this->forge->dropTable('categorias'); + $this->forge->dropTable('estados'); + } +} diff --git a/ci4/app/Entities/Soporte/TicketEntity.php b/ci4/app/Entities/Soporte/TicketEntity.php new file mode 100644 index 00000000..192e8d51 --- /dev/null +++ b/ci4/app/Entities/Soporte/TicketEntity.php @@ -0,0 +1,52 @@ + null, + 'usuario_id' => null, + 'tecnico_id' => null, + 'categoria_id'=> null, + 'estado_id' => null, + 'prioridad' => 'media', + 'titulo' => '', + 'descripcion' => '', + 'created_at' => null, + 'updated_at' => null, + ]; + + protected $dates = ['created_at', 'updated_at']; + + public function setTitulo(string $titulo) + { + $this->attributes['titulo'] = ucfirst($titulo); // Capitaliza el título + return $this; + } + + public function setDescripcion(string $descripcion) + { + $this->attributes['descripcion'] = ucfirst($descripcion); + return $this; + } + + public function getPrioridad(): string + { + return ucfirst($this->attributes['prioridad']); + } + + public function asignarTecnico(int $tecnicoId) + { + $this->attributes['tecnico_id'] = $tecnicoId; + return $this; + } + + public function cambiarEstado(int $estadoId) + { + $this->attributes['estado_id'] = $estadoId; + return $this; + } +} diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index 44552d73..a24597ea 100755 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -818,5 +818,9 @@ return [ "menu_oauth" => "Autenticaciones", "menu_template" => "Plantillas", + "menu_soporte" => "Soporte", + "menu_soporte_new_ticket" => "Crear ticket", + "menu_soporte_ticket_list" => "Mis tickets", + ]; \ No newline at end of file diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php new file mode 100644 index 00000000..679055f3 --- /dev/null +++ b/ci4/app/Language/es/Tickets.php @@ -0,0 +1,9 @@ + 'Ticket', + 'tickets' => 'Tickets', + 'moduleTitle' => 'Tickets', +]; diff --git a/ci4/app/Models/Soporte/ticketModel.php b/ci4/app/Models/Soporte/ticketModel.php new file mode 100644 index 00000000..7e2cc18a --- /dev/null +++ b/ci4/app/Models/Soporte/ticketModel.php @@ -0,0 +1,26 @@ +select('tickets.*, users.nombre as usuario, categorias.nombre as categoria, estados.nombre as estado') + ->join('users', 'users.id = tickets.usuario_id') + ->join('categorias', 'categorias.id = tickets.categoria_id') + ->join('estados', 'estados.id = tickets.estado_id') + ->findAll(); + } + + return $this->find($id); + } +} diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php new file mode 100644 index 00000000..1003598d --- /dev/null +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -0,0 +1,50 @@ +include('themes/_commonPartialsBs/datatables') ?> +extend('themes/vuexy/main/defaultlayout') ?> +section('content'); ?> + +
+
+
+
+

Crear Ticket

+
+
+
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+
+
+
+
+ +endSection(); ?> diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php new file mode 100644 index 00000000..e69de29b diff --git a/ci4/app/Views/themes/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/vuexy/main/menu_impresion.php index 2ba24ff5..fc43702e 100644 --- a/ci4/app/Views/themes/vuexy/main/menu_impresion.php +++ b/ci4/app/Views/themes/vuexy/main/menu_impresion.php @@ -48,6 +48,8 @@ require "menus/mensajes_menu.php"; + require "menus/soporte_menu.php"; + require "menus/sistema_menu.php"; ?> diff --git a/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php b/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php new file mode 100644 index 00000000..91f1ec7b --- /dev/null +++ b/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php @@ -0,0 +1,22 @@ + +
  • + + + + + +
    • From a616ec7ba7fce2d657a2371905d6b9bd7f0d35b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Fri, 14 Feb 2025 23:45:28 +0100 Subject: [PATCH 2/9] =?UTF-8?q?trabajando=20en=20el=20formulario=20de=20a?= =?UTF-8?q?=C3=B1adir?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Soporte/Ticketcontroller.php | 6 +- ...025-02-14-114500_create_tickets_system.php | 34 ++++--- ci4/app/Database/Seeds/TicketsSeeder.php | 60 ++++++++++++ ci4/app/Language/es/Tickets.php | 31 ++++++ ci4/app/Models/Soporte/ticketModel.php | 47 ++++++++- .../vuexy/form/soporte/viewTicketForm.php | 95 +++++++++++++------ .../themes/vuexy/main/menus/soporte_menu.php | 2 +- 7 files changed, 225 insertions(+), 50 deletions(-) create mode 100644 ci4/app/Database/Seeds/TicketsSeeder.php diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 7e47dbe1..32cadbbb 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -31,7 +31,7 @@ class Ticketcontroller extends \App\Controllers\GoBaseController // Breadcrumbs $this->viewData['breadcrumb'] = [ ['title' => lang("App.menu_soporte"), 'route' => "javascript:void(0);", 'active' => false], - ['title' => lang("App.menu_ticket_list"), 'route' => route_to('TicketIndex'), 'active' => true] + ['title' => lang("App.menu_soporte_ticket_list"), 'route' => route_to('TicketIndex'), 'active' => true] ]; parent::initController($request, $response, $logger); @@ -104,6 +104,10 @@ class Ticketcontroller extends \App\Controllers\GoBaseController $this->viewData['formAction'] = route_to('NewTicket'); + $this->viewData['categorias'] = $this->model->getCategorias(); + $this->viewData['estados'] = $this->model->getEstados(); + $this->viewData['secciones'] = $this->model->getSecciones(); + $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaextra.tarifaextra') . ' ' . lang('Basic.global.addNewSuffix'); diff --git a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php index bfcd870e..f93d609c 100644 --- a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php +++ b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php @@ -11,18 +11,26 @@ class CreateTicketsSystem extends Migration // Tabla de Categorías $this->forge->addField([ 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], - 'nombre' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], + 'keyword' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], ]); $this->forge->addPrimaryKey('id'); - $this->forge->createTable('categorias'); + $this->forge->createTable('tickets_categorias'); + + // Tabla de secciones + $this->forge->addField([ + 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], + 'keyword' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], + ]); + $this->forge->addPrimaryKey('id'); + $this->forge->createTable('tickets_secciones'); // Tabla de Estados $this->forge->addField([ 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], - 'nombre' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], + 'keyword' => ['type' => 'VARCHAR', 'constraint' => 100, 'unique' => true], ]); $this->forge->addPrimaryKey('id'); - $this->forge->createTable('estados'); + $this->forge->createTable('tickets_estados'); // Tabla de Tickets $this->forge->addField([ @@ -38,8 +46,8 @@ class CreateTicketsSystem extends Migration ]); $this->forge->addPrimaryKey('id'); $this->forge->addForeignKey('usuario_id', 'users', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('categoria_id', 'categorias', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('estado_id', 'estados', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('categoria_id', 'tickets_categorias', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('estado_id', 'tickets_estados', 'id', 'CASCADE', 'CASCADE'); $this->forge->createTable('tickets'); // Tabla de Respuestas @@ -53,7 +61,7 @@ class CreateTicketsSystem extends Migration $this->forge->addPrimaryKey('id'); $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'CASCADE', 'CASCADE'); $this->forge->addForeignKey('usuario_id', 'users', 'id', 'CASCADE', 'CASCADE'); - $this->forge->createTable('respuestas'); + $this->forge->createTable('tickets_respuestas'); // Tabla de Adjuntos $this->forge->addField([ @@ -65,16 +73,16 @@ class CreateTicketsSystem extends Migration ]); $this->forge->addPrimaryKey('id'); $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('respuesta_id', 'respuestas', 'id', 'CASCADE', 'CASCADE'); - $this->forge->createTable('adjuntos'); + $this->forge->addForeignKey('respuesta_id', 'tickets_respuestas', 'id', 'CASCADE', 'CASCADE'); + $this->forge->createTable('tickets_adjuntos'); } public function down() { - $this->forge->dropTable('adjuntos'); - $this->forge->dropTable('respuestas'); + $this->forge->dropTable('tickets_adjuntos'); + $this->forge->dropTable('tickets_respuestas'); $this->forge->dropTable('tickets'); - $this->forge->dropTable('categorias'); - $this->forge->dropTable('estados'); + $this->forge->dropTable('tickets_categorias'); + $this->forge->dropTable('tickets_estados'); } } diff --git a/ci4/app/Database/Seeds/TicketsSeeder.php b/ci4/app/Database/Seeds/TicketsSeeder.php new file mode 100644 index 00000000..3fd49111 --- /dev/null +++ b/ci4/app/Database/Seeds/TicketsSeeder.php @@ -0,0 +1,60 @@ + 'errores', + ], + [ + 'keyword' => 'consultas', + ], + [ + 'keyword' => 'sugerencias', + ], + ]; + $this->db->table('tickets_categorias')->insertBatch($data); + + // secciones + $data = [ + [ + 'keyword' => 'presupuestos', + ], + [ + 'keyword' => 'pedidos', + ], + [ + 'keyword' => 'facturacion', + ], + [ + 'keyword' => 'logistica', + ], + ]; + $this->db->table('tickets_secciones')->insertBatch($data); + + // estados + $data = [ + [ + 'keyword' => 'abierto', + ], + [ + 'keyword' => 'en_proceso', + ], + [ + 'keyword' => 'resuelto', + ], + [ + 'keyword' => 'archivado', + ], + ]; + $this->db->table('tickets_estados')->insertBatch($data); + } +} \ No newline at end of file diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index 679055f3..b3208387 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -6,4 +6,35 @@ return [ 'ticket' => 'Ticket', 'tickets' => 'Tickets', 'moduleTitle' => 'Tickets', + + "asunto" => "Asunto", + "tipo" => "Tipo", + "seccion" => "Sección", + "estado" => "Estado", + "prioridad" => "Prioridad", + "descripcion" => "Descripción", + "asignarTo" => "Asignado a", + "createTicket" => "Crear Ticket", + + // categorías + 'errores' => 'Errores', + 'consultas' => 'Consultas', + 'sugerencias' => 'Sugerencias', + + // secciones + 'presupuestos' => 'Presupuestos', + 'pedidos' => 'Pedidos', + 'facturacion' => 'Facturación', + 'logistica' => 'Logística', + + // estados + 'abierto' => 'Abierto', + 'en_proceso' => 'En proceso', + 'resuelto' => 'Resuelto', + 'archivado' => 'Archivado', + + //Prioridades + 'alta' => 'Alta', + 'media' => 'Media', + 'baja' => 'Baja', ]; diff --git a/ci4/app/Models/Soporte/ticketModel.php b/ci4/app/Models/Soporte/ticketModel.php index 7e2cc18a..43a0c71b 100644 --- a/ci4/app/Models/Soporte/ticketModel.php +++ b/ci4/app/Models/Soporte/ticketModel.php @@ -5,20 +5,57 @@ namespace App\Models\Soporte; class TicketModel extends \App\Models\BaseModel { - protected $table = 'tickets'; + + protected $table = 'tickets'; protected $primaryKey = 'id'; protected $allowedFields = ['usuario_id', 'tecnico_id', 'categoria_id', 'estado_id', 'prioridad', 'titulo', 'descripcion', 'created_at', 'updated_at']; protected $useTimestamps = true; + public function getEstados() + { + $values = $this->db->table('tickets_estados')->get()->getResultArray(); + $data = []; + + foreach ($values as $value) { + $data[$value['keyword']] = lang("Tickets." . $value['keyword']); + } + + return $data; + } + + public function getCategorias() + { + $values = $this->db->table('tickets_categorias')->get()->getResultArray(); + $data = []; + + foreach ($values as $value) { + $data[$value['keyword']] = lang("Tickets." . $value['keyword']); + } + + return $data; + } + + public function getSecciones() + { + $values = $this->db->table('tickets_secciones')->get()->getResultArray(); + $data = []; + + foreach ($values as $value) { + $data[$value['keyword']] = lang("Tickets." . $value['keyword']); + } + + return $data; + } + public function getTickets($id = null) { if ($id === null) { return $this->select('tickets.*, users.nombre as usuario, categorias.nombre as categoria, estados.nombre as estado') - ->join('users', 'users.id = tickets.usuario_id') - ->join('categorias', 'categorias.id = tickets.categoria_id') - ->join('estados', 'estados.id = tickets.estado_id') - ->findAll(); + ->join('users', 'users.id = tickets.usuario_id') + ->join('categorias', 'categorias.id = tickets.categoria_id') + ->join('estados', 'estados.id = tickets.estado_id') + ->findAll(); } return $this->find($id); diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php index 1003598d..8b814aae 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -1,9 +1,9 @@ -include('themes/_commonPartialsBs/datatables') ?> -extend('themes/vuexy/main/defaultlayout') ?> -section('content'); ?> +include('themes/_commonPartialsBs/datatables') ?> +extend('themes/vuexy/main/defaultlayout') ?> +section('content'); ?>
    -
    +

    Crear Ticket

    @@ -11,40 +11,75 @@
    - -
    - - + +
    +
    + + +
    +
    + +
    + +
    + + +
    + + +
    + + +
    + + +
    + + +
    + +
    + +
    +
    + + +
    + +
    + + +
    +
    - - + +
    -
    - - -
    - -
    - - -
    - - +
    -endSection(); ?> +endSection(); ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php b/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php index 91f1ec7b..aed71d1e 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php @@ -1,7 +1,7 @@
  • - +
      From 4a8aaf906c297e7d3b5f9bc66eb0ea3a25ef6c27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Sat, 15 Feb 2025 17:54:49 +0100 Subject: [PATCH 3/9] trabajando en la lista de tickets --- ci4/app/Config/RBAC/permissionMatrix.php | 7 +- ci4/app/Config/RBAC/permissions.php | 3 + ci4/app/Config/Routes.php | 2 + ci4/app/Controllers/Sistema/Intranet.php | 25 ++++ .../Controllers/Soporte/Ticketcontroller.php | 80 +++++++++++- ...025-02-14-114500_create_tickets_system.php | 26 ++-- ci4/app/Database/Seeds/TicketsSeeder.php | 16 +++ ci4/app/Language/es/RolesPermisos.php | 2 +- ci4/app/Language/es/Tickets.php | 7 + ci4/app/Models/Soporte/ticketFileModel.php | 11 ++ ci4/app/Models/Soporte/ticketModel.php | 71 +++++++--- .../vuexy/form/soporte/viewTicketForm.php | 123 ++++++++++++++---- .../vuexy/form/soporte/viewTicketList.php | 64 +++++++++ .../themes/vuexy/main/menus/soporte_menu.php | 2 +- .../js/safekat/pages/soporte/tickets.js | 98 ++++++++++++++ 15 files changed, 473 insertions(+), 64 deletions(-) create mode 100644 ci4/app/Models/Soporte/ticketFileModel.php create mode 100644 httpdocs/assets/js/safekat/pages/soporte/tickets.js diff --git a/ci4/app/Config/RBAC/permissionMatrix.php b/ci4/app/Config/RBAC/permissionMatrix.php index c13aa388..7506cfec 100644 --- a/ci4/app/Config/RBAC/permissionMatrix.php +++ b/ci4/app/Config/RBAC/permissionMatrix.php @@ -45,10 +45,6 @@ const SK_PERMISSION_MATRIX = [ "tarifa-encuadernacion.edit", "tarifa-encuadernacion.delete", "tarifa-encuadernacion.menu", - "tarifa-extra.create", - "tarifa-extra.edit", - "tarifa-extra.delete", - "tarifa-extra.menu", "tarifa-envio.create", "tarifa-envio.edit", "tarifa-envio.delete", @@ -93,6 +89,9 @@ const SK_PERMISSION_MATRIX = [ "roles-permisos.edit", "roles-permisos.delete", "roles-permisos.menu", + "tickets.create", + "tickets.edit", + "tickets.menu", ], "cliente-admin" => [ "presupuesto-cliente.create", diff --git a/ci4/app/Config/RBAC/permissions.php b/ci4/app/Config/RBAC/permissions.php index 4c640b77..35e8235f 100644 --- a/ci4/app/Config/RBAC/permissions.php +++ b/ci4/app/Config/RBAC/permissions.php @@ -93,4 +93,7 @@ const SK_PERMISSIONS = [ 'roles-permisos.edit' => 'Can edit', 'roles-permisos.delete' => 'Can delete', 'roles-permisos.menu' => 'Menu shall be visualize', + 'tickets.create' => 'Can create', + 'tickets.edit' => 'Can edit', + 'tickets.menu' => 'Menu shall be visualize', ]; diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 264e3ad3..aad9dcaf 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -923,6 +923,8 @@ $routes->group('messages', ['namespace' => 'App\Controllers\Chat'], function ($r $routes->group('soporte', ['namespace' => 'App\Controllers\Soporte'], function ($routes) { $routes->get('', 'Ticketcontroller::index', ['as' => 'TicketIndex']); $routes->get('add', 'Ticketcontroller::add', ['as' => 'NewTicket']); + $routes->post('add', 'Ticketcontroller::add', ['as' => 'createTicket']); + $routes->post('ticketlist', 'Ticketcontroller::datatable'); }); diff --git a/ci4/app/Controllers/Sistema/Intranet.php b/ci4/app/Controllers/Sistema/Intranet.php index 99d3b206..73aa48f2 100644 --- a/ci4/app/Controllers/Sistema/Intranet.php +++ b/ci4/app/Controllers/Sistema/Intranet.php @@ -32,4 +32,29 @@ class Intranet extends Controller } + function tickets($resource_name) + { + helper('file'); + + $resource_path = WRITEPATH . 'uploads/tickets/' . $resource_name; + + if (file_exists($resource_path)) { + // Get the mime type of the file + $mime_type = mime_content_type($resource_path); + + // Get an instance of the Response class + $response = service('response'); + + // Set the content type + $response->setContentType($mime_type); + + // Set the output + $response->setBody(file_get_contents($resource_path)); + + // Send the response to the browser + $response->send(); + } + + } + } \ No newline at end of file diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 32cadbbb..6b12717e 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -7,11 +7,10 @@ use App\Models\CategoriaModel; use App\Models\EstadoModel; use CodeIgniter\Controller; use App\Entities\Soporte\TicketEntity; +use App\Models\Soporte\ticketFileModel; class Ticketcontroller extends \App\Controllers\GoBaseController { - - protected static $primaryModelName = 'App\Models\Soporte\ticketModel'; protected static $singularObjectNameCc = 'ticket'; @@ -21,7 +20,7 @@ class Ticketcontroller extends \App\Controllers\GoBaseController protected static $viewPath = 'themes/vuexy/form/soporte/'; - protected $indexRoute = 'TicketIndex'; + protected $indexRoute = 'viewTicketList'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) @@ -44,7 +43,7 @@ class Ticketcontroller extends \App\Controllers\GoBaseController $this->viewData['usingClientSideDataTable'] = true; - $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tarifaextra.tarifaextra')]); + $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tickets.tickets')]); parent::index(); } @@ -53,14 +52,18 @@ class Ticketcontroller extends \App\Controllers\GoBaseController { //checkPermission('tickets.create', $this->indexRoute); - + if ($this->request->getPost()) : $nullIfEmpty = false; // !(phpversion() >= '8.1'); $postData = $this->request->getPost(); - $sanitizedData = $this->sanitized($postData, $nullIfEmpty); + // get user id + $postData['usuario_id'] = auth()->user()->id; + $postData['user_soporte_id'] = model('App\Models\Configuracion\ConfigVariableModel')->getVariable('default_soporte_user_id')->value; + + $sanitizedData = $this->sanitized($postData, $nullIfEmpty); $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -84,6 +87,34 @@ class Ticketcontroller extends \App\Controllers\GoBaseController $id = $this->model->db->insertID(); + $uploadPath = WRITEPATH . 'uploads/tickets/'; + + $fileModel = new ticketFileModel(); + $files = $this->request->getFiles(); + if ($files && isset($files['files'])) { + foreach ($files['files'] as $file) { + if ($file->isValid() && !$file->hasMoved()) { + $originalName = $file->getClientName(); + $fileExt = $file->getExtension(); + + // Generar hash SHA-256 basado en el contenido del archivo + $fileHash = hash_file("sha256", $file->getTempName()); + $newFileName = $fileHash . '.' . $fileExt; + + // Mover el archivo con el nombre basado en el hash + $file->move($uploadPath, $newFileName); + + // Guardar en la base de datos + $fileModel->insert([ + 'nombre' => $originalName, + 'ticket_id' => $id, + 'hash' => $fileHash, + 'path' => 'uploads/' . $newFileName + ]); + } + } + } + $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.'; if ($thenRedirect) : @@ -190,4 +221,41 @@ class Ticketcontroller extends \App\Controllers\GoBaseController */ } // end function edit(...) + public function datatable() + { + if ($this->request->isAJAX()) { + $reqData = $this->request->getPost(); + if (!isset($reqData['draw']) || !isset($reqData['columns'])) { + $errstr = 'No data available in response to this specific request.'; + $response = $this->respond(Collection::datatable([], 0, 0, $errstr), 400, $errstr); + return $response; + } + $start = $reqData['start'] ?? 0; + $length = $reqData['length'] ?? 5; + + $requestedOrder = $reqData['order'] ?? []; + + $searchValues = get_filter_datatables_columns($reqData); + + $resourceData = $this->model->getResource($searchValues, $cliente_id); + foreach ($requestedOrder as $order) { + $column = $order['column'] ?? 0; + $dir = $order['dir'] ?? 'asc'; + $orderColumn = $this->model::SORTABLE[$column] ?? null; + if ($orderColumn) { + $resourceData->orderBy($orderColumn, $dir); + } + } + $resourceData = $resourceData->limit($length, $start)->get()->getResultObject(); + + return $this->respond(Collection::datatable( + $resourceData, + $this->model->getResource($searchValues)->countAllResults(), + $this->model->getResource($searchValues)->countAllResults() + )); + } else { + return $this->failUnauthorized('Invalid request', 403); + } + } + } diff --git a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php index f93d609c..716bf956 100644 --- a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php +++ b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php @@ -36,8 +36,10 @@ class CreateTicketsSystem extends Migration $this->forge->addField([ 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], 'usuario_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'user_soporte_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], 'categoria_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], - 'estado_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'seccion_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], + 'estado_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'default' => 1], 'prioridad' => ['type' => 'ENUM', 'constraint' => ['alta', 'media', 'baja'], 'default' => 'media'], 'titulo' => ['type' => 'VARCHAR', 'constraint' => 255], 'descripcion' => ['type' => 'TEXT'], @@ -45,9 +47,11 @@ class CreateTicketsSystem extends Migration 'updated_at' => ['type' => 'DATETIME', 'null' => true], ]); $this->forge->addPrimaryKey('id'); - $this->forge->addForeignKey('usuario_id', 'users', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('categoria_id', 'tickets_categorias', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('estado_id', 'tickets_estados', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('usuario_id', 'users', 'id', 'NO ACTION', 'NO ACTION'); + $this->forge->addForeignKey('user_soporte_id', 'users', 'id', 'NO ACTION', 'NO ACTION'); + $this->forge->addForeignKey('categoria_id', 'tickets_categorias', 'id', 'NO ACTION', 'NO ACTION'); + $this->forge->addForeignKey('seccion_id', 'tickets_secciones', 'id', 'NO ACTION', 'NO ACTION'); + $this->forge->addForeignKey('estado_id', 'tickets_estados', 'id', 'NO ACTION', 'NO ACTION'); $this->forge->createTable('tickets'); // Tabla de Respuestas @@ -59,8 +63,8 @@ class CreateTicketsSystem extends Migration 'created_at' => ['type' => 'DATETIME', 'null' => true], ]); $this->forge->addPrimaryKey('id'); - $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('usuario_id', 'users', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('ticket_id', 'tickets', 'id', '', 'NO ACTION'); + $this->forge->addForeignKey('usuario_id', 'users', 'id', 'NO ACTION', 'NO ACTION'); $this->forge->createTable('tickets_respuestas'); // Tabla de Adjuntos @@ -68,12 +72,15 @@ class CreateTicketsSystem extends Migration 'id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'auto_increment' => true], 'ticket_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'null' => true], 'respuesta_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true, 'null' => true], - 'archivo' => ['type' => 'VARCHAR', 'constraint' => 255], + 'nombre' => ['type' => 'VARCHAR', 'constraint' => 255], + 'hash' => ['type' => 'VARCHAR', 'constraint' => 255], + 'path' => ['type' => 'VARCHAR', 'constraint' => 255], 'created_at' => ['type' => 'DATETIME', 'null' => true], + 'updated_at' => ['type' => 'DATETIME', 'null' => true], ]); $this->forge->addPrimaryKey('id'); - $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'CASCADE', 'CASCADE'); - $this->forge->addForeignKey('respuesta_id', 'tickets_respuestas', 'id', 'CASCADE', 'CASCADE'); + $this->forge->addForeignKey('ticket_id', 'tickets', 'id', 'NO ACTION', 'NO ACTION'); + $this->forge->addForeignKey('respuesta_id', 'tickets_respuestas', 'id', 'NO ACTION', 'NO ACTION'); $this->forge->createTable('tickets_adjuntos'); } @@ -84,5 +91,6 @@ class CreateTicketsSystem extends Migration $this->forge->dropTable('tickets'); $this->forge->dropTable('tickets_categorias'); $this->forge->dropTable('tickets_estados'); + $this->forge->dropTable('tickets_secciones'); } } diff --git a/ci4/app/Database/Seeds/TicketsSeeder.php b/ci4/app/Database/Seeds/TicketsSeeder.php index 3fd49111..f7d0ea93 100644 --- a/ci4/app/Database/Seeds/TicketsSeeder.php +++ b/ci4/app/Database/Seeds/TicketsSeeder.php @@ -37,6 +37,12 @@ class TicketsSeeder extends Seeder [ 'keyword' => 'logistica', ], + [ + 'keyword' => 'configuracion', + ], + [ + 'keyword' => 'general', + ], ]; $this->db->table('tickets_secciones')->insertBatch($data); @@ -56,5 +62,15 @@ class TicketsSeeder extends Seeder ], ]; $this->db->table('tickets_estados')->insertBatch($data); + + // config variables + $data = [ + [ + 'name' => 'default_soporte_user_id', + 'value' => '10', + 'description' => 'ID del usuario por defecto para asignar tickets', + ], + ]; + $this->db->table('config_variables_app')->insertBatch($data); } } \ No newline at end of file diff --git a/ci4/app/Language/es/RolesPermisos.php b/ci4/app/Language/es/RolesPermisos.php index 84e56b7f..ccc4176a 100644 --- a/ci4/app/Language/es/RolesPermisos.php +++ b/ci4/app/Language/es/RolesPermisos.php @@ -55,7 +55,7 @@ return [ 'ajustesSection' => 'Ajustes', 'actividadSection' => 'Accesos', - + "ticketsSection" => "Tickets", 'validation' => [ 'id' => [ diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index b3208387..26a17628 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -14,7 +14,9 @@ return [ "prioridad" => "Prioridad", "descripcion" => "Descripción", "asignarTo" => "Asignado a", + "usuario" => "Creado por", "createTicket" => "Crear Ticket", + "fechaCreacion" => "Fecha de creación", // categorías 'errores' => 'Errores', @@ -37,4 +39,9 @@ return [ 'alta' => 'Alta', 'media' => 'Media', 'baja' => 'Baja', + + // FIcheros + 'adjuntos' => 'Adjuntar imágenes', + 'adjuntos_main_text' => 'Arrastra y suelta las imágenes aquí o haz clic para subirlas', + ]; diff --git a/ci4/app/Models/Soporte/ticketFileModel.php b/ci4/app/Models/Soporte/ticketFileModel.php new file mode 100644 index 00000000..dbbd24e5 --- /dev/null +++ b/ci4/app/Models/Soporte/ticketFileModel.php @@ -0,0 +1,11 @@ + "t1.categoria_id", + 1 => "t1.seccion_id", + 2 => "t1.estado_id", + 3 => "t1.prioridad", + 4 => "t1.titulo", + 5 => "t1.usuario_id", + 6 => "t1.usuario_soporte_id", + 7 => "t1.created_at", + ]; + public function getEstados() { $values = $this->db->table('tickets_estados')->get()->getResultArray(); - $data = []; - - foreach ($values as $value) { - $data[$value['keyword']] = lang("Tickets." . $value['keyword']); + + for($i = 0; $i < count($values); $i++){ + $values[$i]['text'] = lang("Tickets." . $values[$i]['keyword']); } - return $data; + return $values; } public function getCategorias() { $values = $this->db->table('tickets_categorias')->get()->getResultArray(); - $data = []; - - foreach ($values as $value) { - $data[$value['keyword']] = lang("Tickets." . $value['keyword']); + + for($i = 0; $i < count($values); $i++){ + $values[$i]['text'] = lang("Tickets." . $values[$i]['keyword']); } - return $data; + return $values; } public function getSecciones() { $values = $this->db->table('tickets_secciones')->get()->getResultArray(); - $data = []; - foreach ($values as $value) { - $data[$value['keyword']] = lang("Tickets." . $value['keyword']); + for($i = 0; $i < count($values); $i++){ + $values[$i]['text'] = lang("Tickets." . $values[$i]['keyword']); } - return $data; + return $values; } public function getTickets($id = null) @@ -60,4 +68,37 @@ class TicketModel extends \App\Models\BaseModel return $this->find($id); } + + public function getResource($search = [], ) + { + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.id as id, t1.usuario_id AS usuario_id, CONCAT(t2.first_name, ' ', t2.last_name) AS usuario, + t1.user_soporte_id AS user_soporte_id, CONCAT(t2.first_name, ' ', t2.last_name) AS user_soporte, + t1.categoria_id AS categoria_id, t3.keyword AS categoria, t1.seccion_id AS seccion_id, t1.estado_id AS estado_id, + t1.prioridad AS prioridad, t1.titulo AS titulo, t1.created_at AS created_at + " + ); + + $builder->join("users t2", "t1.usuario_id = t2.id", "left"); + $builder->join("users t2", "t1.user_soporte_id = t2.id", "left"); + $builder->join("tickets_categorias t3", "t1.categoria_id = t3.id", "left"); + $builder->join("tickets_estados t4", "t1.estado_id = t4.id", "left"); + $builder->join("tickets_secciones t5", "t1.seccion_id = t5.id", "left"); + + if (empty($search)) + return $builder; + else { + $builder->groupStart(); + foreach ($search as $col_search) { + if ($col_search[0] > 0 && $col_search[0] < 4) + $builder->where(self::SORTABLE[$col_search[0]], $col_search[2]); + else + $builder->like(self::SORTABLE[$col_search[0]], $col_search[2]); + } + $builder->groupEnd(); + return $builder; + } + } } diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php index 8b814aae..ab8fa533 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -6,10 +6,10 @@
      -

      Crear Ticket

      +

      -
      +
      @@ -23,9 +23,9 @@
      - + +
      @@ -33,48 +33,104 @@
      - + +
      -
      - + +
      -
      -
      - - + user()->can('tickets.edit')): ?> + +
      +
      + + +
      + +
      + + +
      +
      -
      - - -
      - -
      +
      + + +
      +
      + + +
      +
      + + + + + + + + +
      @@ -82,4 +138,15 @@
      -endSection(); ?> \ No newline at end of file +endSection(); ?> + +section('css') ?> + +endSection() ?> + + +section('additionalExternalJs') ?> + + + +endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php index e69de29b..7fe03d7a 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php @@ -0,0 +1,64 @@ +include('themes/_commonPartialsBs/datatables') ?> +extend('themes/vuexy/main/defaultlayout') ?> +section('content')?> + +
      +
      + +
      +
      +

      + 'btn btn-primary float-end']); ?> +
      +
      + + + + + + + + + + + + + + + + + + + +
      ID
      +
      +
      + +
      +
      +
      +
      + +endSection() ?> + +section('css') ?> +"> +endSection() ?> + + +section('additionalExternalJs') ?> + + + + + + + + + +endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php b/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php index aed71d1e..be2b5866 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/soporte_menu.php @@ -13,7 +13,7 @@
    • - " class="menu-link"> + " class="menu-link">
      • diff --git a/httpdocs/assets/js/safekat/pages/soporte/tickets.js b/httpdocs/assets/js/safekat/pages/soporte/tickets.js new file mode 100644 index 00000000..b6567306 --- /dev/null +++ b/httpdocs/assets/js/safekat/pages/soporte/tickets.js @@ -0,0 +1,98 @@ +import Table from '../../components/table.js'; +import Ajax from '../../components/ajax.js'; + +/*$(function () { + + + +/* + document.querySelectorAll('[data-bs-toggle="lightbox"]').forEach(anchor => { + anchor.addEventListener('click', function (event) { + event.preventDefault(); + const imgSrc = this.getAttribute('href'); + document.getElementById('lightboxImage').src = imgSrc; + new bootstrap.Modal(document.getElementById('lightboxModal')).show(); + }); + }); +});*/ + + +class Ticket { + + constructor() { + + // check if url includes "add" + this.action = 'list'; + if(window.location.href.includes("add")) + this.action = "add"; + else if(window.location.href.includes("edit")) + this.action = "edit"; + + this.table = null; + + this.init(); + } + + + init() { + + if(this.action == "edit") { + + } + else if (this.action == "list") { + this.#initDatatable(); + } + } + + #initDatatable() { + + const self = this; + + const actions = ['view']; + const columns = [ + { 'data': 'id' }, + { 'data': 'categoria_id' }, + { 'data': 'seccion_id' }, + { 'data': 'estado_id' }, + { 'data': 'prioridad' }, + { 'data': 'titulo' }, + { 'data': 'usuario_id' }, + { 'data': 'user_soporte_id' }, + { 'data': 'created_at' }, + ]; + + this.table = new Table( + $('#tableOfTickets'), + 'tickets', + '/soporte/ticketlist', + columns, + ); + + this.table.init({ + actions: actions, + buttonsExport: true, + }); + + + this.tableTarifas.table.on('init.dt', function () { + self.tableTarifas.table.page.len(50).draw(); + }); + } +} + +document.addEventListener('DOMContentLoaded', function () { + + const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); + + new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Tickets'] }, {}, + function(translations) { + window.language = JSON.parse(translations); + new Ticket(); + }, + function (error) { + console.log("Error getting translations:", error); + } + ).post(); +}); + +export default Ticket; \ No newline at end of file From aff79ec3d6ca4681b872d58187353d0f664f285e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Sun, 16 Feb 2025 18:52:56 +0100 Subject: [PATCH 4/9] terminado tickets. faltan respuestas --- ci4/app/Config/Routes.php | 3 + .../Controllers/Soporte/Ticketcontroller.php | 129 ++++++++++++---- ci4/app/Language/es/Tickets.php | 5 +- .../{ticketModel.php => TicketModel.php} | 10 +- ci4/app/Models/UserModel.php | 13 ++ .../vuexy/form/soporte/viewTicketForm.php | 140 +++++++++++------- .../vuexy/form/soporte/viewTicketList.php | 14 +- .../js/safekat/pages/soporte/tickets.js | 78 +++++++--- 8 files changed, 273 insertions(+), 119 deletions(-) rename ci4/app/Models/Soporte/{ticketModel.php => TicketModel.php} (89%) diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index aad9dcaf..359bda01 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -924,7 +924,10 @@ $routes->group('soporte', ['namespace' => 'App\Controllers\Soporte'], function ( $routes->get('', 'Ticketcontroller::index', ['as' => 'TicketIndex']); $routes->get('add', 'Ticketcontroller::add', ['as' => 'NewTicket']); $routes->post('add', 'Ticketcontroller::add', ['as' => 'createTicket']); + $routes->get('edit/(:num)', 'Ticketcontroller::edit/$1', ['as' => 'editTicket']); + $routes->post('edit/(:num)', 'Ticketcontroller::edit/$1', ['as' => 'updateTicket']); $routes->post('ticketlist', 'Ticketcontroller::datatable'); + $routes->get('image/(:segment)', 'Ticketcontroller::image/$1'); }); diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 6b12717e..81d8641c 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -2,16 +2,21 @@ namespace App\Controllers\Soporte; -use App\Models\TicketModel; +use App\Models\Soporte\TicketModel; use App\Models\CategoriaModel; use App\Models\EstadoModel; use CodeIgniter\Controller; use App\Entities\Soporte\TicketEntity; use App\Models\Soporte\ticketFileModel; -class Ticketcontroller extends \App\Controllers\GoBaseController + +use App\Models\Collection; + +class Ticketcontroller extends \App\Controllers\BaseResourceController { - protected static $primaryModelName = 'App\Models\Soporte\ticketModel'; + + protected $modelName = TicketModel::class; + protected $format = 'json'; protected static $singularObjectNameCc = 'ticket'; protected static $singularObjectName = 'Ticket'; @@ -34,17 +39,22 @@ class Ticketcontroller extends \App\Controllers\GoBaseController ]; parent::initController($request, $response, $logger); - } public function index() { //checkPermission('tickets.menu'); - $this->viewData['usingClientSideDataTable'] = true; + $viewData = [ + 'currentModule' => static::$controllerSlug, + 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Tickets.tickets')]), + 'usingServerSideDataTable' => true, + 'userType' => auth()->user()->can('tickets.edit')? 1:0, + ]; - $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Tickets.tickets')]); - parent::index(); + $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class + + return view(static::$viewPath . 'viewTicketList', $viewData); } @@ -109,7 +119,7 @@ class Ticketcontroller extends \App\Controllers\GoBaseController 'nombre' => $originalName, 'ticket_id' => $id, 'hash' => $fileHash, - 'path' => 'uploads/' . $newFileName + 'path' => 'uploads/tickets/' . $newFileName ]); } } @@ -139,7 +149,7 @@ class Ticketcontroller extends \App\Controllers\GoBaseController $this->viewData['estados'] = $this->model->getEstados(); $this->viewData['secciones'] = $this->model->getSecciones(); - $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tarifaextra.tarifaextra') . ' ' . lang('Basic.global.addNewSuffix'); + $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tickets.ticket') . ' ' . lang('Basic.global.addNewSuffix'); return $this->displayForm(__METHOD__); @@ -147,32 +157,22 @@ class Ticketcontroller extends \App\Controllers\GoBaseController public function edit($requestedId = null) { - /* - checkPermission('tarifa-extra.edit', $this->indexRoute); - + if ($requestedId == null) : return $this->redirect2listView(); endif; $id = filter_var($requestedId, FILTER_SANITIZE_URL); - $tarifaextraEntity = $this->model->find($id); + $ticket = $this->model->find($id); - if ($tarifaextraEntity == false) : - $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Tarifaextra.tarifaextra')), $id]); + if ($ticket == false) : + $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Tickets.ticket')), $id]); return $this->redirect2listView('errorMessage', $message); endif; if ($this->request->getPost()) : $postData = $this->request->getPost(); - $sanitizedData = $this->sanitized($postData, true); - - // JJO - if (isset($this->model->user_updated_id)) { - $sanitizedData['user_updated_id'] = auth()->user()->id; - } - if ($this->request->getPost('mostrar_en_presupuesto') == null) { - $sanitizedData['mostrar_en_presupuesto'] = false; - } + $sanitizedData = $this->sanitized($postData, false); $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -184,17 +184,17 @@ class Ticketcontroller extends \App\Controllers\GoBaseController $this->dealWithException($e); } else: - $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Tarifaextra.tarifaextra'))]); + $this->viewData['warningMessage'] = lang('Basic.global.formErr1', [mb_strtolower(lang('Tickets.ticket'))]); $this->session->setFlashdata('formErrors', $this->model->errors()); endif; - $tarifaextraEntity->fill($sanitizedData); + $ticket->fill($sanitizedData); $thenRedirect = false; endif; if ($noException && $successfulResult) : - $id = $tarifaextraEntity->id ?? $id; + $id = $ticket->id ?? $id; $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.'; if ($thenRedirect) : @@ -210,15 +210,37 @@ class Ticketcontroller extends \App\Controllers\GoBaseController endif; // $noException && $successfulResult endif; // ($requestMethod === 'post') - $this->viewData['tarifaextraEntity'] = $tarifaextraEntity; + $this->viewData['ticket'] = $ticket; - $this->viewData['formAction'] = route_to('updateTarifaextra', $id); + $this->viewData['formAction'] = route_to('updateTicket', $id); - $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Tarifaextra.tarifaextra') . ' ' . lang('Basic.global.edit3'); + $this->viewData['categorias'] = $this->model->getCategorias(); + $this->viewData['estados'] = $this->model->getEstados(); + $this->viewData['secciones'] = $this->model->getSecciones(); + $defatulSoporteUserId = model('App\Models\Configuracion\ConfigVariableModel')->getVariable('default_soporte_user_id')->value; + $this->viewData['supportUsers'] = array( + array( + 'id' => $defatulSoporteUserId, + 'name' => model('App\Models\UserModel')->getFullName($defatulSoporteUserId) + ), + array( + 'id' => 2, + 'name' => model('App\Models\UserModel')->getFullName(2) + ), + array( + 'id' => 1, + 'name' => model('App\Models\UserModel')->getFullName(1) + ), + ); + + $this->viewData['imagesTicket'] = $this->getImages('ticket', $id); + $this->viewData['imagesRespuesta'] = $this->getImages('respuesta', $id); + + $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' ' . lang('Tickets.ticket') . ' ' . lang('Basic.global.edit3'); return $this->displayForm(__METHOD__, $id); - */ + } // end function edit(...) public function datatable() @@ -237,7 +259,7 @@ class Ticketcontroller extends \App\Controllers\GoBaseController $searchValues = get_filter_datatables_columns($reqData); - $resourceData = $this->model->getResource($searchValues, $cliente_id); + $resourceData = $this->model->getResource($searchValues); foreach ($requestedOrder as $order) { $column = $order['column'] ?? 0; $dir = $order['dir'] ?? 'asc'; @@ -258,4 +280,47 @@ class Ticketcontroller extends \App\Controllers\GoBaseController } } + public function image($imageName) + { + $filePath = WRITEPATH . "uploads/tickets/" . $imageName; + + if (!file_exists($filePath)) { + return $this->response->setStatusCode(404, 'Imagen no encontrada'); + } + + $mimeType = mime_content_type($filePath); + + return $this->response + ->setHeader('Content-Type', $mimeType) + ->setBody(file_get_contents($filePath)); + } + + private function getImages($tipo = 'ticket', $id = null) + { + $images = []; + + $model = new ticketFileModel(); + if($tipo == 'ticket'){ + $files = $model->where('ticket_id', $id)->findAll(); + foreach ($files as $file) { + $ext = pathinfo($file['nombre'], PATHINFO_EXTENSION); + array_push($images,array( + "path" => '/soporte/image/' . $file['hash'] .".". $ext, + "name" => $file['nombre'] + )); + } + } + else{ + $files = $model->where('respuesta_id', $id)->findAll(); + foreach ($files as $file) { + $ext = pathinfo($file['nombre'], PATHINFO_EXTENSION); + array_push($images,array( + "path" => '/soporte/image/' . $file['hash'] .".". $ext, + "name" => $file['nombre'] + )); + } + } + return $images; + } + } diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index 26a17628..9175e6e1 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -28,6 +28,8 @@ return [ 'pedidos' => 'Pedidos', 'facturacion' => 'Facturación', 'logistica' => 'Logística', + 'configuracion' => 'Configuración', + 'general' => 'General', // estados 'abierto' => 'Abierto', @@ -42,6 +44,7 @@ return [ // FIcheros 'adjuntos' => 'Adjuntar imágenes', - 'adjuntos_main_text' => 'Arrastra y suelta las imágenes aquí o haz clic para subirlas', + 'adjuntos_ticket' => 'Imágenes adjuntas', + 'adjuntos_respuesta' => 'Imágenes adjuntos de la respuesta', ]; diff --git a/ci4/app/Models/Soporte/ticketModel.php b/ci4/app/Models/Soporte/TicketModel.php similarity index 89% rename from ci4/app/Models/Soporte/ticketModel.php rename to ci4/app/Models/Soporte/TicketModel.php index 39d7cf9f..7fcd6e9e 100644 --- a/ci4/app/Models/Soporte/ticketModel.php +++ b/ci4/app/Models/Soporte/TicketModel.php @@ -12,6 +12,8 @@ class TicketModel extends \App\Models\BaseModel protected $useTimestamps = true; + protected $returnType = "App\Entities\Soporte\TicketEntity"; + const SORTABLE = [ 0 => "t1.categoria_id", 1 => "t1.seccion_id", @@ -75,14 +77,16 @@ class TicketModel extends \App\Models\BaseModel ->table($this->table . " t1") ->select( "t1.id as id, t1.usuario_id AS usuario_id, CONCAT(t2.first_name, ' ', t2.last_name) AS usuario, - t1.user_soporte_id AS user_soporte_id, CONCAT(t2.first_name, ' ', t2.last_name) AS user_soporte, - t1.categoria_id AS categoria_id, t3.keyword AS categoria, t1.seccion_id AS seccion_id, t1.estado_id AS estado_id, + t1.user_soporte_id AS user_soporte_id, CONCAT(t6.first_name, ' ', t6.last_name) AS user_soporte, + t1.categoria_id AS categoria_id, t3.keyword AS categoria, + t1.seccion_id AS seccion_id, t5.keyword AS seccion, + t1.estado_id AS estado_id, t4.keyword AS estado, t1.prioridad AS prioridad, t1.titulo AS titulo, t1.created_at AS created_at " ); $builder->join("users t2", "t1.usuario_id = t2.id", "left"); - $builder->join("users t2", "t1.user_soporte_id = t2.id", "left"); + $builder->join("users t6", "t1.user_soporte_id = t6.id", "left"); $builder->join("tickets_categorias t3", "t1.categoria_id = t3.id", "left"); $builder->join("tickets_estados t4", "t1.estado_id = t4.id", "left"); $builder->join("tickets_secciones t5", "t1.seccion_id = t5.id", "left"); diff --git a/ci4/app/Models/UserModel.php b/ci4/app/Models/UserModel.php index cd7d2944..34f1767a 100644 --- a/ci4/app/Models/UserModel.php +++ b/ci4/app/Models/UserModel.php @@ -122,6 +122,19 @@ class UserModel extends ShieldUserModel } + public function getFullName($id=0){ + $builder = $this->db + ->table("users" . " t1") + ->select( + "CONCAT(t1.first_name, ' ', t1.last_name) AS name" + ); + + $builder->where('t1.deleted_at', null); + $builder->where('t1.id', $id); + + return $builder->get()->getRow()->name; + } + // Método para comprobar si el email ya está registrado public function isEmailUnique($email) { diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php index ab8fa533..c35984ca 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -1,21 +1,40 @@ +include("themes/_commonPartialsBs/sweetalert") ?> include('themes/_commonPartialsBs/datatables') ?> extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?> + + +
      -

      +

      - + + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
      - + id))?"readonly":"" ?> + value="titulo) ?>">
      @@ -23,9 +42,11 @@
      - id) && !auth()->user()->can('tickets.edit'))?"disabled":"" ?>> - +
      @@ -33,18 +54,25 @@
      - id) && !auth()->user()->can('tickets.edit'))?"disabled":"" ?>> - +
      - + +
      @@ -57,15 +85,25 @@
      @@ -75,63 +113,51 @@
      - +
      +

      - - + +
      - - + - - +
      + id) && auth()->user()->can('tickets.edit'))): ?> + " + /> + + "btn btn-secondary"]) ?> - - - +
      diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php index 7fe03d7a..a1d546f5 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php @@ -13,7 +13,7 @@
      - @@ -21,10 +21,10 @@ - + - - + + @@ -49,6 +49,11 @@ section('additionalExternalJs') ?> + + + +endSection() ?> diff --git a/httpdocs/assets/js/safekat/pages/soporte/tickets.js b/httpdocs/assets/js/safekat/pages/soporte/tickets.js index b6567306..82fd6b32 100644 --- a/httpdocs/assets/js/safekat/pages/soporte/tickets.js +++ b/httpdocs/assets/js/safekat/pages/soporte/tickets.js @@ -1,20 +1,6 @@ import Table from '../../components/table.js'; import Ajax from '../../components/ajax.js'; -/*$(function () { - - - -/* - document.querySelectorAll('[data-bs-toggle="lightbox"]').forEach(anchor => { - anchor.addEventListener('click', function (event) { - event.preventDefault(); - const imgSrc = this.getAttribute('href'); - document.getElementById('lightboxImage').src = imgSrc; - new bootstrap.Modal(document.getElementById('lightboxModal')).show(); - }); - }); -});*/ class Ticket { @@ -37,6 +23,12 @@ class Ticket { init() { if(this.action == "edit") { + + $('.gallery-img').on('click', function() { + let imageUrl = $(this).data('src'); // Obtiene la URL de la imagen + $('#modalImage').attr('src', imageUrl); // Cambia la imagen en el modal + $('#imageModal').modal('show'); // Muestra el modal + }); } else if (this.action == "list") { @@ -51,16 +43,44 @@ class Ticket { const actions = ['view']; const columns = [ { 'data': 'id' }, - { 'data': 'categoria_id' }, - { 'data': 'seccion_id' }, - { 'data': 'estado_id' }, - { 'data': 'prioridad' }, + { 'data': 'categoria_id', + render: function (data, type, row) { + return window.language.Tickets[row.categoria]; + } + }, + { 'data': 'seccion_id' , + render: function (data, type, row) { + return window.language.Tickets[row.seccion]; + } + }, + { 'data': 'estado_id' , + render: function (data, type, row) { + return window.language.Tickets[row.estado]; + } + }, + { 'data': 'prioridad' , + render: function (data, type, row) { + return window.language.Tickets[data]; + }, + visible: false, + }, { 'data': 'titulo' }, - { 'data': 'usuario_id' }, - { 'data': 'user_soporte_id' }, + { 'data': 'usuario_id' , + render: function (data, type, row) { + return row.usuario; + }, + visible: false, + }, + { 'data': 'user_soporte_id', + render: function (data, type, row) { + return row.user_soporte; + }, + visible: false, + }, { 'data': 'created_at' }, ]; + this.table = new Table( $('#tableOfTickets'), 'tickets', @@ -68,15 +88,29 @@ class Ticket { columns, ); + this.table.init({ actions: actions, buttonsExport: true, }); + this.table.table.on('init.dt', function () { + self.table.table.page.len(50).draw(); + if(window.userType==1){ - this.tableTarifas.table.on('init.dt', function () { - self.tableTarifas.table.page.len(50).draw(); + self.table.table.column(4).visible(true); + self.table.table.column(6).visible(true); + self.table.table.column(7).visible(true); + + self.table.table.column(4).header().style.display = 'table-cell'; + self.table.table.column(6).header().style.display = 'table-cell'; + self.table.table.column(7).header().style.display = 'table-cell'; + } }); + + this.table.setEditCallback(function(id){ + window.location.href = '/soporte/edit/' + id; + }) } } From 809a705c884f9f4baa22121e3016405d739eb83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Sun, 16 Feb 2025 18:58:38 +0100 Subject: [PATCH 5/9] terminado tickets. faltan respuestas 2 --- ci4/app/Controllers/Soporte/Ticketcontroller.php | 2 +- .../themes/vuexy/form/soporte/viewTicketForm.php | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 81d8641c..ec1539ad 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -141,7 +141,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController endif; // ($requestMethod === 'post') - $this->viewData['ticketEntity'] = isset($sanitizedData) ? new TicketEntity($sanitizedData) : new TicketEntity(); + $this->viewData['ticket'] = isset($sanitizedData) ? new TicketEntity($sanitizedData) : new TicketEntity(); $this->viewData['formAction'] = route_to('NewTicket'); diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php index c35984ca..6cfac8c4 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -33,7 +33,7 @@
      id))?"readonly":"" ?> + id))?"readonly":"" ?> value="titulo) ?>">
      @@ -43,7 +43,7 @@
      id) && !auth()->user()->can('tickets.edit'))?"disabled":"" ?>> + id) && !auth()->user()->can('tickets.edit'))?"disabled":"" ?>> @@ -114,13 +114,12 @@
      -

      @@ -147,7 +146,7 @@
      id) && auth()->user()->can('tickets.edit'))): ?> + ($formAction !== route_to('NewTicket') && auth()->user()->can('tickets.edit'))): ?> Date: Mon, 17 Feb 2025 20:56:32 +0100 Subject: [PATCH 6/9] terminadas respuesta. falta repasar todo y cabecera datatable y permisos menus y botones --- ci4/app/Config/RBAC/permissionMatrix.php | 7 + .../Controllers/Soporte/Ticketcontroller.php | 167 +++++++++++------- ...025-02-14-114500_create_tickets_system.php | 1 + .../Soporte/TicketRespuestaEntity.php | 20 +++ ci4/app/Language/es/Basic.php | 1 + ci4/app/Language/es/Tickets.php | 2 +- ci4/app/Models/Soporte/TicketModel.php | 5 +- .../Models/Soporte/TicketRespuestaModel.php | 17 ++ .../vuexy/form/soporte/viewTicketForm.php | 57 +++--- ci4/writable/logs/index.html | 11 -- 10 files changed, 193 insertions(+), 95 deletions(-) create mode 100644 ci4/app/Entities/Soporte/TicketRespuestaEntity.php create mode 100644 ci4/app/Models/Soporte/TicketRespuestaModel.php delete mode 100755 ci4/writable/logs/index.html diff --git a/ci4/app/Config/RBAC/permissionMatrix.php b/ci4/app/Config/RBAC/permissionMatrix.php index 7506cfec..ed0b4fe3 100644 --- a/ci4/app/Config/RBAC/permissionMatrix.php +++ b/ci4/app/Config/RBAC/permissionMatrix.php @@ -202,6 +202,10 @@ const SK_PERMISSION_MATRIX = [ "tarifa-encuadernacion.edit", "tarifa-encuadernacion.delete", "tarifa-encuadernacion.menu", + "tarifa-extra.create", + "tarifa-extra.edit", + "tarifa-extra.delete", + "tarifa-extra.menu", "tarifa-envio.create", "tarifa-envio.edit", "tarifa-envio.delete", @@ -246,5 +250,8 @@ const SK_PERMISSION_MATRIX = [ "roles-permisos.edit", "roles-permisos.delete", "roles-permisos.menu", + "tickets.create", + "tickets.edit", + "tickets.menu", ], ]; diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index ec1539ad..3f5c8757 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -16,7 +16,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController { protected $modelName = TicketModel::class; - protected $format = 'json'; + protected $format = 'json'; protected static $singularObjectNameCc = 'ticket'; protected static $singularObjectName = 'Ticket'; @@ -25,13 +25,13 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController protected static $viewPath = 'themes/vuexy/form/soporte/'; - protected $indexRoute = 'viewTicketList'; + protected $indexRoute = 'ticketList'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Tickets.moduleTitle'); - + // Breadcrumbs $this->viewData['breadcrumb'] = [ ['title' => lang("App.menu_soporte"), 'route' => "javascript:void(0);", 'active' => false], @@ -49,20 +49,19 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController 'currentModule' => static::$controllerSlug, 'pageSubTitle' => lang('Basic.global.ManageAllRecords', [lang('Tickets.tickets')]), 'usingServerSideDataTable' => true, - 'userType' => auth()->user()->can('tickets.edit')? 1:0, + 'userType' => auth()->user()->can('tickets.edit') ? 1 : 0, ]; $viewData = array_merge($this->viewData, $viewData); // merge any possible values from the parent controller class return view(static::$viewPath . 'viewTicketList', $viewData); - } public function add() { //checkPermission('tickets.create', $this->indexRoute); - + if ($this->request->getPost()) : $nullIfEmpty = false; // !(phpversion() >= '8.1'); @@ -97,33 +96,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $id = $this->model->db->insertID(); - $uploadPath = WRITEPATH . 'uploads/tickets/'; - - $fileModel = new ticketFileModel(); - $files = $this->request->getFiles(); - if ($files && isset($files['files'])) { - foreach ($files['files'] as $file) { - if ($file->isValid() && !$file->hasMoved()) { - $originalName = $file->getClientName(); - $fileExt = $file->getExtension(); - - // Generar hash SHA-256 basado en el contenido del archivo - $fileHash = hash_file("sha256", $file->getTempName()); - $newFileName = $fileHash . '.' . $fileExt; - - // Mover el archivo con el nombre basado en el hash - $file->move($uploadPath, $newFileName); - - // Guardar en la base de datos - $fileModel->insert([ - 'nombre' => $originalName, - 'ticket_id' => $id, - 'hash' => $fileHash, - 'path' => 'uploads/tickets/' . $newFileName - ]); - } - } - } + $this->saveImages($id, $this->request->getFiles()); $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.'; @@ -149,6 +122,8 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $this->viewData['estados'] = $this->model->getEstados(); $this->viewData['secciones'] = $this->model->getSecciones(); + $this->viewData['supportUsers'] = $this->getSupportUsers(); + $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' ' . lang('Tickets.ticket') . ' ' . lang('Basic.global.addNewSuffix'); @@ -157,7 +132,8 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController public function edit($requestedId = null) { - + $modelRespuesta = new \App\Models\Soporte\TicketRespuestaModel(); + if ($requestedId == null) : return $this->redirect2listView(); endif; @@ -169,16 +145,42 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController return $this->redirect2listView('errorMessage', $message); endif; + if(!auth()->user()->can('Tickets.edit') && auth()->user()->id != $ticket->usuario_id){ + return redirect()->to(route_to('TicketIndex'))->with('errorMessage', lang('Basic.global.noPermission')); + } + if ($this->request->getPost()) : $postData = $this->request->getPost(); - $sanitizedData = $this->sanitized($postData, false); + $sanitizedData = $this->sanitized($postData, false); $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : if ($this->canValidate()) : try { $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData); + + $this->saveImages($id, $this->request->getFiles()); + + if(auth()->user()->can('Tickets.edit')){ + + $respuesta = $modelRespuesta->where('ticket_id', $id)->first(); + if($respuesta == null){ + $modelRespuesta->insert([ + 'ticket_id' => $id, + 'usuario_id' => auth()->user()->id, + 'mensaje' => $sanitizedData['respuesta_mensaje'] + ]); + }else{ + $modelRespuesta->update($respuesta->id, [ + 'mensaje' => $sanitizedData['respuesta_mensaje'], + 'usuario_id' => auth()->user()->id, + ]); + } + + + } + } catch (\Exception $e) { $noException = false; $this->dealWithException($e); @@ -204,34 +206,22 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController return $this->redirect2listView('successMessage', $message); endif; else: - $this->session->setFlashData('sweet-success', $message); + return redirect()->to(route_to("editTicket", $id))->with('successMessage', $message); + //$this->session->setFlashData('sweet-success', $message); endif; endif; // $noException && $successfulResult endif; // ($requestMethod === 'post') $this->viewData['ticket'] = $ticket; + $this->viewData['respuesta'] = $modelRespuesta->where('ticket_id', $id)->first(); $this->viewData['formAction'] = route_to('updateTicket', $id); $this->viewData['categorias'] = $this->model->getCategorias(); $this->viewData['estados'] = $this->model->getEstados(); $this->viewData['secciones'] = $this->model->getSecciones(); - $defatulSoporteUserId = model('App\Models\Configuracion\ConfigVariableModel')->getVariable('default_soporte_user_id')->value; - $this->viewData['supportUsers'] = array( - array( - 'id' => $defatulSoporteUserId, - 'name' => model('App\Models\UserModel')->getFullName($defatulSoporteUserId) - ), - array( - 'id' => 2, - 'name' => model('App\Models\UserModel')->getFullName(2) - ), - array( - 'id' => 1, - 'name' => model('App\Models\UserModel')->getFullName(1) - ), - ); + $this->viewData['supportUsers'] = $this->getSupportUsers(); $this->viewData['imagesTicket'] = $this->getImages('ticket', $id); $this->viewData['imagesRespuesta'] = $this->getImages('respuesta', $id); @@ -240,7 +230,6 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController return $this->displayForm(__METHOD__, $id); - } // end function edit(...) public function datatable() @@ -259,7 +248,13 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $searchValues = get_filter_datatables_columns($reqData); - $resourceData = $this->model->getResource($searchValues); + if(auth()->user()->can('tickets.edit')){ + $user_id = null; + }else{ + $user_id = auth()->user()->id; + } + + $resourceData = $this->model->getResource($searchValues, $user_id); foreach ($requestedOrder as $order) { $column = $order['column'] ?? 0; $dir = $order['dir'] ?? 'asc'; @@ -269,7 +264,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController } } $resourceData = $resourceData->limit($length, $start)->get()->getResultObject(); - + return $this->respond(Collection::datatable( $resourceData, $this->model->getResource($searchValues)->countAllResults(), @@ -295,27 +290,57 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController ->setBody(file_get_contents($filePath)); } + private function saveImages($ticket_id, $files = []) + { + $uploadPath = WRITEPATH . 'uploads/tickets/'; + + $fileModel = new ticketFileModel(); + + if ($files && isset($files['files'])) { + foreach ($files['files'] as $file) { + if ($file->isValid() && !$file->hasMoved()) { + $originalName = $file->getClientName(); + $fileExt = $file->getExtension(); + + // Generar hash SHA-256 basado en el contenido del archivo + $fileHash = hash_file("sha256", $file->getTempName()); + $newFileName = $fileHash . '.' . $fileExt; + + // Mover el archivo con el nombre basado en el hash + $file->move($uploadPath, $newFileName); + + // Guardar en la base de datos + $fileModel->insert([ + 'nombre' => $originalName, + 'ticket_id' => $ticket_id, + 'hash' => $fileHash, + 'path' => 'uploads/tickets/' . $newFileName + ]); + } + } + } + } + private function getImages($tipo = 'ticket', $id = null) { $images = []; $model = new ticketFileModel(); - if($tipo == 'ticket'){ + if ($tipo == 'ticket') { $files = $model->where('ticket_id', $id)->findAll(); foreach ($files as $file) { $ext = pathinfo($file['nombre'], PATHINFO_EXTENSION); - array_push($images,array( - "path" => '/soporte/image/' . $file['hash'] .".". $ext, + array_push($images, array( + "path" => '/soporte/image/' . $file['hash'] . "." . $ext, "name" => $file['nombre'] )); } - } - else{ + } else { $files = $model->where('respuesta_id', $id)->findAll(); foreach ($files as $file) { $ext = pathinfo($file['nombre'], PATHINFO_EXTENSION); - array_push($images,array( - "path" => '/soporte/image/' . $file['hash'] .".". $ext, + array_push($images, array( + "path" => '/soporte/image/' . $file['hash'] . "." . $ext, "name" => $file['nombre'] )); } @@ -323,4 +348,24 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController return $images; } + private function getSupportUsers() + { + $defatulSoporteUserId = model('App\Models\Configuracion\ConfigVariableModel')->getVariable('default_soporte_user_id')->value; + $supportUsers = array( + array( + 'id' => $defatulSoporteUserId, + 'name' => model('App\Models\UserModel')->getFullName($defatulSoporteUserId) + ), + array( + 'id' => 2, + 'name' => model('App\Models\UserModel')->getFullName(2) + ), + array( + 'id' => 1, + 'name' => model('App\Models\UserModel')->getFullName(1) + ), + ); + + return $supportUsers; + } } diff --git a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php index 716bf956..2b3242fa 100644 --- a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php +++ b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php @@ -61,6 +61,7 @@ class CreateTicketsSystem extends Migration 'usuario_id' => ['type' => 'INT', 'constraint' => 11, 'unsigned' => true], 'mensaje' => ['type' => 'TEXT'], 'created_at' => ['type' => 'DATETIME', 'null' => true], + 'updated_at' => ['type' => 'DATETIME', 'null' => true], ]); $this->forge->addPrimaryKey('id'); $this->forge->addForeignKey('ticket_id', 'tickets', 'id', '', 'NO ACTION'); diff --git a/ci4/app/Entities/Soporte/TicketRespuestaEntity.php b/ci4/app/Entities/Soporte/TicketRespuestaEntity.php new file mode 100644 index 00000000..d7a082a3 --- /dev/null +++ b/ci4/app/Entities/Soporte/TicketRespuestaEntity.php @@ -0,0 +1,20 @@ + null, + 'ticket_id' => null, + 'usuario_id' => null, + 'mensaje' => null, + 'created_at' => null, + 'updated_at' => null, + ]; + + protected $dates = ['created_at', 'updated_at']; + +} diff --git a/ci4/app/Language/es/Basic.php b/ci4/app/Language/es/Basic.php index be74f2d1..3f1c5bf5 100755 --- a/ci4/app/Language/es/Basic.php +++ b/ci4/app/Language/es/Basic.php @@ -88,6 +88,7 @@ return [ 'line' => 'la línea', 'error_tittle' => 'Error', ], + 'noPermission' => 'No tiene permiso para acceder a esta página.', 'ok' => 'Ok', 'wait' => 'Espere', 'yes' => 'Si', diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index 9175e6e1..59bb9747 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -17,6 +17,7 @@ return [ "usuario" => "Creado por", "createTicket" => "Crear Ticket", "fechaCreacion" => "Fecha de creación", + "respuesta" => "Respuesta", // categorías 'errores' => 'Errores', @@ -45,6 +46,5 @@ return [ // FIcheros 'adjuntos' => 'Adjuntar imágenes', 'adjuntos_ticket' => 'Imágenes adjuntas', - 'adjuntos_respuesta' => 'Imágenes adjuntos de la respuesta', ]; diff --git a/ci4/app/Models/Soporte/TicketModel.php b/ci4/app/Models/Soporte/TicketModel.php index 7fcd6e9e..99114ee1 100644 --- a/ci4/app/Models/Soporte/TicketModel.php +++ b/ci4/app/Models/Soporte/TicketModel.php @@ -71,7 +71,7 @@ class TicketModel extends \App\Models\BaseModel return $this->find($id); } - public function getResource($search = [], ) + public function getResource($search = [], $user_id = null) { $builder = $this->db ->table($this->table . " t1") @@ -91,6 +91,9 @@ class TicketModel extends \App\Models\BaseModel $builder->join("tickets_estados t4", "t1.estado_id = t4.id", "left"); $builder->join("tickets_secciones t5", "t1.seccion_id = t5.id", "left"); + if ($user_id !== null) + $builder->where("t1.usuario_id", $user_id); + if (empty($search)) return $builder; else { diff --git a/ci4/app/Models/Soporte/TicketRespuestaModel.php b/ci4/app/Models/Soporte/TicketRespuestaModel.php new file mode 100644 index 00000000..5d616c85 --- /dev/null +++ b/ci4/app/Models/Soporte/TicketRespuestaModel.php @@ -0,0 +1,17 @@ + id))?"readonly":"" ?> + id)) ? "readonly" : "" ?> value="titulo) ?>">
      @@ -43,7 +43,7 @@
      id) && !auth()->user()->can('tickets.edit'))?"disabled":"" ?>> + id) && !auth()->user()->can('tickets.edit')) ? "disabled" : "" ?>> @@ -67,14 +67,14 @@ user()->can('tickets.edit')): ?> - - - - - + +
      @@ -114,11 +114,24 @@
      - + user()->can('tickets.edit'))) : ?> + +

      + +
      + + +
      + + + + user()->can('tickets.edit'))): ?>
      @@ -127,8 +140,9 @@ accept="image/*">
      + - +

      @@ -145,14 +159,15 @@
      - user()->can('tickets.edit'))): ?> + user()->can('tickets.edit')) + ): ?> " - /> + type="submit" + class="btn btn-primary float-start me-sm-3 me-1" + name="save" + value="" /> "btn btn-secondary"]) ?> diff --git a/ci4/writable/logs/index.html b/ci4/writable/logs/index.html deleted file mode 100755 index b702fbc3..00000000 --- a/ci4/writable/logs/index.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - 403 Forbidden - - - -

      Directory access is forbidden.

      - - - From fea409b5adef18b28028761820b01c53f056668e Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Wed, 19 Feb 2025 15:00:20 +0100 Subject: [PATCH 7/9] haciendo el buscador --- ci4/app/Config/Email.php | 10 +- .../Controllers/Soporte/Ticketcontroller.php | 49 ++++- ...025-02-14-114500_create_tickets_system.php | 2 + ci4/app/Language/es/Tickets.php | 3 + ci4/app/Models/Soporte/TicketModel.php | 17 +- .../js/safekat/pages/soporte/tickets.js | 203 +++++++++++++++--- 6 files changed, 246 insertions(+), 38 deletions(-) diff --git a/ci4/app/Config/Email.php b/ci4/app/Config/Email.php index 43b3edb0..e354e4f3 100755 --- a/ci4/app/Config/Email.php +++ b/ci4/app/Config/Email.php @@ -6,7 +6,7 @@ use CodeIgniter\Config\BaseConfig; class Email extends BaseConfig { - public string $fromEmail = 'safekat@imnavajas.es'; + public string $fromEmail = 'soporte_erp@safekat.es'; public string $fromName = 'Safekat ERP'; public string $recipients = ''; @@ -28,22 +28,22 @@ class Email extends BaseConfig /** * SMTP Server Hostname */ - public string $SMTPHost = 'imnavajas.es'; + public string $SMTPHost = 'smtp.ionos.es'; /** * SMTP Username */ - public string $SMTPUser = 'safekat@imnavajas.es'; + public string $SMTPUser = 'soporte_erp@safekat.es'; /** * SMTP Password */ - public string $SMTPPass = 'Etkd9~448'; + public string $SMTPPass = 'H%5&qDkDkWnfLTGN'; /** * SMTP Port */ - public int $SMTPPort = 25; + public int $SMTPPort = 465; /** * SMTP Timeout (in seconds) diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 3f5c8757..0c732ffb 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -2,6 +2,7 @@ namespace App\Controllers\Soporte; +use App\Models\Sistema\SettingsModel; use App\Models\Soporte\TicketModel; use App\Models\CategoriaModel; use App\Models\EstadoModel; @@ -25,7 +26,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController protected static $viewPath = 'themes/vuexy/form/soporte/'; - protected $indexRoute = 'ticketList'; + protected $indexRoute = 'TicketIndex'; public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) @@ -57,6 +58,48 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController return view(static::$viewPath . 'viewTicketList', $viewData); } + private function sendMail($subject,$body,$recipient) + { + $settings_model = new SettingsModel(); + $config = $settings_model->first()->toArray(); + $gateway = $config['email_gateway']; + $body = html_entity_decode($body); + + if($gateway == 'smtp'){ + try { + //https://codeigniter.com/user_guide/libraries/email.html + $email = \Config\Services::email(); + $config['protocol'] = $config['email_gateway']; + $config['SMTPHost'] = $config['email_smtp']; + $config['SMTPUser'] = $config['email_address']; + $config['SMTPPass'] = $config['email_pass']; + $config['SMTPPort'] = intval($config['email_port']); + $config['SMTPCrypto'] = $config['email_cert']=='none'?'':$config['email_cert']; + $config['SMTPTimeout'] = 15; + $config['mailType'] = 'html'; + $config['wordWrap'] = true; + + $email->initialize($config); + + $email->setFrom($config['email_address'], $config['email_name']); + $email->setTo($recipient); + + $email->setSubject($subject); + $email->setMessage($body); + + if (!$email->send()) + { + return false; + }else{ + return true; + } + } catch (\Exception $ex) { + return false; + } + } + return false; + } + public function add() { @@ -100,6 +143,10 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $message = lang('Basic.global.saveSuccess', [lang('Basic.global.record')]) . '.'; + $userModel = new \App\Models\UserModel(); + + $this->sendMail(lang('Tickets.newTicket'), lang('Tickets.newTicketBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['supportUser'])->email); + if ($thenRedirect) : if (!empty($this->indexRoute)) : return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message); diff --git a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php index 2b3242fa..c0bbab1f 100644 --- a/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php +++ b/ci4/app/Database/Migrations/2025-02-14-114500_create_tickets_system.php @@ -93,5 +93,7 @@ class CreateTicketsSystem extends Migration $this->forge->dropTable('tickets_categorias'); $this->forge->dropTable('tickets_estados'); $this->forge->dropTable('tickets_secciones'); + + $this->db->table('config_variables_app')->where('name', 'default_soporte_user_id')->delete(); } } diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index 59bb9747..2cd8e9a8 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -47,4 +47,7 @@ return [ 'adjuntos' => 'Adjuntar imágenes', 'adjuntos_ticket' => 'Imágenes adjuntas', + // Mail + 'newTicket' => 'Nuevo Ticket en ERP Safekat', + 'newTicketBody' => '

      Se ha creado un nuevo ticket en el sistema de soporte de Safekat ERP.

      Puede verlo en el siguiente enlace:

      ', ]; diff --git a/ci4/app/Models/Soporte/TicketModel.php b/ci4/app/Models/Soporte/TicketModel.php index 99114ee1..7860a6e6 100644 --- a/ci4/app/Models/Soporte/TicketModel.php +++ b/ci4/app/Models/Soporte/TicketModel.php @@ -15,14 +15,15 @@ class TicketModel extends \App\Models\BaseModel protected $returnType = "App\Entities\Soporte\TicketEntity"; const SORTABLE = [ - 0 => "t1.categoria_id", - 1 => "t1.seccion_id", - 2 => "t1.estado_id", - 3 => "t1.prioridad", - 4 => "t1.titulo", - 5 => "t1.usuario_id", - 6 => "t1.usuario_soporte_id", - 7 => "t1.created_at", + 0 => "t1.id", + 1 => "t1.categoria_id", + 2 => "t1.seccion_id", + 3 => "t1.estado_id", + 4 => "t1.prioridad", + 5 => "t1.titulo", + 6 => "t1.usuario_id", + 7 => "t1.usuario_soporte_id", + 8 => "t1.created_at", ]; public function getEstados() diff --git a/httpdocs/assets/js/safekat/pages/soporte/tickets.js b/httpdocs/assets/js/safekat/pages/soporte/tickets.js index 82fd6b32..9bdfc789 100644 --- a/httpdocs/assets/js/safekat/pages/soporte/tickets.js +++ b/httpdocs/assets/js/safekat/pages/soporte/tickets.js @@ -8,75 +8,83 @@ class Ticket { constructor() { // check if url includes "add" - this.action = 'list'; - if(window.location.href.includes("add")) + this.action = 'list'; + if (window.location.href.includes("add")) this.action = "add"; - else if(window.location.href.includes("edit")) + else if (window.location.href.includes("edit")) this.action = "edit"; this.table = null; - + this.init(); } init() { - if(this.action == "edit") { + if (this.action == "edit") { - $('.gallery-img').on('click', function() { + $('.gallery-img').on('click', function () { let imageUrl = $(this).data('src'); // Obtiene la URL de la imagen $('#modalImage').attr('src', imageUrl); // Cambia la imagen en el modal $('#imageModal').modal('show'); // Muestra el modal }); - + } else if (this.action == "list") { this.#initDatatable(); } } - + #initDatatable() { + this.#headerSearcher(); + const self = this; const actions = ['view']; const columns = [ { 'data': 'id' }, - { 'data': 'categoria_id', + { + 'data': 'categoria_id', render: function (data, type, row) { return window.language.Tickets[row.categoria]; } - }, - { 'data': 'seccion_id' , + }, + { + 'data': 'seccion_id', render: function (data, type, row) { return window.language.Tickets[row.seccion]; } }, - { 'data': 'estado_id' , + { + 'data': 'estado_id', render: function (data, type, row) { return window.language.Tickets[row.estado]; } }, - { 'data': 'prioridad' , + { + 'data': 'prioridad', render: function (data, type, row) { return window.language.Tickets[data]; }, visible: false, }, { 'data': 'titulo' }, - { 'data': 'usuario_id' , + { + 'data': 'usuario_id', render: function (data, type, row) { return row.usuario; }, visible: false, }, - { 'data': 'user_soporte_id', + { + 'data': 'user_soporte_id', render: function (data, type, row) { return row.user_soporte; }, visible: false, - }, + }, { 'data': 'created_at' }, ]; @@ -88,7 +96,7 @@ class Ticket { columns, ); - + this.table.init({ actions: actions, buttonsExport: true, @@ -96,7 +104,7 @@ class Ticket { this.table.table.on('init.dt', function () { self.table.table.page.len(50).draw(); - if(window.userType==1){ + if (window.userType == 1) { self.table.table.column(4).visible(true); self.table.table.column(6).visible(true); @@ -108,25 +116,172 @@ class Ticket { } }); - this.table.setEditCallback(function(id){ + this.table.setEditCallback(function (id) { window.location.href = '/soporte/edit/' + id; }) } + + #headerSearcher() { + const self = this; + + $('#tableOfTickets thead tr').clone(true).appendTo('#tableOfTickets thead'); + $('#tableOfTickets thead tr:eq(1) th').each(function (i) { + if (!$(this).hasClass("noFilter")) { + var title = $(this).text(); + if (i == 8) { + + $(this).html(''); + var bsRangePickerRange = $('#bs-rangepicker-range') + bsRangePickerRange.daterangepicker({ + ranges: { + [window.language.datePicker.hoy]: [moment(), moment()], + [window.language.datePicker.ayer]: [moment().subtract(1, 'days'), moment().subtract(1, 'days')], + [window.language.datePicker.ultimos7]: [moment().subtract(6, 'days'), moment()], + [window.language.datePicker.ultimos30]: [moment().subtract(29, 'days'), moment()], + [window.language.datePicker.esteMes]: [moment().startOf('month'), moment().endOf('month')], + [window.language.datePicker.ultimoMes]: [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] + }, + opens: 'right', + language: 'i18n ?>', + "locale": { + "customRangeLabel": "", + "format": "YYYY-MM-DD", + "separator": " ", + "applyLabel": "", + "cancelLabel": "", + + }, + "alwaysShowCalendars": true, + autoUpdateInput: false, + + }); + + bsRangePickerRange.on('apply.daterangepicker', function (ev, picker) { + $(this).val(picker.startDate.format('YYYY-MM-DD') + ' ' + picker.endDate.format('YYYY-MM-DD')); + self.table + .column(i) + .search(this.value) + .draw(); + }); + + bsRangePickerRange.on('cancel.daterangepicker', function (ev, picker) { + $(this).val(''); + self.table + .column(i) + .search(this.value) + .draw(); + }); + + } + else if (i == 1) { + // Agregar un selector en la tercera columna + $(this).html(''); + + // Agregar opciones al selector + var selectorTipo = $('select', this); + selectorTipo.append(''); // Opción vacía + selectorTipo.append(''); + selectorTipo.append(''); + selectorTipo.append(''); + + selectorTipo.on('change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); + self.table.column(i).search(val).draw(); + }); + } + + else if (i == 2) { + // Agregar un selector en la tercera columna + $(this).html(''); + + // Agregar opciones al selector + var selectorSeccion = $('select', this); + selectorSeccion.append(''); // Opción vacía + selectorSeccion.append(''); + selectorSeccion.append(''); + selectorSeccion.append(''); + selectorSeccion.append(''); + selectorSeccion.append(''); + selectorSeccion.append(''); + + selectorSeccion.on('change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); + self.table.column(i).search(val).draw(); + }); + } + else if (i == 2) { + // Agregar un selector en la tercera columna + $(this).html(''); + + // Agregar opciones al selector + var selectorEstado = $('select', this); + selectorEstado.append(''); // Opción vacía + selectorEstado.append(''); + selectorEstado.append(''); + selectorEstado.append(''); + + selectorEstado.on('change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); + self.table.column(i).search(val).draw(); + }); + } + else if (i == 8) { + // Agregar un selector en la tercera columna + $(this).html(''); + + // Agregar opciones al selector + var selectorPrioridad = $('select', this); + selectorPrioridad.append(''); // Opción vacía + selectorPrioridad.append(''); + selectorPrioridad.append(''); + selectorPrioridad.append(''); + + selectorPrioridad.on('change', function () { + var val = $.fn.dataTable.util.escapeRegex( + $(this).val() + ); + self.table.column(i).search(val).draw(); + }); + } + else { + $(this).html(''); + + $('input', this).on('change clear', function () { + if (self.table.column(i).search() !== this.value) { + self.table + .column(i) + .search(this.value) + .draw(); + } + }); + } + } + else { + $(this).html(''); + } + }); + } } document.addEventListener('DOMContentLoaded', function () { - + const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); - new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Tickets'] }, {}, - function(translations) { + new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Tickets, datePicker'] }, {}, + function (translations) { window.language = JSON.parse(translations); new Ticket(); }, function (error) { console.log("Error getting translations:", error); } - ).post(); -}); + ).post(); +}); export default Ticket; \ No newline at end of file From b6decf8657bfba1b875cea5339985b90569e3c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Jim=C3=A9nez?= Date: Wed, 19 Feb 2025 21:35:55 +0100 Subject: [PATCH 8/9] terminado --- ci4/app/Config/Email.php | 2 +- .../Controllers/Soporte/Ticketcontroller.php | 79 ++++---- ci4/app/Language/es/Tickets.php | 4 + ci4/app/Models/Soporte/TicketModel.php | 49 ++++- .../vuexy/form/soporte/viewTicketList.php | 14 +- .../js/safekat/pages/soporte/tickets.js | 168 ++++++++++-------- 6 files changed, 195 insertions(+), 121 deletions(-) diff --git a/ci4/app/Config/Email.php b/ci4/app/Config/Email.php index e354e4f3..9447a491 100755 --- a/ci4/app/Config/Email.php +++ b/ci4/app/Config/Email.php @@ -48,7 +48,7 @@ class Email extends BaseConfig /** * SMTP Timeout (in seconds) */ - public int $SMTPTimeout = 5; + public int $SMTPTimeout = 15; /** * Enable persistent SMTP connections diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 0c732ffb..44a5386d 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -58,14 +58,14 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController return view(static::$viewPath . 'viewTicketList', $viewData); } - private function sendMail($subject,$body,$recipient) + private function sendMail($subject, $body, $recipient) { $settings_model = new SettingsModel(); $config = $settings_model->first()->toArray(); $gateway = $config['email_gateway']; $body = html_entity_decode($body); - if($gateway == 'smtp'){ + if ($gateway == 'smtp') { try { //https://codeigniter.com/user_guide/libraries/email.html $email = \Config\Services::email(); @@ -74,23 +74,22 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $config['SMTPUser'] = $config['email_address']; $config['SMTPPass'] = $config['email_pass']; $config['SMTPPort'] = intval($config['email_port']); - $config['SMTPCrypto'] = $config['email_cert']=='none'?'':$config['email_cert']; + $config['SMTPCrypto'] = $config['email_cert'] == 'none' ? '' : $config['email_cert']; $config['SMTPTimeout'] = 15; $config['mailType'] = 'html'; $config['wordWrap'] = true; $email->initialize($config); - $email->setFrom($config['email_address'], $config['email_name']); + $email->setFrom($config['email_address'], $config['email_name']); $email->setTo($recipient); $email->setSubject($subject); $email->setMessage($body); - if (!$email->send()) - { + if (!$email->send()) { return false; - }else{ + } else { return true; } } catch (\Exception $ex) { @@ -105,7 +104,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController //checkPermission('tickets.create', $this->indexRoute); - if ($this->request->getPost()) : + if ($this->request->getPost()): $nullIfEmpty = false; // !(phpversion() >= '8.1'); @@ -118,10 +117,10 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $sanitizedData = $this->sanitized($postData, $nullIfEmpty); $noException = true; - if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : + if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) : - if ($this->canValidate()) : + if ($this->canValidate()): try { $successfulResult = $this->model->skipValidation(true)->save($sanitizedData); } catch (\Exception $e) { @@ -135,7 +134,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $thenRedirect = true; // Change this to false if you want your user to stay on the form after submission endif; - if ($noException && $successfulResult) : + if ($noException && $successfulResult): $id = $this->model->db->insertID(); @@ -145,10 +144,10 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $userModel = new \App\Models\UserModel(); - $this->sendMail(lang('Tickets.newTicket'), lang('Tickets.newTicketBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['supportUser'])->email); + $this->sendMail(lang('Tickets.newTicket'), lang('Tickets.newTicketBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['user_soporte_id'])->email); - if ($thenRedirect) : - if (!empty($this->indexRoute)) : + if ($thenRedirect): + if (!empty($this->indexRoute)): return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message); else: return $this->redirect2listView('successMessage', $message); @@ -181,51 +180,63 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController { $modelRespuesta = new \App\Models\Soporte\TicketRespuestaModel(); - if ($requestedId == null) : + if ($requestedId == null): return $this->redirect2listView(); endif; $id = filter_var($requestedId, FILTER_SANITIZE_URL); $ticket = $this->model->find($id); - if ($ticket == false) : + if ($ticket == false): $message = lang('Basic.global.notFoundWithIdErr', [mb_strtolower(lang('Tickets.ticket')), $id]); return $this->redirect2listView('errorMessage', $message); endif; - if(!auth()->user()->can('Tickets.edit') && auth()->user()->id != $ticket->usuario_id){ + if (!auth()->user()->can('Tickets.edit') && auth()->user()->id != $ticket->usuario_id) { return redirect()->to(route_to('TicketIndex'))->with('errorMessage', lang('Basic.global.noPermission')); } - if ($this->request->getPost()) : + if ($this->request->getPost()): + + $oldUserSupport = $ticket->user_soporte_id; + $oldState = $ticket->estado_id; $postData = $this->request->getPost(); - $sanitizedData = $this->sanitized($postData, false); + $sanitizedData = $this->sanitized($postData, false); $noException = true; - if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : - if ($this->canValidate()) : + if ($successfulResult = $this->canValidate()): // if ($successfulResult = $this->validate($this->formValidationRules) ) : + if ($this->canValidate()): try { $successfulResult = $this->model->skipValidation(true)->update($id, $sanitizedData); $this->saveImages($id, $this->request->getFiles()); - if(auth()->user()->can('Tickets.edit')){ + if (auth()->user()->can('Tickets.edit')) { - $respuesta = $modelRespuesta->where('ticket_id', $id)->first(); - if($respuesta == null){ + $respuesta = $modelRespuesta->where('ticket_id', $id)->first(); + if ($respuesta == null) { $modelRespuesta->insert([ 'ticket_id' => $id, 'usuario_id' => auth()->user()->id, 'mensaje' => $sanitizedData['respuesta_mensaje'] ]); - }else{ + } else { $modelRespuesta->update($respuesta->id, [ 'mensaje' => $sanitizedData['respuesta_mensaje'], 'usuario_id' => auth()->user()->id, ]); } - + // envio de correos + $userModel = new \App\Models\UserModel(); + if ($oldUserSupport != $sanitizedData['supportUser']) { + $this->sendMail(lang('Tickets.asgignToChanged'), lang('Tickets.asgignToChangedBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['supportUser'])->email); + } + + if ($oldState != $sanitizedData['estado_id']) { + $this->sendMail(lang('Tickets.stateChange'), lang('Tickets.stateChangeBody') . base_url(route_to('editTicket', $id)), $userModel->find($ticket->usuario_id)->email); + } + } } catch (\Exception $e) { @@ -242,12 +253,12 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $thenRedirect = false; endif; - if ($noException && $successfulResult) : + if ($noException && $successfulResult): $id = $ticket->id ?? $id; $message = lang('Basic.global.updateSuccess', [lang('Basic.global.record')]) . '.'; - if ($thenRedirect) : - if (!empty($this->indexRoute)) : + if ($thenRedirect): + if (!empty($this->indexRoute)): return redirect()->to(route_to($this->indexRoute))->with('successMessage', $message); else: return $this->redirect2listView('successMessage', $message); @@ -295,9 +306,9 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController $searchValues = get_filter_datatables_columns($reqData); - if(auth()->user()->can('tickets.edit')){ + if (auth()->user()->can('tickets.edit')) { $user_id = null; - }else{ + } else { $user_id = auth()->user()->id; } @@ -359,9 +370,9 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController // Guardar en la base de datos $fileModel->insert([ 'nombre' => $originalName, - 'ticket_id' => $ticket_id, - 'hash' => $fileHash, - 'path' => 'uploads/tickets/' . $newFileName + 'ticket_id' => $ticket_id, + 'hash' => $fileHash, + 'path' => 'uploads/tickets/' . $newFileName ]); } } diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index 2cd8e9a8..15e10bdc 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -49,5 +49,9 @@ return [ // Mail 'newTicket' => 'Nuevo Ticket en ERP Safekat', + 'stateChange' => 'Cambio de estado en ticket en ERP Safekat', + 'asgignToChanged' => 'Asignado ticket en ERP Safekat', 'newTicketBody' => '

      Se ha creado un nuevo ticket en el sistema de soporte de Safekat ERP.

      Puede verlo en el siguiente enlace:

      ', + 'stateChangeBody' => '

      El estado de un ticket en el sistema de soporte de Safekat ERP ha cambiado.

      Puede verlo en el siguiente enlace:

      ', + 'asgignToChangedBody' => '

      Se le ha asignado un ticket en el sistema de soporte de Safekat ERP.

      Puede verlo en el siguiente enlace:

      ', ]; diff --git a/ci4/app/Models/Soporte/TicketModel.php b/ci4/app/Models/Soporte/TicketModel.php index 7860a6e6..b87441cf 100644 --- a/ci4/app/Models/Soporte/TicketModel.php +++ b/ci4/app/Models/Soporte/TicketModel.php @@ -8,7 +8,7 @@ class TicketModel extends \App\Models\BaseModel protected $table = 'tickets'; protected $primaryKey = 'id'; - protected $allowedFields = ['usuario_id', 'user_soporte_id', 'seccion_id' ,'categoria_id', 'estado_id', 'prioridad', 'titulo', 'descripcion', 'created_at', 'updated_at']; + protected $allowedFields = ['usuario_id', 'user_soporte_id', 'seccion_id', 'categoria_id', 'estado_id', 'prioridad', 'titulo', 'descripcion', 'created_at', 'updated_at']; protected $useTimestamps = true; @@ -29,8 +29,8 @@ class TicketModel extends \App\Models\BaseModel public function getEstados() { $values = $this->db->table('tickets_estados')->get()->getResultArray(); - - for($i = 0; $i < count($values); $i++){ + + for ($i = 0; $i < count($values); $i++) { $values[$i]['text'] = lang("Tickets." . $values[$i]['keyword']); } @@ -40,8 +40,8 @@ class TicketModel extends \App\Models\BaseModel public function getCategorias() { $values = $this->db->table('tickets_categorias')->get()->getResultArray(); - - for($i = 0; $i < count($values); $i++){ + + for ($i = 0; $i < count($values); $i++) { $values[$i]['text'] = lang("Tickets." . $values[$i]['keyword']); } @@ -52,7 +52,7 @@ class TicketModel extends \App\Models\BaseModel { $values = $this->db->table('tickets_secciones')->get()->getResultArray(); - for($i = 0; $i < count($values); $i++){ + for ($i = 0; $i < count($values); $i++) { $values[$i]['text'] = lang("Tickets." . $values[$i]['keyword']); } @@ -100,13 +100,44 @@ class TicketModel extends \App\Models\BaseModel else { $builder->groupStart(); foreach ($search as $col_search) { - if ($col_search[0] > 0 && $col_search[0] < 4) - $builder->where(self::SORTABLE[$col_search[0]], $col_search[2]); + if ($col_search[1] == "seccion_id") { + $id = $this->getIdFromKeyword("tickets_secciones", $col_search[2]); + $builder->where("t1." . $col_search[1], $id); + } else if ($col_search[1] == "categoria_id") { + $id = $this->getIdFromKeyword("tickets_categorias", $col_search[2]); + $builder->where("t1." . $col_search[1], $id); + } else if ($col_search[1] == "estado_id") { + $id = $this->getIdFromKeyword("tickets_estados", $col_search[2]); + $builder->where("t1." . $col_search[1], $id); + } else if ($col_search[1] == "prioridad") { + $builder->where("t1." . $col_search[1], $col_search[2]); + } else if ($col_search[1] == "created_at") { + $dates = explode(" ", $col_search[2]); + $builder->where("t1." . $col_search[1] . ">=", $dates[0]); + $builder->where("t1." . $col_search[1] . "<=", $dates[1]); + } else if ($col_search[1] == "usuario_id") { + $builder->like("t2.first_name", $col_search[2]); + $builder->orLike("t2.last_name", $col_search[2]); + } else if ($col_search[1] == "user_soporte_id") { + $builder->like("t6.first_name", $col_search[2]); + $builder->orLike("t6.last_name", $col_search[2]); + } else - $builder->like(self::SORTABLE[$col_search[0]], $col_search[2]); + $builder->like("t1." . $col_search[1], $col_search[2]); } $builder->groupEnd(); return $builder; + } } + + private function getIdFromKeyword($table, $keyword) + { + $subquery = $this->db->table($table) + ->select('id') + ->where('keyword', $keyword) + ->get() + ->getRow(); + return $subquery->id; + } } diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php index a1d546f5..b022bbee 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php @@ -21,12 +21,16 @@
      - + + + - - + + + + - + @@ -45,6 +49,7 @@ section('css') ?> "> +endSection() ?> @@ -65,6 +70,7 @@ crossorigin="anonymous" referrerpolicy="no-referrer"> +endSection() ?> diff --git a/httpdocs/assets/js/safekat/pages/soporte/tickets.js b/httpdocs/assets/js/safekat/pages/soporte/tickets.js index 9bdfc789..c442772f 100644 --- a/httpdocs/assets/js/safekat/pages/soporte/tickets.js +++ b/httpdocs/assets/js/safekat/pages/soporte/tickets.js @@ -38,55 +38,81 @@ class Ticket { #initDatatable() { - this.#headerSearcher(); - const self = this; + self.#headerSearcher(); + const actions = ['view']; - const columns = [ - { 'data': 'id' }, - { - 'data': 'categoria_id', - render: function (data, type, row) { - return window.language.Tickets[row.categoria]; - } - }, - { - 'data': 'seccion_id', - render: function (data, type, row) { - return window.language.Tickets[row.seccion]; - } - }, - { - 'data': 'estado_id', - render: function (data, type, row) { - return window.language.Tickets[row.estado]; - } - }, - { - 'data': 'prioridad', - render: function (data, type, row) { - return window.language.Tickets[data]; + + let columns = []; + if (window.userType == 1) { + columns = [ + { 'data': 'id' }, + { + 'data': 'categoria_id', + render: function (data, type, row) { + return window.language.Tickets[row.categoria]; + } }, - visible: false, - }, - { 'data': 'titulo' }, - { - 'data': 'usuario_id', - render: function (data, type, row) { - return row.usuario; + { + 'data': 'seccion_id', + render: function (data, type, row) { + return window.language.Tickets[row.seccion]; + } }, - visible: false, - }, - { - 'data': 'user_soporte_id', - render: function (data, type, row) { - return row.user_soporte; + { + 'data': 'estado_id', + render: function (data, type, row) { + return window.language.Tickets[row.estado]; + } }, - visible: false, - }, - { 'data': 'created_at' }, - ]; + { + 'data': 'prioridad', + render: function (data, type, row) { + return window.language.Tickets[data]; + }, + }, + { 'data': 'titulo' }, + { + 'data': 'usuario_id', + render: function (data, type, row) { + return row.usuario; + }, + }, + { + 'data': 'user_soporte_id', + render: function (data, type, row) { + return row.user_soporte; + }, + }, + { 'data': 'created_at' }, + ]; + } + else { + columns = [ + { 'data': 'id' }, + { + 'data': 'categoria_id', + render: function (data, type, row) { + return window.language.Tickets[row.categoria]; + } + }, + { + 'data': 'seccion_id', + render: function (data, type, row) { + return window.language.Tickets[row.seccion]; + } + }, + { + 'data': 'estado_id', + render: function (data, type, row) { + return window.language.Tickets[row.estado]; + } + }, + { 'data': 'titulo' }, + { 'data': 'created_at' }, + ]; + } this.table = new Table( @@ -103,17 +129,10 @@ class Ticket { }); this.table.table.on('init.dt', function () { - self.table.table.page.len(50).draw(); - if (window.userType == 1) { - self.table.table.column(4).visible(true); - self.table.table.column(6).visible(true); - self.table.table.column(7).visible(true); + self.table.table.page.len(100).draw(); + self.table.table.draw(); - self.table.table.column(4).header().style.display = 'table-cell'; - self.table.table.column(6).header().style.display = 'table-cell'; - self.table.table.column(7).header().style.display = 'table-cell'; - } }); this.table.setEditCallback(function (id) { @@ -124,11 +143,14 @@ class Ticket { #headerSearcher() { const self = this; - $('#tableOfTickets thead tr').clone(true).appendTo('#tableOfTickets thead'); + $('#tableOfTickets thead tr.search-header').remove(); + let searchRow = $('#tableOfTickets thead tr').first().clone(true); + searchRow.addClass('search-header').appendTo('#tableOfTickets thead'); + $('#tableOfTickets thead tr:eq(1) th').each(function (i) { if (!$(this).hasClass("noFilter")) { var title = $(this).text(); - if (i == 8) { + if (title == window.language.Tickets.fechaCreacion) { $(this).html(''); var bsRangePickerRange = $('#bs-rangepicker-range') @@ -142,13 +164,13 @@ class Ticket { [window.language.datePicker.ultimoMes]: [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')] }, opens: 'right', - language: 'i18n ?>', + language: $('html').attr('lang'), "locale": { - "customRangeLabel": "", + "customRangeLabel": window.language.datePicker.personalizar, "format": "YYYY-MM-DD", "separator": " ", - "applyLabel": "", - "cancelLabel": "", + "applyLabel": window.language.datePicker.aplicar, + "cancelLabel": window.language.datePicker.limpiar, }, "alwaysShowCalendars": true, @@ -158,7 +180,7 @@ class Ticket { bsRangePickerRange.on('apply.daterangepicker', function (ev, picker) { $(this).val(picker.startDate.format('YYYY-MM-DD') + ' ' + picker.endDate.format('YYYY-MM-DD')); - self.table + self.table.table .column(i) .search(this.value) .draw(); @@ -166,14 +188,14 @@ class Ticket { bsRangePickerRange.on('cancel.daterangepicker', function (ev, picker) { $(this).val(''); - self.table + self.table.table .column(i) .search(this.value) .draw(); }); } - else if (i == 1) { + else if (title == window.language.Tickets.tipo) { // Agregar un selector en la tercera columna $(this).html(''); @@ -188,11 +210,11 @@ class Ticket { var val = $.fn.dataTable.util.escapeRegex( $(this).val() ); - self.table.column(i).search(val).draw(); + self.table.table.column(i).search(val).draw(); }); } - else if (i == 2) { + else if (title == window.language.Tickets.seccion) { // Agregar un selector en la tercera columna $(this).html(''); @@ -210,10 +232,10 @@ class Ticket { var val = $.fn.dataTable.util.escapeRegex( $(this).val() ); - self.table.column(i).search(val).draw(); + self.table.table.column(i).search(val).draw(); }); } - else if (i == 2) { + else if (title == window.language.Tickets.estado) { // Agregar un selector en la tercera columna $(this).html(''); @@ -223,15 +245,15 @@ class Ticket { selectorEstado.append(''); selectorEstado.append(''); selectorEstado.append(''); - + selectorEstado.on('change', function () { var val = $.fn.dataTable.util.escapeRegex( $(this).val() ); - self.table.column(i).search(val).draw(); + self.table.table.column(i).search(val).draw(); }); } - else if (i == 8) { + else if (title == window.language.Tickets.prioridad) { // Agregar un selector en la tercera columna $(this).html(''); @@ -241,20 +263,20 @@ class Ticket { selectorPrioridad.append(''); selectorPrioridad.append(''); selectorPrioridad.append(''); - + selectorPrioridad.on('change', function () { var val = $.fn.dataTable.util.escapeRegex( $(this).val() ); - self.table.column(i).search(val).draw(); + self.table.table.column(i).search(val).draw(); }); } else { $(this).html(''); $('input', this).on('change clear', function () { - if (self.table.column(i).search() !== this.value) { - self.table + if (self.table.table.column(i).search() !== this.value) { + self.table.table .column(i) .search(this.value) .draw(); @@ -273,7 +295,7 @@ document.addEventListener('DOMContentLoaded', function () { const locale = document.querySelector('meta[name="locale"]').getAttribute('content'); - new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Tickets, datePicker'] }, {}, + new Ajax('/translate/getTranslation', { locale: locale, translationFile: ['Tickets', 'datePicker'] }, {}, function (translations) { window.language = JSON.parse(translations); new Ticket(); From fdd507692053d052a7deb46ee2ce2f612b8b9cb1 Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Thu, 20 Feb 2025 10:50:23 +0100 Subject: [PATCH 9/9] =?UTF-8?q?a=C3=B1adida=20validacion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Soporte/Ticketcontroller.php | 4 ++-- ci4/app/Language/es/Tickets.php | 13 +++++++++++ ci4/app/Models/Soporte/TicketModel.php | 22 +++++++++++++++++++ .../vuexy/form/soporte/viewTicketForm.php | 2 +- 4 files changed, 38 insertions(+), 3 deletions(-) diff --git a/ci4/app/Controllers/Soporte/Ticketcontroller.php b/ci4/app/Controllers/Soporte/Ticketcontroller.php index 44a5386d..a50c7889 100644 --- a/ci4/app/Controllers/Soporte/Ticketcontroller.php +++ b/ci4/app/Controllers/Soporte/Ticketcontroller.php @@ -229,8 +229,8 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController // envio de correos $userModel = new \App\Models\UserModel(); - if ($oldUserSupport != $sanitizedData['supportUser']) { - $this->sendMail(lang('Tickets.asgignToChanged'), lang('Tickets.asgignToChangedBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['supportUser'])->email); + if ($oldUserSupport != $sanitizedData['user_soporte_id']) { + $this->sendMail(lang('Tickets.asgignToChanged'), lang('Tickets.asgignToChangedBody') . base_url(route_to('editTicket', $id)), $userModel->find($sanitizedData['user_soporte_id'])->email); } if ($oldState != $sanitizedData['estado_id']) { diff --git a/ci4/app/Language/es/Tickets.php b/ci4/app/Language/es/Tickets.php index 15e10bdc..020d304f 100644 --- a/ci4/app/Language/es/Tickets.php +++ b/ci4/app/Language/es/Tickets.php @@ -54,4 +54,17 @@ return [ 'newTicketBody' => '

      Se ha creado un nuevo ticket en el sistema de soporte de Safekat ERP.

      Puede verlo en el siguiente enlace:

      ', 'stateChangeBody' => '

      El estado de un ticket en el sistema de soporte de Safekat ERP ha cambiado.

      Puede verlo en el siguiente enlace:

      ', 'asgignToChangedBody' => '

      Se le ha asignado un ticket en el sistema de soporte de Safekat ERP.

      Puede verlo en el siguiente enlace:

      ', + + 'validation' => [ + 'titulo' => [ + 'max_length' => 'El campo {field} no puede exceder {param} caracteres en longitud.', + 'required' => 'El campo {field} es obligatorio.', + + ], + + 'descripcion' => [ + 'required' => 'El campo {field} es obligatorio.', + + ], + ], ]; diff --git a/ci4/app/Models/Soporte/TicketModel.php b/ci4/app/Models/Soporte/TicketModel.php index b87441cf..0ab09a66 100644 --- a/ci4/app/Models/Soporte/TicketModel.php +++ b/ci4/app/Models/Soporte/TicketModel.php @@ -26,6 +26,28 @@ class TicketModel extends \App\Models\BaseModel 8 => "t1.created_at", ]; + protected $validationRules = [ + "titulo" => [ + "label" => "Tickets.asunto", + "rules" => "trim|required|max_length[255]", + ], + "descripcion" => [ + "label" => "Tickets.descripcion", + "rules" => "trim|required", + ], + ]; + + protected $validationMessages = [ + "titulo" => [ + "max_length" => "Tickets.validation.titulo.max_length", + "required" => "Tickets.validation.titulo.required", + ], + "descripcion" => [ + "decimal" => "Tickets.validation.descripcion.decimal", + "required" => "Tickets.validation.descripcion.required", + ], + ]; + public function getEstados() { $values = $this->db->table('tickets_estados')->get()->getResultArray(); diff --git a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php index 15185eca..4a12a566 100644 --- a/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php +++ b/ci4/app/Views/themes/vuexy/form/soporte/viewTicketForm.php @@ -99,7 +99,7 @@
      -