0.1.35

chat routines

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" %}
-            {% endwith %}
+            {% include "widgets/w_message.html" %}
         {% else %}
             {% for msg in messages %}
-                {% with text=msg.text modifiedDT=msg.modifiedDT %}
-                    {% include "widgets/w_message.html" %}
-                {% endwith %}
+                {% include "widgets/w_message.html" %}
             {% 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>