From c264d2cb8a03f61f593ef0f3c74d07ed3e169d48 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 8 Apr 2020 16:13:38 +0200 Subject: [PATCH 1/3] bug fixes --- rowers/dataprepnodjango.py | 1 + rowers/interactiveplots.py | 1 + rowers/views/exportviews.py | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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) From a5f83b98b900b7ab620d5bce9a57ad72671b66dc Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 8 Apr 2020 16:19:50 +0200 Subject: [PATCH 2/3] fixed error distance jump --- rowers/interactiveplots.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index 19197f0a..ad91b1b0 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -15,6 +15,7 @@ from rowingdata import cumcpdata,histodata from rowingdata import rowingdata as rrdata from math import pi from django.utils import timezone +from rowingdata import make_cumvalues from bokeh.palettes import Dark2_8 as palette from bokeh.models.glyphs import MultiLine @@ -4780,6 +4781,10 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', group.sort_values(by='time',ascending=True,inplace=True) + print(xparam) + if xparam == 'cumdist': + res = make_cumvalues(group[xparam]) + group[xparam] = res[0] try: group['x'] = group[xparam] except KeyError: From b2e7da58c22fc23ff919870ab27033cea6c4d5e7 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 8 Apr 2020 16:25:19 +0200 Subject: [PATCH 3/3] further fixes --- rowers/interactiveplots.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index ad91b1b0..80e02f70 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -3097,7 +3097,9 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='', gr = groupname, ) - + if xparam == 'cumdist': + res = make_cumvalues(datadf[xparam]) + datadf[xparam] = res[0] if xparam=='distance': xaxmax = datadf[xparam].max() xaxmin = datadf[xparam].min() @@ -4781,7 +4783,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', group.sort_values(by='time',ascending=True,inplace=True) - print(xparam) + if xparam == 'cumdist': res = make_cumvalues(group[xparam]) group[xparam] = res[0]