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

Merge branch 'release/v7.50'

Browse Source
This commit is contained in:
Sander Roosendaal
2018-09-05 21:35:51 +02:00
parent 6cb8801ad1 8265c188fd
commit 8de988033d
4 changed files with 36 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/c2stuff.py
+1 -1
View File
@@ -834,11 +834,11 @@ def add_workout_from_data(user,importid,data,strokedata,
pace = pace.replace(0,300) pace = pace.replace(0,300)
velo = 500./pace velo = 500./pace
power = 2.8*velo**3
if workouttype == 'bike': if workouttype == 'bike':
velo = 1000./pace velo = 1000./pace
pace = 500./velo pace = 500./velo
power = 2.8*velo**3
# save csv # save csv
# Create data frame with all necessary data to write to csv # Create data frame with all necessary data to write to csv
rowers/dataprepnodjango.py
+2 -2
View File
@@ -246,11 +246,11 @@ def add_c2_stroke_data_db(strokedata,workoutid,starttimeunix,csvfilename,
pace = pace.replace(0,300) pace = pace.replace(0,300)
velo = 500./pace velo = 500./pace
power = 2.8*velo**3
if workouttype == 'bike': if workouttype == 'bike':
velo = 1000./pace velo = 1000./pace
# This may be wrong for the bike erg
power = 2.8*velo**3
# save csv # save csv
# Create data frame with all necessary data to write to csv # Create data frame with all necessary data to write to csv
rowers/interactiveplots.py
+5 -4
View File
@@ -3780,6 +3780,7 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
colors = itertools.cycle(palette) colors = itertools.cycle(palette)
cntr = 0 cntr = 0
l1 = []
for id,color in itertools.izip(ids,colors): for id,color in itertools.izip(ids,colors):
group = datadf[datadf['workoutid']==int(id)].copy() group = datadf[datadf['workoutid']==int(id)].copy()
@@ -3826,12 +3827,12 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
legend=str(id) legend=str(id)
if plottype=='line': 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: else:
l1 = plot.scatter('x','y',source=source,color=color,legend=legend, l1.append(plot.scatter('x','y',source=source,color=color,legend=legend,
fill_alpha=0.4,line_color=None) 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 cntr += 1
plot.legend.location='bottom_right' plot.legend.location='bottom_right'
rowers/views.py
+28 -28
View File
@@ -4017,12 +4017,12 @@ def otwrankings_view(request,theuser=0,
except ParseError: except ParseError:
pass pass
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if enddate < startdate: if enddate < startdate:
s = enddate s = enddate
@@ -4445,12 +4445,12 @@ def oterankings_view(request,theuser=0,
except ParseError: except ParseError:
pass pass
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if enddate < startdate: if enddate < startdate:
s = enddate s = enddate
@@ -5363,12 +5363,12 @@ def user_multiflex_select(request,
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if 'waterboattype' in request.session: if 'waterboattype' in request.session:
@@ -5924,12 +5924,12 @@ def user_boxplot_select(request,
waterboattype = types.waterboattype waterboattype = types.waterboattype
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if startdatestring != "": if startdatestring != "":
startdate = iso8601.parse_date(startdatestring) startdate = iso8601.parse_date(startdatestring)
@@ -5942,12 +5942,12 @@ def user_boxplot_select(request,
enddate = startdate enddate = startdate
startdate = s startdate = s
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if request.method == 'POST' and 'daterange' in request.POST: if request.method == 'POST' and 'daterange' in request.POST:
dateform = DateRangeForm(request.POST) dateform = DateRangeForm(request.POST)
@@ -11897,12 +11897,12 @@ def rower_update_empower_view(
except Rower.DoesNotExist: except Rower.DoesNotExist:
raise Http404("Rower doesn't exist") raise Http404("Rower doesn't exist")
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if request.method == 'POST' and 'daterange' in request.POST: if request.method == 'POST' and 'daterange' in request.POST:
dateform = DateRangeForm(request.POST) dateform = DateRangeForm(request.POST)
@@ -12361,12 +12361,12 @@ def plannedsession_multiclone_view(
r = getrequestrower(request,rowerid=rowerid) r = getrequestrower(request,rowerid=rowerid)
if 'startdate' in request.session: # if 'startdate' in request.session:
startdate = iso8601.parse_date(request.session['startdate']) # startdate = iso8601.parse_date(request.session['startdate'])
if 'enddate' in request.session: # if 'enddate' in request.session:
enddate = iso8601.parse_date(request.session['enddate']) # enddate = iso8601.parse_date(request.session['enddate'])
if timeperiod != 'none': if timeperiod != 'none':
startdate,enddate = get_dates_timeperiod(timeperiod) startdate,enddate = get_dates_timeperiod(timeperiod)