sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
SDE
2023-08-07 23:45:19 +03:00
parent eaab071a1e 53b6883a2c
commit 075459ad79
2 changed files with 44 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
static/js/check_new_messages.js
View File

@@ -1,22 +1,22 @@
document.onload( $(document).ready(
checkOpenWindow() checkOpenWindow()
) )
function checkOpenWindow (){
var window = document.querySelector(".container-messages")
while (window === null){
check_timeout()
} function checkOpenWindow (window=null){
if (window !== null) { if (window === null){
check_window_tm()
} else {
var data_set = document.querySelector(".container-messages").dataset var data_set = document.querySelector(".container-messages").dataset
var sender = data_set['curReceiver']; var sender = data_set['userId'];
var receiver = data_set['ticketId']; var receiver = data_set['curReceiver'];
var ticket_id = data_set['userId']; var ticket_id = data_set['ticketId'];
var data = { var data = {
@@ -25,24 +25,39 @@ function checkOpenWindow (){
'ticket_id': ticket_id 'ticket_id': ticket_id
// 'last_message_modifiteDT':last_message_time // 'last_message_modifiteDT':last_message_time
} }
timeout(data)
} }
} }
function check_timeout(){ function check_window_tm(){
setTimeout(checkOpenWindow, 1000) let window = document.querySelector(".container-messages")
let intervl = setInterval(function () {
window = document.querySelector(".container-messages")
if (window !== null){
clearInterval(intervl)
checkOpenWindow(window)
}
},
1000)
} }
function timeout (){ var check_msg = null
var window = document.querySelector(".container-messages")
while (window !== null){ function timeout (data){
setTimeout(check_new_messages, 1000) let window = document.querySelector(".container-messages")
} check_msg = setInterval(check_new_messages(window,data), 1000)
} }
function check_new_messages (){ function check_new_messages (window,data){
// let user_online_check = document.addEventListener("mouseover"); // let user_online_check = document.addEventListener("mouseover");
let last_message_time = document.querySelector(".date_n_time_last_message").dataset['modifieddt']; let last_message_time = document.querySelector(".date_n_time_last_message")
data['last_message_modifiteDT'] = last_message_time if (last_message_time === null){
//
} else {
data.push([{ 'last_message_modifiteDT':last_message_time.dataset['modifieddt'] }])
}
$.ajax({ $.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() }, headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
@@ -61,12 +76,19 @@ function check_new_messages (){
} else { } else {
document.querySelector(".info_profile").innerHTML = data.html; document.querySelector(".info_profile").innerHTML = data.html;
} }
if (window !== null){
clearTimeout(check_msg)
checkOpenWindow()
}
}, },
error: function (data){ error: function (data){
document.querySelector(".info_profile").innerHTML = data.responseJSON.html; document.querySelector(".info_profile").innerHTML = data.responseJSON.html;
if (window !== null){
clearTimeout(check_msg)
checkOpenWindow()
}
} }
}); });
} }

2
templates/pages/profile/p_user_profile.html
View File

@@ -8,7 +8,7 @@
<link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet"> <link href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" rel="stylesheet">
<script src='{% static "js/user_profile.js" %}'> </script> <script src='{% static "js/user_profile.js" %}'> </script>
<script src='{% static "js/user_profile(boris).js" %}'> </script> <script src='{% static "js/user_profile(boris).js" %}'> </script>
{# <script src='{% static "js/check_new_messages.js" %}'></script>#} <script src='{% static "js/check_new_messages.js" %}'></script>
<link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}"> <link rel="stylesheet" href="{% static 'css/ion.rangeSlider.min.css' %}">