small bug fixes
This commit is contained in:
@@ -4360,7 +4360,10 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
|
|||||||
try:
|
try:
|
||||||
tseconds = datadf.loc[:,'time']
|
tseconds = datadf.loc[:,'time']
|
||||||
except KeyError:
|
except KeyError:
|
||||||
|
try:
|
||||||
tseconds = datadf.loc[:,xparam]
|
tseconds = datadf.loc[:,xparam]
|
||||||
|
except:
|
||||||
|
return ['','<p>A chart data error occurred</p>','','A chart data error occurred']
|
||||||
|
|
||||||
yparamname = axlabels[yparam]
|
yparamname = axlabels[yparam]
|
||||||
|
|
||||||
|
|||||||
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
Binary file not shown.
@@ -910,7 +910,8 @@ def virtualevent_compare_view(request,id=0):
|
|||||||
workouts = []
|
workouts = []
|
||||||
for id in workoutids:
|
for id in workoutids:
|
||||||
try:
|
try:
|
||||||
workouts.append(Workout.objects.get(id=encoded.decode_hex(id)))
|
workouts.append(Workout.objects.get(
|
||||||
|
id=encoder.decode_hex(id)))
|
||||||
except Workout.DoesNotExist:
|
except Workout.DoesNotExist:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
@@ -4858,14 +4859,23 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
|
|||||||
value_power = request.POST['value_power']
|
value_power = request.POST['value_power']
|
||||||
value_work = request.POST['value_work']
|
value_work = request.POST['value_work']
|
||||||
if powerorpace == 'power':
|
if powerorpace == 'power':
|
||||||
|
try:
|
||||||
power = int(value_power)
|
power = int(value_power)
|
||||||
|
except ValueError:
|
||||||
|
int(normp)
|
||||||
elif powerorpace == 'pace':
|
elif powerorpace == 'pace':
|
||||||
try:
|
try:
|
||||||
pace_secs = float(value_pace)
|
pace_secs = float(value_pace)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
|
try:
|
||||||
pace_secs = float(value_pace.replace(',','.'))
|
pace_secs = float(value_pace.replace(',','.'))
|
||||||
|
except ValueError:
|
||||||
|
pace_secs = int(500./normv)
|
||||||
elif powerorpace == 'work':
|
elif powerorpace == 'work':
|
||||||
|
try:
|
||||||
work = int(value_work)
|
work = int(value_work)
|
||||||
|
except ValueError:
|
||||||
|
work = int(normw)
|
||||||
|
|
||||||
if powerorpace == 'power' and power is not None:
|
if powerorpace == 'power' and power is not None:
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user