diff --git a/ChatServiceApp/funcs.py b/ChatServiceApp/funcs.py index 4dd628c..f8f2ead 100644 --- a/ChatServiceApp/funcs.py +++ b/ChatServiceApp/funcs.py @@ -323,6 +323,9 @@ def get_tickets_wo_manager(): return tickets def get_tickets_for_manager(user): + unread_msgs = Message.objects.filter( + group=31, status='sended', receiver=user + ) unread_msgs = Message.objects.filter( group=OuterRef('pk'), status='sended', receiver=user diff --git a/ChatServiceApp/js_views.py b/ChatServiceApp/js_views.py index 5c1c3c1..2fda826 100644 --- a/ChatServiceApp/js_views.py +++ b/ChatServiceApp/js_views.py @@ -368,7 +368,10 @@ def support_show_chat_by_ticket_ajax(request): # if len(msgs) > 1: new_msg_allow = True - # msgs.filter(receiver=cur_receiver).update(status='seen') + seen_msgs = msgs.filter(receiver=request.user, status='sended') + if seen_msgs: + seen_msgs.update(status='seen') + msgs = get_messages_for_ticket(ticket) Dict = { 'ticket': ticket, diff --git a/RoutesApp/funcs.py b/RoutesApp/funcs.py index ba014fd..baabee5 100644 --- a/RoutesApp/funcs.py +++ b/RoutesApp/funcs.py @@ -1,5 +1,5 @@ from .models import * -def get_routes_Dict(user=None): +def get_routes_Dict(user=None, data=None): from ReferenceDataApp.models import Airport, Country, City # if not user and user.is_authenticated: diff --git a/RoutesApp/js_urls.py b/RoutesApp/js_urls.py index 6b2e178..7bd6bb8 100644 --- a/RoutesApp/js_urls.py +++ b/RoutesApp/js_urls.py @@ -11,4 +11,5 @@ urlpatterns = [ path('edit_route/', edit_route_ajax, name='edit_route_ajax'), path('get_routes/', get_routes_ajax, name='get_routes_ajax'), + ] \ No newline at end of file