diff --git a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js index c45dd9e..68ae342 100644 --- a/static/js/chat_socket_functions/etc_operations_for_chat_socket.js +++ b/static/js/chat_socket_functions/etc_operations_for_chat_socket.js @@ -1,28 +1,37 @@ -function update_count_unread_messages (data) { - let selected_btn = document.querySelector(".selected") - let list_unrd = document.querySelectorAll(".unredmessages_value_text") - let current_count = parseInt(list_unrd[i].innerHTML); - if (selected_btn.dataset['ajaxUrl'] !== 'chats'){ - let list_unrd_parent = document.querySelectorAll(".icon_unread_messages") - let i = 0 +function update_count_unread_messages(data) { + let selected_btn = document.querySelector(".selected"); + let list_unrd = document.querySelectorAll(".unredmessages_value_text"); + let list_unrd_parent = document.querySelectorAll(".icon_unread_messages"); - for (i;i < list_unrd.length;i++){ - - - - if(data.unread_msgs_count){ - list_unrd[i].innerHTML = (current_count + 1).toString(); - } - - if(current_count === 0){ - list_unrd_parent[i].classList.toggle("showed") - } + 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) { + list_unrd[i].innerHTML = (current_count + 1).toString(); + } + if (current_count === 0) { + list_unrd_parent[i].classList.toggle("showed"); + } } - } else if (current_count === 0){ - list_unrd_parent[i].classList.toggle("showed") - } + } else if(data.unanswered_msgs_count || data.unanswered_msgs_count === 0){ + 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) { diff --git a/static/js/user_profile_2.js b/static/js/user_profile_2.js index 784dc48..848c474 100644 --- a/static/js/user_profile_2.js +++ b/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() diff --git a/templates/blocks/profile/b_new_route.html b/templates/blocks/profile/b_new_route.html index b634a1e..c59fd3e 100644 --- a/templates/blocks/profile/b_new_route.html +++ b/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 %}/>
{% 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 %}/> {# end #} diff --git a/templates/widgets/w_chat_right_panel_user.html b/templates/widgets/w_chat_right_panel_user.html index 6fd3fca..8acf4c5 100644 --- a/templates/widgets/w_chat_right_panel_user.html +++ b/templates/widgets/w_chat_right_panel_user.html @@ -10,6 +10,7 @@ {% if item.unread_msgs_count %} +{# {% if unanswered_msgs_count > 0 %}#}