Merge remote-tracking branch 'origin/dev' into dev

static/js/chat_socket_functions/etc_operations_for_chat_socket.js

@@ -1,28 +1,37 @@
 
-function update_count_unread_messages (data) {
+function update_count_unread_messages(data) {
-    let selected_btn = document.querySelector(".selected")
+    let selected_btn = document.querySelector(".selected");
-     let list_unrd = document.querySelectorAll(".unredmessages_value_text")
+    let list_unrd = document.querySelectorAll(".unredmessages_value_text");
-      let current_count = parseInt(list_unrd[i].innerHTML);
+    let list_unrd_parent = document.querySelectorAll(".icon_unread_messages");
-    if (selected_btn.dataset['ajaxUrl'] !== 'chats'){
-        let list_unrd_parent = document.querySelectorAll(".icon_unread_messages")
-        let i = 0
 
-        for (i;i < list_unrd.length;i++){
+    if (selected_btn.dataset['ajaxUrl'] !== 'chats') {
-
+        for (let i = 0; i < list_unrd.length; i++) {
-
+            let current_count = parseInt(list_unrd[i].innerHTML);
-
+            if (data.unread_msgs_count) {
-               if(data.unread_msgs_count){
+                list_unrd[i].innerHTML = (current_count + 1).toString();
-                     list_unrd[i].innerHTML = (current_count + 1).toString();
+            }
-               }
-
-                if(current_count === 0){
-                    list_unrd_parent[i].classList.toggle("showed")
-                }
 
+            if (current_count === 0) {
+                list_unrd_parent[i].classList.toggle("showed");
+            }
         }
-    } else if (current_count === 0){
+    } else if(data.unanswered_msgs_count || data.unanswered_msgs_count === 0){
-                    list_unrd_parent[i].classList.toggle("showed")
+        for (let i = 0; i < list_unrd.length; i++){
-                }
+            list_unrd[i].innerHTML = data.unanswered_msgs_count.toString()
+            if(data.unanswered_msgs_count === 0){
+                list_unrd_parent[i].classList.remove("showed");
+            }
+        }
+    }
+
+    // else {
+    //     for (let i = 0; i < list_unrd.length; i++) {
+    //         let current_count = parseInt(list_unrd[i].innerHTML);
+    //         if (current_count === 0 || selected_btn.dataset['ajaxUrl'] !== 'chats') {
+    //             list_unrd_parent[i].classList.toggle("showed");
+    //         }
+    //     }
+    // }
 }
 
 function play_required_beep (data,beep) {

static/js/user_profile_2.js

@@ -561,7 +561,7 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){
     }
     let user_type = getInfoAboutUser()
 
-    update_count_unread_messages()
+
     // if (user_type === 'mobile' || user_type === 'laptop') {
     //     open_curtain_w_contacts()
     // }
@@ -592,6 +592,9 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){
                 let top = document.querySelector(".tab_user_messanger.select").offsetTop
                 document.querySelector(".menu_buttons.curtain.left.open").scrollTo({top:top})
             }
+
+            update_count_unread_messages(data);
+
             // second time beacause we need to close curtain
             // if (user_type === 'mobile' || user_type === 'laptop') {
             //     open_curtain_w_contacts()

templates/blocks/profile/b_new_route.html

@@ -110,7 +110,7 @@
                     id="id_departure_DT"
                     name="departure_DT"
                     placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.departure_DT %}
-                    value="{{ form.initial.departure_DT|date:"d.m.Y H:m" }}"{% endif %}/>
+                    value="{{ form.initial.departure_DT|date:"d.m.Y H:i" }}"{% endif %}/>
             <div id="displayRegervation"></div>
 
           {% if not errors_off and form.errors and form.errors.departure_DT %}
@@ -147,7 +147,7 @@
                     id="id_arrival_DT"
                     name="arrival_DT"
                     placeholder="{% translate "Выберите дату и время" %}" {% if form.initial.arrival_DT %}
-                    value="{{ form.initial.arrival_DT|date:"d.m.Y H:m" }}"{% endif %}/>
+                    value="{{ form.initial.arrival_DT|date:"d.m.Y H:i" }}"{% endif %}/>
 
             <div id="displayRegervation"></div>
         {# end #}

templates/widgets/w_chat_right_panel_user.html

@@ -10,6 +10,7 @@
         <span class="last-message-messenger-user-tab">{{ item.last_msg }}</span>
     </div>
     {% if item.unread_msgs_count %}
+{#    {% if unanswered_msgs_count > 0 %}#}
         <div class="right-part-tab-user">
             <div class="cost-messages-in-user-tab-messenger">
                 <span>{{ unanswered_msgs_count }}</span>