Private
Public Access
1
0
This commit is contained in:
Sander Roosendaal
2018-11-27 08:50:19 +01:00
parent c1ee308b99
commit f17dbadf8a
2 changed files with 26 additions and 9 deletions

View File

@@ -744,16 +744,27 @@ def create_row_df(r,distance,duration,startdatetime,workouttype='rower',
duplicate=False, duplicate=False,
title='Manual entry',notes='',weightcategory='hwt'): title='Manual entry',notes='',weightcategory='hwt'):
if duration is not None:
totalseconds = duration.hour*3600.
totalseconds += duration.minute*60.
totalseconds += duration.second
totalseconds += duration.microsecond/1.e6
else:
totalseconds = 60.
if distance is None:
distance = 0
nr_strokes = int(distance/10.) try:
nr_strokes = int(distance/10.)
except TypeError:
nr_strokes = int(20.*totalseconds)
if nr_strokes == 0:
nr_strokes = 100
unixstarttime = arrow.get(startdatetime).timestamp unixstarttime = arrow.get(startdatetime).timestamp
totalseconds = duration.hour*3600.
totalseconds += duration.minute*60.
totalseconds += duration.second
totalseconds += duration.microsecond/1.e6
if not avgspm: if not avgspm:
try: try:
@@ -773,7 +784,10 @@ def create_row_df(r,distance,duration,startdatetime,workouttype='rower',
unixtime = unixstarttime + elapsed unixtime = unixstarttime + elapsed
pace = 500.*totalseconds/distance try:
pace = 500.*totalseconds/distance
except ZeroDivisionError:
pace = 240.
if workouttype in ['rower','slides','dynamic']: if workouttype in ['rower','slides','dynamic']:
try: try:

View File

@@ -16550,7 +16550,10 @@ def rower_create_trainingplan(request,userid=0):
startdate = form.cleaned_data['startdate'] startdate = form.cleaned_data['startdate']
enddate = form.cleaned_data['enddate'] enddate = form.cleaned_data['enddate']
athletes = form.cleaned_data['rowers'] try:
athletes = form.cleaned_data['rowers']
except KeyError:
athletes = [therower]
p = TrainingPlan( p = TrainingPlan(
name=name, name=name,