0.1.35

chat routines

ChatServiceApp/funcs.py

@@ -8,20 +8,21 @@ def get_msgs_for_chat_w_users(user1, user2):
         Q(sender=user1) | Q(receiver=user1),
         Q(sender=user2) | Q(receiver=user2),
         group=None
-    )
+    ).order_by('-modifiedDT')
     return msgs
 
 def get_chat_receivers_for_user(user):
     receivers = Message.objects.filter(
         Q(sender=user) | Q(receiver=user),
         group=None
-    ).order_by('-modifiedDT').values('sender', 'receiver')
+    ).order_by('-modifiedDT')#.select_related('sender', 'receiver').values('sender', 'receiver').distinct()
 
     receivers_list = []
-    receivers_list.extend([item['sender'] for item in receivers if item['sender'] != user])
-    receivers_list.extend([item['receiver'] for item in receivers if item['receiver'] != user])
 
-    return receivers_list
+    receivers_list.extend((item.sender for item in receivers if item.sender != user))
+    receivers_list.extend((item.receiver for item in receivers if item.receiver != user))
+
+    return list(set(receivers_list))
 
 def get_messages_for_ticket(ticket):
     return ticket.rel_messages_for_group.filter(enable=True).order_by('-modifiedDT')

ChatServiceApp/js_views.py

@@ -57,6 +57,8 @@ def send_msg_ajax(request):
         data = json.loads(request.body)
         ticket = None
 
+        tpl_name = 'blocks/profile/b_chats.html'
+
         if data['text']:
 
 
@@ -67,13 +69,14 @@ def send_msg_ajax(request):
             receiver = User.objects.get(id=data['receiver'])
 
             # если только что манагер присоединился к тикету
-            if ticket and not ticket.manager:
+            if ticket:
-                if sender.is_staff:
+                if not ticket.manager:
-                    ticket.manager = sender
+                    if sender.is_staff:
-                else:
+                        ticket.manager = sender
-                    ticket.manager = receiver
+                    else:
+                        ticket.manager = receiver
 
-                ticket.save()
+                    ticket.save()
 
                 kwargs = {
                     'sender': ticket.owner,
@@ -81,32 +84,45 @@ def send_msg_ajax(request):
                     'text': ticket.text,
                 }
 
-                if ticket:
+                kwargs.update({'group': ticket})
-                    kwargs.update({'group': ticket})
 
                 msg = Message.objects.create(**kwargs)
                 Message.objects.filter(id=msg.id).update(modifiedDT=ticket.createDT, createDT=ticket.createDT)
-            # ------------
 
-            kwargs = {
+                res_Dict.update({
-                'sender': sender,
+                    'ticket': ticket,
-                'receiver': receiver,
+                    'cur_receiver': receiver,
-                'text': data['text']
+                    'messages': get_messages_for_ticket(ticket),
-            }
+                    'text': ticket.text,
+                    'modifiedDT': ticket.modifiedDT
+                })
+                res_Dict.update(get_ticketsDict_for_staff(request.user))
 
-            if ticket:
+                tpl_name = 'blocks/profile/b_support_chat.html'
-                kwargs.update({'group': ticket})
 
-            msg = Message.objects.create(**kwargs)
+            else:
+
+                kwargs = {
+                    'sender': sender,
+                    'receiver': receiver,
+                    'text': data['text']
+                }
+
+                msg = Message.objects.create(**kwargs)
+
+                receivers = get_chat_receivers_for_user(request.user)
+                msgs = get_msgs_for_chat_w_users(sender, receiver)
+
+                res_Dict.update({
+                    'messages': msgs,
+                    'cur_receiver': receiver,
+                    'receivers': receivers,
+                    'text': data['text'],
+                    'modifiedDT': msgs[0].modifiedDT
+                })
 
 
-        res_Dict.update({
-            'ticket': ticket,
-            'messages': get_messages_for_ticket(ticket)
-        })
-        res_Dict.update(get_ticketsDict_for_staff(request.user))
 
-        tpl_name = 'blocks/profile/b_support_chat.html'
 
         html = render_to_string(tpl_name, res_Dict, request=request)
         return JsonResponse({'html': html}, status=200)

templates/blocks/profile/b_chats.html

@@ -32,7 +32,7 @@
 {#    <div class="block-list-of-users">#}
 {#        <span class="title-list-of-users">Пользователи</span>#}
 {#        <div class="insert_users">#}
-{#            {% include "widgets/w_tab_user.html" %}#}
+{#            {% include "widgets/w_chat_right_panel_tickets.html" %}#}
 {#        </div>#}
 {#    </div>#}
 {#</div>#}
@@ -42,7 +42,8 @@
     <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">{{ 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" %}">
@@ -52,14 +53,10 @@
 
     <div class="container-messages">
         {% if not messages %}
-            {% with text=ticket.text modifiedDT=ticket.modifiedDT  %}
+            {% include "widgets/w_message.html" %}
-                {% include "widgets/w_message.html" %}
-            {% endwith %}
         {% else %}
             {% for msg in messages %}
-                {% with text=msg.text modifiedDT=msg.modifiedDT %}
+                {% include "widgets/w_message.html" %}
-                    {% include "widgets/w_message.html" %}
-                {% endwith %}
             {% endfor %}
         {% endif %}
     </div>
@@ -79,7 +76,11 @@
     <div class="insert_users">
         {% if tickets_wo_manager %}
             {% for item in tickets_wo_manager %}
-                {% include "widgets/w_tab_user.html" %}
+                {% include "widgets/w_chat_right_panel_tickets.html" %}
+            {% endfor %}
+        {% else %}
+            {% for item in receivers %}
+                {% include "widgets/w_chat_right_panel_users.html" %}
             {% endfor %}
         {% endif %}
 

templates/blocks/profile/b_support_chat.html

@@ -61,7 +61,7 @@
             <div class="insert_users">
                 {% if tickets_wo_manager %}
                     {% for item in tickets_wo_manager %}
-                        {% include "widgets/w_tab_user.html" %}
+                        {% include "widgets/w_chat_right_panel_tickets.html" %}
                     {% endfor %}
                 {% endif %}
 
@@ -70,7 +70,7 @@
                 <span class="title-list-of-users">Тикеты в работе</span>
                 {% if tickets_for_manager %}
                     {% for item in tickets_for_manager %}
-                        {% include "widgets/w_tab_user.html" %}
+                        {% include "widgets/w_chat_right_panel_tickets.html" %}
                     {% endfor %}
                 {% endif %}
             </div>

templates/widgets/w_chat_right_panel_users.html

@@ -0,0 +1,15 @@
+{% load static %}
+<div class="tab_user_messanger{% if item.id == cur_receiver.id %} select{% endif %}" onclick="selectedUserMessenger(this,{{ item.id }})">
+    <div class="left-part-tab-user">
+        <img class="user_avatar_messenger" src="{% static "delete_later/Avatar.png" %}">
+        <div class="status_user">
+        </div>
+    </div>
+    <div class="center-part-tab-user">
+        <span class="user_name_messenger">{{ item.last_name }} {{ item.first_name }}</span>
+        <span class="last-message-messenger-user-tab">{{ item.id }}</span>
+    </div>
+    <div class="right-part-tab-user">
+        <div class="cost-messages-in-user-tab-messenger"><span>1</span></div>
+    </div>
+</div>

templates/widgets/w_message.html

@@ -9,11 +9,11 @@
         <div class="block_text_message {% get_msg_side user ticket msg %}">
             <div class="container_text_message {% get_msg_side user ticket msg %}">
                 <span class="text_message">
-                    {{ text }}
+                    {% if msg %}{{ msg.text }}{% else %}{{ ticket.text }}{% endif %}
                 </span>
             </div>
             <div class="data_send_message {% get_msg_side user ticket msg %}">
-                <span>{{ modifiedDT }}</span>
+                <span>{% if msg %}{{ msg.modifiedDT }}{% else %}{{ ticket.modifiedDT }}{% endif %}</span>
             </div>
         </div>
     </div>