From f1596e18562c43dc9a17c4ce7eb75931a477b647 Mon Sep 17 00:00:00 2001 From: borissedw Date: Thu, 24 Aug 2023 13:10:38 +0300 Subject: [PATCH] 0.0.163 --- .../update_tickets_operations_manager.js | 2 +- static/js/chat_sockets.js | 51 +++++++++++++------ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/static/js/chat_socket_functions/update_tickets_operations_manager.js b/static/js/chat_socket_functions/update_tickets_operations_manager.js index 930dc50..aab33fd 100644 --- a/static/js/chat_socket_functions/update_tickets_operations_manager.js +++ b/static/js/chat_socket_functions/update_tickets_operations_manager.js @@ -79,7 +79,7 @@ function clear_messenger (data) { } } -function update_support_chat_func (data){ +function update_support_chat_func (data,msg_cont){ if (msg_cont !== null){ if (msg_cont.dataset['curReceiver'] === ""){ document.querySelector(".info_profile").innerHTML = data.support_chat_html diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index 451e76e..96ae4ac 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -42,27 +42,46 @@ chatSocket.onmessage = function (e) { update_tickets_operations_manager(el_tab,data,old_item_tab_user,null,'wo') // if (){ - if (data.group_name === "support_managers"){ - let user_id = document.querySelector(".button_profile_header").dataset["userId"] - if (user_id){ - if (data.ticket_manager !== user_id){ - clear_messenger() + if (data.group_name === "support_managers") { + let ticket_maneger = data.ticket_manager + if (ticket_maneger) { + let user_id = document.querySelector(".button_profile_header").dataset["userId"] + if (user_id) { + if (ticket_maneger.toString() !== user_id) { + clear_messenger() + } + } + else { + let user_id_inf_er = "Error user id is not defined" + console.log(user_id_inf_er) + // не найден user id } } else { - let user_id_inf_er = "Error user id is not defined" - console.log(user_id_inf_er) - // не найден user id + let error_ticket_manager = "ticket_manager is not defined" + console.log(error_ticket_manager) } + } else { - let cont_mes_ins = document.querySelector(".info_profile") - if (cont_mes_ins){ - cont_mes_ins.innerHTML = data.chat_html - } else { - let error_cont_mes_ins = "cont_mes_ins is not defined" - console.log(error_cont_mes_ins) - // не найден info profile + if (data.chat_html){ + if (msg_cont){ + msg_cont.innerHTML = data.chat_html + } else { + let error_msg_cont = "msg_cont is not defined" + console.log(error_msg_cont) + } + } else if (data.support_chat_html){ + let cont_mes_ins = document.querySelector(".info_profile") + if (cont_mes_ins){ + cont_mes_ins.innerHTML = data.chat_html + } else { + let error_cont_mes_ins = "cont_mes_ins is not defined" + console.log(error_cont_mes_ins) + // не найден info profile + } } + + } // } // if @@ -71,7 +90,7 @@ chatSocket.onmessage = function (e) { } else if (data.type === "update_support_chat"){ - update_support_chat_func(data) + update_support_chat_func(data,msg_cont) } if (data.unread_msgs_count > 0){ update_count_unread_messages(data)