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

Merge branch 'develop' into feature/restapi

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-01 14:37:01 +01:00
parent 51ef777c30 2a62db3703
commit a98e724d3a
6 changed files with 308 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rowers/views.py
View File

@@ -2610,22 +2610,39 @@ def workout_flexchart3_view(request,id=0,xparam='distance',yparam1='pace',
div = res[1]
js_resources = res[2]
css_resources = res[3]
return render(request,
'flexchart3.html',
{'the_script':script,
'the_div':div,
'js_res': js_resources,
'css_res':css_resources,
'id':id,
'xparam':xparam,
'yparam1':yparam1,
'yparam2':yparam2,
'plottype':plottype,
'mayedit':mayedit,
'promember':promember,
'workstrokesonly': not workstrokesonly,
})
if row.workouttype == 'water':
return render(request,
'flexchart3otw.html',
{'the_script':script,
'the_div':div,
'js_res': js_resources,
'css_res':css_resources,
'id':id,
'xparam':xparam,
'yparam1':yparam1,
'yparam2':yparam2,
'plottype':plottype,
'mayedit':mayedit,
'promember':promember,
'workstrokesonly': not workstrokesonly,
})
else:
return render(request,
'flexchart3.html',
{'the_script':script,
'the_div':div,
'js_res': js_resources,
'css_res':css_resources,
'id':id,
'xparam':xparam,
'yparam1':yparam1,
'yparam2':yparam2,
'plottype':plottype,
'mayedit':mayedit,
'promember':promember,
'workstrokesonly': not workstrokesonly,
})
def testbokeh(request):