new

osinaweb/osichat/api/views.py

@@ -26,13 +26,13 @@ def get_visitors(request):
         end_date = parse_date(end_date)
     
     if start_date and end_date:  # Range of time
-        visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date__range=[start_date, end_date]) |  Q(visitorlog__left_date__date__range=[start_date, end_date])).distinct()
+        visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date__range=[start_date, end_date]) |  Q(visitorlog__left_date__date__range=[start_date, end_date])).distinct().annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit')
 
     elif start_date and not end_date:  # Specific date
-        visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date=start_date) | Q(visitorlog__left_date__date=start_date)).distinct()
+        visitors = Visitor.objects.filter(Q(visitorlog__visit_date__date=start_date) | Q(visitorlog__left_date__date=start_date)).distinct().annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit')
         
     else:  # Active visitors
-        visitors = Visitor.objects.filter(visitorlog__left_date__isnull=True).distinct()
+        visitors = Visitor.objects.filter(visitorlog__left_date__isnull=True).distinct().annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit')
 
     visitors_count = visitors.count()
     visitors_data = []

osinaweb/osichat/consumers.py

@@ -326,7 +326,7 @@ class OsichatVisitor(WebsocketConsumer):
 
 class OsitcomChatRoom(WebsocketConsumer):
     def connect(self):
-        self.domain = 'https://osina.ositcom.com'
+        self.domain = 'http://192.168.1.111:8000'
         self.session_id = self.scope['url_route']['kwargs']['session_id']
         self.visitor = Visitor.objects.filter(session_id=self.session_id).last()
         if not self.visitor:
@@ -684,9 +684,17 @@ class OsitcomChatRoom(WebsocketConsumer):
         }
         if self.client_type == 'mobile_admin':
             chat_message_data = model_to_dict(chat_message)
+            member = chat_message.member
+            member_data = {
+                'id': member.id,
+                'first_name': member.first_name,  
+                'last_name': member.last_name,
+                'image': member.staffprofile.image
+            }
             self.send(text_data=json.dumps({
                 'event_type': 'send_message',
                 'chat_message_data': chat_message_data,
+                'member_data': member_data
             },cls=DjangoJSONEncoder))
         elif self.client_type == 'website_admin':
             html = render_to_string("chat_templates/partials/message.html", context=context)

osinaweb/static/js/osichat-admin/osichat.js

@@ -1,6 +1,6 @@
 let admin_chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws";
 let protocol = window.location.protocol === "https:" ? "https" : "http";
-let admin_chat_domain = "osina.ositcom.com";
+let admin_chat_domain = "192.168.1.111:8000";
 let userId = document.getElementById('userId').textContent.trim();
 let osichatadminroomSocket = null;
 let currentChatId = null;

osinaweb/static/js/osichat/visitors.js

@@ -1,7 +1,7 @@
 const wsScheme = window.location.protocol === "https:" ? "wss" : "ws";
 const protocol = window.location.protocol === "https:" ? "https" : "http";
-const osinaDomain = "osina.ositcom.com";
-const ositcomDomain = "ositcom.com";
+const osinaDomain = "192.168.1.111:8000";
+const ositcomDomain = "192.168.1.111:3000";
 
 
 async function fetchClientData() {