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:
ArtemB
2023-08-11 18:05:58 +03:00
parent b7ff089cca 9bfa6dfee6
commit 80370f11ae
8 changed files with 122 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
static/js/check_new_messages.js
View File

@@ -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");
@@ -125,35 +139,50 @@ function check_new_messages (window){
function success_check_new_messages (data) {
let window = document.querySelector(".container-messages")
if (window === null){
clearTimeout(check_msg)
} else {
if (data.html) {
if (data_new_messages['ticket_id'] !== 'null') {
if (data !== null) {
if (data_new_messages['ticket_id'] && 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 if (data.tickets_list_html){
if (document.querySelector(".block-list-of-users")) {
document.querySelector(".block-list-of-users").innerHTML = data.tickets_list_html
}
}
} else {
document.querySelector(".info_profile").innerHTML = data.html;
}
} else {
document.querySelector(".container-messages").innerHTML = data.html;
}
else if (data.chat_html) {
if (document.querySelector(".container-messages")) {
document.querySelector(".container-messages").innerHTML = data.chat_html;
}
if (data.users_list_html){
if (document.querySelector(".block-list-of-users")) {
document.querySelector(".block-list-of-users").innerHTML = data.users_list_html;
}
}
}
if (data.required_beep === true){
const beep = new Audio('/static/sounds/beep_2.mp3')
beep.play()
}
}
if (data.users_list_html){
document.querySelector(".block-list-of-users").innerHTML = data.users_list_html.html;
}
}
if (data.required_beep === true){
const beep = new Audio('/static/sounds/beep_2.mp3')
beep.play()
}
if (data.users_list_html){
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
}
// 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')

11
static/js/global_js.js
View File

@@ -4,11 +4,20 @@ $(document).ready(function (){
function getNewMessageSession(){
let window_messages = document.querySelector(".container-messages")
let new_timeout_time;
if (window_messages !== null){
check_new_messages(window)
// check_new_messages(window)
new_timeout_time = 1000
} else {
new_timeout_time = 60000
}
if (check_msg !== null){
clearInterval(check_msg)
}
check_new_messages_timeout(new_timeout_time)
}
// var window_messages = document.querySelector(".container-messages")
// function getNewMessageSession (){

3
static/js/user_profile(boris).js
View File

@@ -201,6 +201,7 @@ function sendMessage(id_ticket=null,sender,receiver){
event.preventDefault()
let text = document.querySelector(".enter-message-inp").value
document.querySelector(".enter-message-inp").value = null
if (text.length === 0){
//
@@ -238,14 +239,12 @@ function sendMessage(id_ticket=null,sender,receiver){
getNewMessageSession()
document.querySelector(".container-messages").innerHTML = data.html;
document.querySelector(".enter-message-inp").value = null
document.querySelector(".enter-message-inp").focus()
},
error: function (data){
document.querySelector(".container-messages").innerHTML = data.responseJSON.error;
document.querySelector(".enter-message-inp").value = null
document.querySelector(".enter-message-inp").focus()
}
});