Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Only derive session times from logs of the same day

Roland Geider5f357b28ab5e
diff --git a/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py b/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py
index 4f2a480e9..c6bb1c9b6 100644
--- a/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py
+++ b/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py
@@ -5,7 +5,7 @@ import datetime
import django.utils.timezone
from django.conf import settings
from django.db import migrations, models
-from django.db.models import Max, Min
+from django.db.models import F, Max, Min, Q
from django.utils.timezone import make_aware
@@ -46,9 +46,11 @@ def build_interval(session):
def forward_func(apps, schema_editor):
WorkoutSession = apps.get_model('manager', 'WorkoutSession')
+ # Logs pinned to a session of another day must not move the session there
+ same_day = Q(logs__date__date=F('date'))
queryset = WorkoutSession.objects.annotate(
- first_log=Min('logs__date'),
- last_log=Max('logs__date'),
+ first_log=Min('logs__date', filter=same_day),
+ last_log=Max('logs__date', filter=same_day),
).order_by('pk')
batch = []