diff --git a/jarvis/core/templates/dashboard/dashboard.html b/jarvis/core/templates/dashboard/dashboard.html index 4d78f36..5df66f2 100644 --- a/jarvis/core/templates/dashboard/dashboard.html +++ b/jarvis/core/templates/dashboard/dashboard.html @@ -133,9 +133,9 @@

Last updated gymnasts

- {% if last_updated_gymnast %} + {% if last_updated_gymnasts %} - {% for gymnast in last_updated_gymnast %} + {% for gymnast in last_updated_gymnasts %} diff --git a/jarvis/core/views.py b/jarvis/core/views.py index 1d7969d..3255bf4 100644 --- a/jarvis/core/views.py +++ b/jarvis/core/views.py @@ -99,13 +99,28 @@ def home(request): # A METTRE EN CACHE. # last_updated_gymnast = None - last_updated_gymnast = Gymnast.objects.filter( - Q(mindstate__created_at__gt=request.user.last_login) - | Q(points__created_at__gt=request.user.last_login) - | Q(chronos__created_at__gt=request.user.last_login) - | Q(accident__created_at__gt=request.user.last_login) - | Q(known_skills__created_at__gt=request.user.last_login) - ).distinct() + last_updated_gymnasts = set() + last_updated_gymnasts.update( + Gymnast.objects.filter(mindstate__created_at__gt=request.user.last_login) + ) + last_updated_gymnasts.update( + Gymnast.objects.filter(height_weight__date__gt=request.user.last_login) + ) + last_updated_gymnasts.update( + Gymnast.objects.filter(intensities__date__gt=request.user.last_login) + ) + last_updated_gymnasts.update( + Gymnast.objects.filter(points__created_at__gt=request.user.last_login) + ) + last_updated_gymnasts.update( + Gymnast.objects.filter(chronos__created_at__gt=request.user.last_login) + ) + last_updated_gymnasts.update( + Gymnast.objects.filter(accident__created_at__gt=request.user.last_login) + ) + last_updated_gymnasts.update( + Gymnast.objects.filter(known_skills__created_at__gt=request.user.last_login) + ) limit_date = today - timedelta(days=14) waiting_update_gymnast = Gymnast.objects.exclude( @@ -148,7 +163,7 @@ def home(request): "quote": quote, "week_number": week_number, "event_list": event_list, - "last_updated_gymnast": last_updated_gymnast, + "last_updated_gymnasts": last_updated_gymnasts, "waiting_update_gymnast": waiting_update_gymnast, "nb_active_gymnast": nb_active_gymnast, "nb_event": nb_event,
{{ gymnast }} {{ gymnast.club.acronym }}