From a75c7d2d70ab14d5513fdf194f28cca8de789cd9 Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 21 Mar 2024 13:01:57 +0200 Subject: [PATCH] aaa --- .../custom_context.cpython-310.pyc | Bin 2614 -> 2861 bytes .../__pycache__/tasks.cpython-310.pyc | Bin 1193 -> 1083 bytes osinaweb/osinacore/custom_context.py | 19 +++++++++++------- .../__pycache__/celery.cpython-310.pyc | Bin 738 -> 736 bytes osinaweb/osinaweb/celery.py | 2 +- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-310.pyc index d382957f1f53cc891278f65498593d90c8f60f4b..1042d4a5f1668c02c2ff56542c859732333f843c 100644 GIT binary patch delta 1359 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 diff --git a/osinaweb/osinacore/custom_context.py b/osinaweb/osinacore/custom_context.py index 001744dd..57594173 100644 --- a/osinaweb/osinacore/custom_context.py +++ b/osinaweb/osinacore/custom_context.py @@ -2,6 +2,7 @@ from .models import * from django.contrib.auth.models import AnonymousUser from datetime import datetime, timedelta from django.shortcuts import get_object_or_404 +from django.db.models import Max, F def calculate_time_ago(status): @@ -21,14 +22,18 @@ def calculate_time_ago(status): def utilities(request): - last_connections = Connection.objects.order_by('user', '-date').distinct('user') - + latest_connections = Connection.objects.filter( + user__staffprofile__isnull=False + ).values('user').annotate( + latest_connection=Max('date') + ) online_staff_profiles = [] - - for connection in last_connections: - if connection.status == 'Online': - # Add user staff profile to online_staff_profiles - online_staff_profiles.append(connection.user.staffprofile) + for connection in latest_connections: + user_id = connection['user'] + latest_connection = connection['latest_connection'] + last_connection = Connection.objects.filter(user_id=user_id, date=latest_connection).first() + if last_connection.status == 'Online': + online_staff_profiles.append(last_connection.user.staffprofile) notes = None recent_note = None if request.user.is_authenticated: diff --git a/osinaweb/osinaweb/__pycache__/celery.cpython-310.pyc b/osinaweb/osinaweb/__pycache__/celery.cpython-310.pyc index 8557f1657ff1b25152da45fb72c69b8cad0abf53..e551eedb13896b6a16991e3dcb08bb4ad31dda88 100644 GIT binary patch delta 40 tcmaFF`hb-;pO=@50SJ19|D=j;