diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index c685a06c..8c6852a8 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ 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 @@
-
+
@@ -155,7 +155,7 @@
-

{{status.staff.user.first_name}} +

xxxxx{{status.staff.user.first_name}} {{status.staff.user.last_name}}

{% if status.time_ago == '0min ago' %}

Just Now