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

0.3.22

Browse Source 
support chat v3
This commit is contained in:
SDE
2023-08-15 17:16:40 +03:00
parent 662138ac00
commit f5361f679a
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChatServiceApp/funcs.py
View File

@@ -316,17 +316,24 @@ def get_tickets_wo_manager():
def get_tickets_for_manager(user): def get_tickets_for_manager(user):
msgs = Message.objects.filter(group=OuterRef('pk'), status='sended', receiver=user).values('id')[:1] unread_msgs = Message.objects.filter(
group=OuterRef('pk'), status='sended', receiver=user
).values('id')[:1]
msgs = Message.objects.filter(
group=OuterRef('pk')
).order_by('-modifiedDT').values('modifiedDT')[:1]
tickets = MsgGroup.objects.filter( tickets = MsgGroup.objects.filter(
enable=True, manager=user enable=True, manager=user
).annotate( ).annotate(
unread_msgs_count = Count(Subquery(msgs)) unread_msgs_count = Count(Subquery(unread_msgs)),
last_msg_modifiedDT = Subquery(msgs)
# unread_msgs_count=Count( # unread_msgs_count=Count(
# 'rel_messages_for_group', # 'rel_messages_for_group',
# filter=Q(rel_messages_for_group__status='sended', rel_messages_for_group__receiver=user) # filter=Q(rel_messages_for_group__status='sended', rel_messages_for_group__receiver=user)
# ) # )
).order_by('-modifiedDT') ).order_by('-unread_msgs_count', '-last_msg_modifiedDT')
return tickets return tickets

2
templates/blocks/profile/b_support_chat.html
View File

@@ -19,7 +19,7 @@
<div class="container-header-chat"> <div class="container-header-chat">
<div class="header-chat-left-part"> <div class="header-chat-left-part">
<img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}"> <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
<span class="chat-username">{{ ticket.manager.last_name }} {{ ticket.manager.first_name }}</span> <span class="chat-username">{{ cur_receiver.last_name }} {{ cur_receiver.first_name }}</span>
</div> </div>
<div class="header-chat-right-part"> <div class="header-chat-right-part">
<img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}"> <img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">