From 4bdf4cecf36c733f18462b28800321705e7e3bb8 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 11 Jul 2024 22:26:17 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1560576 -> 1560576 bytes
 .../__pycache__/consumers.cpython-310.pyc     | Bin 5549 -> 5642 bytes
 osinaweb/osinacore/consumers.py               |  19 ++++++++++++------
 .../partials/recently-online.html             |  16 +++++++--------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 0465e4ac7d8f68024959aca258e09732c910bc60..6fd2c2d8adcf205f902addbfa6ecba925a0cb438 100644
GIT binary patch
delta 88
zcmV~$u@!<a06@VPK@mhjP%K~@2gx5L7Qe?0vV?QE4;6PQ$CTqbhwZz(!}dXf9Hfv^
fj&hPp&QePw7ir}xH|eC8y9_eQL!L7Ic;){Nc-9`b

delta 88
zcmV~$K^1~P06@XFf+C25pm=~b2H78FJ^VX1*b?S21VxxhIi?)fIc(qM9kve=<RFEV
fa+H%)a+X>exkxKlxk)Fz++~na9`cmw$1DGLYZo4g

diff --git a/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc b/osinaweb/osinacore/__pycache__/consumers.cpython-310.pyc
index 7f417cf307c533655f8173f89825ac6f7db22252..bec9a3bb9c0b03d7a1c422b7382911d5d6ced065 100644
GIT binary patch
delta 1129
zcmZvc$xjne9LM`gXX(te9lEe1C~}y%g{W*IQBee|6{RRjq>RjT8Cwc(hJ!kQNiV1u
z<1_I92aSm*F)<wY2Q=~O(K)!pn<u@hB);E3!9?1;&wPK&ci!u7CSBS0V1KX}2nZhf
znQwcP{!#rV_?{6s8urm;{vuzPiG`jy-ePUu;52{9i{qdS-lgBAV2Jc8X~ME^&Tq5N
z0=EA-LY|p}n=X;MjQ?Cg*Toq@BV@>~Us`6UpWF6p0h_bgW}DH1^wxq^X?u*Y5h)=p
zWD6xP@@Sr6k0O(I?6;H?nw&MQVnN5#xR}o6b;aih=^Qq#)RbD#9e-Zkl(>cdG%Qj$
zl4+^wblJe*BTzXCfF6g*71WIGwvw-04n;|v-#g%NS=Cf63u7KSw>^i!6UgXR%H7M<
z^{I_*Sao_@pVDwU^mjm4#VpQ~mwZ<2fz&ZTH>ve^wV$9;KoV*|G72Ie{qi(oy)3=@
z5c@}B%aH)_Z-MjP^HvbszZC8+-%9b~4NVjwiF(MqP(%4t=n(s%<t*SF`4EjTom38y
zpTd3ANoHcz<gr+bT3@^p5lWF2DTl6*>OddLtd0d*(88eW1H>s55eGqs0LK9`07l}l
z!<K5zns^8@4B!GF0k}w^aJU|{dz_n~Qh*7-#_2#cZebTy4p|RYq5=tpPQ@-k<uYIx
z&;(FOKGsl!lT?q>Wx_#t507|WVsVnZ78}W0D2ql&v)syF1;;3iAOvO`!fO<F_K;6<
zJz11@N3PRQ@g{H@YGZ&K&@U)dmLMD_ALZ}pA$ePQ5)BeI+!^kIwEIB8r1)`y42A33
z+$pe7s{)*c8oM!o^He)NO|?{f25PRkpDcyz(c<b_xCY6Yt@Hq>IQbl@icf-c2k*|j
z7s4IJ?9RWu70lXUtfHpg#sx6^^BQDn{Dh1~N1Aq=EOg%jWZ@;L!#dS>=`!Je!<{k5
cGm?aLvK~Ez668Rvmxbp*6Em@{ie$9$FL9~y;Q#;t

delta 1147
zcmZ{k-Ahwp9LLYI?Y!>n#kr}?RMdn{hTQ~nSwh*1R$DJqQ>pZ{bLKYYwx07$P|mP0
zgp43~F7ra^stYedg8qaE61wc%Bt+NU1YHF^zoSV;Zag2p&+l!|p6}UKPj2=GD}jK*
zvDe4m7rB+DH^KM3!n5rVTh<QU;b)e5>yj-Mg`(&Zw2TLV>&gaKMh0idYu>s{{E#=4
zWe-l<!n$h98wha^`}X2~7N4}mzv2N~TxJ!9YKyjD^G0CJS64{T=8B<Wco`W%o6SO;
zU~m~u3(+sa*QDlk#F}N|>4M=%Aj<ljiM!cZolv%BkqX;YaV1wMnT~1^J(t_t(N3v=
z8t60WSOQC|9QOfE1Ke)8U{!JzJf{;!%<Gm;2zCU$S~bgt!&h;kOz2N3?;n7MGk_#5
z%E=QjKtU=xioz&}eC#bD!6Tpu5`L+?$}$S_Jd!*f5B)5^j3ocGYaYC->54KMhpDf<
zj$+Q6Wim|`s;1-1lerQepg)vE_a*4M3>X2l?V}x3f?<TF{ZCPXZpWJGcmEO8{z_I6
znxIOcfW{~Z4568=cY$uSGz=Z?l&ef>ejJ2A2yhk<2EhF|LWbz1X5kwUfd>L#2c!UL
z22I4RpxwjipzZ^v0f(K{p;Ms-l%u84h4@V<yal)o=m2PdEPRU=oMHM7TNa!~;v^(V
zs(>@pueQ->IFCkYJ=}AA96F%v-&=usHHc3zEOyaP(N_8`+}SwEwwfo6O~_3F?$Y%@
zv)=}Jk72RLtsQUpfS%CK$ayqOvyuKtKjdBap;MD_if%^YDfe~+$Tb1rN23Y57juni
z$7kq7#}^^zHoLcV&_GATX4Wjsn~%4mjV)*?w_kh(l<Sj<J3)6bxFb#c0QRnLu4U(7
z%L5L&<l6V=MDXDbPb!AKfJ;#OKc5u$p_*ms=k#rKtm9ChiZEdo%!*@!X~LET|0J$i
dqQt8zHt1CB6iU(6*q{K0vcPsM=}kr3egg`D@?8J`

diff --git a/osinaweb/osinacore/consumers.py b/osinaweb/osinacore/consumers.py
index 0d9adbff..db305cbb 100644
--- a/osinaweb/osinacore/consumers.py
+++ b/osinaweb/osinacore/consumers.py
@@ -49,17 +49,24 @@ class OnlineUserConsumer(WebsocketConsumer):
         customer_connections = []
         staff_connections = []
         for connection in sorted_connections:
-            connection_data = {
-                'user_id': connection.user.id,
-                'username': connection.user.username,
-                'last_seen': connection.last_seen.isoformat() if connection.last_seen else None
-            }
             if hasattr(connection.user, 'customerprofile'):
+                connection_data = {
+                'first_name': connection.user.first_name,
+                'last_name': connection.user.last_name,
+                'last_seen': connection.user.customerprofile.get_last_seen,
+                'online': connection.online
+                }
                 customer_connections.append(connection_data)
             elif hasattr(connection.user, 'staffprofile'):
+                connection_data = {
+                'first_name': connection.user.first_name,
+                'last_name': connection.user.last_name,
+                'last_seen': connection.user.staffprofile.get_last_seen,
+                'image': connection.user.staffprofile.image.url,
+                'online': connection.online
+                }
                 staff_connections.append(connection_data)
 
-        print(staff_connections)
         event = {
             'type': 'online_user_connection_handler',
             'staff_connections': staff_connections,
diff --git a/osinaweb/osinacore/templates/details_templates/partials/recently-online.html b/osinaweb/osinacore/templates/details_templates/partials/recently-online.html
index 15be5791..b75d595f 100644
--- a/osinaweb/osinacore/templates/details_templates/partials/recently-online.html
+++ b/osinaweb/osinacore/templates/details_templates/partials/recently-online.html
@@ -19,17 +19,17 @@
             <div class="w-full flex justify-start items-center gap-2">
                 <div class="relative">
                     <div class="w-[40px] h-[40px] rounded-full">
-                        <img src="{{staff_connection.user.staffprofile.image.url}}"
+                        <img src="{{staff_connection.image}}"
                             class="w-full h-full object-cover rounded-full">
                     </div>
                 </div>
                 <div class="flex flex-col">
-                    <p class="text-secondosiblue text-sm">{{staff_connection.user.first_name}}
-                        {{staff_connection.user.last_name}}</p>
+                    <p class="text-secondosiblue text-sm">{{staff_connection.first_name}}
+                        {{staff_connection.last_name}}</p>
                     {% if staff_connection.online %}
                         <p class="text-green-700 text-xs">Online</p>
                     {% else %}
-                        <p class="text-gray-500 text-xs">{{staff_connection.user.staffprofile.get_last_seen}}</p>
+                        <p class="text-gray-500 text-xs">{{staff_connection.last_seen}}</p>
                     {% endif %}
 
                 </div>
@@ -50,16 +50,16 @@
             <div class="w-full flex justify-start items-center gap-2">
                 <div
                     class="w-[40px] h-[40px] bg-secondosiblue flex justify-center items-center rounded-full text-white">
-                    <p>{{customer_connection.user.first_name|slice:":1"}}{{customer_connection.user.last_name|slice:":1"}}
+                    <p>{{customer_connection.first_name|slice:":1"}}{{customer_connection.last_name|slice:":1"}}
                     </p>
                 </div>
                 <div class="flex flex-col">
-                    <p class="text-secondosiblue text-sm">{{customer_connection.user.first_name}}
-                        {{customer_connection.user.last_name}}</p>
+                    <p class="text-secondosiblue text-sm">{{customer_connection.first_name}}
+                        {{customer_connection.last_name}}</p>
                         {% if customer_connection.online %}
                             <p class="text-green-700 text-xs">Online</p>
                         {% else %}
-                            <p class="text-gray-500 text-xs"> {{customer_connection.user.customerprofile.get_last_seen}}</p>
+                            <p class="text-gray-500 text-xs"> {{customer_connection.last_seen}}</p>
                         {% endif %}
                 </div>
             </div>