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

fixed a few bgs

Browse Source
This commit is contained in:
Sander Roosendaal
2017-05-16 10:10:43 +02:00
parent e8e7312fb6
commit f0a35aa8c0
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/interactiveplots.py
View File

@@ -1404,7 +1404,10 @@ def interactive_flex_chart2(id=0,promember=0,
if rowdata.empty: if rowdata.empty:
return "","No valid data" return "","No valid data"
else: else:
rowdata.sort_values(by='time',ascending=True,inplace=True) try:
rowdata.sort_values(by='time',ascending=True,inplace=True)
except KeyError:
pass
workoutstateswork = [1,4,5,8,9,6,7] workoutstateswork = [1,4,5,8,9,6,7]
workoutstatesrest = [3] workoutstatesrest = [3]

14
rowers/views.py
View File

@@ -4368,18 +4368,20 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
intensityfactor = normp/float(r.ftp) intensityfactor = normp/float(r.ftp)
tss = 100.*((duration*normp*intensityfactor)/(3600.*r.ftp)) tss = 100.*((duration*normp*intensityfactor)/(3600.*r.ftp))
if not np.isnan(tss):
otherstats['tss'] = {
'verbose_name':'rScore',
'value':int(tss),
'unit':''
}
if not np.isnan(normp):
otherstats['np'] = { otherstats['np'] = {
'verbose_name':'rPower', 'verbose_name':'rPower',
'value':int(10*normp)/10., 'value':int(10*normp)/10.,
'unit':'Watt' 'unit':'Watt'
} }
otherstats['tss'] = {
'verbose_name':'rScore',
'value':int(tss),
'unit':''
}
# HR Drift # HR Drift
tmax = datadf['time'].max() tmax = datadf['time'].max()
tmin = datadf['time'].min() tmin = datadf['time'].min()