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

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2020-02-23 09:44:42 +01:00
parent ada370f007
commit d58e019d5a
1 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
rowers/views/workoutviews.py
View File

@@ -5680,6 +5680,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
value_spm = request.POST['value_spm'] value_spm = request.POST['value_spm']
activeminutesmin = request.POST['activeminutesmin'] activeminutesmin = request.POST['activeminutesmin']
activeminutesmax = request.POST['activeminutesmax'] activeminutesmax = request.POST['activeminutesmax']
activesecondsmin = 60.*activeminutesmin
activesecondsmax = 60.*activeminutesmax
if abs(rowdata.duration-activesecondsmax) < 60.:
activesecondsmax = rowdata.duration
if powerorpace == 'power': if powerorpace == 'power':
try: try:
power = int(value_power) power = int(value_power)
@@ -5708,7 +5712,9 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
try: try:
rowdata.updateinterval_metric( rowdata.updateinterval_metric(
' Power (watts)',power,mode='larger', ' Power (watts)',power,mode='larger',
debug=False,smoothwindow=15.) debug=False,smoothwindow=15.,
activewindow=[activesecondsmin,activesecondsmax],
)
except: except:
messages.error(request,'Error updating power') messages.error(request,'Error updating power')
elif powerorpace == 'pace': elif powerorpace == 'pace':
@@ -5716,14 +5722,18 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
velo = 500./pace_secs velo = 500./pace_secs
rowdata.updateinterval_metric( rowdata.updateinterval_metric(
' AverageBoatSpeed (m/s)',velo,mode='larger', ' AverageBoatSpeed (m/s)',velo,mode='larger',
debug=False,smoothwindow=15.) debug=False,smoothwindow=15.,
activewindow=[activesecondsmin,activesecondsmax],
)
except: except:
messages.error(request,'Error updating pace') messages.error(request,'Error updating pace')
elif powerorpace == 'work': elif powerorpace == 'work':
try: try:
rowdata.updateinterval_metric( rowdata.updateinterval_metric(
'driveenergy',work,mode='larger', 'driveenergy',work,mode='larger',
debug=False,smoothwindow=15.) debug=False,smoothwindow=15.,
activewindow=[activesecondsmin,activesecondsmax],
)
except: except:
messages.error(request,'Error updating Work per Stroke') messages.error(request,'Error updating Work per Stroke')
elif powerorpace == 'spm': elif powerorpace == 'spm':
@@ -5731,7 +5741,8 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
print('aap') print('aap')
rowdata.updateinterval_metric( rowdata.updateinterval_metric(
' Cadence (stokes/min)',spm,mode='larger', ' Cadence (stokes/min)',spm,mode='larger',
debug=False,smoothwindow=2.) debug=False,smoothwindow=2.,
activewindow=[activesecondsmin,activesecondsmax],)
except: except:
messages.error(request,'Error updating SPM') messages.error(request,'Error updating SPM')
@@ -5818,35 +5829,44 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
spm = cd['spm'] spm = cd['spm']
activeminutesmin = cd['activeminutesmin'] activeminutesmin = cd['activeminutesmin']
activeminutesmax = cd['activeminutesmax'] activeminutesmax = cd['activeminutesmax']
activesecondsmin = 60.*activeminutesmin
activesecondsmax = 60.*activeminutesmax
if abs(rowdata.duration-activesecondsmax) < 60.:
activesecondsmax = rowdata.duration
try: try:
pace_secs = pace.seconds+pace.microseconds/1.0e6 pace_secs = pace.seconds+pace.microseconds/1.0e6
except AttributeError: except AttributeError:
pace_secs = 120. pace_secs = 120.
if powerorpace == 'power' and power is not None: if powerorpace == 'power' and power is not None:
try: rowdata.updateinterval_metric(' Power (watts)',power,mode='larger',
rowdata.updateinterval_metric(' Power (watts)',power,mode='larger', debug=False,smoothwindow=15,
debug=False,smoothwindow=15) activewindow=[activesecondsmin,activesecondsmax],
except: )
messages.error(request,'Error updating power')
elif powerorpace == 'pace': elif powerorpace == 'pace':
try: try:
velo = 500./pace_secs velo = 500./pace_secs
rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',velo,mode='larger', rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',velo,mode='larger',
debug=False,smoothwindow=15) debug=False,smoothwindow=15,
activewindow=[activesecondsmin,activesecondsmax],
)
except: except:
messages.error(request,'Error updating pace') messages.error(request,'Error updating pace')
elif powerorpace == 'work': elif powerorpace == 'work':
try: try:
rowdata.updateinterval_metric( rowdata.updateinterval_metric(
'driveenergy',work,mode='larger', 'driveenergy',work,mode='larger',
debug=False,smoothwindow=15.) debug=False,smoothwindow=15.,
activewindow=[activesecondsmin,activesecondsmax],)
except: except:
messages.error(request,'Error updating Work per Stroke') messages.error(request,'Error updating Work per Stroke')
elif powerorpace == 'spm': elif powerorpace == 'spm':
try: try:
rowdata.updateinterval_metric(' Cadence (stokes/min)',spm,mode='larger', rowdata.updateinterval_metric(' Cadence (stokes/min)',spm,mode='larger',
debug=False,smoothwindow=2.) debug=False,smoothwindow=2.,
activewindow=[activesecondsmin,activesecondsmax],
)
except: except:
print('mies') print('mies')
messages.error(request,'Error updating SPM') messages.error(request,'Error updating SPM')