From dc4647fee774d25e0972602d0a381729883cc2c5 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Thu, 3 Apr 2025 19:51:07 +0200
Subject: [PATCH 1/5] add default value if cargo is null in query

---
 ci4/app/Models/Clientes/ClienteModel.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci4/app/Models/Clientes/ClienteModel.php b/ci4/app/Models/Clientes/ClienteModel.php
index 77af360d..f2d19bbb 100755
--- a/ci4/app/Models/Clientes/ClienteModel.php
+++ b/ci4/app/Models/Clientes/ClienteModel.php
@@ -596,7 +596,7 @@ class ClienteModel extends \App\Models\BaseModel
         $query = $this->builder()->select([
             "cliente_contactos.id",
             "CONCAT(COALESCE(cliente_contactos.nombre,''),' ',COALESCE(cliente_contactos.apellidos,'')) as name",
-            'cliente_contactos.cargo as description'
+            "COALESCE(cliente_contactos.cargo,'".lang("ClienteContactos.cargo_null")."') as description"
         ])
             ->join('cliente_contactos', 'cliente_contactos.cliente_id = clientes.id', 'left')
             ->where('cliente_contactos.deleted_at',null)

From 465ab4c8f5d0b6669ec96323800a0e22adf48a48 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Thu, 3 Apr 2025 19:51:19 +0200
Subject: [PATCH 2/5] add cargo_null key

---
 ci4/app/Language/es/ClienteContactos.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci4/app/Language/es/ClienteContactos.php b/ci4/app/Language/es/ClienteContactos.php
index d8ccfb0d..607ccada 100755
--- a/ci4/app/Language/es/ClienteContactos.php
+++ b/ci4/app/Language/es/ClienteContactos.php
@@ -5,6 +5,7 @@
 return [
 		'apellidos' => 'Apellidos',
 		'cargo' => 'Cargo',
+		'cargo_null' => 'Sin cargo',
 		'cliente' => 'Cliente ID',
 		'cliente-contactos' => 'Contactos de cliente',
 		'clienteId' => 'Cliente ID',

From 0cde6d5fc5ec4e489fd47fbbe2c773c729f4e040 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Thu, 3 Apr 2025 19:51:52 +0200
Subject: [PATCH 3/5] allow all roles except cliente-administrador y cliente

---
 ci4/app/Views/themes/vuexy/components/chat_factura.php    | 6 +++---
 .../themes/vuexy/components/chat_internal_factura.php     | 8 ++++----
 .../themes/vuexy/components/chat_internal_pedido.php      | 8 ++++----
 .../themes/vuexy/components/chat_internal_presupuesto.php | 8 ++++----
 ci4/app/Views/themes/vuexy/components/chat_pedido.php     | 6 +++---
 .../Views/themes/vuexy/components/chat_presupuesto.php    | 6 +++---
 ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php   | 2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/ci4/app/Views/themes/vuexy/components/chat_factura.php b/ci4/app/Views/themes/vuexy/components/chat_factura.php
index 6e0ae25a..72b1f64a 100644
--- a/ci4/app/Views/themes/vuexy/components/chat_factura.php
+++ b/ci4/app/Views/themes/vuexy/components/chat_factura.php
@@ -26,7 +26,7 @@
                 </div>
                 <hr class="container-m-nx m-0" />
                 <div class="sidebar-body">
-                    <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                    <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
                         <div class="mb-0 px-4 pt-3 pb-2">
                             <select class="form-control chat-search-client"></select>
                         </div>
@@ -68,7 +68,7 @@
 
                             </div>
                             <div class="d-flex align-items-center">
-                                <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                                <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
 
                                     <div class="ml-2 px-2">
                                         <button type="button" class="btn btn-danger btn-sm exit-chat">
@@ -121,7 +121,7 @@
                                 placeholder="<?= lang('Chat.write_message_placeholder') ?>" />
                             <div class="message-actions d-flex align-items-center">
 
-                                <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                                <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
                                     <button type="button" class="btn btn-primary d-flex send-msg-btn" style="color:white"
                                         id="send-msg-btn-deparment" disabled>
                                         <i class="ti ti-send me-md-1 me-0"></i>
diff --git a/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php b/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php
index ab98558e..49761eae 100644
--- a/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php
+++ b/ci4/app/Views/themes/vuexy/components/chat_internal_factura.php
@@ -13,19 +13,19 @@
                 <div class="nav-align-top">
                     <ul class="nav nav-pills mb-4" role="tablist">
                         <li class="nav-item">
-                            <button type="button" class="nav-link <?=!auth()->user()->inGroup('cliente-editor','cliente') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false"><?=lang('Chat.messages_client')?></button>
+                            <button type="button" class="nav-link <?=!auth()->user()->inGroup('cliente-administrador','cliente') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false"><?=lang('Chat.messages_client')?></button>
                         </li>
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')) { ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')) { ?>
                         <li class="nav-item">
                             <button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false"><?=lang('Chat.messages_internal')?></button>
                         </li>
                         <?php } ?>
                     </ul>
                     <div class="tab-content">
-                        <div class="tab-pane fade <?=!auth()->user()->inGroup('cliente-editor','cliente') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
+                        <div class="tab-pane fade <?=!auth()->user()->inGroup('cliente-administrador','cliente') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
                             <?= view("themes/vuexy/components/chat_factura", data: ["modelId" => $modelId,"type" => "factura"]) ?>
                         </div>
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')) { ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')) { ?>
                         <div class="tab-pane fade show active" id="navs-pills-top-internal-messages" role="tabpanel">
                         <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId,"type" => "factura"]) ?>
                         </div>
diff --git a/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php
index 1337172b..a12f11da 100644
--- a/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php
+++ b/ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php
@@ -13,19 +13,19 @@
                 <div class="nav-align-top">
                     <ul class="nav nav-pills mb-4" role="tablist">
                         <li class="nav-item">
-                            <button type="button" class="nav-link <?=!auth()->user()->inGroup('cliente-editor','cliente') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false"><?=lang('Chat.messages_client')?></button>
+                            <button type="button" class="nav-link <?=!auth()->user()->inGroup('cliente-administrador','cliente') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false"><?=lang('Chat.messages_client')?></button>
                         </li>
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')) { ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')) { ?>
                         <li class="nav-item">
                             <button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false"><?=lang('Chat.messages_internal')?></button>
                         </li>
                         <?php } ?>
                     </ul>
                     <div class="tab-content">
-                        <div class="tab-pane fade <?=!auth()->user()->inGroup('cliente-editor','cliente') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
+                        <div class="tab-pane fade <?=!auth()->user()->inGroup('cliente-administrador','cliente') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
                             <?= view("themes/vuexy/components/chat_pedido", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
                         </div>
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')) { ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')) { ?>
                             <div class="tab-pane fade show active" id="navs-pills-top-internal-messages" role="tabpanel">
                                 <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
                             </div>
diff --git a/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php b/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php
index 2c0a1d30..7023811d 100644
--- a/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php
+++ b/ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php
@@ -13,19 +13,19 @@
                 <div class="nav-align-top">
                     <ul class="nav nav-pills mb-4" role="tablist">
                         <li class="nav-item">
-                            <button type="button" class="nav-link <?= !auth()->user()->inGroup('cliente-editor','cliente') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false"><?= lang('Chat.messages_client') ?></button>
+                            <button type="button" class="nav-link <?= !auth()->user()->inGroup('cliente-administrador','cliente') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false"><?= lang('Chat.messages_client') ?></button>
                         </li>
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')) { ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')) { ?>
                             <li class="nav-item">
                                 <button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false"><?= lang('Chat.messages_internal') ?></button>
                             </li>
                         <?php } ?>
                     </ul>
                     <div class="tab-content">
-                        <div class="tab-pane fade <?= !auth()->user()->inGroup('cliente-editor','cliente') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
+                        <div class="tab-pane fade <?= !auth()->user()->inGroup('cliente-administrador','cliente') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
                             <?= view("themes/vuexy/components/chat_presupuesto", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
                         </div>
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')) { ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')) { ?>
                             <div class="tab-pane fade show active" id="navs-pills-top-internal-messages" role="tabpanel">
                                 <?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
                             </div>
diff --git a/ci4/app/Views/themes/vuexy/components/chat_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_pedido.php
index caf1355d..d779f831 100644
--- a/ci4/app/Views/themes/vuexy/components/chat_pedido.php
+++ b/ci4/app/Views/themes/vuexy/components/chat_pedido.php
@@ -27,7 +27,7 @@
                 <hr class="container-m-nx m-0" />
                 <div class="sidebar-body">
                     <div class="chat-contact-list-item-title">
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
                             <div class="mb-0 px-4 pt-3 pb-2">
                                 <select class="form-control chat-search-client"></select>
                             </div>
@@ -67,7 +67,7 @@
 
                             </div>
                             <div class="d-flex align-items-center">
-                                <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                                <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
 
                                     <div class="ml-2 px-2">
                                         <button type="button" class="btn btn-danger btn-sm exit-chat">
@@ -118,7 +118,7 @@
                             <input class="form-control message-input border-0 me-3 shadow-none"
                                 placeholder="<?= lang('Chat.write_message_placeholder') ?>" />
                             <div class="message-actions d-flex align-items-center">
-                                <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                                <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
                                     <button type="button" class="btn btn-primary d-flex send-msg-btn" style="color:white"
                                         id="send-msg-btn-deparment" disabled>
                                         <i class="ti ti-send me-md-1 me-0"></i>
diff --git a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php
index 92592794..9e8d9421 100644
--- a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php
+++ b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php
@@ -26,7 +26,7 @@
                 <hr class="container-m-nx m-0" />
                 <div class="sidebar-body">
                     <div class="chat-contact-list-item-title">
-                        <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                        <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
                             <div class="mb-0 px-4 pt-3 pb-2">
                                 <select class="form-control chat-search-client"></select>
                             </div>
@@ -69,7 +69,7 @@
                             </div>
 
                             <div class="d-flex align-items-center">
-                                <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                                <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
 
                                     <div class="ml-2 px-2">
                                         <button type="button" class="btn btn-danger btn-sm exit-chat">
@@ -117,7 +117,7 @@
                             <input class="form-control message-input border-0 me-3 shadow-none"
                                 placeholder="<?= lang('Chat.write_message_placeholder') ?>" />
                             <div class="message-actions d-flex align-items-center">
-                                <?php if (!auth()->user()->inGroup('cliente-editor','cliente')): ?>
+                                <?php if (!auth()->user()->inGroup('cliente-administrador','cliente')): ?>
                                     <button type="button" class="btn btn-primary d-flex send-msg-btn" style="color:white"
                                         id="send-msg-btn-deparment" disabled>
                                         <i class="ti ti-send me-md-1 me-0"></i>
diff --git a/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php b/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php
index 7faa33da..823edf87 100644
--- a/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php
+++ b/ci4/app/Views/themes/vuexy/main/menus/mensajes_menu.php
@@ -2,7 +2,7 @@
 /**
  * MENU MENSAJES
  */
-if (auth()->user()->inGroup('beta') || auth()->user()->inGroup('cliente-editor')) {
+if (!auth()->user()->inGroup('cliente-administrador','cliente')) {
     ?>
     <!-- Messages -->
     <li class="menu-item">

From e593f3000bd3f1449cba214cafbe119d66a56a47 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Thu, 3 Apr 2025 20:20:36 +0200
Subject: [PATCH 4/5] roles message datatatables

---
 ci4/app/Models/Chat/ChatModel.php | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/ci4/app/Models/Chat/ChatModel.php b/ci4/app/Models/Chat/ChatModel.php
index ddc06bcc..88bbad19 100644
--- a/ci4/app/Models/Chat/ChatModel.php
+++ b/ci4/app/Models/Chat/ChatModel.php
@@ -770,7 +770,7 @@ class ChatModel extends Model
             ->join("users u", "u.id = cm.sender_id", 'left')
             ->where("chats.presupuesto_id is NOT NULL", NULL, FALSE);
 
-        if (auth()->user()->inGroup("admin") == false) {
+        if (auth()->user()->inGroup("cliente-administrador","cliente")) {
             $query->where('presupuestos.cliente_id', auth()->user()->cliente_id)
                 ->where("chats.chat_department_id is NOT NULL", NULL, FALSE);
         }
@@ -801,7 +801,7 @@ class ChatModel extends Model
             ->join("presupuestos", "presupuestos.id = pedidos_linea.presupuesto_id", 'left')
             ->where("chats.pedido_id is NOT NULL", NULL, FALSE);
 
-        if (auth()->user()->inGroup("admin") == false) {
+        if (auth()->user()->inGroup("cliente-administrador","cliente")) {
             $query->where('presupuestos.cliente_id', auth()->user()->cliente_id)
                 ->where("chats.chat_department_id is NOT NULL", NULL, FALSE);
         }
@@ -831,12 +831,10 @@ class ChatModel extends Model
             ->join("facturas", "facturas.id = chats.factura_id", "left")
             ->where("chats.factura_id is NOT NULL", NULL, FALSE);
 
-        if (auth()->user()->inGroup("admin") == false) {
-            if (auth()->user()->inGroup("admin") == false) {
+            if (auth()->user()->inGroup("cliente-administrador","cliente")) {
                 $query->where('facturas.cliente_id', auth()->user()->cliente_id)
                     ->where("chats.chat_department_id is NOT NULL", NULL, FALSE);
             }
-        }
         return $query->groupBy('chatMessageId');
     }
     public function createNewDirectChat(string $title, string $message, array $users)

From 41bdae0623b570fd0ec2d06fe337aea22b689ed0 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Thu, 3 Apr 2025 20:20:49 +0200
Subject: [PATCH 5/5] fix focus dropdown notifications unviewed

---
 .../datatables/MessagesDatatable.js           | 19 ++++---------------
 .../configuracion/messages/messagePage.js     |  4 ++++
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js
index 7b5ab74d..7b91f0c5 100644
--- a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js
+++ b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js
@@ -7,6 +7,7 @@ class MessagesDatatable {
         this.datatablePresupuestoMessageItem = this.item.find("#tablePresupuestoMessages")
         this.datatablePedidoMessageItem = this.item.find("#tablePedidoMessages")
         this.datatableFacturaMessageItem = this.item.find("#tableFacturaMessages")
+        this.focusTable = this.datatableItem
         this.columnDefs = [
         ]
         this.datatableColumns = [
@@ -49,7 +50,7 @@ class MessagesDatatable {
     init() {
         this.item.on('click', '.btn-notification-viewed', (event) => {
             const chatMessageId = $(event.currentTarget).data('id')
-            $(`#dropdown-viewed-${chatMessageId}`).empty()
+            this.focusTable.find(`#dropdown-viewed-${chatMessageId}`).empty()
             this.handleDropUp(chatMessageId)
         })
 
@@ -160,27 +161,15 @@ class MessagesDatatable {
         const notifications = response.data.notifications
 
         if (notifications.length > 0) {
-
             notifications.forEach(user => {
                 if (user.userFullName || user.userName) {
-
-                    $(`#dropdown-viewed-${chat_message_id}`)
+                    console.log(user.userFullName)
+                    this.focusTable.find(`#dropdown-viewed-${chat_message_id}`)
                         .append(this.addDropUpItem(user))
                 }
 
             });
         }
-        // if (viewedNotifications.length > 0) {
-
-        //     viewedNotifications.forEach(user => {
-        //         if (user.userFullName || user.userName) {
-
-        //             $(`#dropdown-viewed-${chat_message_id}`)
-        //                 .append(this.addDropUpItem(user))
-        //         }
-
-        //     });
-        // } 
     }
     handleDropUpError() { }
     addDropUpItem(user)
diff --git a/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js b/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js
index 25d1d500..97543c74 100644
--- a/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js
+++ b/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js
@@ -40,15 +40,19 @@ class MessagePage {
 
         $("#navs-top-align-all-tab").on("click",()=>{
             this.messageDatatable.datatable.ajax.reload()
+            this.messageDatatable.focusTable = this.messageDatatable.datatableItem
         })
         $("#navs-top-align-presupuestos-tab").on("click",()=>{
             this.messageDatatable.datatablePresupuestoMessage.ajax.reload()
+            this.messageDatatable.focusTable = this.messageDatatable.datatablePresupuestoMessageItem
         })
         $("#navs-top-align-pedidos-tab").on("click",()=>{
             this.messageDatatable.datatablePedidoMessage.ajax.reload()
+            this.messageDatatable.focusTable = this.messageDatatable.datatablePedidoMessageItem
         })
         $("#navs-top-align-facturas-tab").on("click",()=>{
             this.messageDatatable.datatableFacturaMessage.ajax.reload()
+            this.messageDatatable.focusTable = this.messageDatatable.datatableFacturaMessageItem
         })
 
     }