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

finalizing mvp of goldmedalscores chart

Browse Source
This commit is contained in:
Sander Roosendaal
2021-01-04 17:20:16 +01:00
parent b84ba9d49a
commit 6e3d4a7051
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/interactiveplots.py
View File

@@ -1820,6 +1820,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
) )
df = pd.DataFrame({ df = pd.DataFrame({
'id':outids,
'date':dates, 'date':dates,
'testpower':testpower, 'testpower':testpower,
'testduration':testduration, 'testduration':testduration,
@@ -1830,10 +1831,15 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1) df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1)
#df['date'] = df.apply(lambda x: newtestpowerdate(x), axis=1) #df['date'] = df.apply(lambda x: newtestpowerdate(x), axis=1)
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
outids = df.mask(mask)['id'].dropna().unique()
# all workouts # all workouts
alldates,alltestpower,allduration = all_goldmedalstandards(workouts,startdate,enddate) alldates,alltestpower,allduration = all_goldmedalstandards(workouts,startdate,enddate)
@@ -1937,7 +1943,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
size=10, size=10,
legend_label='Marker Workouts') legend_label='Marker Workouts')
plot.legend.location = "top_left" plot.legend.location = "bottom_left"
plot.x_range = Range1d( plot.x_range = Range1d(
startdate,enddate+datetime.timedelta(days=5), startdate,enddate+datetime.timedelta(days=5),
@@ -1955,7 +1961,7 @@ def goldmedalscorechart(user,startdate=None,enddate=None):
script, div = components(plot) script, div = components(plot)
return script, div return script, div,outids
def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7, def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
metricchoice='trimp',doform=False,dofatigue=False, metricchoice='trimp',doform=False,dofatigue=False,

2
rowers/templates/goldmedalscores.html
View File

@@ -99,8 +99,8 @@
</p> </p>
</li> </li>
{% if bestworkouts %} {% if bestworkouts %}
<h2>Marker Workouts</h2>
<li class="grid_4"> <li class="grid_4">
<h2>Marker Workouts</h2>
<table width="100%" class="listtable"> <table width="100%" class="listtable">
<thead> <thead>
<tr> <tr>

5
rowers/views/analysisviews.py
View File

@@ -1573,10 +1573,12 @@ def goldmedalscores_view(request,userid=0,
'enddate':enddate, 'enddate':enddate,
}) })
script, div = goldmedalscorechart( script, div, ids = goldmedalscorechart(
theuser,startdate=startdate,enddate=enddate, theuser,startdate=startdate,enddate=enddate,
) )
bestworkouts = Workout.objects.filter(id__in=ids).order_by('date')
breadcrumbs = [ breadcrumbs = [
{ {
'url':'/rower/analysis', 'url':'/rower/analysis',
@@ -1604,6 +1606,7 @@ def goldmedalscores_view(request,userid=0,
'breadcrumbs':breadcrumbs, 'breadcrumbs':breadcrumbs,
'the_div':div, 'the_div':div,
'form':form, 'form':form,
'bestworkouts':bestworkouts,
}) })