Merge branch 'develop' into feature/integrations

rowers/interactiveplots.py

@@ -2688,8 +2688,10 @@ def leaflet_chart_compare(course, workoutids, labeldict={}, startenddict={}):
                 data.append(df)
             except (Workout.DoesNotExist, KeyError):  # pragma: no cover
                 pass
-
+    try:
         df = pd.concat(data, axis=0)
+    except ValueError:
+        df = pd.DataFrame()
 
     latmean, lonmean, coordinates = course_coord_center(course)
     lat_min, lat_max, long_min, long_max = course_coord_maxmin(course)

rowers/views/importviews.py

@@ -692,7 +692,12 @@ def workout_nkimport_view(request, userid=0, after=0, before=0):
     parkedids = []
     try:
         with open('nkblocked.json', 'r') as nkblocked:
+            try:
                 jsondata = json.load(nkblocked)
+            except:
+                jsondata = {
+                    'ids':[]
+                }
             parkedids = jsondata['ids']
     except FileNotFoundError:  # pragma: no cover
         pass