diff --git a/static/js/check_new_messages.js b/static/js/check_new_messages.js index 0c8e535..1884f1c 100644 --- a/static/js/check_new_messages.js +++ b/static/js/check_new_messages.js @@ -8,11 +8,16 @@ window.onload = function () { // ) function funcFocus(){ - - let inp = document.querySelector(".enter-message-inp") - if (inp !== null){ - inp.focus() + let window = document.querySelector(".container-messages") + if (window !== null){ + let inp = document.querySelector(".enter-message-inp") + if (inp !== null){ + inp.focus() + } + } else{ + check_new_messages_timeout(60000) } + } @@ -54,6 +59,7 @@ function check_new_messages_timeout(timeout_time=1000){ // let user_online = userOnline('set') window = document.querySelector(".container-messages") if (window === null){ + check_new_messages(window,true) // let new_timeout_time = 60000 // // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) @@ -63,7 +69,7 @@ function check_new_messages_timeout(timeout_time=1000){ // it_func++ // check_new_messages_timeout(new_timeout_time,it_set_func,it_func) // } - check_new_messages(window) + check_new_messages(window,false) } }, @@ -75,17 +81,25 @@ function check_new_messages_timeout(timeout_time=1000){ var data_new_messages = null -function check_new_messages (window){ +function check_new_messages (window,only_sender_mode){ // if (it === 0){ - let data_set = document.querySelector(".container-messages").dataset - let sender = data_set['userId']; - let receiver = data_set['curReceiver']; - let ticket_id = data_set['ticketId']; - data_new_messages = { - 'sender': sender, - 'receiver': receiver, - 'ticket_id': ticket_id - // 'last_message_modifiteDT':last_message_time + if (only_sender_mode === false){ + let data_set = document.querySelector(".container-messages").dataset + let sender = data_set['userId']; + let receiver = data_set['curReceiver']; + let ticket_id = data_set['ticketId']; + data_new_messages = { + 'sender': sender, + 'receiver': receiver, + 'ticket_id': ticket_id + // 'last_message_modifiteDT':last_message_time + } + } else { + let profile_data_set = document.querySelector(".button_profile_header").dataset + let sender = profile_data_set['userId'] + data_new_messages = { + 'sender': sender + } } // } // let user_online_check = document.addEventListener("mouseover"); @@ -131,16 +145,23 @@ function success_check_new_messages (data) { if (data.html) { if (data_new_messages['ticket_id'] !== 'null') { if (data.msgs_count > 1) { - document.querySelector(".container-messages").innerHTML = data.html; + if (document.querySelector(".container-messages")){ + document.querySelector(".container-messages").innerHTML = data.html; + } } else { document.querySelector(".info_profile").innerHTML = data.html; } } else { - document.querySelector(".container-messages").innerHTML = data.html; + if (document.querySelector(".container-messages")) { + + document.querySelector(".container-messages").innerHTML = data.html; + } } } if (data.users_list_html){ - document.querySelector(".block-list-of-users").innerHTML = data.users_list_html.html; + if (document.querySelector(".block-list-of-users")) { + document.querySelector(".block-list-of-users").innerHTML = data.users_list_html; + } } } if (data.required_beep === true){ @@ -149,10 +170,14 @@ function success_check_new_messages (data) { } if (data.users_list_html){ - document.querySelector(".block-list-of-users").innerHTML = data.users_list_html + if (document.querySelector(".block-list-of-users")) { + document.querySelector(".block-list-of-users").innerHTML = data.users_list_html + } } if (data.tickets_list_html){ - document.querySelector(".block-list-of-users").innerHTML = data.tickets_list_html + if (document.querySelector(".block-list-of-users")) { + document.querySelector(".block-list-of-users").innerHTML = data.tickets_list_html + } } // let updatedCookie = encodeURIComponent(name_cookie) + "=" + encodeURIComponent(''); // let search_cookie = document.cookie.match("(^|[^;]+)\s*" + name_cookie + "\s*=\s*([^;]+)")[0].substring(1) diff --git a/static/js/global_js.js b/static/js/global_js.js index 1de5624..5311260 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -5,7 +5,13 @@ $(document).ready(function (){ function getNewMessageSession(){ let window_messages = document.querySelector(".container-messages") if (window_messages !== null){ - check_new_messages(window) + // check_new_messages(window) + if (check_msg !== null){ + clearInterval(check_msg) + } + check_new_messages_timeout(1000) + } else { + check_new_messages(window_messages,true) } } diff --git a/templates/blocks/b_header.html b/templates/blocks/b_header.html index 7b35d1b..7ad2c98 100644 --- a/templates/blocks/b_header.html +++ b/templates/blocks/b_header.html @@ -10,7 +10,7 @@
Служба поддержки
{% if user.is_authenticated %} - Профиль