From 797e5f1b87803d3eab20d76dc3205d6a7e6545dd Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Wed, 10 Jul 2024 13:14:37 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1556480 -> 1556480 bytes
 osinaweb/osinacore/custom_context.py          |   1 +
 .../partials/new-status-activity.html         |   4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index c685a06c68c44e3e474f59b35f5a729e9fc41ecd..8c6852a892f8b4c88770d190ea401368913f38fb 100644
GIT binary patch
delta 1513
zcmaKsU1%It7=~wd_UzfeGt*?Vj!hygsbYoA<jl{RzYEti2<na5q`T=~Od1=qN=w_6
zZZ1T!n+8G=)77@jhzRXPDT3A}Yda{|dZE1$w1UuF>DE?J5H@#J6!c_gX=Ac2Gw*p}
z=H=l#=lf<#rLj_JtkT80?{p8a?$UU?mmRGh>YZWP;OSqa3VZiNv2UT+$5I8TII5sm
z>;sFJxh`SAfi)mSUJ?d`s_>EUm-Ac=^myYnaEIqZ92-#Cpl{qlwhpL5RM5-T!_^x1
zJX&$!&B$ExPqd1DLp8L5etK|K+b-K^JLCcZHptv<ILF*+`p-?j-SpbkA0xpYt_xMp
z!l)WV=TXJka+7=V%0%>O^bA^M=$+)}f`Dn;%1#vr_a8qtc|hgoxW<D*s`+4H8AYjL
zRB<Xq#Zw7XTd3No+P!6z7}^o~5EPiG>U19oA9CvFlA^abm?*Jf@Fn;hd<rf({7~Yb
z4sa2i1Mh)%!CPP+ya|fnFerG@;lz%>D~)4`kNURHx4pjY@ol$nyL=n*E$>^-x1E4v
z0`cL-I@DORjdgJ0MlM0sL6xL>%)5~jpY04z!jsJZOBPt?2^Ff&w@1aR-S8It9)1JA
zhS%X|unIqh7vXvMK0FIg!IR$nwD^0_S*$0gy}xI~$m3>bbcqqZ5>5*v!dAY<U*KQo
zZS*ht4xK@HB%@gT*Z8&gd^{KLiv1B=j-80T80(DIqD$5Ck>k-=+8qrs+ahfLRMENp
zwwP>}v5gH|l_i<TrYRflKIiD7*tvbGs47^|da=<f<5V++C8E%boObv6ltStOh1gh=
zG+o0wG2A_le2P*Esf`qxQYA~Vu%e{h-7P7Kq^deLC}r0pD6*tmnrf<Pccdi+ONMEf
zI^9wJ5fm(8Ly-+5?dCR9G@DqGtSFYD8Sc);xy)|f5lxvA!6wo0Q|@qx5hG0h3zG*A
z9$t5T*rF&K>ym0JI+1(ap%BwXbA{J7giM<di55+;vCYkfm;?>Y%uL@;={U8<GHpeZ
z3_=u@^tgjf*2MjkA0oC)Bx32BqI&rc#7pfRVN_>?FN8M)i@(QT;g9h$s?!ht7MjhJ
z4}_ThKtH#Rv99Sv)#yKE^E)~=nu4(rDXe75ueKyK8%`UF*^P96WQeZJYI;~?GUbVf
zA=bJr6WwfuSeq9tt7_!hWTw3TVT83#%Q9|R1b&$g3$_d^`oq0UdAuc}*=C{<Yf};a
YpvZ=%8Ik;%OnJ<ytVWVf_PY4Vf60_{ApigX

delta 475
zcmZwDze^)Q6bJA(yV<OXnVrOSvqmF9iw!|EMc_aS74rvZl*C4eh+4>n%iT$YyJqjM
zNGH)mrVt^Go%ka`r%`Mqb{g%~wXm>?t#EKYOW}BY_%aW^JQ&-~+IF_oL(&`JBuO95
z`v%EmJvX>Uh*W+WDv^gjg?O<LCrCmva*0A*SwECREX7qv8B*$OkG=A7N9pHNj^Y*z
zj`FB!=KyeO!5PM}1;tcLL2jgqRI9D-$m1Gtwdwh7JkbA4J#d($5vdPup#mU<;0DT=
z0cgS|rUx!z15WNeu6{X0Yg?)}!Tn9yI-d8&Xw0GlV!$F~Ir$}*|Gc!iwD`UXf)T;)
z97LjI@jHD1TC7noYDYfw{?-sfeiT3*qDJ-U3HP?r06Y@Tx8-=NYM5euO1B9QPV0Y#
zHKR{R<x>7fv60qMCo)h_G}7j1w`*3tgO5!{cyB^Y@T;%piKu=vpIunbi@P;5+7<TE
z46qAUX0t4$IohtaqK(jh^qN*^2LI&~6`37#zr!oDVPI$MCmY7?0F%dlWqIkvWAN0u
GdGH3~j+-d}

diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py
index 4090d746..4764210c 100644
--- a/osinaweb/osinacore/custom_context.py
+++ b/osinaweb/osinacore/custom_context.py
@@ -50,6 +50,7 @@ def utilities(request):
         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()
+            total_tasks = open_task_count + working_on_task_count
             all_tickets = Ticket.objects.all()
             filtered_tickets = []
             for ticket in all_tickets:
diff --git a/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html b/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html
index e52c8d61..c95d1c4a 100644
--- a/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html
+++ b/osinaweb/osinacore/templates/details_templates/partials/new-status-activity.html
@@ -136,7 +136,7 @@
 
 
 <div class="w-full flex flex-col py-3 users-activities fade-in-up" data-userId="{{ status.staff.user.id }}">
-    <div class="w-full flex flex-col justify-center items-start gap-3 bg-red-500 pt-2 px-2 pb-6 rounded-md relative">
+    <div class="w-full flex flex-col justify-center items-start gap-3 bg-gray-200 pt-2 px-2 pb-6 rounded-md relative">
         <div class="w-full flex justify-between items-center gap-2">
             <div class="flex justify-start gap-2 cursor-pointer userRecentActivitiesButton"
                 data-modal-url="{% url 'userrecentativities' status.staff.user.id %}">
@@ -155,7 +155,7 @@
                 </div>
 
                 <div class="flex flex-col">
-                    <h1 class="text-sm text-secondosiblue font-semibold">{{status.staff.user.first_name}}
+                    <h1 class="text-sm text-secondosiblue font-semibold">xxxxx{{status.staff.user.first_name}}
                         {{status.staff.user.last_name}}</h1>
                     {% if status.time_ago == '0min ago' %}
                     <p class="text-sm text-gray-500">Just Now</p>