From f609361ee927f054c479a2a234966d40ed942aff Mon Sep 17 00:00:00 2001 From: ArtemB Date: Wed, 17 Jul 2024 15:24:42 +0300 Subject: [PATCH 1/6] 1.1.37 show/hide unanswered_msgs_count --- .../etc_operations_for_chat_socket.js | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) 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..33e043b 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,28 @@ -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 { + for (let i = 0; i < list_unrd.length; i++) { + let current_count = parseInt(list_unrd[i].innerHTML); + if (current_count === 0) { + list_unrd_parent[i].classList.toggle("showed"); + } + } + } } function play_required_beep (data,beep) { From c999d994d6dc5e90deed27d634dc1a581b6e8831 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 18 Jul 2024 11:42:29 +0300 Subject: [PATCH 2/6] 1.1.38 show/hide unanswered_msgs_count --- templates/widgets/w_chat_right_panel_user.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/templates/widgets/w_chat_right_panel_user.html b/templates/widgets/w_chat_right_panel_user.html index 6fd3fca..43a231d 100644 --- a/templates/widgets/w_chat_right_panel_user.html +++ b/templates/widgets/w_chat_right_panel_user.html @@ -9,7 +9,8 @@ {{ item.last_name }} {{ item.first_name }} {{ item.last_msg }} - {% if item.unread_msgs_count %} +{# {% if item.unread_msgs_count %}#} + {% if unanswered_msgs_count > 0 %}
{{ unanswered_msgs_count }} From f61482ded60c7c65975302f1aa1d6a12d1f288d2 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 18 Jul 2024 12:05:54 +0300 Subject: [PATCH 3/6] 1.1.39 show/hide unanswered_msgs_count --- templates/widgets/w_chat_right_panel_user.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/widgets/w_chat_right_panel_user.html b/templates/widgets/w_chat_right_panel_user.html index 43a231d..8acf4c5 100644 --- a/templates/widgets/w_chat_right_panel_user.html +++ b/templates/widgets/w_chat_right_panel_user.html @@ -9,8 +9,8 @@ {{ item.last_name }} {{ item.first_name }} {{ item.last_msg }}
-{# {% if item.unread_msgs_count %}#} - {% if unanswered_msgs_count > 0 %} + {% if item.unread_msgs_count %} +{# {% if unanswered_msgs_count > 0 %}#}
{{ unanswered_msgs_count }} From 87b21c5f55ab88a762454a6a9503f63cebfb93f1 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Thu, 18 Jul 2024 12:53:04 +0300 Subject: [PATCH 4/6] 1.1.40 show/hide unanswered_msgs_count --- .../chat_socket_functions/etc_operations_for_chat_socket.js | 4 ++++ static/js/user_profile_2.js | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) 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 33e043b..06e7501 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 @@ -15,6 +15,10 @@ function update_count_unread_messages(data) { list_unrd_parent[i].classList.toggle("showed"); } } + } else if(data.unanswered_msgs_count){ + for (let i = 0; i < list_unrd.length; i++){ + list_unrd[i].innerHTML = data.unanswered_msgs_count.toString() + } } else { for (let i = 0; i < list_unrd.length; i++) { let current_count = parseInt(list_unrd[i].innerHTML); 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() From 92e9b1ce63ebce68dd34dd4d5a41071197a2bca1 Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 23 Jul 2024 13:41:41 +0300 Subject: [PATCH 5/6] 1.1.41 show/hide unanswered_msgs_count --- .../etc_operations_for_chat_socket.js | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 06e7501..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 @@ -15,18 +15,23 @@ function update_count_unread_messages(data) { list_unrd_parent[i].classList.toggle("showed"); } } - } else if(data.unanswered_msgs_count){ + } 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() - } - } else { - for (let i = 0; i < list_unrd.length; i++) { - let current_count = parseInt(list_unrd[i].innerHTML); - if (current_count === 0) { - list_unrd_parent[i].classList.toggle("showed"); + 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) { From 81af5990ae0abd293296c2bfc690cc9ade7cbd6a Mon Sep 17 00:00:00 2001 From: ArtemB Date: Tue, 23 Jul 2024 14:28:41 +0300 Subject: [PATCH 6/6] 1.1.42 Fix date formatting issue in template --- templates/blocks/profile/b_new_route.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 #}