From 67fc069cf6fb95d28248cd5acb76fd5ab813bbac Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 6 Jan 2021 21:17:57 +0100 Subject: [PATCH] fix duplicate case --- rowers/dataprep.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e495403c..e6d50ad3 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1104,7 +1104,8 @@ def workout_goldmedalstandard(workout): def check_marker(workout): r = workout.user - ws = Workout.objects.filter(date__gte=workout.date-datetime.timedelta(days=r.kfit), + dd = arrow.get(workout.date).datetime-datetime.timedelta(days=r.kfit) + ws = Workout.objects.filter(date__gte=dd, date__lte=workout.date, user=r,duplicate=False, ).order_by("date") @@ -1520,8 +1521,9 @@ def checkbreakthrough(w, r): # submit email task to send email about breakthrough workout if isbreakthrough: - w.rankingpiece = True - w.save() + if not w.duplicate: + w.rankingpiece = True + w.save() if r.getemailnotifications and not r.emailbounced: job = myqueue(queuehigh,handle_sendemail_breakthrough, w.id, @@ -1532,8 +1534,9 @@ def checkbreakthrough(w, r): # submit email task to send email about breakthrough workout if ishard: - w.rankingpiece = True - w.save() + if not w.duplicate: + w.rankingpiece = True + w.save() if r.getemailnotifications and not r.emailbounced: job = myqueue(queuehigh,handle_sendemail_hard, w.id,