0.12.24 timezone in chat messages

ChatServiceApp/funcs.py

@@ -13,7 +13,7 @@ from django.urls import reverse
 import json
 from datetime import datetime, time
 from django.conf import settings
-
+from AuthApp.funcs import get_user_timezone_Dict
 
 
 def get_unanswered_msgs_count_for_user(user):
@@ -56,7 +56,6 @@ def get_update_chat_Dict(data):
         if data['sender'] == data['cur_user']:
             user = copy.copy(sender)
             cur_receiver = copy.copy(receiver)
-            # context_Dict.update({'user': sender})
         else:
             user = copy.copy(receiver)
             cur_receiver = copy.copy(sender)
@@ -65,8 +64,9 @@ def get_update_chat_Dict(data):
         # context_Dict.update({'cur_receiver': receiver})
         context_Dict.update({
             'cur_receiver': cur_receiver,
-            'user': user
+            'user': user,
         })
+        context_Dict.update(get_user_timezone_Dict(user))
 
         if sender == receiver:
             print('!')
@@ -112,7 +112,7 @@ def get_update_chat_Dict(data):
 
         context_Dict.update({
             'messages': msgs,
-            'MEDIA_URL': settings.MEDIA_URL
+            'MEDIA_URL': settings.MEDIA_URL,
         })
         html = render_to_string(tpl_name, context_Dict)
         if required_full_support_chat_html:
@@ -288,10 +288,7 @@ def send_msg(data):
 
 def get_chat_page_content_html(request, receiver_id=None):
     from AuthApp.models import User
-    from django.utils import timezone
-
-    msg = f'now {timezone.now()}'
-    print(msg)
+    from AuthApp.funcs import get_user_timezone_Dict
 
     msgs = []
     try:
@@ -311,6 +308,7 @@ def get_chat_page_content_html(request, receiver_id=None):
         'receivers': receivers,
         'page': 'chat',
     }
+    Dict.update(get_user_timezone_Dict(request.user, request=request))
     tpl_name = 'blocks/profile/b_chats.html'
 
     html = render_to_string(tpl_name, Dict, request=request)

ChatServiceApp/js_views.py

@@ -53,6 +53,7 @@ def show_chat_w_user_ajax(request):
 
         data = json.loads(request.body)
         Dict = get_chat_page_content_Dict(request, data['user_id'])
+        Dict.update(get_user_timezone_Dict(request.user, request=request))
 
         tpl_name = 'blocks/profile/b_chats.html'
 
@@ -99,7 +100,7 @@ def update_chat_ajax2(request):
             receiver = User.objects.get(id=data['receiver'])
 
         context_Dict.update({'cur_receiver': receiver})
-
+        context_Dict.update(get_user_timezone_Dict(request.user, request=request))
 
         if not ticket:
 
@@ -190,6 +191,7 @@ def update_chat_ajax(request):
             receiver = User.objects.get(id=data['receiver'])
 
         context_Dict.update({'cur_receiver': receiver})
+        context_Dict.update(get_user_timezone_Dict(request.user, request=request))
 
         if ticket: