new

osinaweb/osinacore/templates/customer_index.html

@@ -249,7 +249,7 @@
 
 <script>
     // WebSocket connection for new tickets
-    const newTicketsSocket = new WebSocket('wss://' + window.location.host + '/ws/new-tickets/');
+    const newTicketsSocket = new WebSocket('ws://' + window.location.host + '/ws/new-tickets/');
 
     newTicketsSocket.onopen = () => {
         console.log('WebSocket connection to new tickets established');
@@ -273,7 +273,7 @@
 
 
     // WebSocket connection for new ticket updates
-    const newTicketUpdatesSocket = new WebSocket('wss://' + window.location.host + '/ws/new-ticket-updates/');
+    const newTicketUpdatesSocket = new WebSocket('ws://' + window.location.host + '/ws/new-ticket-updates/');
 
     newTicketUpdatesSocket.onopen = () => {
         console.log('WebSocket connection to new ticket updates established');
@@ -281,7 +281,7 @@
 
     newTicketUpdatesSocket.onmessage = function(e) {
         const data = JSON.parse(e.data);
-        if (data.event_type === 'new_ticket_update_group') {
+        if (data.event_type === 'new_ticket_update') {
             const html = data.html;
             const ticketId = data.ticket_id;
             console.log(ticketId);

osinaweb/osinacore/templates/index.html

@@ -322,16 +322,17 @@
 
 
     // WebSocket connection for new ticket updates
-    const newTicketUpdatesSocketUrl = `${ws_scheme}://${window.location.host}/ws/new-tickets/`;
-    const newTicketUpdatesSocket = new WebSocket(newTicketsSocketUrl);
+    const newTicketUpdatesSocketUrl = `${ws_scheme}://${window.location.host}/ws/new-ticket-updates/`;
+    const newTicketUpdatesSocket = new WebSocket(newTicketUpdatesSocketUrl);
 
     newTicketUpdatesSocket.onopen = () => {
         console.log('WebSocket connection to new ticket updates established');
     };
 
     newTicketUpdatesSocket.onmessage = function(e) {
+        console.log('jiiii');
         const data = JSON.parse(e.data);
-        if (data.event_type === 'new_ticket_update_group') {
+        if (data.event_type === 'new_ticket_update') {
             const ticketsDiv = document.getElementById('tickets-div');
             if (ticketsDiv.classList.contains('hidden')) {
                 ticketsDiv.classList.remove('hidden');

osinaweb/osinacore/templates/main.html

@@ -1211,7 +1211,12 @@
     <!---------------------- JS SCRIPTS -------------------->
 
     
+    <!-- ONLINE CONSUMER SCRIPT -->
+    <script type="text/javascript" src='{% static "js/online/online-consumer.js" %}'></script>
 
+    <!-- NEW STATUS CONSUMER -->
+    <script type="text/javascript" src='{% static "js/status/new-status-consumer.js" %}'></script>
+    <script type="text/javascript" src='{% static "js/status/update-status-time-consumer.js" %}'></script>
 
     <!-- SIDE BAR SCRIPT -->
     <script type="text/javascript" src='{% static "js/side-bar.js" %}'></script>

osinaweb/osinaweb/settings.py

@@ -159,7 +159,7 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
 EMAIL_HOST = 'osinamail.ositcom.com'
 EMAIL_PORT = 587
-EMAIL_HOST_USER = 'osina@ositcom.com'
-DEFAULT_FROM_EMAIL = 'osina@ositcom.com'
+EMAIL_HOST_USER = 'osina@fositcom.com'
+DEFAULT_FROM_EMAIL = 'osina@jositcom.com'
 EMAIL_HOST_PASSWORD = 'EMILEselim!@67'
 EMAIL_USE_TLS = True

osinaweb/support/consumers.py

@@ -231,6 +231,8 @@ class NewTicketConsumer(WebsocketConsumer):
             }))
 
 
+
+
 class NewTicketUpdateConsumer(WebsocketConsumer):
     def connect(self):
         self.user = self.scope['user']
@@ -270,7 +272,7 @@ class NewTicketUpdateConsumer(WebsocketConsumer):
             else:
                 html = render_to_string("details_templates/partials/customer-ticket-display.html", context)
             self.send(text_data=json.dumps({
-                'event_type': 'new_ticket_update_group',
+                'event_type': 'new_ticket_update',
                 'html': html,
                 'ticket_id': ticket_id
             }))

osinaweb/support/models.py

@@ -137,9 +137,6 @@ class Ticket(models.Model):
         return all_staff
 
 
-
-
-
 @receiver(post_save, sender=Ticket)
 def send_signal_on_save(sender, instance, created, **kwargs):
     if created: