From f7ea837bcccbb007dce2df773777820e9b81c4e9 Mon Sep 17 00:00:00 2001
From: sanderroosendaal <roosendaalsander@gmail.com>
Date: Mon, 31 Oct 2016 12:55:21 +0100
Subject: [PATCH] Sliders on flex chart

---
 db.sqlite3                        | Bin 1174528 -> 1174528 bytes
 rowers/interactiveplots.py        | 237 ++++++++++++++++--------------
 rowers/interactiveplots.pyc       | Bin 48279 -> 48408 bytes
 rowers/interactiveplots.py~       |   7 +-
 rowers/templates/flexchart3.html  |  60 ++++----
 rowers/templates/flexchart3.html~ |  60 ++++----
 rowers/urls.py                    |  12 +-
 rowers/urls.pyc                   | Bin 9720 -> 9720 bytes
 rowers/urls.py~                   |   1 +
 rowers/views.pyc                  | Bin 96531 -> 96531 bytes
 rowers/views.py~                  |  34 ++---
 11 files changed, 213 insertions(+), 198 deletions(-)

diff --git a/db.sqlite3 b/db.sqlite3
index c7bffb542c629dac0644b412a002296bd30325d2..40af5aaaab3adb809d119277ac5efdb7a5a853db 100644
GIT binary patch
delta 72
zcmWN>xe-7B006=9|6giUBhkjyAtJb(4m6<`J!parc6*lXS&lJW$8(zhcO;NdB8erD
VR5Hn>kWwnCrIA)T>2HSX{Q!M;7;XRn

delta 72
zcmWN>ITeFI06@W)<%V#zJk-!&<J+KHir*&=VgfICzybxCV&b{RbNx(VyT9}De@9*t
ZB#~4y$)%7|DygNBx3tnpFT=t3yB_5$8ZZC=

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 1a7861d7..accc3d4b 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -21,6 +21,7 @@ from bokeh.models import (
     GMapPlot, GMapOptions, ColumnDataSource, Circle,
     DataRange1d, PanTool, WheelZoomTool, BoxSelectTool,
     SaveTool,	ResizeTool, ResetTool, TapTool,CrosshairTool,BoxZoomTool,
+    Span,
 )
 #from bokeh.models.widgets import Slider, Select, TextInput
 from bokeh.core.properties import value
@@ -1394,29 +1395,26 @@ def interactive_flex_chart2(id=0,promember=0,
 	xaxmax = get_datetimes([xaxmax],tzinfo=1)[0]
 	xaxmin = get_datetimes([xaxmin],tzinfo=1)[0]
 	x1 = get_datetimes(x1,tzinfo=1)
-
-    if xparam=='distance':
+    elif xparam=='distance':
 	xaxmax = x1.max()
 	xaxmin = x1.min()
+    else:
+	xaxmax = yaxmaxima[xparam]
+	xaxmin = yaxminima[xparam]
 
     # average values
-    y1mean = y1.mean()+0.0*np.arange(100)
-    y2mean = y2.mean()+0.0*np.arange(100)
     if xparam != 'time':
-	x1mean = x1.mean()+0.0*np.arange(100)
+	x1mean = x1.mean()
     else:
-	x1mean = 0+0.0*np.arange(100)
+	x1mean = 0
+	
+    y1mean = y1.mean()
+    y2mean = y2.mean()
 
-
-
-    if xparam != 'time' and xparam != 'distance' and yparam1 != 'pace':
-	xvals = yaxminima[xparam]+np.arange(100)*(yaxmaxima[xparam]-yaxminima[xparam])/100.
-	y1vals = yaxminima[yparam1]+np.arange(100)*(yaxmaxima[yparam1]-yaxminima[yparam1])/100.
+    if xparam != 'time':
+	xvals = xaxmin+np.arange(100)*(xaxmax-xaxmin)/100.
     else:
 	xvals = np.arange(100)
-	y1vals = np.arange(100)
-
-
 
     # constant power plot
     if yparam1 == 'driveenergy':
@@ -1466,11 +1464,10 @@ def interactive_flex_chart2(id=0,promember=0,
 	    spmc=np.rint(10*spm)/10.,
 	    distance=distance,
 	    power=power,
-	    xvals=xvals,
-	    y1mean=y1mean,
-	    y2mean=y2mean,
-	    x1mean=x1mean,
-	    y1vals=y1vals,
+#	    xvals=xvals,
+	    y1mean=[y1mean,y1mean],
+	    y2mean=[y2mean,y2mean],
+	    x1mean=[x1mean,x1mean],
 	    )
 	)
 
@@ -1487,11 +1484,10 @@ def interactive_flex_chart2(id=0,promember=0,
 	    spmc=np.rint(10*spm)/10.,
 	    distance=distance,
 	    power=power,
-	    xvals=xvals,
-	    y1mean=y1mean,
-	    y2mean=y2mean,
-	    x1mean=x1mean,
-	    y1vals=y1vals,
+#	    xvals=xvals,
+	    y1mean=[y1mean,y1mean],
+	    y2mean=[y2mean,y2mean],
+	    x1mean=[x1mean,x1mean],
 	    )
 	)
 
@@ -1510,9 +1506,109 @@ def interactive_flex_chart2(id=0,promember=0,
 		  toolbar_sticky=False,
 #		  plot_width=900,
 		  )
+    x1means = Span(location=x1mean,dimension='height',line_color='green',
+		   line_dash=[6,6], line_width=2)
+
+    y1means = Span(location=y1mean,dimension='width',line_color='blue',
+		   line_dash=[6,6],line_width=2)
+    y2means = y1means
+
+    if (xparam != 'time') and (xparam != 'distance'):
+	plot.add_layout(x1means)
+
+    plot.add_layout(y1means)
 
 
-    callback = CustomJS(args = dict(source=source,source2=source2), code="""
+    
+    # average values
+    if yparam1 == 'driveenergy':
+	if xparam == 'spm':
+	    plot.line(xvals,yconstantpower,color="green",legend="Constant Power")
+
+    if plottype=='line':
+	plot.line('x1','y1',source=source2,legend=axlabels[yparam1])
+    elif plottype=='scatter':
+#	plot.circle('x1','y1',source=source2,legend=yparam1,size=3)
+	plot.scatter('x1','y1',source=source2,legend=axlabels[yparam1],fill_alpha=0.4,
+		     line_color=None)
+
+    plot.title.text = row.name
+    plot.title.text_font_size=value("1.0em")
+    plot.xaxis.axis_label = axlabels[xparam]
+    plot.yaxis.axis_label = axlabels[yparam1]
+
+
+
+    yrange1 = Range1d(start=yaxminima[yparam1],end=yaxmaxima[yparam1])
+    plot.y_range = yrange1
+
+    if (xparam != 'time') and (xparam != 'distance'):
+	xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam])
+	plot.x_range = xrange1
+
+    if xparam == 'time':
+	xrange1 = Range1d(start=xaxmin,end=xaxmax)
+	plot.x_range = xrange1
+	plot.xaxis[0].formatter = DatetimeTickFormatter(
+		hours = ["%H"],
+		minutes = ["%M"],
+		seconds = ["%S"],
+		days = ["0"],
+		months = [""],
+		years = [""]
+	    )
+
+
+    if yparam1 == 'pace':
+	plot.y_range = Range1d(ymin,ymax)
+	plot.yaxis[0].formatter = DatetimeTickFormatter(
+		seconds = ["%S"],
+		minutes = ["%M"]
+	    )
+
+    if yparam2 != 'None':
+	yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2])
+	plot.extra_y_ranges = {"yax2": yrange2}
+
+	if plottype=='line':
+	    plot.line('x1','y2',color="red",y_range_name="yax2",
+		      legend=axlabels[yparam2],
+		      source=source2)
+
+	elif plottype=='scatter':
+#	    plot.circle(x1,y2,color="red",y_range_name="yax2",legend=yparam2,
+#			source=source,size=3)
+	    plot.scatter('x1','y2',source=source2,legend=axlabels[yparam2]
+			 ,fill_alpha=0.4,
+			 line_color=None,color="red",y_range_name="yax2")
+	
+	plot.add_layout(LinearAxis(y_range_name="yax2",
+				   axis_label=axlabels[yparam2]),'right')
+
+	y2means = Span(location=y2mean,dimension='width',line_color='red',
+		       line_dash=[6,6],line_width=2,y_range_name="yax2")
+
+
+	plot.add_layout(y2means)
+
+    hover = plot.select(dict(type=HoverTool))
+
+
+    hover.tooltips = OrderedDict([
+	('Time','@time'),
+	('Distance','@distance'),
+	('Pace','@pace'),
+	('HR','@hr'),
+	('SPM','@spmc{1.1}'),
+	('Power','@power{int}'),
+	])
+ 
+    hover.mode = 'mouse'
+
+    callback = CustomJS(args = dict(source=source,source2=source2,
+				    x1means=x1means,
+				    y1means=y1means,
+				    y2means=y2means), code="""
        var data = source.data
        var data2 = source2.data
        var x1 = data['x1']
@@ -1568,6 +1664,7 @@ def interactive_flex_chart2(id=0,promember=0,
 		xm += x1[i]
 		ym1 += y1[i]
 		ym2 += y2[i]
+
 		}
 	     }
        }
@@ -1579,10 +1676,9 @@ def interactive_flex_chart2(id=0,promember=0,
        data2['x1mean'] = [xm,xm]
        data2['y1mean'] = [ym1,ym1]
        data2['y2mean'] = [ym2,ym2]
-
-       data2['xvals'] = [0,3e4]
-       data2['y1vals'] = [0,3e4]
-       data2['y2vals'] = [0,3e4]
+       x1means.location = xm
+       y1means.location = ym1
+       y2means.location = ym2
 
        source2.trigger('change');
        """)
@@ -1606,89 +1702,6 @@ def interactive_flex_chart2(id=0,promember=0,
 			     step=1,
 			     title="Max Distance",callback=callback)
     callback.args["maxdist"] = slider_dist_max
-    
-    # average values
-    plot.line('xvals','y1mean',color="black",source=source2)
-    plot.line('x1mean','y1vals',color="black",source=source2)
-    if yparam1 == 'driveenergy':
-	if xparam == 'spm':
-	    plot.line(xvals,yconstantpower,color="green",legend="Constant Power")
-
-    if plottype=='line':
-	plot.line('x1','y1',source=source2,legend=axlabels[yparam1])
-    elif plottype=='scatter':
-#	plot.circle('x1','y1',source=source2,legend=yparam1,size=3)
-	plot.scatter('x1','y1',source=source2,legend=axlabels[yparam1],fill_alpha=0.4,
-		     line_color=None)
-
-    plot.title.text = row.name
-    plot.title.text_font_size=value("1.0em")
-    plot.xaxis.axis_label = axlabels[xparam]
-    plot.yaxis.axis_label = axlabels[yparam1]
-
-
-    yrange1 = Range1d(start=yaxminima[yparam1],end=yaxmaxima[yparam1])
-    plot.y_range = yrange1
-
-    if (xparam != 'time') and (xparam != 'distance'):
-	xrange1 = Range1d(start=yaxminima[xparam],end=yaxmaxima[xparam])
-	plot.x_range = xrange1
-
-    if xparam == 'time':
-	xrange1 = Range1d(start=xaxmin,end=xaxmax)
-	plot.x_range = xrange1
-	plot.xaxis[0].formatter = DatetimeTickFormatter(
-		hours = ["%H"],
-		minutes = ["%M"],
-		seconds = ["%S"],
-		days = ["0"],
-		months = [""],
-		years = [""]
-	    )
-
-
-    if yparam1 == 'pace':
-	plot.y_range = Range1d(ymin,ymax)
-	plot.yaxis[0].formatter = DatetimeTickFormatter(
-		seconds = ["%S"],
-		minutes = ["%M"]
-	    )
-
-    if yparam2 != 'None':
-	yrange2 = Range1d(start=yaxminima[yparam2],end=yaxmaxima[yparam2])
-	plot.extra_y_ranges = {"yax2": yrange2}
-	plot.line('xvals','y2mean',color="black",y_range_name="yax2",
-		  source=source2)
-
-	if plottype=='line':
-	    plot.line('x1','y2',color="red",y_range_name="yax2",
-		      legend=axlabels[yparam2],
-		      source=source2)
-
-	elif plottype=='scatter':
-#	    plot.circle(x1,y2,color="red",y_range_name="yax2",legend=yparam2,
-#			source=source,size=3)
-	    plot.scatter('x1','y2',source=source2,legend=axlabels[yparam2]
-			 ,fill_alpha=0.4,
-			 line_color=None,color="red",y_range_name="yax2")
-	
-	plot.add_layout(LinearAxis(y_range_name="yax2",
-				   axis_label=axlabels[yparam2]),'right')
-
-	
-    hover = plot.select(dict(type=HoverTool))
-
-
-    hover.tooltips = OrderedDict([
-	('Time','@time'),
-	('Distance','@distance'),
-	('Pace','@pace'),
-	('HR','@hr'),
-	('SPM','@spmc{1.1}'),
-	('Power','@power{int}'),
-	])
- 
-    hover.mode = 'mouse'
 
     layout = layoutrow([layoutcolumn([slider_spm_min,
 			       slider_spm_max,
diff --git a/rowers/interactiveplots.pyc b/rowers/interactiveplots.pyc
index 59f5869219cd448f670f706ba223c89a3481bb0e..94bec1a786be595b27df86b766f4c9aa028d0fd7 100644
GIT binary patch
delta 11303
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

delta 10811
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
R>YH10ULW~ffid!n{{;`Dw3q+@

diff --git a/rowers/interactiveplots.py~ b/rowers/interactiveplots.py~
index b48f6343..1a7861d7 100644
--- a/rowers/interactiveplots.py~
+++ b/rowers/interactiveplots.py~
@@ -1580,9 +1580,9 @@ def interactive_flex_chart2(id=0,promember=0,
        data2['y1mean'] = [ym1,ym1]
        data2['y2mean'] = [ym2,ym2]
 
-       data2['xvals'] = [0,1e6]
-       data2['y1vals'] = [0,1e6]
-       data2['y2vals'] = [0,1e6]
+       data2['xvals'] = [0,3e4]
+       data2['y1vals'] = [0,3e4]
+       data2['y2vals'] = [0,3e4]
 
        source2.trigger('change');
        """)
@@ -1681,6 +1681,7 @@ def interactive_flex_chart2(id=0,promember=0,
 
     hover.tooltips = OrderedDict([
 	('Time','@time'),
+	('Distance','@distance'),
 	('Pace','@pace'),
 	('HR','@hr'),
 	('SPM','@spmc{1.1}'),
diff --git a/rowers/templates/flexchart3.html b/rowers/templates/flexchart3.html
index 46ab7e73..21e53bdd 100644
--- a/rowers/templates/flexchart3.html
+++ b/rowers/templates/flexchart3.html
@@ -51,17 +51,17 @@
 		<div class="grid_2 alpha dropdown">
 		<button class="grid_2 alpha button blue small dropbtn">X-axis</button>
 		<div class="dropdown-content">
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/time/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Time</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/distance/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Distance</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/time/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Time</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/distance/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Distance</a>
 		{% if promember %}
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/power/{{ yparam1 }}/{{ yparam2 }}/scatter">Power</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/hr/{{ yparam1 }}/{{ yparam2 }}/scatter">HR</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/spm/{{ yparam1 }}/{{ yparam2 }}/scatter">SPM</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/peakforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Peak Force</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/averageforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Average Force</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/drivelength/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Length</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/driveenergy/{{ yparam1 }}/{{ yparam2 }}/scatter">Work per Stroke</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/drivespeed/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Speed</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/power/{{ yparam1 }}/{{ yparam2 }}/scatter">Power</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/hr/{{ yparam1 }}/{{ yparam2 }}/scatter">HR</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/spm/{{ yparam1 }}/{{ yparam2 }}/scatter">SPM</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/peakforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Peak Force</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/averageforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Average Force</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/drivelength/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Length</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/driveenergy/{{ yparam1 }}/{{ yparam2 }}/scatter">Work per Stroke</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/drivespeed/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Speed</a>
 		{% else %}
 		<a class="button rosy small" href="/rowers/promembership">Power (Pro)</a>
 		<a class="button rosy small" href="/rowers/promembership">HR (Pro)</a>
@@ -79,16 +79,16 @@
 		<div class="grid_2 dropdown">
 		<button class="grid_2 alpha button blue small dropbtn">Left</button>
 		<div class="dropdown-content">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/pace/{{ yparam2 }}/{{ plottype }}">Pace</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/hr/{{ yparam2 }}/{{ plottype }}">HR</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/spm/{{ yparam2 }}/{{ plottype }}">SPM</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/power/{{ yparam2 }}/{{ plottype }}">Power</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/pace/{{ yparam2 }}/{{ plottype }}">Pace</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/hr/{{ yparam2 }}/{{ plottype }}">HR</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/spm/{{ yparam2 }}/{{ plottype }}">SPM</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/power/{{ yparam2 }}/{{ plottype }}">Power</a>
 		{% if promember %}
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/peakforce/{{ yparam2 }}/{{ plottype }}">Peak Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/averageforce/{{ yparam2 }}/{{ plottype }}">Average Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/drivelength/{{ yparam2 }}/{{ plottype }}">Drive Length</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/driveenergy/{{ yparam2 }}/{{ plottype }}">Work per Stroke</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/drivespeed/{{ yparam2 }}/{{ plottype }}">Drive Speed</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/peakforce/{{ yparam2 }}/{{ plottype }}">Peak Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/averageforce/{{ yparam2 }}/{{ plottype }}">Average Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/drivelength/{{ yparam2 }}/{{ plottype }}">Drive Length</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/driveenergy/{{ yparam2 }}/{{ plottype }}">Work per Stroke</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/drivespeed/{{ yparam2 }}/{{ plottype }}">Drive Speed</a>
 		{% else %}
 		<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
 		<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
@@ -103,15 +103,15 @@
 		<div class="grid_2 dropdown omega">
 		<button class="grid_2 alpha button blue small dropbtn">Right</button>
 		<div class="dropdown-content">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/hr/{{ plottype }}">HR</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/spm/{{ plottype }}">SPM</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/power/{{ plottype }}">Power</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/hr/{{ plottype }}">HR</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/spm/{{ plottype }}">SPM</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/power/{{ plottype }}">Power</a>
 		{% if promember %}
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/peakforce/{{ plottype }}">Peak Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/averageforce/{{ plottype }}">Average Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/drivelength/{{ plottype }}">Drive Length</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/driveenergy/{{ plottype }}">Work per Stroke</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/drivespeed/{{ plottype }}">Drive Speed</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/peakforce/{{ plottype }}">Peak Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/averageforce/{{ plottype }}">Average Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/drivelength/{{ plottype }}">Drive Length</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/driveenergy/{{ plottype }}">Work per Stroke</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/drivespeed/{{ plottype }}">Drive Speed</a>
 		{% else %}
 		<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
 		<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
@@ -120,7 +120,7 @@
 		<a class="button rosy small" href="/rowers/promembership">Drive Speed (Pro)</a>
 		{% endif %}
 
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/None/{{ plottype }}">None</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/None/{{ plottype }}">None</a>
 
 		</div>
 		</div>
@@ -141,10 +141,10 @@
 		<span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
 		</div>
 		<div class="grid_2">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/line">Line Plot</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/line">Line Plot</a>
 		</div>
 		<div class="grid_2 omega">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/scatter">Scatter Plot</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/scatter">Scatter Plot</a>
 		</div>
 	</div>
 
diff --git a/rowers/templates/flexchart3.html~ b/rowers/templates/flexchart3.html~
index 21e53bdd..46ab7e73 100644
--- a/rowers/templates/flexchart3.html~
+++ b/rowers/templates/flexchart3.html~
@@ -51,17 +51,17 @@
 		<div class="grid_2 alpha dropdown">
 		<button class="grid_2 alpha button blue small dropbtn">X-axis</button>
 		<div class="dropdown-content">
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/time/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Time</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/distance/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Distance</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/time/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Time</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/distance/{{ yparam1 }}/{{ yparam2 }}/{{ plottype }}">Distance</a>
 		{% if promember %}
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/power/{{ yparam1 }}/{{ yparam2 }}/scatter">Power</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/hr/{{ yparam1 }}/{{ yparam2 }}/scatter">HR</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/spm/{{ yparam1 }}/{{ yparam2 }}/scatter">SPM</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/peakforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Peak Force</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/averageforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Average Force</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/drivelength/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Length</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/driveenergy/{{ yparam1 }}/{{ yparam2 }}/scatter">Work per Stroke</a>
-		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart/drivespeed/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Speed</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/power/{{ yparam1 }}/{{ yparam2 }}/scatter">Power</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/hr/{{ yparam1 }}/{{ yparam2 }}/scatter">HR</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/spm/{{ yparam1 }}/{{ yparam2 }}/scatter">SPM</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/peakforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Peak Force</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/averageforce/{{ yparam1 }}/{{ yparam2 }}/scatter">Average Force</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/drivelength/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Length</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/driveenergy/{{ yparam1 }}/{{ yparam2 }}/scatter">Work per Stroke</a>
+		<a class="button blue small alpha" href="/rowers/workout/{{ id }}/flexchart2/drivespeed/{{ yparam1 }}/{{ yparam2 }}/scatter">Drive Speed</a>
 		{% else %}
 		<a class="button rosy small" href="/rowers/promembership">Power (Pro)</a>
 		<a class="button rosy small" href="/rowers/promembership">HR (Pro)</a>
@@ -79,16 +79,16 @@
 		<div class="grid_2 dropdown">
 		<button class="grid_2 alpha button blue small dropbtn">Left</button>
 		<div class="dropdown-content">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/pace/{{ yparam2 }}/{{ plottype }}">Pace</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/hr/{{ yparam2 }}/{{ plottype }}">HR</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/spm/{{ yparam2 }}/{{ plottype }}">SPM</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/power/{{ yparam2 }}/{{ plottype }}">Power</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/pace/{{ yparam2 }}/{{ plottype }}">Pace</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/hr/{{ yparam2 }}/{{ plottype }}">HR</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/spm/{{ yparam2 }}/{{ plottype }}">SPM</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/power/{{ yparam2 }}/{{ plottype }}">Power</a>
 		{% if promember %}
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/peakforce/{{ yparam2 }}/{{ plottype }}">Peak Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/averageforce/{{ yparam2 }}/{{ plottype }}">Average Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/drivelength/{{ yparam2 }}/{{ plottype }}">Drive Length</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/driveenergy/{{ yparam2 }}/{{ plottype }}">Work per Stroke</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/drivespeed/{{ yparam2 }}/{{ plottype }}">Drive Speed</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/peakforce/{{ yparam2 }}/{{ plottype }}">Peak Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/averageforce/{{ yparam2 }}/{{ plottype }}">Average Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/drivelength/{{ yparam2 }}/{{ plottype }}">Drive Length</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/driveenergy/{{ yparam2 }}/{{ plottype }}">Work per Stroke</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/drivespeed/{{ yparam2 }}/{{ plottype }}">Drive Speed</a>
 		{% else %}
 		<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
 		<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
@@ -103,15 +103,15 @@
 		<div class="grid_2 dropdown omega">
 		<button class="grid_2 alpha button blue small dropbtn">Right</button>
 		<div class="dropdown-content">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/hr/{{ plottype }}">HR</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/spm/{{ plottype }}">SPM</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/power/{{ plottype }}">Power</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/hr/{{ plottype }}">HR</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/spm/{{ plottype }}">SPM</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/power/{{ plottype }}">Power</a>
 		{% if promember %}
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/peakforce/{{ plottype }}">Peak Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/averageforce/{{ plottype }}">Average Force</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/drivelength/{{ plottype }}">Drive Length</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/driveenergy/{{ plottype }}">Work per Stroke</a>
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/drivespeed/{{ plottype }}">Drive Speed</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/peakforce/{{ plottype }}">Peak Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/averageforce/{{ plottype }}">Average Force</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/drivelength/{{ plottype }}">Drive Length</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/driveenergy/{{ plottype }}">Work per Stroke</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/drivespeed/{{ plottype }}">Drive Speed</a>
 		{% else %}
 		<a class="button rosy small" href="/rowers/promembership">Peak Force (Pro)</a>
 		<a class="button rosy small" href="/rowers/promembership">Average Force (Pro)</a>
@@ -120,7 +120,7 @@
 		<a class="button rosy small" href="/rowers/promembership">Drive Speed (Pro)</a>
 		{% endif %}
 
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/None/{{ plottype }}">None</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/None/{{ plottype }}">None</a>
 
 		</div>
 		</div>
@@ -141,10 +141,10 @@
 		<span class="tooltiptext">If your data source allows, this will show or hide strokes taken during rest intervals.</span>
 		</div>
 		<div class="grid_2">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/line">Line Plot</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/line">Line Plot</a>
 		</div>
 		<div class="grid_2 omega">
-		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/scatter">Scatter Plot</a>
+		<a class="button blue small" href="/rowers/workout/{{ id }}/flexchart2/{{ xparam }}/{{ yparam1 }}/{{ yparam2 }}/scatter">Scatter Plot</a>
 		</div>
 	</div>
 
diff --git a/rowers/urls.py b/rowers/urls.py
index 1eac2682..6004c7ab 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -125,14 +125,14 @@ urlpatterns = [
     url(r'^legal', TemplateView.as_view(template_name='legal.html'),name='legal'),
     url(r'^register$',views.rower_register_view),
     url(r'^register/thankyou/$', TemplateView.as_view(template_name='registerthankyou.html'), name='registerthankyou'),
-    url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+)/$',views.workout_flexchart2_view),
-    url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+.*)$',views.workout_flexchart2_view),
+    url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+)/$',views.workout_flexchart3_view),
+    url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+.*)$',views.workout_flexchart3_view),
     url(r'^workout/(?P<id>\d+)/flexchart/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)$',views.workout_flexchart2_view),
-    url(r'^workout/(?P<id>\d+)/flexchart$',views.workout_flexchart2_view),
-    url(r'^workout/(?P<id>\d+)/flexchart2/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+)/$',views.workout_flexchart3_view),
-    url(r'^workout/(?P<id>\d+)/flexchart2/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+.*)$',views.workout_flexchart3_view),
+    url(r'^workout/(?P<id>\d+)/flexchart$',views.workout_flexchart3_view),
+    url(r'^workout/(?P<id>\d+)/flexchart2/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+)/$',views.workout_flexchart2_view),
+    url(r'^workout/(?P<id>\d+)/flexchart2/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)/(?P<plottype>\w+.*)$',views.workout_flexchart2_view),
     url(r'^workout/(?P<id>\d+)/flexchart2/(?P<xparam>\w+.*)/(?P<yparam1>\w+.*)/(?P<yparam2>\w+.*)$',views.workout_flexchart3_view),
-    url(r'^workout/(?P<id>\d+)/flexchart2$',views.workout_flexchart3_view),
+    url(r'^workout/(?P<id>\d+)/flexchart2$',views.workout_flexchart2_view),
     url(r'^workout/compare/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>\w+.*)/(?P<plottype>\w+.*)$',views.workout_comparison_view2),
     url(r'^workout/compare/(?P<id1>\d+)/(?P<id2>\d+)/(?P<xparam>\w+.*)/(?P<yparam>\w+.*)/$',views.workout_comparison_view2),
     ]
diff --git a/rowers/urls.pyc b/rowers/urls.pyc
index 3b7ecb0cea1bc6bc5afc7a54d6dad3729f107520..620e4b7636f329590dfc0b0d21fbb949033aaccb 100644
GIT binary patch
delta 42
ycmez2{llA$`7<xqMT3oO-`E+wC;w%)X7t)@$#Gno(RebWiu5EE_RY#FR~Z3PWDX(#

delta 42
ycmez2{llA$`7<xqBmIqR-`E+wCjVu(X7t`{$#Gno(P%QGiu5EE_RY#FR~Z3RVh%9?

diff --git a/rowers/urls.py~ b/rowers/urls.py~
index e732d37e..1eac2682 100644
--- a/rowers/urls.py~
+++ b/rowers/urls.py~
@@ -16,6 +16,7 @@ handler403 = 'views.error403_view'
 urlpatterns = [
 #    url(r'^password_change/$',auth_views.password_change),
 #    url(r'^password_change_done/$',auth_views.password_change_done),
+    url(r'^testbokeh$',views.testbokeh),
     url(r'^500/$', TemplateView.as_view(template_name='500.html'),name='500'),
     url(r'^404/$', TemplateView.as_view(template_name='404.html'),name='404'),
     url(r'^400/$', TemplateView.as_view(template_name='400.html'),name='400'),
diff --git a/rowers/views.pyc b/rowers/views.pyc
index a5f103a4b1d26233bd80ddcd65398a9b5f539c48..faa9087c15b344f6c20b8bb470aae87333e7fd7b 100644
GIT binary patch
delta 21
dcmbRIiFNWPR(9skyj=SX#2eYSvNQ5j0svXn2KWE~

delta 21
dcmbRIiFNWPR(9skyj*ux#TwbSvNQ5j0svZ|2MYiI

diff --git a/rowers/views.py~ b/rowers/views.py~
index 45a80d4d..6d84ceb3 100644
--- a/rowers/views.py~
+++ b/rowers/views.py~
@@ -354,10 +354,10 @@ def add_workout_from_strokedata(user,importid,data,strokedata,source='c2'):
     pace = strokedata.ix[:,'p']/10.
 
     velo = 500./pace
-    if (source=='c2'):
-	power = 2.8*velo**3
-    else:
-	power = 0.0*velo
+#    if (source=='c2' or source=='strava'):
+    power = 2.8*velo**3
+#    else:
+#	power = 0.0*velo
     
     # save csv
     # Create data frame with all necessary data to write to csv
@@ -2457,15 +2457,15 @@ def workout_flexchart3_view(request,id=0,xparam='distance',yparam1='pace',
 				 workstrokesonly=workstrokesonly)
     script = res[0]
     div = res[1]
-    widgetscript = res[2]
-    widgetdiv1 = res[3]
-    widgetdiv2 = res[4]
-
-
+    js_resources = res[2]
+    css_resources = res[3]
+    
     return render(request,
-		  'flexchart2.html',
-		  {'interactiveplot':script,
+		  'flexchart3.html',
+		  {'the_script':script,
 		   'the_div':div,
+		   'js_res': js_resources,
+		   'css_res':css_resources,
 		   'id':id,
 		   'xparam':xparam,
 		   'yparam1':yparam1,
@@ -2474,9 +2474,6 @@ def workout_flexchart3_view(request,id=0,xparam='distance',yparam1='pace',
 		   'mayedit':mayedit,
 		   'promember':promember,
 		   'workstrokesonly': not workstrokesonly,
-		   'widgetscript': widgetscript,
-		   'widgetdiv1': widgetdiv1,
-		   'widgetdiv2': widgetdiv2,
 		   })
 	
 def testbokeh(request):
@@ -2557,7 +2554,7 @@ def testbokeh(request):
 
     hover.mode = 'mouse'
     
-    layout = row([column([s1,s2,s3,s4]),plot])
+    layout = layoutrow([layoutcolumn([s1,s2,s3,s4]),plot])
 #    widgetbox(s)
     script, div = components(layout)
     js_resources = INLINE.render_js()
@@ -4040,10 +4037,10 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
     
     savebutton = 'nosavebutton'
 
+    # We have submitted the mini language interpreter
     if request.method == 'POST' and "intervalstring" in request.POST:
 	form = SummaryStringForm(request.POST)
 	if form.is_valid():
-	    #something
 	    cd = form.cleaned_data
 	    s = cd["intervalstring"]
 	    rowdata.updateinterval_string(s)
@@ -4052,6 +4049,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	    nrintervals = len(idist)
 	    savebutton = 'savestringform'
 	    
+    # we are saving the results obtained from the mini language interpreter
     elif request.method == 'POST' and "savestringform" in request.POST:
 	s = request.POST["savestringform"]
 	rowdata.updateinterval_string(s)
@@ -4059,7 +4057,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	itime,idist,itype = rowdata.intervalstats_values()
 	nrintervals = len(idist)
 	row.summary = intervalstats
-	intervalstats = rowdata.allstats()
+	#intervalstats = rowdata.allstats()
 	row.notes += "\n"+s
 	row.save()
 	rowdata.write_csv(f1)
@@ -4067,6 +4065,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 	form = SummaryStringForm(initial=data)
 	savebutton = 'savestringform'
 
+    # we are saving the results obtained from the detailed form
     elif request.method == 'POST' and "savedetailform" in request.POST:
 	savebutton = 'savedetailform'
 	form = SummaryStringForm()
@@ -4117,6 +4116,7 @@ def workout_summary_edit_view(request,id,message="",successmessage=""
 
 	form = SummaryStringForm()
 
+    # we are processing the details form
     elif request.method == 'POST' and "nrintervals" in request.POST:
 	savebutton = 'savedetailform'
 	nrintervals = int(request.POST['nrintervals'])