sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fixed error

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-04 19:29:46 +01:00
parent 555200b5a5
commit 92ebe1f319
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rowers/interactiveplots.py
View File

@@ -171,7 +171,7 @@ def build_goldmedalstandards(workouts,kfitness):
else: else:
goldmedalstandards.append(0) goldmedalstandards.append(0)
goldmedaldurations.append(0) goldmedaldurations.append(0)
workoutdt.append(arrow.get(w.startdatetime).datetime) workoutdt.append(arrow.get(w.date).datetime)
df = pd.DataFrame({ df = pd.DataFrame({
'workout':ids, 'workout':ids,
@@ -180,8 +180,6 @@ def build_goldmedalstandards(workouts,kfitness):
'goldmedalduration':goldmedaldurations, 'goldmedalduration':goldmedaldurations,
}) })
df.sort_values(['workoutdt'],inplace=True) df.sort_values(['workoutdt'],inplace=True)
#for id, row in df.iterrows(): #for id, row in df.iterrows():
@@ -200,7 +198,10 @@ def build_goldmedalstandards(workouts,kfitness):
# fitnesses.append(np.nan) # fitnesses.append(np.nan)
for w in workouts: for w in workouts:
ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=90), #ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=90),
# date__lte=w.date)]
ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=10),
date__lte=w.date)] date__lte=w.date)]
powerdf = df[df['workout'].isin(ids)] powerdf = df[df['workout'].isin(ids)]
@@ -1837,6 +1838,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
mask = df['testpower'].isnull() mask = df['testpower'].isnull()
dates = df.mask(mask)['date'].dropna().values dates = df.mask(mask)['date'].dropna().values
testpower = df.mask(mask)['testpower'].dropna().values testpower = df.mask(mask)['testpower'].dropna().values
ids = df.mask(mask)['id'].dropna().values
outids = df.mask(mask)['id'].dropna().unique() outids = df.mask(mask)['id'].dropna().unique()
@@ -1854,8 +1856,11 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
previous = 0 previous = 0
for i in range(len(dates)): for i in range(len(dates)):
id = ids[i]
w = Workout.objects.get(id=id)
dd = str(dates[i]) dd = str(dates[i])
td.append(arrow.get(dd).datetime) #td.append(arrow.get(dd).datetime)
td.append(arrow.get(w.date).datetime)
markerscore.append(testpower[i]) markerscore.append(testpower[i])
markerduration.append(testduration[i]) markerduration.append(testduration[i])
score.append(np.nan) score.append(np.nan)