new

osinaweb/osinacore/templates/customer_index.html

@@ -149,43 +149,11 @@
                 </thead>
 
                 <!-- TABLE BODY -->
-                {% for ticket in customer_open_tickets %}
+                <tbody class="bg-white divide-y divide-gray-200" id="tickets">
-                <tbody class="bg-white divide-y divide-gray-200">
+                    {% for ticket in customer_open_tickets %}
-                    <tr data-href="{% url 'ticketroom' ticket.ticket_number %}"
+                        {% include 'details_templates/partials/customer-ticket-display.html' %}
-                        class="hover:bg-gray-100 duration-300 cursor-pointer">
+                    {% endfor %}
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <div class="w-full flex {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center {% endif %} items-center gap-3"> 
-                                <a href="{% url 'ticketroom' ticket.ticket_number %}">
-                                    <p class="text-secondosiblue">{{ticket.title }}</p>
-                                </a>
-
-                                {% if ticket.unread_updates_count > 0 %}
-                                <div>
-                                    <div class="w-[25px] h-[25px] rounded-full bg-green-700 text-white flex justify-center items-center text-sm">
-                                        <p>{{ticket.unread_updates_count}}</p>
-                                    </div>
-                                </div>
-                                {% endif %}
-                            </div>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">{{ticket.ticket_number}}</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">{{ticket.regarding}}</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm">
-                            {% if ticket.ticketupdate_set.all %}
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.date_added}} <br> by {{ticket.ticketupdate_set.last.added_by.first_name}}</p>
-                            {% endif %}
-
-                        </td>
-                    </tr>
                 </tbody>
-                {% endfor %}
             </table>
         </div>
     </div>
@@ -279,5 +247,62 @@
     });
 </script>
 
+<script>
+    // WebSocket connection for new tickets
+    const newTicketsSocket = new WebSocket('wss://' + window.location.host + '/ws/new-tickets/');
+
+    newTicketsSocket.onopen = () => {
+        console.log('WebSocket connection to new tickets established');
+    };
+
+    newTicketsSocket.onmessage = function(e) {
+        const data = JSON.parse(e.data);
+        if (data.event_type === 'new_ticket') {
+            const html = data.html;
+            document.getElementById('tickets').insertAdjacentHTML('afterbegin', html);
+        }
+    };
+
+    newTicketsSocket.onclose = () => {
+        console.log('WebSocket connection to new tickets closed');
+    };
+
+    newTicketsSocket.onerror = (error) => {
+        console.log('WebSocket error:', error);
+    };
+
+
+    // WebSocket connection for new ticket updates
+    const newTicketUpdatesSocket = new WebSocket('wss://' + window.location.host + '/ws/new-ticket-updates/');
+
+    newTicketUpdatesSocket.onopen = () => {
+        console.log('WebSocket connection to new ticket updates established');
+    };
+
+    newTicketUpdatesSocket.onmessage = function(e) {
+        const data = JSON.parse(e.data);
+        if (data.event_type === 'new_ticket_update_group') {
+            const html = data.html;
+            const ticketId = data.ticket_id;
+            console.log(ticketId);
+            
+            // Remove the existing ticket row if it exists
+            const existingTicketRows = document.querySelectorAll(`.ticket-${ticketId}`);
+            existingTicketRows.forEach(row => row.remove());
+
+            // Insert the updated ticket row at the top
+            document.getElementById('tickets').insertAdjacentHTML('afterbegin', html);
+        }
+    };
+
+    newTicketUpdatesSocket.onclose = () => {
+        console.log('WebSocket connection to new ticket updates closed');
+    };
+
+    newTicketUpdatesSocket.onerror = (error) => {
+        console.log('WebSocket error:', error);
+    };
+</script>
+
 <script type="module" src='{% static "js/projects/calculate-all-projects-time.js" %}'></script>
 {% endblock %}

osinaweb/osinacore/templates/index.html

@@ -42,7 +42,7 @@
 
                 <tbody class="bg-white divide-y divide-gray-200" id="tickets">
                     {% for ticket in open_tickets %}
-                        {% include 'details_templates/partials/ticket-display.html' %}
+                        {% include 'details_templates/partials/staff-ticket-display.html' %}
                     {% endfor %}
                 </tbody>
             </table>
@@ -292,7 +292,7 @@
 <script type="text/javascript" src='{% static "js/tickets/share-ticket.js" %}'></script>
 <script>
     // WebSocket connection for new tickets
-    const newTicketsSocket = new WebSocket('ws://' + window.location.host + '/ws/new-tickets/');
+    const newTicketsSocket = new WebSocket('wss://' + window.location.host + '/ws/new-tickets/');
 
     newTicketsSocket.onopen = () => {
         console.log('WebSocket connection to new tickets established');
@@ -316,7 +316,7 @@
 
 
     // WebSocket connection for new ticket updates
-    const newTicketUpdatesSocket = new WebSocket('ws://' + window.location.host + '/ws/new-ticket-updates/');
+    const newTicketUpdatesSocket = new WebSocket('wss://' + window.location.host + '/ws/new-ticket-updates/');
 
     newTicketUpdatesSocket.onopen = () => {
         console.log('WebSocket connection to new ticket updates established');

osinaweb/static/js/tickets/tickets-room.js

@@ -63,7 +63,7 @@ function app(socket) {
 
 function initializeWebSocket() {
     const ticketId = document.getElementById('ticketId').textContent.trim();
-    const wsUrl = `ws://${window.location.host}/ws/ticketroom/${ticketId}/`;
+    const wsUrl = `wss://${window.location.host}/ws/ticketroom/${ticketId}/`;
     const socket = new WebSocket(wsUrl);
 
     socket.onopen = () => {

osinaweb/support/consumers.py

@@ -251,14 +251,19 @@ class NewTicketUpdateConsumer(WebsocketConsumer):
             if not TicketRead.objects.filter(ticket_update=ticket_update, user=self.user, read=True).exists():
                 unread_updates_count += 1
             ticket.unread_updates_count = unread_updates_count
-        is_staff_or_superuser = (
+        is_ticketstaff_member = (
             hasattr(self.user, 'staffprofile') and 
             (self.user.staffprofile in ticket.get_all_ticket_staff() or self.user.is_superuser)
         )
-        if is_staff_or_superuser:
+        is_ticket_customer = (
+            hasattr(self.user, 'customerprofile') and 
+            (self.user.customerprofile == ticket.customer))
+        if is_ticketstaff_member or is_ticket_customer:
             context = {'ticket': ticket, 'new': True}
-            html = render_to_string("details_templates/partials/ticket-display.html", context)
+            if is_ticketstaff_member:
-
+                html = render_to_string("details_templates/partials/staff-ticket-display.html", context)
+            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',
                 'html': html,

osinaweb/support/templates/details_templates/partials/customer-ticket-display.html

@@ -0,0 +1,53 @@
+<tr class="ticket-{{ticket.id}} {% if new %}bg-gray-200 fade-in-up{% endif %} hover:bg-gray-100 duration-300 cursor-pointer"
+    data-href="{% url 'ticketroom' ticket.ticket_number %}">
+    <td class="px-6 py-4 text-sm border-r border-gray-300">
+        <div
+            class="w-full flex  {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center text-center {% endif %} items-center gap-3">
+            <p class="text-secondosiblue">{{ticket.title}}</p>
+
+            {% if ticket.unread_updates_count > 0 %}
+            <div>
+                <div
+                    class="w-[25px] h-[25px] rounded-full bg-green-700 text-white flex justify-center items-center text-sm">
+                    <p>{{ticket.unread_updates_count}}</p>
+                </div>
+            </div>
+            {% endif %}
+        </div>
+    </td>
+
+
+    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+        <p class="text-secondosiblue">{{ticket.ticket_number}}</p>
+    </td>
+
+    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+        <p class="text-secondosiblue">{{ticket.regarding}}</p>
+    </td>
+
+    <td class="px-6 py-4 text-center text-sm ">
+        {% if ticket.ticketupdate_set.all %}
+        <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.date_added}} <br> by
+            {{ticket.ticketupdate_set.all.last.added_by.first_name}}</p>
+        {% endif %}
+    </td>
+
+</tr>
+
+<style>
+    @keyframes fadeInAndUp {
+        from {
+            opacity: 0;
+            transform: translateY(12px);
+        }
+
+        to {
+            opacity: 1;
+            transform: translateY(0px);
+        }
+    }
+
+    .fade-in-up {
+        animation: fadeInAndUp 0.6s ease;
+    }
+</style>

osinaweb/support/templates/details_templates/partials/staff-ticket-display.html

@@ -1,6 +1,7 @@
-<tr  class="ticket-{{ticket.id}} {% if new %}bg-gray-200 fade-in-up{% endif %}">
+<tr class="ticket-{{ticket.id}} {% if new %}bg-gray-200 fade-in-up{% endif %}">
     <td class="px-6 py-4 text-sm border-r border-gray-300">
-        <div class="w-full flex  {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center text-center {% endif %} items-center gap-3">
+        <div
+            class="w-full flex  {% if ticket.unread_updates_count > 0 %} justify-between {% else %} justify-center text-center {% endif %} items-center gap-3">
             <p class="text-secondosiblue">{{ticket.title}}</p>
 
             {% if ticket.unread_updates_count > 0 %}
@@ -23,9 +24,10 @@
         <p class="text-secondosiblue">{{ticket.regarding}}</p>
     </td>
 
-    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+    <td class="px-6 py-4 text-center text-sm  border-r border-gray-300">
         {% if ticket.ticketupdate_set.all %}
-            <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.date_added}} <br> by {{ticket.ticketupdate_set.all.last.added_by.first_name}}</p>
+        <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.date_added}} <br> by
+            {{ticket.ticketupdate_set.all.last.added_by.first_name}}</p>
         {% endif %}
     </td>
 
@@ -36,34 +38,33 @@
             <button class="copyButton">
                 <input type="text" class="hidden copyInput"
                     value="https://osina.ositcom.com/my-tickets/{{ticket.ticket_number}}/">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                    stroke-width="1.5" stroke="currentColor"
+                    stroke="currentColor"
                     class="w-[16px] text-fifthosiblue hover:scale-110 duration-500 transition-transform">
                     <path stroke-linecap="round" stroke-linejoin="round"
                         d="M7.217 10.907a2.25 2.25 0 1 0 0 2.186m0-2.186c.18.324.283.696.283 1.093s-.103.77-.283 1.093m0-2.186 9.566-5.314m-9.566 7.5 9.566 5.314m0 0a2.25 2.25 0 1 0 3.935 2.186 2.25 2.25 0 0 0-3.935-2.186Zm0-12.814a2.25 2.25 0 1 0 3.933-2.185 2.25 2.25 0 0 0-3.933 2.185Z" />
                 </svg>
             </button>
             <a href="{% url 'ticketroom' ticket.ticket_number %}">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                    stroke-width="1.5" stroke="currentColor"
+                    stroke="currentColor"
                     class="w-[18px] text-fifthosiblue hover:scale-110 duration-500 transition-transform">
                     <path stroke-linecap="round" stroke-linejoin="round"
                         d="M2.036 12.322a1.012 1.012 0 0 1 0-.639C3.423 7.51 7.36 4.5 12 4.5c4.638 0 8.573 3.007 9.963 7.178.07.207.07.431 0 .639C20.577 16.49 16.64 19.5 12 19.5c-4.638 0-8.573-3.007-9.963-7.178Z" />
-                    <path stroke-linecap="round" stroke-linejoin="round"
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
-                        d="M15 12a3 3 0 1 1-6 0 3 3 0 0 1 6 0Z" />
                 </svg>
             </a>
             <a href="">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                    stroke-width="1.5" stroke="currentColor"
+                    stroke="currentColor"
                     class="w-[18px] text-fifthosiblue hover:scale-110 duration-500 transition-transform">
                     <path stroke-linecap="round" stroke-linejoin="round"
                         d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
                 </svg>
             </a>
             <div class="cursor-pointer deleteTicketButton" data-modal-url="">
-                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                    stroke-width="1.5" stroke="currentColor"
+                    stroke="currentColor"
                     class="w-[18px] text-red-500 hover:scale-110 duration-500 transition-transform">
                     <path stroke-linecap="round" stroke-linejoin="round"
                         d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
@@ -71,14 +72,23 @@
             </div>
         </div>
     </td>
+
 </tr>
 
 <style>
     @keyframes fadeInAndUp {
-        from { opacity: 0; transform: translateY(12px); }
+        from {
-        to { opacity: 1; transform: translateY(0px); }
+            opacity: 0;
+            transform: translateY(12px);
+        }
+
+        to {
+            opacity: 1;
+            transform: translateY(0px);
+        }
     }
+
     .fade-in-up {
         animation: fadeInAndUp 0.6s ease;
     }
-</style>
+</style>