terminado

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

ci4/app/Controllers/Soporte/Ticketcontroller.php

@@ -87,8 +87,7 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
                 $email->setSubject($subject);
                 $email->setMessage($body);
 
-                if (!$email->send())
+                if (!$email->send()) {
-                {
                     return false;
                 } else {
                     return true;
@@ -145,7 +144,7 @@ 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)):
@@ -198,6 +197,9 @@ class Ticketcontroller extends \App\Controllers\BaseResourceController
 
         if ($this->request->getPost()):
 
+            $oldUserSupport = $ticket->user_soporte_id;
+            $oldState = $ticket->estado_id;
+
             $postData = $this->request->getPost();
             $sanitizedData = $this->sanitized($postData, false);
 
@@ -225,6 +227,15 @@ 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 ($oldState != $sanitizedData['estado_id']) {
+                                $this->sendMail(lang('Tickets.stateChange'), lang('Tickets.stateChangeBody') . base_url(route_to('editTicket', $id)), $userModel->find($ticket->usuario_id)->email);
+                            }
 
                         }
 

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' => '<p>Se ha creado un nuevo ticket en el sistema de soporte de Safekat ERP. <br><br>Puede verlo en el siguiente enlace:</p>',
+    'stateChangeBody' => '<p>El estado de un ticket en el sistema de soporte de Safekat ERP ha cambiado. <br><br>Puede verlo en el siguiente enlace:</p>',
+    'asgignToChangedBody' => '<p>Se le ha asignado un ticket en el sistema de soporte de Safekat ERP. <br><br>Puede verlo en el siguiente enlace:</p>',
 ];

ci4/app/Models/Soporte/TicketModel.php

@@ -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)
+                if ($col_search[1] == "seccion_id") {
-                    $builder->where(self::SORTABLE[$col_search[0]], $col_search[2]);
+                    $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;
+    }
 }

ci4/app/Views/themes/vuexy/form/soporte/viewTicketList.php

@@ -21,12 +21,16 @@
                             <th><?= lang('Tickets.tipo') ?></th>
                             <th><?= lang('Tickets.seccion') ?></th>
                             <th><?= lang('Tickets.estado') ?></th>
-                            <th style="display: none;"><?= lang('Tickets.prioridad') ?></th>
+                            <?php if ($userType == 1) : ?>
+                            <th><?= lang('Tickets.prioridad') ?></th>
+                            <?php endif; ?>
                             <th><?= lang('Tickets.asunto') ?></th>
-                            <th style="display: none;"><?= lang('Tickets.usuario') ?></th>
+                            <?php if ($userType == 1) : ?>
-                            <th style="display: none;"><?= lang('Tickets.asignarTo') ?></th>
+                            <th><?= lang('Tickets.usuario') ?></th>
+                            <th><?= lang('Tickets.asignarTo') ?></th>
+                            <?php endif; ?>
                             <th><?= lang('Tickets.fechaCreacion') ?></th>
-                            <th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
+                            <th class="text-nowrap noFilter"><?= lang('Basic.global.Action') ?></th>
                         </tr>
                     </thead>
                     <tbody>
@@ -45,6 +49,7 @@
 <?= $this->section('css') ?>
 <link rel="stylesheet"
     href="<?= site_url("/themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.bootstrap5.min.css") ?>">
+<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/bootstrap-daterangepicker/bootstrap-daterangepicker.css') ?>" />
 <?= $this->endSection() ?>
 
 
@@ -65,6 +70,7 @@
     crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script src="<?= site_url("/themes/vuexy/vendor/libs/datatables-sk/plugins/pdfmake/vfs_fonts.js") ?>"></script>
 <script src="<?= site_url("/themes/vuexy/vendor/libs/datatables-sk/plugins/buttons/buttons.colVis.min.js") ?>"></script>
+<script src="<?= site_url('themes/vuexy/vendor/libs/bootstrap-daterangepicker/bootstrap-daterangepicker.js') ?>"></script>
 
 <script type="module" src="<?= site_url('assets/js/safekat/pages/soporte/tickets.js') ?>"></script>
 <?= $this->endSection() ?>

httpdocs/assets/js/safekat/pages/soporte/tickets.js

@@ -38,12 +38,15 @@ class Ticket {
 
     #initDatatable() {
 
-        this.#headerSearcher();
-
         const self = this;
 
+        self.#headerSearcher();
+
         const actions = ['view'];
-        const columns = [
+
+        let columns = [];
+        if (window.userType == 1) {
+            columns = [
                 { 'data': 'id' },
                 {
                     'data': 'categoria_id',
@@ -68,7 +71,6 @@ class Ticket {
                     render: function (data, type, row) {
                         return window.language.Tickets[data];
                     },
-                visible: false,
                 },
                 { 'data': 'titulo' },
                 {
@@ -76,17 +78,41 @@ class Ticket {
                     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' },
             ];
+        }
+        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.page.len(100).draw();
-                self.table.table.column(6).visible(true);
+            self.table.table.draw();
-                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) {
@@ -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('<input id="bs-rangepicker-range" type="text" class="form-control " style="min-width:100px;max-width:120px;font-size:0.8rem !important;"  />');
                     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: '<?= config('Basics')->i18n ?>',
+                        language: $('html').attr('lang'),
                         "locale": {
-                            "customRangeLabel": "<?= lang('datePicker.personalizar') ?>",
+                            "customRangeLabel": window.language.datePicker.personalizar,
                             "format": "YYYY-MM-DD",
                             "separator": " ",
-                            "applyLabel": "<?= lang('datePicker.aplicar') ?>",
+                            "applyLabel": window.language.datePicker.aplicar,
-                            "cancelLabel": "<?= lang('datePicker.limpiar') ?>",
+                            "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('<select class="form-control" style="min-width:100px;max-width:120px;font-size:0.8rem !important;"></select>');
 
@@ -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('<select class="form-control" style="min-width:100px;max-width:120px;font-size:0.8rem !important;"></select>');
 
@@ -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('<select class="form-control" style="min-width:100px;max-width:120px;font-size:0.8rem !important;"></select>');
 
@@ -228,10 +250,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 == 8) {
+                else if (title == window.language.Tickets.prioridad) {
                     // Agregar un selector en la tercera columna
                     $(this).html('<select class="form-control" style="min-width:100px;max-width:120px;font-size:0.8rem !important;"></select>');
 
@@ -246,15 +268,15 @@ 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 {
                     $(this).html('<input type="text" class="form-control " style="min-width:100px;max-width:120px;font-size:0.8rem !important;"  />');
 
                     $('input', this).on('change clear', function () {
-                        if (self.table.column(i).search() !== this.value) {
+                        if (self.table.table.column(i).search() !== this.value) {
-                            self.table
+                            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();