From 618afee04d3dddcd2e5635f0d69e2df29fba56ce Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 11 Jul 2024 10:20:02 +0300
Subject: [PATCH] new

---
 osinaweb/db.sqlite3                           | Bin 1560576 -> 1560576 bytes
 .../custom_context.cpython-310.pyc            | Bin 2833 -> 2837 bytes
 osinaweb/osinacore/custom_context.py          |   5 +++--
 .../osinacore/templates/recent-status.html    |   4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index b47c13cac9ad8fa6d71180ceda995e10b2bcc845..0cf22f23726f9de9343d2b876a2a386abdbb23be 100644
GIT binary patch
delta 277
zcmZoz5Z|yMeu5NJru0M^Cm^{ofk&4yyE#|4Jy(|zh?#(x8Hibcm=%cGfS4VKIe?fG
zh`E568;E&;m=}oofS4bM1%Ox(h=sQ2>IzR+V%yHj&A??mU8aB|cl!GUqT<{80)!_p
zGO==RmkSbp&BVsa%)rEx-7Xj^48$TpEDFS8+XX|#KTEL`vzs!YYUO8~E^EwgJpEju
z_!}m6)9t&8#4A~*TfG-Ow*7axIHv@&2K(>n>=VTOnb?1CZY)^LuBtR6n~gz`lfkjP
l*vP=hMAyJv*U(VGz}(8v%*xnY&%(mM+{|>l!VK{T<^T(VQZWDk

delta 229
zcmZoz5Z|yMeu5NJ#><H^PC#;F0*@|ZR&%ayd#)}c5HkTWGZ3=?F)I+W0Wmuea{w_X
z5OV=BHxTmxF)tAF0Wm)i3jnbo5DRV3)fJwu#I}u9kb%p1x=aB_?)3KyM8&uF1qe@I
z+^!HL{F-TE07tuEs4x(V0I?_#i)|MS75^;7Qp9e}fU1X|ak{KAyYcjMh2n3v?<o?m
oWC7})?(kmp!1mwe;+zu9>KqEw*(ZqmZ*D9&#lBr(hWG<>05p|LUjP6A

diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc
index 358d63f72dbe21006bd799ebbdf0f9134dbe345e..63c1e8bd06b4d93618459e453b5374ab66bd7f78 100644
GIT binary patch
delta 210
zcmbOzHdTx_pO=@50SNrs`_sNp<h{qm1LQCRaWTupuO`A_B}`e&Su7n4Sqv#my^IqW
zi^4YBFxoKb)e4u$fMjZfQ^a~17qF#>FJ!FcgouGuX9=Z90L9rCGSqUF$WC6xEXyc6
z`2@288&HGX9PZ73nC~$$a!<a^wt({%Ye{}eVx^|s=2~_EM*dqIC7HRYRrz_Tx0v(t
u%O}s}ILqe>bWo8zh|mKPldCv28MjPc!r92kF<FhvkcEkn?c3x?t{ng<KRR~+

delta 214
zcmbO#Hc^Z>pO=@50SIo!^`$+W$a{~A8^~b>;$pUmUrmG~N|>^kvsgM9vKUgBdKo7$
z7Da5fVYFeASs=5Jp;ov=79?9EoFdlCxPUE1d?8~kXNm0O3CyDMav+%$Ng$N!Wdh1c
zFJw$%NReq}l4PhADUq9egxP>4MQ#q)=3mVBm>9Vx-(*|Bq$$6-iCutEpokUdfLqLY
z`Q^7*QW8s2CokkUE8qeYE0PCEu$JVfBvwwY;nZZ@G<g|kBO}jb4K70_w(pZ;xpn{m
Ds|7nI

diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py
index 4764210c..c4c791a3 100644
--- a/osinaweb/osinacore/custom_context.py
+++ b/osinaweb/osinacore/custom_context.py
@@ -86,7 +86,7 @@ def utilities(request):
 
             ticket.unread_updates_count = unread_updates_count
 
-        today = datetime.now().date()
+        today = timezone.now()
         latest_statuses = Status.objects.filter(date_time__date=today).order_by('-id')
         last_status = Status.objects.filter(staff=request.user.staffprofile).last()
 
@@ -111,5 +111,6 @@ def utilities(request):
             'recent_logged_in_staffs' : recent_logged_in_staffs,
             'recent_logged_in_customers' : recent_logged_in_customers,
             'open_tickets': open_tickets,
-            'closed_tickets': closed_tickets
+            'closed_tickets': closed_tickets,
+            'today': today,
 }
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/recent-status.html b/osinaweb/osinacore/templates/recent-status.html
index 541a43e3..1ed0b3be 100644
--- a/osinaweb/osinacore/templates/recent-status.html
+++ b/osinaweb/osinacore/templates/recent-status.html
@@ -5,8 +5,8 @@
                 <span class="text-secondosiblue font-semibold">{{last_status.text}}</span>
         </p>
         <p class="text-sm text-gray-500">Last update:
-                {% if last_status.date == current_date %}
-                        {% if last_status.time_ago == '0min ago' %}
+                {% if last_status.date_time.date|date:"Y-m-d" == today|date:"Y-m-d" %}
+                        {% if last_status.time_ago == '0min ago' %} 
                         Just Now
                         {% else %}
                            Today | {{last_status.time_ago}}