bug fix, and some additions

Reviewed bug allowing database to be queried on non-existing columns.
Looks like a freak bug and code to prevent it was already in place. Not
sure what happened to trigger the bug on the production server. Wait for
another occurence, then solve.
Added Flex Chart as a button on the left panel. Added Workflow
configuration to the User Settings page

rowers/interactiveplots.py

@@ -2170,7 +2170,10 @@ def interactive_flex_chart2(id=0,promember=0,
 
     if yparam1 == 'pace':
 	y_axis_type = 'datetime'
+        try:
 	    y1mean = rowdata.ix[:,'pace'].mean()
+        except KeyError:
+            y1mean = 0
 
 
     rowdata['xname'] = axlabels[xparam]

rowers/templates/favoritecharts.html

@@ -6,7 +6,7 @@
 <form method="post">
   {% csrf_token %}
   <div class="grid_12 alpha">
-    <div class="grid_4 fav-form-header">
+    <div class="grid_4 alpha fav-form-header">
       <p><input type="submit" value="Update Favorites" class="button green small"/></p>
     </div>
   </div>

rowers/templates/panel_flexchart.html

@@ -0,0 +1,5 @@
+<div class="grid_2 alpha">
+  <p>
+    <a class="button gray small" href="/rowers/workout/{{ workout.id }}/flexchart">Flex Chart</a>
+  </p>
+</div>

rowers/templates/rower_form.html

@@ -170,7 +170,7 @@
   </div>
 </div>
 <div class="grid_12 alpha">
-  <div class="grid_6 suffix_6 alpha">
+  <div class="grid_6 alpha">
     <p>
       <h2>Export Settings</h2>
       <div class="grid_2 suffix_4 alpha">
@@ -178,6 +178,14 @@
       </div>
     </p>
   </div>
+  <div class="grid_6 omega">
+    <p>
+      <h2>Configure Workflow Layout</h2>
+      <div class="grid_2 suffix_4 alpha">
+        <a class="button gray small" href="/rowers/me/workflowconfig2">Manage Workflow Layout</a>
+      </div>
+    </p>
+  </div>
   
 
 </div>

rowers/utils.py

@@ -35,6 +35,7 @@ workflowleftpanel = (
     ('panel_advancededit.html','Advanced Workout Edit Button'),
     ('panel_editintervals.html','Edit Intervals Button'),
     ('panel_stats.html','Workout Statistics Button'),
+    ('panel_flexchart.html','Flex Chart'),
     ('panel_staticchart.html','Create Static Charts Buttons'),
     ('panel_geekyheader.html','Geeky Header'),
     ('panel_editwind.html','Edit Wind Data'),

rowers/views.py

@@ -8555,7 +8555,6 @@ def rower_favoritecharts_view(request):
         if favorites_formset.is_valid():
             new_instances = []
             for favorites_form in favorites_formset:
-                print 'mies'
                 yparam1 = favorites_form.cleaned_data.get('yparam1')
                 yparam2 = favorites_form.cleaned_data.get('yparam2')
                 xparam = favorites_form.cleaned_data.get('xparam')