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

---
 osinaweb/db.sqlite3                           | Bin 1417216 -> 1417216 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 7283 -> 7692 bytes
 .../support/__pycache__/views.cpython-310.pyc | Bin 2868 -> 2547 bytes
 osinaweb/support/models.py                    |  13 +++++++++++++
 osinaweb/support/views.py                     |  14 +++-----------
 5 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index bb768c73b9184d5aa36a103c245144a4391b8ebb..6680beebc91d1a0f71af0f16bf24eeab4bfb219a 100644
GIT binary patch
delta 463
zcmZoT5Y})YY=ShS*+dy<Mzf6xk-Cg-&AW8lcj+<$F%u9o12GE_vjQ<25VHd@2M}`t
zF&7YX12GQ}^8zs+5c6-}r7Pg&#PW}YjbVF%pzt)N?emHRk{H>z&vBpN>fio>gVUFJ
zdvLix5eq*Xrw1!DClj|Dm~`EKrCPv%g_%KsVLN++z&m~}1_lOhHYOm++Wx;^VEg}m
zLDmE|pfm&j_w8IC1mE&=0_8YC3Rqf%T7<WVuv}nX$TD*~`vsBbOe`!5fXsK7M3ys7
zF1XIZ<-_g9#>~j%!|l3#`4y4aY-VF7sp;$vqRA{wkxWvX8w=Jj*4s>T<7D8sWaMS!
zbTkafOwLX%2`))YOH;^C%1TWxQP42dWcD#KFf!3KFxNFORxmWQGO(~RHPf>&H#9Q0
zu$krx*KUMOyAdw!X6B|wrq0`EI*DfcLVUPqJJ$r!P5dlC&$&!LFke(o3CL1%WaLD$
V-oV_-(9FuvNYB{9+{n~|9RP~seCYrH

delta 333
zcmW;Eze@sP9LMo{e%<+8<#V2Q5fmZr7w286IGII-APqs(CN&muxHPm#365R}ol}l2
zEmrV=H25b732m({6)w>t*tdq)d-x2W`e464*bf(xf4#JU{9g6YL7P{7r`dN9z<>Y>
z7*K%*Vt@l3%z#-i2jW1;zGIY2bV5}{28rYimbW$I2&s&4theMi#w$ebof|bOOuqBC
z^6md_$<c-3Qi8>|)au5U&>2BU#gri4oVE-(Z6#P$#o|X16RD3ApMq1u5hjH5hS^9y
zS#(Ic^iFC+>m5gDJvAMDm@F&HFV-$<hk@A+UYWcfSqCR1gFBH{w2!09VtoEF3>L8L
zl<d<A{68z=P3ocjAZQ9RB^q??<#Y-$WgT(P^;R7>=eT~#%@s1)LdIM1^Eq!Vul)ia
C>tad(

diff --git a/osinaweb/support/__pycache__/models.cpython-310.pyc b/osinaweb/support/__pycache__/models.cpython-310.pyc
index 5f8acdc021caa867746aed61d22afff25e4fe7e8..2c2fd1bd87bcdfacaadc449d5130d8d70aa3fc91 100644
GIT binary patch
delta 1784
zcma)6U1%It6rMYo-Ap$7GrQf*CY!Yeq?RcdD^;l=NL<>O7B}Lq2t&y@*_jQKPIl8X
zlc4R!wM|Nknrd=m#Rnn52N7RdiXbW|dF_*rE{dS|;ENBo4=O%*&Yd-;ZA1s|H}{--
z?z!ij`<;91=$lU_n~6kB!te0I7wexNxSssAmu+*Vev+|MwzeV}Lzg5)G71$*Pv7`T
z{Y`1t7@2p!2>xl5aQIUQfi%lz<(6c#Rkqn<%Uf)T1<Ed6#O~Q*o6#+4Np8uoza`K1
zZmKBtG~^k?ps&SdW43H7c4SpvW+?Y8v%IvVv=odXT5dxMkAV?{v;7a*R^XVHZ98^V
zXC0;PS%Kc)>94xA(@szcta=>=$UKkGN&1fG)B+P6G;?go(aIRX(*#2V1%!^`xqi^;
zU$ndh$2UpPBQTCDMm%T>*QQUtjWjv(1JicqEePhEMqp_F%)3T?mgj|2I6y}Tc#zJ?
z&NzWdtHCa(%edkv5wdKMDJ;$uxgaa@+2Js${ODer^kM#4;<gM^{Nv<dR^;C%hZQxY
z4e;NS+w3a;A~ku+qqEP@vAs2LL;)s91*D1u?wkW*X!E2M@$K`ShHd)pOvCcbX2bNY
zMTg_+En<u!$5{-A@+X{I&)vsYv=cd#w!TDQ5y%7%|52;5_xaKEnO-nRv&275udxsL
ziOj*{d+tCZBQ9?5IcU~h&w*EI-v~jLKqF`qyhd=Ir;GW5aQ*?xK82@B8q=7H^#fx)
zm*t6pJ|5ZUwyC_j{73A?CY*K~Gb57?SP`mDwB$8?q{T%PVTs@|gep8v(<czhx(0W~
zYa}bxvFZyIv-Hg5MCn+in=x$=af+}-u+ymPME&4?D_HQsC5t+#R6$;I`ju`vlt~dT
z;L?{k{5XOtDNKuKEJL|mpi-a8K6Q`+EbFnm0=g#vzMa)`m(lhnxr+*S8p|@cyq<H%
z$;t7LSf|%^>ehl6l=b9)Im8`d`9%(C65IS*?oswN|0#FgAdgizLh7(&ssHV;Mw@Jc
zo$|mX62pt8%0%H1D!$?04Lri;cq%{QG{~Tdpvy2ybLyO3Jl<(G!Sf$z(I*H976=vz
zUM3K>JM4#ZsQaGuEvotT{K=D|T<`|!%6k0Y^P(69V>^j%V=v6pLlx#FO18?!2lwZ%
zpyAIrd=()itj6F9(e>@Y*N@!EwR^6XP7&M^=e<SZG=FyJf&3ayf5Fjpo5kzSFj)J$
z3*H-y^J_y>?RU^bmplCv4co2P9l+NMu7<jvie<yQIIoIZ6paw}K}fsAUCA5T^T)<Y
z)rraS9-Sa=Q*^?9^a#`mh6;{q)dIKKfI~c9EEZq`)wgkUn^$2Oq&)I;<HpUxARDF2
t2p??mgiwP3(HbTRL<OjtK)J&Pa%Ezu6l0mbOf*x>#1Yk4RLGHm=wEMSj4c2F

delta 1326
zcma)6&1(};5YJ1KbWQWI-6l=*Q4yrp6;!k;ii!uJTC1(nfS9(%wYytm(~Zt<T5D~!
z)~`yTtq(l(Kk%rc2N6N>;K7sN!Qep=^r%<`5kY5OLhV7(h50e_dvE5=n>Vx5I~KNv
z3c;Y?g`Zt@*?hS2cIb08d%&4=&wthBab@CNE;W4jne@%$RueoO{=yH)YgvMi%1O5z
z=JWCsHpP2uJ9|tF0Rsr7>OL?u$IzjTs60_#CpTySG!b!<U=^`-wqfa6JJ)Y%`E0?;
z+S-tD1s4`5ACEi0{3xCuP~;Pl2>+=p<4wxG=n?YI5Ofo`39|f>l4i5~m2x^<s!8Yi
z1`Mam(M%JD`JuWwHqYPHHMjoJ6WucbvG*Vp%v|1pGZb+JL4-gi7$G=IaE@!ShWIF|
zH&JX#RdUHpW)cf97{yettR6>Fb$|CCF2F#}>R-`m!FfTIe7o}n8%uKmP0Ve5G*+`D
zD}E>%-=3u<ak5B69N&Xn$!9y7Q?#LvHXI{H(sbR>v&Tm&`B7@gF<iNWVh0c;mxsw-
znJJXq*kT>OMt3z2<8p`Uhb8ADQ>iCu<s5i-y&9cF`w@!mL!j$M7)&lkyI;S54@GOe
z#Y)w>VQR&^)1ij`6&XFs#T6H-C3A$g#Wu00d^|Rhp@?Z{A$l7^hZ_FxfW72&lwh$|
zaFNXNGg6tnYtVkqhZ;6i^}AgBliX;+3EGlFP~EVO^bo=CrWG1>u4w9)qzn>R1O<Xq
z1VHfHOE?sfdqMorV%7G=+uKFefO@_|4gCFjl&fgVQqU2-oh_cyam32k6P3Hh-^7>4
zrf}nH6k9?lx24QrN}Q=CuDAT-t?3xiZ{on~WcKj)iIuTwRNtah;zscO6$aB7w~_Bm
zp4>Z&YpT0c(`M;8(=@=a9GEL}Rb846H&9QDXN1kD!WM#Z0|u8~n}19uRWShK;luze
zr@b@)843R@eNL`mK{-D$i8HwJ0i`mD9;RTsV|&ir)l&^jrNTp$fJPQ*IDontItfG^
hDjMEpT`I*NH*Sn?@iS$a;!{#e08#S$gzc^O{Q|Ue8m9mN

diff --git a/osinaweb/support/__pycache__/views.cpython-310.pyc b/osinaweb/support/__pycache__/views.cpython-310.pyc
index 106d5e11bf8d48254cbfd2db3fb9dc4735259d27..2c1e1988cc8615d98eaa649c73ac6c51257224fe 100644
GIT binary patch
delta 849
zcmY*W&ubGw6rMM;JK5cAel*#nr4-s)iY%HIYLA}UrUwh6wt^Q4v9qm7+oYYHNDCWU
z44x#24hVvW=Ge2I^xnU~(}Mqm9tCk`w_@GleemA*zVGdu`CR>3&UbS;2dVGP(yN_f
z?rr|dsjV`qVpT=x0YU-^h=9Qm_p!hcJ|`nI06-CH8*P)98SazLyr4Q~WPtfx!ek=c
zw)RxU48>QjcvJDq32&!PFA!f&91P(wI)KxcAhK<@or^Hb4B<S_tP%8$>$P?v8D;-v
z*U;1PzA1`{%1k(Ch|kAHD14q&OHo?QGIvM-9X%A~YZJT?>QhnC6_#UuKCvyRp_zz8
zI5Hv{Wmxf}*|$VBLToIu24oZYCAo+n$Pc9ETtG}kYkMyc@{-KnjE!Cx@GYP4g1SOp
zR1h0HXtH%5Vn+o0pw(%LK>jAYHqMEr=~g0-%|qVmh}hc=M5DRC-$-2>p=j>x@S;33
z{0Xj~i|Yr9-Bk7XkZHTG#*~~k@6|b0oNvb&9vt<8P;g5NTn(Ovih`K-5)rTJ%DAp%
zw!0k>9E%IYZzJ@MJgaA~rt@z1KzoD>3S4l(0t%BVrc_wiBR8N59^kVQ_An+G(nEi_
zHedL(PQL+N(qrz(8S8#lnI{tvugMc@3TpDbwFoQn(s~VL`N%%GJE1z_V!GQ}aM<MH
zAm|7_t%WlhW_3e0ZP?UT6VtHEMZoxq{9(_n`nu`g)@wSgYgpHCOT)FlP-$GaS~U!W
nXmxhOx_shH!-hO|8dPtsjK4dRm5u+UiAhbm**S9_PvqebRYlHV

delta 1196
zcmZ8fOKVd>6rP!Tb02v%No!MURcsZ_qE!$Te1iqC+Tx?SDAW);lhWIm)VWi!azoW9
ziqeJ5RwP-8OVN!k`~iwPSNBgSxYUK`Olqy(%X~BEG4p-r%>3wm*Pm@<GD!m8m(ru^
ztL*daht)J#4h#!MI86yrMA3+Hy2hI92?<zW$qZ*rt3Ii0w7Jz{a=VEnA{ID{U~wDb
zC)VQ$h+k7~;01ofxU)vvN$z%NJJlggJF<gxI|HkP%3{W9H>K&Qp2wt0xySv7UgV6E
z7Hv^^&JgDfSuRT4Ci1fJcq-46E&70N%!PmGQXSfK)h1uiYow=*7>JIO*<#aEeZc~%
z^h_|b#@bstBzy{PFX&(QW_iz=MaivD6*o}~Kn1?q8hGu&4uSe|K$wiIh(&JXM@gQ4
zk!YsWwkL!aqEySeLQ1{*8@;&tn#PV=m|GO;ZfcZQlqgp?7km!-zVR_w;cXm*5$*uE
zPa-m#Y*J830=S!iEwXC_G%-%#WI9!{VtY9hQsUjliBMIl)e?)@*a4XZ50JW2+*%eP
zQ?K<o`^FLf_`Il#J4^CpFOt{*?A{Q$yQ8bEEE|oRW5;Waxk@cOIku6kPq9&bo9!yf
z4D6ULS+WSTF=AVaivGxCZb+i|*qJtE%8Z`1N`*MrHOIwLMXH;kuJlW5=xn08AVU==
z`G!08=Y=Yp3gT3E&lM~uwkq`%Q=i1w8mGIlt4r8K{oXpi3K_MU#O9UKGLO1E1bp9e
z5MU->gVa!!|B}rNC?j%{t4kfuWY!}_Nhr6$0kN}e*yIo%xg9<3T%)eU9VH9oI{0!J
zz>dbL_3hY5lo1{UNK=nFbdWkUO$TU_W@*1!JK*<NpEV42A7%FnEXSC|X!m!1rhR$%
z?RWbtb?_8<On-8w_7!kxzz`O(ZM6!N7Yb1?HzXIbyeL)<>C^6hI-!@`XLPIn<*w|-
z7bS-gMi6!*>_I32#7@|dN^m)$-*_Wu{%hj}Oq)cQLO6u*pN^hCeG^J8)aS!VUG#U-
gOZtdkb`E3ygnr=<Zn^aD)@~j8vp<p;Wdm9I8@Glkr~m)}

diff --git a/osinaweb/support/models.py b/osinaweb/support/models.py
index 6ccdb3bb..d856cb83 100644
--- a/osinaweb/support/models.py
+++ b/osinaweb/support/models.py
@@ -128,6 +128,19 @@ class Ticket(models.Model):
         else:
             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')
+        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)
+        
+        return all_staff
+
+
 
 
 
diff --git a/osinaweb/support/views.py b/osinaweb/support/views.py
index afd58c17..bf81a558 100644
--- a/osinaweb/support/views.py
+++ b/osinaweb/support/views.py
@@ -7,21 +7,13 @@ 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:
         base_template = "customer_main.html"
-    elif hasattr(request.user, 'staffprofile'):
-        latest_department = TicketDepartment.objects.filter(ticket=ticket).order_by('-date_added').first()
-        ticket_department_staffs = latest_department.department.get_staff()
-        ticket_staffs = TicketStaff.objects.filter(ticket=ticket)
-        if any(request.user.staffprofile == staff.staff for staff in ticket_staffs):
-            base_template = "main.html"
-        elif request.user.staffprofile in ticket_department_staffs:
+    elif hasattr(request.user, 'staffprofile') and request.user.staffprofile in ticket.get_all_ticket_staff():
             base_template = "main.html"
-        else:
-            raise Http404("You are not authorized to view this ticket.")
     else:
         raise Http404("You are not authorized to view this ticket.")
 
@@ -33,7 +25,7 @@ def ticket_room(request, ticket_number):
 
     last_ticket_status = TicketStatus.objects.filter(ticket=ticket).last()
 
-    connections = TicketConnection.objects.all().order_by('-id')
+    connections = TicketConnection.objects.filter(terminated=False).order_by('-id')
 
     context = {     
         'base_template': base_template,