diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index d2c77f3b..84b10091 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 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,