some error checking in interactive plot

rowers/interactiveplots.py

@@ -997,11 +997,20 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
     if datadf.empty:
 	return ['','<p>No non-zero data in selection</p>','','']
 
- 
+
-    datadf['x1'] = datadf.ix[:,xparam]
+    try:
-    datadf['y1'] = datadf.ix[:,yparam1]
+        datadf['x1'] = datadf.ix[:,xparam]
+    except KeyError:
+        datadf['x1'] = datadf['distance']
+    try:
+        datadf['y1'] = datadf.ix[:,yparam1]
+    except KeyError:
+        datadf['y1'] = datadf['pace']
     if yparam2 != 'None':
-	datadf['y2'] = datadf.ix[:,yparam2]
+        try:
+	    datadf['y2'] = datadf.ix[:,yparam2]
+        except KeyError:
+            datadf['y2'] = datadf['y1']
     else:
 	datadf['y2'] = datadf['y1']
 

rowers/views.py

@@ -76,6 +76,10 @@ from rowsandall_app.settings import (
     TP_CLIENT_ID,TP_REDIRECT_URI,TP_CLIENT_KEY,TP_CLIENT_SECRET,
     )
 
+from rowers.tasks_standalone import addcomment2
+from django.contrib import messages
+from async_messages import messages as a_messages
+
 import requests
 import json
 from rest_framework.renderers import JSONRenderer
@@ -2182,9 +2186,6 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
                       'teams':get_my_teams(request.user),
                   })
 
-from rowers.tasks_standalone import addcomment2
-#from django.contrib import messages
-from async_messages import messages
 # Test asynchronous tasking and messaging
 @login_required()
 def workout_test_task_view(request,id=0):