From 487e925069ea6d25e82604b7f160d5f9d6063ea6 Mon Sep 17 00:00:00 2001
From: borissedw <strigevitch.boris@gmail.com>
Date: Mon, 7 Aug 2023 19:06:42 +0300
Subject: [PATCH] 0.0.60

---
 static/js/check_new_messages.js               | 39 +++++++++++++++----
 templates/blocks/profile/b_chats.html         |  6 +--
 .../blocks/profile/b_messages_container.html  |  2 +-
 templates/pages/profile/p_user_profile.html   |  3 +-
 4 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/static/js/check_new_messages.js b/static/js/check_new_messages.js
index a81ff24..1c9faa9 100644
--- a/static/js/check_new_messages.js
+++ b/static/js/check_new_messages.js
@@ -1,12 +1,37 @@
-var user_online = true
 
-function check_new_messages (sender,receiver,ticket_id=null){
-    // let user_online_check = document.addEventListener("mouseover");
-    let data = {
-        'sender':sender,
-        'receiver':receiver,
-        'ticket_id':ticket_id
+
+
+$(document).ready(
+    timeout()
+
+)
+
+
+var data_set = document.querySelector(".container-messages").dataset
+
+var sender = data_set['curReceiver'];
+var receiver = data_set['ticketId'];
+var ticket_id = data_set['userId'];
+var window = document.querySelector(".container-messages")
+
+var data = {
+    'sender':sender,
+    'receiver':receiver,
+    'ticket_id':ticket_id
+    // 'last_message_modifiteDT':last_message_time
+}
+
+
+function timeout (){
+    while (window !== null){
+        setTimeout(check_new_messages(), 1000)
     }
+}
+
+function check_new_messages (){
+    // let user_online_check = document.addEventListener("mouseover");
+    let last_message_time = document.querySelector(".date_n_time_last_message").dataset['modifieddt'];
+    data['last_message_modifiteDT'] = last_message_time
 
     $.ajax({
         headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
diff --git a/templates/blocks/profile/b_chats.html b/templates/blocks/profile/b_chats.html
index 5308a67..47a182c 100644
--- a/templates/blocks/profile/b_chats.html
+++ b/templates/blocks/profile/b_chats.html
@@ -1,5 +1,6 @@
 {% load static %}
 
+
 <div class="title-profile-cont">
     <h1>Написать сообщение</h1>
 </div>
@@ -38,7 +39,7 @@
 {#</div>#}
 
 
-<div class="block-chat" onclick='check_new_messages({{ user.id }},{{ cur_receiver.id }})'>
+<div class="block-chat">
     <div class="container-header-chat">
         <div class="header-chat-left-part">
             <img class="chat-avatar" src="{% static "delete_later/Avatar.png" %}">
@@ -50,7 +51,7 @@
             <img class="header-icons-right-part-padding" src="{% static "img/svg/info.svg" %}">
         </div>
     </div>
-    <div class="container-messages" >
+    <div class="container-messages" data-user-id="{{ user.id }}" data-cur-receiver="{{ cur_receiver.id }}" data-ticket-id='null'>
         {% include "blocks/profile/b_messages_container.html" %}
     </div>
 
@@ -81,4 +82,3 @@
     </div>
 </div>
 
-<script src="{% static "js/check_new_messages.js" %}"></script>
\ No newline at end of file
diff --git a/templates/blocks/profile/b_messages_container.html b/templates/blocks/profile/b_messages_container.html
index 7498981..371c27c 100644
--- a/templates/blocks/profile/b_messages_container.html
+++ b/templates/blocks/profile/b_messages_container.html
@@ -8,7 +8,7 @@
     {% for msg in messages %}
         {% include "widgets/w_message.html" %}
         {% if forloop.last %}
-            <span style="display: none" data-modifiedDT="{{ msg.modifiedDT }}"></span>
+            <span style="display: none" class="date_n_time_last_message" data-modifiedDT="{{ msg.modifiedDT }}"></span>
         {% endif %}
     {% endfor %}
 {% endif %}
diff --git a/templates/pages/profile/p_user_profile.html b/templates/pages/profile/p_user_profile.html
index 2b28f96..cc7daea 100644
--- a/templates/pages/profile/p_user_profile.html
+++ b/templates/pages/profile/p_user_profile.html
@@ -17,4 +17,5 @@
 
 {% block content %}
     {% include 'blocks/b_user_profile.html' %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+