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

Merge branch 'release/v12.26'

Browse Source
This commit is contained in:
Sander Roosendaal
2020-05-06 13:29:25 +02:00
parent b2550e67b9 bf5f76e2ea
commit cd0508a334
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rowers/interactiveplots.py
View File

@@ -176,20 +176,24 @@ def interactive_hr_piechart(df,rower,title):
return "","Not enough data to make a chart" return "","Not enough data to make a chart"
df.sort_values(by='hr',inplace=True) df.sort_values(by='hr',inplace=True)
df['timehr'] = df['deltat']*df['hr']
sumtimehr = df['deltat'].sum()
qry = 'hr < {ut2}'.format(ut2=rower.ut2) qry = 'hr < {ut2}'.format(ut2=rower.ut2)
frac_lut2 = len(df.query(qry))/len(df) frac_lut2 = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2) qry = 'hr < {ut1}'.format(ut1=rower.ut1,ut2=rower.ut2)
frac_ut2 = len(df.query(qry))/len(df) frac_ut2 = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {at}'.format(ut1=rower.ut1,at=rower.at) qry = 'hr < {at}'.format(ut1=rower.ut1,at=rower.at)
frac_ut1 = len(df.query(qry))/len(df) frac_ut1 = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {tr}'.format(at=rower.at,tr=rower.tr) qry = 'hr < {tr}'.format(at=rower.at,tr=rower.tr)
frac_at = len(df.query(qry))/len(df) frac_at = df.query(qry)['deltat'].sum()/sumtimehr
qry = 'hr < {an}'.format(tr=rower.tr,an=rower.an) qry = 'hr < {an}'.format(tr=rower.tr,an=rower.an)
frac_tr = len(df.query(qry))/len(df) frac_tr = df.query(qry)['deltat'].sum()/sumtimehr
frac_an = 1. frac_an = 1.

2
rowers/views/analysisviews.py
View File

@@ -4665,7 +4665,7 @@ def history_view(request,userid=0):
activity_enddate = timezone.now() activity_enddate = timezone.now()
activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone) activity_enddate = activity_enddate.replace(hour=23,minute=59,second=59).astimezone(usertimezone)
activity_startdate = activity_enddate-datetime.timedelta(days=15) activity_startdate = activity_enddate-datetime.timedelta(days=15)
activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0) activity_startdate = activity_startdate.replace(hour=0,minute=0,second=0).astimezone(usertimezone)
typeselect = 'All' typeselect = 'All'
if request.method=='POST': if request.method=='POST':

1
rowers/views/workoutviews.py
View File

@@ -744,6 +744,7 @@ def addmanual_view(request,raceid=0):
) )
return HttpResponseRedirect(url) return HttpResponseRedirect(url)
else: else:
iform = ImageForm()
return render(request,'manualadd.html', return render(request,'manualadd.html',
{'form':form, {'form':form,
'iform':iform, 'iform':iform,