diff --git a/rowers/c2stuff.py b/rowers/c2stuff.py index 7ecea39e..5693e760 100644 --- a/rowers/c2stuff.py +++ b/rowers/c2stuff.py @@ -834,11 +834,11 @@ def add_workout_from_data(user,importid,data,strokedata, pace = pace.replace(0,300) velo = 500./pace + power = 2.8*velo**3 if workouttype == 'bike': velo = 1000./pace pace = 500./velo - power = 2.8*velo**3 # save csv # Create data frame with all necessary data to write to csv diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index 77b5b8fc..7dad7bb2 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -246,11 +246,11 @@ def add_c2_stroke_data_db(strokedata,workoutid,starttimeunix,csvfilename, pace = pace.replace(0,300) velo = 500./pace + power = 2.8*velo**3 if workouttype == 'bike': velo = 1000./pace - # This may be wrong for the bike erg - power = 2.8*velo**3 + # save csv # Create data frame with all necessary data to write to csv diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index f3e42627..1e9c7b5d 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -3780,6 +3780,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', colors = itertools.cycle(palette) cntr = 0 + l1 = [] for id,color in itertools.izip(ids,colors): group = datadf[datadf['workoutid']==int(id)].copy() @@ -3826,12 +3827,12 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line', legend=str(id) if plottype=='line': - l1 = plot.line('x','y',source=source,color=color,legend=legend) + l1.append(plot.line('x','y',source=source,color=color,legend=legend)) else: - l1 = plot.scatter('x','y',source=source,color=color,legend=legend, - fill_alpha=0.4,line_color=None) + l1.append(plot.scatter('x','y',source=source,color=color,legend=legend, + fill_alpha=0.4,line_color=None)) - plot.add_tools(HoverTool(renderers=[l1],tooltips=TIPS)) + plot.add_tools(HoverTool(renderers=[l1[cntr]],tooltips=TIPS)) cntr += 1 plot.legend.location='bottom_right' diff --git a/rowers/views.py b/rowers/views.py index 5b2c47d5..c77ebef0 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -4017,12 +4017,12 @@ def otwrankings_view(request,theuser=0, except ParseError: pass - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if enddate < startdate: s = enddate @@ -4445,12 +4445,12 @@ def oterankings_view(request,theuser=0, except ParseError: pass - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if enddate < startdate: s = enddate @@ -5363,12 +5363,12 @@ def user_multiflex_select(request, - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if 'waterboattype' in request.session: @@ -5924,12 +5924,12 @@ def user_boxplot_select(request, waterboattype = types.waterboattype - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if startdatestring != "": startdate = iso8601.parse_date(startdatestring) @@ -5942,12 +5942,12 @@ def user_boxplot_select(request, enddate = startdate startdate = s - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if request.method == 'POST' and 'daterange' in request.POST: dateform = DateRangeForm(request.POST) @@ -11897,12 +11897,12 @@ def rower_update_empower_view( except Rower.DoesNotExist: raise Http404("Rower doesn't exist") - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if request.method == 'POST' and 'daterange' in request.POST: dateform = DateRangeForm(request.POST) @@ -12361,12 +12361,12 @@ def plannedsession_multiclone_view( r = getrequestrower(request,rowerid=rowerid) - if 'startdate' in request.session: - startdate = iso8601.parse_date(request.session['startdate']) +# if 'startdate' in request.session: +# startdate = iso8601.parse_date(request.session['startdate']) - if 'enddate' in request.session: - enddate = iso8601.parse_date(request.session['enddate']) +# if 'enddate' in request.session: +# enddate = iso8601.parse_date(request.session['enddate']) if timeperiod != 'none': startdate,enddate = get_dates_timeperiod(timeperiod)