From 41bdae0623b570fd0ec2d06fe337aea22b689ed0 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Thu, 3 Apr 2025 20:20:49 +0200 Subject: [PATCH] fix focus dropdown notifications unviewed --- .../datatables/MessagesDatatable.js | 19 ++++--------------- .../configuracion/messages/messagePage.js | 4 ++++ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js index 7b5ab74d..7b91f0c5 100644 --- a/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js +++ b/httpdocs/assets/js/safekat/components/datatables/MessagesDatatable.js @@ -7,6 +7,7 @@ class MessagesDatatable { this.datatablePresupuestoMessageItem = this.item.find("#tablePresupuestoMessages") this.datatablePedidoMessageItem = this.item.find("#tablePedidoMessages") this.datatableFacturaMessageItem = this.item.find("#tableFacturaMessages") + this.focusTable = this.datatableItem this.columnDefs = [ ] this.datatableColumns = [ @@ -49,7 +50,7 @@ class MessagesDatatable { init() { this.item.on('click', '.btn-notification-viewed', (event) => { const chatMessageId = $(event.currentTarget).data('id') - $(`#dropdown-viewed-${chatMessageId}`).empty() + this.focusTable.find(`#dropdown-viewed-${chatMessageId}`).empty() this.handleDropUp(chatMessageId) }) @@ -160,27 +161,15 @@ class MessagesDatatable { const notifications = response.data.notifications if (notifications.length > 0) { - notifications.forEach(user => { if (user.userFullName || user.userName) { - - $(`#dropdown-viewed-${chat_message_id}`) + console.log(user.userFullName) + this.focusTable.find(`#dropdown-viewed-${chat_message_id}`) .append(this.addDropUpItem(user)) } }); } - // if (viewedNotifications.length > 0) { - - // viewedNotifications.forEach(user => { - // if (user.userFullName || user.userName) { - - // $(`#dropdown-viewed-${chat_message_id}`) - // .append(this.addDropUpItem(user)) - // } - - // }); - // } } handleDropUpError() { } addDropUpItem(user) diff --git a/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js b/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js index 25d1d500..97543c74 100644 --- a/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js +++ b/httpdocs/assets/js/safekat/pages/configuracion/messages/messagePage.js @@ -40,15 +40,19 @@ class MessagePage { $("#navs-top-align-all-tab").on("click",()=>{ this.messageDatatable.datatable.ajax.reload() + this.messageDatatable.focusTable = this.messageDatatable.datatableItem }) $("#navs-top-align-presupuestos-tab").on("click",()=>{ this.messageDatatable.datatablePresupuestoMessage.ajax.reload() + this.messageDatatable.focusTable = this.messageDatatable.datatablePresupuestoMessageItem }) $("#navs-top-align-pedidos-tab").on("click",()=>{ this.messageDatatable.datatablePedidoMessage.ajax.reload() + this.messageDatatable.focusTable = this.messageDatatable.datatablePedidoMessageItem }) $("#navs-top-align-facturas-tab").on("click",()=>{ this.messageDatatable.datatableFacturaMessage.ajax.reload() + this.messageDatatable.focusTable = this.messageDatatable.datatableFacturaMessageItem }) }