From 327e1dbe2e08aed3f3869316a38f5ed5166818e7 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Fri, 9 Aug 2024 13:34:22 +0300
Subject: [PATCH] new

---
 .../__pycache__/consumers.cpython-310.pyc     | Bin 14854 -> 15015 bytes
 osinaweb/osichat/consumers.py                 |   3 +-
 .../chat_templates/partials/visitors.html     |  48 +-----------------
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-310.pyc
index d814185785c7557d6945dd9a08d43d07fc5d15cd..d88c731d88a4a0d2588d44ffef89ace2ce84c91e 100644
GIT binary patch
delta 1494
zcmY*YZA@Eb6u#%ud;48J%F2h30qvk20!@XMk(tbm=?{%D+v1ijrdDn#E$hnO-fdZJ
zg9&EwtJ}hns1sc~8Pnj<c|qqygBlDfYJwz&{+K^a^pF2E(L~>KfuK$9({s;xp7Xr#
zdEa|My>Z5ovfC{J|DFGRe(*y4mSeec)XHCF{v6;>`Ys1mC_qsth(#eMs$~g7LduE?
z<RKxeMnxP0r7RBxlVT`Bu1t}#WpT(EvO>bF$ipH#5fgGe*DpNLmXotm!IG5|R{q!&
z<D^&w5LA0s9)p}wb?BYtQN@&poJlb&mS=^msbAnlbJm<SD%QP%-oQw*({652u2v)}
z6<bzP?31Eer8x4UQl95kMK~;|PNgDiP%86c&a%NR5Z9tqk?}Uq=X}%$#~aSZ({VM$
zPClH9g~R$wSc$07u#U%FTjl>(xzKi!v(oB@BxCRR?<-DMU4jJ+I*Z-aC6gLYMl-2X
zQP#+ZS~5^~*3CoKLl7j05jY5jIN&eN-FQ7vjw61v(`RM1RCt6#Nm5fv<UICOA2X89
z22I*4)eivVaeYU>{1Wl<=yn~3i}<sz1~0lA;Cq~Ljlm^c+*5-O)-=j3Y#*oL3sA3(
z)jTc2Z}?B$IJ|~oQ!^N~x%yiYyo`fQNw|h<P0u@~Ik{vQiKs(9kxk)n^9lJT+05cf
z^ZoWI3eR!ymGPphrKgTEB`J1>kA`wo*9bm9rR7`sHiaK!kNY`z6+d&=a^IiaBlpaa
z$Z=pOq8>`6l82&a<I!_$llzp%Q+I`AWK*&Ya8fuKO{XKVD7U=o=>`qgJRxvswq1XU
zFpZLTr@Tah3Eb^%sh=U4DV`3;lO&m?3gy`AIOrXQNnG_N0*jOg5lj%!C&0`cO2$}J
zji@TykStSP?{Er>0Vh8n3%=-U>-dWDy5|5z8G^3~^l8{OmrFM)!e;o%)JhAyx~%=}
zYlP5MA|Bzu=ar_ol|Wy|QHtK6lE`*ZthbL)^c_Cdz7r;Jr2Qf3O`b4o3+)+@uTial
zdpqiR?Py0Ee1oGM&%nfZ=YG86uak<r-l#p<`8YJZO;p`iWS>*KZTS|ic6qt<udXgw
z#dd!iHE6?(-(}UA`Z9jhH*$k34{Epl0cd@1t0AKs!guopCG^{}-TED@2>9S8_62&p
zG)bRfV`utQPm>@@SvxaQ{3!wVZiFeE4|uG4N8No*cYl}HBO2Uigw}bY(stM}4&0so
z*p~#`?(bt~_Yr++we)e}O27{DxE^Ye<~T8<t#|K$8oKgZXQ7|0u3teZ*atu0zTmyQ
zK{B{s`jGR+aV|J(|AbsNN4bQlP-nwOlu-!iw0y>m?JQCv&BY#A!n>hH=?+g^AMYLT
u(0yQZj*L!-(Nr02j?uapIk7wR3Crv<kAKCfUN>CE<=#IyF77!9{(k{99GY|h

delta 1288
zcmYLIZERCz6u#%S_x59L0by&|N9MYATj$n|eYGqab&MDdF_AAZhSZzgy0y>@-rk8W
zw}Av=R4hhLf{H`iWsV>Ntycua@R1QAPJ{7>i8aRf%V_+ezvQRq+>NZs`}Ev%o^zgi
z-gEBRsaK7_q~GtA=r{7ur5FF6s08k;JIv22oh@|oUlSNo7D{qiD#$vRas~<xQ_4DY
zd7mtv8kY)AQy!J}wiguBS#p|6R-vQnjv2WOAQ>)GISK{UaAzUwF%{iegn~;~boH2I
zx<)06xlOmJ>aK?+J70Z<(+)mB5?-Sw>(kw)Q}@ishF|v<Wxb|IQC-?083EmAI&^<g
zE_jx?CFXkc01L13Vr!np=JjvERs3XqdF>i8Kn;mOf~rH?zaNin=!7Bst*+4*^NJA1
zwh`dZ8}=y7^jgW<#{rJxbls@>28WO1t-2lXCLZYwVo$IUzQ=9BqfkU`IEa4)o1n!~
zLZ@Z;3rqDU;T=r5TR^pTHB=NhiLRC$lyIu$^}rmJsyYv7#zagOv*-&yub$`X3z!Q(
z;-6*n5JAjA!OP*njqIr^<5TIp!9I>x7(PX%bxHk#&CB>x>uYcdQ;`tqz8pEw@EIos
zwoGWo_Q}cI_Vi1c^dYgrbwnc@-{mxxsrtr<l**;^d2KvRl8;3Ppn_A;1o*8B(R(t?
z;e1E4y2uHLOC90*bDZYR<Wrd(rz~)Ued0ZI#rDBz%*V3b*VvI@Kn7kY;UTEH#?yvo
z7-Bi)8}=`txAV#FTWs1gV{A<`+-9&Zz_;>-DP1!(agJsXQof?-ZR<>D6C}<saVG&?
zQJ(EK23z`Bw%+HEETU}N<u$gJ@ZX1;0dZZ|6Uq!Z+}7T%X;4cX`v8CKuBX_&?sm9?
z55|v>U5<~yU0eD?qBL62vl|-cnQcqU;yT-_s%6agc2M?AZx8%{-}ScJHQKRZQypB#
zYCNobL<ytTbDR30?ZW*!g4coixWNv4HC8L0#Y$fc&f_nAgB^VFG3Rnm_7DzoLYlpP
z;bQwL1HX0?%;N6;NX-p)*!}-#xA8GOzhKSwyP(bD5Vs-r5Rg3oiJJ_o@)z;$z)t(Z
zLU=9i!Cb#zwG(gR;bfD-Tlb1JJy;7t-tzmiuqSI5`4;DghUvTceW;771QH|4=fry(
zcO@?RzhtSEdtAh|$v9lXN0YUxy-9f@M_|!bxkAJ_EGNezya0j+CwLx$FH>+!f?q^%
dX>o<WPF0*B`%m1uxfM=eX7hi9+VEEB`5)8dR{Q_}

diff --git a/osinaweb/osichat/consumers.py b/osinaweb/osichat/consumers.py
index 8477eaff..e6bf4e12 100644
--- a/osinaweb/osichat/consumers.py
+++ b/osinaweb/osichat/consumers.py
@@ -170,7 +170,8 @@ class Osichat(WebsocketConsumer):
 
 
     def get_visitors_handler(self, event):
-        visitors = Visitor.objects.all()
+        today = timezone.now().date()
+        visitors = Visitor.objects.filter(visitorlog__visit_date__date=today).annotate(latest_visit=Max('visitorlog__visit_date')).order_by('-latest_visit')
         context = {
             'visitors': visitors,
         }
diff --git a/osinaweb/osinacore/templates/chat_templates/partials/visitors.html b/osinaweb/osinacore/templates/chat_templates/partials/visitors.html
index 4e82a7be..09fafaa6 100644
--- a/osinaweb/osinacore/templates/chat_templates/partials/visitors.html
+++ b/osinaweb/osinacore/templates/chat_templates/partials/visitors.html
@@ -1,47 +1 @@
-{% load static %}
-<!-- VISITORS -->
-<div class="h-full flex flex-col">
-    <div class="w-full py-3 px-3 border-b border-gray-200 flex items-center gap-2">
-        <div class="w-[20px] h-[20px] bg-green-600 rounded-full onlineDot">
-            <div class="wave"></div>
-        </div>
-
-        <p class="text-secondosiblue">Visitors today</p>
-    </div>
-
-    <div id="visitors">
-        {% for visitor in visitors %}
-        <div data-visitorid = {{visitor.id}} class="visitor w-full flex justify-between gap-2 items-center py-3 px-3 border-b border-gray-200 text-sm cursor-pointer bg-white">
-            <div class="w-full flex gap-2 items-center">
-                <div class="w-[40px] h-[40px] bg-osiblue rounded-full relative">
-                    {% if not visitor.country == 'Unknown' %}
-                        <img src="{{visitor.flag_image_url}}">
-                    {% else %}
-                        <img class="w-[30px] h-[25px] absolute top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2" src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}">
-                    {% endif %}
-
-                    {% if visitor.is_online %}
-                    <div class="online absolute w-[12px] h-[12px] border-2 border-white bg-green-600 rounded-full bottom-0 right-0"></div>
-                    {% endif %}
-                </div>
-
-                <div class="flex flex-col">   
-                    <p class="text-secondosiblue font-poppinsBold">{{visitor.ip_address}}</p>
-                    <p class="text-fifthosiblue text-xs">
-                        {% if not visitor.visitorlog_set.all.last.title %}
-                            {{ visitor.visitorlog_set.all.last.url|slice:":26" }}{% if visitor.visitorlog_set.all.last.url|length > 26 %}…{% endif %}
-                        {% else %}
-                            {{ visitor.visitorlog_set.all.last.title|slice:":26" }}{% if visitor.visitorlog_set.all.last.title|length > 26 %}…{% endif %}
-                        {% endif %}
-                    </p>
-                </div>
-            
-            </div>
-
-            <p class="duration text-gray-500 text-sm">{{visitor.total_duration}}</p>
-        </div>
-        {% endfor %}
-    </div>
-</div> 
-
-<audio id="visitor-notification-sound" src="{{domain}}/static/notifications/new-visitor.mp3" preload="auto"></audio>
\ No newline at end of file
+aloooooo
\ No newline at end of file