new

osinaweb/osichat/consumers.py

@@ -7,8 +7,7 @@ from django.shortcuts import  get_object_or_404
 import requests
 from django.forms.models import model_to_dict
 from django.core.serializers.json import DjangoJSONEncoder
-
-
+from django.db.models import Case, When, F, Max, DateTimeField
 class OsitcomVisitor(WebsocketConsumer):
     def connect(self):
         async_to_sync(self.channel_layer.group_add)(
@@ -72,10 +71,17 @@ class OsitcomChatRooms(WebsocketConsumer):
 
     
     def get_chats_handler(self):
-        chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent')).order_by('-last_update', '-date_created')
+        
+        chat_rooms = ChatRoom.objects.annotate(last_update=Max('chatmessage__date_sent'),
+            order_key=Case(
+                When(last_update__isnull=True, then=F('date_created')),
+                default=F('last_update'),
+                output_field=DateTimeField(),)).order_by('-order_key')
+                
         user = get_object_or_404(User, id=self.user_id)
         for room in chat_rooms:
             room.number_of_unread = room.unread_messages(user)
+            room.last_message = room.last_updated
         context = {
             'chat_rooms': chat_rooms,
         }
@@ -125,7 +131,7 @@ class OsitcomChatRooms(WebsocketConsumer):
 
 class OsitcomChatRoom(WebsocketConsumer):
     def connect(self):
-        self.domain = 'http://192.168.1.111:8000'
+        self.domain = 'http://192.168.1.109:8000'
         self.session_id = self.scope['url_route']['kwargs']['session_id']
         self.visitor = Visitor.objects.filter(session_id=self.session_id).last()
 

osinaweb/osinacore/templates/details_templates/project-details.html

@@ -330,7 +330,7 @@
                                             </svg>
                                         </button>
     
-                                        <a href="{% url 'ticketdetails' ticket.ticket_number %}">
+                                        <a href="{% url 'ticketroom' ticket.ticket_number %}">
                                             <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
                                                 stroke-width="1.5" stroke="currentColor"
                                                 class="w-[18px] text-fifthosiblue hover:scale-110 duration-500 transition-transform">

osinaweb/static/js/osichat-admin/rooms.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 = "192.168.1.111:8000";
+let admin_chat_domain = "192.168.1.109:8000";
 let userId = document.getElementById('userId').textContent.trim();
 let osichatroomsSocket;
 let osichatadminroomSocket;

osinaweb/static/js/osichat/conversation.js

@@ -1,6 +1,6 @@
 const chat_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws";
 const protocol = window.location.protocol === "https:" ? "https" : "http";
-const domain = "192.168.1.111:8000";
+const domain = "192.168.1.109:8000";
 let osichatSocket;
 let isOpen = false;
 let chatLoaded = false;
@@ -38,7 +38,7 @@ async function fetchSessionID() {
     let session_id = 'Unknown';
     while (session_id === 'Unknown') {
         try {
-            const response = await fetch('http://192.168.1.111:3000/get-client-session/');
+            const response = await fetch('http://192.168.1.109:3000/get-client-session/');
             const data = await response.json();
             if (data.session_id) {
                 session_id = data.session_id;

osinaweb/static/js/osichat/upload-file.js

@@ -1,5 +1,5 @@
 (function () {
-    const imageDomain = "http://192.168.1.111:8000";
+    const imageDomain = "http://192.168.1.109:8000";
 
     // TO TRIGGER TEH FILE UPLOADER WHEN CLICKING ON THE UPLOAD FILE SVG
     document.getElementById('svgFileUpload').addEventListener('click', function () {

osinaweb/static/js/osichat/visitors.js

@@ -1,11 +1,11 @@
 const visitors_ws_scheme = window.location.protocol === "https:" ? "wss" : "ws";
-const my_domain = "192.168.1.111:8000";
+const my_domain = "192.168.1.109:8000";
 
 async function fetchClientData() {
     let clientData = { client_ip: 'Unknown', client_country: 'Unknown' };
     while (clientData.client_ip === 'Unknown') {
         try {
-            const response = await fetch('http://192.168.1.111:8000/get-client-ip/');
+            const response = await fetch('http://192.168.1.109:8000/get-client-ip/');
             const data = await response.json();
             if (data.ip) {
                 clientData = {
@@ -25,7 +25,7 @@ async function fetchVisitorsSession() {
     let session_id = 'Unknown';
     while (session_id === 'Unknown') {
         try {
-            const response = await fetch('http://192.168.1.111:3000/get-client-session/');
+            const response = await fetch('http://192.168.1.109:3000/get-client-session/');
             const data = await response.json();
             if (data.session_id) {
                 session_id = data.session_id;