From 2012967043e13c214b1d09570a9db86890a9f008 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Wed, 3 Jul 2024 22:37:00 +0300
Subject: [PATCH] new

---
 .../__pycache__/views.cpython-310.pyc         | Bin 7471 -> 7471 bytes
 .../listing_pages/customer-tickets.html       |  30 ++--
 osinaweb/db.sqlite3                           | Bin 1417216 -> 1417216 bytes
 .../custom_context.cpython-310.pyc            | Bin 3223 -> 4396 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 21193 -> 20455 bytes
 osinaweb/osinacore/custom_context.py          |  99 +++++++++---
 .../osinacore/templates/customer_index.html   |  19 +--
 osinaweb/osinacore/templates/index.html       | 148 ++++++++++--------
 .../templates/listing_pages/tickets.html      |  28 +---
 osinaweb/osinacore/views.py                   |  49 ------
 osinaweb/static/dist/output.css               |  62 +++-----
 osinaweb/static/js/tickets/tickets-room.js    |   8 +-
 .../__pycache__/models.cpython-310.pyc        | Bin 7692 -> 7824 bytes
 .../support/__pycache__/views.cpython-310.pyc | Bin 2547 -> 2526 bytes
 .../add/__pycache__/views.cpython-310.pyc     | Bin 686 -> 1497 bytes
 osinaweb/support/add/views.py                 |  44 ++++--
 osinaweb/support/models.py                    |   5 +-
 .../add-ticket-department-modal.html          |  11 +-
 .../add-ticket-member-modal.html              |  15 +-
 .../details_templates/ticket-room.html        |  19 ++-
 .../details_templates/ticket-settings.html    |   8 +-
 osinaweb/support/views.py                     |   1 -
 22 files changed, 281 insertions(+), 265 deletions(-)

diff --git a/osinaweb/customercore/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/__pycache__/views.cpython-310.pyc
index f2f203a36e0aafc8230978f85fb75b8b14774910..fa6a0b83fbdef500ad68bbdb568bf7da39dc2550 100644
GIT binary patch
delta 20
acmZ2)wcd(5pO=@50SH{8S~qg5$N~U083d64

delta 20
acmZ2)wcd(5pO=@50SIn{wQS^8kp%!b2n8Sj

diff --git a/osinaweb/customercore/templates/listing_pages/customer-tickets.html b/osinaweb/customercore/templates/listing_pages/customer-tickets.html
index bbbc69c5..63505995 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-tickets.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-tickets.html
@@ -46,13 +46,9 @@
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
                                 Date Created
                             </th>
-                            <th scope="col"
-                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
-                                Last Updated
-                            </th>
                             <th scope="col"
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
-                                Updated By
+                                Last Updated
                             </th>
                         </tr>
                     </thead>
@@ -62,7 +58,7 @@
 
                         {% for ticket in open_tickets %}
                         <tr data-href="{% url 'ticketroom' ticket.ticket_number %}" class="hover:bg-gray-100 duration-300 cursor-pointer">
-                            <td class="min-w-[250px] max-w-[250px] 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">
                                 <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>
@@ -90,12 +86,10 @@
                                 <p class="text-secondosiblue">{{ ticket.opened_date }}</p>
                             </td>
 
-                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.date_added}}</p>
-                            </td>
-
                             <td class="px-6 py-4 text-center text-sm">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.added_by.first_name}}</p>
+                                {% 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>
                         {% endfor %}
@@ -124,13 +118,9 @@
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
                                 Date Created
                             </th>
-                            <th scope="col"
-                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
-                                Last Updated
-                            </th>
                             <th scope="col"
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
-                                Updated By
+                                Last Updated
                             </th>
                         </tr>
                     </thead>
@@ -159,12 +149,10 @@
                             </td>
 
 
-                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.date_added}}</p>
-                            </td>
-
                             <td class="px-6 py-4 text-center text-sm">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.added_by.first_name}}</p>
+                                {% 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>
                         {% endfor %}
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 6680beebc91d1a0f71af0f16bf24eeab4bfb219a..db980d8fc2b2e32cfb9457ee6fcd2e49ee1d5f8a 100644
GIT binary patch
delta 2754
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
I$0LLO50-Y4djJ3c

delta 1481
zcmZ8heM}Q)7{B-K==Iv(M@tU{$-Idgm}_mXAJ<lvtdog25GlyinGI}9p+G66rG;gR
z*bU8GsIcs2HZe=shnrc@s&BHeNz67)mKdX37;JH5m@P*C&?N@ZP4^=D$9B2rdGEdF
z_ulXKKJW8f-$Z@iM15u%<HRtq1ABZODwcusM8m^kfDbp6Jcaz8k{7_v?70#T4!+L*
zvt}HC4cV_ugiG0&H8P|uyX5S};BLTKTppY3vDnNOyX3Yyv#*4X6|0Th5c)7E&FV7y
zISts>pO0p~etO@?Q8;oG_!^YHzW}L}7-%g>r13P7Cet}-Rhmkx({x&MN=u4FJAM&T
zqV_ic|F{jdf`N5KTDY!A_kHOSmd8@qJ&d`{TxPP&yG(+qXJlrnqHfU5r~tW~@Z!o$
zRLFzIMjfeB-oFj*@<<LZStPs3VmDdcqGdpg=%5&3u5}WZNjs!wn1=wezcWKX8J%Uq
z!<ncA?bn$7$8r21{3gSG2Zm=pWt1;IVe{d!A@;6*MXNj3B}e`3-M!8ZTRfDErFvW9
zu|Tk=sm;}#k^(>&KL1(Cz|Bz>-W=tGA1LiP@PJfdFsjde4~HW$z6s!(L3m3|R}ru_
z$#<Y2hN<X{@WShSDXGJdXzmVopPS;QAm7LT%q=AmU<m-k!pI@hs&M3Us52R!6xBF4
zj&WDH@vMGqjKf8ggtNR6UOvl9m(*5v8skXzf%0LD_bJU8y$%{~>7%R?9VAJ3bwt0q
zW|44?o8zXrX~^Hw|H26vmWS8~M8X2(=mk3Rl!4?mI5&rJe<ScLWO>6Zw+z!S;7Ec7
zI6=^~1|f0o4u<sKL4vMxkC+DL*Bapb+FYt{XoA!Mb`oPJ!8%kNdW1R8!m&4m5^!cB
zmz*H1oK~Sk%D);Ep!hS$mOi$XXv{<Q<b4@>ei>%^jD;*4js`<DHk3$w?{e%XC9~hS
z(&XRL7zwtC-nMu!7HN#PbO*)t9g%pfqfLAiF$X&QsTyf<5!4PE=S9Lts1<6=_;Ge`
zbSF-%dh<EOd(xN(pUxU*3yF`&!;rdUyn!o`6RH);O+$_oR$eh~0Ef2F!_i3+9{JH2
zT2tVrMlqDj)7&7}!j*B$*?IN~`z3pT^`91nS1D9u#pEiY3Rj+u2_n2e38m^nnyA2N
zgYIqSq{dC%P<@;80U0AIv<>VOE-E4~OqS3F+?P|eZ@ag<F_diX4mMc>t#Zs6^e2Pz
zu0*e^+n$i30lTwZ5%mJxQ{hZ{x|^b@$}X#|%+yq8-?Z7=8rq)pd2Ok(y5weeW$dL$
zc)dMd-Wh4_3N7}CY_dwCWbsH6y3LX#*=>&gRsGx}-e@Ay8w#g-0)bexE7;L(54by}
zxTU=}9uLJMa+f){DODeSv8y^6_Esq-z3_QOg~ji2CaS6{!g8Z)Tj;gcnsQflTW7L7
z)$FKkFZWfZc2xIN_avNhov)>{>%Stb4v)iPcG)D!WrG#DLcSUYYv6reC<gFgp^z#f
zY<Ph}JuigNVI2ps;057NQxPgZ2D?WxCv^w34H`E)rJBe&jB;6t7tsdn9(5htH@r8x
z3%(T<rZsSm7iw{JQNIT5aI052G|Y<don-<5@Ymglhp^IB3e_k05yPw+Rvi$aYO!6$
zQO}`DgnULwa5-3Az85H+M+Bi!vU%)Qv)$oxSe+Xd8oL&SKy{?8B@&d-w9E_WC;PP6
kMD!cANFImFEV~^xn|)!yivJ;GkJah1N@kl&mK-kXU)GhVQUCw|

diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc
index 8d36907262460b805c33ab510673c20d39f0e0b2..b3922d31a84f9fabfef6d4414636ec8ba24833cc 100644
GIT binary patch
delta 2215
zcmZ`*%WoS+7@rxh*X!N&#<88mahzA_L#8y)Ry+i0T4>ZF9#J6$p@^_Do=s}U^*XcT
zl0>t0P+LGqky`cuLLBT15&|KiN}M@V9Jq1ae}DrgIP^&QX6>X2ExVfE&i9<(_sy5b
zm!m%%vfNZkNAUd7y|uD1amOlRdgu83B%!#jUq&=RwVP<kph>F3*Q5qD;hXyDld}XT
zgI~#$0}~Kz!ivH2wqn5pveBkVUx#H-<eRWkpP^c^X57Z?8aHdWMx;#j9UN&=`!yYl
z8eL2gHE)qo<R|z+>p&Oz8b=2rq|Oo+yDqF+f~M98YhS09pKL%4elj{b&3@;DGKdb)
z^bYQ1AVlwL2KO`u&(?4!2ett*P*ZrEW^Q1b-NAlZq=8tji~Ye>C<#_d49=tFX+I+}
zwV{rrkQG_>o5<D@ezq;LbO?Cd6RD0SGF^<(`j5hV{J!D$h(ttnAUM23_7m*u2lw>*
zXabR(7yu$8l1OJ5Xbka@Pupk((-E4#sfnR^bOYazjZTW(9)Z7QrO=I0TDXZsPWsTX
z9ekkXf&Z!b=)syH^Tl4(y`n)r*M3;{ZM=T$VdamLfc+6a1Jg1Lt<2X(quD6#V9@9M
z5nhl)#Ym*J==e^oGuB17vFD0mI`KU6hau<t0%GkV>@Epi7$a@u=lOVNqKi6{(2`L;
z6(t#^lW_MIoq~HT(CMi5f~?&i<I_<;Fvau`wBMpnL_>Hu8p7f}>ybyS<03B#VoW52
zCWuIiq8K-YDN^+4H^w3=9Si<amg7wRbOa0W=h|VOS1W4{Z#8L|JGLERnNo+AaG0rs
z&f|99C~aHW6OSrG^?cp+AcTZQ+4HKa4Tsv?Wy5ev1q19p1UB;M)3CfEK>K4P&~nnp
z0@n~U6|IqX5sW9H2*~0Eb{L!>Etz>HjC;Jivhp1c6U<p}0WT&quyKGeIlJmKoQ)=%
zdj~{M0U+B2v{h{JYQ4&<jyE$~cPr((H#f8A3e?)**nf7pErRT209GZnc#qm0vQ8FJ
zbRhJFRH0P%6!?T{uYEl#5Bcb`^{U4!?$zepdorI)o<UpV|D_Ymsn%({q*keIR~wL8
zi+XQ=xLJyYsb21W``MH{Phn1(G8}vzuf!t;0akNqCL8L*iViBE;B|FLeF5Z>5qz(H
zI~AI4(`nefd|qf(qU+j~ONWBRL?dM`%Klzr?n<@p1ivIswbjefY=p6Ly&k6f(Y(xC
zp6xk2%&j`y22($e9o-K&H#T>j`-3B$6V67Z-l9&Z_maL1b%d(30d4ZaT&p4L>R0O7
z6}Q#k><ewYIKiHlW$#X6#ced43a`2ikDU$9XveKHU}kd?&H)6UYo+#iDa`{cL6{t0
z&tY~MqOMi>CQRraV=pZ36YP(w{L21W53~ENE~5@}C_4p-LnBHI1w${E($Fw2ZM{ac
zp&%>jh288m(_<e<O3zAoQHIC4OUs+=C8?N|@UnzgBt$bbBX_;Q-kX?F(0TU&rm%vw
z=*?jrTbOJsF$HwHZ@U<qz&Us=tYU>|u?)^&J(dP%>7qqn6}~1mi5VmJ^Hx66$)s{e
zw(~^A>I0o9q~{M3=q+p!E2hC=Ia~l=Wm_kjVk$Xe5j93I!OA~oObK31PHIw8@3Z>d
zwd6FOVkcxlh6MSynOPE2040T0;S>C<zc%@%R4z!kAmO3}Tf!R>-U=p-{K+-B%}E#n
zDCyC3Fc<b=@`~GHo?TvbSyMVRBvgYd#)Y^%;;Z1UaWWxy3neS~(^x6OCAFGOm+_ga
jE_Lc2lm9xfdM|9*JUT3Y324Z~Y3NiM>eXUe+HC&|6|y?0

delta 1032
zcmZXR&ubGw6vuZa$!33MH)(#g)?#}Qww2oYqgap@wN$L2g=!B$2r-kiiE&qFCt_hk
z3s$s;3S|ynJTw<iQV=ix1$xr6tbc$9LBvxpqHnfUYTac%@6GqUH*bEt8hYNF@=Q~c
z;QO?=UjLBWO7){#TO%`tBvIC-l15abfz^pl46w%QXVVxd{39N=dZ0*DUV`C&Lp&LK
zxEe@JwW(8=8BNs0Vn)<Wv~3cti-<(@$GBJOBo9SXU8$om>7NRrX@N#tf!0hC;|``R
zVs=y)6Vy@nyKF?(q8rQ>wIoGWEohd8Qhi^t$sfgVo&B;MmO0pp?(F48Q4JPJZ{mY%
z?CbVl-EiY1)6roVfgTtIsbjL9?QB=t&aFc06w61;r$|q9@@yA%ERrMnbt$lBq(`V@
zvqH3AL=Y)JGm{jf+v$yNCw(B=_g^#<n1L18K{8MR9H>D$$dDs1)CI}uzc%aer*esZ
zktgyF4)u!fH<sKQDKn4e;f-jFe^#oaAs!vuoA(Pb!cp)-?R=}@v#NLZ-qf6UQVi(h
zPn5wJE@k<aoa1Zi1^EQ1j>_MwFR@ePo0`j2ecUt_SfyT{r(V6$s`0n_z_Fe%No)7p
zHJ^o<R)v8rS3TFQRawJxeR`Vz&_{;GVKI72;0&MyiICRzYqVT}yax@o!bc2ebrgbO
zf_bE}LQjh9F@duJ69R`0qPAJ1)nJX9UxcX705ZZT{!76!l7Ge%3KD-7X()y8S{#XA
zK?9&<L6LDB+c*P$5f@P(it7mo$BcLur(*n_IUJXF>HM2ra}XuNgf9-x2dumq>e2Q=
zU~QjIT64?OVso<s=L9ANE(=TvTokYbGJr5vx$V=mm|hpi3giHeMz09}CLmOoy*BmB
zl_ifZ3h{=(0{?2wCKkZ0@(Fu9DZFcr$z8i{&;gM#znAviKAyF~RU`x1NDL*W*v8f0
D3M}%g

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index d1616fd141c4951376be5a92d73c178b805366df..b0ef60317f26fa409492f17258a8fe87d9214e1b 100644
GIT binary patch
delta 2769
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
ILmM{#2Xi^t7ytkO

delta 3672
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

diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py
index a4d2c563..e8bfc50b 100644
--- a/osinaweb/osinacore/custom_context.py
+++ b/osinaweb/osinacore/custom_context.py
@@ -3,6 +3,7 @@ from django.contrib.auth.models import AnonymousUser
 from datetime import datetime, timedelta
 from django.shortcuts import get_object_or_404
 from django.db.models import Max, F
+from support.models import *
 
 
 def calculate_time_ago(status):
@@ -22,11 +23,7 @@ def calculate_time_ago(status):
 
 
 def utilities(request):
-    latest_connections = Connection.objects.filter(
-        user__staffprofile__isnull=False
-    ).values('user').annotate(
-        latest_connection=Max('date')
-    )
+    latest_connections = Connection.objects.filter(user__staffprofile__isnull=False).values('user').annotate(latest_connection=Max('date'))
     online_staff_profiles = []
     for connection in latest_connections:
         user_id = connection['user']
@@ -34,32 +31,87 @@ def utilities(request):
         last_connection = Connection.objects.filter(user_id=user_id, date=latest_connection).first()
         if last_connection.status == 'Online':
             online_staff_profiles.append(last_connection.user.staffprofile)
+
+
     notes = None
     recent_note = None
     user_offline=None
-    if request.user.is_authenticated:
+    open_task_count = 0
+    working_on_task_count = 0
+    open_tickets = None
+    closed_tickets = None
+
+
+    if request.user.is_authenticated and StaffProfile.objects.filter(user=request.user):
         notes = Note.objects.filter(user=request.user).order_by('-date')[:6]
         recent_note = Note.objects.filter(user=request.user).last()
         last_user_activity = Connection.objects.filter(user=request.user).last()
         if last_user_activity and last_user_activity.status == 'Offline':
-            # Send 'user_offline' object to your context
             user_offline = True
         else:
             user_offline = False
 
-    if request.user.is_authenticated and request.user.is_superuser:
-        open_task_count = Task.objects.filter(status='Open').count()
-        working_on_task_count = Task.objects.filter(status='Working On').count()
+
+        if request.user.is_superuser:
+            open_task_count = Task.objects.filter(status='Open').count()
+            working_on_task_count = Task.objects.filter(status='Working On').count()
+
+
+            all_tickets = Ticket.objects.all()
+            all_tickets_with_update_date = all_tickets.annotate(latest_update_date=Max('ticketupdate__date_added'))
+            all_tickets_ordered = all_tickets_with_update_date.order_by('-latest_update_date')
+            open_tickets = []
+            closed_tickets = []
+            for ticket in all_tickets_ordered:
+                last_status = ticket.ticketstatus_set.last()
+                if last_status:
+                    last_status = last_status.status
+                    if last_status == 'Closed':
+                        closed_tickets.append(ticket)
+                    else:
+                        open_tickets.append(ticket)
+                else:
+                    # If no status is found, assume it's open
+                    open_tickets.append(ticket)
+
+
+        else: 
+            open_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Open').count()
+            working_on_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Working On').count()
+            all_tickets = Ticket.objects.all()
+            filtered_tickets = []
+            for ticket in all_tickets:
+                staff_profiles = ticket.get_all_ticket_staff()
+                if any(staff.user == request.user for staff in staff_profiles):
+                    filtered_tickets.append(ticket)
+
+            all_tickets = Ticket.objects.filter(id__in=[ticket.id for ticket in filtered_tickets]).annotate(
+            latest_update_date=Max('ticketupdate__date_added'))
+            all_tickets_ordered = all_tickets_with_update_date.order_by('-latest_update_date')
+                
+            open_tickets = []
+            closed_tickets = []
+            for ticket in all_tickets_ordered:
+                last_status = ticket.ticketstatus_set.last()
+                if last_status:
+                    last_status = last_status.status
+                    if last_status == 'Closed':
+                        closed_tickets.append(ticket)
+                    else:
+                        open_tickets.append(ticket)
+                else:
+                    # If no status is found, assume it's open
+                    open_tickets.append(ticket)
     
-    elif request.user.is_authenticated and StaffProfile.objects.filter(user=request.user):
-        open_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Open').count()
-        working_on_task_count = Task.objects.filter(assigned_to=request.user.staffprofile, status='Working On').count()
-        
 
-    else:
-        # Handle the case when the user is not logged in
-        open_task_count = 0
-        working_on_task_count = 0
+        for ticket in open_tickets:
+            unread_updates_count = 0
+            for ticket_update in ticket.ticketupdate_set.exclude(added_by=request.user): 
+                if not TicketRead.objects.filter(ticket_update=ticket_update, user=request.user, read=True).exists():
+                    unread_updates_count += 1
+
+            ticket.unread_updates_count = unread_updates_count
+
        
     
     total_tasks = open_task_count + working_on_task_count
@@ -69,19 +121,18 @@ def utilities(request):
     today = datetime.now().date()
     # Fetch the latest statuses from the last 24 hours
     latest_statuses = Status.objects.filter(date=today).order_by('-id')
-
     # Calculate time ago for each status and store it in a dictionary
     latest_statuses_time_ago = [{'status': status, 'time_ago': calculate_time_ago(status)} for status in latest_statuses]
 
 
     recent_logged_in_staffs = User.objects.filter(
-        staffprofile__isnull=False,  # Ensure there's a StaffProfile associated
-        last_login__isnull=False  # Ensure they have logged in at least once
+        staffprofile__isnull=False, 
+        last_login__isnull=False  
     ).order_by('-last_login')[:8] 
 
     recent_logged_in_customers = User.objects.filter(
-        customerprofile__isnull=False,  # Ensure there's a CustomerProfile associated
-        last_login__isnull=False  # Ensure they have logged in at least once
+        customerprofile__isnull=False, 
+        last_login__isnull=False 
     ).order_by('-last_login')[:8]  
     
     return {'total_tasks': total_tasks, 
@@ -93,6 +144,8 @@ def utilities(request):
             'user_offline' : user_offline,
             'recent_logged_in_staffs' : recent_logged_in_staffs,
             'recent_logged_in_customers' : recent_logged_in_customers,
+            'open_tickets': open_tickets,
+            'closed_tickets': closed_tickets
 }
 
 
diff --git a/osinaweb/osinacore/templates/customer_index.html b/osinaweb/osinacore/templates/customer_index.html
index 778ad42b..9e7adbd5 100644
--- a/osinaweb/osinacore/templates/customer_index.html
+++ b/osinaweb/osinacore/templates/customer_index.html
@@ -141,13 +141,9 @@
                             class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
                             Regarding
                         </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
-                            Last Updated
-                        </th>
                         <th scope="col"
                             class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
-                            Updated By
+                            Last Updated
                         </th>
                     </tr>
                 </thead>
@@ -157,7 +153,7 @@
                 <tbody class="bg-white divide-y divide-gray-200">
                     <tr data-href="{% url 'ticketroom' ticket.ticket_number %}"
                         class="hover:bg-gray-100 duration-300 cursor-pointer">
-                        <td class="min-w-[250px] max-w-[250px] 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">
                             <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>
@@ -181,14 +177,11 @@
                             <p class="text-secondosiblue">{{ticket.regarding}}</p>
                         </td>
 
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-
-                            <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.date_added}}</p>
-
-                        </td>
-
                         <td class="px-6 py-4 text-center text-sm">
-                            <p class="text-secondosiblue">{{ticket.ticketupdate_set.last.added_by.first_name}}</p>
+                            {% 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>
diff --git a/osinaweb/osinacore/templates/index.html b/osinaweb/osinacore/templates/index.html
index 8567c069..8a91a420 100644
--- a/osinaweb/osinacore/templates/index.html
+++ b/osinaweb/osinacore/templates/index.html
@@ -5,6 +5,10 @@
 <!-- LEFT SIDE -->
 <div class="w-full xxlg1:w-[75%] flex flex-col gap-5">
 
+    <!-- RESPONSE MESSGAE FOR SHARING A TICKET -->
+    <div id="successMessage"
+        class="fixed mx-auto top-10 opacity-0 w-[85%] s:w-fit px-9 s:px-14 py-3 rounded-md bg-osiblue bg-opacity-80 text-white text-center rounded-t-md shadow-md z-10 pointer-events-none">
+    </div>
 
 
     <!-- TICKETS -->
@@ -30,10 +34,6 @@
                             class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
                             Last Updated
                         </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
-                            Updated By
-                        </th>
                         <th scope="col" class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
                             Actions
                         </th>
@@ -41,71 +41,82 @@
                 </thead>
 
                 <tbody class="bg-white divide-y divide-gray-200">
-
-                    <tr>
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">Ticket Subject</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">234233</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">ggg</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">20-2-234</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                            <p class="text-secondosiblue">20-2-234</p>
-                        </td>
-
-                        <td class="px-6 py-4 text-center text-sm">
-                            <div class="flex justify-center items-center gap-3">
-
-                                <button onclick="myFunction()">
-                                    <input type="text" class="hidden"
-                                        value="https://osina.ositcom.com/my-tickets/{{ticket.ticket_number}}/"
-                                        id="myInput">
-                                    <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="">
-                                    <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>
+                    {% 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>
-                            </div>
-                        </td>
-                    </tr>
+                            </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>
+                    {% endfor %}
                 </tbody>
             </table>
         </div>
@@ -351,6 +362,7 @@
 
 <!---------------------- 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>
     
 
 {% endblock content %}
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/listing_pages/tickets.html b/osinaweb/osinacore/templates/listing_pages/tickets.html
index 874761d2..278caaba 100644
--- a/osinaweb/osinacore/templates/listing_pages/tickets.html
+++ b/osinaweb/osinacore/templates/listing_pages/tickets.html
@@ -58,10 +58,6 @@
                                 class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
                                 Last Updated
                             </th>
-                            <th scope="col"
-                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
-                                Updated By
-                            </th>
                             <th scope="col"
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
                                 Actions
@@ -75,7 +71,7 @@
                     <tbody class="bg-white divide-y divide-gray-200">
 
                         <tr>
-                            <td class="min-w-[300px] max-w-[300px] px-6 py-4 text-sm border-r border-gray-300">
+                            <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>
 
@@ -99,12 +95,9 @@
                             </td>
 
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.date_added}}</p>
-                            </td>
-
-                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.added_by.first_name}}
-                                </p>
+                                {% 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">
@@ -181,10 +174,6 @@
                                 class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
                                 Last Updated
                             </th>
-                            <th scope="col"
-                                class="px-6 py-3 text-sm font-medium text-gray-500 border-r border-gray-300 uppercase whitespace-nowrap">
-                                Updated By
-                            </th>
                             <th scope="col"
                                 class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
                                 Actions
@@ -210,12 +199,9 @@
                             </td>
 
                             <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.date_added}}</p>
-                            </td>
-
-                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                                <p class="text-secondosiblue">{{ticket.ticketupdate_set.all.last.added_by.first_name}}
-                                </p>
+                                {% 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">
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index 9d0c0575..8afab2ad 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -367,56 +367,7 @@ def my_tasks(request, *args, **kwargs):
 
 @staff_login_required
 def tickets(request, *args, **kwargs):
-    if request.user.is_superuser:
-        all_tickets = Ticket.objects.all()
-        all_tickets_with_update_date = all_tickets.annotate(
-        latest_update_date=Max('ticketupdate__date_added'))
-        all_tickets_ordered = all_tickets_with_update_date.order_by('-latest_update_date')
-        open_tickets = []
-        closed_tickets = []
-        for ticket in all_tickets_ordered:
-            last_status = ticket.ticketstatus_set.last()
-            if last_status:
-                last_status = last_status.status
-                if last_status == 'Closed':
-                    closed_tickets.append(ticket)
-                else:
-                    open_tickets.append(ticket)
-            else:
-                # If no status is found, assume it's open
-                open_tickets.append(ticket)
-    else: 
-        all_tickets = Ticket.objects.all()
-        all_tickets_with_update_date = all_tickets.annotate(
-        latest_update_date=Max('ticketupdate__date_added'))
-        all_tickets_ordered = all_tickets_with_update_date.order_by('-latest_update_date')
-        open_tickets = []
-        closed_tickets = []
-        for ticket in all_tickets_ordered:
-            last_status = ticket.ticketstatus_set.last()
-            if last_status:
-                last_status = last_status.status
-                if last_status == 'Closed':
-                    closed_tickets.append(ticket)
-                else:
-                    open_tickets.append(ticket)
-            else:
-                # If no status is found, assume it's open
-                open_tickets.append(ticket)
-    
-    for ticket in open_tickets:
-        unread_updates_count = 0
-        for ticket_update in ticket.ticketupdate_set.exclude(added_by=request.user): 
-            if not TicketRead.objects.filter(ticket_update=ticket_update, user=request.user, read=True).exists():
-                unread_updates_count += 1
-
-        ticket.unread_updates_count = unread_updates_count
-
-
     context = {
-        'open_tickets': open_tickets,
-        'closed_tickets': closed_tickets
-
     }
 
     return render(request, 'listing_pages/tickets.html', context)
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index 902a64b3..2893aa81 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -916,6 +916,14 @@ video {
   margin-right: auto;
 }
 
+.-ml-10 {
+  margin-left: -2.5rem;
+}
+
+.-ml-5 {
+  margin-left: -1.25rem;
+}
+
 .-mr-3 {
   margin-right: -0.75rem;
 }
@@ -960,6 +968,10 @@ video {
   margin-left: 0px;
 }
 
+.ml-10 {
+  margin-left: 2.5rem;
+}
+
 .ml-2 {
   margin-left: 0.5rem;
 }
@@ -968,6 +980,10 @@ video {
   margin-left: 1rem;
 }
 
+.ml-5 {
+  margin-left: 1.25rem;
+}
+
 .ml-\[300px\] {
   margin-left: 300px;
 }
@@ -1081,22 +1097,6 @@ video {
   margin-top: 80px;
 }
 
-.ml-5 {
-  margin-left: 1.25rem;
-}
-
-.ml-10 {
-  margin-left: 2.5rem;
-}
-
-.-ml-10 {
-  margin-left: -2.5rem;
-}
-
-.-ml-5 {
-  margin-left: -1.25rem;
-}
-
 .block {
   display: block;
 }
@@ -1221,6 +1221,10 @@ video {
   height: 16px;
 }
 
+.h-\[180px\] {
+  height: 180px;
+}
+
 .h-\[18px\] {
   height: 18px;
 }
@@ -1560,14 +1564,6 @@ video {
   width: 100%;
 }
 
-.min-w-\[250px\] {
-  min-width: 250px;
-}
-
-.min-w-\[300px\] {
-  min-width: 300px;
-}
-
 .min-w-full {
   min-width: 100%;
 }
@@ -1584,14 +1580,6 @@ video {
   max-width: 72rem;
 }
 
-.max-w-\[250px\] {
-  max-width: 250px;
-}
-
-.max-w-\[300px\] {
-  max-width: 300px;
-}
-
 .max-w-lg {
   max-width: 32rem;
 }
@@ -3076,6 +3064,11 @@ video {
   color: rgb(156 163 175 / var(--tw-text-opacity));
 }
 
+.text-gray-50 {
+  --tw-text-opacity: 1;
+  color: rgb(249 250 251 / var(--tw-text-opacity));
+}
+
 .text-gray-500 {
   --tw-text-opacity: 1;
   color: rgb(107 114 128 / var(--tw-text-opacity));
@@ -3171,11 +3164,6 @@ video {
   color: rgb(234 179 8 / var(--tw-text-opacity));
 }
 
-.text-gray-50 {
-  --tw-text-opacity: 1;
-  color: rgb(249 250 251 / var(--tw-text-opacity));
-}
-
 .underline {
   text-decoration-line: underline;
 }
diff --git a/osinaweb/static/js/tickets/tickets-room.js b/osinaweb/static/js/tickets/tickets-room.js
index 206600fd..8736bd93 100644
--- a/osinaweb/static/js/tickets/tickets-room.js
+++ b/osinaweb/static/js/tickets/tickets-room.js
@@ -120,10 +120,10 @@ function initializeWebSocket() {
             });
 
         } else if (data.event_type === 'user_status') {
-            const onlineUsersDiv = document.getElementById('online-users');
-            if (onlineUsersDiv) {
-                onlineUsersDiv.innerHTML = data.html;
-            }
+            const toponlineUsersDiv = document.getElementById('top-online-users');
+            const fixedonlineUsersDiv = document.getElementById('fixed-online-users');
+            toponlineUsersDiv.innerHTML = data.html;
+            fixedonlineUsersDiv.innerHTML = data.html;
         } else {
             messagesDiv.insertAdjacentHTML('beforeend', data.html);
             typingDiv.innerHTML = '';
diff --git a/osinaweb/support/__pycache__/models.cpython-310.pyc b/osinaweb/support/__pycache__/models.cpython-310.pyc
index 2c2fd1bd87bcdfacaadc449d5130d8d70aa3fc91..201c35704b88e0b0c68f739e4e019cfb7ea7f1a5 100644
GIT binary patch
delta 552
zcmYLGO=uHA6rMNxW3pzq$u>5LRurj)2*%>UQw)j)K}3{z3MtE)-Gs(XqcekG*|nA!
zR8UYx>P=Gc;8phGv4{wQCvWB?)RPx4l^*qNMEl_T-hA`seQ%g~Qhj#T?3<=RFlyI^
z?GJCwEptsrr64XKcoRvGE_7)~Ja`Hbc+^uKkPsHh03s@sz1m3i)J+&^n<P>~g&hl(
zu0Gm_N?oBHWRVK#0Fc!I6iB3nTAh@&D{Km9v;b)mYseIlT%nHOHd2R#WJ!x4gf4kb
zZ__$q$8oz1>}Zncm{u0Xn!h60-AUmu&0}qBRD)$MTK(Rw+7LBQylt|2>iTl)rY|ZT
zUpQ_MIAS6lF6P~KyHXAMEjQpbT>NWZ-G9<^h3~kY=X>R}bghDXWF46+>+B+0HZuPm
z(4b**fywFly&FE`@{`rbW$}~+78F5+45&04pPo8F;iX*4ZNLk;llu;@<X4+PQ(m6l
zfH!h`dRR){|22XqpOhk5$U+LcSu<YGp99#E?+<*0&+_ri4t$aK3cE0tcZ&C6TkaMY
z^l#Y1Lb;yL%infdUMjtVAF*=K0QebOht321im%R|0UY@7a8Oz_z)st`J!@x>Q-(g#
H+Km1OrK^er

delta 397
zcmYj~K_~=a7>4KlcV?{FogHR(?G8e2E8^tDL5hQN;k3mz`DbNK)XYy}HcE1#<gdM{
z-5gw8wka0}PA)E#i@k_kT$EDE$<N7G?^Ewn-}fDj9*pR#x~@rLh6eYFmv#MG-&REX
z&A5m^FTkV{N+ggd4pEIzQbQR`{^t}LsiCUYq%sMJ*A<XbQ#C4DWQ8mWvgQCKjS?zT
z<&f+`^vEtUQdth<87ZeudxrSp^$2Xn2GZ1KPQj+sp|d$O<f3b{T#SDtGA)gS@3_ta
zD|n8O4&_m!ySEWrx7{_zFStuS%PHQZIFpaFrG;gO6?|qFi+sw+8wsIP$U;UOGHDMl
zj6Q-2e{QXS^9}PACwwmHA<yrU6`b+K)Si+TE2sP;l@zvar9vy+4_xtywj11XJ@bis
zPO@Kk<losHyznh+2v7XnYTzy0Z`XkL@VH|P_zWL9haqmnx?F2qgV}7VW~Uh!jB4s%
HSK8Dc{Df>8

diff --git a/osinaweb/support/__pycache__/views.cpython-310.pyc b/osinaweb/support/__pycache__/views.cpython-310.pyc
index 2c1e1988cc8615d98eaa649c73ac6c51257224fe..4325d55a0c0957fbeed32fc88aa848ab80b0b26d 100644
GIT binary patch
delta 582
zcmZ8dzi$&U81?7#`R<b3rEQu9A)rX5Qq?x)$HGd~Af%$Q024x|fG<@qQPTR{N|k)7
zM8$+MAg>*gKLKTAV*$a+l!1kTwNn3q+73m4hbMpUeeZjpeO~!diTYt!K>B=n{<i(A
z^gjB0>;pmq36Q{GfO9NSic^P&4ChX7SrAh*=LGZXR&gaxX-8L#XubMdceTD@bx-1<
zKSGCyZ`cV$1dN`*8xV!Gn3g1F-T;On^GA>q%^m+C)5t~zmvR%mtmUpKTbpaO!T=9v
zMksq_*;zSdi>x$o0PQ~(bALrtMkuFZ-Y_g=k)2xBp`LUkmPAtNv6)ks<i4nmf5J9I
z3*6B^GojCRUw0CrUO0CaCi6Rqh+ExmEG!vkqSbDzcg{yxQ;*02S=SEriPWJ!J|o|O
z-qkg~r@qoBD{JOz!8A>3W>UA6i8xD=Ufky_;c+K9T2~Le+t3*AdDme1hVd*KxM@7a
z=_*f6=!9l{E)vEY>Vv<uxni1p10@5S2AT#Q8dx>(-vZ^!CnQ4b_I9$Sss)R%rS1nY
at(*RaIt{K?xBj(GAE3SkOYSXvC4virppy6i

delta 643
zcmYk2Pm9w)7{=$F{B4`0)n<1+2r8wArQ0gCUOm*+i?|?q6A5Lf?Iv5&-N{ruBor(j
zgUDPxv>(7z(Tg8ozknb_@Jo30;LNm26ZkRj^US=@JM*jlyY5Y0w~WO1q5FPRb3b}l
za~}|5h(QVja-3m?Q@qqxXaRsy6zP#c>jY<7++?P#iMGJBp&Tp4k$o;Iq6>d->l?!F
zDZjMo^ajzM>Y%eSF&FR-SS4~IH^s!t=dkpMy@E{N5h1Fos8YUlkJ0Oc%wRQj%urrA
z$IELgl$<H`db&|7#K|>4m(N-Ke*`T370OJuCl%rnPj#(|Oe@v+6;xq={R5ss>ws$F
zX$tdYczQl$g>gZ{m=*qb$b!LS5-=qP2^)+?ysO>gZ?$i5#C!V8?1*y?@XvZ1I_sbM
zcQCs`q4)V0^Q3YlmkMp}SvR50Th?9ZuV0CE^OiJkOWYACDx2&VGNUk)DP==K`}~vL
zm><ebwuB>bEb&<4i9}0cCrOk=_20xp#=>}<$lb}lfP;PTzyTYuhC%-3AIGLog>`c1
z6g3hJ;_<YToQeF?8A~Weh(9bndLZvf`vQfpo*|e_$6*}M;pHr(Vp7>*XNv8mzm^(C
I6W{RQFEF5;Z2$lO

diff --git a/osinaweb/support/add/__pycache__/views.cpython-310.pyc b/osinaweb/support/add/__pycache__/views.cpython-310.pyc
index 7edaf79506df811935dc3413c7fb89d54611e4a8..4bbed824fa1fff70db47a203ecbd0c2ce9548628 100644
GIT binary patch
literal 1497
zcmaJ>&2Aev5GJ|5`b(A6sL}tVhoT$6yD5-cji5kt=%H|e%Dw0!td?}V^6qjoq^#JG
zPic>SgC3+yfjmp!fY+Y-3ISSlxT{z~f|SAzIm6-bBfpQ5gF%;I`}2?AP70rpzpS&{
z7&_nMr>x<G(}I+AOiMOq)cUM&j@#aCdZ+M8f9&I&%e`O8IN&}Hun&1SB2njWtU@AY
zd=M2EU~WGXdLpMYkzoguhYub`)X@8A`af!2|14B3D<v`u<4p^2fKbT~_^ER=nrOPD
zoL;jlrrFF{xofiWI9t;zXGvy0cg`3*z$}JdunM`mrrg79S9g}~@=esoXmIUZc}s8A
zT@y-lkB2Ymh+u}pJHN9lU-y@UcbEQ42M^ObdPU7Z=h+#ap_-Rd0hi7}&W-!@$>`X0
zxu{dnrKmLKF&pQp7LfxT#BBU_A*Nw)l5#Hi>-bP*kk|UrBCohy#9G#IA+uEHvWh_z
zGUeYy-yJ5KtcbzDmg;SHQkOB7nrKnh1=dvwdI#-J2ivTJQu4HjPjy*D18^ER$IUrR
z_wfyC6STxA<D^AlLJ7#&WO`xzQs`63A+!q}WY7%T)jMllm7WXmFas=iQD6cP&*wsE
zu>3W^VQ5FqZ46tCTZkseWTnLm{ffZnnD%;_{GtS?M3i|UL{a1yB6%#-8QxJcN{hU_
z`%_w5=ZVU7Cd)*syh@WwESdqIrPVXp1{Y$QsCivW(Dr_k^IR-cTwj<^o4acX-9ni(
zw`F0fFVOVqkap=FWzDZk{eMC)q|9N||F`eKmzeT?xxT>Jx8*u>IpfYXU3qJ=5v+@X
z{dPyN9!k@HN3a1#!?y(6xe;vlMzFn&VEad4-_0?;E<eq5js!IndP=7!Ct&{wppOP6
zde4rnxZsvGAK2(dZG$Ge26=)+sLT8B)mtg-lXzEaa2u<c{>X0nv@HW4+K`VGwE)<&
zTYhAXg$Mg~uGcE8Sp*;3@Q$|N6C2p->MQHoBaC~kuG#~BX2VuYt+8a9{T<3%z%AW(
zadJcVo&TfzYs@=}I%e1kELNwes%)-RBm3rUjc;wl7Nd|vp~icSA~Ojh<^sD^OHlZV
r8;Rnp)OC9}D<!ZS?0|0IH^{?7EH^L2BWj^q-i9osA??%9>F@ss7?zC4

delta 303
zcmcb~y^fVHpO=@50SF>gThq2OPUMqeG?}QaBFdb?(!vnMn!=jG2Bg_i*n=4~IVKjU
z8zwV?R6_w1kY)j5XCVG803<RQY8guyY8X-&YZ#lEfqIzyCSPPUkYCAI1X8<_=@xrY
zYGG+=amg+A<ovvn)QXao3`Ja%moatde+HSv!o<T;!~<mDw5Ny_C<`*zkwr(Whz-ao
zVh0f*UqA@%$$wd71Vuo6UJ$_tB>XhlCws6uS%b|6iy&zLYvl&2y2W9Wo1apelWGU@
QWid!xfQf?<2w8Zz0q^KCl>h($

diff --git a/osinaweb/support/add/views.py b/osinaweb/support/add/views.py
index 3749dd9a..0ac2d19f 100644
--- a/osinaweb/support/add/views.py
+++ b/osinaweb/support/add/views.py
@@ -3,13 +3,25 @@
 from django.shortcuts import render, get_object_or_404
 from support.models import *
 from osinacore.decorators import *
-
-
-
-def add_ticket_department_modal(request):
-
-    context = {     
-
+from django.http import HttpResponse
+
+
+def add_ticket_department_modal(request, ticket_number):
+    ticket = get_object_or_404(Ticket, ticket_number=ticket_number)
+    departments = Department.objects.all().order_by('-id')
+    if request.method == 'POST':
+        department = get_object_or_404(Department, id=request.POST.get('department'))
+        ticketdepartment = TicketDepartment(
+            department=department,
+            ticket=ticket,
+            date_added = request.POST.get('date')
+        )
+        ticketdepartment.save()
+        return HttpResponse('<script>window.top.location.reload();</script>')
+
+    context = {  
+        'ticket': ticket,
+        'departments': departments,
     }
 
     return render(request, 'add_templates/add-ticket-department-modal.html', context)
@@ -17,10 +29,22 @@ def add_ticket_department_modal(request):
 
 
 
-def add_ticket_member_modal(request):
-
-    context = {     
+def add_ticket_member_modal(request, ticket_number):
+    ticket = get_object_or_404(Ticket, ticket_number=ticket_number)
+    staffprofiles = StaffProfile.objects.filter(active=True).all()
+    if request.method == 'POST':
+        staff = get_object_or_404(StaffProfile, id=request.POST.get('staff'))
+        ticketstaff = TicketStaff(
+            staff=staff,
+            ticket=ticket,
+            date_added = request.POST.get('date')
+        )
+        ticketstaff.save()
+        return HttpResponse('<script>window.top.location.reload();</script>')
 
+    context = {  
+        'ticket': ticket,
+        'staffprofiles': staffprofiles,
     }
 
     return render(request, 'add_templates/add-ticket-member-modal.html', context)
diff --git a/osinaweb/support/models.py b/osinaweb/support/models.py
index d856cb83..239f5b77 100644
--- a/osinaweb/support/models.py
+++ b/osinaweb/support/models.py
@@ -129,14 +129,15 @@ class Ticket(models.Model):
             return f"last seen on {last_seen_time.strftime('%b %d at %I:%M %p')}"
 
     def get_all_ticket_staff(self):
-        ticket_staff = TicketStaff.objects.filter(ticket=self).select_related('staff')
+        ticket_staff = TicketStaff.objects.filter(ticket=self)
+        staff_members = [entry.staff for entry in ticket_staff]
         latest_department = TicketDepartment.objects.filter(ticket=self).order_by('-date_added').first()
         if latest_department:
             department_staff = latest_department.department.get_staff()
         else:
             department_staff = []
 
-        all_staff = list(ticket_staff.values_list('staff', flat=True)) + list(department_staff)
+        all_staff = list(staff_members) + list(department_staff)
         
         return all_staff
 
diff --git a/osinaweb/support/templates/add_templates/add-ticket-department-modal.html b/osinaweb/support/templates/add_templates/add-ticket-department-modal.html
index 44f27db7..0f384a38 100644
--- a/osinaweb/support/templates/add_templates/add-ticket-department-modal.html
+++ b/osinaweb/support/templates/add_templates/add-ticket-department-modal.html
@@ -14,16 +14,19 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form method="POST" action="">
+    <form method="POST" action="{% url 'addticketdepartmentmodal' ticket.ticket_number %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add New Department</h1>
 
-        <select name="department" id="" class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
-            <option value="">Dep 1</option>
+        <select name="department" class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4">
+            <option value="" disabled selected>Select Department</option>
+            {% for department in departments %}
+                <option value="{{department.id}}">{{department.name}}</option>
+            {% endfor %}
         </select>
 
         <div class="w-full">
-            <input required name="date" type="date" id="date" name="date"
+            <input required name="date" type="datetime-local" id="date" name="date"
                 class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
         </div>
 
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 ffb5328b..f550a6dd 100644
--- a/osinaweb/support/templates/add_templates/add-ticket-member-modal.html
+++ b/osinaweb/support/templates/add_templates/add-ticket-member-modal.html
@@ -14,14 +14,23 @@
 </head>
 
 <body class="font-poppinsLight">
-    <form method="POST" action="">
+    <form method="POST" action="{% url 'addticketmembermodal' ticket.ticket_number %}">
         {% csrf_token %}
         <h1 class="text-secondosiblue text-2xl font-semibold text-center">Add New Member</h1>
 
-        <select name="member" id="" class="w-full h-[100px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" multiple>
-            <option value="">Member 1</option>
+
+        <select name="staff"  class="w-full h-[150px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-4" multiple>
+            <option value="" selected disabled>Select Staff</option>
+            {% for staff in staffprofiles %}
+            <option value="{{staff.id}}">{{staff.user.first_name}} {{staff.user.last_name}}</option>
+            {% endfor %}
         </select>
 
+        <div class="w-full">
+            <input required name="date" type="datetime-local" id="date" name="date"
+                class="w-full p-3 border border-gray-300 rounded-md bg-transparent outline-none mt-1">
+        </div>
+
 
         <div class="w-full flex justify-center items-center mt-4">
             <button type="submit"
diff --git a/osinaweb/support/templates/details_templates/ticket-room.html b/osinaweb/support/templates/details_templates/ticket-room.html
index 3d5bdd88..6985de53 100644
--- a/osinaweb/support/templates/details_templates/ticket-room.html
+++ b/osinaweb/support/templates/details_templates/ticket-room.html
@@ -22,7 +22,7 @@
         <div class="w-full flex flex-col md:flex-row justify-between items-start md:items-center gap-3 mb-5 md:mb-0">
             <p class="text-secondosiblue text-[20px] flex items-center gap-1">Ticket <span
                     class="font-semibold">#{{ticket.ticket_number}}</span> - <span
-                    class="font-semibold text-base">Department</span></p>
+                    class="font-semibold text-base">{{ticket.ticketdepartment_set.all.last.department}}</span></p>
 
 
             <div class="w-full s:w-fit flex flex-col s:flex-row justify-end items-center gap-2">
@@ -81,12 +81,21 @@
         </div>
         {% endif %}
 
-
-        <div class="w-full mt-3">
+        <div class="w-full">
             <p class="text-gray-500 font-light text-sm leading-7">{{ticket.description}}
             </p>
         </div>
 
+        <div class="w-full flex items-center gap-1">
+            <p class="text-secondosiblue">Online:</p>
+            
+    
+            <div class="flex items-center" id="top-online-users">
+                {% include 'details_templates/partials/ticket-online-users.html' %}
+            </div>
+    
+        </div>
+
         {% if ticket.ticketattachment_set.all %}
         <div class="w-full flex flex-wrap justify-end items-center gap-3">
             {% for file in ticket.ticketattachment_set.all %}
@@ -110,7 +119,7 @@
         <div class="w-full flex flex-col md:flex-row justify-between items-start md:items-center gap-3">
             <p class="text-secondosiblue text-[17px] flex items-center gap-1">Ticket <span
                     class="font-semibold">#{{ticket.ticket_number}}</span> - <span
-                    class="font-semibold text-base">Department</span>
+                    class="font-semibold text-base">{{ticket.ticketdepartment_set.all.last.department}}</span>
             </p>
     
             {% if last_ticket_status.status == 'Open' %}
@@ -139,7 +148,7 @@
             <p class="text-secondosiblue">Online:</p>
             
     
-            <div class="flex items-center" id="online-users">
+            <div class="flex items-center" id="fixed-online-users">
                 {% include 'details_templates/partials/ticket-online-users.html' %}
             </div>
     
diff --git a/osinaweb/support/templates/details_templates/ticket-settings.html b/osinaweb/support/templates/details_templates/ticket-settings.html
index e2c91258..cac54eaf 100644
--- a/osinaweb/support/templates/details_templates/ticket-settings.html
+++ b/osinaweb/support/templates/details_templates/ticket-settings.html
@@ -18,7 +18,7 @@
 
             <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 xsmallPopupButton"
-                data-modal-url="{% url 'addticketdepartmentmodal' %}">
+                data-modal-url="{% url 'addticketdepartmentmodal' ticket.ticket_number %}">
                 <i class="fa fa-plus"></i>
             </button>
         </div>
@@ -27,7 +27,7 @@
         <div class="w-full flex flex-col gap-3 mt-3">
             {% for department in ticket_departments %}
             <div
-                class="w-full rounded-md py-5 px-3 {% if forloop.first %} bg-secondosiblue border border-secondosiblue {% else %}  bg-gray-50 border border-gray-100 {% endif %} flex justify-between items-center gap-3 text-gray-50">
+                class="w-full rounded-md py-5 px-3 {% if forloop.first %} bg-secondosiblue border border-secondosiblue text-gray-50 {% else %}  bg-gray-50 border border-gray-100 text-secondosiblue {% endif %} flex justify-between items-center gap-3">
                 <p class="text-sm sm:text-[17px]">{{department.department.name}}</p>
 
                 <p class="text-sm sm:text-base">{{department.date_added}}</p>
@@ -45,8 +45,8 @@
             </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 xsmallPopupButton"
-                data-modal-url="{% url 'addticketmembermodal' %}">
+                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"
+                data-modal-url="{% url 'addticketmembermodal' ticket.ticket_number %}">
                 <i class="fa fa-plus"></i>
             </button>
         </div>
diff --git a/osinaweb/support/views.py b/osinaweb/support/views.py
index bf81a558..97409a5d 100644
--- a/osinaweb/support/views.py
+++ b/osinaweb/support/views.py
@@ -7,7 +7,6 @@ from django.http import Http404
 # Create your views here.
 def ticket_room(request, ticket_number):
     ticket = get_object_or_404(Ticket, ticket_number=ticket_number)
-    print(ticket.get_all_ticket_staff())
     if request.user.is_superuser:
         base_template = "main.html"
     elif hasattr(request.user, 'customerprofile') and request.user.customerprofile == ticket.customer: