From 55157d23aaecb412efe2d75cf89dc871c0fa894a Mon Sep 17 00:00:00 2001 From: amazuecos Date: Sun, 16 Mar 2025 23:13:03 +0100 Subject: [PATCH 1/7] message client department --- ci4/app/Config/Routes.php | 3 + ci4/app/Controllers/Chat/ChatController.php | 92 ++++++++++++++---- ci4/app/Language/en/Chat.php | 45 +++++++++ ci4/app/Language/es/Chat.php | 11 ++- .../themes/vuexy/components/chat_factura.php | 43 +++++---- .../themes/vuexy/components/chat_pedido.php | 44 +++++---- .../vuexy/components/chat_presupuesto.php | 42 +++++---- .../safekat/components/alerts/sweetAlert.js | 26 ++--- httpdocs/assets/js/safekat/components/chat.js | 94 ++++++++++++++++++- 9 files changed, 318 insertions(+), 82 deletions(-) create mode 100644 ci4/app/Language/en/Chat.php diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index b4f6144b..bbd2c1e0 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -898,6 +898,9 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->get('department/pedido/(:num)/(:num)', 'ChatController::get_chat_pedido/$1/$2', ['as' => 'getChatPedido']); $routes->get('department/factura/(:num)/(:num)', 'ChatController::get_chat_factura/$1/$2', ['as' => 'getChatFactura']); $routes->get('department/(:num)/users', 'ChatController::get_chat_department_users/$1', ['as' => 'getChatDepartmentUsers']); + $routes->post('department/user', 'ChatController::subscribe_to_chat_deparment/$1', ['as' => 'subscribeToChatDepartment']); + $routes->delete('department/user/(:num)', 'ChatController::delete_user_from_department/$1', ['as' => 'deleteUserFromDepartment']); + $routes->get('(:num)', 'ChatController::get_chat/$1', ['as' => 'getChat']); $routes->post('message/error/presupuesto', 'ChatController::store_chat_error_message', ['as' => 'storeChatErrorMessage']); diff --git a/ci4/app/Controllers/Chat/ChatController.php b/ci4/app/Controllers/Chat/ChatController.php index 872235f4..4a2e97c2 100644 --- a/ci4/app/Controllers/Chat/ChatController.php +++ b/ci4/app/Controllers/Chat/ChatController.php @@ -207,6 +207,17 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->countAllResults(); + $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); + if($cliente_in_department_count == 0){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client']]); + } + if($auth_user_in_department_count){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id]); + + } + foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); @@ -228,6 +239,16 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->countAllResults(); + $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); + if($cliente_in_department_count == 0){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client']]); + } + if($auth_user_in_department_count){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id]); + + } foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); @@ -249,6 +270,16 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->countAllResults(); + $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); + if($cliente_in_department_count == 0){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client']]); + } + if($auth_user_in_department_count){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id]); + + } foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); @@ -319,26 +350,30 @@ class ChatController extends BaseController $response = []; if ($cliente_id) { $data = $this->clienteModel->getClienteDataPresupuestoPedidoFactura($cliente_id); + $response["internals"] = $this->chatModel->getChatDepartmentNotifications(); $response["totalMessages"] = 0; - $response["chatFacturas"] = $this->chatModel->getClienteChatFacturas($data["facturas"]); $mensajes_directos = $this->chatModel->getChatDirectMessageNotifications(); - - foreach ($response["chatFacturas"] as $key => $value) { + // $response["chatFacturas"] = $this->chatModel->getClienteChatFacturas($data["facturas"]); + // foreach ($response["chatFacturas"] as $key => $value) { + // $response["totalMessages"] += $value->unreadMessages; + // } + // $response["chatPresupuestos"] = $this->chatModel->getClienteChatPresupuestos($data["presupuestos"]); + // foreach ($response["chatPresupuestos"] as $key => $value) { + // $response["totalMessages"] += $value->unreadMessages; + // } + // foreach ($mensajes_directos as $value) { + // $response["internals"][] = $value; + // $response["totalMessages"] += $value->unreadMessages; + // } + // $response["chatPedidos"] = $this->chatModel->getClienteChatPedidos($data["pedidos"]); + // foreach ($response["chatPedidos"] as $key => $value) { + // $response["totalMessages"] += $value->unreadMessages; + // } + // $response["data"] = $data; + $response["totalMessages"] = 0; + foreach ($response["internals"] as $key => $value) { $response["totalMessages"] += $value->unreadMessages; } - $response["chatPresupuestos"] = $this->chatModel->getClienteChatPresupuestos($data["presupuestos"]); - foreach ($response["chatPresupuestos"] as $key => $value) { - $response["totalMessages"] += $value->unreadMessages; - } - foreach ($mensajes_directos as $value) { - $response["internals"][] = $value; - $response["totalMessages"] += $value->unreadMessages; - } - $response["chatPedidos"] = $this->chatModel->getClienteChatPedidos($data["pedidos"]); - foreach ($response["chatPedidos"] as $key => $value) { - $response["totalMessages"] += $value->unreadMessages; - } - $response["data"] = $data; } else { $response["internals"] = $this->chatModel->getChatDepartmentNotifications(); $internal_notifications = $this->chatModel->getChatInternalNotifications(); @@ -800,4 +835,29 @@ class ChatController extends BaseController $r = $messageService->createErrorMessagePresupuesto("Error", $bodyData['presupuesto_id']); return $this->response->setJSON(["message" => "ok", "data" => $r]); } + public function delete_user_from_department($chat_department_id) + { + $user_id = auth()->user()->id; + $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id); + if($chatDepartmentUserEntity->countAllResults() > 0) + { + $deleted = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id)->delete(); + return $this->response->setJSON(["message" => lang('Chat.exit_chat_ok'), "status" => true]); + }else{ + return $this->response->setJSON(["message" => lang('Chat.exit_chat_wrong'),"status" => false]); + } + } + public function subscribe_to_chat_deparment() + { + $data = $this->request->getPost(); + $user_id = auth()->user()->id; + $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$data['chat_department_id'])->where('user_id',$user_id); + if($chatDepartmentUserEntity->countAllResults() > 0) + { + return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'),"status" => false]); + }else{ + $this->chatDeparmentUserModel->insert(["chat_department_id" => $data["chat_department_id"],"user_id" => $user_id]); + return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_ok'), "status" => true]); + } + } } diff --git a/ci4/app/Language/en/Chat.php b/ci4/app/Language/en/Chat.php new file mode 100644 index 00000000..bb9c813c --- /dev/null +++ b/ci4/app/Language/en/Chat.php @@ -0,0 +1,45 @@ + "Messages", + "messages" => "Messages", + "message" => "Message", + "messages_internal" => "Internal messages", + "message_internal" => "Internal message", + "messages_client" => "Client messages", + "message_client" => "Client message", + "modal" => [ + "new_hebra" => "New thread", + "title" => "Title", + "new_message" => "New message", + "new_receivers" => "New participants", + "btn_send" => "Send", + "btn_send_update" => "Send" + ], + "datatable_messages" => [ + "created_at" => "Created at", + "updated_at" => "Updated at", + "title" => "Title", + "creator" => "Created by", + "viewed" => "Viewed", + + ], + "new_message_ok" => "Message sent successfully", + "participants" => "Participants", + "choose_department" => "Choose a deparment", + "new_participant" => "Add new participants", + "write_message_placeholder" => "Type your message here ...", + "add_notification" => "Notification", + "check_as_unviewed" => "Check as not viewed", + "add_notification_message" => "Add users present in this chat a notification", + "chat_title_presupuesto" => 'Presupuesto[{title,string,0}][{id}]', + "no_messages_notification" => 'There is no messages', + "view_chat" => 'See chat', + "view_by_alt_message" => 'Show users that has or not viewed the messages', + "exit_chat" => 'Exit chat', + "subscribe_chat" => 'Subscribe to chat', + "exit_chat_ok" => "You have exit chat successfully. Notifications on this chat will no longer be received", + "exit_chat_wrong" => "You can't exit the chat because you don't belong to it.", + "subscribe_chat_ok" => "You've subscribed to chat successfully. Now on you'll receive notifications.", + "subscribe_chat_wrong" => "You already belong to this chat.", +]; \ No newline at end of file diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php index e9f32692..3488f38b 100644 --- a/ci4/app/Language/es/Chat.php +++ b/ci4/app/Language/es/Chat.php @@ -35,5 +35,14 @@ return [ "chat_title_presupuesto" => 'Presupuesto[{title,string,0}][{id}]', "no_messages_notification" => 'No hay mensajes que revisar por el momento', "view_chat" => 'Ver chat', - "view_by_alt_message" => 'Muestra los usuarios que han leído o no los mensajes' + "view_by_alt_message" => 'Muestra los usuarios que han leído o no los mensajes', + "exit_chat" => 'Salir conversación', + "subscribe_chat" => 'Subscribirse al chat', + "exit_chat_ok" => "Ha salido de la conversación correctamente. No recibirá más notificaciones a no ser que sea añadido de nuevo.", + "exit_chat_wrong" => "No puede salir de la conversación porque no pertenece a ella.", + "subscribe_chat_ok" => "Te has subscrito al chat correctamente. Ahora recibirás notificaciones cuando lleguen mensajes.", + "subscribe_chat_wrong" => "Ya perteneces a este chat.", + + + ]; \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/chat_factura.php b/ci4/app/Views/themes/vuexy/components/chat_factura.php index be1ebf0b..0a50c300 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_factura.php +++ b/ci4/app/Views/themes/vuexy/components/chat_factura.php @@ -1,9 +1,5 @@
-user()->inGroup('admin')) { ?> -
- -
- +
@@ -30,12 +26,17 @@
+
+
+ +
+
Departamentos
    -
    +
    @@ -67,11 +68,23 @@
    +
    + +
    +
    + +
    -
    +
    @@ -101,19 +114,15 @@
    + placeholder="" />
    - + +
    diff --git a/ci4/app/Views/themes/vuexy/components/chat_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_pedido.php index d6a5d1db..2568b51a 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_pedido.php +++ b/ci4/app/Views/themes/vuexy/components/chat_pedido.php @@ -1,9 +1,5 @@
    -user()->inGroup('admin')) { ?> -
    - -
    - +
    @@ -30,13 +26,18 @@
    +
    +
    + +
    +
    Departamentos
      - - + +
    @@ -64,11 +65,23 @@
    +
    + +
    +
    + +
    -
    +
    @@ -98,19 +111,14 @@
    + placeholder="" />
    - +
    diff --git a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php index 20877108..482a80a2 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php +++ b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php @@ -1,9 +1,5 @@
    - user()->inGroup('admin')) { ?> -
    - -
    - +
    @@ -29,6 +25,12 @@
    +
    +
    + +
    +
    +
    Departamentos
    @@ -63,15 +65,26 @@
    +
    +
    + +
    +
    + +
    @@ -97,19 +110,14 @@
    + placeholder="" />
    - +
    diff --git a/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js b/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js index 320a8126..2e3ea61c 100644 --- a/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js +++ b/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js @@ -34,18 +34,19 @@ export const alertConfirmAction = (title, type = "primary") => { buttonsStyling: false }) } -export const alertSuccessMessage = (title, type = "primary") => { +export const alertSuccessMessage = (title, type = "primary", options = {}) => { return Swal.fire({ showCancelButton: false, showConfirmButton: false, title: title, text: title, icon: "success", - timer: 2000 + timer: 2000, + ...options, }) } -export const alertWarningMessage = (title, message, type = "primary") => { +export const alertWarningMessage = (title, message, type = "primary",options = {}) => { return Swal.fire({ title: title, text: message, @@ -70,8 +71,8 @@ export const toastPresupuestoSummary = (value, target = 'body') => { popup: 'bg-primary text-white', }, target: target, - width : "200px", - padding : '1px', + width: "200px", + padding: '1px', allowEscapeKey: false, showConfirmButton: false, timer: 0, @@ -79,7 +80,7 @@ export const toastPresupuestoSummary = (value, target = 'body') => { stopKeydownPropagation: false, }) } -export const alertSuccess = (value, target = 'body') => { +export const alertSuccess = (value, target = 'body',options = {}) => { return Swal.mixin({ toast: true, position: 'bottom-end', @@ -87,15 +88,16 @@ export const alertSuccess = (value, target = 'body') => { customClass: { popup: 'bg-success text-white', }, - icon : 'success', + icon: 'success', iconColor: 'white', target: target, showConfirmButton: false, timer: 2000, timerProgressBar: true, + ...options, }) } -export const alertError = (value, target = 'body') => { +export const alertError = (value, target = 'body',options = {}) => { return Swal.mixin({ toast: true, position: 'bottom-end', @@ -103,15 +105,16 @@ export const alertError = (value, target = 'body') => { customClass: { popup: 'bg-danger text-white', }, - icon : 'error', + icon: 'error', iconColor: 'white', target: target, showConfirmButton: false, timer: 2000, timerProgressBar: true, + ...options }) } -export const alertWarning = (value, target = 'body') => { +export const alertWarning = (value, target = 'body',options = {}) => { return Swal.mixin({ toast: true, position: 'bottom-end', @@ -119,11 +122,12 @@ export const alertWarning = (value, target = 'body') => { customClass: { popup: 'bg-warning text-white', }, - icon : 'warning', + icon: 'warning', iconColor: 'white', target: target, showConfirmButton: false, timer: 2000, timerProgressBar: true, + ...options }) } \ No newline at end of file diff --git a/httpdocs/assets/js/safekat/components/chat.js b/httpdocs/assets/js/safekat/components/chat.js index e572b1fc..72ea62e9 100644 --- a/httpdocs/assets/js/safekat/components/chat.js +++ b/httpdocs/assets/js/safekat/components/chat.js @@ -1,7 +1,7 @@ import Ajax from '../components/ajax.js' import Modal from './modal.js' import ClassSelect from './select2.js' - +import {alertConfirmAction, alertConfirmationDelete, alertError, alertSuccess} from "./alerts/sweetAlert.js" class Chat { @@ -16,10 +16,13 @@ class Chat { this.chatSidebarLeftUserAbout = this.domItem.find('.chat-sidebar-left-user-about'), this.messageInput = this.domItem.find(".message-input") this.sideBar = this.domItem.find(".sidebar-body") + this.selectItem = this.domItem.find(".chat-search-client") + this.btnExitChat = this.domItem.find(".exit-chat") + this.btnSubscribeChat = this.domItem.find(".subscribe-chat") + this.chatDeparmentId = undefined this.searchInput = this.domItem.find(".chat-search-input") this.headers = {} - this.chatContactsBody = this.domItem.find('.app-chat-contacts .sidebar-body') this.chatContactListItems = [].slice.call( document.querySelectorAll('.chat-contact-list-item:not(.chat-contact-list-item-title)') @@ -52,6 +55,9 @@ class Chat { } this.sendBtnMessageDepartment.addClass("d-none") + this.btnExitChat.on('click',this._handleExitChatDepartment.bind(this)) + this.btnSubscribeChat.on('click',this._handleSubscribeChatDepartment.bind(this)) + this.sendBtnMessageInternal.addClass("d-none") if (this.chatContactsBody[0]) { this.scrollbarContacts = new PerfectScrollbar(this.chatContactsBody[0], { @@ -69,6 +75,7 @@ class Chat { } } initDirectMessage() { + this.chatType = "direct" this.modalNewParticipant = new Modal(this.domItem.find("#modalAddNewChatParticipant")) this.selectPlaceholder = { @@ -103,6 +110,19 @@ class Chat { this._handleGetChatDirect() setInterval(this._handleReloadChatDirectMessages.bind(this),10000) } + initSelectClient() + { + this.selectClientUser = new ClassSelect(this.selectItem,`/chat/direct/client/users/select/${this.chatType}/${this.modelId}`,"Seleccione contacto",true) + this.selectClientUser.init() + this.selectItem.on('change',() => { + if(this.selectClientUser.getVal()){ + this.sendBtnMessageDepartment.attr('disabled',null) + }else{ + this.sendBtnMessageDepartment.attr('disabled','disabled') + } + }) + + } initGeneral() { this.chatType = "general" this._handleGetChatList() @@ -113,6 +133,8 @@ class Chat { this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) + this.initSelectClient() + } @@ -121,6 +143,8 @@ class Chat { this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) + this.initSelectClient() + } initFactura() { @@ -128,6 +152,8 @@ class Chat { this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) + this.initSelectClient() + } initContacts() { @@ -398,6 +424,7 @@ class Chat { message: messageText, chat_department_id: this.chatDeparmentId, user: this.userId, + client : this.selectClientUser.getVal(), model_id: this.modelId } if (messageText) { @@ -712,7 +739,70 @@ class Chat { this._handleReloadChatDirectMessages(); } _handleUpdateChatMessagesUnreadError(){} + _handleRequestExitChatDeparment() + { + const ajax = new Ajax('/chat/department/user/'+this.chatDeparmentId, + null, + null, + (response) => { + if(response.status){ + alertSuccess(response.message).fire() + this._getChatDeparmentUsers() + }else{ + alertError(response.message).fire() + } + }, + (error) => { + alertError("Error") + } + ) + ajax.delete(); + } + _handleRequestSubscribeChatDeparment() + { + const ajax = new Ajax('/chat/department/user', + { + chat_department_id : this.chatDeparmentId + }, + null, + (response) => { + if(response.status){ + alertSuccess(response.message).fire() + this._getChatDeparmentUsers() + }else{ + alertError(response.message).fire() + } + }, + (error) => { + alertError("Error") + } + + ) + ajax.post(); + } + _handleExitChatDepartment() + { + if(this.chatDeparmentId) + { + alertConfirmationDelete('¿Estás seguro de salir de la conversación?').then((result) => { + if(result.isConfirmed){ + this._handleRequestExitChatDeparment() + } + }) + } + } + _handleSubscribeChatDepartment() + { + if(this.chatDeparmentId) + { + alertConfirmAction('¿Estás seguro de subscribirte al chat?').then((result) => { + if(result.isConfirmed){ + this._handleRequestSubscribeChatDeparment() + } + }) + } + } From 3662613ba5578a1551eaa6d774dbe16af6def1eb Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 17 Mar 2025 06:50:35 +0100 Subject: [PATCH 2/7] add client to chat --- ci4/app/Config/Routes.php | 5 +- ci4/app/Controllers/Chat/ChatController.php | 94 ++++++++--- ...7-080000_AddForeignChatDepartmentUsers.php | 45 ++++++ ci4/app/Language/es/Chat.php | 4 +- ci4/app/Models/Chat/ChatDeparmentModel.php | 49 ++++-- .../Models/Chat/ChatDeparmentUserModel.php | 7 +- httpdocs/assets/js/safekat/components/chat.js | 152 +++++++++--------- 7 files changed, 248 insertions(+), 108 deletions(-) create mode 100644 ci4/app/Database/Migrations/2025-03-17-080000_AddForeignChatDepartmentUsers.php diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index bbd2c1e0..b289ef74 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -897,7 +897,10 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->get('department/presupuesto/(:num)/(:num)', 'ChatController::get_chat_presupuesto/$1/$2', ['as' => 'getChatPresupuesto']); $routes->get('department/pedido/(:num)/(:num)', 'ChatController::get_chat_pedido/$1/$2', ['as' => 'getChatPedido']); $routes->get('department/factura/(:num)/(:num)', 'ChatController::get_chat_factura/$1/$2', ['as' => 'getChatFactura']); - $routes->get('department/(:num)/users', 'ChatController::get_chat_department_users/$1', ['as' => 'getChatDepartmentUsers']); + $routes->get('department/users/presupuesto/(:num)/(:num)', 'ChatController::get_chat_department_presupuesto_users/$1/$2', ['as' => 'getPresupuestoChatDepartmentUsers']); + $routes->get('department/users/pedido/(:num)/(:num)', 'ChatController::get_chat_department_pedido_users/$1/$2', ['as' => 'getPedidoChatDepartmentUsers']); + $routes->get('department/users/factura/(:num)/(:num)', 'ChatController::get_chat_department_factura_users/$1/$2', ['as' => 'getFacturaChatDepartmentUsers']); + $routes->post('department/user', 'ChatController::subscribe_to_chat_deparment/$1', ['as' => 'subscribeToChatDepartment']); $routes->delete('department/user/(:num)', 'ChatController::delete_user_from_department/$1', ['as' => 'deleteUserFromDepartment']); diff --git a/ci4/app/Controllers/Chat/ChatController.php b/ci4/app/Controllers/Chat/ChatController.php index 4a2e97c2..6813243b 100644 --- a/ci4/app/Controllers/Chat/ChatController.php +++ b/ci4/app/Controllers/Chat/ChatController.php @@ -207,15 +207,18 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); + $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($data["chat_department_id"],$data["model_id"]); $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->countAllResults(); + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->where('presupuesto_id',$data['model_id'])->countAllResults(); $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); if($cliente_in_department_count == 0){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client']]); + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client'],'presupuesto_id' => $data['model_id']]); } if($auth_user_in_department_count){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id]); - + $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); + if(!in_array(auth()->user()->id,$users_always_in_department)){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'presupuesto_id' => $data['model_id']]); + } } foreach ($chatDepartmentUsers as $user) { @@ -223,6 +226,11 @@ class ChatController extends BaseController $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); } } + foreach ($chatExternalUsers as $user) { + if ($user->id != auth()->user()->id) { + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); + } + } return $this->response->setJSON($dataResponse); } public function store_chat_message_pedido() @@ -239,21 +247,30 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); + $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($data["chat_department_id"],$data["model_id"]); $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->countAllResults(); + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->where('pedido_id',$data['model_id'])->countAllResults(); $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); if($cliente_in_department_count == 0){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client']]); + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client'],'pedido_id' => $data['model_id']]); } if($auth_user_in_department_count){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id]); - + $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); + if(!in_array(auth()->user()->id,$users_always_in_department)){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'pedido_id' => $data['model_id']]); + } } + foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); } } + foreach ($chatExternalUsers as $user) { + if ($user->id != auth()->user()->id) { + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); + } + } return $this->response->setJSON($dataResponse); } public function store_chat_message_factura() @@ -270,21 +287,30 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); + $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentFacturaUsers($data["chat_department_id"],$data["model_id"]); $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->countAllResults(); + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->where('factura_id',$data['model_id'])->countAllResults(); $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); if($cliente_in_department_count == 0){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client']]); + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client'],'factura_id' => $data['model_id']]); } if($auth_user_in_department_count){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id]); - + $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); + if(!in_array(auth()->user()->id,$users_always_in_department)){ + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'factura_id' => $data['model_id']]); + } } + foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); } } + foreach ($chatExternalUsers as $user) { + if ($user->id != auth()->user()->id) { + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); + } + } return $this->response->setJSON($dataResponse); } public function store_chat_message_single() @@ -392,10 +418,23 @@ class ChatController extends BaseController return $this->response->setJSON($response); } - public function get_chat_department_users(int $chat_department_id) + public function get_chat_department_presupuesto_users(int $chat_department_id,int $presupuesto_id) { - $data = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - return $this->response->setJSON($data); + $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); + $externalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($chat_department_id,$presupuesto_id); + return $this->response->setJSON(['admin_users' => $adminUsers,'external_users' => $externalUsers]); + } + public function get_chat_department_pedido_users(int $chat_department_id,$pedido_id) + { + $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); + $externalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($chat_department_id,$pedido_id); + return $this->response->setJSON(['admin_users' => $adminUsers,'external_users' => $externalUsers]); + } + public function get_chat_department_factura_users(int $chat_department_id,$factura_id) + { + $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); + $externalUsers = $this->chatDeparmentModel->getChatDeparmentFacturaUsers($chat_department_id,$factura_id); + return $this->response->setJSON(['admin_users' => $adminUsers,'external_users' => $externalUsers]); } public function get_chat_users_internal() { @@ -837,8 +876,18 @@ class ChatController extends BaseController } public function delete_user_from_department($chat_department_id) { + $data = $this->request->getPost(); $user_id = auth()->user()->id; - $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id); + $adminExist = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id) + ->where('user_id',$user_id) + ->where('pedido_id',null) + ->where('factura_id',null) + ->where('presupuesto_id',null)->countAllResults(); + if($adminExist) + { + return $this->response->setJSON(["message" => lang('Chat.exit_admin_chat_wrong'),"status" => false]); + } + $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id)->where($data['model_fk'],$data['model_id_fk']); if($chatDepartmentUserEntity->countAllResults() > 0) { $deleted = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id)->delete(); @@ -851,12 +900,21 @@ class ChatController extends BaseController { $data = $this->request->getPost(); $user_id = auth()->user()->id; - $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$data['chat_department_id'])->where('user_id',$user_id); + $adminExist = $this->chatDeparmentUserModel->where('chat_department_id',$data['chat_department_id']) + ->where('user_id',$user_id) + ->where('pedido_id',null) + ->where('factura_id',null) + ->where('presupuesto_id',null)->countAllResults(); + if($adminExist) + { + return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'),"status" => false]); + } + $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$data['chat_department_id'])->where('user_id',$user_id)->where($data['model_fk'],$data['model_id_fk']); if($chatDepartmentUserEntity->countAllResults() > 0) { return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'),"status" => false]); }else{ - $this->chatDeparmentUserModel->insert(["chat_department_id" => $data["chat_department_id"],"user_id" => $user_id]); + $this->chatDeparmentUserModel->insert(["chat_department_id" => $data["chat_department_id"],"user_id" => $user_id,$data['model_fk'] => $data['model_id_fk']]); return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_ok'), "status" => true]); } } diff --git a/ci4/app/Database/Migrations/2025-03-17-080000_AddForeignChatDepartmentUsers.php b/ci4/app/Database/Migrations/2025-03-17-080000_AddForeignChatDepartmentUsers.php new file mode 100644 index 00000000..a92c42e7 --- /dev/null +++ b/ci4/app/Database/Migrations/2025-03-17-080000_AddForeignChatDepartmentUsers.php @@ -0,0 +1,45 @@ + [ + "type" => "INT", + "constraint" => 16, + "unsigned" => true, + "null" => true + ], + "presupuesto_id" => [ + "type" => "INT", + "constraint" => 10, + "unsigned" => true, + "null" => true + ], + "factura_id" => [ + "type" => "INT", + "constraint" => 10, + "unsigned" => true, + "null" => true + ], + ]; + public function up() + { + $this->forge->addColumn("chat_department_users",$this->COLUMNS); + $this->forge->addForeignKey('pedido_id', 'pedidos', 'id'); + $this->forge->addForeignKey('factura_id', 'facturas', 'id'); + $this->forge->addForeignKey('presupuesto_id', 'presupuestos', 'id'); + } + + public function down() + { + $this->forge->dropForeignKey("chat_department_users","pedido_id"); + $this->forge->dropForeignKey("chat_department_users","factura_id"); + $this->forge->dropForeignKey("chat_department_users","presupuesto_id"); + $this->forge->dropColumn("chat_department_users",["pedido_id","factura_id","presupuesto_id"]); + } +} diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php index 3488f38b..122ab47a 100644 --- a/ci4/app/Language/es/Chat.php +++ b/ci4/app/Language/es/Chat.php @@ -40,9 +40,7 @@ return [ "subscribe_chat" => 'Subscribirse al chat', "exit_chat_ok" => "Ha salido de la conversación correctamente. No recibirá más notificaciones a no ser que sea añadido de nuevo.", "exit_chat_wrong" => "No puede salir de la conversación porque no pertenece a ella.", + "exit_admin_chat_wrong" => "Perteneces como personal a este chat y no puedes salirte. Contacta administrador para ello.", "subscribe_chat_ok" => "Te has subscrito al chat correctamente. Ahora recibirás notificaciones cuando lleguen mensajes.", "subscribe_chat_wrong" => "Ya perteneces a este chat.", - - - ]; \ No newline at end of file diff --git a/ci4/app/Models/Chat/ChatDeparmentModel.php b/ci4/app/Models/Chat/ChatDeparmentModel.php index f729ec04..ecaab80c 100644 --- a/ci4/app/Models/Chat/ChatDeparmentModel.php +++ b/ci4/app/Models/Chat/ChatDeparmentModel.php @@ -89,7 +89,7 @@ class ChatDeparmentModel extends Model $departmentName = $row['name']; // If the department is not yet added to the array, initialize it if (!isset($departments[$departmentName])) { - + $departments[$departmentName] = [ 'id' => $row['id'], 'name' => $row['name'], @@ -105,9 +105,10 @@ class ChatDeparmentModel extends Model } return $departments; } - public function getChatDepartmentUsers(int $chat_deparment_id) + + public function getChatDeparmentUserQuery(int $chat_deparment_id) { - $result = $this->builder() + $query = $this->builder() ->select( [ "users.*" @@ -123,12 +124,42 @@ class ChatDeparmentModel extends Model "chat_department_users.user_id = users.id", 'left' )->where("chat_departments.id", $chat_deparment_id) - ->where("chat_department_users.deleted_at",null) - ->where("users.deleted_at",null) + ->where("chat_department_users.deleted_at", null) + + ->where("users.deleted_at", null); + return $query; + } + public function getChatDepartmentUsers(int $chat_deparment_id) + { + $result = $this->getChatDeparmentUserQuery($chat_deparment_id) + ->where('chat_department_users.presupuesto_id', null) + ->where('chat_department_users.pedido_id', null) + ->where('chat_department_users.factura_id', null) ->get()->getResultObject(); return $result; } - public function getDisplay(int $chat_deparment_id) : string + public function getChatDeparmentPresupuestoUsers(int $chat_deparment_id, int $presupuesto_id) + { + $result = $this->getChatDeparmentUserQuery($chat_deparment_id) + ->where('chat_department_users.presupuesto_id', $presupuesto_id) + ->get()->getResultObject(); + return $result; + } + public function getChatDeparmentPedidoUsers(int $chat_deparment_id, int $pedido_id) + { + $result = $this->getChatDeparmentUserQuery($chat_deparment_id) + ->where('chat_department_users.pedido_id', $pedido_id) + ->get()->getResultObject(); + return $result; + } + public function getChatDeparmentFacturaUsers(int $chat_deparment_id, int $factura_id) + { + $result = $this->getChatDeparmentUserQuery($chat_deparment_id) + ->where('chat_department_users.factura_id', $factura_id) + ->get()->getResultObject(); + return $result; + } + public function getDisplay(int $chat_deparment_id): string { return $this->find($chat_deparment_id)->display; } @@ -139,9 +170,9 @@ class ChatDeparmentModel extends Model "display as name", "description" ]); - if($query){ - $q->orLike("display",$query) - ->orLike("name",$query); + if ($query) { + $q->orLike("display", $query) + ->orLike("name", $query); } return $q; } diff --git a/ci4/app/Models/Chat/ChatDeparmentUserModel.php b/ci4/app/Models/Chat/ChatDeparmentUserModel.php index 9dbde312..4b550648 100644 --- a/ci4/app/Models/Chat/ChatDeparmentUserModel.php +++ b/ci4/app/Models/Chat/ChatDeparmentUserModel.php @@ -15,7 +15,10 @@ class ChatDeparmentUserModel extends Model protected $protectFields = true; protected $allowedFields = [ "chat_department_id", - "user_id" + "user_id", + "pedido_id", + "factura_id", + "presupuesto_id" ]; protected bool $allowEmptyInserts = false; @@ -47,6 +50,7 @@ class ChatDeparmentUserModel extends Model protected $afterFind = []; protected $beforeDelete = []; protected $afterDelete = []; + public function getChatDepartmentUser(int $user_id) { return $this->db->table($this->table." t1") @@ -55,6 +59,5 @@ class ChatDeparmentUserModel extends Model ->where("t1.user_id",$user_id) ->where("t1.deleted_at",null) ->get()->getResultObject(); - } } diff --git a/httpdocs/assets/js/safekat/components/chat.js b/httpdocs/assets/js/safekat/components/chat.js index 72ea62e9..47a11a8b 100644 --- a/httpdocs/assets/js/safekat/components/chat.js +++ b/httpdocs/assets/js/safekat/components/chat.js @@ -1,7 +1,7 @@ import Ajax from '../components/ajax.js' import Modal from './modal.js' import ClassSelect from './select2.js' -import {alertConfirmAction, alertConfirmationDelete, alertError, alertSuccess} from "./alerts/sweetAlert.js" +import { alertConfirmAction, alertConfirmationDelete, alertError, alertSuccess } from "./alerts/sweetAlert.js" class Chat { @@ -14,7 +14,7 @@ class Chat { this.sendBtnMessageDepartment = this.domItem.find("#send-msg-btn-deparment") this.sendBtnMessageInternal = this.domItem.find("#send-msg-btn-internal") this.chatSidebarLeftUserAbout = this.domItem.find('.chat-sidebar-left-user-about'), - this.messageInput = this.domItem.find(".message-input") + this.messageInput = this.domItem.find(".message-input") this.sideBar = this.domItem.find(".sidebar-body") this.selectItem = this.domItem.find(".chat-search-client") this.btnExitChat = this.domItem.find(".exit-chat") @@ -55,8 +55,8 @@ class Chat { } this.sendBtnMessageDepartment.addClass("d-none") - this.btnExitChat.on('click',this._handleExitChatDepartment.bind(this)) - this.btnSubscribeChat.on('click',this._handleSubscribeChatDepartment.bind(this)) + this.btnExitChat.on('click', this._handleExitChatDepartment.bind(this)) + this.btnSubscribeChat.on('click', this._handleSubscribeChatDepartment.bind(this)) this.sendBtnMessageInternal.addClass("d-none") if (this.chatContactsBody[0]) { @@ -98,7 +98,7 @@ class Chat { this.selectParticipants.init() this.modalNewParticipant.toggle() }) - + this.selectParticipants.item.on("change", () => { if (this.selectParticipants.getVal().length > 0) { this.btnAddParticipantSubmit.removeClass("d-none") @@ -106,19 +106,18 @@ class Chat { this.btnAddParticipantSubmit.addClass("d-none") } }) - this.btnUpdateMessagesUnviewed.on("click",this._handleUpdateChatMessagesUnread.bind(this)) + this.btnUpdateMessagesUnviewed.on("click", this._handleUpdateChatMessagesUnread.bind(this)) this._handleGetChatDirect() - setInterval(this._handleReloadChatDirectMessages.bind(this),10000) + setInterval(this._handleReloadChatDirectMessages.bind(this), 10000) } - initSelectClient() - { - this.selectClientUser = new ClassSelect(this.selectItem,`/chat/direct/client/users/select/${this.chatType}/${this.modelId}`,"Seleccione contacto",true) + initSelectClient() { + this.selectClientUser = new ClassSelect(this.selectItem, `/chat/direct/client/users/select/${this.chatType}/${this.modelId}`, "Seleccione contacto", true) this.selectClientUser.init() - this.selectItem.on('change',() => { - if(this.selectClientUser.getVal()){ - this.sendBtnMessageDepartment.attr('disabled',null) - }else{ - this.sendBtnMessageDepartment.attr('disabled','disabled') + this.selectItem.on('change', () => { + if (this.selectClientUser.getVal()) { + this.sendBtnMessageDepartment.attr('disabled', null) + } else { + this.sendBtnMessageDepartment.attr('disabled', 'disabled') } }) @@ -228,7 +227,7 @@ class Chat { this.domItem.find("#chat-header-users").empty() this.domItem.find("#chat-header-dropdown-users").removeClass("d-none") let ajax = new Ajax( - `/chat/department/${this.chatDeparmentId}/users`, + `/chat/department/users/${this.chatType}/${this.chatDeparmentId}/${this.modelId}`, null, null, this._getChatDeparmentUsersSuccess.bind(this), @@ -238,31 +237,34 @@ class Chat { ajax.get() } _getChatDeparmentUsersSuccess(deparmentUsers) { - deparmentUsers.map((user) => { - this.domItem.find("#chat-header-users").append( - ` -
  • - -
    - - ${user?.first_name?.charAt(0) ?? "?" - + user?.last_name?.charAt(0) ?? "?"} - -
    -
    -
    ${user?.first_name ?? "" + " " + - user?.last_name ?? ""}
    -

    - ${user.username} -

    -
    -     -
    • + deparmentUsers.admin_users.map(user => this.appendChatDepartmentUser(user)) + deparmentUsers.external_users.map(user => this.appendChatDepartmentUser(user, 'warning', 'user')) + } + appendChatDepartmentUser(user, color = "primary", icon = "user") { + this.domItem.find("#chat-header-users").append( ` - ) - }) +
  • +
    + +
    + + + +
    +
    +
    ${user?.first_name ?? "" + " " + + user?.last_name ?? ""}
    +

    + ${user.username} +

    +
    +
    +
    • + + ` + ) } _getChatDeparmentUsersError(err) { } @@ -424,7 +426,7 @@ class Chat { message: messageText, chat_department_id: this.chatDeparmentId, user: this.userId, - client : this.selectClientUser.getVal(), + client: this.selectClientUser.getVal(), model_id: this.modelId } if (messageText) { @@ -442,6 +444,7 @@ class Chat { _sendMessageSuccess(data) { this.messageInput.val("") this._getChatMessage(this.chatDeparmentId) + this._getChatDeparmentUsers() } _sendMessageError(err) { console.error(err) @@ -674,7 +677,7 @@ class Chat { } _handleReloadChatDirectMessagesError(error) { } _handleStoreChatDirectUsers() { - const data = { "users": this.selectParticipants.getVal() ,"notification" : this.checkboxNotificationMessage.prop("checked")} + const data = { "users": this.selectParticipants.getVal(), "notification": this.checkboxNotificationMessage.prop("checked") } this.domItem.find(".chat-loader").removeClass("d-none") const ajax = new Ajax( @@ -716,7 +719,7 @@ class Chat { this._addChatDirectMessages(message) this.messageInput.val("") } catch (error) { - + } finally { this.scrollbarChatHistory.update() this.chatHistoryBody[0].scrollTop = this.scrollbarChatHistory.containerHeight @@ -735,20 +738,22 @@ class Chat { ) ajax.post() } - _handleUpdateChatMessagesUnreadSuccess(){ + _handleUpdateChatMessagesUnreadSuccess() { this._handleReloadChatDirectMessages(); } - _handleUpdateChatMessagesUnreadError(){} - _handleRequestExitChatDeparment() - { - const ajax = new Ajax('/chat/department/user/'+this.chatDeparmentId, - null, + _handleUpdateChatMessagesUnreadError() { } + _handleRequestExitChatDeparment() { + const ajax = new Ajax('/chat/department/user/' + this.chatDeparmentId, + { + model_fk: this.chatType, + model_id_fk: this.modelId + }, null, (response) => { - if(response.status){ + if (response.status) { alertSuccess(response.message).fire() this._getChatDeparmentUsers() - }else{ + } else { alertError(response.message).fire() } }, @@ -759,18 +764,19 @@ class Chat { ) ajax.delete(); } - _handleRequestSubscribeChatDeparment() - { + _handleRequestSubscribeChatDeparment() { const ajax = new Ajax('/chat/department/user', { - chat_department_id : this.chatDeparmentId + chat_department_id: this.chatDeparmentId, + model_fk: this.chatType, + model_id_fk: this.modelId }, null, (response) => { - if(response.status){ + if (response.status) { alertSuccess(response.message).fire() this._getChatDeparmentUsers() - }else{ + } else { alertError(response.message).fire() } }, @@ -781,27 +787,23 @@ class Chat { ) ajax.post(); } - _handleExitChatDepartment() - { - if(this.chatDeparmentId) - { - alertConfirmationDelete('¿Estás seguro de salir de la conversación?').then((result) => { - if(result.isConfirmed){ - this._handleRequestExitChatDeparment() - } - }) - } + _handleExitChatDepartment() { + if (this.chatDeparmentId) { + alertConfirmationDelete('¿Estás seguro de salir de la conversación?').then((result) => { + if (result.isConfirmed) { + this._handleRequestExitChatDeparment() + } + }) + } } - _handleSubscribeChatDepartment() - { - if(this.chatDeparmentId) - { - alertConfirmAction('¿Estás seguro de subscribirte al chat?').then((result) => { - if(result.isConfirmed){ - this._handleRequestSubscribeChatDeparment() - } - }) - } + _handleSubscribeChatDepartment() { + if (this.chatDeparmentId) { + alertConfirmAction('¿Estás seguro de subscribirte al chat?').then((result) => { + if (result.isConfirmed) { + this._handleRequestSubscribeChatDeparment() + } + }) + } } From 4ef91da9b31749cbcdfa8b34833367ee7545f450 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 17 Mar 2025 06:59:33 +0100 Subject: [PATCH 3/7] add sweetAlert js --- ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php | 5 +++-- ci4/app/Views/themes/vuexy/form/mensajes/messageChat.php | 2 ++ .../themes/vuexy/form/mensajes/messageChatFactura.php | 4 ++++ .../themes/vuexy/form/mensajes/messageChatInternal.php | 4 +++- .../Views/themes/vuexy/form/mensajes/messageChatPedido.php | 7 +++---- .../themes/vuexy/form/mensajes/messageChatPresupuesto.php | 7 +++---- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php index 07428fcb..85cf1b96 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php @@ -60,8 +60,7 @@ section('css') ?> - - + endSection() ?> section("additionalExternalJs") ?> @@ -70,5 +69,7 @@ + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/messageChat.php b/ci4/app/Views/themes/vuexy/form/mensajes/messageChat.php index 4b6df88a..cb4e3a1f 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/messageChat.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/messageChat.php @@ -23,5 +23,7 @@ + + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatFactura.php b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatFactura.php index ff05265c..ac6cd19a 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatFactura.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatFactura.php @@ -18,6 +18,8 @@ section('css') ?> + + @@ -26,5 +28,7 @@ + + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatInternal.php b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatInternal.php index 0152bb79..a25ee198 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatInternal.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatInternal.php @@ -15,6 +15,8 @@ section('css') ?> + + @@ -24,5 +26,5 @@ - + endSection() ?> diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPedido.php b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPedido.php index db0e52d1..110ea521 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPedido.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPedido.php @@ -15,13 +15,12 @@ section('css') ?> - - + endSection() ?> section("additionalExternalJs") ?> - - + + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPresupuesto.php b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPresupuesto.php index 8eda11d4..90a632f1 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPresupuesto.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/messageChatPresupuesto.php @@ -15,13 +15,12 @@ section('css') ?> - - + endSection() ?> section("additionalExternalJs") ?> - - + + endSection() ?> \ No newline at end of file From d417db18e2b72d1c2ad70bf329bf5e012430184a Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 17 Mar 2025 23:16:11 +0100 Subject: [PATCH 4/7] fix store message --- ci4/app/Controllers/Chat/ChatController.php | 8 +++++--- .../assets/js/safekat/components/alerts/sweetAlert.js | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ci4/app/Controllers/Chat/ChatController.php b/ci4/app/Controllers/Chat/ChatController.php index 6813243b..098d6734 100644 --- a/ci4/app/Controllers/Chat/ChatController.php +++ b/ci4/app/Controllers/Chat/ChatController.php @@ -217,7 +217,7 @@ class ChatController extends BaseController if($auth_user_in_department_count){ $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); if(!in_array(auth()->user()->id,$users_always_in_department)){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'presupuesto_id' => $data['model_id']]); + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id,'presupuesto_id' => $data['model_id']]); } } @@ -257,7 +257,8 @@ class ChatController extends BaseController if($auth_user_in_department_count){ $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); if(!in_array(auth()->user()->id,$users_always_in_department)){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'pedido_id' => $data['model_id']]); + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id,'pedido_id' => $data['model_id']]); + } } @@ -297,7 +298,8 @@ class ChatController extends BaseController if($auth_user_in_department_count){ $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); if(!in_array(auth()->user()->id,$users_always_in_department)){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'factura_id' => $data['model_id']]); + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id,'factura_id' => $data['model_id']]); + } } diff --git a/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js b/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js index 2e3ea61c..d9c3cec7 100644 --- a/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js +++ b/httpdocs/assets/js/safekat/components/alerts/sweetAlert.js @@ -92,7 +92,7 @@ export const alertSuccess = (value, target = 'body',options = {}) => { iconColor: 'white', target: target, showConfirmButton: false, - timer: 2000, + timer: 6000, timerProgressBar: true, ...options, }) @@ -109,7 +109,7 @@ export const alertError = (value, target = 'body',options = {}) => { iconColor: 'white', target: target, showConfirmButton: false, - timer: 2000, + timer: 6000, timerProgressBar: true, ...options }) @@ -126,7 +126,7 @@ export const alertWarning = (value, target = 'body',options = {}) => { iconColor: 'white', target: target, showConfirmButton: false, - timer: 2000, + timer: 6000, timerProgressBar: true, ...options }) From 6e96beeec8d007b079baad4c4647790f219c1ea7 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Thu, 20 Mar 2025 08:20:50 +0100 Subject: [PATCH 5/7] messages departments section --- ci4/app/Config/Routes.php | 13 +- ci4/app/Config/Validation.php | 11 + ci4/app/Controllers/Chat/ChatController.php | 286 ++++++++++++------ ci4/app/Language/en/Chat.php | 18 +- ci4/app/Language/es/App.php | 3 + ci4/app/Language/es/Chat.php | 18 ++ ci4/app/Models/Chat/ChatDeparmentModel.php | 27 +- .../Models/Chat/ChatDeparmentUserModel.php | 58 +++- ci4/app/Models/Chat/ChatModel.php | 65 ++-- ci4/app/Models/ChatNotification.php | 8 + .../themes/vuexy/components/chat_factura.php | 50 +-- .../themes/vuexy/components/chat_pedido.php | 54 ++-- .../vuexy/components/chat_presupuesto.php | 53 ++-- .../components/forms/chat_department.php | 46 +++ .../tables/chat_department_users_table.php | 12 + .../tables/chat_departments_table.php | 13 + .../configuracion/messages/configView.php | 54 ++++ .../messages/editChatDepartmentForm.php | 38 +++ .../vuexy/main/menus/configuracion_menu.php | 7 + httpdocs/assets/js/safekat/components/chat.js | 22 +- .../datatables/ChatDepartmentDatatable.js | 160 ++++++++++ .../datatables/MessagesDatatable.js | 50 +-- .../components/forms/chatDepartmentForm.js | 91 ++++++ .../assets/js/safekat/components/select2.js | 173 ++++++----- .../configuracion/messages/configView.js | 13 + .../messages/editChatDepartmentView.js | 8 + 26 files changed, 1045 insertions(+), 306 deletions(-) create mode 100644 ci4/app/Views/themes/vuexy/components/forms/chat_department.php create mode 100644 ci4/app/Views/themes/vuexy/components/tables/chat_department_users_table.php create mode 100644 ci4/app/Views/themes/vuexy/components/tables/chat_departments_table.php create mode 100644 ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php create mode 100644 ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php create mode 100644 httpdocs/assets/js/safekat/components/datatables/ChatDepartmentDatatable.js create mode 100644 httpdocs/assets/js/safekat/components/forms/chatDepartmentForm.js create mode 100644 httpdocs/assets/js/safekat/pages/configuracion/messages/configView.js create mode 100644 httpdocs/assets/js/safekat/pages/configuracion/messages/editChatDepartmentView.js diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index b289ef74..96e82b01 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -133,6 +133,9 @@ $routes->group('configuracion', ['namespace' => 'App\Controllers\Configuracion'] $routes->get('edit/(:num)', 'MaquinaTarea::viewForm/$1', ['as' => 'maquinaTareaViewForm']); $routes->get('datatable', 'MaquinaTarea::datatable', ['as' => 'maquinaTareaDatatable']); }); + $routes->group("messages", ["namespace" => 'App\Controllers\Chat'], function ($routes) { + $routes->get('', 'ChatController::config_view', ['as' => 'configMessagesIndex']); + }); }); @@ -892,17 +895,25 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->post('direct/messages/unread/(:num)', 'ChatController::update_chat_direct_message_unread/$1', ['as' => 'updateChatDirectMessageUnread']); + $routes->post('department', 'ChatController::store_chat_department', ['as' => 'storeChatDepartment']); + $routes->delete('department/(:num)', 'ChatController::delete_chat_department/$1', ['as' => 'deleteChatDepartment']); + $routes->post('department/update/(:num)', 'ChatController::update_chat_department/$1', ['as' => 'updateChatDepartment']); $routes->get('departments', 'ChatController::get_chat_departments', ['as' => 'getChatDepartments']); $routes->get('departments/select', 'ChatController::get_chat_department_select', ['as' => 'getChatDepartmentSelect']); $routes->get('department/presupuesto/(:num)/(:num)', 'ChatController::get_chat_presupuesto/$1/$2', ['as' => 'getChatPresupuesto']); $routes->get('department/pedido/(:num)/(:num)', 'ChatController::get_chat_pedido/$1/$2', ['as' => 'getChatPedido']); $routes->get('department/factura/(:num)/(:num)', 'ChatController::get_chat_factura/$1/$2', ['as' => 'getChatFactura']); $routes->get('department/users/presupuesto/(:num)/(:num)', 'ChatController::get_chat_department_presupuesto_users/$1/$2', ['as' => 'getPresupuestoChatDepartmentUsers']); + $routes->get('department/datatable', 'ChatController::chat_department_datatable', ['as' => 'chatDepartmentDatatable']); + $routes->get('department/edit/(:num)', 'ChatController::chat_department_edit/$1', ['as' => 'chatDepartmentEditView']); + $routes->get('department/users/datatable/(:num)', 'ChatController::chat_department_user_datatable/$1', ['as' => 'chatDepartmentUsersDatatable']); $routes->get('department/users/pedido/(:num)/(:num)', 'ChatController::get_chat_department_pedido_users/$1/$2', ['as' => 'getPedidoChatDepartmentUsers']); $routes->get('department/users/factura/(:num)/(:num)', 'ChatController::get_chat_department_factura_users/$1/$2', ['as' => 'getFacturaChatDepartmentUsers']); - + $routes->get('department/users/select/add/(:num)', 'ChatController::select_users_not_in_chat_department/$1', ['as' => 'selectUsersNotInChatDepartment']); $routes->post('department/user', 'ChatController::subscribe_to_chat_deparment/$1', ['as' => 'subscribeToChatDepartment']); + $routes->post('department/subscribe/admin/user', 'ChatController::subscribe_admin_to_department', ['as' => 'subscribeAdminToChatDepartment']); $routes->delete('department/user/(:num)', 'ChatController::delete_user_from_department/$1', ['as' => 'deleteUserFromDepartment']); + $routes->delete('department/admin/user/(:num)/(:num)', 'ChatController::delete_user_admin_from_department/$1/$2', ['as' => 'deleteUserAdminFromDepartment']); $routes->get('(:num)', 'ChatController::get_chat/$1', ['as' => 'getChat']); diff --git a/ci4/app/Config/Validation.php b/ci4/app/Config/Validation.php index 1c8614bf..982ce5c9 100755 --- a/ci4/app/Config/Validation.php +++ b/ci4/app/Config/Validation.php @@ -162,4 +162,15 @@ class Validation extends BaseConfig ], ]; + public array $chat_department = + [ + "display" => [ + "rules" => "required|string", + "label" => "tarifa acabado", + ], + "description" => [ + "rules" => "permit_empty", + "label" => "maquina", + ], + ]; } diff --git a/ci4/app/Controllers/Chat/ChatController.php b/ci4/app/Controllers/Chat/ChatController.php index 098d6734..840785ce 100644 --- a/ci4/app/Controllers/Chat/ChatController.php +++ b/ci4/app/Controllers/Chat/ChatController.php @@ -21,6 +21,7 @@ use CodeIgniter\Log\Logger; use Psr\Log\LoggerInterface; use Hermawan\DataTables\DataTable; use CodeIgniter\I18n\Time; +use CodeIgniter\Validation\Validation; class ChatController extends BaseController { @@ -32,6 +33,8 @@ class ChatController extends BaseController protected ClienteModel $clienteModel; protected ChatUser $chatUserModel; protected ChatNotification $chatNotificationModel; + protected Validation $validation; + protected array $viewData; protected static $viewPath = 'themes/vuexy/form/mensajes/'; @@ -52,6 +55,7 @@ class ChatController extends BaseController $this->clienteModel = model(ClienteModel::class); $this->chatUserModel = model(ChatUser::class); $this->chatNotificationModel = model(ChatNotification::class); + $this->validation = service("validation"); } public function index() {} public function get_chat_departments() @@ -77,6 +81,7 @@ class ChatController extends BaseController if ($chat) { $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id); $this->chatMessageModel->set_chat_department_messages_as_read($chat->id); + $this->chatModel->setAsViewedChatUserNotifications($chat->id, auth()->user()->id); $data["count"] = count($data["messages"]); } $data["chat"] = $chat; @@ -94,6 +99,8 @@ class ChatController extends BaseController if ($chat) { $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id); $this->chatMessageModel->set_chat_department_messages_as_read($chat->id); + $this->chatModel->setAsViewedChatUserNotifications($chat->id, auth()->user()->id); + $data["count"] = count($data["messages"]); } $data["chat"] = $chat; @@ -111,6 +118,7 @@ class ChatController extends BaseController if ($chat) { $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id); $this->chatMessageModel->set_chat_department_messages_as_read($chat->id); + $this->chatModel->setAsViewedChatUserNotifications($chat->id, auth()->user()->id); $data["count"] = count($data["messages"]); } $data["chat"] = $chat; @@ -207,19 +215,18 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); - $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($data["chat_department_id"],$data["model_id"]); - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->where('presupuesto_id',$data['model_id'])->countAllResults(); - $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); - if($cliente_in_department_count == 0){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client'],'presupuesto_id' => $data['model_id']]); - } - if($auth_user_in_department_count){ - $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); - if(!in_array(auth()->user()->id,$users_always_in_department)){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id,'presupuesto_id' => $data['model_id']]); + if (auth()->user()->inGroup('admin')) { + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', $data['client'])->where('presupuesto_id', $data['model_id'])->countAllResults(); + if ($cliente_in_department_count == 0) { + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => $data['client'], 'presupuesto_id' => $data['model_id']]); } } + $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($data["chat_department_id"], $data["model_id"]); + $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', auth()->user()->id)->countAllResults(); + + if ($auth_user_in_department_count) { + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => auth()->user()->id, 'presupuesto_id' => $data['model_id']]); + } foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { @@ -227,9 +234,7 @@ class ChatController extends BaseController } } foreach ($chatExternalUsers as $user) { - if ($user->id != auth()->user()->id) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); } return $this->response->setJSON($dataResponse); } @@ -247,20 +252,17 @@ class ChatController extends BaseController $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); - $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($data["chat_department_id"],$data["model_id"]); - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->where('pedido_id',$data['model_id'])->countAllResults(); - $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); - if($cliente_in_department_count == 0){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client'],'pedido_id' => $data['model_id']]); - } - if($auth_user_in_department_count){ - $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); - if(!in_array(auth()->user()->id,$users_always_in_department)){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id,'pedido_id' => $data['model_id']]); - + if (auth()->user()->inGroup('admin')) { + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', $data['client'])->where('pedido_id', $data['model_id'])->countAllResults(); + if ($cliente_in_department_count == 0) { + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => $data['client'], 'pedido_id' => $data['model_id']]); } } + $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($data["chat_department_id"], $data["model_id"]); + $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', auth()->user()->id)->countAllResults(); + if ($auth_user_in_department_count == 0) { + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => auth()->user()->id, 'pedido_id' => $data['model_id']]); + } foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { @@ -268,40 +270,34 @@ class ChatController extends BaseController } } foreach ($chatExternalUsers as $user) { - if ($user->id != auth()->user()->id) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); } return $this->response->setJSON($dataResponse); } public function store_chat_message_factura() { - $data = $this->request->getPost(); - $existChat = $this->chatModel->existChatFactura($data["chat_department_id"], $data["model_id"]); + $existChat = $this->chatModel->existChatPedido($data["chat_department_id"], $data["model_id"]); if ($existChat == false) { - $chatId = $this->chatModel->createChatFactura($data["chat_department_id"], $data["model_id"]); + $chatId = $this->chatModel->createChatPedido($data["chat_department_id"], $data["model_id"]); } else { - $chat = $this->chatModel->getChatFactura($data["chat_department_id"], $data["model_id"]); + $chat = $this->chatModel->getChatPedido($data["chat_department_id"], $data["model_id"]); $chatId = $chat->id; } $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $dataResponse = $this->chatMessageModel->find($chat_message_id); $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); - $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentFacturaUsers($data["chat_department_id"],$data["model_id"]); - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $data['client']]); - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',$data['client'])->where('factura_id',$data['model_id'])->countAllResults(); - $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id',$data["chat_department_id"])->where('user_id',auth()->user()->id)->countAllResults(); - if($cliente_in_department_count == 0){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => $data['client'],'factura_id' => $data['model_id']]); - } - if($auth_user_in_department_count){ - $users_always_in_department = array_map(fn($q) => $q->id,$chatDepartmentUsers); - if(!in_array(auth()->user()->id,$users_always_in_department)){ - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"],'user_id' => auth()->user()->id,'factura_id' => $data['model_id']]); - + if (auth()->user()->inGroup('admin')) { + $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', $data['client'])->where('pedido_id', $data['model_id'])->countAllResults(); + if ($cliente_in_department_count == 0) { + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => $data['client'], 'factura_id' => $data['model_id']]); } } + $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($data["chat_department_id"], $data["model_id"]); + $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', auth()->user()->id)->countAllResults(); + if ($auth_user_in_department_count == 0) { + $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => auth()->user()->id, 'pedido_id' => $data['model_id']]); + } foreach ($chatDepartmentUsers as $user) { if ($user->id != auth()->user()->id) { @@ -309,9 +305,7 @@ class ChatController extends BaseController } } foreach ($chatExternalUsers as $user) { - if ($user->id != auth()->user()->id) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } + $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); } return $this->response->setJSON($dataResponse); } @@ -377,7 +371,7 @@ class ChatController extends BaseController $cliente_id = auth()->user()->cliente_id; $response = []; if ($cliente_id) { - $data = $this->clienteModel->getClienteDataPresupuestoPedidoFactura($cliente_id); + // $data = $this->clienteModel->getClienteDataPresupuestoPedidoFactura($cliente_id); $response["internals"] = $this->chatModel->getChatDepartmentNotifications(); $response["totalMessages"] = 0; $mensajes_directos = $this->chatModel->getChatDirectMessageNotifications(); @@ -389,10 +383,10 @@ class ChatController extends BaseController // foreach ($response["chatPresupuestos"] as $key => $value) { // $response["totalMessages"] += $value->unreadMessages; // } - // foreach ($mensajes_directos as $value) { - // $response["internals"][] = $value; - // $response["totalMessages"] += $value->unreadMessages; - // } + foreach ($mensajes_directos as $value) { + $response["internals"][] = $value; + $response["totalMessages"] += $value->unreadMessages; + } // $response["chatPedidos"] = $this->chatModel->getClienteChatPedidos($data["pedidos"]); // foreach ($response["chatPedidos"] as $key => $value) { // $response["totalMessages"] += $value->unreadMessages; @@ -420,23 +414,23 @@ class ChatController extends BaseController return $this->response->setJSON($response); } - public function get_chat_department_presupuesto_users(int $chat_department_id,int $presupuesto_id) + public function get_chat_department_presupuesto_users(int $chat_department_id, int $presupuesto_id) { $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - $externalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($chat_department_id,$presupuesto_id); - return $this->response->setJSON(['admin_users' => $adminUsers,'external_users' => $externalUsers]); + $externalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($chat_department_id, $presupuesto_id); + return $this->response->setJSON(['admin_users' => $adminUsers, 'external_users' => $externalUsers]); } - public function get_chat_department_pedido_users(int $chat_department_id,$pedido_id) + public function get_chat_department_pedido_users(int $chat_department_id, $pedido_id) { $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - $externalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($chat_department_id,$pedido_id); - return $this->response->setJSON(['admin_users' => $adminUsers,'external_users' => $externalUsers]); + $externalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($chat_department_id, $pedido_id); + return $this->response->setJSON(['admin_users' => $adminUsers, 'external_users' => $externalUsers]); } - public function get_chat_department_factura_users(int $chat_department_id,$factura_id) + public function get_chat_department_factura_users(int $chat_department_id, $factura_id) { $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - $externalUsers = $this->chatDeparmentModel->getChatDeparmentFacturaUsers($chat_department_id,$factura_id); - return $this->response->setJSON(['admin_users' => $adminUsers,'external_users' => $externalUsers]); + $externalUsers = $this->chatDeparmentModel->getChatDeparmentFacturaUsers($chat_department_id, $factura_id); + return $this->response->setJSON(['admin_users' => $adminUsers, 'external_users' => $externalUsers]); } public function get_chat_users_internal() { @@ -766,8 +760,18 @@ class ChatController extends BaseController } public function get_notifications_not_viewed_from_chat(int $chat_id) { - $data = $this->chatModel->getUsersNotificationNotViewedFromChat($chat_id); - return $this->response->setJSON(["data" => $data, "chat_id" => $chat_id]); + $unviewedNotifications = $this->chatModel->getUsersNotificationNotViewedFromChat($chat_id); + $viewedNotifications = $this->chatModel->getUsersNotificationViewedFromChat($chat_id); + + return $this->response->setJSON( + [ + "data" => [ + "unviewedNotifications" => $unviewedNotifications, + "viewedNotifications" => $viewedNotifications + ], + "chat_id" => $chat_id + ] + ); } public function store_new_direct_message() { @@ -878,46 +882,142 @@ class ChatController extends BaseController } public function delete_user_from_department($chat_department_id) { - $data = $this->request->getPost(); + $data = $this->request->getRawInput(); $user_id = auth()->user()->id; - $adminExist = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id) - ->where('user_id',$user_id) - ->where('pedido_id',null) - ->where('factura_id',null) - ->where('presupuesto_id',null)->countAllResults(); - if($adminExist) - { - return $this->response->setJSON(["message" => lang('Chat.exit_admin_chat_wrong'),"status" => false]); + $adminExist = $this->chatDeparmentUserModel->where('chat_department_id', $chat_department_id) + ->where('user_id', $user_id) + ->where('pedido_id', null) + ->where('factura_id', null) + ->where('presupuesto_id', null)->countAllResults(); + if ($adminExist) { + return $this->response->setJSON(["message" => lang('Chat.exit_admin_chat_wrong'), "status" => false]); } - $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id)->where($data['model_fk'],$data['model_id_fk']); - if($chatDepartmentUserEntity->countAllResults() > 0) - { - $deleted = $this->chatDeparmentUserModel->where('chat_department_id',$chat_department_id)->where('user_id',$user_id)->delete(); + $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id', $chat_department_id)->where('user_id', $user_id)->where($data['model_fk'], $data['model_id_fk']); + if ($chatDepartmentUserEntity->countAllResults() > 0) { + $deleted = $this->chatDeparmentUserModel->where('chat_department_id', $chat_department_id)->where('user_id', $user_id)->delete(purge: true); return $this->response->setJSON(["message" => lang('Chat.exit_chat_ok'), "status" => true]); - }else{ - return $this->response->setJSON(["message" => lang('Chat.exit_chat_wrong'),"status" => false]); + } else { + return $this->response->setJSON(["message" => lang('Chat.exit_chat_wrong'), "status" => false]); } } + public function delete_user_admin_from_department($chat_department_id, $user_id) + { + $this->chatDeparmentUserModel->where('chat_department_id', $chat_department_id)->where('user_id', $user_id)->delete(); + return $this->response->setJSON(["message" => lang('Chat.user_deleted_ok'), "status" => true]); + } public function subscribe_to_chat_deparment() { $data = $this->request->getPost(); $user_id = auth()->user()->id; - $adminExist = $this->chatDeparmentUserModel->where('chat_department_id',$data['chat_department_id']) - ->where('user_id',$user_id) - ->where('pedido_id',null) - ->where('factura_id',null) - ->where('presupuesto_id',null)->countAllResults(); - if($adminExist) - { - return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'),"status" => false]); + $adminExist = $this->chatDeparmentUserModel->where('chat_department_id', $data['chat_department_id']) + ->where('user_id', $user_id) + ->where('pedido_id', null) + ->where('factura_id', null) + ->where('presupuesto_id', null)->countAllResults(); + if ($adminExist) { + return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'), "status" => false]); } - $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id',$data['chat_department_id'])->where('user_id',$user_id)->where($data['model_fk'],$data['model_id_fk']); - if($chatDepartmentUserEntity->countAllResults() > 0) - { - return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'),"status" => false]); - }else{ - $this->chatDeparmentUserModel->insert(["chat_department_id" => $data["chat_department_id"],"user_id" => $user_id,$data['model_fk'] => $data['model_id_fk']]); + $chatDepartmentUserEntity = $this->chatDeparmentUserModel->where('chat_department_id', $data['chat_department_id'])->where('user_id', $user_id)->where($data['model_fk'], $data['model_id_fk']); + if ($chatDepartmentUserEntity->countAllResults() > 0) { + return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_wrong'), "status" => false]); + } else { + $this->chatDeparmentUserModel->insert(["chat_department_id" => $data["chat_department_id"], "user_id" => $user_id, $data['model_fk'] => $data['model_id_fk']]); return $this->response->setJSON(["message" => lang('Chat.subscribe_chat_ok'), "status" => true]); } } + public function subscribe_admin_to_department() + { + $data = $this->request->getPost(); + if ($data['user_id']) { + + $this->chatDeparmentUserModel + ->insert( + [ + "chat_department_id" => $data["chat_department_id"], + "user_id" => $data["user_id"], + ] + ); + return $this->response->setJSON(["message" => lang('Chat.subscribe_admin_chat_ok'), "status" => true]); + } else { + return $this->response->setStatusCode(422)->setJSON(["message" => lang('Chat.subscribe_admin_chat_wrong'), "status" => false]); + } + } + public function config_view() + { + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => 'javascript:void(0);', 'active' => false], + ['title' => lang("App.menu_config_messages"), 'route' => route_to("configMessagesIndex"), 'active' => true] + ]; + + return view('themes/vuexy/form/configuracion/messages/configView', $this->viewData); + } + public function chat_department_edit($chat_department_id) + { + $chatDepartment = $this->chatDeparmentModel->find($chat_department_id); + $this->viewData['breadcrumb'] = [ + ['title' => lang("App.menu_configuration"), 'route' => 'javascript:void(0);', 'active' => false], + ['title' => lang("App.menu_config_messages"), 'route' => route_to("configMessagesIndex"), 'active' => false], + ['title' => $chatDepartment->display, 'route' => route_to("chatDepartmentEditView", $chat_department_id), 'active' => true] + + ]; + $this->viewData["chat_department"] = $chatDepartment; + return view('themes/vuexy/form/configuracion/messages/editChatDepartmentForm', $this->viewData); + } + public function chat_department_datatable() + { + $q = $this->chatDeparmentModel->datatableQuery(); + return DataTable::of($q) + ->add('action', fn($r) => $r->id) + ->toJson(true); + } + public function chat_department_user_datatable(int $chat_department_id) + { + $q = $this->chatDeparmentUserModel->datatableQuery($chat_department_id); + $datatable = DataTable::of($q); + if (auth()->user()->inGroup('admin')) { + $datatable->add('action', fn($r) => $r->userId); + } + return $datatable->toJson(true); + } + public function select_users_not_in_chat_department(int $chat_department_id) + { + $paramQuery = $this->request->getGet("q"); + $data = $this->chatDeparmentUserModel->querySelectUsersNotInDepartment($chat_department_id, $paramQuery); + return $this->response->setJSON($data); + } + public function store_chat_department() + { + $data = $this->request->getPost(); + $validated = $this->validation->run($data, 'chat_department'); + if ($validated) { + $dataValidated = $this->validation->getValidated(); + $dataValidated['name'] = newUUID(); + $this->chatDeparmentModel->insert($dataValidated); + return $this->response->setJSON(["message" => lang('App.global_alert_save_success'), "status" => true, "data" => $dataValidated]); + } else { + return $this->response->setStatusCode(422)->setJSON(["message" => lang('App.global_alert_save_success'), "status" => false, "errors" => $this->validation->getErrors()]); + } + return $this->response->setJSON(["message" => lang('App.global_alert_save_success'), "status" => true]); + } + public function update_chat_department(int $chat_department_id) + { + $data = $this->request->getPost(); + $validated = $this->validation->run($data, 'chat_department'); + if ($validated) { + $dataValidated = $this->validation->getValidated(); + $this->chatDeparmentModel->update($chat_department_id, $dataValidated); + return $this->response->setJSON(["message" => lang('App.global_alert_save_success'), "status" => true, "data" => $dataValidated]); + } else { + return $this->response->setStatusCode(422)->setJSON(["message" => lang('App.global_alert_save_success'), "status" => false, "errors" => $this->validation->getErrors()]); + } + } + public function delete_chat_department($chat_department_id) + { + if (auth()->user()->inGroup('admin')) { + $this->chatDeparmentModel->delete($chat_department_id); + return $this->response->setJSON(["message" => lang('App.user_alert_delete'), "status" => true]); + } else { + return $this->response->setStatusCode(403)->setJSON(["message" => lang('App.user_alert_forbidden'), "status" => false]); + } + } } diff --git a/ci4/app/Language/en/Chat.php b/ci4/app/Language/en/Chat.php index bb9c813c..42eb23b1 100644 --- a/ci4/app/Language/en/Chat.php +++ b/ci4/app/Language/en/Chat.php @@ -24,6 +24,14 @@ return [ "viewed" => "Viewed", ], + "datatable_departments" => [ + "name" => "Name", + "description" => "Description", + ], + "datatable_department_users" => [ + "name" => "Name", + "user" => "User", + ], "new_message_ok" => "Message sent successfully", "participants" => "Participants", "choose_department" => "Choose a deparment", @@ -42,4 +50,12 @@ return [ "exit_chat_wrong" => "You can't exit the chat because you don't belong to it.", "subscribe_chat_ok" => "You've subscribed to chat successfully. Now on you'll receive notifications.", "subscribe_chat_wrong" => "You already belong to this chat.", -]; \ No newline at end of file + "message_configuration" => "Messages configuration", + "new_chat_department" => "New chat department", + "user_deleted_ok" => "User deleted succesfully", + "subscribe_admin_chat_ok" => "User added successfully", + "subscribe_admin_chat_wrong" => "You must select a user", + + + +]; diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index 3bb95036..095247ad 100755 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -226,6 +226,8 @@ return [ "user_alert_add" => "¡Agregado exitosamente!", "user_alert_edit" => "¡Editado con éxito!", "user_alert_delete" => "¡Eliminado con éxito!", + "user_alert_forbidden" => "No tienes permiso para realizar esta acción", + // USER - form "user_add_title" => "Nuevo Usuario", @@ -686,6 +688,7 @@ return [ "menu_configuration" => "Configuración", "menu_variables" => "Variables sistema", + "menu_config_messages" => "Mensajería", "menu_error_presupuesto" => "Errores presupuesto", "menu_calendario" => "Calendario", "menu_paises" => "Paises", diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php index 122ab47a..300a3974 100644 --- a/ci4/app/Language/es/Chat.php +++ b/ci4/app/Language/es/Chat.php @@ -24,6 +24,14 @@ return [ "viewed" => "Leído", ], + "datatable_departments" => [ + "name" => "Nombre", + "description" => "Descripción", + ], + "datatable_department_users" => [ + "name" => "Nombre", + "user" => "Usuario", + ], "new_message_ok" => "Mensaje enviado correctamente", "participants" => "Participantes", "choose_department" => "Elige un departamento", @@ -43,4 +51,14 @@ return [ "exit_admin_chat_wrong" => "Perteneces como personal a este chat y no puedes salirte. Contacta administrador para ello.", "subscribe_chat_ok" => "Te has subscrito al chat correctamente. Ahora recibirás notificaciones cuando lleguen mensajes.", "subscribe_chat_wrong" => "Ya perteneces a este chat.", + "message_configuration" => "Configuración mensajería", + "new_chat_department" => "Nuevo departamento", + "user_deleted_ok" => "Usuario eliminado con éxito", + "department_users" => "Usuarios departamento", + "subscribe_admin_chat_ok" => "Usuario añadido correctamente.", + "subscribe_admin_chat_wrong" => "Tienes que seleccionar un usuario.", + "help_select_chat_department_user" => "Solamente son listados los usuarios que pertenecen al personal. Los clientes no son listados, para añadirlos a la conversación se realiza desde la sección de mensajería de las diferentes secciones(presupuesto,pedido,factura ...)", + "store_department" => "Crear departamento", + + ]; \ No newline at end of file diff --git a/ci4/app/Models/Chat/ChatDeparmentModel.php b/ci4/app/Models/Chat/ChatDeparmentModel.php index ecaab80c..ec3a857a 100644 --- a/ci4/app/Models/Chat/ChatDeparmentModel.php +++ b/ci4/app/Models/Chat/ChatDeparmentModel.php @@ -108,7 +108,7 @@ class ChatDeparmentModel extends Model public function getChatDeparmentUserQuery(int $chat_deparment_id) { - $query = $this->builder() + $query = $this ->select( [ "users.*" @@ -123,20 +123,21 @@ class ChatDeparmentModel extends Model "users", "chat_department_users.user_id = users.id", 'left' - )->where("chat_departments.id", $chat_deparment_id) - ->where("chat_department_users.deleted_at", null) - - ->where("users.deleted_at", null); + ) + ->where("chat_department_users.chat_department_id", $chat_deparment_id) + ->where("chat_department_users.deleted_at",null) + ->where("users.deleted_at",null); return $query; } public function getChatDepartmentUsers(int $chat_deparment_id) { $result = $this->getChatDeparmentUserQuery($chat_deparment_id) - ->where('chat_department_users.presupuesto_id', null) - ->where('chat_department_users.pedido_id', null) - ->where('chat_department_users.factura_id', null) - ->get()->getResultObject(); - return $result; + ->where('chat_department_users.presupuesto_id',null) + ->where('chat_department_users.pedido_id',null) + ->where('chat_department_users.factura_id',null) + ->get(); + + return $result->getResultObject() ?: []; } public function getChatDeparmentPresupuestoUsers(int $chat_deparment_id, int $presupuesto_id) { @@ -163,7 +164,7 @@ class ChatDeparmentModel extends Model { return $this->find($chat_deparment_id)->display; } - public function getChatDepartmentSelect(string $query = null) + public function getChatDepartmentSelect(?string $query) { $q = $this->builder()->select([ "id", @@ -176,4 +177,8 @@ class ChatDeparmentModel extends Model } return $q; } + public function datatableQuery() + { + return $this->select(['id','display','description'])->where('deleted_at',null); + } } diff --git a/ci4/app/Models/Chat/ChatDeparmentUserModel.php b/ci4/app/Models/Chat/ChatDeparmentUserModel.php index 4b550648..7726e5d9 100644 --- a/ci4/app/Models/Chat/ChatDeparmentUserModel.php +++ b/ci4/app/Models/Chat/ChatDeparmentUserModel.php @@ -2,7 +2,7 @@ namespace App\Models\Chat; - +use App\Models\Usuarios\UserModel; use CodeIgniter\Model; class ChatDeparmentUserModel extends Model @@ -53,11 +53,55 @@ class ChatDeparmentUserModel extends Model public function getChatDepartmentUser(int $user_id) { - return $this->db->table($this->table." t1") - ->select("chat_departments.*") - ->join("chat_departments","t1.chat_department_id = chat_departments.id","left") - ->where("t1.user_id",$user_id) - ->where("t1.deleted_at",null) - ->get()->getResultObject(); + return $this->db->table($this->table . " t1") + ->select("chat_departments.*") + ->join("chat_departments", "t1.chat_department_id = chat_departments.id", "left") + ->where("t1.user_id", $user_id) + ->where("t1.deleted_at", null) + ->get()->getResultObject(); + } + public function datatableQuery(int $chat_department_id) + { + return $this->builder()->select( + [ + 'users.id as userId', + 'CONCAT(users.first_name," ",users.last_name) as userFullName', + 'users.username' + ] + ) + ->join('users', 'users.id = chat_department_users.user_id', 'left') + ->join('chat_departments', 'chat_departments.id = chat_department_users.chat_department_id', 'left') + ->where('chat_departments.id', $chat_department_id) + ->where('chat_department_users.pedido_id', null) + ->where('chat_department_users.presupuesto_id', null) + ->where('chat_department_users.factura_id', null) + ->where('chat_department_users.deleted_at', null); + } + public function querySelectUsersNotInDepartment(int $chat_department_id, ?string $q): array + { + $query = $this->builder()->select([ + 'users.id as userId', + ]) + ->join('users', 'users.id = chat_department_users.user_id', 'left') + ->join('chat_departments', 'chat_departments.id = chat_department_users.chat_department_id', 'left') + ->where('chat_departments.id', $chat_department_id) + ->where('chat_department_users.deleted_at', null); + + $usersInDepartment = array_map(fn($q) => $q->userId, $query->get()->getResultObject()); + $userModel = model(UserModel::class); + $queryUser = $userModel->builder()->select([ + 'id', + 'CONCAT(first_name," ",last_name) as name', + 'username as description', + ]) + ->where('cliente_id',null) + ->where('deleted_at', null); + if ($usersInDepartment) { + $queryUser->whereNotIn("id", $usersInDepartment); + } + if ($q) { + $queryUser->like('CONCAT(first_name," ",last_name)', $q); + } + return $queryUser->get()->getResultArray(); } } diff --git a/ci4/app/Models/Chat/ChatModel.php b/ci4/app/Models/Chat/ChatModel.php index 4055fca9..70db1dca 100644 --- a/ci4/app/Models/Chat/ChatModel.php +++ b/ci4/app/Models/Chat/ChatModel.php @@ -329,18 +329,19 @@ class ChatModel extends Model "chats.presupuesto_id as presupuestoId", "chats.factura_id as facturaId", "chats.title as chatDisplay", + "COUNT(chat_notifications.viewed) as unreadMessages" ]) ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left") ->where("chat_notifications.user_id", auth()->user()->id) ->where("chat_notifications.viewed", false) - ->where("chats.chat_department_id is NOT NULL", NULL, FALSE); + ->where("chats.chat_department_id is NOT NULL", NULL, FALSE) + ->groupBy('chats.id'); $rows = $q->get()->getResultObject(); $auth_user = auth()->user(); $rows_new = []; foreach ($rows as $row) { - $row->unreadMessages = 0; if ($row->presupuestoId) { $row->model = $presupuestoModel->find($row->presupuestoId); if ($auth_user->cliente_id) { @@ -355,7 +356,6 @@ class ChatModel extends Model $row->chatDisplay .= "[INTERNAL]"; } $row->avatar = "PRE"; - $row->unreadMessages = $this->countUnreadMessagePresupuesto($row->presupuestoId); $rows_new[] = $row; } elseif ($row->pedidoId) { $row->model = $pedidoModel->find($row->pedidoId); @@ -365,7 +365,6 @@ class ChatModel extends Model $row->chatDisplay .= "[INTERNAL]"; } $row->avatar = "P"; - $row->unreadMessages = $this->countUnreadMessagePedido($row->pedidoId); $rows_new[] = $row; } elseif ($row->facturaId) { $row->model = $facturaModel->find($row->facturaId); @@ -375,7 +374,6 @@ class ChatModel extends Model $row->chatDisplay .= "[INTERNAL]"; } $row->title = $row->facturaId; - $row->unreadMessages = $this->countUnreadMessageFactura($row->facturaId); $rows_new[] = $row; } } @@ -587,7 +585,7 @@ class ChatModel extends Model } return $data; } - public function countUnreadMessagePresupuesto($presupuesto_id): int|string + public function countUnreadMessagePresupuesto(int $presupuesto_id,int $chat_department_id): int|string { return $this->builder()->select() ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") @@ -595,6 +593,7 @@ class ChatModel extends Model ->where("chats.presupuesto_id", $presupuesto_id) ->where("chat_notifications.viewed", false) ->where("chat_notifications.user_id", auth()->user()->id) + ->where('chats.chat_department_id',$chat_department_id) ->countAllResults(); } public function countUnreadMessagePedido($pedido_id): int|string @@ -711,9 +710,7 @@ class ChatModel extends Model [ "CONCAT(users.first_name,' ',users.last_name) as userFullName", "users.username as userName", - "SUM(chat_notifications.viewed) as viewed_count", - "COUNT(chat_notifications.id) as notification_count" - + "chat_notifications.viewed" ] ) @@ -722,6 +719,26 @@ class ChatModel extends Model ->join("users", "users.id = chat_notifications.user_id", 'left') ->where("chats.id", $chat_id) ->where("chat_notifications.deleted_at", null) + ->where('chat_notifications.viewed',false) + ->get()->getResultArray(); + return $q; + } + public function getUsersNotificationViewedFromChat(int $chat_id): array + { + $q = $this->builder()->distinct()->select( + [ + "CONCAT(users.first_name,' ',users.last_name) as userFullName", + "users.username as userName", + "chat_notifications.viewed" + ] + + ) + ->join("chat_messages", "chat_messages.chat_id = chats.id", 'left') + ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", 'left') + ->join("users", "users.id = chat_notifications.user_id", 'left') + ->where("chats.id", $chat_id) + ->where("chat_notifications.deleted_at", null) + ->where('chat_notifications.viewed',true) ->get()->getResultArray(); return $q; } @@ -903,16 +920,17 @@ class ChatModel extends Model public function setAsViewedChatUserNotifications(int $chat_id, int $user_id) { $query = $this->builder() - ->select("chat_messages.id") + ->select("chat_notifications.id as notificationId") ->join('chat_messages', 'chat_messages.chat_id = chats.id', 'left') + ->join('chat_notifications', 'chat_notifications.chat_message_id = chat_messages.id', 'left') + ->where('chat_notifications.user_id',$user_id) ->where('chat_messages.chat_id', $chat_id) ->get()->getResultObject(); - $chat_messages_ids = array_map(fn($q) => $q->id, $query); - - $this->db->table("chat_notifications") - ->where("user_id", $user_id) - ->whereIn("chat_message_id", $chat_messages_ids) - ->update(["viewed" => true]); + $chat_messages_ids = array_map(fn($q) => $q->notificationId, $query); + $chatNotificationModel = model(ChatNotification::class); + if($chat_messages_ids){ + $chatNotificationModel->setNotificationsAsViewed($chat_messages_ids); + } } public function setAsViewedChatUserMessages(int $chat_id, int $user_id) { @@ -924,16 +942,17 @@ class ChatModel extends Model public function setAsUnviewedChatUserNotifications(int $chat_id, int $user_id) { $query = $this->builder() - ->select("chat_messages.id") + ->select("chat_notifications.id as notificationId") ->join('chat_messages', 'chat_messages.chat_id = chats.id', 'left') + ->join('chat_notifications', 'chat_notifications.chat_message_id = chat_messages.id', 'left') + ->where('chat_notifications.user_id',$user_id) ->where('chat_messages.chat_id', $chat_id) ->get()->getResultObject(); - $chat_messages_ids = array_map(fn($q) => $q->id, $query); - - $this->db->table("chat_notifications") - ->where("user_id", $user_id) - ->whereIn("chat_message_id", $chat_messages_ids) - ->update(["viewed" => false]); + $chat_messages_ids = array_map(fn($q) => $q->notificationId, $query); + $chatNotificationModel = model(ChatNotification::class); + if($chat_messages_ids){ + $chatNotificationModel->setNotificationsAsUnViewed($chat_messages_ids); + } } public function setAsUnviewedChatUserMessages(int $chat_id, int $user_id) diff --git a/ci4/app/Models/ChatNotification.php b/ci4/app/Models/ChatNotification.php index 007f26c5..7d8824d4 100644 --- a/ci4/app/Models/ChatNotification.php +++ b/ci4/app/Models/ChatNotification.php @@ -59,4 +59,12 @@ class ChatNotification extends Model } return $status; } + public function setNotificationsAsViewed(array $notificationIds) : bool + { + return $this->update($notificationIds,["viewed" => 1]); + } + public function setNotificationsAsUnViewed(array $notificationIds) : bool + { + return $this->update($notificationIds,["viewed" => 0]); + } } diff --git a/ci4/app/Views/themes/vuexy/components/chat_factura.php b/ci4/app/Views/themes/vuexy/components/chat_factura.php index 0a50c300..df2495c1 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_factura.php +++ b/ci4/app/Views/themes/vuexy/components/chat_factura.php @@ -26,11 +26,11 @@
    -
    + user()->inGroup('admin')): ?>
    -
    +
    Departamentos
    @@ -68,18 +68,22 @@
    -
    - -
    -
    - -
    + user()->inGroup('admin')): ?> + +
    + +
    +
    + +
    + +
    diff --git a/ci4/app/Views/themes/vuexy/components/chat_pedido.php b/ci4/app/Views/themes/vuexy/components/chat_pedido.php index 2568b51a..b629f638 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_pedido.php +++ b/ci4/app/Views/themes/vuexy/components/chat_pedido.php @@ -27,9 +27,11 @@
    -
    - -
    + user()->inGroup('admin')): ?> +
    + +
    +
    Departamentos
    @@ -65,18 +67,21 @@
    -
    - -
    -
    - -
    + user()->inGroup('admin')): ?> + +
    + +
    +
    + +
    +
    diff --git a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php index 482a80a2..92b10484 100644 --- a/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php +++ b/ci4/app/Views/themes/vuexy/components/chat_presupuesto.php @@ -26,9 +26,11 @@
    -
    - -
    + user()->inGroup('admin')): ?> +
    + +
    +
    @@ -67,18 +69,21 @@
    -
    - -
    -
    - -
    + user()->inGroup('admin')): ?> + +
    + +
    +
    + +
    +
    diff --git a/ci4/app/Views/themes/vuexy/components/forms/chat_department.php b/ci4/app/Views/themes/vuexy/components/forms/chat_department.php new file mode 100644 index 00000000..07ff5bee --- /dev/null +++ b/ci4/app/Views/themes/vuexy/components/forms/chat_department.php @@ -0,0 +1,46 @@ +
    +
    +
    + + +
    +
    + + +
    +
    + +
    +
    + +
    +
    +

    + +

    +
    +
    +
    +
    +
    + +
    +
    +
    + +
    +
    + "tableChatDepartmentUsers", "entity" => $entity]) ?> +
    +
    +
    +
    +
    +
    \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/tables/chat_department_users_table.php b/ci4/app/Views/themes/vuexy/components/tables/chat_department_users_table.php new file mode 100644 index 00000000..1a636804 --- /dev/null +++ b/ci4/app/Views/themes/vuexy/components/tables/chat_department_users_table.php @@ -0,0 +1,12 @@ + + + + + + + + + + + +
    \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/tables/chat_departments_table.php b/ci4/app/Views/themes/vuexy/components/tables/chat_departments_table.php new file mode 100644 index 00000000..e5696838 --- /dev/null +++ b/ci4/app/Views/themes/vuexy/components/tables/chat_departments_table.php @@ -0,0 +1,13 @@ + + + + + + + + + + + + +
    #
    \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php b/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php new file mode 100644 index 00000000..20c7e3a0 --- /dev/null +++ b/ci4/app/Views/themes/vuexy/form/configuracion/messages/configView.php @@ -0,0 +1,54 @@ +include('themes/_commonPartialsBs/select2bs5') ?> +include('themes/_commonPartialsBs/datatables') ?> +include('themes/_commonPartialsBs/_confirm2delete') ?> +extend('themes/vuexy/main/defaultlayout') ?> + + +section('content'); ?> + +
    +
    + +
    +
    +

    +
    + +
    + +

    +
    +
    + + +
    +
    + + +
    +
    + "tableChatDepartments"]) ?> +
    +
    + +
    +
    + +endSection() ?> + +section('css') ?> + + + +endSection() ?> +section("additionalExternalJs") ?> + + + + + + + +endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php b/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php new file mode 100644 index 00000000..1e7d0b05 --- /dev/null +++ b/ci4/app/Views/themes/vuexy/form/configuracion/messages/editChatDepartmentForm.php @@ -0,0 +1,38 @@ +include('themes/_commonPartialsBs/select2bs5') ?> +include('themes/_commonPartialsBs/datatables') ?> +include('themes/_commonPartialsBs/_confirm2delete') ?> +extend('themes/vuexy/main/defaultlayout') ?> + + +section('content'); ?> + +
    +
    + +
    +
    +

    display ?>

    +
    + +
    + "chatDepartmentForm", "entity" => $chat_department]) ?> +
    + +
    +
    + + endSection() ?> + + section('css') ?> + + + + endSection() ?> + section("additionalExternalJs") ?> + + + + + + + endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php index 5fe14fba..5a3621f9 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/configuracion_menu.php @@ -120,6 +120,13 @@ if ( + user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?> +
  • + + + +
    • +
\ No newline at end of file diff --git a/httpdocs/assets/js/safekat/components/chat.js b/httpdocs/assets/js/safekat/components/chat.js index 47a11a8b..aa0caf5b 100644 --- a/httpdocs/assets/js/safekat/components/chat.js +++ b/httpdocs/assets/js/safekat/components/chat.js @@ -12,6 +12,7 @@ class Chat { this.modelId = this.domItem.data("id") this.chatHistoryBody = this.domItem.find(".chat-history-body") this.sendBtnMessageDepartment = this.domItem.find("#send-msg-btn-deparment") + this.sendBtnMessageDepartmentClient = this.domItem.find("#send-msg-btn-deparment-client") this.sendBtnMessageInternal = this.domItem.find("#send-msg-btn-internal") this.chatSidebarLeftUserAbout = this.domItem.find('.chat-sidebar-left-user-about'), this.messageInput = this.domItem.find(".message-input") @@ -126,11 +127,15 @@ class Chat { this.chatType = "general" this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) + this.sendBtnMessageDepartmentClient.on("click", this._sendMessage.bind(this)) + } initPresupuesto() { this.chatType = "presupuesto" this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) + this.sendBtnMessageDepartmentClient.on("click", this._sendMessage.bind(this)) + this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) this.initSelectClient() @@ -141,6 +146,7 @@ class Chat { this.chatType = "pedido" this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) + this.sendBtnMessageDepartmentClient.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) this.initSelectClient() @@ -150,6 +156,7 @@ class Chat { this.chatType = "factura" this._handleGetChatList() this.sendBtnMessageDepartment.on("click", this._sendMessage.bind(this)) + this.sendBtnMessageDepartmentClient.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) this.initSelectClient() @@ -215,10 +222,14 @@ class Chat { this._getChatMessage() this._getChatTotalMessages(row.name) this._getChatDeparmentUsers() + }) }) - this.chatList.find(`#chat__produccion`).trigger("click"); + if (Object.values(data)) { + const firstDepartment = Object.values(data)[0] + this.chatList.find(`#chat_${firstDepartment.name}`).trigger("click"); + } } _handleGetChatListError(error) { console.error(error) @@ -356,10 +367,9 @@ class Chat {
- ${chatMessage?.user?.first_name + " " + chatMessage?.user?.last_name}
- + ${chatMessage.created_at}
@@ -426,7 +436,7 @@ class Chat { message: messageText, chat_department_id: this.chatDeparmentId, user: this.userId, - client: this.selectClientUser.getVal(), + client: this.selectClientUser.getVal() ?? null, model_id: this.modelId } if (messageText) { @@ -745,7 +755,7 @@ class Chat { _handleRequestExitChatDeparment() { const ajax = new Ajax('/chat/department/user/' + this.chatDeparmentId, { - model_fk: this.chatType, + model_fk: this.chatType + "_id", model_id_fk: this.modelId }, null, @@ -768,7 +778,7 @@ class Chat { const ajax = new Ajax('/chat/department/user', { chat_department_id: this.chatDeparmentId, - model_fk: this.chatType, + model_fk: this.chatType + "_id", model_id_fk: this.modelId }, null, diff --git a/httpdocs/assets/js/safekat/components/datatables/ChatDepartmentDatatable.js b/httpdocs/assets/js/safekat/components/datatables/ChatDepartmentDatatable.js new file mode 100644 index 00000000..3b33a0c2 --- /dev/null +++ b/httpdocs/assets/js/safekat/components/datatables/ChatDepartmentDatatable.js @@ -0,0 +1,160 @@ +import Ajax from "../ajax.js"; +import { alertConfirmationDelete, alertSuccess, alertError, alertConfirmAction } from '../alerts/sweetAlert.js' +export class ChatDepartmentDatatable { + constructor(domItem) { + this.item = domItem + this.chatDepartmentDisplay = $("#chat-department-display") + this.btnStoreChatDepartment = $("#btn-add-new-chat-department") + + this.datatableColumns = [ + { data: 'id', searchable: false, sortable: true }, + { data: 'display', searchable: true, sortable: true }, + { data: 'description', searchable: true, sortable: true }, + { + data: 'action', searchable: false, sortable: false, + render: (d, t) => { + return `
+ + +
` + } + } + ] + } + init() { + this.btnStoreChatDepartment.on('click', this.storeNewChatDepartment.bind(this)) + this.item.on('click', '.chat-department-delete', this.deleteChatDepartment.bind(this)) + + this.datatable = this.item.DataTable({ + processing: true, + order: [[0, 'asc']], + layout: { + topStart: 'pageLength', + topEnd: 'search', + bottomStart: 'info', + bottomEnd: 'paging' + }, + serverSide: true, + pageLength: 10, + language: { + url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" + }, + columns: this.datatableColumns, + ajax: '/chat/department/datatable' + }); + } + deleteChatDepartment(event) { + const ajax = new Ajax( + `/chat/department/${$(event.currentTarget).data("id")}`, + null, + null, + this.deleteChatDepartmentSuccess.bind(this), + this.deleteChatDepartmentError.bind(this) + ) + alertConfirmationDelete().then(result => { + if (result.isConfirmed) { + ajax.delete() + } + }) + } + deleteChatDepartmentSuccess(response) { + this.datatable.ajax.reload() + alertSuccess(response.message).fire() + } + deleteChatDepartmentError(response) { + alertError(response.message).fire() + } + storeNewChatDepartment() { + this.btnStoreChatDepartment.attr("disabled") + const ajax = new Ajax("/chat/department", { + display: this.chatDepartmentDisplay.val() + }, + null, + this.storeNewChatDepartmentSuccess.bind(this), + this.storeNewChatDepartmentError.bind(this) + ) + if (this.chatDepartmentDisplay.val()) { + alertConfirmAction().then(result => { + if (result.isConfirmed) { + ajax.post() + } + }) + } else { + this.btnStoreChatDepartment.removeAttr("disabled") + } + } + storeNewChatDepartmentSuccess(response) { + this.datatable.ajax.reload() + alertSuccess(response.message).fire() + } + storeNewChatDepartmentError(response) { + console.log(response) + alertError(response.message).fire() + } + +} +export class ChatDepartmentUserDatatable { + constructor(domItem) { + this.item = domItem + this.datatableColumns = [ + { data: 'userFullName', searchable: true, sortable: true }, + { data: 'username', searchable: true, sortable: true }, + { + data: 'action', searchable: false, sortable: false, + render: (d, t) => { + return `
+ +
` + } + } + ] + } + init() { + this.actions() + this.datatable = this.item.DataTable({ + processing: true, + order: [[0, 'desc']], + layout: { + topStart: 'pageLength', + topEnd: 'search', + bottomStart: 'info', + bottomEnd: 'paging' + }, + serverSide: true, + pageLength: 10, + language: { + url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" + }, + columns: this.datatableColumns, + ajax: '/chat/department/users/datatable/' + this.item.data('id') + }); + } + actions() { + this.item.on("click", ".chat-department-user-delete", this.deleteRow.bind(this)) + } + deleteRow(event) { + const ajax = new Ajax(`/chat/department/admin/user/${this.item.data('id')}/${$(event.currentTarget).data("id")}`, + null, + null, + this.deleteRowSuccess.bind(this), + this.deleteRowError.bind(this), + ) + alertConfirmationDelete().then(result => { + if (result.isConfirmed) { + ajax.delete() + } + }) + } + deleteRowSuccess(response) { + this.datatable.ajax.reload(); + alertSuccess(response.message).fire() + } + deleteRowError(response) { + alertError(response?.message).fire() + } + + +} + + + diff --git a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js index c27f70ef..d46d76a6 100644 --- a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js +++ b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js @@ -134,33 +134,49 @@ class MessagesDatatable { } handleDropUpSuccess(response) { const chatId = response.chat_id - const users = response.data - if (users.length > 0) { + const unviewedNotifications = response.data.unviewedNotifications + const viewedNotifications = response.data.viewedNotifications - users.forEach(user => { - const viewed = (user.notification_count - user.viewed_count) == 0 + if (unviewedNotifications.length > 0) { + + unviewedNotifications.forEach(user => { if (user.userFullName || user.userName) { $(`#dropdown-viewed-${chatId}`) - .append(` -
  • - - ${user.userFullName ?? user.userName} - - - - -
    • - `) + .append(this.addDropUpItem(user)) } }); - } else { - $(`#dropdown-viewed-${chatId}`).append(`
  • Visto
    • `) } + if (viewedNotifications.length > 0) { + + viewedNotifications.forEach(user => { + if (user.userFullName || user.userName) { + + $(`#dropdown-viewed-${chatId}`) + .append(this.addDropUpItem(user)) + } + + }); + } } handleDropUpError() { } - + addDropUpItem(user) + { + return ` +
  • + + ${user.userFullName ?? user.userName} + + + + +
    • `; + } } diff --git a/httpdocs/assets/js/safekat/components/forms/chatDepartmentForm.js b/httpdocs/assets/js/safekat/components/forms/chatDepartmentForm.js new file mode 100644 index 00000000..16d66d30 --- /dev/null +++ b/httpdocs/assets/js/safekat/components/forms/chatDepartmentForm.js @@ -0,0 +1,91 @@ +import ClassSelect from "../select2.js" +import { ChatDepartmentUserDatatable } from '../datatables/ChatDepartmentDatatable.js' +import Ajax from "../ajax.js" +import { alertConfirmAction, alertError, alertSuccess } from "../alerts/sweetAlert.js" + +class ChatDepartmentForm { + constructor(domItem) { + this.item = domItem + this.chatDepartmentId = this.item.data("id") + this.btnAddUserToDepartment = this.item.find("#add-user-admin-chat-department") + this.btnUpdate = this.item.find("#btn-chat-department-update") + this.chatDepartmentUsersDatatable = new ChatDepartmentUserDatatable($("#tableChatDepartmentUsers")) + this.seletChatDepartmentUserItem = this.item.find("#selectChatDepartmentUser") + this.seletChatDepartmentUser = new ClassSelect( + this.seletChatDepartmentUserItem, + `/chat/department/users/select/add/${this.chatDepartmentId}` + ) + } + init() { + this.seletChatDepartmentUser.init() + this.chatDepartmentUsersDatatable.init() + this.btnAddUserToDepartment.on('click', this._handleUserToDepartment.bind(this)) + this.btnUpdate.on("click", this._handleUpdateDepartment.bind(this)) + } + getFormData() { + return { + display: this.item.find("#chat-department-display").val(), + description: this.item.find("#chat-department-description").val() + } + } + updateFormData(data) { + this.item.find("#chat-department-display").val(data.display) + this.item.find("#chat-department-description").val(data.description) + } + _handleUserToDepartment() { + this.btnAddUserToDepartment.attr("disabled", "disabled") + const ajax = new Ajax("/chat/department/subscribe/admin/user", + { + user_id: this.seletChatDepartmentUser.getVal(), + chat_department_id: this.chatDepartmentId + }, + null, + this._handleUserToDepartmentSuccess.bind(this), + this._handleUserToDepartmentError.bind(this) + ) + if (this.seletChatDepartmentUser.getVal()) { + ajax.post(); + } else { + this.btnAddUserToDepartment.removeAttr("disabled") + } + } + _handleUserToDepartmentSuccess(response) { + this.btnAddUserToDepartment.removeAttr("disabled") + this.chatDepartmentUsersDatatable.datatable.ajax.reload() + alertSuccess(response.message).fire() + this.seletChatDepartmentUser.reset() + } + _handleUserToDepartmentError(response) { + alertError(response.message ?? "").fire() + this.btnAddUserToDepartment.removeAttr("disabled") + + } + _handleUpdateDepartment() { + this.btnUpdate.attr("disabled") + const ajax = new Ajax("/chat/department/update/" + this.chatDepartmentId, + this.getFormData(), + null, + this._handleUserToDepartmentSuccess.bind(this), + this._handleUserToDepartmentError.bind(this) + ) + if (this.getFormData()) { + ajax.post(); + } else { + this.btnUpdate.removeAttr("disabled") + } + } + __handleUpdateDepartmentSuccess(response) { + this.btnUpdate.removeAttr("disabled") + alertSuccess(response.message).fire() + this.updateFormData(response.data) + } + _handleUpdateDepartmentError(response) { + this.btnUpdate.removeAttr("disabled") + alertError(response.message ?? "").fire() + } + + + +} + +export default ChatDepartmentForm \ No newline at end of file diff --git a/httpdocs/assets/js/safekat/components/select2.js b/httpdocs/assets/js/safekat/components/select2.js index c7fdfa51..c6199c56 100644 --- a/httpdocs/assets/js/safekat/components/select2.js +++ b/httpdocs/assets/js/safekat/components/select2.js @@ -5,97 +5,96 @@ * @param {String} placeholder */ let ClassSelect = function (domItem, url, placeholder, allowClear = false, params = {}, dropdownParent = "", hideSearch = false) { - this.url = url; - this.item = domItem; - this.params = params; - this.dropdownParent = dropdownParent; - this.hideSearch = hideSearch; + this.url = url; + this.item = domItem; + this.params = params; + this.dropdownParent = dropdownParent; + this.hideSearch = hideSearch; - this.config = { - placeholder: placeholder, - allowClear: allowClear, - dropdownParent: dropdownParent!=""?dropdownParent:domItem.parent(), - language: "es", - ajax: { - url: () => { - return this.url; - }, - data: (params) => { - let q = $.trim(params.term); - let d = { - q: q, - page: params.page || 1, - }; - - for (let key in this.params) { - d[key] = this.params[key]; - } - - return d; - }, - processResults: function (data) { - return { - results: $.map(data, function (obj) { - return { - id: obj.id, - text: obj.nombre ?? obj.name, - desc: obj.description, - }; - }), - }; - }, - cache: true, + this.config = { + placeholder: placeholder, + allowClear: allowClear, + dropdownParent: dropdownParent != "" ? dropdownParent : domItem.parent(), + language: "es", + ajax: { + url: () => { + return this.url; }, - }; - this.init = function () { - if (this.item.length) { + data: (params) => { + let q = $.trim(params.term); + let d = { + q: q, + page: params.page || 1, + }; - if(this.hideSearch){ - this.config.minimumResultsForSearch = -1; + for (let key in this.params) { + d[key] = this.params[key]; } - this.item = this.item.select2(this.config); - // $.fn.modal.Constructor.prototype.enforceFocus = function () {}; - } - }; - this.setOption = function (id, nombre) { - var newOption = new Option(nombre , id, false, false); - this.item.append(newOption); - this.item.val(id).trigger("change"); - }; - this.reset = function () { - this.item.val(null).trigger("change"); - }; - this.setParams = function(params){ - this.params = params; - }; - this.getVal = function () { - return this.item.val(); - }; - this.setVal = function (val) { - return this.item.val(val).trigger("change"); - }; - this.empty = function () { - return this.item.empty().trigger("change"); - }; - this.readOnly = function () { - this.item.enable(false); - }; - this.enable = () => { - this.item.enable(true); - }; - this.fixWithScroll = function () {}; - this.getText = () => { - return this.item.find(":selected").text(); - }; - this.onChange = function(callback) { - this.item.on('change', callback); - }; - this.offChange = function() { - this.item.off('change'); - }; - + return d; + }, + processResults: function (data) { + return { + results: $.map(data, function (obj) { + return { + id: obj.id, + text: obj.nombre ?? obj.name, + desc: obj.description, + }; + }), + }; + }, + cache: true, + }, }; - + this.init = function () { + if (this.item.length) { + + if (this.hideSearch) { + this.config.minimumResultsForSearch = -1; + } + + this.item = this.item.select2(this.config); + // $.fn.modal.Constructor.prototype.enforceFocus = function () {}; + } + }; + this.setOption = function (id, nombre) { + var newOption = new Option(nombre, id, false, false); + this.item.append(newOption); + this.item.val(id).trigger("change"); + }; + this.reset = function () { + this.item.val(null).trigger("change"); + }; + this.setParams = function (params) { + this.params = params; + }; + this.getVal = function () { + return this.item.val(); + }; + this.setVal = function (val) { + return this.item.val(val).trigger("change"); + }; + this.empty = function () { + return this.item.empty().trigger("change"); + }; + this.readOnly = function () { + this.item.enable(false); + }; + this.enable = () => { + this.item.enable(true); + }; + this.fixWithScroll = function () { }; + this.getText = () => { + return this.item.find(":selected").text(); + }; + this.onChange = function (callback) { + this.item.on('change', callback); + }; + this.offChange = function () { + this.item.off('change'); + }; + +}; + export default ClassSelect; - \ No newline at end of file diff --git a/httpdocs/assets/js/safekat/pages/configuracion/messages/configView.js b/httpdocs/assets/js/safekat/pages/configuracion/messages/configView.js new file mode 100644 index 00000000..5c17e5b2 --- /dev/null +++ b/httpdocs/assets/js/safekat/pages/configuracion/messages/configView.js @@ -0,0 +1,13 @@ + +import Ajax from '../../../components/ajax.js' +import { ChatDepartmentDatatable } from '../../../components/datatables/ChatDepartmentDatatable.js' + + + + + +$(() => { + const chatDepartmentDatatable = new ChatDepartmentDatatable($("#tableChatDepartments")) + chatDepartmentDatatable.init() +}) + diff --git a/httpdocs/assets/js/safekat/pages/configuracion/messages/editChatDepartmentView.js b/httpdocs/assets/js/safekat/pages/configuracion/messages/editChatDepartmentView.js new file mode 100644 index 00000000..94b36ab8 --- /dev/null +++ b/httpdocs/assets/js/safekat/pages/configuracion/messages/editChatDepartmentView.js @@ -0,0 +1,8 @@ + +import ChatDepartmentForm from '../../../components/forms/chatDepartmentForm.js' + +$(() => { + + const chatDepartmentForm = new ChatDepartmentForm($("#chatDepartmentForm")) + chatDepartmentForm.init() +}) \ No newline at end of file From c0d54e28b7cd86d2a570ca592a2aec81175f8883 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 24 Mar 2025 08:12:06 +0100 Subject: [PATCH 6/7] message refactor --- ci4/app/Config/Routes.php | 16 +- ci4/app/Config/Services.php | 5 + ci4/app/Controllers/Chat/ChatController.php | 333 +++--------------- .../Entities/Chat/ChatDepartmentEntity.php | 79 +++++ .../Chat/ChatDepartmentUserEntity.php | 60 ++++ ci4/app/Entities/Chat/ChatEntity.php | 148 ++++++++ ci4/app/Entities/Chat/ChatMessageEntity.php | 65 ++++ .../Entities/Chat/ChatNotificationEntity.php | 42 +++ ci4/app/Entities/Chat/ChatUserEntity.php | 36 ++ ci4/app/Entities/Usuarios/UserEntity.php | 18 + ci4/app/Helpers/general_helper.php | 5 +- ci4/app/Language/es/App.php | 2 +- ci4/app/Language/es/Chat.php | 1 + ci4/app/Models/Chat/ChatDeparmentModel.php | 19 +- .../Models/Chat/ChatDeparmentUserModel.php | 3 +- ci4/app/Models/Chat/ChatMessageModel.php | 52 ++- ci4/app/Models/Chat/ChatModel.php | 177 +++++----- ci4/app/Models/ChatNotification.php | 3 +- ci4/app/Models/ChatUser.php | 3 +- ci4/app/Services/ChatService.php | 176 +++++++++ .../components/tables/messages_table.php | 10 + .../Views/themes/vuexy/main/defaultlayout.php | 5 +- httpdocs/assets/js/safekat/components/chat.js | 291 ++++----------- .../datatables/MessagesDatatable.js | 68 ++-- .../components/internalMessagesSection.js | 48 ++- .../js/safekat/pages/chatNotification.js | 6 +- 26 files changed, 994 insertions(+), 677 deletions(-) create mode 100644 ci4/app/Entities/Chat/ChatDepartmentEntity.php create mode 100644 ci4/app/Entities/Chat/ChatDepartmentUserEntity.php create mode 100644 ci4/app/Entities/Chat/ChatEntity.php create mode 100644 ci4/app/Entities/Chat/ChatMessageEntity.php create mode 100644 ci4/app/Entities/Chat/ChatNotificationEntity.php create mode 100644 ci4/app/Entities/Chat/ChatUserEntity.php create mode 100644 ci4/app/Services/ChatService.php diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 8ac4ad83..b40d287a 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -908,7 +908,7 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->post('department', 'ChatController::store_chat_department', ['as' => 'storeChatDepartment']); $routes->delete('department/(:num)', 'ChatController::delete_chat_department/$1', ['as' => 'deleteChatDepartment']); $routes->post('department/update/(:num)', 'ChatController::update_chat_department/$1', ['as' => 'updateChatDepartment']); - $routes->get('departments', 'ChatController::get_chat_departments', ['as' => 'getChatDepartments']); + $routes->get('departments/(:alpha)/(:num)', 'ChatController::get_chat_departments/$1/$2', ['as' => 'getChatDepartments']); $routes->get('departments/select', 'ChatController::get_chat_department_select', ['as' => 'getChatDepartmentSelect']); $routes->get('department/presupuesto/(:num)/(:num)', 'ChatController::get_chat_presupuesto/$1/$2', ['as' => 'getChatPresupuesto']); $routes->get('department/pedido/(:num)/(:num)', 'ChatController::get_chat_pedido/$1/$2', ['as' => 'getChatPedido']); @@ -928,9 +928,7 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->get('(:num)', 'ChatController::get_chat/$1', ['as' => 'getChat']); $routes->post('message/error/presupuesto', 'ChatController::store_chat_error_message', ['as' => 'storeChatErrorMessage']); - $routes->post('message/presupuesto', 'ChatController::store_chat_message_presupuesto', ['as' => 'storeChatMessagePresupuesto']); - $routes->post('message/pedido', 'ChatController::store_chat_message_pedido', ['as' => 'storeChatMessagePedido']); - $routes->post('message/factura', 'ChatController::store_chat_message_factura', ['as' => 'storeChatMessageFactura']); + $routes->post('message/(:alpha)', 'ChatController::store_message/$1', ['as' => 'storeChatMessage']); $routes->post('message/internal', 'ChatController::store_chat_message_single', ['as' => 'storeChatMessageSingle']); $routes->get('contacts', 'ChatController::get_chat_internal_contacts', ['as' => 'getChatInternalContacts']); $routes->get('contacts/(:num)', 'ChatController::get_chat_internal_contact/$1', ['as' => 'getChatInternalContact']); @@ -939,15 +937,11 @@ $routes->group('chat', ['namespace' => 'App\Controllers\Chat'], function ($route $routes->get('users/internal', 'ChatController::get_chat_users_internal', ['as' => 'getChatUsersInternal']); $routes->get('users/all', 'ChatController::get_chat_users_all', ['as' => 'getChatUsersAll']); - $routes->post('hebra/presupuesto', 'ChatController::store_hebra_presupuesto', ['as' => 'storeHebraPresupuesto']); - $routes->post('hebra/pedido', 'ChatController::store_hebra_pedido', ['as' => 'storeHebraPedido']); - $routes->post('hebra/factura', 'ChatController::store_hebra_factura', ['as' => 'storeHebraFactura']); + $routes->post('hebra/(:alpha)', 'ChatController::store_hebra/$1', ['as' => 'storeHebra']); $routes->post('hebra/(:num)', 'ChatController::update_hebra/$1', ['as' => 'updateHebra']); - $routes->get('hebra/presupuesto/(:num)', "ChatController::get_hebra_presupuesto/$1", ["as" => "getHebraPresupuesto"]); - $routes->get('hebra/pedido/(:num)', "ChatController::get_hebra_pedido/$1", ["as" => "getHebraPedido"]); - $routes->get('hebra/factura/(:num)', "ChatController::get_hebra_factura/$1", ["as" => "getHebraFactura"]); + $routes->get('hebra/(:alpha)/(:num)', "ChatController::get_hebra/$1/$2", ["as" => "getHebra"]); - $routes->get('users/notifications-unviewed/(:num)','ChatController::get_notifications_not_viewed_from_chat/$1'); + $routes->get('users/message/notifications-unviewed/(:num)','ChatController::get_notifications_not_viewed_from_message/$1'); }); diff --git a/ci4/app/Config/Services.php b/ci4/app/Config/Services.php index 33330fa1..9309734f 100755 --- a/ci4/app/Config/Services.php +++ b/ci4/app/Config/Services.php @@ -2,6 +2,7 @@ namespace Config; +use App\Services\ChatService; use App\Services\FTPService; use App\Services\MaquinaService; use App\Services\MessageService; @@ -53,4 +54,8 @@ class Services extends BaseService { return new MessageService(); } + public static function chat() + { + return new ChatService(); + } } diff --git a/ci4/app/Controllers/Chat/ChatController.php b/ci4/app/Controllers/Chat/ChatController.php index 840785ce..b54ec909 100644 --- a/ci4/app/Controllers/Chat/ChatController.php +++ b/ci4/app/Controllers/Chat/ChatController.php @@ -14,6 +14,7 @@ use App\Models\Facturas\FacturaModel; use App\Models\Pedidos\PedidoModel; use App\Models\Presupuestos\PresupuestoModel; use App\Models\Usuarios\UserModel; +use App\Services\ChatService; use App\Services\MessageService; use CodeIgniter\HTTP\ResponseInterface; use CodeIgniter\HTTP\RequestInterface; @@ -34,7 +35,7 @@ class ChatController extends BaseController protected ChatUser $chatUserModel; protected ChatNotification $chatNotificationModel; protected Validation $validation; - + protected ChatService $chatService; protected array $viewData; protected static $viewPath = 'themes/vuexy/form/mensajes/'; @@ -56,12 +57,15 @@ class ChatController extends BaseController $this->chatUserModel = model(ChatUser::class); $this->chatNotificationModel = model(ChatNotification::class); $this->validation = service("validation"); + $this->chatService = service("chat"); + } public function index() {} - public function get_chat_departments() + public function get_chat_departments(string $model,int $modelId) { - $data = $this->chatDeparmentModel->getChatDepartments(); + $data = $this->chatService->getChatDepartments($model,$modelId); + return $this->response->setJSON($data); } public function get_chat_department_select() @@ -73,6 +77,7 @@ class ChatController extends BaseController { $data = [ + "department" => $this->chatDeparmentModel->find($chat_department_id), "chat" => null, "messages" => null, "count" => 0, @@ -82,6 +87,7 @@ class ChatController extends BaseController $data["messages"] = $this->chatMessageModel->get_chat_messages($chat->id); $this->chatMessageModel->set_chat_department_messages_as_read($chat->id); $this->chatModel->setAsViewedChatUserNotifications($chat->id, auth()->user()->id); + $data["count"] = count($data["messages"]); } $data["chat"] = $chat; @@ -91,6 +97,7 @@ class ChatController extends BaseController { $data = [ + "department" => $this->chatDeparmentModel->find($chat_department_id), "chat" => null, "messages" => null, "count" => 0, @@ -110,6 +117,7 @@ class ChatController extends BaseController { $data = [ + "department" => $this->chatDeparmentModel->find($chat_department_id), "chat" => null, "messages" => null, "count" => 0, @@ -200,115 +208,15 @@ class ChatController extends BaseController $data = $this->chatModel->getChat($chat_id); return $this->response->setJSON($data); } - public function store_chat_message_presupuesto() + public function store_message($model) { $data = $this->request->getPost(); - // $data = $this->chatModel->createChatPresupuesto(); - $existChat = $this->chatModel->existChatPresupuesto($data["chat_department_id"], $data["model_id"]); - if ($existChat == false) { - $chatId = $this->chatModel->createChatPresupuesto($data["chat_department_id"], $data["model_id"]); - } else { - $chat = $this->chatModel->getChatPresupuesto($data["chat_department_id"], $data["model_id"]); - $chatId = $chat->id; - } - $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); - $dataResponse = $this->chatMessageModel->find($chat_message_id); - $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); - if (auth()->user()->inGroup('admin')) { - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', $data['client'])->where('presupuesto_id', $data['model_id'])->countAllResults(); - if ($cliente_in_department_count == 0) { - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => $data['client'], 'presupuesto_id' => $data['model_id']]); - } - } - $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($data["chat_department_id"], $data["model_id"]); - $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', auth()->user()->id)->countAllResults(); + $chatMessageEntity = $this->chatService->storeChatMessage($data["chat_department_id"],$model,$data["model_id"],$data); + return $this->response->setJSON($chatMessageEntity); - if ($auth_user_in_department_count) { - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => auth()->user()->id, 'presupuesto_id' => $data['model_id']]); - } - - foreach ($chatDepartmentUsers as $user) { - if ($user->id != auth()->user()->id) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } - } - foreach ($chatExternalUsers as $user) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } - return $this->response->setJSON($dataResponse); } - public function store_chat_message_pedido() - { - $data = $this->request->getPost(); - $existChat = $this->chatModel->existChatPedido($data["chat_department_id"], $data["model_id"]); - if ($existChat == false) { - $chatId = $this->chatModel->createChatPedido($data["chat_department_id"], $data["model_id"]); - } else { - $chat = $this->chatModel->getChatPedido($data["chat_department_id"], $data["model_id"]); - $chatId = $chat->id; - } - $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); - $dataResponse = $this->chatMessageModel->find($chat_message_id); - $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); - if (auth()->user()->inGroup('admin')) { - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', $data['client'])->where('pedido_id', $data['model_id'])->countAllResults(); - if ($cliente_in_department_count == 0) { - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => $data['client'], 'pedido_id' => $data['model_id']]); - } - } - $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($data["chat_department_id"], $data["model_id"]); - $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', auth()->user()->id)->countAllResults(); - if ($auth_user_in_department_count == 0) { - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => auth()->user()->id, 'pedido_id' => $data['model_id']]); - } - - foreach ($chatDepartmentUsers as $user) { - if ($user->id != auth()->user()->id) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } - } - foreach ($chatExternalUsers as $user) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } - return $this->response->setJSON($dataResponse); - } - public function store_chat_message_factura() - { - $data = $this->request->getPost(); - $existChat = $this->chatModel->existChatPedido($data["chat_department_id"], $data["model_id"]); - if ($existChat == false) { - $chatId = $this->chatModel->createChatPedido($data["chat_department_id"], $data["model_id"]); - } else { - $chat = $this->chatModel->getChatPedido($data["chat_department_id"], $data["model_id"]); - $chatId = $chat->id; - } - $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $chatId, "sender_id" => auth()->user()->id, "message" => $data["message"]]); - $dataResponse = $this->chatMessageModel->find($chat_message_id); - $chatDepartmentUsers = $this->chatDeparmentModel->getChatDepartmentUsers($data["chat_department_id"]); - if (auth()->user()->inGroup('admin')) { - $cliente_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', $data['client'])->where('pedido_id', $data['model_id'])->countAllResults(); - if ($cliente_in_department_count == 0) { - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => $data['client'], 'factura_id' => $data['model_id']]); - } - } - $chatExternalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($data["chat_department_id"], $data["model_id"]); - $auth_user_in_department_count = $this->chatDeparmentUserModel->where('chat_department_id', $data["chat_department_id"])->where('user_id', auth()->user()->id)->countAllResults(); - if ($auth_user_in_department_count == 0) { - $this->chatDeparmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], 'user_id' => auth()->user()->id, 'pedido_id' => $data['model_id']]); - } - - foreach ($chatDepartmentUsers as $user) { - if ($user->id != auth()->user()->id) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } - } - foreach ($chatExternalUsers as $user) { - $this->chatNotificationModel->insert(["chat_message_id" => $chat_message_id, "user_id" => $user->id]); - } - return $this->response->setJSON($dataResponse); - } public function store_chat_message_single() { $data = $this->request->getPost(); @@ -369,68 +277,24 @@ class ChatController extends BaseController public function get_chat_cliente() { $cliente_id = auth()->user()->cliente_id; - $response = []; - if ($cliente_id) { - // $data = $this->clienteModel->getClienteDataPresupuestoPedidoFactura($cliente_id); - $response["internals"] = $this->chatModel->getChatDepartmentNotifications(); - $response["totalMessages"] = 0; - $mensajes_directos = $this->chatModel->getChatDirectMessageNotifications(); - // $response["chatFacturas"] = $this->chatModel->getClienteChatFacturas($data["facturas"]); - // foreach ($response["chatFacturas"] as $key => $value) { - // $response["totalMessages"] += $value->unreadMessages; - // } - // $response["chatPresupuestos"] = $this->chatModel->getClienteChatPresupuestos($data["presupuestos"]); - // foreach ($response["chatPresupuestos"] as $key => $value) { - // $response["totalMessages"] += $value->unreadMessages; - // } - foreach ($mensajes_directos as $value) { - $response["internals"][] = $value; - $response["totalMessages"] += $value->unreadMessages; - } - // $response["chatPedidos"] = $this->chatModel->getClienteChatPedidos($data["pedidos"]); - // foreach ($response["chatPedidos"] as $key => $value) { - // $response["totalMessages"] += $value->unreadMessages; - // } - // $response["data"] = $data; - $response["totalMessages"] = 0; - foreach ($response["internals"] as $key => $value) { - $response["totalMessages"] += $value->unreadMessages; - } - } else { - $response["internals"] = $this->chatModel->getChatDepartmentNotifications(); - $internal_notifications = $this->chatModel->getChatInternalNotifications(); - $mensajes_directos = $this->chatModel->getChatDirectMessageNotifications(); - foreach ($internal_notifications as $value) { - $response["internals"][] = $value; - } - foreach ($mensajes_directos as $value) { - $response["internals"][] = $value; - } - $response["totalMessages"] = 0; - foreach ($response["internals"] as $key => $value) { - $response["totalMessages"] += $value->unreadMessages; - } - } + $response = $this->chatService->getAuthUserNotifications(); return $this->response->setJSON($response); } public function get_chat_department_presupuesto_users(int $chat_department_id, int $presupuesto_id) { - $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - $externalUsers = $this->chatDeparmentModel->getChatDeparmentPresupuestoUsers($chat_department_id, $presupuesto_id); - return $this->response->setJSON(['admin_users' => $adminUsers, 'external_users' => $externalUsers]); + $data = $this->chatDeparmentModel->find($chat_department_id)->withUsers($presupuesto_id, 'presupuesto'); + return $this->response->setJSON($data); } public function get_chat_department_pedido_users(int $chat_department_id, $pedido_id) { - $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - $externalUsers = $this->chatDeparmentModel->getChatDeparmentPedidoUsers($chat_department_id, $pedido_id); - return $this->response->setJSON(['admin_users' => $adminUsers, 'external_users' => $externalUsers]); + $data = $this->chatDeparmentModel->find($chat_department_id)->withUsers($pedido_id, 'pedido'); + return $this->response->setJSON($data); } public function get_chat_department_factura_users(int $chat_department_id, $factura_id) { - $adminUsers = $this->chatDeparmentModel->getChatDepartmentUsers($chat_department_id); - $externalUsers = $this->chatDeparmentModel->getChatDeparmentFacturaUsers($chat_department_id, $factura_id); - return $this->response->setJSON(['admin_users' => $adminUsers, 'external_users' => $externalUsers]); + $data = $this->chatDeparmentModel->find($chat_department_id)->withUsers($factura_id, 'factura'); + return $this->response->setJSON($data); } public function get_chat_users_internal() { @@ -536,80 +400,14 @@ class ChatController extends BaseController return $this->response->setJSON($query->get()->getResultObject()); } - public function store_hebra_presupuesto() + public function store_hebra(string $model) { $auth_user = auth()->user(); $bodyData = $this->request->getPost(); - $chat_id = $this->chatModel->insert([ - "presupuesto_id" => $bodyData["modelId"], - "title" => $bodyData["title"] - ]); - $chatMessageId = $this->chatMessageModel->insert([ - "chat_id" => $chat_id, - "message" => $bodyData["message"], - "sender_id" => $auth_user->id - ]); - if (isset($bodyData["users"])) { - $bodyData["users"][] = $auth_user->id; - $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chat_id], $bodyData["users"]); - $this->chatUserModel->insertBatch($chatUserData); - foreach ($bodyData["users"] as $userId) { - $this->chatNotificationModel->insert( - ["chat_message_id" => $chatMessageId, "user_id" => $userId] - ); - } - } - return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => true]); + $status = $this->chatService->storeHebra($model,$bodyData['modelId'],$bodyData); + return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => $status]); } - public function store_hebra_pedido() - { - $bodyData = $this->request->getPost(); - $chat_id = $this->chatModel->insert([ - "pedido_id" => $bodyData["modelId"], - "title" => $bodyData["title"] - - ]); - $chatMessageId = $this->chatMessageModel->insert([ - "chat_id" => $chat_id, - "message" => $bodyData["message"], - "sender_id" => auth()->user()->id - ]); - if (isset($bodyData["users"])) { - $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chat_id], $bodyData["users"]); - $this->chatUserModel->insertBatch($chatUserData); - foreach ($bodyData["users"] as $userId) { - $this->chatNotificationModel->insert( - ["chat_message_id" => $chatMessageId, "user_id" => $userId] - ); - } - } - return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => true]); - } - - public function store_hebra_factura() - { - $bodyData = $this->request->getPost(); - $chat_id = $this->chatModel->insert([ - "factura_id" => $bodyData["modelId"], - "title" => $bodyData["title"] - ]); - $chatMessageId = $this->chatMessageModel->insert([ - "chat_id" => $chat_id, - "message" => $bodyData["message"], - "sender_id" => auth()->user()->id - ]); - if (isset($bodyData["users"])) { - $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chat_id], $bodyData["users"]); - $this->chatUserModel->insertBatch($chatUserData); - foreach ($bodyData["users"] as $userId) { - $this->chatNotificationModel->insert( - ["chat_message_id" => $chatMessageId, "user_id" => $userId] - ); - } - } - return $this->response->setJSON(["message" => "Hebra creada correctamente", "status" => true]); - } public function update_hebra($chat_id) { $bodyData = $this->request->getPost(); @@ -620,11 +418,7 @@ class ChatController extends BaseController ]); $actualUsers = $this->chatUserModel->builder()->select("user_id")->where("chat_id", $chat_id)->get()->getResultArray(); $actualUsersArray = array_map(fn($x) => $x["user_id"], $actualUsers); - foreach ($actualUsersArray as $key => $user_id) { - $this->chatNotificationModel->insert( - ["chat_message_id" => $chatMessageId, "user_id" => $user_id] - ); - } + if (isset($bodyData["users"])) { foreach ($bodyData["users"] as $userId) { if (in_array($userId, $actualUsersArray) == false) { @@ -638,55 +432,13 @@ class ChatController extends BaseController } return $this->response->setJSON(["message" => "Hebra actualizada correctamente", "status" => true]); } - public function get_hebra_presupuesto($presupuesto_id) + public function get_hebra(string $model,int $modelId) { - $data = $this->chatModel->getPresupuestoHebras($presupuesto_id); - $notifications = $this->chatModel->builder()->select([ - "chat_notifications.id" - ]) - ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") - ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left") - ->where("chats.presupuesto_id", $presupuesto_id) - ->where("chat_notifications.user_id", auth()->user()->id) - ->get()->getResultArray(); - foreach ($notifications as $notification) { - $this->chatNotificationModel->update($notification["id"], ["viewed" => true]); - } - return $this->response->setJSON($data); - } - public function get_hebra_pedido($pedido_id) - { - $data = $this->chatModel->getPedidoHebras($pedido_id); - $notifications = $this->chatModel->builder()->select([ - "chat_notifications.id" - ]) - ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") - ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left") - ->where("chats.pedido_id", $pedido_id) - ->where("chat_notifications.user_id", auth()->user()->id) - ->get()->getResultArray(); - foreach ($notifications as $notification) { - $this->chatNotificationModel->update($notification["id"], ["viewed" => true]); - } - return $this->response->setJSON($data); - } - public function get_hebra_factura($factura_id) - { - $data = $this->chatModel->getFacturaHebras($factura_id); - $notifications = $this->chatModel->builder()->select([ - "chat_notifications.id" - ]) - ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") - ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left") - ->where("chats.factura_id", $factura_id) - ->where("chat_notifications.user_id", auth()->user()->id) - ->get()->getResultArray(); - foreach ($notifications as $notification) { - $this->chatNotificationModel->update($notification["id"], ["viewed" => true]); - } + $data = $this->chatService->getHebras($model,$modelId); return $this->response->setJSON($data); } + public function datatable_messages() { $auth_user_id = auth()->user()->id; @@ -716,9 +468,9 @@ class ChatController extends BaseController return DataTable::of($query) ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "") ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "") - ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName) - ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->id, $auth_user_id)) - ->add("action", fn($q) => ["type" => "presupuesto", "modelId" => $q->id, "isAdmin" => $isAdmin, "lang" => [ + ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId)) + ->edit("creator",fn($q) => $q->userId == $auth_user_id ? ''.lang("App.me").'' : $q->creator) + ->add("action", fn($q) => ["type" => "presupuesto", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [ "view_chat" => lang('Chat.view_chat'), "view_by_alt_message" => lang('Chat.view_by_alt_message') ]]) @@ -732,9 +484,9 @@ class ChatController extends BaseController return DataTable::of($query) ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "") ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "") - ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName) - ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->id, $auth_user_id)) - ->add("action", fn($q) => ["type" => "pedido", "modelId" => $q->id, "isAdmin" => $isAdmin, "lang" => [ + ->edit("creator",fn($q) => $q->userId == $auth_user_id ? ''.lang("App.me").'' : $q->creator) + ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId)) + ->add("action", fn($q) => ["type" => "pedido", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [ "view_chat" => lang('Chat.view_chat'), "view_by_alt_message" => lang('Chat.view_by_alt_message') ]]) @@ -749,27 +501,26 @@ class ChatController extends BaseController return DataTable::of($query) ->edit('created_at', fn($q) => $q->created_at ? Time::createFromFormat('Y-m-d H:i:s', $q->created_at)->format("d/m/Y H:i") : "") ->edit('updated_at', fn($q) => $q->updated_at ? Time::createFromFormat('Y-m-d H:i:s', $q->updated_at)->format("d/m/Y H:i") : "") - ->add("creator", fn($q) => $this->chatModel->getChatFirstUser($q->id)->userFullName) - ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->id, $auth_user_id)) - ->add("action", fn($q) => ["type" => "factura", "modelId" => $q->id, "isAdmin" => $isAdmin, "lang" => [ + ->edit("creator",fn($q) => $q->userId == $auth_user_id ? ''.lang("App.me").'' : $q->creator) + ->add("viewed", fn($q) => $this->chatModel->isMessageChatViewed($q->chatMessageId)) + ->add("action", fn($q) => ["type" => "factura", "modelId" => $q->id, "isAdmin" => $isAdmin,"chatMessageId" => $q->chatMessageId, "lang" => [ "view_chat" => lang('Chat.view_chat'), "view_by_alt_message" => lang('Chat.view_by_alt_message') ]]) ->toJson(true); } - public function get_notifications_not_viewed_from_chat(int $chat_id) + public function get_notifications_not_viewed_from_message(int $chat_message_id) { - $unviewedNotifications = $this->chatModel->getUsersNotificationNotViewedFromChat($chat_id); - $viewedNotifications = $this->chatModel->getUsersNotificationViewedFromChat($chat_id); + $unviewedNotifications = $this->chatModel->getUsersNotificationNotViewedFromChat($chat_message_id); + // $viewedNotifications = $this->chatModel->getUsersNotificationViewedFromChat($chat_message_id); return $this->response->setJSON( [ "data" => [ - "unviewedNotifications" => $unviewedNotifications, - "viewedNotifications" => $viewedNotifications + "notifications" => $unviewedNotifications, ], - "chat_id" => $chat_id + "chat_message_id" => $chat_message_id ] ); } diff --git a/ci4/app/Entities/Chat/ChatDepartmentEntity.php b/ci4/app/Entities/Chat/ChatDepartmentEntity.php new file mode 100644 index 00000000..5017c310 --- /dev/null +++ b/ci4/app/Entities/Chat/ChatDepartmentEntity.php @@ -0,0 +1,79 @@ + null, + "name" => null, + "display" => null, + "description" => null, + "type" => null, + ]; + + + protected $casts = [ + "name" => "string", + "display" => "string", + "description" => "?string", + "type" => "string", + ]; + + /** + * Chat department users that are in department as administrador. These users belongs to department in all chats in any model associated and + * will receive notifications always + * + * @return array + */ + public function chatDepartmentAdminUsers(){ + $m = model(ChatDeparmentUserModel::class); + $chatDepartmentUsers = $m->where('chat_department_id',$this->attributes['id']) + ->where('pedido_id',null) + ->where('factura_id',null) + ->where('presupuesto_id',null)->findAll(); + return $chatDepartmentUsers; + } + /** + * Chat department users that has been associated to the department by sending a + * message and users that are not as admin of the department that has written a message. + * + * @param integer $modelFkId Id from model associated + * @param string $model Name of the model associated `['presupuesto','pedido','factura']` + * @return array + */ + public function chatDepartmentExternalUsers(int $modelFkId,string $model = "presupuesto") : array + { + $m = model(ChatDeparmentUserModel::class); + $m->where('chat_department_id',$this->attributes['id']); + + switch ($model) { + case 'presupuesto': + $m->where('presupuesto_id',$modelFkId); + break; + case 'pedido': + $m->where('pedido_id',$modelFkId); + break; + case 'factura': + $m->where('pedido_id',$modelFkId); + break; + default: + break; + } + return $m->findAll() ?? []; + + } + public function withUsers(int $modelFkId,string $model = "presupuesto") : self + { + $externalUsers = $this->chatDepartmentExternalUsers($modelFkId,$model); + $this->attributes["adminUsers"] = array_map(fn(ChatDepartmentUserEntity $du) => $du->user()->withAvatar() , $this->chatDepartmentAdminUsers()); + $this->attributes["externalUsers"] = array_map(fn(ChatDepartmentUserEntity $du) => $du->user()->withAvatar() , $externalUsers); + return $this; + } + +} diff --git a/ci4/app/Entities/Chat/ChatDepartmentUserEntity.php b/ci4/app/Entities/Chat/ChatDepartmentUserEntity.php new file mode 100644 index 00000000..c261f568 --- /dev/null +++ b/ci4/app/Entities/Chat/ChatDepartmentUserEntity.php @@ -0,0 +1,60 @@ + null, + "user_id" => null, + "pedido_id" => null, + "factura_id" => null, + "presupuesto_id" => null, + ]; + + + protected $casts = [ + "chat_department_id" => "integer", + "user_id" => "integer", + "pedido_id" => "?integer", + "factura_id" => "?integer", + "presupuesto_id" => "?integer", + ]; + + public function user() : ?UserEntity + { + $m = model(UserModel::class); + return $m->find($this->attributes['user_id']); + } + public function department() : ?ChatDepartmentEntity + { + $m = model(ChatDeparmentModel::class); + return $m->find($this->attributes['chat_department_id']); + } + public function presupuesto() : ?PresupuestoEntity + { + $m = model(PresupuestoModel::class); + return $m->find($this->attributes['presupuesto_id']); + } + public function pedido() : ?PedidoEntity + { + $m = model(PedidoModel::class); + return $m->find($this->attributes['pedido_id']); + } + public function factura() : ?FacturaEntity + { + $m = model(FacturaEntity::class); + return $m->find($this->attributes['factura_id']); + } + +} diff --git a/ci4/app/Entities/Chat/ChatEntity.php b/ci4/app/Entities/Chat/ChatEntity.php new file mode 100644 index 00000000..1669f3cd --- /dev/null +++ b/ci4/app/Entities/Chat/ChatEntity.php @@ -0,0 +1,148 @@ + null, + "chat_department_id" => null, + "pedido_id" => null, + "presupuesto_id" => null, + "factura_id" => null, + "title" => null + ]; + + + protected $casts = [ + "chat_department_id" => "?integer", + "pedido_id" => "?integer", + "presupuesto_id" => "?integer", + "factura_id" => "?integer", + "title" => "string" + ]; + + public function withMessages(): self + { + $auth_user = auth()->user(); + $messages = $this->messages(); + foreach ($messages as $key => $message) { + if ($message->sender_id == $auth_user->id) { + $message->pos = 'right'; + } else { + $message->pos = 'left'; + } + } + $this->attributes["messages"] = $messages; + return $this; + } + public function department(): ?ChatDepartmentEntity + { + $m = model(ChatDeparmentModel::class); + return $m->find($this->attributes['chat_department_id']); + } + public function presupuesto(): ?PresupuestoEntity + { + $m = model(PresupuestoModel::class); + return $m->find($this->attributes['presupuesto_id']); + } + public function pedido(): ?PedidoEntity + { + $m = model(PedidoModel::class); + return $m->find($this->attributes['pedido_id']); + } + public function factura(): ?FacturaEntity + { + $m = model(FacturaEntity::class); + return $m->find($this->attributes['factura_id']); + } + public function messages(): ?array + { + $m = model(ChatMessageModel::class); + + $messages = $m->where('chat_id', $this->attributes["id"])->findAll(); + return array_map(fn(ChatMessageEntity $m) => $m->withUser(), $messages); + } + public function withHebra(): self + { + $this->attributes["messages"] = array_map(fn(ChatMessageEntity $m) => $m->withUser(), $this->messages()); + $this->attributes["internalUsers"] = array_map(fn(ChatUserEntity $u) => $u->user(), $this->internalUsers()); + return $this; + } + /** + * Undocumented function + * + * @return array + */ + public function internalUsers(): array + { + $m = model(ChatUser::class); + return $m->where('chat_id', $this->attributes["id"])->findAll() ?? []; + } + public function getModel(): ?Model + { + $model = null; + $models = [ + "presupuesto_id" => model(PresupuestoModel::class), + "pedido_id" => model(PedidoModel::class), + "factura_id" => model(FacturaModel::class) + ]; + $fks = [ + "presupuesto_id" => $this->attributes["presupuesto_id"], + "pedido_id" => $this->attributes["pedido_id"], + "factura_id" => $this->attributes["factura_id"], + ]; + foreach ($fks as $key => $fk) { + if ($fk) { + $model = $models[$key]; + break; + } + } + return $model; + } + public function relatedFk(): array + { + $relatedFk = null; + $relatedFkValue = null; + $fks = [ + "presupuesto" => $this->attributes["presupuesto_id"], + "pedido" => $this->attributes["pedido_id"], + "factura" => $this->attributes["factura_id"], + ]; + foreach ($fks as $key => $fk) { + if ($fk) { + $relatedFk = $key; + $relatedFkValue = $fk; + break; + } + } + return [ + "relatedModel" => $relatedFk, + "relatedFkValue" => $relatedFkValue + ]; + } + public function withModel() : self + { + if($this->getModel()){ + $this->attributes["modelData"] = $this->getModel()->find($this->relatedFk()['relatedFkValue']); + }else{ + $this->attributes["modelData"] = null; + } + return $this; + } +} diff --git a/ci4/app/Entities/Chat/ChatMessageEntity.php b/ci4/app/Entities/Chat/ChatMessageEntity.php new file mode 100644 index 00000000..2771a9c4 --- /dev/null +++ b/ci4/app/Entities/Chat/ChatMessageEntity.php @@ -0,0 +1,65 @@ + null, + "message" => null, + "chat_id" => null, + "sender_id" => null, + "receiver_id" => null, + "viewed" => null, + ]; + + + protected $casts = [ + "message" => "string", + "chat_id" => "integer", + "sender_id" => "?integer", + "receiver_id" => "?integer", + "viewed" => "boolean", + ]; + protected $dates = []; + + public function chat() : ?ChatEntity + { + $m = model(ChatModel::class); + return $m->find($this->attributes['chat_id']); + + } + /** + * Notifications related with this chat entity. + * + * @return array + */ + public function notifications() : array + { + $m = model(ChatNotification::class); + return $m->asArray()->where('chat_id',$this->attributes['chat_id'])->findAll() ?? []; + } + public function sentBy() : ?UserEntity + { + $m = model(UserModel::class); + return $m->find($this->attributes["sender_id"])->withAvatar(); + + } + public function withUser() : self + { + $this->attributes["user"] = $this->sentBy(); + return $this; + } + public function getCreatedAt() + { + return Time::createFromFormat("Y-m-d H:i:s",$this->attributes['created_at'])->format('d/m/Y H:i'); + + } +} diff --git a/ci4/app/Entities/Chat/ChatNotificationEntity.php b/ci4/app/Entities/Chat/ChatNotificationEntity.php new file mode 100644 index 00000000..07828a1c --- /dev/null +++ b/ci4/app/Entities/Chat/ChatNotificationEntity.php @@ -0,0 +1,42 @@ + null, + "chat_message_id" => null, + "user_id" => null, + "viewed" => null, + ]; + + + protected $casts = [ + "chat_message_id" => "integer", + "user_id" => "integer", + "viewed" => "boolean", + ]; + + public function message() : ?ChatMessageEntity + { + $m = model(ChatMessageModel::class); + return $m->find($this->attributes['chat_message_id']); + } + public function user() : ?UserEntity + { + $m = model(UserModel::class); + return $m->find($this->attributes['user_id']); + } + public function chat() : ?ChatEntity + { + return $this->message()->chat(); + } + +} diff --git a/ci4/app/Entities/Chat/ChatUserEntity.php b/ci4/app/Entities/Chat/ChatUserEntity.php new file mode 100644 index 00000000..9f485cb5 --- /dev/null +++ b/ci4/app/Entities/Chat/ChatUserEntity.php @@ -0,0 +1,36 @@ + null, + "user_id" => null, + "chat_id" => null, + ]; + + + protected $casts = [ + "user_id" => "integer", + "chat_id" => "integer", + ]; + + public function chat() : ?ChatEntity + { + $m = model(ChatModel::class); + return $m->find($this->attributes['chat_id']); + + } + public function user() : ?UserEntity + { + $m = model(UserModel::class); + return $m->find($this->attributes['user_id'])->withAvatar(); + } + +} diff --git a/ci4/app/Entities/Usuarios/UserEntity.php b/ci4/app/Entities/Usuarios/UserEntity.php index 34206cad..a6410e2f 100755 --- a/ci4/app/Entities/Usuarios/UserEntity.php +++ b/ci4/app/Entities/Usuarios/UserEntity.php @@ -1,6 +1,8 @@ getFullName(); } + public function withAvatar() : self + { + $users = auth()->getProvider(); + $this->attributes["avatar"] = md5($users->findById($this->attributes['id'])->getEmail()); + return $this; + } + /** + * Return an array of ChatNotificationEntities that belongs to the user + * + * @return array + */ + public function chatNotifications() : array + { + $m = model(ChatNotification::class); + return $m->where('user_id',$this->attributes['id'])->findAll() ?? []; + } } diff --git a/ci4/app/Helpers/general_helper.php b/ci4/app/Helpers/general_helper.php index e0578134..0736e7aa 100644 --- a/ci4/app/Helpers/general_helper.php +++ b/ci4/app/Helpers/general_helper.php @@ -97,7 +97,10 @@ function getCurrentLanguageFlag(){ } } - +function getGravatarURL(int $size = 30) +{ + return "https://gravatar.com/avatar/".md5(auth()->user()->getEmail())."?s=".$size; +} function getAllClassFolder($folder = null){ try { helper('filesystem'); diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index 095247ad..eac95b5e 100755 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -826,6 +826,6 @@ return [ "menu_soporte" => "Soporte", "menu_soporte_new_ticket" => "Crear ticket", "menu_soporte_ticket_list" => "Mis tickets", - + "me" => "Yo", ]; \ No newline at end of file diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php index 300a3974..b1ba0e4e 100644 --- a/ci4/app/Language/es/Chat.php +++ b/ci4/app/Language/es/Chat.php @@ -20,6 +20,7 @@ return [ "created_at" => "Fecha creación", "updated_at" => "Fecha actualización", "title" => "Título", + "message" => "Mensaje", "creator" => "Creador", "viewed" => "Leído", diff --git a/ci4/app/Models/Chat/ChatDeparmentModel.php b/ci4/app/Models/Chat/ChatDeparmentModel.php index ec3a857a..c5d81c87 100644 --- a/ci4/app/Models/Chat/ChatDeparmentModel.php +++ b/ci4/app/Models/Chat/ChatDeparmentModel.php @@ -2,6 +2,7 @@ namespace App\Models\Chat; +use App\Entities\Chat\ChatDepartmentEntity; use App\Models\Usuarios\UserModel; use CodeIgniter\Model; @@ -10,7 +11,7 @@ class ChatDeparmentModel extends Model protected $table = 'chat_departments'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; - protected $returnType = 'object'; + protected $returnType = ChatDepartmentEntity::class; protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = [ @@ -181,4 +182,20 @@ class ChatDeparmentModel extends Model { return $this->select(['id','display','description'])->where('deleted_at',null); } + + public function getModelChatDepartments(string $modelFk,int $modelId) : array + { + $query = $this->builder()->select([ + 'chat_departments.id', + 'chat_departments.name', + 'chat_departments.display', + 'COUNT(chat_messages.id) as countMessages' + ]) + ->join('chats','chats.chat_department_id = chat_departments.id','left') + ->join('chat_messages','chat_messages.chat_id = chats.id','left') + ->where($modelFk,$modelId) + ->groupBy('chat_departments.name'); + return $query->get()->getResultArray() ?? []; + + } } diff --git a/ci4/app/Models/Chat/ChatDeparmentUserModel.php b/ci4/app/Models/Chat/ChatDeparmentUserModel.php index 7726e5d9..1afdca85 100644 --- a/ci4/app/Models/Chat/ChatDeparmentUserModel.php +++ b/ci4/app/Models/Chat/ChatDeparmentUserModel.php @@ -2,6 +2,7 @@ namespace App\Models\Chat; +use App\Entities\Chat\ChatDepartmentUserEntity; use App\Models\Usuarios\UserModel; use CodeIgniter\Model; @@ -10,7 +11,7 @@ class ChatDeparmentUserModel extends Model protected $table = 'chat_department_users'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; - protected $returnType = 'array'; + protected $returnType = ChatDepartmentUserEntity::class; protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = [ diff --git a/ci4/app/Models/Chat/ChatMessageModel.php b/ci4/app/Models/Chat/ChatMessageModel.php index e0ee9a20..5fb01241 100644 --- a/ci4/app/Models/Chat/ChatMessageModel.php +++ b/ci4/app/Models/Chat/ChatMessageModel.php @@ -2,6 +2,7 @@ namespace App\Models\Chat; +use App\Entities\Chat\ChatMessageEntity; use App\Models\ChatNotification; use App\Models\Usuarios\UserModel; use CodeIgniter\Model; @@ -12,7 +13,7 @@ class ChatMessageModel extends Model protected $table = 'chat_messages'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; - protected $returnType = 'object'; + protected $returnType = ChatMessageEntity::class; protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = [ @@ -45,7 +46,7 @@ class ChatMessageModel extends Model // Callbacks protected $allowCallbacks = true; protected $beforeInsert = []; - protected $afterInsert = []; + protected $afterInsert = ['callbackNewMessage']; protected $beforeUpdate = []; protected $afterUpdate = []; protected $beforeFind = []; @@ -82,7 +83,6 @@ class ChatMessageModel extends Model if ($auth_user->id == $message->sender_id) { $message->sender_first_name = $auth_user->first_name; $message->sender_last_name = $auth_user->last_name; - } else { $sender_user = $user->find($message->sender_id); $message->sender_first_name = $sender_user->first_name; @@ -133,10 +133,10 @@ class ChatMessageModel extends Model ->where("receiver_id", auth()->user()->id)->countAllResults(); return $messagesFromReceiver; } - public function get_chat_department_messages_count(int $chat_id) : int + public function get_chat_department_messages_count(int $chat_id): int { $chatDepartmentMessagesCount = $this->builder() - ->where("id",$chat_id) + ->where("id", $chat_id) ->countAllResults(); return $chatDepartmentMessagesCount; } @@ -194,4 +194,46 @@ class ChatMessageModel extends Model return $messagesFromReceiver; } + public function callbackNewMessage(array $data) + { + $authUser = auth()->user(); + $chatNotificationModel = model(ChatNotification::class); + $chatMessageEntity = $this->find($data["id"]); + $chatEntity = $chatMessageEntity->chat(); + if ($chatEntity->chat_department_id) { + $chatDepartmentEntity = $chatEntity->department(); + $adminUsers = $chatDepartmentEntity->chatDepartmentAdminUsers(); + $modelFk = $chatEntity->relatedFk(); + $externalUsers = $chatDepartmentEntity->chatDepartmentExternalUsers($modelFk["relatedFkValue"], $modelFk["relatedModel"]); + if ($modelFk["relatedModel"] && $modelFk["relatedFkValue"]) { + + foreach ($adminUsers as $user) { + if ($user->user_id != $authUser->id) { + $chatNotificationModel->insert([ + "user_id" => $user->user_id, + "chat_message_id" => $data["id"] + ]); + } + } + foreach ($externalUsers as $user) { + if ($user->user_id != $authUser->id) { + $chatNotificationModel->insert([ + "user_id" => $user->user_id, + "chat_message_id" => $data["id"] + ]); + } + } + } + }else{ + foreach ($chatEntity->internalUsers() as $user) { + if ($user->user_id != $authUser->id) { + $chatNotificationModel->insert([ + "user_id" => $user->user_id, + "chat_message_id" => $data["id"] + ]); + } + } + } + return $data; + } } diff --git a/ci4/app/Models/Chat/ChatModel.php b/ci4/app/Models/Chat/ChatModel.php index 70db1dca..3106560f 100644 --- a/ci4/app/Models/Chat/ChatModel.php +++ b/ci4/app/Models/Chat/ChatModel.php @@ -2,6 +2,7 @@ namespace App\Models\Chat; +use App\Entities\Chat\ChatEntity; use App\Models\ChatNotification; use App\Models\ChatUser; use App\Models\Facturas\FacturaModel; @@ -16,7 +17,7 @@ class ChatModel extends Model protected $table = 'chats'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; - protected $returnType = 'object'; + protected $returnType = ChatEntity::class; protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = [ @@ -315,12 +316,6 @@ class ChatModel extends Model } public function getChatDepartmentNotifications() { - $chatDeparmentModel = model(ChatDeparmentModel::class); - $chatMessageModel = model(ChatMessageModel::class); - $presupuestoModel = model(PresupuestoModel::class); - $facturaModel = model(FacturaModel::class); - $pedidoModel = model(PedidoModel::class); - $q = $this->builder() ->select([ "chats.id as chatId", @@ -329,7 +324,7 @@ class ChatModel extends Model "chats.presupuesto_id as presupuestoId", "chats.factura_id as facturaId", "chats.title as chatDisplay", - "COUNT(chat_notifications.viewed) as unreadMessages" + "COUNT(chat_notifications.id) as unreadMessages" ]) ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left") @@ -343,36 +338,28 @@ class ChatModel extends Model $rows_new = []; foreach ($rows as $row) { if ($row->presupuestoId) { - $row->model = $presupuestoModel->find($row->presupuestoId); + // $row->model = $presupuestoModel->find($row->presupuestoId); if ($auth_user->cliente_id) { $row->uri = "/presupuestocliente/edit/" . $row->presupuestoId . "#accordionChatPresupuesto"; } else { $row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId . "#accordionChatPresupuesto"; } $row->title = $row->presupuestoId; - if ($row->chatDepartmentId) { - $row->chatDisplay = $row->model->titulo; - } else { - $row->chatDisplay .= "[INTERNAL]"; - } + $row->avatar = "PRE"; $rows_new[] = $row; } elseif ($row->pedidoId) { - $row->model = $pedidoModel->find($row->pedidoId); + // $row->model = $pedidoModel->find($row->pedidoId); $row->uri = "/pedidos/edit/" . $row->pedidoId . "#accordionChatPedido"; $row->title = $row->pedidoId; - if ($row->chatDepartmentId) { - $row->chatDisplay .= "[INTERNAL]"; - } + $row->avatar = "P"; $rows_new[] = $row; } elseif ($row->facturaId) { - $row->model = $facturaModel->find($row->facturaId); + // $row->model = $facturaModel->find($row->facturaId); $row->uri = "/chat/factura/" . $row->facturaId . "#accordionChatFactura"; $row->avatar = "F"; - if ($row->chatDepartmentId) { - $row->chatDisplay .= "[INTERNAL]"; - } + $row->title = $row->facturaId; $rows_new[] = $row; } @@ -381,10 +368,6 @@ class ChatModel extends Model } public function getChatInternalNotifications() { - $presupuestoModel = model(PresupuestoModel::class); - $facturaModel = model(FacturaModel::class); - $pedidoModel = model(PedidoModel::class); - $q = $this->builder() ->select([ "chats.id as chatId", @@ -393,52 +376,41 @@ class ChatModel extends Model "chats.presupuesto_id as presupuestoId", "chats.factura_id as facturaId", "chats.title as chatDisplay", + "COUNT(chat_messages.id) as unreadMessages" + ]) ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", "left") ->where("chat_notifications.user_id", auth()->user()->id) ->where("chat_notifications.viewed", false) - ->where("chats.chat_department_id", null); + ->where("chats.chat_department_id", null) + ->groupBy('chats.id'); + $auth_user = auth()->user(); $rows = $q->get()->getResultObject(); $rows_new = []; foreach ($rows as $row) { - $row->unreadMessages = 0; if ($row->presupuestoId) { - $row->model = $presupuestoModel->find($row->presupuestoId); if ($auth_user->cliente_id) { $row->uri = "/presupuestocliente/edit/" . $row->presupuestoId . "#accordionChatPresupuesto"; } else { $row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId . "#accordionChatPresupuesto"; } $row->title = $row->presupuestoId; - if ($row->chatDepartmentId) { - $row->chatDisplay = $row->model->titulo; - } else { - $row->chatDisplay .= "[INTERNAL]"; - } + $row->chatDisplay .= "[INTERNAL]"; $row->avatar = "PRE"; - $row->unreadMessages = $this->countUnreadMessagePresupuesto($row->presupuestoId); $rows_new[] = $row; } elseif ($row->pedidoId) { - $row->model = $pedidoModel->find($row->pedidoId); $row->uri = "/pedidos/edit/" . $row->pedidoId . "#accordionChatFactura"; $row->title = $row->pedidoId; - if ($row->chatDepartmentId) { - $row->chatDisplay .= "[INTERNAL]"; - } + $row->chatDisplay .= "[INTERNAL]"; $row->avatar = "P"; - $row->unreadMessages = $this->countUnreadMessagePedido($row->pedidoId); $rows_new[] = $row; } elseif ($row->facturaId) { - $row->model = $facturaModel->find($row->facturaId); $row->uri = "/factura/edit/" . $row->facturaId . "#accordionChatFactura"; $row->avatar = "F"; - if ($row->chatDepartmentId) { - $row->chatDisplay .= "[INTERNAL]"; - } + $row->chatDisplay .= "[INTERNAL]"; $row->title = $row->facturaId; - $row->unreadMessages = $this->countUnreadMessageFactura($row->facturaId); $rows_new[] = $row; } } @@ -585,7 +557,7 @@ class ChatModel extends Model } return $data; } - public function countUnreadMessagePresupuesto(int $presupuesto_id,int $chat_department_id): int|string + public function countUnreadMessagePresupuesto(int $presupuesto_id): int|string { return $this->builder()->select() ->join("chat_messages", "chat_messages.chat_id = chats.id", "left") @@ -593,7 +565,6 @@ class ChatModel extends Model ->where("chats.presupuesto_id", $presupuesto_id) ->where("chat_notifications.viewed", false) ->where("chat_notifications.user_id", auth()->user()->id) - ->where('chats.chat_department_id',$chat_department_id) ->countAllResults(); } public function countUnreadMessagePedido($pedido_id): int|string @@ -675,6 +646,7 @@ class ChatModel extends Model ->orderBy("chat_messages.created_at", 'ASC'); return $q->get()->getFirstRow(); } + /** * Check if all messages of a chat sent to an user have been viewed. * @@ -682,13 +654,12 @@ class ChatModel extends Model * @param integer $user_id * @return boolean True : All messages readed */ - public function isMessageChatViewed(int $chat_id, int $user_id): bool + public function isMessageChatViewed(int $chat_message_id): bool { - $q = $this->builder()->select(["chat_notifications.id"]) + $q = $this->builder()->select(["chat_notifications.id as cnId"]) ->join("chat_messages", "chat_messages.chat_id = chats.id", 'left') ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", 'left') - ->where("chats.id", $chat_id) - // ->where("chat_notifications.user_id", $user_id) + ->where("chat_messages.id", $chat_message_id) ->where("chat_notifications.viewed", false); $unread_messages_count = $q->countAllResults(); if ($unread_messages_count > 0) { @@ -704,7 +675,7 @@ class ChatModel extends Model * @param integer $chat_id * @return array True : All messages readed */ - public function getUsersNotificationNotViewedFromChat(int $chat_id): array + public function getUsersNotificationNotViewedFromChat(int $chat_message_id): array { $q = $this->builder()->distinct()->select( [ @@ -717,13 +688,12 @@ class ChatModel extends Model ->join("chat_messages", "chat_messages.chat_id = chats.id", 'left') ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", 'left') ->join("users", "users.id = chat_notifications.user_id", 'left') - ->where("chats.id", $chat_id) + ->where("chat_messages.id", $chat_message_id) ->where("chat_notifications.deleted_at", null) - ->where('chat_notifications.viewed',false) ->get()->getResultArray(); return $q; } - public function getUsersNotificationViewedFromChat(int $chat_id): array + public function getUsersNotificationViewedFromChat(int $chat_message_id): array { $q = $this->builder()->distinct()->select( [ @@ -736,9 +706,9 @@ class ChatModel extends Model ->join("chat_messages", "chat_messages.chat_id = chats.id", 'left') ->join("chat_notifications", "chat_notifications.chat_message_id = chat_messages.id", 'left') ->join("users", "users.id = chat_notifications.user_id", 'left') - ->where("chats.id", $chat_id) + ->where("chat_messages.id", $chat_message_id) ->where("chat_notifications.deleted_at", null) - ->where('chat_notifications.viewed',true) + ->where('chat_notifications.viewed', true) ->get()->getResultArray(); return $q; } @@ -772,78 +742,93 @@ class ChatModel extends Model $query = $this->builder() ->select([ "chats.id", + "cm.id as chatMessageId", + "u.id as userId", + "cm.message", "chats.created_at", - "cm.updated_at", - "chats.title", + " + ( + SELECT cm2.updated_at + FROM chat_messages cm2 + WHERE cm2.chat_id = chats.id + ORDER BY cm2.updated_at DESC LIMIT 1 + ) as updated_at", + "CONCAT(u.first_name,' ',u.last_name) as creator", + "CONCAT('[',chats.title,']',' ',presupuestos.titulo) as title", ]) - ->join("chat_users", "chats.id = chat_users.chat_id", "left") ->join("presupuestos", "presupuestos.id = chats.presupuesto_id", 'left') ->join("chat_messages cm", "chats.id = cm.chat_id", "left") - ->where("chats.presupuesto_id is NOT NULL", NULL, FALSE) - ->where("cm.updated_at = ( - SELECT cm2.updated_at - FROM chat_messages cm2 - WHERE cm2.chat_id = chats.id - ORDER BY cm2.updated_at DESC LIMIT 1 - )"); + ->join("users u", "u.id = cm.sender_id", 'left') + ->where("chats.presupuesto_id is NOT NULL", NULL, FALSE); + if (auth()->user()->inGroup("admin") == false) { $query->where('presupuestos.cliente_id', auth()->user()->cliente_id) - ->where("chat_department_id is NOT NULL", NULL, FALSE); + ->where("chats.chat_department_id is NOT NULL", NULL, FALSE); } - return $query; + return $query->groupBy('chatMessageId'); } public function getQueryDatatableMessagePedido(int $user_id): BaseBuilder { $query = $this->builder() ->select([ "chats.id", + "cm.id as chatMessageId", + "u.id as userId", + "cm.message", "chats.created_at", - "cm.updated_at", - "chats.title", - ]) - ->join("chat_users", "chat_users.chat_id = chats.id", "left") - ->join("pedidos_linea", "pedidos_linea.pedido_id = chats.pedido_id", 'left') - ->join("chat_messages cm", "chats.id = cm.chat_id", "left") - ->join("presupuestos", "presupuestos.id = pedidos_linea.presupuesto_id", 'left') - ->where("chats.pedido_id is NOT NULL", NULL, FALSE) - ->where("cm.updated_at = ( + " + ( SELECT cm2.updated_at FROM chat_messages cm2 WHERE cm2.chat_id = chats.id ORDER BY cm2.updated_at DESC LIMIT 1 - )"); + ) as updated_at", + "CONCAT(u.first_name,' ',u.last_name) as creator", + "CONCAT('[',chats.title,']',' ',presupuestos.titulo) as title", + ]) + ->join("pedidos_linea", "pedidos_linea.pedido_id = chats.pedido_id", 'left') + ->join("chat_messages cm", "chats.id = cm.chat_id", "left") + ->join("users u", "u.id = cm.sender_id", 'left') + ->join("presupuestos", "presupuestos.id = pedidos_linea.presupuesto_id", 'left') + ->where("chats.pedido_id is NOT NULL", NULL, FALSE); + if (auth()->user()->inGroup("admin") == false) { $query->where('presupuestos.cliente_id', auth()->user()->cliente_id) - ->where("chat_department_id is NOT NULL", NULL, FALSE); + ->where("chats.chat_department_id is NOT NULL", NULL, FALSE); } - return $query; + return $query->groupBy('chatMessageId'); } public function getQueryDatatableMessageFactura(int $user_id): BaseBuilder { $query = $this->builder() ->select([ "chats.id", + "cm.id as chatMessageId", + "u.id as userId", + "cm.message", "chats.created_at", - "cm.updated_at", - "chats.title", - ]) - ->join("chat_users", "chat_users.chat_id = chats.id", "left") - ->join("chat_messages cm", "chats.id = cm.chat_id", "left") - ->join("facturas", "facturas.id = chats.factura_id", "left") - ->where("chats.factura_id is NOT NULL", NULL, FALSE) - ->where("cm.updated_at = ( + " + ( SELECT cm2.updated_at FROM chat_messages cm2 WHERE cm2.chat_id = chats.id ORDER BY cm2.updated_at DESC LIMIT 1 - )"); + ) as updated_at", + "CONCAT(u.first_name,' ',u.last_name) as creator", + "chats.title", + ]) + ->join("chat_messages cm", "chats.id = cm.chat_id", "left") + ->join("users u", "u.id = cm.sender_id", 'left') + ->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) { $query->where('facturas.cliente_id', auth()->user()->cliente_id) - ->where("chat_department_id is NOT NULL", NULL, FALSE); + ->where("chats.chat_department_id is NOT NULL", NULL, FALSE); } } - return $query; + return $query->groupBy('chatMessageId'); } public function createNewDirectChat(string $title, string $message, array $users) { @@ -923,12 +908,12 @@ class ChatModel extends Model ->select("chat_notifications.id as notificationId") ->join('chat_messages', 'chat_messages.chat_id = chats.id', 'left') ->join('chat_notifications', 'chat_notifications.chat_message_id = chat_messages.id', 'left') - ->where('chat_notifications.user_id',$user_id) + ->where('chat_notifications.user_id', $user_id) ->where('chat_messages.chat_id', $chat_id) ->get()->getResultObject(); $chat_messages_ids = array_map(fn($q) => $q->notificationId, $query); $chatNotificationModel = model(ChatNotification::class); - if($chat_messages_ids){ + if ($chat_messages_ids) { $chatNotificationModel->setNotificationsAsViewed($chat_messages_ids); } } @@ -945,12 +930,12 @@ class ChatModel extends Model ->select("chat_notifications.id as notificationId") ->join('chat_messages', 'chat_messages.chat_id = chats.id', 'left') ->join('chat_notifications', 'chat_notifications.chat_message_id = chat_messages.id', 'left') - ->where('chat_notifications.user_id',$user_id) + ->where('chat_notifications.user_id', $user_id) ->where('chat_messages.chat_id', $chat_id) ->get()->getResultObject(); $chat_messages_ids = array_map(fn($q) => $q->notificationId, $query); $chatNotificationModel = model(ChatNotification::class); - if($chat_messages_ids){ + if ($chat_messages_ids) { $chatNotificationModel->setNotificationsAsUnViewed($chat_messages_ids); } } diff --git a/ci4/app/Models/ChatNotification.php b/ci4/app/Models/ChatNotification.php index 7d8824d4..aa1e0a28 100644 --- a/ci4/app/Models/ChatNotification.php +++ b/ci4/app/Models/ChatNotification.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Entities\Chat\ChatNotificationEntity; use CodeIgniter\Model; class ChatNotification extends Model @@ -9,7 +10,7 @@ class ChatNotification extends Model protected $table = 'chat_notifications'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; - protected $returnType = 'array'; + protected $returnType = ChatNotificationEntity::class; protected $useSoftDeletes = false; protected $protectFields = true; protected $allowedFields = [ diff --git a/ci4/app/Models/ChatUser.php b/ci4/app/Models/ChatUser.php index f51f989f..b6355a53 100644 --- a/ci4/app/Models/ChatUser.php +++ b/ci4/app/Models/ChatUser.php @@ -2,6 +2,7 @@ namespace App\Models; +use App\Entities\Chat\ChatUserEntity; use CodeIgniter\Model; class ChatUser extends Model @@ -9,7 +10,7 @@ class ChatUser extends Model protected $table = 'chat_users'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; - protected $returnType = 'array'; + protected $returnType = ChatUserEntity::class; protected $useSoftDeletes = true; protected $protectFields = true; protected $allowedFields = [ diff --git a/ci4/app/Services/ChatService.php b/ci4/app/Services/ChatService.php new file mode 100644 index 00000000..66277625 --- /dev/null +++ b/ci4/app/Services/ChatService.php @@ -0,0 +1,176 @@ + "presupuesto_id", + "pedido" => "pedido_id", + "factura" => "factura_id", + ]; + protected array $modelClassMap; + public function __construct() + { + $this->chatModel = model(ChatModel::class); + $this->chatMessageModel = model(ChatMessageModel::class); + $this->chatNotificationModel = model(ChatNotification::class); + $this->chatDepartmentUserModel = model(ChatDeparmentUserModel::class); + $this->chatUserModel = model(ChatUser::class); + $this->presupuestoModel = model(PresupuestoModel::class); + $this->chatDepartmentModel = model(ChatDeparmentModel::class); + $this->configVariables = model(ConfigVariableModel::class); + } + public function setChat($chatEntity): self + { + $this->chatEntity = $chatEntity; + return $this; + } + public function storeChatMessage(string $chatDepartmentId, string $model, int $modelId, array $data): ?ChatMessageEntity + { + $this->chatEntity = $this->chatModel->where('chat_department_id', $chatDepartmentId)->where($this->modelFkMap[$model], $modelId)->first(); + if ($this->chatEntity == null) { + $chatId = $this->createChat($chatDepartmentId, $model, $modelId); + $this->chatEntity = $this->chatModel->find($chatId); + } + if ($data["client"]) { + $cliente_in_department = $this->chatDepartmentUserModel + ->where('chat_department_id', $chatDepartmentId) + ->where('user_id', $data['client']) + ->where($this->modelFkMap[$model], $modelId) + ->first(); + if ($cliente_in_department == null) { + $this->chatDepartmentUserModel->insert(['chat_department_id' => $chatDepartmentId, 'user_id' => $data['client'], $this->modelFkMap[$model] => $modelId]); + } + } + $userAdminDepartment = $this->chatDepartmentUserModel + ->where('chat_department_id', $data["chat_department_id"]) + ->where('user_id', auth()->user()->id) + ->where("pedido_id", null) + ->where("factura_id", null) + ->where("presupuesto_id", null) + ->first(); + $userAlreadyInDepartment = $this->chatDepartmentUserModel + ->where('chat_department_id', $data["chat_department_id"]) + ->where('user_id', auth()->user()->id) + ->where($this->modelFkMap[$model], $modelId) + ->first(); + if ($userAdminDepartment == null && $userAlreadyInDepartment == null) { + $this->chatDepartmentUserModel->insert(['chat_department_id' => $data["chat_department_id"], $this->modelFkMap[$model] => $modelId, 'user_id' => auth()->user()->id]); + } + $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $this->chatEntity->id, "sender_id" => auth()->user()->id, "message" => $data["message"]]); + $chatMessageEntity = $this->chatMessageModel->find($chat_message_id); + return $chatMessageEntity; + } + public function createChat(int $chatDepartmentId, string $model, int $modelId): bool|int|string + { + $r = false; + switch ($model) { + case 'presupuesto': + $r = $this->chatModel->createChatPresupuesto($chatDepartmentId, $modelId); + break; + case 'pedido': + $r = $this->chatModel->createChatPedido($chatDepartmentId, $modelId); + break; + case 'factura': + $r = $this->chatModel->createChatFactura($chatDepartmentId, $modelId); + break; + default: + break; + } + return $r; + } + + public function getChatDepartments(string $model, int $modelId): array + { + $chatDepartments = $this->chatDepartmentModel->getModelChatDepartments($this->modelFkMap[$model], $modelId); + $departmentWithChat = array_map(fn($q) => $q["name"], $chatDepartments); + if(count($departmentWithChat) > 0){ + $departmentWithoutChat = $this->chatDepartmentModel->whereNotIn('name', $departmentWithChat)->findAll(); + }else{ + $departmentWithoutChat = $this->chatDepartmentModel->findAll(); + } + foreach ($departmentWithoutChat as $value) { + $d = []; + $d["id"] = $value->id; + $d["name"] = $value->name; + $d["display"] = $value->display; + $d["countMessages"] = "0"; + $chatDepartments[] = $d; + } + return $chatDepartments; + } + + public function storeHebra(string $model, int $modelId, array $data): bool + { + $auth_user = auth()->user(); + $chatId = $this->chatModel->insert([$this->modelFkMap[$model] => $modelId, 'title' => $data['title']]); + + if (isset($data["users"])) { + $data["users"][] = $auth_user->id; + $chatUserData = array_map(fn($x) => ["user_id" => $x, "chat_id" => $chatId], $data["users"]); + $this->chatUserModel->insertBatch($chatUserData); + } + $this->chatMessageModel->insert( + [ + 'chat_id' => $chatId, + 'message' => $data['message'], + 'sender_id' => $auth_user->id + ] + ); + return true; + } + public function getHebras(string $model, int $modelId): array + { + $chats = $this->chatModel->where('chat_department_id', null) + ->where($this->modelFkMap[$model], $modelId) + ->findAll(); + foreach ($chats as $c) { + $this->chatModel->setAsViewedChatUserNotifications($c->id,auth()->user()->id); + } + $chatWithHebraData = array_map(fn(ChatEntity $c) => $c->withHebra(), $chats); + return $chatWithHebraData ?? []; + } + public function getAuthUserNotifications(): array + { + $departmentNotifications = $this->chatModel->getChatDepartmentNotifications(); + $internalNotifications = $this->chatModel->getChatInternalNotifications(); + $totalMessages = 0; + $countNotificiationDepartments = array_map(fn($n) => $n->unreadMessages,$departmentNotifications); + $countNotificationInternal = array_map(fn($n) => $n->unreadMessages,$internalNotifications); + $totalMessages = array_sum($countNotificiationDepartments) + array_sum($countNotificationInternal); + + return [ + "departmentNotifications" => $departmentNotifications, + "internalNotifications" => $internalNotifications, + "totalMessages" => $totalMessages + ]; + } +} diff --git a/ci4/app/Views/themes/vuexy/components/tables/messages_table.php b/ci4/app/Views/themes/vuexy/components/tables/messages_table.php index 22456941..17316fda 100644 --- a/ci4/app/Views/themes/vuexy/components/tables/messages_table.php +++ b/ci4/app/Views/themes/vuexy/components/tables/messages_table.php @@ -4,10 +4,20 @@ + + + + + + + + + + diff --git a/ci4/app/Views/themes/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/vuexy/main/defaultlayout.php index adc7e9e1..63230311 100644 --- a/ci4/app/Views/themes/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/vuexy/main/defaultlayout.php @@ -250,7 +250,7 @@ $picture = "/assets/img/default-user.png";
    - +
      @@ -259,7 +259,7 @@ $picture = "/assets/img/default-user.png";
      - +
      @@ -346,7 +346,6 @@ $picture = "/assets/img/default-user.png"; - diff --git a/httpdocs/assets/js/safekat/components/chat.js b/httpdocs/assets/js/safekat/components/chat.js index aa0caf5b..6f941544 100644 --- a/httpdocs/assets/js/safekat/components/chat.js +++ b/httpdocs/assets/js/safekat/components/chat.js @@ -138,6 +138,7 @@ class Chat { this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) this.initSelectClient() + // setInterval(this._getChatMessage.bind(this), 10000) @@ -149,6 +150,8 @@ class Chat { this.sendBtnMessageDepartmentClient.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) this.initSelectClient() + // setInterval(this._getChatMessage.bind(this), 10000) + } @@ -159,8 +162,7 @@ class Chat { this.sendBtnMessageDepartmentClient.on("click", this._sendMessage.bind(this)) this.messageInput.on("keypress", this._sendMessagePressKey.bind(this)) this.initSelectClient() - - + // setInterval(this._getChatMessage.bind(this), 10000) } initContacts() { this.chatType = "internal" @@ -198,7 +200,7 @@ class Chat { _handleGetChatList(event) { this.domItem.find(".chat-loader").removeClass("d-none") let ajax = new Ajax( - "/chat/departments", + `/chat/departments/${this.chatType}/${this.modelId}`, null, null, this._handleGetChatListSuccess.bind(this), @@ -211,7 +213,6 @@ class Chat { Object.values(data).map(row => { this.chatList.append(this._getContact(row)) this.chatDeparmentId = row.id - this._getChatTotalMessages(row.name) this.chatList.find(`#chat_${row.name}`).on("click", (event) => { $(".chat-contact-list-item").removeClass("active") $(event.currentTarget).parent().addClass("active") @@ -220,7 +221,6 @@ class Chat { this.domItem.find(".chat-history-header div.chat-contact-info h6").text(row.display) this.domItem.find(".chat-history-header div.chat-contact-info small.user-status").text(row.display) this._getChatMessage() - this._getChatTotalMessages(row.name) this._getChatDeparmentUsers() }) @@ -248,8 +248,8 @@ class Chat { ajax.get() } _getChatDeparmentUsersSuccess(deparmentUsers) { - deparmentUsers.admin_users.map(user => this.appendChatDepartmentUser(user)) - deparmentUsers.external_users.map(user => this.appendChatDepartmentUser(user, 'warning', 'user')) + deparmentUsers.adminUsers.map(user => this.appendChatDepartmentUser(user)) + deparmentUsers.externalUsers.map(user => this.appendChatDepartmentUser(user, 'warning', 'user')) } appendChatDepartmentUser(user, color = "primary", icon = "user") { @@ -259,10 +259,8 @@ class Chat {
      -
      - - - +
      +
      ${user?.first_name ?? "" + " " + @@ -292,7 +290,7 @@ class Chat { ${row.display}

      - ${row.totalMessages ?? 0} + ${row.countMessages} ` @@ -304,7 +302,7 @@ class Chat { null, null, (data) => { - this.chatList.find(`#chat_${row_name} .messages-unread-contact`).text(data.count) + }, null @@ -346,6 +344,7 @@ class Chat { _getChatMessageSuccess(data) { this.domItem.find(".chat-loader").addClass("d-none") this._setBtnDeparment() + this.chatList.find(`#chat_${data.department.name} .messages-unread-contact`).text(data.count ?? 0) if (data.messages) { data.messages.map((m) => { this._addChatMessage(m) @@ -365,7 +364,7 @@ class Chat {

      ${chatMessage?.message}

      -
      +
      ${chatMessage?.user?.first_name + " " + chatMessage?.user?.last_name}
      @@ -375,8 +374,8 @@ class Chat {
      -
      - ${chatMessage?.user?.first_name.charAt(0) + chatMessage?.user?.last_name.charAt(0)} +
      +
      @@ -533,8 +532,6 @@ class Chat { } _handleGetSingleContactMessagesSuccess(data) { try { - - if (data) { data.map((m) => { this._addChatMessage(m) @@ -824,106 +821,73 @@ class Chat { } +const addInternalNotification = (e) => { + let numberOfMessages = e.unreadMessages + if (numberOfMessages > 0) { + $("#chat-notification-list").append( + ` +
    • + +
      + ${e.avatar} +
      +
      +
      [${e.title}] ${e.chatDisplay}
      +
      + ${numberOfMessages} +       +
      • + ` + ) + } +} +const addDepartmentNotification = (e) => { + let numberOfMessages = e.unreadMessages + if (numberOfMessages > 0) { + $("#chat-notification-list").append( + ` +
    • + +
      + ${e.avatar} +
      +
      +
      [${e.title}] ${e.chatDisplay}
      +
      + ${numberOfMessages} +       +
      • + ` + ) + } +} -export const showNotificationMessages = (dom) => { +const addNotificationsToDom = (data) => +{ + $("#chat-notification-list").empty() + if (data.totalMessages > 0) { + $("#chat-message-notification-title").addClass("d-none") + $("#chat-notification-number").removeClass("d-none") + $("#chat-notification-number").text(data.totalMessages ?? 0) + } else { + $("#chat-message-notification-title").removeClass("d-none") + $("#chat-notification-number").addClass("d-none") + $("#chat-notification-number").text(0) + } + data.departmentNotifications?.map( e => { + addDepartmentNotification(e)} + ) + data.internalNotifications?.map(e => { + addInternalNotification(e)} + ) + +} +export const showNotificationMessages = () => { let ajax = new Ajax( '/chat/notifications', null, null, - (data) => { - dom.empty() - $("#chat-notification-number") - if (data.totalMessages > 0) { - $("#chat-message-notification-title").addClass("d-none") - $("#chat-notification-number").removeClass("d-none") - $("#chat-notification-number").text(data.totalMessages ?? 0) - } else { - $("#chat-message-notification-title").removeClass("d-none") - $("#chat-notification-number").addClass("d-none") - $("#chat-notification-number").text(0) - } - data?.internals?.map((e) => { - let numberOfMessages = e.unreadMessages - if (numberOfMessages > 0) { - dom.append( - ` -
    • - -
      - ${e.avatar} -
      -
      -
      [${e.title}] ${e.chatDisplay}
      -
      - ${numberOfMessages} -       -
      • - ` - ) - } - }) - data?.chatPresupuestos?.map((e) => { - let numberOfMessages = e.unreadMessages - if (numberOfMessages > 0) { - dom.append( - ` -
    • - -
      - ${e.presupuestoId} -
      -
      -
      [${e.title}] ${e.chatDisplay}
      -
      - ${numberOfMessages} -       -
      • - ` - ) - } - }) - data?.chatFacturas?.map((e) => { - let numberOfMessages = e.unreadMessages - if (numberOfMessages > 0) { - dom.append( - ` -
    • - -
      - ${e.facturaId} -
      -
      -
      [${e.title}] ${e.chatDisplay}
      -
      - ${numberOfMessages} -       -
      • - ` - ) - } - }) - data?.chatPedidos?.map((e) => { - let numberOfMessages = e.unreadMessages - if (numberOfMessages > 0) { - dom.append( - ` -
    • - -
      - ${e.pedidoId} -
      -
      -
      [${e.title}] ${e.chatDisplay}
      -
      - ${numberOfMessages} -       -
      • - ` - ) - } - }) - - }, + addNotificationsToDom, (err) => { } ) ajax.get() @@ -931,104 +895,3 @@ export const showNotificationMessages = (dom) => { export default Chat -// // Seleccionar elementos del DOM -// const chatContactsBody = document.querySelector('.app-chat-contacts .sidebar-body'), -// chatContactListItems = [].slice.call( -// document.querySelectorAll('.chat-contact-list-item:not(.chat-contact-list-item-title)') -// ), -// chatHistoryBody = document.querySelector('.chat-history-body'), -// chatSidebarLeftUserAbout = document.querySelector('.chat-sidebar-left-user-about'), -// messageInput = document.querySelector('.message-input'), -// searchInput = document.querySelector('.chat-search-input'), -// sendMsgBtn = document.querySelector('.send-msg-btn'); // Seleccionar el botón de envío de mensaje - -// // Inicializar PerfectScrollbar -// if (chatContactsBody) { -// new PerfectScrollbar(chatContactsBody, { -// wheelPropagation: false, -// suppressScrollX: true -// }); -// } - -// if (chatHistoryBody) { -// new PerfectScrollbar(chatHistoryBody, { -// wheelPropagation: false, -// suppressScrollX: true -// }); -// } - -// // Función para desplazar el scroll al final -// function scrollToBottom() { -// if (chatHistoryBody) { -// chatHistoryBody.scrollTo(0, chatHistoryBody.scrollHeight); -// } -// } -// scrollToBottom(); - -// // Seleccionar chat o contacto - - -// // Filtrar chats -// if (searchInput) { -// searchInput.addEventListener('keyup', e => { -// const searchValue = e.currentTarget.value.toLowerCase(), -// chatListItem0 = document.querySelector('.chat-list-item-0'), -// contactListItem0 = document.querySelector('.contact-list-item-0'), -// searchChatListItems = [].slice.call( -// document.querySelectorAll('#chat-list li:not(.chat-contact-list-item-title)') -// ), -// searchContactListItems = [].slice.call( -// document.querySelectorAll('#contact-list li:not(.chat-contact-list-item-title)') -// ); - -// // Buscar en chats -// const chatListItemsCount = searchChatContacts(searchChatListItems, searchValue); -// // Mostrar u ocultar mensaje de "No se encontraron resultados" en chats -// if (chatListItem0) { -// chatListItem0.classList.toggle('d-none', chatListItemsCount !== 0); -// } - -// // Buscar en contactos -// const contactListItemsCount = searchChatContacts(searchContactListItems, searchValue); -// // Mostrar u ocultar mensaje de "No se encontraron resultados" en contactos -// if (contactListItem0) { -// contactListItem0.classList.toggle('d-none', contactListItemsCount !== 0); -// } -// }); -// } - -// // Función para buscar en chats y contactos -// function searchChatContacts(searchListItems, searchValue) { -// let searchListItemsCount = 0; -// searchListItems.forEach(searchListItem => { -// const searchListItemText = searchListItem.textContent.toLowerCase(); -// const matchesSearch = searchListItemText.indexOf(searchValue) !== -1; - -// searchListItem.classList.toggle('d-flex', matchesSearch); -// searchListItem.classList.toggle('d-none', !matchesSearch); - -// if (matchesSearch) { -// searchListItemsCount++; -// } -// }); - -// return searchListItemsCount; -// } - -// // // Enviar mensaje -// // if (sendMsgBtn) { -// // sendMsgBtn.addEventListener('click', e => { -// // e.preventDefault(); -// // if (messageInput.value) { -// // const renderMsg = document.createElement('div'); -// // renderMsg.className = 'chat-message-text mt-2'; -// // renderMsg.innerHTML = `

      ${messageInput.value}

      `; -// // const lastChatMessageWrapper = document.querySelector('li:last-child .chat-message-wrapper'); -// // if (lastChatMessageWrapper) { -// // lastChatMessageWrapper.appendChild(renderMsg); -// // } -// // messageInput.value = ''; -// // scrollToBottom(); -// // } -// // }); -// // } diff --git a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js index d46d76a6..0322a033 100644 --- a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js +++ b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js @@ -7,11 +7,13 @@ class MessagesDatatable { this.datatablePresupuestoMessageItem = this.item.find("#tablePresupuestoMessages") this.datatablePedidoMessageItem = this.item.find("#tablePedidoMessages") this.datatableFacturaMessageItem = this.item.find("#tableFacturaMessages") - + this.columnDefs = [ + ] this.datatableColumns = [ { data: 'created_at', searchable: true, sortable: true }, { data: 'updated_at', searchable: true, sortable: true }, - { data: 'title', searchable: true, sortable: true }, + { data: 'title', name:"chats.title",searchable: true, sortable: true }, + { data: 'message', searchable: false, sortable: true }, { data: 'creator', searchable: false, sortable: false }, { data: 'viewed', searchable: false, sortable: true, @@ -27,10 +29,10 @@ class MessagesDatatable { ${d.isAdmin ? `
      - -
      ` : "" } @@ -46,13 +48,16 @@ class MessagesDatatable { } init() { this.item.on('click', '.btn-notification-viewed', (event) => { - const chatId = $(event.currentTarget).data('id') - $(`#dropdown-viewed-${chatId}`).empty() - this.handleDropUp(chatId) + const chatMessageId = $(event.currentTarget).data('id') + $(`#dropdown-viewed-${chatMessageId}`).empty() + this.handleDropUp(chatMessageId) }) + this.datatable = this.datatableItem.DataTable({ processing: true, order: [[1, 'desc']], + columnDefs : this.columnDefs, + orderCellsTop : true, layout: { topStart: 'pageLength', topEnd: 'search', @@ -71,6 +76,8 @@ class MessagesDatatable { this.datatablePresupuestoMessage = this.datatablePresupuestoMessageItem.DataTable({ processing: true, order: [[1, 'desc']], + columnDefs : this.columnDefs, + orderCellsTop : true, layout: { topStart: 'pageLength', topEnd: 'search', @@ -87,6 +94,8 @@ class MessagesDatatable { }); this.datatablePedidoMessage = this.datatablePedidoMessageItem.DataTable({ processing: true, + orderCellsTop : true, + columnDefs : this.columnDefs, order: [[1, 'desc']], layout: { topStart: 'pageLength', @@ -104,6 +113,8 @@ class MessagesDatatable { }); this.datatableFacturaMessage = this.datatableFacturaMessageItem.DataTable({ processing: true, + orderCellsTop : true, + columnDefs : this.columnDefs, order: [[1, 'desc']], layout: { topStart: 'pageLength', @@ -119,11 +130,23 @@ class MessagesDatatable { columns: this.datatableColumns, ajax: '/messages/datatable/factura' }); + this.datatablePresupuestoMessageItem.on("keyup", ".datatable-message-filter", (event) => { + let columnIndex = this.datatableColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) + this.datatablePresupuestoMessage.column(columnIndex).search($(event.currentTarget).val()).draw() + }) + this.datatablePedidoMessageItem.on("keyup", ".datatable-message-filter", (event) => { + let columnIndex = this.datatableColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) + this.datatablePedidoMessage.column(columnIndex).search($(event.currentTarget).val()).draw() + }) + this.datatableFacturaMessageItem.on("keyup", ".datatable-message-filter", (event) => { + let columnIndex = this.datatableColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) + this.datatableFacturaMessage.column(columnIndex).search($(event.currentTarget).val()).draw() + }) } - handleDropUp(chatId) { - let ajax = new Ajax('/chat/users/notifications-unviewed/' + chatId, + handleDropUp(chatMessageId) { + let ajax = new Ajax('/chat/users/message/notifications-unviewed/' + chatMessageId, null, null, this.handleDropUpSuccess.bind(this), @@ -133,32 +156,31 @@ class MessagesDatatable { ajax.get(); } handleDropUpSuccess(response) { - const chatId = response.chat_id - const unviewedNotifications = response.data.unviewedNotifications - const viewedNotifications = response.data.viewedNotifications + const chat_message_id = response.chat_message_id + const notifications = response.data.notifications - if (unviewedNotifications.length > 0) { + if (notifications.length > 0) { - unviewedNotifications.forEach(user => { + notifications.forEach(user => { if (user.userFullName || user.userName) { - $(`#dropdown-viewed-${chatId}`) + $(`#dropdown-viewed-${chat_message_id}`) .append(this.addDropUpItem(user)) } }); } - if (viewedNotifications.length > 0) { + // if (viewedNotifications.length > 0) { - viewedNotifications.forEach(user => { - if (user.userFullName || user.userName) { + // viewedNotifications.forEach(user => { + // if (user.userFullName || user.userName) { - $(`#dropdown-viewed-${chatId}`) - .append(this.addDropUpItem(user)) - } + // $(`#dropdown-viewed-${chat_message_id}`) + // .append(this.addDropUpItem(user)) + // } - }); - } + // }); + // } } handleDropUpError() { } addDropUpItem(user) diff --git a/httpdocs/assets/js/safekat/components/internalMessagesSection.js b/httpdocs/assets/js/safekat/components/internalMessagesSection.js index 751678a0..a761db22 100644 --- a/httpdocs/assets/js/safekat/components/internalMessagesSection.js +++ b/httpdocs/assets/js/safekat/components/internalMessagesSection.js @@ -5,8 +5,8 @@ import ClassSelect from "./select2.js" const getInitials = (name) => name.split(" ").map(e => e.charAt(0)).join("") const hebraList = (message) => `
      -
      - ${getInitials(message.senderFullName)} +
      +
      @@ -18,7 +18,7 @@ const hebraList = (message) => ` ${message.created_at}

      - ${message.senderFullName} (${message.senderUserName}) + ${message.user.first_name} ${message.user.last_name} (${message.user.username})

      ${message.message}

      @@ -27,12 +27,10 @@ const hebraList = (message) => `
      ` const hebraUsersList = (user) => ` +
      + +
      ` -
      - ${getInitials(user.userFullName)} -
      - -` class InternalMessages { constructor(domItem) { this.item = domItem @@ -53,14 +51,14 @@ class InternalMessages { this.type = this.item.data("type") this.chatId = null - this.selectMessageUsers = new ClassSelect(this.selectUsers, '/chat/users/internal', "Seleccione un usuario",true) + this.selectMessageUsers = new ClassSelect(this.selectUsers, '/chat/users/internal', "Seleccione un usuario", true) } init() { this.selectMessageUsers.init() this.item.on("click", ".btn-new-hebra", this.handleBtnNewHebra.bind(this)) this.item.on("click", ".btn-new-hebra-message", this.handleBtnUpdateHebra.bind(this)) - this.modalNewMessage.item.on("click","#submit_new_hebra",this.handlePostNewHebra.bind(this)) - this.modalNewMessage.item.on("click","#submit_update_hebra",this.handleUpdateHebra.bind(this)) + this.modalNewMessage.item.on("click", "#submit_new_hebra", this.handlePostNewHebra.bind(this)) + this.modalNewMessage.item.on("click", "#submit_update_hebra", this.handleUpdateHebra.bind(this)) this.handleGetInternalMessages() } @@ -75,7 +73,7 @@ class InternalMessages { ) ajax.get() } - handlePostNewHebra(){ + handlePostNewHebra() { this._handleUpdateFormNewHebraValues() let ajax = new Ajax( `/chat/hebra/${this.type}`, @@ -87,12 +85,12 @@ class InternalMessages { ajax.post() } - handlePostNewHebraSuccess(data){ + handlePostNewHebraSuccess(data) { this.modalNewMessage.toggle() this.handleGetInternalMessages() } - handlePostNewHebraError(err){} - handleUpdateHebra(){ + handlePostNewHebraError(err) { } + handleUpdateHebra() { this._handleUpdateFormUpdateHebraValues() let ajax = new Ajax( `/chat/hebra/${this.chatId}`, @@ -103,11 +101,11 @@ class InternalMessages { ) ajax.post() } - handleUpdateNewHebraSuccess(data){ + handleUpdateNewHebraSuccess(data) { this.modalNewMessage.toggle() this.handleGetInternalMessages() } - handleUpdateNewHebraError(err){} + handleUpdateNewHebraError(err) { } handleBtnNewHebra(e) { e.preventDefault() this.chatId = null @@ -137,34 +135,34 @@ class InternalMessages { } _handleUpdateFormNewHebraValues() { this.formNewValues = { - title : this.hebraTitle.val(), + title: this.hebraTitle.val(), users: this.selectMessageUsers.getVal(), message: this.textAreaMessage.val(), - modelId : this.modelId + modelId: this.modelId } } _handleUpdateFormUpdateHebraValues() { this.formUpdateValues = { users: this.selectMessageUsers.getVal(), message: this.textAreaMessage.val(), - modelId : this.modelId + modelId: this.modelId } } - _handleGetInternalMessagesSuccess(data){ + _handleGetInternalMessagesSuccess(data) { Object.values(data).map((k) => { - this._addHebraDOM(k.chatId,k.chatTitle,k.messages,k.users) + this._addHebraDOM(k.id, k.title, k.messages, k.internalUsers) }) } - _handleGetInternalMessagesError(err){} + _handleGetInternalMessagesError(err) { } - _addHebraDOM(key,chatTitle,messages,users) { + _addHebraDOM(key, chatTitle, messages, users) { const itemHebra = $(`
      `).addClass("border border-container flex-grow-0 container-p-y mt-4 p-5") const headerHebra = $("
      ").addClass("d-flex justify-content-between align-items-center") const contentHeaderHebra = $("

      ").text(`${chatTitle}`) const btnNewHebra = $("").attr("type", "button").addClass("btn btn-danger btn-sm btn-new-hebra") btnNewHebra.append('') btnNewHebra.append("Nuevo hilo") - headerHebra.append(contentHeaderHebra,btnNewHebra) + headerHebra.append(contentHeaderHebra, btnNewHebra) itemHebra.append(headerHebra) let itemMessagesHebraRow = $("
      ").addClass("row") let itemMessagesHebraCol = $("
      ").addClass("col") diff --git a/httpdocs/assets/js/safekat/pages/chatNotification.js b/httpdocs/assets/js/safekat/pages/chatNotification.js index 060d824d..d966e6e3 100644 --- a/httpdocs/assets/js/safekat/pages/chatNotification.js +++ b/httpdocs/assets/js/safekat/pages/chatNotification.js @@ -2,12 +2,12 @@ import { showNotificationMessages } from "../components/chat.js"; $(() => { - showNotificationMessages($("#chat-notification-list")) + showNotificationMessages() const chatNotificationInterval = setInterval(() => { - showNotificationMessages($("#chat-notification-list")) + showNotificationMessages() }, 10000) $("#message-notification-dropdown").on("click", (e) => { - showNotificationMessages($("#chat-notification-list")) + showNotificationMessages() }) $("#btn-log-out").on("click",() => { clearInterval(chatNotificationInterval) From 74867ca1acdc21900a1dd857dd9b88f6bb7edeef Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 24 Mar 2025 22:45:02 +0100 Subject: [PATCH 7/7] send email --- ci4/app/Config/Email.php | 4 +- ci4/app/Config/Services.php | 2 + ci4/app/Language/es/Chat.php | 4 +- ci4/app/Services/ChatService.php | 35 ++++++-- .../vuexy/form/mensajes/mensajesView.php | 18 +--- .../Views/themes/vuexy/mail/mail_layout.php | 84 +++++++++++++++++++ .../themes/vuexy/mail/messageNotification.php | 30 +++++++ 7 files changed, 152 insertions(+), 25 deletions(-) create mode 100644 ci4/app/Views/themes/vuexy/mail/mail_layout.php create mode 100644 ci4/app/Views/themes/vuexy/mail/messageNotification.php diff --git a/ci4/app/Config/Email.php b/ci4/app/Config/Email.php index 9447a491..09d27f0b 100755 --- a/ci4/app/Config/Email.php +++ b/ci4/app/Config/Email.php @@ -28,7 +28,7 @@ class Email extends BaseConfig /** * SMTP Server Hostname */ - public string $SMTPHost = 'smtp.ionos.es'; + public string $SMTPHost = 'localhost'; /** * SMTP Username @@ -38,7 +38,7 @@ class Email extends BaseConfig /** * SMTP Password */ - public string $SMTPPass = 'H%5&qDkDkWnfLTGN'; + public string $SMTPPass = ''; /** * SMTP Port diff --git a/ci4/app/Config/Services.php b/ci4/app/Config/Services.php index 9309734f..02632cdf 100755 --- a/ci4/app/Config/Services.php +++ b/ci4/app/Config/Services.php @@ -10,6 +10,7 @@ use App\Services\PapelImpresionService; use CodeIgniter\Config\BaseService; use App\Services\ProductionService; use App\Services\TarifaMaquinaService; +use CodeIgniter\Email\Email; /** * Services Configuration file. @@ -36,6 +37,7 @@ class Services extends BaseService * return new \CodeIgniter\Example(); * } */ + public static function production(){ return new ProductionService(); } diff --git a/ci4/app/Language/es/Chat.php b/ci4/app/Language/es/Chat.php index b1ba0e4e..10458366 100644 --- a/ci4/app/Language/es/Chat.php +++ b/ci4/app/Language/es/Chat.php @@ -60,6 +60,8 @@ return [ "subscribe_admin_chat_wrong" => "Tienes que seleccionar un usuario.", "help_select_chat_department_user" => "Solamente son listados los usuarios que pertenecen al personal. Los clientes no son listados, para añadirlos a la conversación se realiza desde la sección de mensajería de las diferentes secciones(presupuesto,pedido,factura ...)", "store_department" => "Crear departamento", - + "mail" => [ + "mail_subject" => "Nuevo mensaje" + ] ]; \ No newline at end of file diff --git a/ci4/app/Services/ChatService.php b/ci4/app/Services/ChatService.php index 66277625..d5d8f9fb 100644 --- a/ci4/app/Services/ChatService.php +++ b/ci4/app/Services/ChatService.php @@ -17,12 +17,13 @@ use App\Models\Configuracion\ConfigVariableModel; use App\Models\Presupuestos\PresupuestoModel; use App\Models\Usuarios\UserModel; use CodeIgniter\Config\BaseService; - - +use CodeIgniter\Email\Email; class ChatService extends BaseService { protected ?ChatEntity $chatEntity; + protected Email $emailService; + protected UserModel $userModel; protected ChatModel $chatModel; protected ChatMessageModel $chatMessageModel; protected ChatUser $chatUserModel; @@ -39,6 +40,8 @@ class ChatService extends BaseService protected array $modelClassMap; public function __construct() { + $this->emailService = service('email'); + $this->userModel = model(UserModel::class); $this->chatModel = model(ChatModel::class); $this->chatMessageModel = model(ChatMessageModel::class); $this->chatNotificationModel = model(ChatNotification::class); @@ -87,6 +90,12 @@ class ChatService extends BaseService } $chat_message_id = $this->chatMessageModel->insert(["chat_id" => $this->chatEntity->id, "sender_id" => auth()->user()->id, "message" => $data["message"]]); $chatMessageEntity = $this->chatMessageModel->find($chat_message_id); + if ($data["client"]) { + $userClient = $this->userModel->find($data['client']); + if ($userClient) { + $this->sendMessageNotificationEmail($chatMessageEntity, $userClient); + } + } return $chatMessageEntity; } public function createChat(int $chatDepartmentId, string $model, int $modelId): bool|int|string @@ -112,9 +121,9 @@ class ChatService extends BaseService { $chatDepartments = $this->chatDepartmentModel->getModelChatDepartments($this->modelFkMap[$model], $modelId); $departmentWithChat = array_map(fn($q) => $q["name"], $chatDepartments); - if(count($departmentWithChat) > 0){ + if (count($departmentWithChat) > 0) { $departmentWithoutChat = $this->chatDepartmentModel->whereNotIn('name', $departmentWithChat)->findAll(); - }else{ + } else { $departmentWithoutChat = $this->chatDepartmentModel->findAll(); } foreach ($departmentWithoutChat as $value) { @@ -153,18 +162,18 @@ class ChatService extends BaseService ->where($this->modelFkMap[$model], $modelId) ->findAll(); foreach ($chats as $c) { - $this->chatModel->setAsViewedChatUserNotifications($c->id,auth()->user()->id); + $this->chatModel->setAsViewedChatUserNotifications($c->id, auth()->user()->id); } $chatWithHebraData = array_map(fn(ChatEntity $c) => $c->withHebra(), $chats); return $chatWithHebraData ?? []; } - public function getAuthUserNotifications(): array + public function getAuthUserNotifications(): array { $departmentNotifications = $this->chatModel->getChatDepartmentNotifications(); $internalNotifications = $this->chatModel->getChatInternalNotifications(); $totalMessages = 0; - $countNotificiationDepartments = array_map(fn($n) => $n->unreadMessages,$departmentNotifications); - $countNotificationInternal = array_map(fn($n) => $n->unreadMessages,$internalNotifications); + $countNotificiationDepartments = array_map(fn($n) => $n->unreadMessages, $departmentNotifications); + $countNotificationInternal = array_map(fn($n) => $n->unreadMessages, $internalNotifications); $totalMessages = array_sum($countNotificiationDepartments) + array_sum($countNotificationInternal); return [ @@ -173,4 +182,14 @@ class ChatService extends BaseService "totalMessages" => $totalMessages ]; } + public function sendMessageNotificationEmail(ChatMessageEntity $chatMessageEntity, UserEntity $user): bool + { + $users = auth()->getProvider(); + $toEmail = $users->find($user->id)->getEmail(); + $this->emailService->setTo($toEmail); + $subject = '[Safekat]' . lang('Chat.mail.mail_subject') . '-' . $chatMessageEntity->chat()->title; + $this->emailService->setSubject($subject); + $this->emailService->setMessage(view('themes/vuexy/mail/messageNotification', ["header" => lang('Chat.mail.mail_subject'), "data" => $chatMessageEntity->withUser()])); + return $this->emailService->send(); + } } diff --git a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php index 85cf1b96..3ef4954e 100644 --- a/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php +++ b/ci4/app/Views/themes/vuexy/form/mensajes/mensajesView.php @@ -10,11 +10,11 @@
        -
      • +
      • - +
      • @@ -25,18 +25,8 @@
      - -