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

fix mean power in history

Browse Source
This commit is contained in:
Sander Roosendaal
2020-12-15 08:28:08 +01:00
parent 55b1157737
commit b798a16172
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rowers/templates/history.html
View File

@@ -148,6 +148,7 @@
console.log(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}&yaxis={{ yaxis }}') console.log(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}&yaxis={{ yaxis }}')
$.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}&yaxis={{ yaxis }}', function(json) { $.getJSON(window.location.protocol + '//'+window.location.host + '/rowers/history/user/{{ rower.user.id }}/data/?startdate={{ sstartdate|date:"Y-m-d" }}&enddate={{ senddate|date:"Y-m-d" }}&workouttype={{ workouttype }}&yaxis={{ yaxis }}', function(json) {
var script = json.script; var script = json.script;
var div = json.div; var div = json.div;
var totalsdict = json.totalsdict var totalsdict = json.totalsdict

12
rowers/views/analysisviews.py
View File

@@ -5226,16 +5226,19 @@ def history_view_data(request,userid=0):
ddf['deltat'] = ddf['time'].diff().clip(lower=0) ddf['deltat'] = ddf['time'].diff().clip(lower=0)
except KeyError: except KeyError:
pass pass
ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
ddf = dataprep.clean_df_stats(ddf,workstrokesonly=False,
ignoreadvanced=True) ignoreadvanced=True)
ddict['hrmean'] = int(wavg(ddf,'hr','deltat')) ddict['hrmean'] = int(wavg(ddf,'hr','deltat'))
try: try:
ddict['hrmax'] = ddf['hr'].max().astype(int) ddict['hrmax'] = ddf['hr'].max().astype(int)
except ValueError: except ValueError:
ddict['hrmax'] = 0 ddict['hrmax'] = 0
ddict['powermean'] = int(wavg(df,'power','deltat')) ddict['powermean'] = int(wavg(ddf,'power','deltat'))
ddict['powermax'] = ddf['power'].max().astype(int) ddict['powermax'] = ddf['power'].max().astype(int)
ddict['nrworkouts'] = a_workouts.count() ddict['nrworkouts'] = a_workouts.count()
listofdicts.append(ddict) listofdicts.append(ddict)
@@ -5275,12 +5278,17 @@ def history_view_data(request,userid=0):
meters, hours,minutes,seconds = get_totals(a_workouts) meters, hours,minutes,seconds = get_totals(a_workouts)
totalseconds = 3600*hours+60*minutes+seconds totalseconds = 3600*hours+60*minutes+seconds
ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts]) ddf = getsmallrowdata_db(columns,ids=[w.id for w in a_workouts])
try: try:
ddf['deltat'] = ddf['time'].diff().clip(lower=0) ddf['deltat'] = ddf['time'].diff().clip(lower=0)
except KeyError: except KeyError:
pass pass
ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True, ddf = dataprep.clean_df_stats(ddf,workstrokesonly=True,
ignoreadvanced=True) ignoreadvanced=True)
totalscript, totaldiv = interactive_hr_piechart( totalscript, totaldiv = interactive_hr_piechart(
ddf,r,mytypes.workouttypes_ordered[typeselect], ddf,r,mytypes.workouttypes_ordered[typeselect],
totalseconds=totalseconds) totalseconds=totalseconds)