jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into 'mod/presupuesto_admin'

Browse Source 
Main

See merge request jjimenez/safekat!465
This commit is contained in:
Jaime Jimenez Ortega
2025-01-06 11:48:28 +00:00
parent 4777e22952 5a6174a597
commit 212b1f4d08
9 changed files with 129 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Config/Routes.php
View File

@ -55,10 +55,12 @@ $routes->group('tarifas', ['namespace' => 'App\Controllers\Tarifas'], function (
$routes->get('acabado/select', 'TarifaMaquinas::get_select_maquina_acabado');
$routes->get('manipulado/select', 'TarifaMaquinas::get_select_maquina_manipulado');
$routes->get('impresion/select', 'TarifaMaquinas::get_select_maquina_impresion');
$routes->get('encuadernacion/select', 'TarifaMaquinas::get_select_maquina_manipulado');
$routes->get('tareas/select', 'TarifaMaquinas::get_select_maquina_tareas');
$routes->get('acabado/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_acabado_maquina/$1');
$routes->get('manipulado/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_manipulado_maquina/$1');
$routes->get('preimpresion/datatable/(:num)', 'TarifaMaquinas::get_datatable_tarifa_preimpresion_maquina/$1');

146
ci4/app/Models/Chat/ChatModel.php
View File

@ -239,7 +239,7 @@ class ChatModel extends Model
$count++;
}
}
$row->uri = "/pedidos/edit/" . $row->pedidoId;
$row->uri = "/chat/pedido/" . $row->chatId;
$row->unreadMessages = $count;
}
return $results;
@ -273,7 +273,7 @@ class ChatModel extends Model
$count++;
}
}
$row->uri = "/facturas/edit/" . $row->facturaId;
$row->uri = "/chat/factura/" . $row->chatId;
$row->unreadMessages = $count;
}
return $results;
@ -307,7 +307,7 @@ class ChatModel extends Model
$count++;
}
}
$row->uri = "/presupuestos/presupuestocliente/edit/" . $row->presupuestoId;
$row->uri = "/chat/presupuesto/" . $row->chatId;
$row->unreadMessages = $count;
}
@ -321,66 +321,7 @@ class ChatModel extends Model
$facturaModel = model(FacturaModel::class);
$pedidoModel = model(PedidoModel::class);
$q = $this->db->table("chats")
->select([
"chats.id as chatId",
"chats.pedido_id as pedidoId",
"chats.presupuesto_id as presupuestoId",
"chats.factura_id as facturaId",
"chats.chat_department_id as chatDepartmentId",
"chat_departments.display as chatDisplay",
])
->join("chat_departments", "chat_departments.id = chats.chat_department_id", "left")
->join("chat_department_users", "chat_department_users.chat_department_id = chats.chat_department_id", "left")
->where("chat_department_users.user_id", auth()->user()->id);
$rows = $q->get()->getResultObject();
$auth_user = auth()->user();
foreach ($rows as $row) {
$messages = $chatMessageModel->get_chat_messages($row->chatId);
$count = 0;
$chatDeparmentUsers = $chatDeparmentModel->getChatDepartmentUsers($row->chatDepartmentId);
$chatDeparmentUsersId = array_map(fn($x) => $x->id, $chatDeparmentUsers);
foreach ($messages as $m) {
if ($m->viewed == false && $m->sender_id != auth()->user()->id && in_array($m->sender_id, $chatDeparmentUsersId) == false)
$count++;
}
if ($row->presupuestoId) {
$row->model = $presupuestoModel->find($row->presupuestoId);
if($auth_user->cliente_id){
$row->uri = "/presupuestocliente/edit/" . $row->presupuestoId;
}else{
$row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId;
}
$row->title = $row->presupuestoId;
$row->avatar = "PRE";
$row->unreadMessages = $count;
} elseif ($row->pedidoId) {
$row->model = $pedidoModel->find($row->pedidoId);
$row->uri = "/pedidos/edit/" . $row->pedidoId;
$row->title = $row->pedidoId;
$row->avatar = "P";
$row->unreadMessages = $count;
} elseif ($row->facturaId) {
$row->model = $facturaModel->find($row->facturaId);
$row->uri = "/facturas/edit/" . $row->facturaId;
$row->avatar = "F";
$row->title = $row->facturaId;
$row->unreadMessages = $count;
}
}
return $rows;
}
public function getChatInternalNotifications()
{
$chatMessageModel = model(ChatMessageModel::class);
$presupuestoModel = model(PresupuestoModel::class);
$facturaModel = model(FacturaModel::class);
$pedidoModel = model(PedidoModel::class);
$chatNotificationModel = model(ChatNotification::class);
$q = $this->db->table("chats")
$q = $this->builder()
->select([
"chats.id as chatId",
"chats.chat_department_id as chatDepartmentId",
@ -392,18 +333,20 @@ 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")
->where("chat_notifications.user_id", auth()->user()->id)
->where("chat_notifications.viewed", false);
$auth_user = auth()->user();
->where("chat_notifications.viewed", false)
->where("chats.chat_department_id is NOT NULL",NULL,FALSE);
$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){
$row->uri = "/presupuestocliente/edit/" . $row->presupuestoId;
$row->uri = "/chat/presupuesto/" . $row->chatId;
}else{
$row->uri = "/presupuestoadmin/edit/" . $row->presupuestoId;
$row->uri = "/chat/presupuesto/" . $row->chatId;
}
$row->title = $row->presupuestoId;
if($row->chatDepartmentId){
@ -416,7 +359,7 @@ class ChatModel extends Model
$rows_new[] = $row;
} elseif ($row->pedidoId) {
$row->model = $pedidoModel->find($row->pedidoId);
$row->uri = "/pedidos/edit/" . $row->pedidoId;
$row->uri = "/chat/pedido/" . $row->chatId;
$row->title = $row->pedidoId;
if($row->chatDepartmentId){
$row->chatDisplay .= "[INTERNAL]";
@ -426,7 +369,72 @@ class ChatModel extends Model
$rows_new[] = $row;
} elseif ($row->facturaId) {
$row->model = $facturaModel->find($row->facturaId);
$row->uri = "/facturas/edit/" . $row->facturaId;
$row->uri = "/chat/factura/" . $row->chatId;
$row->avatar = "F";
if($row->chatDepartmentId){
$row->chatDisplay .= "[INTERNAL]";
}
$row->title = $row->facturaId;
$row->unreadMessages = $this->countUnreadMessageFactura($row->facturaId);
$rows_new[] = $row;
}
}
return $rows_new;
}
public function getChatInternalNotifications()
{
$presupuestoModel = model(PresupuestoModel::class);
$facturaModel = model(FacturaModel::class);
$pedidoModel = model(PedidoModel::class);
$q = $this->builder()
->select([
"chats.id as chatId",
"chats.chat_department_id as chatDepartmentId",
"chats.pedido_id as pedidoId",
"chats.presupuesto_id as presupuestoId",
"chats.factura_id as facturaId",
"chats.title as chatDisplay",
])
->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);
$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 = "/chat/presupuesto/" . $row->chatId;
}else{
$row->uri = "/chat/presupuesto/" . $row->chatId;
}
$row->title = $row->presupuestoId;
if($row->chatDepartmentId){
$row->chatDisplay = $row->model->titulo;
}else{
$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 = "/chat/pedido/" . $row->chatId;
$row->title = $row->pedidoId;
if($row->chatDepartmentId){
$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 = "/chat/factura/" . $row->chatId;
$row->avatar = "F";
if($row->chatDepartmentId){
$row->chatDisplay .= "[INTERNAL]";

8
ci4/app/Views/themes/vuexy/components/chat_internal_factura.php
View File

@ -13,20 +13,20 @@
<div class="nav-align-top">
<ul class="nav nav-pills mb-4" role="tablist">
<li class="nav-item">
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
<button type="button" class="nav-link <?=auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
</li>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<li class="nav-item">
<button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
</li>
<?php } ?>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-pills-top-chat" role="tabpanel">
<div class="tab-pane fade <?=auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
<?= view("themes/vuexy/components/chat_factura", data: ["modelId" => $modelId,"type" => "factura"]) ?>
</div>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<div class="tab-pane fade show active" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId,"type" => "factura"]) ?>
</div>
<?php } ?>

8
ci4/app/Views/themes/vuexy/components/chat_internal_pedido.php
View File

@ -13,20 +13,20 @@
<div class="nav-align-top">
<ul class="nav nav-pills mb-4" role="tablist">
<li class="nav-item">
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
<button type="button" class="nav-link <?=auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
</li>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<li class="nav-item">
<button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
</li>
<?php } ?>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-pills-top-chat" role="tabpanel">
<div class="tab-pane fade <?=auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
<?= view("themes/vuexy/components/chat_pedido", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
</div>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<div class="tab-pane fade show active" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "pedido"]) ?>
</div>
<?php } ?>

8
ci4/app/Views/themes/vuexy/components/chat_internal_presupuesto.php
View File

@ -13,20 +13,20 @@
<div class="nav-align-top">
<ul class="nav nav-pills mb-4" role="tablist">
<li class="nav-item">
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
<button type="button" class="nav-link <?=auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta') ? "" : "active" ?>" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-chat" aria-controls="navs-pills-top-internal-chat" aria-selected="false">Chat</button>
</li>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<li class="nav-item">
<button type="button" class="nav-link" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
<button type="button" class="nav-link active" role="tab" data-bs-toggle="tab" data-bs-target="#navs-pills-top-internal-messages" aria-controls="navs-pills-top-internal-messages" aria-selected="false">Mensajes internos</button>
</li>
<?php } ?>
</ul>
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-pills-top-chat" role="tabpanel">
<div class="tab-pane fade <?=auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta') ? "" : "show active" ?>" id="navs-pills-top-chat" role="tabpanel">
<?= view("themes/vuexy/components/chat_presupuesto", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
</div>
<?php if (auth()->user()->inGroup('admin') || auth()->user()->inGroup('beta')) { ?>
<div class="tab-pane fade" id="navs-pills-top-internal-messages" role="tabpanel">
<div class="tab-pane fade show active" id="navs-pills-top-internal-messages" role="tabpanel">
<?= view("themes/vuexy/components/internal_messages", data: ["modelId" => $modelId, "type" => "presupuesto"]) ?>
</div>
<?php } ?>

12
httpdocs/assets/js/safekat/components/chat.js
View File

@ -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.chatDeparmentId = undefined
this.searchInput = this.domItem.find(".chat-search-input")
@ -78,6 +78,8 @@ class Chat {
this.btnUpdateMessagesUnviewed = this.domItem.find("#update-message-unviewed")
this.btnDirectMessageSubmit = this.domItem.find("#send-msg-btn-direct")
this.btnDirectMessageSubmit.on("click", this._handleStoreChatDirectMessage.bind(this))
this.messageInput.on("keypress", this._sendDirectMessagePressKey.bind(this))
this.selectParticipants = new ClassSelect(this.modalNewParticipant.item.find("#select-users"), `/chat/direct/users/select/${this.modelId}`, this.selectPlaceholder, true)
this.authUserId = this.domItem.data("user-id")
this.checkboxNotificationMessage = this.modalNewParticipant.item.find("#checkbox-notification-chat")
@ -157,6 +159,7 @@ class Chat {
this.sendBtnMessageDepartment.removeClass("d-none")
this.sendBtnMessageInternal.addClass("d-none")
}
/**============================================
* PRESUPUESTOS
*=============================================**/
@ -380,6 +383,13 @@ class Chat {
this._sendMessage()
}
}
_sendDirectMessagePressKey(e) {
if (e.which == 13) {
e.preventDefault();
this._handleStoreChatDirectMessage()
}
}
_sendMessage() {

15
httpdocs/assets/js/safekat/pages/chatFactura.js
View File

@ -2,7 +2,7 @@ import Chat from '../components/chat.js'
import InternalMessages from "../components/internalMessagesSection.js"
import ModalDirectMessageClient from '../components/modals/modalDirectMessageClient.js'
$(document).ready(() => {
$(() => {
let chat = new Chat($("#chat-factura"))
chat.init()
chat.initFactura()
@ -10,9 +10,12 @@ $(document).ready(() => {
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
}
let modalDirectMessageClient = new ModalDirectMessageClient("factura", $("#modalNewDirectMessageClient"))
modalDirectMessageClient.init()
$("#direct-message-cliente").on("click",() => {
modalDirectMessageClient.modal.show()
})
if ($("#modalNewDirectMessageClient").length > 0) {
let modalDirectMessageClient = new ModalDirectMessageClient("presupuesto", $("#modalNewDirectMessageClient"))
modalDirectMessageClient.init()
$("#direct-message-cliente").on("click", () => {
modalDirectMessageClient.modal.show()
})
}
})

15
httpdocs/assets/js/safekat/pages/chatPedido.js
View File

@ -2,7 +2,7 @@ import Chat from '../components/chat.js'
import InternalMessages from "../components/internalMessagesSection.js"
import ModalDirectMessageClient from '../components/modals/modalDirectMessageClient.js'
$(document).ready(() => {
$(() => {
let chat = new Chat($("#chat-pedido"))
chat.init()
chat.initPedido()
@ -10,10 +10,13 @@ $(document).ready(() => {
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
}
let modalDirectMessageClient = new ModalDirectMessageClient("pedido", $("#modalNewDirectMessageClient"))
modalDirectMessageClient.init()
$("#direct-message-cliente").on("click",() => {
modalDirectMessageClient.modal.show()
})
if ($("#modalNewDirectMessageClient").length > 0) {
let modalDirectMessageClient = new ModalDirectMessageClient("presupuesto", $("#modalNewDirectMessageClient"))
modalDirectMessageClient.init()
$("#direct-message-cliente").on("click", () => {
modalDirectMessageClient.modal.show()
})
}
})

13
httpdocs/assets/js/safekat/pages/chatPresupuesto.js
View File

@ -5,14 +5,19 @@ $(function () {
let chat = new Chat($("#chat-presupuesto"))
chat.init()
chat.initPresupuesto()
if ($("#internal_messages_chat").length > 0) {
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
if ($("#modalNewDirectMessageClient").length > 0) {
let modalDirectMessageClient = new ModalDirectMessageClient("presupuesto", $("#modalNewDirectMessageClient"))
modalDirectMessageClient.init()
$("#direct-message-cliente").on("click",() => {
$("#direct-message-cliente").on("click", () => {
modalDirectMessageClient.modal.show()
})
}
if ($("#internal_messages_chat").length > 0) {
let internalMessages = new InternalMessages($("#internal_messages_chat"))
internalMessages.init()
}
})