From 0e7a153784d8ee4e56bdc784e13eb7e92ca58624 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 4 Jul 2024 13:38:06 +0300
Subject: [PATCH] new

---
 .../billing/__pycache__/tasks.cpython-310.pyc | Bin 878 -> 878 bytes
 osinaweb/celerybeat-schedule.db               | Bin 16384 -> 16384 bytes
 osinaweb/db.sqlite3                           | Bin 1417216 -> 1441792 bytes
 .../__pycache__/tasks.cpython-310.pyc         | Bin 1412 -> 1395 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 20455 -> 20489 bytes
 .../details_templates/staff-details.html      |  73 +++++----
 osinaweb/osinacore/templates/index.html       | 140 ++++++++----------
 osinaweb/osinacore/views.py                   |  25 ++--
 .../__pycache__/celery.cpython-310.pyc        | Bin 738 -> 738 bytes
 .../__pycache__/settings.cpython-310.pyc      | Bin 3110 -> 3110 bytes
 .../add-staffs-position-in-staffs-details.js  |  10 +-
 osinaweb/static/js/tickets/tickets-room.js    |   2 +-
 .../__pycache__/consumers.cpython-310.pyc     | Bin 4906 -> 7066 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 7824 -> 8216 bytes
 .../__pycache__/routing.cpython-310.pyc       | Bin 364 -> 477 bytes
 .../support/__pycache__/views.cpython-310.pyc | Bin 2526 -> 2536 bytes
 osinaweb/support/consumers.py                 |  86 ++++++++++-
 .../0009_ticketconnection_terminated_at.py    |  18 +++
 ...0010_remove_ticketconnection_terminated.py |  17 +++
 ...etconnection_terminated_at.cpython-310.pyc | Bin 0 -> 677 bytes
 ...icketconnection_terminated.cpython-310.pyc | Bin 0 -> 614 bytes
 osinaweb/support/models.py                    |  53 ++++---
 osinaweb/support/routing.py                   |   2 +
 .../add-ticket-member-modal.html              |   2 +-
 .../partials/ticket-display.html              |  84 +++++++++++
 .../details_templates/ticket-settings.html    |   2 +-
 osinaweb/support/views.py                     |   2 +-
 27 files changed, 366 insertions(+), 150 deletions(-)
 create mode 100644 osinaweb/support/migrations/0009_ticketconnection_terminated_at.py
 create mode 100644 osinaweb/support/migrations/0010_remove_ticketconnection_terminated.py
 create mode 100644 osinaweb/support/migrations/__pycache__/0009_ticketconnection_terminated_at.cpython-310.pyc
 create mode 100644 osinaweb/support/migrations/__pycache__/0010_remove_ticketconnection_terminated.cpython-310.pyc
 create mode 100644 osinaweb/support/templates/details_templates/partials/ticket-display.html

diff --git a/osinaweb/billing/__pycache__/tasks.cpython-310.pyc b/osinaweb/billing/__pycache__/tasks.cpython-310.pyc
index 4301de41f15b13366eabdcad8d13d6e326b194b7..352a520c290d435ad69a2ba93f089856e2982952 100644
GIT binary patch
delta 107
zcmaFI_KuAwpO=@50SIn{wWMw2S;)v3HF+JQJ&=6IC<`QcnB?W7xN{PVOX8C=5{uGP
uqj>UC%i~i@Q{z(-OHx-d6iH6@Vp_*2J^3e-ov1X>pdv|BLTa)Pvl0Nba2-Ve

delta 107
zcmaFI_KuAwpO=@50SJQD{Y~A-vyhST*5q}J_CWF-qb!i*VUm}>#hsH_ToRw0kyw<T
vdW$D7wLCthG&MdYu_SdRLy_EMFQ#>j3X^{_*@-Fu4JwjDCFCdjFe?E7gfAd6

diff --git a/osinaweb/celerybeat-schedule.db b/osinaweb/celerybeat-schedule.db
index 931ef97d7a8341841d7c31cf46d4527328e62b30..2de31d4d2811f750e517e9fde8b3ad4b516f77cf 100644
GIT binary patch
delta 48
zcmZo@U~Fh$+^|)SgPnz4nt_3zfAU_rK*pNM{PHS{#*<Ct9YGS3D(tD9n``Bp6#yaE
B3zGl<

delta 48
zcmZo@U~Fh$+^|)SgIP?#l7T_fdh%YmK*p-c{PHS{hLcU?9YGQjmQ4Lxn``Bp6#y~u
B3;O^7

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index db980d8fc2b2e32cfb9457ee6fcd2e49ee1d5f8a..a57fe75a95c6771611da3b1d82cf2bb6d155d935 100644
GIT binary patch
delta 27381
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
Bd>#M*

delta 10251
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
CKg#U@

diff --git a/osinaweb/osinacore/__pycache__/tasks.cpython-310.pyc b/osinaweb/osinacore/__pycache__/tasks.cpython-310.pyc
index 57d70807142bdba64d37f7dcb97c21229259b378..94084c008735d8d18e3fddcf627058e41c912da8 100644
GIT binary patch
delta 467
zcmYk3ze^lJ6vyA2nVtQ0>)z$gcv#yUiXbUNERuko7U=>Oa<k%%zt?HRSuT*EHdllx
zC9sRVSXfy2m)xI_Hl+%Adv}Bke3|c?H}m29m>=<<C^=4&2xzTtUG6^oOzwtt<&!><
z&Q=h>fWq&HU{JG?S5Sb3&#--6pb?sB&!S=@EG2cAWx2CV`?)hg87f|3!A(@gwsyjb
zy4MBMP(pbl+!u5&nK9&)F)TcKFlRlT-hlFHZ{EN!u7Zjc((<xpC7~ptWETqG`v1c$
z>NiDT+7o1;LPB;_RAD(!;X)fyxKO`U@jfRf$fuJqjelX<dV}c&71x<7uz^ZOoF=a`
zE~vTbX_;0qb6u5INb@&G0^u}P@CACU&98iKFmTWK5yx(wT}baF9~>F?$nM*+pJzKJ
z8wY15-!+57tQWZ}e(T<gp$J%n?nx}Ibx<Ok>Q#CSBW%?53;QO1=gaghy>Kl1*+G_{
R=Zwm+YkTi-(QSAi{sMFUcZUD~

delta 483
zcmYk3u}>Q@6vp4PeZD(iE=dD~bYkfe!4|0-3v}+nhJ+BR4}?jHdNBjSCo)v((hSsN
zROwEgX$SrW{t5mA#K?v~>Pv_sEPc}V`91yg$$nJdlXQ@#3h1ogykrko>EFwQLP**s
z4L1<Lg29qiP=JF^u=le-%MBXgP~#ZOfF{hb+&gAu?rm5`npIeE8<)y)a>9w}tOGXD
zT#GTD2->U78Nr+p(0=NIOH-eKmM$=j3H;_dtXLr(FPlyhN)n1dMd-q}Fo)({5!u!Z
z8R>|SOFFKwT&8ldi>X{}R<t_d<Ra59lvCt{Q?pXZqEyRlp;^^x+Pwl7>Drhh%(|}X
z^!2u^S1@-SU9XVdp)nQ+-$D&L&~1MH#kTOtZ?g-3%l@sY{=v}h_XkJEr+4y8o*mfi
zE*jeW&>nxyx{3e6|1@_SXTvPtUu^oW7%|2CwfNAJ*hY!$RWCANsIWH8&uk>_^L6^B
XZcOB?pXKK{qqyr?(8KrsW3c%jt*3vd

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index b0ef60317f26fa409492f17258a8fe87d9214e1b..a0b99cad96b01db89f7d8949ab7f62189e70f837 100644
GIT binary patch
delta 2900
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

delta 2841
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
GqW=Oz_q&Jy

diff --git a/osinaweb/osinacore/templates/details_templates/staff-details.html b/osinaweb/osinacore/templates/details_templates/staff-details.html
index 231d5fb6..aa21adf1 100644
--- a/osinaweb/osinacore/templates/details_templates/staff-details.html
+++ b/osinaweb/osinacore/templates/details_templates/staff-details.html
@@ -67,33 +67,42 @@
                 </div>
             </div>
 
-            <form>
-                <div class="w-full flex flex-col gap-3 mt-3" id="positionsContainer">
-                    {% for position in positions %}
-                    <div
-                        class="w-full p-3 bg-gray-50 border border-gray-100 rounded-md flex justify-between items-center gap-3">
-                        <div class="flex flex-col">
-                            <p class="text-gray-500">Position: <span class="text-secondosiblue">Junior Software
-                                    Engineer</span></p>
-                            <p class="text-gray-500">Start Date: <span class="text-secondosiblue">20-1-2020</span></p>
-                            <p class="text-gray-500">End Date: <span class="text-secondosiblue">20-1-2020</span></p>
-                        </div>
+            <div class="w-full flex flex-col gap-3 mt-3">
+                {% for position in positions %}
+                <div
+                    class="w-full p-3 bg-gray-50 border border-gray-100 rounded-md flex justify-between items-center gap-3">
+                    <div class="flex flex-col">
+                        <p class="text-gray-500">Position: <span class="text-secondosiblue">{{position.position}}</span>
+                        </p>
+                        <p class="text-gray-500">Start Date: <span
+                                class="text-secondosiblue">{{position.start_date}}</span></p>
+                                 {% if not position.end_date %} - Present {% endif %}
+                        {% if position.end_date %}
+                        <p class="text-gray-500">End Date: <span class="text-secondosiblue">{{position.end_date}}</span>
+                        </p>
+                        {% endif %}
+                    </div>
 
-                        <div class="w-[30px] h-[30px] rounded-full bg-secondosiblue border border-secondosiblue flex justify-center items-center gap-1 text-white cursor-pointer hover:bg-transparent hover:text-secondosiblue duration-300 delete"
-                            data-modal-url="{% url 'deletestaffpositionmodal' %}">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                                stroke="currentColor" class="w-5">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
-                            </svg>
-                        </div>
+                    <div class="w-[30px] h-[30px] rounded-full bg-secondosiblue border border-secondosiblue flex justify-center items-center gap-1 text-white cursor-pointer hover:bg-transparent hover:text-secondosiblue duration-300 delete"
+                        data-modal-url="{% url 'deletestaffpositionmodal' %}">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-5">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                        </svg>
                     </div>
-                    {% endfor %}
+                </div>
+                {% endfor %}
+            </div>
+
+            <form method="POST">
+                {% csrf_token %}
+                <div class="w-full flex flex-col gap-3 mt-3" id="positionsContainer">
                     <div class="w-full bg-gray-50 border border-gray-100 rounded-md flex items-center gap-3 p-3 initialPositionContainer"
                         style="display: none;">
                         <div class="w-full grid grid-cols-1 md:grid-cols-3 gap-3">
                             <div>
                                 <label class="text-gray-500">Position:</label>
-                                <select
+                                <select 
                                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
                                     <option disabled selected>Select Position</option>
                                     {% for position in jobpositions %}
@@ -104,13 +113,13 @@
 
                             <div>
                                 <label class="text-gray-500">Start Date:</label>
-                                <input type="date"
+                                <input type="date" 
                                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
                             </div>
 
                             <div>
                                 <label class="text-gray-500">End Date:</label>
-                                <input type="date"
+                                <input type="date" 
                                     class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
                             </div>
                         </div>
@@ -125,21 +134,21 @@
                     </div>
                 </div>
 
+                <div class="w-full bg-gray-50 shadow-md rounded-md p-3 flex justify-start items-center gap-1 cursor-pointer mt-3"
+                    id="addNewPosition">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-7 text-secondosiblue">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M12 9v6m3-3H9m12 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
+                    </svg>
+                    <p class="text-secondosiblue hover:underline duration-300">Add New Position</p>
+                </div>
+
                 <div class="w-full flex justify-center items-center mt-3 hidden" id="submitButton">
                     <button type="submit"
                         class="w-fit py-1 px-5 bg-osiblue rounded-md outline-none text-white border border-osiblue text-xl cursor-pointer hover:bg-white hover:text-osiblue duration-300">Save</button>
                 </div>
             </form>
-
-            <div class="w-full bg-gray-50 shadow-md rounded-md p-3 flex justify-start items-center gap-1 cursor-pointer mt-3"
-            id="addNewPosition">
-            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
-                stroke="currentColor" class="w-7 text-secondosiblue">
-                <path stroke-linecap="round" stroke-linejoin="round"
-                    d="M12 9v6m3-3H9m12 0a9 9 0 1 1-18 0 9 9 0 0 1 18 0Z" />
-            </svg>
-            <p class="text-secondosiblue hover:underline duration-300">Add New Position</p>
-        </div>
         </div>
     </div>
 </div>
diff --git a/osinaweb/osinacore/templates/index.html b/osinaweb/osinacore/templates/index.html
index 8a91a420..77c8910b 100644
--- a/osinaweb/osinacore/templates/index.html
+++ b/osinaweb/osinacore/templates/index.html
@@ -3,7 +3,7 @@
 {% block content %}
 
 <!-- LEFT SIDE -->
-<div class="w-full xxlg1:w-[75%] flex flex-col gap-5">
+<div class="w-full xxlg1:w-[75%] flex flex-col justify-center items-center gap-5">
 
     <!-- RESPONSE MESSGAE FOR SHARING A TICKET -->
     <div id="successMessage"
@@ -40,82 +40,9 @@
                     </tr>
                 </thead>
 
-                <tbody class="bg-white divide-y divide-gray-200">
+                <tbody class="bg-white divide-y divide-gray-200" id="tickets">
                     {% for ticket in open_tickets %}
-                        <tr>
-                            <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 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>
-                                {% endif %}
-                            </td>
-
-
-                            <td class="px-6 py-4 text-center text-sm">
-                                <div class="flex justify-center items-center gap-3">
-
-                                    <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"
-                                            stroke-width="1.5" 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"
-                                            stroke-width="1.5" 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"
-                                                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"
-                                            stroke-width="1.5" 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"
-                                            stroke-width="1.5" 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" />
-                                        </svg>
-                                    </div>
-                                </div>
-                            </td>
-                        </tr>
+                        {% include 'details_templates/partials/ticket-display.html' %}
                     {% endfor %}
                 </tbody>
             </table>
@@ -125,7 +52,7 @@
 
     {% if tasks %}
     <!-- TASKS ON DESKTOP -->
-    <div class="hidden md:flex flex-col gap-5">
+    <div class="w-full hidden md:flex flex-col gap-5">
         <!-- TASKS TABLE -->
         {% for task in tasks %}
         <div class="w-full h-fit bg-white p-3 rounded-md shadow-md">
@@ -243,7 +170,7 @@
     </div>
 
     <!-- TASKS ON MOBILE -->
-    <div class="flex flex-col gap-5 md:hidden">
+    <div class="w-full flex flex-col gap-5 md:hidden">
         {% for task in tasks %}
         <div class="w-full h-fit bg-white p-3 rounded-md shadow-md">
             <div class="border border-gray-200 rounded-t-md">
@@ -363,6 +290,63 @@
 <!---------------------- JS SCRIPTS -------------------->
 <script type="text/javascript" src='{% static "js/projects/calculate-all-pinned-projects-time.js" %}'></script>
 <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/');
+
+    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('ws://' + 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>
+
     
 
 {% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 8afab2ad..745966f5 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -511,21 +511,22 @@ def staffdetails( request, staff_id):
     positions = StaffPosition.objects.filter(staff=staff).order_by('-id')
     if request.method == 'POST':
         position_ids = request.POST.getlist('position[]')
+        print(position_ids)
         start_dates = request.POST.getlist('start_date[]')
         end_dates = request.POST.getlist('end_date[]')
         for position_id, start_date, end_date in zip(position_ids, start_dates, end_dates):
-                position = get_object_or_404(JobPosition, id=position_id)
-                if end_date:
-                    end_date = end_date
-                else:
-                    end_date = None
-                StaffPosition.objects.create(
-                    staff = staff,
-                    position = position,
-                    start_date = start_date,
-                    end_date = end_date
-                )
-        return HttpResponse('<script>window.top.location.reload();</script>')
+            position = get_object_or_404(JobPosition, id=position_id)
+            if end_date:
+                end_date = end_date
+            else:
+                end_date = None
+            StaffPosition.objects.create(
+                staff = staff,
+                position = position,
+                start_date = start_date,
+                end_date = end_date
+            )
+        return redirect('userdetails', staff_id=staff.staff_id)
 
 
     context = {
diff --git a/osinaweb/osinaweb/__pycache__/celery.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/celery.cpython-310.pyc
index f2a473e5d195eb82204673bde29c03e8fcb6eae8..004ac71053cc07c2b8c6b41690d8cb36c14e36b6 100644
GIT binary patch
delta 21
bcmaFF`iPY$pO=@50SIn{wWMw2xyA$lK%fR2

delta 21
bcmaFF`iPY$pO=@50SKx${Y~A-bBzfALk$L!

diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-310.pyc
index a086f78f9c7fb205502afb2255263600cb24ac67..9f7aba03dc4bf9cb1285c784704fd4cb9f0c3b77 100644
GIT binary patch
delta 20
acmZ1`u}p$HpO=@50SF!?wr%8=<^cdRSp>%b

delta 20
acmZ1`u}p$HpO=@50SIn{wQS^;<^cdQ#{{qd

diff --git a/osinaweb/static/js/add-staffs-position-in-staffs-details.js b/osinaweb/static/js/add-staffs-position-in-staffs-details.js
index ad09a96e..91d89fcf 100644
--- a/osinaweb/static/js/add-staffs-position-in-staffs-details.js
+++ b/osinaweb/static/js/add-staffs-position-in-staffs-details.js
@@ -30,7 +30,13 @@ document.addEventListener('DOMContentLoaded', function () {
         selectElement.name = 'position[]';
 
         const dateInputElements = newPositionContainer.querySelectorAll('input[type="date"]');
-        dateInputElements.forEach(input => input.name = input.name.replace('date[]', '') + '[]');
+        dateInputElements.forEach((input, index) => {
+            if (index === 0) {
+                input.name = 'start_date[]';
+            } else {
+                input.name = 'end_date[]';
+            }
+        });
 
         const removeButton = newPositionContainer.querySelector('.removePositionOption');
         removeButton.addEventListener('click', removePositionContainer);
@@ -44,4 +50,4 @@ document.addEventListener('DOMContentLoaded', function () {
     });
 
     updateSubmitButtonVisibility();
-});
\ No newline at end of file
+});
diff --git a/osinaweb/static/js/tickets/tickets-room.js b/osinaweb/static/js/tickets/tickets-room.js
index 8736bd93..0a794b5e 100644
--- a/osinaweb/static/js/tickets/tickets-room.js
+++ b/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 = `wss://${window.location.host}/ws/ticketroom/${ticketId}/`;
+    const wsUrl = `ws://${window.location.host}/ws/ticketroom/${ticketId}/`;
     const socket = new WebSocket(wsUrl);
 
     socket.onopen = () => {
diff --git a/osinaweb/support/__pycache__/consumers.cpython-310.pyc b/osinaweb/support/__pycache__/consumers.cpython-310.pyc
index 33702a34a1a90ac9f17e413e574bbd101302aefc..162211a152eef202b51637d0c1430c8b0eef8c0e 100644
GIT binary patch
delta 2969
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

delta 910
zcmZ9L&ubGw6vuax-R<Vb=9ke(QUpV2yO>t3jS-s$s~Ci8+M0+YA`-hRwl=BGZUiy6
z77vPt@;vFK;z1+yAh{IJqQ#5%oOARa5Q_NTq>}0m`_0=o^FA~0yPMb9k0XIKUH3|O
zW%f4i9ZqZphS{sl6QG((Niw{jdLh?v!Ekp~XL;#?<!}$K?0OxG*OwbL$1*z!_by{$
z=*g=r4~t6dlIb$tFBy{@wI!_#t!V2Ee?546*Ii6%Nn5_R5|c~`@p92{@gNcfwrnsS
z!Uw|-J4zCI$|y6yuZ~B?F=<CpR3_8-EqCVBZN?_y*HFnfN%dz*GH_E%vvaVa<<x!_
zzH09xCvmQ;SdXoS!!u$rJoThl4z@fKEDJw8KXp;A;~btR4ZGeechmULc5zWF-*@V(
zZN@Lt0*zlJ#!-?BB;*KJQM$5iHB6qTP%)eJhqj^eQJO7~h&>3)uaV3{EpkYi!LSa`
zecy9eDS3*dNV0&^mIaqDQi8DjdOtgW9zdPOxfXozH^=DE{0s?E4EKKk?6D6JCz!$|
z&pNmD0IT#(q`G}8rZMhnOHJEZt6LmFl<0eS10zg`tp;^sKfQ0s0h{1UAa!0?A16S9
z<lm;y)<IJPp71se$>5Zd#iAE*E4af75Dkst%by8N$7Tt21O?9`098s9L}w!yZo~V~
z8(k!cg{@a%KAcaI+f`rFw)h>}sX0x1;5si6qAU;<40qsL_)%(tl5-^V$~c+L$vRHw
w;<Od7z(OLXat-4UJc%54;fMS=K8t^gy?7DIiR3Zr-Y@x?hQq%<{>D-H4>eG+H~;_u

diff --git a/osinaweb/support/__pycache__/models.cpython-310.pyc b/osinaweb/support/__pycache__/models.cpython-310.pyc
index 201c35704b88e0b0c68f739e4e019cfb7ea7f1a5..59a96abbddf7d06b780d88fae61b6a0bb13cc772 100644
GIT binary patch
literal 8216
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
CrF!uI

delta 3789
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
N+JL5INLe2+{tIfICMN&@

diff --git a/osinaweb/support/__pycache__/routing.cpython-310.pyc b/osinaweb/support/__pycache__/routing.cpython-310.pyc
index 30f4ad732dc859ab7cf8c8c520e1fdd65aeb2545..d4f3d3c8bbedf79e0a8d6ae11d021afeac3e4419 100644
GIT binary patch
delta 202
zcmaFEbeCB>pO=@50SFRP+tL&m85kaeILLqv$Z-JTVuy*^%1Wt>DXgii3s@F1G&2F&
zY^iJzb~<wudkT9ngC@ts2y>k({_<k|ywq~tlFa1n)RJQTDlrrR-O_@T#FErveLtZ3
zNme>hf_|yxAz-!6`FX{qxv51_;&7o*uwt0R#4}R_c!2KVVc=loVdi1vVdVG=0KR86
A%K!iX

delta 89
zcmcc1{Dw(8pO=@50SIn}wWQ4l(vLwLWWWOCH~?|6#zbvpu5`vI))dxY22Hk!1?J3t
YK<cv9WJ|^=JRCqJJPaI+Jj@*b0m>Q=m;e9(

diff --git a/osinaweb/support/__pycache__/views.cpython-310.pyc b/osinaweb/support/__pycache__/views.cpython-310.pyc
index 4325d55a0c0957fbeed32fc88aa848ab80b0b26d..742b1c4cbc524eff4a85829e25be1a9322e80f5a 100644
GIT binary patch
delta 355
zcmca7{6d&FpO=@50SMad+tNO6<Xz3E&7H#A%ea6yg>NBaEqe`f4O0zE4O<O+3jZ9|
zT8<LY8io{s8jfb>U<OUW$&VQiN@_AjiI$`m<!0t3mZYY{Cziy=XBOv`=HzVN%oNF}
zAq+IUNCZgSVk<330V*jH1&N4(MA(z_^GZ@HN>(xyX-zg^S;nZd`8LZHMm7VG3d6};
z+5EV*Kuj>9J(-W)htXkjG<!Fr(B$Xrm5kz(6FJ0GWkD+BK!iMyxWyfknVg+k5?qp)
zmUfG+IKK$!s3M2Sb2yas)Io|kKm-qnZ~_s|Ai@PiXo3i2>)vvhFnUf_;*2-d0ZBOk
iiCZGYAamn$^3yZ(;)_xXOEZgr#(Sb_g*tZ|rv?CM&|2aE

delta 321
zcmaDMd{3A+pO=@50SHcnwx&Jb$h(?Rn>U58mvI4a3jadJTJ{>|8m1bS8nznt6oEOc
zwHzg)H4G_&H5|>%!3>&0lOHo4<ag6#yv0?LT9liamspaTvUx94B%_81(8wZDAaRSW
zv>*j2UL*z*5eJE|C+Fvtq*j!yWGK>}Y{#;UQFrrGmMe^Gh9DJ2llQavachH^U_xiI
z1iKHT<K$HKZbsqBAK5FFBtT{egk&aXr<S;+79<vx<fi786v=_K$b$%l$vqsBKrPES
zl=U<~0vsTM2Shl72p16H3L>;X1hQS<IZPP6ChKs<v+07Q94AlYloItqRRwj{0Zt77
D`k_uu

diff --git a/osinaweb/support/consumers.py b/osinaweb/support/consumers.py
index 7a987ab9..d549ca91 100644
--- a/osinaweb/support/consumers.py
+++ b/osinaweb/support/consumers.py
@@ -12,7 +12,6 @@ from django.template.loader import render_to_string
 from asgiref.sync import async_to_sync
 
 
-
 class TicketRoomConsumer(WebsocketConsumer):
     def connect(self): 
         self.user = self.scope['user']
@@ -20,7 +19,7 @@ class TicketRoomConsumer(WebsocketConsumer):
         self.ticket = get_object_or_404(Ticket, id=self.ticket_id)
         self.ticket_number = self.ticket.ticket_number
 
-        existing_connection = TicketConnection.objects.filter(ticket=self.ticket, user=self.user, terminated=False).delete()
+        existing_connection = TicketConnection.objects.filter(ticket=self.ticket, user=self.user, terminated_at__isnull=True).delete()
         TicketConnection.objects.create(
             ticket=self.ticket,
             user=self.user,
@@ -46,7 +45,7 @@ class TicketRoomConsumer(WebsocketConsumer):
         TicketConnection.objects.filter(
             ticket=self.ticket,
             user=self.user,
-        ).update(terminated=True)
+        ).update(terminated_at=datetime.now())
         async_to_sync(self.channel_layer.group_discard)(
            self.ticket_number, self.channel_name 
         )
@@ -171,7 +170,7 @@ class TicketRoomConsumer(WebsocketConsumer):
         }))
 
     def modify_online_user(self):
-        connections = TicketConnection.objects.filter(ticket=self.ticket, terminated=False)
+        connections = TicketConnection.objects.filter(ticket=self.ticket, terminated_at__isnull=True)
         event = {
             'type': 'user_connection_handler',
             'user': self.user,
@@ -190,4 +189,81 @@ class TicketRoomConsumer(WebsocketConsumer):
         self.send(text_data=json.dumps({
             'event_type': 'user_status',
             'html': html
-        }))
\ No newline at end of file
+        }))
+
+
+
+class NewTicketConsumer(WebsocketConsumer):
+    def connect(self):
+        self.user = self.scope['user']
+        async_to_sync(self.channel_layer.group_add)(
+            "new_ticket_group",
+            self.channel_name
+        )
+        self.accept()
+
+    def disconnect(self, close_code):
+        async_to_sync(self.channel_layer.group_discard)(
+            "new_ticket_group",
+            self.channel_name
+        )
+
+    def new_ticket_event(self, event):
+        ticket_id = event['ticket_id']
+        ticket = Ticket.objects.get(id=ticket_id)
+        is_staff_or_superuser = (
+            hasattr(self.user, 'staffprofile') and 
+            (self.user.staffprofile in ticket.get_all_ticket_staff() or self.user.is_superuser)
+        )
+        if is_staff_or_superuser:
+            context = {'ticket': ticket, 'new': True}
+            html = render_to_string("details_templates/partials/ticket-display.html", context)
+
+            self.send(text_data=json.dumps({
+                'event_type': 'new_ticket',
+                'html': html
+            }))
+
+
+
+class NewTicketUpdateConsumer(WebsocketConsumer):
+    def connect(self):
+        self.user = self.scope['user']
+        async_to_sync(self.channel_layer.group_add)(
+            "new_ticket_update_group",
+            self.channel_name
+        )
+        self.accept()
+
+    def disconnect(self, close_code):
+        async_to_sync(self.channel_layer.group_discard)(
+            "new_ticket_update_group",
+            self.channel_name
+        )
+
+    def new_ticket_update_event(self, event):
+        ticket_update_id = event['ticket_update_id']
+        ticket_update = TicketUpdate.objects.get(id=ticket_update_id)
+        ticket = ticket_update.ticket
+        ticket_id = ticket.id
+        unread_updates_count = 0
+        for ticket_update in ticket.ticketupdate_set.exclude(added_by=self.user): 
+            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 = (
+            hasattr(self.user, 'staffprofile') and 
+            (self.user.staffprofile in ticket.get_all_ticket_staff() or self.user.is_superuser)
+        )
+        if is_staff_or_superuser:
+            context = {'ticket': ticket, 'new': True}
+            html = render_to_string("details_templates/partials/ticket-display.html", context)
+
+            self.send(text_data=json.dumps({
+                'event_type': 'new_ticket_update_group',
+                'html': html,
+                'ticket_id': ticket_id
+            }))
+
+
+
diff --git a/osinaweb/support/migrations/0009_ticketconnection_terminated_at.py b/osinaweb/support/migrations/0009_ticketconnection_terminated_at.py
new file mode 100644
index 00000000..a6f1a4be
--- /dev/null
+++ b/osinaweb/support/migrations/0009_ticketconnection_terminated_at.py
@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2024-07-04 06:17
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('support', '0008_alter_tickettask_ticket'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='ticketconnection',
+            name='terminated_at',
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/osinaweb/support/migrations/0010_remove_ticketconnection_terminated.py b/osinaweb/support/migrations/0010_remove_ticketconnection_terminated.py
new file mode 100644
index 00000000..94b7609b
--- /dev/null
+++ b/osinaweb/support/migrations/0010_remove_ticketconnection_terminated.py
@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2024-07-04 06:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('support', '0009_ticketconnection_terminated_at'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='ticketconnection',
+            name='terminated',
+        ),
+    ]
diff --git a/osinaweb/support/migrations/__pycache__/0009_ticketconnection_terminated_at.cpython-310.pyc b/osinaweb/support/migrations/__pycache__/0009_ticketconnection_terminated_at.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..459a3cae1be72649898f19b74caf45117d8e0317
GIT binary patch
literal 677
zcmY*XJ#X7E5aowt%SH?YZPBSirvh3mk1bFHDG;<vlMYE2Ed(uI4B8Z>iZqPODcUK2
zqFetG*G&Bj1&Z`2xo~;{5BKg4_jpfiX0s_l+ns#7{y_=3kKnN-2u|_1SLhT`)R3B%
zv}Prv<O5Mm@vlU2plg21ORkbjlBd70m*gx=YrX2E*Nt^yR5uEYt77S~jS-yUadUJ)
zN~%c76kXAhL$XdI0gTpTmEf1&F*Um5Sj*HHiLx*`|HpuIW4CSFrt{^C#bWVVNaLXs
zURN9NUb@XbERTm&)mRHvyj+-JW38?9poH{SI4WHlX*VIUTVryLi^R(dD{H`9^y#$*
zqb~AE$V8tPB20zAzO4a_kA(QLl_vH^q@V?>z*ZVu$8gh-y;JIaoYC<JXJ^QMrEBPO
zVcN8?SMDe2o?=Juet$1MJLp^iwKf38=o=``z-@ff7MIfK`sGL2M)1jLUo~~nINYnS
zu<HZ0mUh()$sH_<y<o-RKNTq5o4ry8g~WdX&D)zUzKana_XJ%=7*8IOlu<^HX!0j}
p=<64G5+(!XTrK;x`(^v$VW}Z{hI2ypb`bCcpCWOQ<Cs0?e*s1%zs>*v

literal 0
HcmV?d00001

diff --git a/osinaweb/support/migrations/__pycache__/0010_remove_ticketconnection_terminated.cpython-310.pyc b/osinaweb/support/migrations/__pycache__/0010_remove_ticketconnection_terminated.cpython-310.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..c98c7f69992c660df115d5d7661ad90fbea7fc74
GIT binary patch
literal 614
zcmaJ<yG|T26tz9G%Q68$MU9eb8ayc@MTi2ChKCfCW*TdDd|7$%V;IkZwg#m^d<ehf
zmWp4X2wcw+El_YJU)`6FeU9zc*E524v-|gKObL02$y-Y?*~8_(qLV~YO$;q5CBKMd
zGPxl#0Xk*ZNy%h-O7g)Y&XJsk%&19Qb;?;^$I@GS2MVO5lHhhap=AQ;bP$1MddDyy
z$^n87!|Kt0w48+%KWiG-cICICD1L}e)#uRF&RVGBd7^{XC|h+PMb(APkNuD>2M{eY
zPJ$M;G7!?}kMor<5`964kO_eUGYuH832`y2bR3GAga)hxTPyG_LxSPUZ!qo>4isn^
zGS|SX0{5idz<%$ZZuuV%t><8r2GCl~f$xJq?_9%AE3M4-Vb#Rs#4Ds_xbw({Te#{2
zIj!u(Es9q#=C5M#rQW<Kz89kHukx8XJI%aJ@LEG$eiPk@uq1s>2aGbB{u@2_-Qzq7
htBXT-<hbYA*O!bIQ3MF1p9`^e@h=e{-+7H~B`<|Ft|b5f

literal 0
HcmV?d00001

diff --git a/osinaweb/support/models.py b/osinaweb/support/models.py
index 239f5b77..d18a7aac 100644
--- a/osinaweb/support/models.py
+++ b/osinaweb/support/models.py
@@ -9,13 +9,13 @@ from django.conf import settings
 from django.db.models.signals import post_save
 from django.dispatch import receiver
 from threading import Timer
-from datetime import time
+from asgiref.sync import async_to_sync
+from channels.layers import get_channel_layer
 
 def send_ticket(ticket_id):
     ticket = get_object_or_404(Ticket, id=ticket_id)
-    department = TicketDepartment.objects.filter(ticket=ticket).last().department
-    staff_profiles = department.get_staff()
-    for staff in staff_profiles:
+    ticket_staffs = ticket.get_all_ticket_staff()
+    for staff in ticket_staffs:
         subject = f"New Ticket Opened: {ticket.title}"
         html_message = render_to_string('email_templates/new-ticket.html', {
             'ticket': ticket,
@@ -42,14 +42,9 @@ def send_ticket(ticket_id):
 
 def send_update(update_id):
     update = get_object_or_404(TicketUpdate, id=update_id)
-    if  TicketDepartment.objects.filter(ticket=update.ticket):
-        department = TicketDepartment.objects.filter(ticket=update.ticket).last().department
-    else:
-        department = Department.objects.get(name='Support')
-    if  department:
-        staff_profiles = department.get_staff()
-        print(staff_profiles)
-        for staff in staff_profiles:
+    staff_profiles = update.ticket.get_all_ticket_staff()
+    print(staff_profiles)
+    for staff in staff_profiles:
             subject = f"New Ticket Update: {update.ticket.title}"
             html_message = render_to_string('email_templates/new-ticket-update.html', {
                 'update': update,
@@ -113,10 +108,10 @@ class Ticket(models.Model):
 
         last_connection = connections.first()
         
-        if not last_connection.terminated:
+        if not last_connection.terminated_at:
             return "Online"
         
-        last_seen_time = last_connection.date
+        last_seen_time = last_connection.terminated_at
         now = timezone.now()
         time_diff = now - last_seen_time
 
@@ -155,6 +150,18 @@ def send_signal_on_save(sender, instance, created, **kwargs):
 
 
 
+@receiver(post_save, sender=Ticket)
+def new_ticket_handler(sender, instance, created, **kwargs):
+    if created:
+        channel_layer = get_channel_layer()
+        event = {
+            'type': 'new_ticket_event',
+            'ticket_id': instance.id,
+        }
+        async_to_sync(channel_layer.group_send)("new_ticket_group", event)
+
+
+
 class TicketDepartment(models.Model):
     department = models.ForeignKey(Department, on_delete=models.CASCADE)
     ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE)
@@ -172,10 +179,10 @@ class TicketStaff(models.Model):
 
         last_connection = connections.first()
         
-        if not last_connection.terminated:
+        if not last_connection.terminated_at:
             return "Online"
         
-        last_seen_time = last_connection.date
+        last_seen_time = last_connection.terminated_at
         now = timezone.now()
         time_diff = now - last_seen_time
 
@@ -211,7 +218,7 @@ class TicketConnection(models.Model):
     ticket = models.ForeignKey(Ticket, on_delete=models.CASCADE)
     user = models.ForeignKey(User, on_delete=models.CASCADE)
     date = models.DateTimeField()
-    terminated = models.BooleanField(default=False)
+    terminated_at = models.DateTimeField(null=True, blank=True) 
 
 
 
@@ -230,6 +237,18 @@ def send_signal_on_save(sender, instance, created, **kwargs):
         timer.start()
 
 
+@receiver(post_save, sender=TicketUpdate)
+def new_ticket_update_handler(sender, instance, created, **kwargs):
+    if created:
+        channel_layer = get_channel_layer()
+        event = {
+            'type': 'new_ticket_update_event',
+            'ticket_update_id': instance.id,
+        }
+        async_to_sync(channel_layer.group_send)("new_ticket_update_group", event)
+
+
+
 
 class TicketRead(models.Model):
     ticket_update = models.ForeignKey(TicketUpdate, on_delete=models.CASCADE)
diff --git a/osinaweb/support/routing.py b/osinaweb/support/routing.py
index 727f7416..75d355b4 100644
--- a/osinaweb/support/routing.py
+++ b/osinaweb/support/routing.py
@@ -3,6 +3,8 @@ from .consumers import *
 
 websocket_urlpatterns = [
     path("ws/ticketroom/<int:ticket_id>/", TicketRoomConsumer.as_asgi()),
+    path('ws/new-tickets/', NewTicketConsumer.as_asgi()),
+    path('ws/new-ticket-updates/', NewTicketUpdateConsumer.as_asgi()),
 
 
 ]
\ No newline at end of file
diff --git a/osinaweb/support/templates/add_templates/add-ticket-member-modal.html b/osinaweb/support/templates/add_templates/add-ticket-member-modal.html
index f550a6dd..e9d92a68 100644
--- a/osinaweb/support/templates/add_templates/add-ticket-member-modal.html
+++ b/osinaweb/support/templates/add_templates/add-ticket-member-modal.html
@@ -19,7 +19,7 @@
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add New Member</h1>
 
 
-        <select name="staff"  class="w-full h-[150px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" multiple>
+        <select name="staff"  class="w-full  h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
             <option value="" selected disabled>Select Staff</option>
             {% for staff in staffprofiles %}
             <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
diff --git a/osinaweb/support/templates/details_templates/partials/ticket-display.html b/osinaweb/support/templates/details_templates/partials/ticket-display.html
new file mode 100644
index 00000000..a7ec4c56
--- /dev/null
+++ b/osinaweb/support/templates/details_templates/partials/ticket-display.html
@@ -0,0 +1,84 @@
+<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">
+            <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 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>
+        {% endif %}
+    </td>
+
+
+    <td class="px-6 py-4 text-center text-sm">
+        <div class="flex justify-center items-center gap-3">
+
+            <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"
+                    stroke-width="1.5" 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"
+                    stroke-width="1.5" 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"
+                        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"
+                    stroke-width="1.5" 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"
+                    stroke-width="1.5" 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" />
+                </svg>
+            </div>
+        </div>
+    </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>
diff --git a/osinaweb/support/templates/details_templates/ticket-settings.html b/osinaweb/support/templates/details_templates/ticket-settings.html
index cac54eaf..1b36e992 100644
--- a/osinaweb/support/templates/details_templates/ticket-settings.html
+++ b/osinaweb/support/templates/details_templates/ticket-settings.html
@@ -45,7 +45,7 @@
             </div>
 
             <button
-                class="h-full rounded-tr-md px-4 bg-secondosiblue text-gray-200 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center smallPopupButton"
+                class="h-full rounded-tr-md px-4 bg-secondosiblue text-gray-200 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center xsmallPopupButton"
                 data-modal-url="{% url 'addticketmembermodal' ticket.ticket_number %}">
                 <i class="fa fa-plus"></i>
             </button>
diff --git a/osinaweb/support/views.py b/osinaweb/support/views.py
index 97409a5d..9594df13 100644
--- a/osinaweb/support/views.py
+++ b/osinaweb/support/views.py
@@ -24,7 +24,7 @@ def ticket_room(request, ticket_number):
 
     last_ticket_status = TicketStatus.objects.filter(ticket=ticket).last()
 
-    connections = TicketConnection.objects.filter(terminated=False).order_by('-id')
+    connections = TicketConnection.objects.filter(terminated_at__isnull=True).order_by('-id')
 
     context = {     
         'base_template': base_template,