From b3901bd430b6a0af4e20ba9855f1ca2562246b96 Mon Sep 17 00:00:00 2001 From: borissedw Date: Tue, 8 Aug 2023 16:47:26 +0300 Subject: [PATCH] 0.0.76 --- static/css/styles(boris).css | 4 ++ static/js/check_new_messages.js | 47 ++++++++++++------- .../widgets/w_chat_right_panel_tickets.html | 2 +- .../widgets/w_chat_right_panel_users.html | 2 +- 4 files changed, 36 insertions(+), 19 deletions(-) diff --git a/static/css/styles(boris).css b/static/css/styles(boris).css index e315862..8465d67 100644 --- a/static/css/styles(boris).css +++ b/static/css/styles(boris).css @@ -379,6 +379,10 @@ padding: 0 20px 0 20px; } +.footer-chat.hide{ + display: none; +} + .left-part-block-enter-message{ width: 80%; float: left; diff --git a/static/js/check_new_messages.js b/static/js/check_new_messages.js index 1d364dd..6008fbc 100644 --- a/static/js/check_new_messages.js +++ b/static/js/check_new_messages.js @@ -32,16 +32,39 @@ function check_new_messages_timeout(){ 60000) } -var data = null +function success_check_new_messages (data) { + if (window === null){ + clearTimeout(check_msg) + } else { + if (data.html) { + if (data['ticket_id'] !== 'null') { + if (data.msgs_count > 1) { + document.querySelector(".container-messages").innerHTML = data.html; + } else { + document.querySelector(".info_profile").innerHTML = data.html; + } + } else { + if (data.msgs_count > 1) { + document.querySelector(".container-messages").innerHTML = data.html; + } else { + document.querySelector(".info_profile").innerHTML = data.html; + } + } + } + } +} + +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 = { + data_new_messages = { 'sender': sender, 'receiver': receiver, 'ticket_id': ticket_id @@ -65,21 +88,9 @@ function check_new_messages (window,it){ processData: false, contentType: false, // enctype: 'json', - data: JSON.stringify(data), + data: JSON.stringify(data_new_messages), success: function(data){ - if (data.html){ - if (data.msgs_count > 1){ - document.querySelector(".container-messages").innerHTML = data.html; - } else { - document.querySelector(".info_profile").innerHTML = data.html; - } - if (window === null){ - clearTimeout(check_msg) - } - } else { - // - } - + success_check_new_messages(data) }, error: function (data){ @@ -89,4 +100,6 @@ function check_new_messages (window,it){ } } }); -} \ No newline at end of file +} + + diff --git a/templates/widgets/w_chat_right_panel_tickets.html b/templates/widgets/w_chat_right_panel_tickets.html index 44680ef..cb19233 100644 --- a/templates/widgets/w_chat_right_panel_tickets.html +++ b/templates/widgets/w_chat_right_panel_tickets.html @@ -1,5 +1,5 @@ {% load static %} -
+
diff --git a/templates/widgets/w_chat_right_panel_users.html b/templates/widgets/w_chat_right_panel_users.html index 1454749..20a76ff 100644 --- a/templates/widgets/w_chat_right_panel_users.html +++ b/templates/widgets/w_chat_right_panel_users.html @@ -1,5 +1,5 @@ {% load static %} -
+