0.3.22

support chat v3

ChatServiceApp/funcs.py

@@ -316,17 +316,24 @@ def get_tickets_wo_manager():
 
 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(
         enable=True, manager=user
     ).annotate(
-        unread_msgs_count = Count(Subquery(msgs))
+        unread_msgs_count = Count(Subquery(unread_msgs)),
+        last_msg_modifiedDT = Subquery(msgs)
         # unread_msgs_count=Count(
         #     'rel_messages_for_group',
         #     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

templates/blocks/profile/b_support_chat.html

@@ -19,7 +19,7 @@
                 <div class="container-header-chat">
                     <div class="header-chat-left-part">
                         <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 class="header-chat-right-part">
                         <img class="header-icons-right-part-padding" src="{% static "img/svg/phone.svg" %}">