diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 4516ae54..493357d8 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -10,6 +10,7 @@ from rowingdata import make_cumvalues from rowingdata import rower as rrower from rowingdata import main as rmain from rowingdata import empower_bug_correction,get_empower_rigging +from rowingdata.csvparsers import make_cumvalues_array from time import strftime from pandas import DataFrame,Series diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 380088d6..19197f0a 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -4657,6 +4657,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', message = '' errormessage = '' + columns = [xparam,yparam, 'ftime','distance','fpace', 'power','hr','spm', diff --git a/rowers/views/exportviews.py b/rowers/views/exportviews.py index dc83f46e..4de899e5 100644 --- a/rowers/views/exportviews.py +++ b/rowers/views/exportviews.py @@ -277,7 +277,7 @@ def workout_csvtoadmin_view(request,id=0): messages.info(request,successmessage) url = reverse('workout_view', kwargs = { - 'id':str(w.id), + 'id':encoder.encode_hex(w.id), }) response = HttpResponseRedirect(url)