From e2d07d872dcccb2298f9764dfd2960770d453d2e Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Tue, 9 Jul 2024 12:50:39 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                  | Bin 1536000 -> 1536000 bytes
 osinaweb/osinacore/custom_context.py |  18 ++++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index d2c77f3b1fa3ec2c02eea38549a3c21aef506734..84b100917d2979fdc63254f3b05fa11348e87e52 100644
GIT binary patch
delta 841
zcmZvaT}V@57{}jp&bG7nob5dOaMQkQN(nAD&vwqXvqdbm@2l!gNK8r$%rt67WUyf|
zyor^_>rGZdDA7eBc0wq$i~NYxZX$$eL4n|fQlw6jdi|&i>*B}%;(4F{^E`jvWVSk)
zt<G#?YHn|@WNMzCw)mLw{zl&whRJn&^=Fu#wwAJVOBq99DICS1x0D%gJt?t6JA!X8
z3t!+PyoX5`g<%+khtLfKGSCkF@ECHsH*2f`-o!Dif^zB1oRMOp@Ooy>e9^|k46|sk
z8wSjHkTaX#nn%pTuuNWY*vrCqeSyPo45YNz<?Wp{W8NhScM(DkVb#whjvG15iet}g
z*f3ORg)Rh3Fb^}3g%2=A_Zfoc@C5qcK6DY!6mHeKr|`05<2jZ^In=YE5A?oI_>`^C
zYFR??0<J++T9BrsN74<cLPFM;)>doGvP3-d_>6vY9$&I>@l-JxUcq^OMU905{-7FB
zqG6N^%0bm9M|^VBBS&MawV+=O$eJ9n4|T*-MSpwLh(8nv$brCrdeo?24J*NbwqtBE
zp7N~r6zF6HH?o{vYUt#JB35b`@Cy5+Ei?(_NL@7|=T7FFmZ)rMY(8Iix$dlzPD%nr
zq*(N%WIg!Vq9`#n=nn@pRa5kLb5_O1Z51Xud1;Rz-V>WdRag`z`cut!gir}NW<vQ4
zDz9%!)Yq9dT@{MSs$Z5hC8EX1Q4@+|rkoBZ`zvg2vLZ_0_;YwzlQoSTF`>Pr&>|I-
zY6)eN*Lr#(IV^{K<gf|t-telW&t24JHH(NG(G-mwqBgWjYJVB?3hBImt=2+S)Nn98
zElL!i*eG_2L!TC%-UFN)*XsOn=MRR(wdCgs=PomD#R+@?*Xy2>&In&@<Pa;4ul-hW
cY+XjzWn^7mr`xKWlst-y;?~=$@~^vp0|lV)00000

delta 637
zcmZwCO=uHA6ae6v-87roP3CQqw$|#Qf>?+)&Hg0m2BgNHyT6BmMG*^Hs8p2nVAYf;
zxyec`>u(iQ2)2hxs3Qeydk{nqMg@_g7@<PJLqow*#flG)Dl^}EFf;G*CSUE&SG(PH
zG<$jd4w`*<IM_y?mHXNTC|w!;5_jpHLax1-Yo|y;GV+OBd)=jpO**&)mf$PQ!$)`r
zui!b%!W7(xQSiWpGK|A_=o7JO-62p2Ap<s<FS?6$$d44^E(T8OO5iD7@`a_z0GpD%
z7cz^fl3%;)mnkN(EVGxs2&wmLW3WKV>NV{1M!ibJ+W>1)8k*Ewco0!<VhpM`F#6T&
zk96jnY1W`bU<GQh09AMo6`XDc9>WBbyhMea@U~T0M2uG053Un(oQ&_s;v-~iA0|=y
z#187sT4<2K6F377U*;A5fM4L-ISEaN2E9a$9q>A9*x_Q0oeFyAelq2}m5e7Wr^7MH
zq?s`7wuFhh#c(o7D`TbO>6BqO4k6Nqtd#xhfswK7c*?L7hE2-<-X-IfW0<Ci#kc=g
zY^LL#L$t-4U1d$eTV;Kctn>VcqHd5v_a<ZNR=&39bk9+n5PF5Qw$k3-V}BO@l@#+_
zMH&i<JP+;q95g#JHqM(&rcx>KdNE|_a)UNEqVUb-q5hIqoYOc0q@ys3h&e49+bM@x
nK`6VU->CO%PjsV*?Tx0DVYh!vvCtJo^{4?gibB_#vyHz27wx?q

diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py
index 18394de1..4090d746 100644
--- a/osinaweb/osinacore/custom_context.py
+++ b/osinaweb/osinacore/custom_context.py
@@ -13,9 +13,11 @@ def utilities(request):
     user_offline=None
     open_task_count = 0
     working_on_task_count = 0
+    total_tasks = 0
     open_tickets = None
     closed_tickets = None
-
+    latest_statuses = None
+    last_status = None
 
     if request.user.is_authenticated and StaffProfile.objects.filter(user=request.user):
         notes = Note.objects.filter(user=request.user).order_by('-date')[:6]
@@ -24,6 +26,7 @@ def utilities(request):
         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()
+            total_tasks = open_task_count + working_on_task_count
 
 
             all_tickets = Ticket.objects.all()
@@ -82,16 +85,11 @@ def utilities(request):
 
             ticket.unread_updates_count = unread_updates_count
 
-       
-    
-    total_tasks = open_task_count + working_on_task_count
-
-
-
-    today = datetime.now().date()
-    latest_statuses = Status.objects.filter(date_time__date=today).order_by('-id')
-    last_status = Status.objects.filter(staff=request.user.staffprofile).last()
+        today = datetime.now().date()
+        latest_statuses = Status.objects.filter(date_time__date=today).order_by('-id')
+        last_status = Status.objects.filter(staff=request.user.staffprofile).last()
 
+       
 
     recent_logged_in_staffs = User.objects.filter(
         staffprofile__isnull=False,