0.0.178

static/css/styles(boris).css

@@ -484,6 +484,18 @@
     padding-top: 9%;
 }
 
+.icon_unread_messages{
+    display: none;
+}
+
+.icon_unread_messages.showed{
+    width: 12%;
+    height: 100%;
+    float: right;
+    padding-top: 9%;
+    display: block;
+}
+
 
 .cost-messages-in-user-tab-messenger{
     width: 25px;

static/js/chat_socket_functions/etc_operations_for_chat_socket.js

@@ -1,8 +1,12 @@
 
 function update_count_unread_messages (data) {
-    let list_unrd = document.querySelectorAll(".qs")
+    let list_unrd = document.querySelectorAll(".unredmessages_value_text")
+    let list_unrd_parent = document.querySelectorAll(".icon_unread_messages")
     let i = 0
     for (i;i < list_unrd.length;i++){
+        if (!list_unrd_parent[i].classList.contains("showed")){
+            list_unrd_parent[i].classList.toggle("showed")
+        }
         list_unrd[i].innerHTML = data.unread_msgs_count.toString()
     }
 }

static/js/chat_sockets.js

@@ -62,27 +62,27 @@ function wsReceiveData (e) {
                 //    не найден user id
                 }
             } else {
-                let error_ticket_manager = "ticket_manager is not defined"
+                let error_ticket_manager = "Error ticket_manager is not defined"
                 console.log(error_ticket_manager)
             }
 
 
         } else {
-            if (data.chat_html){
+            // if (data.chat_html){
-                if (msg_cont){
+            //     if (msg_cont){
-                    if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) {
+            //         if (msg_cont.dataset['curReceiver'] === data['sender'].toString() || msg_cont.dataset['curReceiver'] === data['receiver'].toString()) {
-                        msg_cont.innerHTML = data.chat_html
+            //             msg_cont.innerHTML = data.chat_html
-                    }
+            //         }
-                } else {
+            //     } else {
-                    let error_msg_cont = "msg_cont is not defined"
+            //         let error_msg_cont = "Error msg_cont is not defined"
-                    console.log(error_msg_cont)
+            //         console.log(error_msg_cont)
-                }
+            //     }
-            } else if (data.support_chat_html){
+            if (data.support_chat_html){
                 let cont_mes_ins = document.querySelector(".info_profile")
                 if (cont_mes_ins){
                     cont_mes_ins.innerHTML = data.support_chat_html
                 } else {
-                    let error_cont_mes_ins = "cont_mes_ins is not defined"
+                    let error_cont_mes_ins = "Error cont_mes_ins is not defined"
                     console.log(error_cont_mes_ins)
                 //    не найден info profile
                 }

templates/blocks/b_header.html

@@ -37,6 +37,11 @@
                     <span>
                         {{ user.first_name }} {{ user.last_name }}
                     </span>
+                    <div class="icon_unread_messages" style="padding-top: 2px;padding-right: 13px;">
+                      <div class="cost-messages-in-user-tab-messenger" style="background: #FFFFFF;">
+                          <span class="unredmessages_value_text" style="padding-top: 2px;padding-left: 0; color: #000000;"></span>
+                      </div>
+                    </div>
                 </a>
 
 

templates/blocks/b_user_profile.html

@@ -18,9 +18,9 @@
         <div onclick="writeMessage(this)">
           <img class="svg" src="/static/img/svg/ChatCircleDots.svg">
           <a href="#">Написать сообщение
-              <div class="right-part-tab-user">
+              <div class="icon_unread_messages" style="padding-top: 0;">
-                  <div class="cost-messages-in-user-tab-messenger" style="background: #FFFFFF">
+                  <div class="cost-messages-in-user-tab-messenger">
-                      <span class="unredmessages_value_text"></span>
+                      <span class="unredmessages_value_text" style="padding-top: 2px;padding-left: 0;"></span>
                   </div>
               </div>
           </a>

templates/pages/p_results_find_route.html

@@ -160,9 +160,8 @@
 {#                                name="type_transport"#}
 {#                                id="id_cargo_type_plane"#}
 {#                            />#}
-{##}
+{##}{#                                <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Airplane.svg" %}">#}
 {#                            <label for="id_cargo_type_plane" >#}
-{#                                <img style="display: inline-block;padding-top: 11px;" src="{% static "img/svg/Airplane.svg" %}">#}
 {#                                <span style="display: inline-block;width: 80%;">{{ form.fields.type_transport.choices }}</span>#}
 {#                            </label>#}
 {#                        </div>#}

templates/widgets/w_carrier_card.html

@@ -44,6 +44,7 @@
                     <div class="clear_both"></div>
                     <div>{{ route.get_cargo_type_display }}</div>
                     <div>{{ route.weight }}</div>
+                    <div>{{ route.get_owner_type_display }}</div>
                 </a>
             </div>
             {% if route.owner != user %}