From 9344c6fdd4471f5ce81db89f63d68a410f7d59cb Mon Sep 17 00:00:00 2001 From: borissedw Date: Wed, 9 Aug 2023 23:33:10 +0300 Subject: [PATCH] 0.0.101 --- static/js/check_new_messages.js | 38 ++++++++------- static/js/global_js.js | 81 ++++++++++++++++++-------------- static/js/user_profile(boris).js | 25 +++++++--- static/js/user_profile.js | 27 ++++++++--- 4 files changed, 105 insertions(+), 66 deletions(-) diff --git a/static/js/check_new_messages.js b/static/js/check_new_messages.js index f9dfee2..b5f00df 100644 --- a/static/js/check_new_messages.js +++ b/static/js/check_new_messages.js @@ -27,7 +27,7 @@ function check_new_messages_timeout(){ // } else { it = 0 - check_new_messages(window,it) + check_new_messages(window) } }, 60000) @@ -38,19 +38,19 @@ function check_new_messages_timeout(){ var data_new_messages = null -function check_new_messages (window,it){ - 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 - } +function check_new_messages (window){ + // 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 } + // } // let user_online_check = document.addEventListener("mouseover"); let last_message_time = document.querySelector(".date_n_time_last_message") if (last_message_time === null){ @@ -71,15 +71,16 @@ function check_new_messages (window,it){ // enctype: 'json', data: JSON.stringify(data_new_messages), success: function(data){ - getNewMessageSession() success_check_new_messages(data) }, error: function (data){ - let request = document.querySelector(".info_profile").innerHTML = data.responseJSON.html; + let request = document.querySelector(".info_profile") if (request === undefined || window === null){ clearTimeout(check_msg) + } else { + request.innerHTML = data.responseJSON.html; } } }); @@ -110,11 +111,14 @@ function success_check_new_messages (data) { beep.play() } - let updatedCookie = encodeURIComponent(name_cookie) + "=" + encodeURIComponent(''); + if (data.users_list_html){ + document.querySelector(".block-list-of-users").innerHTML = data.users_list_html + } + // let updatedCookie = encodeURIComponent(name_cookie) + "=" + encodeURIComponent(''); // let search_cookie = document.cookie.match("(^|[^;]+)\s*" + name_cookie + "\s*=\s*([^;]+)")[0].substring(1) // let search_cookie = getCookieValue('user_alerts') // document.cookie = document.cookie.replace(search_cookie,name_cookie + "=") - document.cookie = updatedCookie + // document.cookie = updatedCookie // document.cookie = document.cookie.slice(0,-26) // document.cookie = document.cookie.replace('user_alerts="{\"new_message\": true}"','user_alerts=;') } diff --git a/static/js/global_js.js b/static/js/global_js.js index 2568d8e..1de5624 100644 --- a/static/js/global_js.js +++ b/static/js/global_js.js @@ -2,43 +2,52 @@ $(document).ready(function (){ getNewMessageSession() }) -function getNewMessageSession (){ - let prs_ = null - // if (r !== 'undefined' && r !== null && r !== ""){ - // - // let prs = JSON.parse(r) - // prs_ = JSON.parse(r) - // } else { - // // - // } - // let r = getCookieValue('user_alerts') - // - // return prs_; - +function getNewMessageSession(){ + let window_messages = document.querySelector(".container-messages") + if (window_messages !== null){ + check_new_messages(window) + } } -var res_cookie = null -var name_cookie = null +// var window_messages = document.querySelector(".container-messages") -// var old_cookeis = document.cookie -// var name_delete = null +// function getNewMessageSession (){ +// let prs_ = null +// // if (r !== 'undefined' && r !== null && r !== ""){ +// // +// // let prs = JSON.parse(r) +// // prs_ = JSON.parse(r) +// // } else { +// // // +// // } +// // let r = getCookieValue('user_alerts') +// // +// // return prs_; +// +// } -function getCookieValue(name_1) { - name_cookie = name_1 - let cur_state = document.cookie; - - let finded_str = ''; - let cur_state_by_opts = cur_state.split('; '); - for (let i=0; i= 0) { - finded_str = cur_state_by_opts[i]; - delete cur_state_by_opts[i]; - } - } - let save_str = cur_state_by_opts.join('; '); - - let result = document.cookie.match("(^|[^;]+)\s*" + name_1 + "\s*=\s*([^;]+)") - res_cookie = result ? result.pop() : "" - return res_cookie - // name_delete = name -} \ No newline at end of file +// var res_cookie = null +// var name_cookie = null +// +// // var old_cookeis = document.cookie +// // var name_delete = null +// +// function getCookieValue(name_1) { +// name_cookie = name_1 +// let cur_state = document.cookie; +// +// let finded_str = ''; +// let cur_state_by_opts = cur_state.split('; '); +// for (let i=0; i= 0) { +// finded_str = cur_state_by_opts[i]; +// delete cur_state_by_opts[i]; +// } +// } +// let save_str = cur_state_by_opts.join('; '); +// +// let result = document.cookie.match("(^|[^;]+)\s*" + name_1 + "\s*=\s*([^;]+)") +// res_cookie = result ? result.pop() : "" +// return res_cookie +// // name_delete = name +// } \ No newline at end of file diff --git a/static/js/user_profile(boris).js b/static/js/user_profile(boris).js index fb57192..92d7aaf 100644 --- a/static/js/user_profile(boris).js +++ b/static/js/user_profile(boris).js @@ -10,8 +10,9 @@ function createTicketShow () { // enctype: 'json', // data: formData, success: function(data){ - getNewMessageSession() - + if (data.user_alerts) { + getNewMessageSession() + } document.querySelector(".insert-tech-place").innerHTML = data.html; }, @@ -81,7 +82,9 @@ function attachFileCreateTicket () { // enctype: 'json', data: data, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } document.querySelector(".insert-tech-place").innerHTML = data.html; @@ -109,7 +112,9 @@ function attachFilemeassge () { // enctype: 'json', data: data, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } document.querySelector(".insert-tech-place").innerHTML = data.html; @@ -133,7 +138,9 @@ function createTicket (el) { // enctype: 'json', data: formData, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } document.querySelector(".insert-tech-place").innerHTML = data.html; @@ -173,7 +180,9 @@ function selectedUserMessenger (ticket_id=null,user_id=null){ // enctype: 'json', data: JSON.stringify(data), success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } document.querySelector(".info_profile").innerHTML = data.html; @@ -257,7 +266,9 @@ function openTicket (ticket_id){ // enctype: 'json', data: JSON.stringify(data), success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } document.querySelector(".info_profile").innerHTML = data.html; diff --git a/static/js/user_profile.js b/static/js/user_profile.js index a9e7716..61c53b3 100644 --- a/static/js/user_profile.js +++ b/static/js/user_profile.js @@ -10,7 +10,9 @@ function writeMessage(el){ // enctype: 'json', // data: formData, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html; @@ -39,6 +41,9 @@ function technicalSupport(el){ // enctype: 'json', // data: formData, success: function(data){ + if (data.user_alerts) { + getNewMessageSession() + } getNewMessageSession() console.log('data received') // location.href = '/profile' @@ -68,7 +73,9 @@ function mySubscription(el){ // enctype: 'json', // data: formData, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } console.log('data received') // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html; @@ -97,7 +104,9 @@ function myProfile(el){ // enctype: 'json', // data: formData, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } console.log('data received') // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html; @@ -339,7 +348,9 @@ function sendRoute(el, routeID = null){ // enctype: 'json', data: formData, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } console.log('data received') // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html @@ -410,7 +421,9 @@ function createRoute(el){ // enctype: 'json', // data: {}, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } // console.log('data received') // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html @@ -450,7 +463,9 @@ function getRoute(el){ // enctype: 'json', // data: formData, success: function(data){ - getNewMessageSession() + if (data.user_alerts) { + getNewMessageSession() + } console.log('data received') // location.href = '/profile' document.querySelector(".info_profile").innerHTML = data.html;