adding marker workouts
This commit is contained in:
@@ -1793,8 +1793,14 @@ 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, workouttype__in=mytypes.rowtypes)
|
||||
markerworkouts = Workout.objects.filter(
|
||||
user=user.rower, date__gte=startdate-datetime.timedelta(days=90),
|
||||
date__lte=enddate,
|
||||
duplicate=False,
|
||||
rankingpiece=True, workouttype__in=mytypes.rowtypes).order_by('date')
|
||||
|
||||
outids = [w.id for w in markerworkouts]
|
||||
|
||||
dates = [arrow.get(w.date).datetime for w in workouts]
|
||||
testpower = [
|
||||
w.goldmedalstandard if w.rankingpiece else np.nan for w in workouts]
|
||||
|
||||
@@ -1285,6 +1285,13 @@ def performancemanager_view(request, userid=0, mode='rower',
|
||||
showtests=True,
|
||||
)
|
||||
else:
|
||||
markerworkouts = Workout.objects.filter(
|
||||
user = therower, date__gte=startdate-datetime.timedelta(days=90),
|
||||
date__lte=enddate,
|
||||
duplicate=False,
|
||||
rankingpiece=True, workouttype__in=mytypes.rowtypes).order_by('date')
|
||||
|
||||
ids = [w.id for w in markerworkouts]
|
||||
form = PerformanceManagerForm(initial={
|
||||
'doform': doform,
|
||||
'dofatigue': dofatigue,
|
||||
|
||||
Reference in New Issue
Block a user