From d53d16071eb734823ef005a80882bf754d98a18b Mon Sep 17 00:00:00 2001 From: SDE Date: Fri, 11 Aug 2023 13:58:40 +0300 Subject: [PATCH] 0.2.15 chat v2 --- ChatServiceApp/funcs.py | 9 +++++++++ ChatServiceApp/js_views.py | 11 +++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/ChatServiceApp/funcs.py b/ChatServiceApp/funcs.py index 9979d64..c665e3b 100644 --- a/ChatServiceApp/funcs.py +++ b/ChatServiceApp/funcs.py @@ -66,6 +66,15 @@ def get_chat_receivers_for_user(user): # # return list(set(receivers_list)) + +def get_tickets_Dict_by_manager(user): + tickets = MsgGroup.objects.filter(enable=True, manager=user).order_by('-modifiedDT') + + Dict = { + 'tickets': tickets, + } + return Dict + def get_messages_for_ticket(ticket): return ticket.rel_messages_for_group.filter(enable=True).order_by('-modifiedDT') diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index 4695d82..5be4a62 100644 --- a/ChatServiceApp/js_views.py +++ b/ChatServiceApp/js_views.py @@ -76,8 +76,15 @@ def update_chat_ajax(request): }) msgs = get_messages_for_ticket(ticket) + Dict = get_ticketsDict_for_staff(request.user) + tickets_list_html = render_to_string( + 'blocks/profile/b_list_of_tickets_support_chat.html', res_Dict, request=request) + res_Dict.update({'tickets_list_html': tickets_list_html}) else: msgs = get_msgs_for_chat_w_users(sender, receiver) + users_list_html = render_to_string( + 'blocks/profile/b_list_of_users_messenger.html', res_Dict, request=request) + res_Dict.update({'users_list_html': users_list_html}) if not msgs or (request.user != msgs[0].receiver) or (not msgs and not last_message_modifiedDT) or (msgs and last_message_modifiedDT and msgs[0].modifiedDT <= last_message_modifiedDT): Dict.update({ @@ -86,6 +93,7 @@ def update_chat_ajax(request): return JsonResponse(Dict, status=200) + res_Dict.update({ 'messages': msgs, 'cur_receiver': receiver, @@ -94,11 +102,10 @@ def update_chat_ajax(request): html = render_to_string(tpl_name, res_Dict, request=request) res_Dict.update({'receivers': get_chat_receivers_for_user(request.user)}) - users_list_html = render_to_string('blocks/profile/b_list_of_users_messenger.html', res_Dict, request=request) + Dict.update({ 'html': html, - 'users_list_html': users_list_html, 'required_beep': True, }) return JsonResponse(Dict, status=200)