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 'fix/message-notification' into 'dev/presu_cliente_v2'

Browse Source 
refactor : in message notification send client to presupuestocliente and admin...

See merge request jjimenez/safekat!357
This commit is contained in:
Alvaro
2024-10-26 11:15:09 +00:00
parent 58ab81d8e8 0b3bf0ed85
commit 4180cea16a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,6 +224,7 @@ class ChatModel extends Model
$count++; $count++;
} }
} }
$row->uri = "/pedidos/edit/".$row->pedidoId;
$row->unreadMessages=$count; $row->unreadMessages=$count;
} }
return $results; return $results;
@ -255,6 +256,7 @@ class ChatModel extends Model
$count++; $count++;
} }
} }
$row->uri = "/facturas/edit/".$row->facturaId;
$row->unreadMessages=$count; $row->unreadMessages=$count;
} }
return $results; return $results;
@ -286,6 +288,7 @@ class ChatModel extends Model
$count++; $count++;
} }
} }
$row->uri = "/presupuestos/presupuestocliente/edit/".$row->presupuestoId;
$row->unreadMessages=$count; $row->unreadMessages=$count;
} }

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

@ -482,6 +482,9 @@ export const showNotificationMessages = (dom) => {
if(data.totalMessages > 0){ if(data.totalMessages > 0){
$("#chat-notification-number").removeClass("d-none") $("#chat-notification-number").removeClass("d-none")
$("#chat-notification-number").text(data.totalMessages ?? 0) $("#chat-notification-number").text(data.totalMessages ?? 0)
}else{
$("#chat-notification-number").addClass("d-none")
$("#chat-notification-number").text(0)
} }
data?.internals?.map((e) => { data?.internals?.map((e) => {
let numberOfMessages = e.unreadMessages let numberOfMessages = e.unreadMessages
@ -509,7 +512,7 @@ export const showNotificationMessages = (dom) => {
dom.append( dom.append(
` `
<li class=""> <li class="">
<a href="/presupuestos/cosidotapablanda/edit/${e.presupuestoId}" class="d-flex align-items-center flex-grow"> <a href="${e.uri}" class="d-flex align-items-center flex-grow">
<div class="avatar d-block flex-shrink-0"> <div class="avatar d-block flex-shrink-0">
<span class="avatar-initial rounded-circle bg-label-primary">${e.presupuestoId}</span> <span class="avatar-initial rounded-circle bg-label-primary">${e.presupuestoId}</span>
</div> </div>
@ -529,7 +532,7 @@ export const showNotificationMessages = (dom) => {
dom.append( dom.append(
` `
<li class=""> <li class="">
<a href="/facturas/edit/${e.facturaId}" class="d-flex align-items-center flex-grow"> <a href="${e.uri}" class="d-flex align-items-center flex-grow">
<div class="avatar d-block flex-shrink-0"> <div class="avatar d-block flex-shrink-0">
<span class="avatar-initial rounded-circle bg-label-primary">${e.facturaId}</span> <span class="avatar-initial rounded-circle bg-label-primary">${e.facturaId}</span>
</div> </div>
@ -549,7 +552,7 @@ export const showNotificationMessages = (dom) => {
dom.append( dom.append(
` `
<li class=""> <li class="">
<a href="/pedidos/edit/${e.pedidoId}" class="d-flex align-items-center flex-grow"> <a href="${e.uri}" class="d-flex align-items-center flex-grow">
<div class="avatar d-block flex-shrink-0"> <div class="avatar d-block flex-shrink-0">
<span class="avatar-initial rounded-circle bg-label-primary">${e.pedidoId}</span> <span class="avatar-initial rounded-circle bg-label-primary">${e.pedidoId}</span>
</div> </div>