start of UI for Analysis -> CP chart

rowers/forms.py

@@ -1036,6 +1036,7 @@ analysischoices = (
     ('flexall','Cumulative Flex Chart'),
     ('stats','Statistics'),
     ('compare','Compare'),
+    ('cp','CP chart'),
     )
 
 

rowers/templates/user_analysis_select.html

@@ -88,6 +88,8 @@
       var yaxis2 = $("#id_yaxis2").parent().parent();
       var plottype = $("#id_plottype").parent().parent();
 
+			var reststrokes = $("#id_includereststrokes").parent().parent();
+
       // Hide the fields.
       // Use JS to do this in case the user doesn't have JS
       // enabled.
@@ -102,6 +104,7 @@
       yaxis1.hide();
       yaxis2.hide();
       plottype.hide();
+			reststrokes.show();
 
       if (functionfield.val() == 'boxplot') {
 	  plotfield.show();
@@ -161,6 +164,7 @@
 	      yaxis1.hide();
 	      yaxis2.hide();
 	      plottype.hide();
+				reststrokes.show();
 	  }
 	  else if (Value=='histo') {
 	      plotfield.show();
@@ -178,6 +182,7 @@
 	      yaxis1.hide();
 	      yaxis2.hide();
 	      plottype.hide();
+				reststrokes.show();
 
 	  }
 	  else if (Value=='trendflex') {
@@ -196,6 +201,7 @@
 	      yaxis1.hide();
 	      yaxis2.hide();
 	      plottype.hide();
+				reststrokes.show();
 
 	  }
 	  else if (Value=='flexall') {
@@ -214,6 +220,7 @@
 	      binsize.hide();
 	      plottype.hide();
 	      errorbars.hide();
+				reststrokes.show();
 	  }
 	  else if (Value=='stats') {
 	      xaxis.hide();
@@ -227,6 +234,7 @@
 	      binsize.hide();
 	      errorbars.hide();
 	      plottype.hide();
+				reststrokes.show();
 	  }
 	  else if (Value=='compare') {
 	      xaxis.show();
@@ -244,6 +252,25 @@
 	      binsize.hide();
 	      plottype.show();
 	      errorbars.hide();
+				reststrokes.show();
+	  }
+		else if (Value=='cp') {
+	      plotfield.hide();
+	      spmmin.hide();
+	      spmmax.hide();
+	      workmin.hide();
+	      workmax.hide();
+	      x_param.hide();
+	      y_param.hide();
+	      groupby.hide();
+	      palette.hide();
+	      binsize.hide();
+	      errorbars.hide();
+	      xaxis.hide();
+	      yaxis1.hide();
+	      yaxis2.hide();
+	      plottype.hide();
+				reststrokes.hide();
 	  }
       });
   });

rowers/views/analysisviews.py

@@ -500,6 +500,9 @@ def histodata(workouts, options):
 
     return(script,div)
 
+def cpdata(workouts, options):
+    return ('','Not Yet Implemented')
+
 def statsdata(workouts, options):
     includereststrokes = options['includereststrokes']
     spmmin = options['spmmin']
@@ -725,6 +728,8 @@ def analysis_view_data(request,userid=0):
         script,div = statsdata(workouts,options)
     elif function == 'compare':
         script,div = comparisondata(workouts,options)
+    elif function == 'cp':
+        script, div = cpdata(workouts, options)
     else:
         script = ''
         div = 'Unknown analysis functions'