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

added spmmin and work filtering to histo

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-29 19:54:08 +02:00
parent 991612d02b
commit a670ee0884
4 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
rowers/views/analysisviews.py
View File

@@ -58,6 +58,7 @@ def analysis_new(request,userid=0,function='boxplot'):
waterboattype = mytypes.waterboattype
if request.method == 'POST':
thediv = get_call()
dateform = DateRangeForm(request.POST)
if dateform.is_valid():
startdate = dateform.cleaned_data['startdate']
@@ -105,6 +106,7 @@ def analysis_new(request,userid=0,function='boxplot'):
ids = []
options['ids'] = ids
else:
thediv = ''
dateform = DateRangeForm(initial={
'startdate':startdate,
'enddate':enddate,
@@ -209,6 +211,7 @@ def analysis_new(request,userid=0,function='boxplot'):
'rower':r,
'breadcrumbs':breadcrumbs,
'theuser':user,
'the_div':thediv,
'form':form,
'active':'nav-analysis',
'chartform':chartform,
@@ -416,10 +419,16 @@ def histodata(workouts, options):
includereststrokes = options['includereststrokes']
plotfield = options['plotfield']
function = options['function']
spmmin = options['spmmin']
spmmax = options['spmmax']
workmin = options['workmin']
workmax = options['workmax']
workstrokesonly = not includereststrokes
script, div = interactive_histoall(workouts,plotfield,includereststrokes)
script, div = interactive_histoall(workouts,plotfield,includereststrokes,
spmmin=spmmin,spmmax=spmmax,workmin=workmin,workmax=workmax)
scripta = script.split('\n')[2:-1]
@@ -2954,6 +2963,8 @@ def multiflex_data(request,userid=0,
'ploterrorbars':False,
}):
def_options = options
if 'options' in request.session:
options = request.session['options']
@@ -2978,16 +2989,16 @@ def multiflex_data(request,userid=0,
userid = request.user.id
palette = options['palette']
groupby = options['groupby']
binsize = options['binsize']
xparam = options['xparam']
yparam = options['yparam']
spmmin = options['spmmin']
spmmax = options['spmmax']
workmin = options['workmin']
workmax = options['workmax']
ids = options['ids']
palette = keyvalue_get_default('palette',options, def_options)
groupby = keyvalue_get_default('groupby',options, def_options)
binsize = keyvalue_get_default('binsize',options, def_options)
xparam = keyvalue_get_default('xparam',options, def_options)
yparam = keyvalue_get_default('yparam',options, def_options)
spmmin = keyvalue_get_default('spmmin',options, def_options)
spmmax = keyvalue_get_default('spmmax',options, def_options)
workmin = keyvalue_get_default('workmin',options, def_options)
workmax = keyvalue_get_default('workmax',options, def_options)
ids = keyvalue_get_default('ids',options, def_options)
workouts = []