Flex buttons on workouts list

rowers/interactiveplots.py

@@ -1,3 +1,4 @@
+
 from rowers.models import Workout, User, Rower, WorkoutForm,RowerForm,GraphImage
 from rowingdata import rower as rrower
 from rowingdata import main as rmain

rowers/templates/list_workouts.html

@@ -59,6 +59,8 @@
 <td> {{ workout.maxhr }} </td>
 <td> <a class="button red small" href="/rowers/workout/{{ workout.id }}/deleteconfirm">Delete</td>
 <td> <a class="button blue small" href="/rowers/workout/{{ workout.id }}/export">Export</a> </td>
+<td> <a class="button blue small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex</a> </td>
+
 
 </tr>
 
@@ -96,7 +98,7 @@
     <a class="wh" href="?page={{ workouts.next_page_number }}">&gt;</a>
     {% endif %}
   </span>
-
+</div>
 
 
 {% endblock %}

rowers/views.py

@@ -2688,10 +2688,20 @@ def workout_flexchart3_view(request,*args,**kwargs):
 	    workstrokesonly = False
 
     # create interactive plot
+    try:
         script,div,js_resources,css_resources = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
 				 yparam2=yparam2,
 				 promember=promember,plottype=plottype,
 				 workstrokesonly=workstrokesonly)
+    except ValueError:
+        script,div = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
+				             yparam2=yparam2,
+				             promember=promember,plottype=plottype,
+				             workstrokesonly=workstrokesonly)
+        js_resources = ""
+        css_resources = ""
+
+        
     # script = res[0]
     # div = res[1]
     # js_resources = res[2]
@@ -3730,7 +3740,6 @@ def workout_upload_view(request,message=""):
                 
 		f = row.df['TimeStamp (sec)'].diff().mean()
 		windowsize = 2*(int(10./(f)))+1
-
 		if not 'originalvelo' in row.df:
 		    row.df['originalvelo'] = velo
 
@@ -3755,7 +3764,6 @@ def workout_upload_view(request,message=""):
                 except:
                     pass
                 
-                
 		# recalculate power data
 		if workouttype == 'rower' or workouttype == 'dynamic' or workouttype == 'slides':
 		    try:
@@ -3777,7 +3785,6 @@ def workout_upload_view(request,message=""):
 		totaltime = row.df['TimeStamp (sec)'].max()-row.df['TimeStamp (sec)'].min()
 		totaltime = totaltime+row.df.ix[0,' ElapsedTime (sec)']
 
-
 		hours = int(totaltime/3600.)
 		minutes = int((totaltime - 3600.*hours)/60.)
 		seconds = int(totaltime - 3600.*hours - 60.*minutes)
@@ -3798,7 +3805,6 @@ def workout_upload_view(request,message=""):
 		if (len(ws) != 0):
 		    message =  "Warning: This workout probably already exists in the database"
 
-
 		w = Workout(user=r,name=t,date=workoutdate,
 			    workouttype=workouttype,
 			    duration=duration,distance=totaldist,