From c0e5b0a522551f7bd9483070ac40d7fc8d423c82 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 11 Apr 2019 13:15:12 -0400
Subject: [PATCH] small bug fixes

---
 rowers/interactiveplots.py            |   7 +++++--
 rowers/tests/testdata/testdata.csv.gz | Bin 12534 -> 12534 bytes
 rowers/views/workoutviews.py          |  18 ++++++++++++++----
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 141bc9f0..2545cd36 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -4360,8 +4360,11 @@ def interactive_multiple_compare_chart(ids,xparam,yparam,plottype='line',
     try:
         tseconds = datadf.loc[:,'time']
     except KeyError:
-        tseconds = datadf.loc[:,xparam]
-        
+        try:
+            tseconds = datadf.loc[:,xparam]
+        except:
+            return ['','<p>A chart data error occurred</p>','','A chart data error occurred']
+            
     yparamname = axlabels[yparam]
 
     #datadf = datadf[datadf[yparam] > 0]
diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index e3e59fd8c7088ac028ccaf6ab5bd449b5e3b619d..b2a8c284b06662f54bf41daad60ad375f359b995 100644
GIT binary patch
delta 16
XcmeyC_$`rLzMF$%R>}H}?C%W#K3@j}

delta 16
XcmeyC_$`rLzMF%?Idb_%_V)$=J2VE0

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 7574a68b..c018755c 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -910,7 +910,8 @@ def virtualevent_compare_view(request,id=0):
             workouts = []
             for id in workoutids:
                 try:
-                    workouts.append(Workout.objects.get(id=encoded.decode_hex(id)))
+                    workouts.append(Workout.objects.get(
+                        id=encoder.decode_hex(id)))
                 except Workout.DoesNotExist:
                     pass
 
@@ -4858,14 +4859,23 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
         value_power = request.POST['value_power']
         value_work = request.POST['value_work']
         if powerorpace == 'power':
-            power = int(value_power)
+            try:
+                power = int(value_power)
+            except ValueError:
+                int(normp)
         elif powerorpace == 'pace':
             try:
                 pace_secs = float(value_pace)
             except ValueError:
-                pace_secs = float(value_pace.replace(',','.'))
+                try:
+                    pace_secs = float(value_pace.replace(',','.'))
+                except ValueError:
+                    pace_secs  = int(500./normv)
         elif powerorpace == 'work':
-            work = int(value_work)
+            try:
+                work = int(value_work)
+            except ValueError:
+                work = int(normw)
 
         if powerorpace == 'power' and power is not None:
             try: