Merge branch 'release/v18.9.10'
This commit is contained in:
@@ -1772,7 +1772,6 @@ def performance_chart(user, startdate=None, enddate=None, kfitness=42, kfatigue=
|
||||
|
||||
workouts = Workout.objects.filter(user=user.rower, date__gte=startdate-datetime.timedelta(days=90),
|
||||
date__lte=enddate,
|
||||
workouttype__in=mytypes.rowtypes,
|
||||
duplicate=False).order_by('date')
|
||||
|
||||
# make fast dict for dates / workouts
|
||||
@@ -1794,7 +1793,7 @@ def performance_chart(user, startdate=None, enddate=None, kfitness=42, kfatigue=
|
||||
return ['', 'No Data', 0, 0, 0, outids]
|
||||
df.set_index('date', inplace=True)
|
||||
|
||||
markerworkouts = workouts.filter(rankingpiece=True)
|
||||
markerworkouts = workouts.filter(rankingpiece=True, workouttype__in=mytypes.rowtypes)
|
||||
outids = [w.id for w in markerworkouts]
|
||||
dates = [arrow.get(w.date).datetime for w in workouts]
|
||||
testpower = [
|
||||
|
||||
Reference in New Issue
Block a user