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 8614e39..930dc50 100644 --- a/static/js/chat_socket_functions/update_tickets_operations_manager.js +++ b/static/js/chat_socket_functions/update_tickets_operations_manager.js @@ -1,14 +1,19 @@ -function update_tickets_operations_manager (data,old_item_tab_user,w=null,wo=null) { +function update_tickets_operations_manager (el_tab,data,old_item_tab_user,w=null,wo=null) { let insert_type = null + let insert_place = null if (w !== null){ - insert_type = 'data.tickets_w_manager_html' + insert_type = data.tickets_w_manager_html + insert_place = 'list_linked_tickets' + // insert_type = data.tickets_w_manager_htm } else if (wo !== null){ - insert_type = 'data.tickets_wo_manager_html' + + insert_type = data.tickets_wo_manager_html + insert_place = 'list_unlinked_tickets' } if (insert_type) { if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) { - document.querySelector(".list_unlinked_tickets").innerHTML = insert_type + document.querySelector(`.${insert_place}`).innerHTML = insert_type // if (el_tab !== null) { // let select_tab = document.querySelector(".tab_user_messanger.select") // if (select_tab) { @@ -34,17 +39,21 @@ function update_tickets_operations_manager (data,old_item_tab_user,w=null,wo=nul // } // } // } - select_and_scroll_to_ticket(data,old_item_tab_user) - clear_messenger(data) + select_and_scroll_to_ticket(data,old_item_tab_user,el_tab) + // clear_messenger(data) } } + return "w?wo" } -function select_and_scroll_to_ticket (data,old_item_tab_user){ +function select_and_scroll_to_ticket (data,old_item_tab_user,el_tab){ if (el_tab !== null){ - document.querySelector(".tab_user_messanger.select").classList.remove("select") + let selected_variabel = document.querySelector(".tab_user_messanger.select") + if (selected_variabel){ + selected_variabel.classList.remove("select") + } let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`) if (old_insert_tab) { old_insert_tab.classList.add("select") diff --git a/static/js/chat_sockets.js b/static/js/chat_sockets.js index 021bd4c..7b21845 100644 --- a/static/js/chat_sockets.js +++ b/static/js/chat_sockets.js @@ -37,9 +37,29 @@ chatSocket.onmessage = function (e) { // // update_tickets_wo_manager(data,old_item_tab_user)л - update_tickets_operations_manager(data,old_item_tab_user,'w') + update_tickets_operations_manager(el_tab,data,old_item_tab_user,'w') - update_tickets_operations_manager(data,old_item_tab_user,null,'wo') + 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() + } + } else { + let user_id_inf_er = "Error user id is not defined" + alert(user_id_inf_er) + console.log(user_id_inf_er) + // не найден user id + } + + } else { + let cont_mes = document.querySelector("") + } + // } + // if update_list_w_users(data,old_item_tab_user,el_tab) @@ -57,47 +77,47 @@ chatSocket.onmessage = function (e) { -function update_tickets_operations_manager (data,old_item_tab_user,w=null,wo=null) { - let insert_type = null - if (w !== null){ - insert_type = 'data.tickets_w_manager_html' - } else if (wo !== null){ - insert_type = 'data.tickets_wo_manager_html' - } - if (insert_type) { - if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) { - document.querySelector(".list_unlinked_tickets").innerHTML = insert_type - // if (el_tab !== null) { - // let select_tab = document.querySelector(".tab_user_messanger.select") - // if (select_tab) { - // select_tab.classList.remove("select") - // } - // let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`) - // if (old_insert_tab) { - // old_insert_tab.classList.add("select") - // old_insert_tab.scrollIntoView({behavior: "smooth"}); - // } - // - // } - // let container_messenger = document.querySelector(".container-messages") - // if (container_messenger){ - // let dataset_cont_mes = container_messenger.dataset - // if (dataset_cont_mes){ - // let ticket_id = dataset_cont_mes["ticketId"] - // if (ticket_id !== ""){ - // let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`) - // if (ticket === null){ - // let chat = document.querySelector(".block-chat").innerHTML = "" - // } - // } - // } - // } - select_and_scroll_to_ticket(data,old_item_tab_user) - clear_messenger(data) - } - - } -} +// function update_tickets_operations_manager (el_tab,data,old_item_tab_user,w=null,wo=null) { +// let insert_type = null +// if (w !== null){ +// insert_type = 'data.tickets_w_manager_html' +// } else if (wo !== null){ +// insert_type = 'data.tickets_wo_manager_html' +// } +// if (insert_type) { +// if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) { +// document.querySelector(".list_unlinked_tickets").innerHTML = insert_type +// // if (el_tab !== null) { +// // let select_tab = document.querySelector(".tab_user_messanger.select") +// // if (select_tab) { +// // select_tab.classList.remove("select") +// // } +// // let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`) +// // if (old_insert_tab) { +// // old_insert_tab.classList.add("select") +// // old_insert_tab.scrollIntoView({behavior: "smooth"}); +// // } +// // +// // } +// // let container_messenger = document.querySelector(".container-messages") +// // if (container_messenger){ +// // let dataset_cont_mes = container_messenger.dataset +// // if (dataset_cont_mes){ +// // let ticket_id = dataset_cont_mes["ticketId"] +// // if (ticket_id !== ""){ +// // let ticket = document.querySelector(`[data-cur-receiver-item="${ticket_id}"]`) +// // if (ticket === null){ +// // let chat = document.querySelector(".block-chat").innerHTML = "" +// // } +// // } +// // } +// // } +// select_and_scroll_to_ticket(data,old_item_tab_user,el_tab) +// clear_messenger(data) +// } +// +// } +// } // let url = `ws://localhost:8000/ws/socket-server/`; //