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-15 17:56:46 +03:00
parent 957b8c9041 e8e9d6af41
commit ebe09382c0
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChatServiceApp/websocket_views.py
View File

@@ -30,7 +30,7 @@ def get_tickets_w_manager_html(ticket, user, data):
Dict = { Dict = {
'ticket': ticket, 'ticket': ticket,
'tickets_w_manager': get_tickets_for_manager(user) 'tickets_for_manager': get_tickets_for_manager(user)
} }
tickets_w_manager_html = render_to_string('widgets/w_tickets_w_manager.html', Dict) tickets_w_manager_html = render_to_string('widgets/w_tickets_w_manager.html', Dict)

19
static/js/chat_sockets.js
View File

@@ -93,9 +93,15 @@ chatSocket.onmessage = function (e) {
if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) { if (document.querySelector(".list_linked_tickets") !== null || document.querySelector(".list_unlinked_tickets") !== null) {
document.querySelector(".list_unlinked_tickets").innerHTML = data.tickets_wo_manager_html document.querySelector(".list_unlinked_tickets").innerHTML = data.tickets_wo_manager_html
if (el_tab !== null) { if (el_tab !== null) {
document.querySelector(".tab_user_messanger.select").classList.remove("select") let select_tab = document.querySelector(".tab_user_messanger.select")
document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`).classList.add("select") if (select_tab) {
document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`).scrollIntoView({behavior: "smooth"}); select_tab.classList.remove("select")
}
let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`)
if (old_insert_tab) {
old_insert_tab.classList.add("select")
old_insert_tab.scrollIntoView({behavior: "smooth"});
}
} }
} }
@@ -105,8 +111,11 @@ chatSocket.onmessage = function (e) {
document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html document.querySelector(".list_linked_tickets").innerHTML = data.tickets_w_manager_html
if (el_tab !== null){ if (el_tab !== null){
document.querySelector(".tab_user_messanger.select").classList.remove("select") document.querySelector(".tab_user_messanger.select").classList.remove("select")
document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]` ).classList.add("select") let old_insert_tab = document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]`)
document.querySelector(`[data-cur-receiver-item="${old_item_tab_user}"]` ).scrollIntoView({behavior: "smooth"}); if (old_insert_tab) {
old_insert_tab.classList.add("select")
old_insert_tab.scrollIntoView({behavior: "smooth"});
}
} }
} }