From f9167c1b8886a5748be4b7c532000b5c72a5a09b Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Wed, 13 Jun 2018 21:14:33 +0200 Subject: [PATCH] changes --- rowers/views.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index 7ffb56fa..a069ef1b 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -11311,15 +11311,22 @@ def workout_summary_edit_view(request,id,message="",successmessage="" powerorpace = cd['selector'] power = cd['power'] pace = cd['pace'] + try: + pace_secs = pace.seconds+pace.microseconds/1.0e6 + except AttributeError: + pace_secs = 120. - if powerorpace == 'power': + if powerorpace == 'power' and power is not None: try: - rowdata.updateinterval_power(power) + rowdata.updateinterval_metric(' Power (watts)',power,mode='larger', + debug=False,smoothwindow=15) except: messages.error(request,'Error updating power') elif powerorpace == 'pace': try: - rowdata.updateinterval_pace(pace) + velo = 500./pace_secs + rowdata.updateinterval_metric(' AverageBoatSpeed (m/s)',velo,mode='larger', + debug=False,smoothwindow=15) except: messages.error(request,'Error updating pace') @@ -11327,6 +11334,8 @@ def workout_summary_edit_view(request,id,message="",successmessage="" itime,idist,itype = rowdata.intervalstats_values() nrintervals = len(idist) savebutton = 'savestringform' + powerupdateform = PowerIntervalUpdateForm(initial=cd) + form = SummaryStringForm() @@ -11428,6 +11437,7 @@ def workout_summary_edit_view(request,id,message="",successmessage="" else: form = SummaryStringForm() + powerupdateform = PowerIntervalUpdateForm() initial = {} for i in xrange(nrintervals): @@ -11437,7 +11447,6 @@ def workout_summary_edit_view(request,id,message="",successmessage="" detailform = IntervalUpdateForm(aantal=nrintervals,initial=initial) - powerupdateform = PowerIntervalUpdateForm() # render page