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

added name to CP chart

Browse Source
This commit is contained in:
Sander Roosendaal
2018-02-27 15:48:23 +01:00
parent c41ebc2c2f
commit 5709669dc5
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/interactiveplots.py
View File

@@ -1382,7 +1382,7 @@ def interactive_agegroupcpchart(age,normalized=False):
return script,div return script,div
def interactive_otwcpchart(powerdf,promember=0): def interactive_otwcpchart(powerdf,promember=0,rowername=""):
powerdf = powerdf[~(powerdf == 0).any(axis=1)] powerdf = powerdf[~(powerdf == 0).any(axis=1)]
# plot tools # plot tools
if (promember==1): if (promember==1):
@@ -1453,6 +1453,7 @@ def interactive_otwcpchart(powerdf,promember=0):
plot.y_range = Range1d(0,1.5*max(theavpower)) plot.y_range = Range1d(0,1.5*max(theavpower))
plot.x_range = Range1d(1,2*max(thesecs)) plot.x_range = Range1d(1,2*max(thesecs))
plot.legend.orientation = "vertical" plot.legend.orientation = "vertical"
plot.title.text = "Critical Power for "+rowername
hover = plot.select(dict(type=HoverTool)) hover = plot.select(dict(type=HoverTool))

13
rowers/views.py
View File

@@ -4149,8 +4149,8 @@ def otwrankings_view(request,theuser=0,
try: try:
r = Rower.objects.get(user=theuser) r = Rower.objects.get(user=theuser)
except Rower.DoesNotExist: except Rower.DoesNotExist:
allergworkouts = [] raise Http404("Rower doesn't exist")
r=0
try: try:
@@ -4230,9 +4230,10 @@ def otwrankings_view(request,theuser=0,
powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True) powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
rowername = rower.user.first_name+" "+rower.user.last_name
# create interactive plot # create interactive plot
if len(powerdf) !=0 : if len(powerdf) !=0 :
res = interactive_otwcpchart(powerdf,promember=promember) res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername)
script = res[0] script = res[0]
div = res[1] div = res[1]
p1 = res[2] p1 = res[2]
@@ -4399,7 +4400,7 @@ def oterankings_view(request,theuser=0,
r = Rower.objects.get(user=theuser) r = Rower.objects.get(user=theuser)
except Rower.DoesNotExist: except Rower.DoesNotExist:
allergworkouts = [] allergworkouts = []
r=0 raise Http404("Rower doesn't exist")
try: try:
@@ -4483,10 +4484,10 @@ def oterankings_view(request,theuser=0,
powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True) powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)
powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True) powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
rowername = r.user.first_name+" "+r.user.last_name
# create interactive plot # create interactive plot
if len(powerdf) !=0 : if len(powerdf) !=0 :
res = interactive_otwcpchart(powerdf,promember=promember) res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername)
script = res[0] script = res[0]
div = res[1] div = res[1]
p1 = res[2] p1 = res[2]