Sulley
/
Jarvis
1
0
Fork 0
Code Issues 21 Pull Requests 1 Projects Releases Wiki Activity

Rewrite gymnast update check

This commit is contained in:
Gregory Trullemans 2023-07-03 13:38:31 +02:00
parent 184ac55e44
commit 44b73e789b
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jarvis/core/templates/dashboard/dashboard.html
View File

@ -133,9 +133,9 @@
<h4><i class="fal fa-highlighter text-success"></i> Last updated gymnasts</h4> <h4><i class="fal fa-highlighter text-success"></i> Last updated gymnasts</h4>
</div> </div>
<div class="card-body pt-0"> <div class="card-body pt-0">
{% if last_updated_gymnast %} {% if last_updated_gymnasts %}
<table class="table tablesorter table-striped table-condensed" data-sort="table" id="gymnast_table"> <table class="table tablesorter table-striped table-condensed" data-sort="table" id="gymnast_table">
{% for gymnast in last_updated_gymnast %} {% for gymnast in last_updated_gymnasts %}
<tr> <tr>
<td class="text-left"><a href="{% url 'gymnast_details' gymnast.id %}">{{ gymnast }}</a></td> <td class="text-left"><a href="{% url 'gymnast_details' gymnast.id %}">{{ gymnast }}</a></td>
<td class="text-right">{{ gymnast.club.acronym }}</td> <td class="text-right">{{ gymnast.club.acronym }}</td>

31
jarvis/core/views.py
View File

@ -99,13 +99,28 @@ def home(request):
# A METTRE EN CACHE. # A METTRE EN CACHE.
# last_updated_gymnast = None # last_updated_gymnast = None
last_updated_gymnast = Gymnast.objects.filter( last_updated_gymnasts = set()
Q(mindstate__created_at__gt=request.user.last_login) last_updated_gymnasts.update(
| Q(points__created_at__gt=request.user.last_login) Gymnast.objects.filter(mindstate__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) last_updated_gymnasts.update(
| Q(known_skills__created_at__gt=request.user.last_login) Gymnast.objects.filter(height_weight__date__gt=request.user.last_login)
).distinct() )
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) limit_date = today - timedelta(days=14)
waiting_update_gymnast = Gymnast.objects.exclude( waiting_update_gymnast = Gymnast.objects.exclude(
@ -148,7 +163,7 @@ def home(request):
"quote": quote, "quote": quote,
"week_number": week_number, "week_number": week_number,
"event_list": event_list, "event_list": event_list,
"last_updated_gymnast": last_updated_gymnast, "last_updated_gymnasts": last_updated_gymnasts,
"waiting_update_gymnast": waiting_update_gymnast, "waiting_update_gymnast": waiting_update_gymnast,
"nb_active_gymnast": nb_active_gymnast, "nb_active_gymnast": nb_active_gymnast,
"nb_event": nb_event, "nb_event": nb_event,