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

Merge tag 'v5.98' into develop

Browse Source 
releasing plan v1.0
This commit is contained in:
Sander Roosendaal
2018-03-03 10:44:42 +01:00
parent 8e0de9163f c3fd328b5f
commit 0108cb3079
8 changed files with 152 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
rowers/views.py
View File

@@ -7453,7 +7453,6 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
return HttpResponseRedirect(url)
datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
datadf['deltat'] = datadf['time'].diff()
if datadf.empty:
datadf,row = dataprep.getrowdata_db(id=id)
@@ -7462,6 +7461,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
if datadf.empty:
return HttpResponse("CSV data file not found")
datadf['deltat'] = datadf['time'].diff()
workoutstateswork = [1,4,5,8,9,6,7]
@@ -8076,15 +8076,31 @@ def workout_flexchart3_view(request,*args,**kwargs):
# create interactive plot
try:
script,div,js_resources,css_resources,workstrokesonly = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2,
promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly)
(
script,
div,
js_resources,
css_resources,
workstrokesonly
) = interactive_flex_chart2(
id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2,
promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly
)
except ValueError:
script,div = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2,
promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly)
(
script,
div,
js_resources,
css_resources,
workstrokesonly
) = interactive_flex_chart2(
id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2,
promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly
)
js_resources = ""
css_resources = ""