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

0.2.15

Browse Source 
chat v2
This commit is contained in:
SDE
2023-08-11 13:58:40 +03:00
parent 5b9d311b06
commit d53d16071e
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChatServiceApp/funcs.py
View File

@@ -66,6 +66,15 @@ def get_chat_receivers_for_user(user):
# #
# return list(set(receivers_list)) # 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): def get_messages_for_ticket(ticket):
return ticket.rel_messages_for_group.filter(enable=True).order_by('-modifiedDT') return ticket.rel_messages_for_group.filter(enable=True).order_by('-modifiedDT')

11
ChatServiceApp/js_views.py
View File

@@ -76,8 +76,15 @@ def update_chat_ajax(request):
}) })
msgs = get_messages_for_ticket(ticket) 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: else:
msgs = get_msgs_for_chat_w_users(sender, receiver) 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): 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({ Dict.update({
@@ -86,6 +93,7 @@ def update_chat_ajax(request):
return JsonResponse(Dict, status=200) return JsonResponse(Dict, status=200)
res_Dict.update({ res_Dict.update({
'messages': msgs, 'messages': msgs,
'cur_receiver': receiver, 'cur_receiver': receiver,
@@ -94,11 +102,10 @@ def update_chat_ajax(request):
html = render_to_string(tpl_name, res_Dict, request=request) html = render_to_string(tpl_name, res_Dict, request=request)
res_Dict.update({'receivers': get_chat_receivers_for_user(request.user)}) 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({ Dict.update({
'html': html, 'html': html,
'users_list_html': users_list_html,
'required_beep': True, 'required_beep': True,
}) })
return JsonResponse(Dict, status=200) return JsonResponse(Dict, status=200)