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

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2019-10-23 21:25:47 +02:00
parent 8398701320
commit 2099dde846
3 changed files with 19 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
rowers/interactiveplots.py
View File

@@ -77,6 +77,7 @@ import rowers.stravastuff as stravastuff
from rowers.dataprep import rdata from rowers.dataprep import rdata
import rowers.dataprep as dataprep import rowers.dataprep as dataprep
import rowers.metrics as metrics import rowers.metrics as metrics
import rowers.c2stuff as c2stuff
from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima
@@ -1815,7 +1816,7 @@ def interactive_agegroupcpchart(age,normalized=False):
fhpower = [] fhpower = []
for distance in distances: for distance in distances:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='female', sex='female',
distance=distance, distance=distance,
@@ -1829,7 +1830,7 @@ def interactive_agegroupcpchart(age,normalized=False):
except ZeroDivisionError: except ZeroDivisionError:
pass pass
for duration in durations: for duration in durations:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='female', sex='female',
duration=duration, duration=duration,
@@ -1847,7 +1848,7 @@ def interactive_agegroupcpchart(age,normalized=False):
flpower = [] flpower = []
for distance in distances: for distance in distances:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='female', sex='female',
distance=distance, distance=distance,
@@ -1861,7 +1862,7 @@ def interactive_agegroupcpchart(age,normalized=False):
except ZeroDivisionError: except ZeroDivisionError:
pass pass
for duration in durations: for duration in durations:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='female', sex='female',
duration=duration, duration=duration,
@@ -1879,7 +1880,7 @@ def interactive_agegroupcpchart(age,normalized=False):
mlpower = [] mlpower = []
for distance in distances: for distance in distances:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='male', sex='male',
distance=distance, distance=distance,
@@ -1893,7 +1894,7 @@ def interactive_agegroupcpchart(age,normalized=False):
except ZeroDivisionError: except ZeroDivisionError:
pass pass
for duration in durations: for duration in durations:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='male', sex='male',
duration=duration, duration=duration,
@@ -1912,7 +1913,7 @@ def interactive_agegroupcpchart(age,normalized=False):
mhpower = [] mhpower = []
for distance in distances: for distance in distances:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='male', sex='male',
distance=distance, distance=distance,
@@ -1926,7 +1927,7 @@ def interactive_agegroupcpchart(age,normalized=False):
except ZeroDivisionError: except ZeroDivisionError:
pass pass
for duration in durations: for duration in durations:
worldclasspower = metrics.getagegrouprecord( worldclasspower = c2stuff.getagegrouprecord(
age, age,
sex='male', sex='male',
duration=duration, duration=duration,
@@ -4060,15 +4061,7 @@ def thumbnails_set(r,id,favorites):
columns += [f.yparam2 for f in favorites] columns += [f.yparam2 for f in favorites]
columns += ['time'] columns += ['time']
try:
rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True) rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True)
except:
return [
{'script':"",
'div':"",
'notes':""
}]
rowdata.dropna(axis=1,how='all',inplace=True) rowdata.dropna(axis=1,how='all',inplace=True)

8
rowers/views/statements.py
View File

@@ -256,19 +256,17 @@ def getfavorites(r,row):
if 'speedcoach2' in row.workoutsource: if 'speedcoach2' in row.workoutsource:
workoutsource = 'speedcoach2' workoutsource = 'speedcoach2'
try:
favorites = FavoriteChart.objects.filter(user=r, favorites = FavoriteChart.objects.filter(user=r,
workouttype__in=matchworkouttypes).order_by("id") workouttype__in=matchworkouttypes).order_by("id")
favorites2 = FavoriteChart.objects.filter(user=r, favorites2 = FavoriteChart.objects.filter(user=r,
workouttype__in=[workoutsource]).order_by("id") workouttype__in=[workoutsource]).order_by("id")
favorites = favorites | favorites2 favorites = favorites | favorites2
maxfav = len(favorites)-1 maxfav = len(favorites)-1
except:
favorites = None
maxfav = 0
return favorites,maxfav return favorites,maxfav

1
rowers/views/workoutviews.py
View File

@@ -2768,7 +2768,6 @@ def workout_workflow_view(request,id):
favorites,maxfav = getfavorites(r,row) favorites,maxfav = getfavorites(r,row)
charts = get_call() charts = get_call()