working predictions and fit type

rowers/templates/user_analysis_select.html

@@ -89,6 +89,9 @@
       var plottype = $("#id_plottype").parent().parent();
 
 			var reststrokes = $("#id_includereststrokes").parent().parent();
+			var piece = $("#id_piece").parent().parent();
+			var cpfit = $("#id_cpfit").parent().parent();
+
 
       // Hide the fields.
       // Use JS to do this in case the user doesn't have JS
@@ -109,6 +112,8 @@
 			workmax.hide();
 			spmmin.hide();
 			spmmax.hide();
+			cpfit.hide();
+			piece.hide();
 
       if (functionfield.val() == 'boxplot') {
 	  plotfield.show();
@@ -141,8 +146,14 @@
 	  xaxis.show();
 	  yaxis1.show();
 	  plottype.show();
+		piece.hide();
       }
 
+			if (functionfield.val() == 'cp') {
+				cpfit.show();
+				piece.show();
+			}
+
 
       // Setup an event listener for when the state of the
       // checkbox changes.
@@ -169,6 +180,8 @@
 	      yaxis2.hide();
 	      plottype.hide();
 				reststrokes.show();
+				cpfit.hide();
+				piece.hide();
 	  }
 	  else if (Value=='histo') {
 	      plotfield.show();
@@ -187,6 +200,8 @@
 	      yaxis2.hide();
 	      plottype.hide();
 				reststrokes.show();
+				cpfit.hide();
+				piece.hide();
 
 	  }
 	  else if (Value=='trendflex') {
@@ -206,6 +221,8 @@
 	      yaxis2.hide();
 	      plottype.hide();
 				reststrokes.show();
+				cpfit.hide();
+				piece.hide();
 
 	  }
 	  else if (Value=='flexall') {
@@ -225,6 +242,8 @@
 	      plottype.hide();
 	      errorbars.hide();
 				reststrokes.show();
+				cpfit.hide();
+				piece.hide();
 	  }
 	  else if (Value=='stats') {
 	      xaxis.hide();
@@ -239,6 +258,8 @@
 	      errorbars.hide();
 	      plottype.hide();
 				reststrokes.show();
+				cpfit.hide();
+				piece.hide();
 	  }
 	  else if (Value=='compare') {
 	      xaxis.show();
@@ -256,7 +277,11 @@
 	      binsize.hide();
 	      plottype.show();
 	      errorbars.hide();
+				piece.hide();
+				cpfit.hide();
 				reststrokes.show();
+
+
 	  }
 		else if (Value=='cp') {
 	      plotfield.hide();
@@ -275,6 +300,8 @@
 	      yaxis2.hide();
 	      plottype.hide();
 				reststrokes.hide();
+				cpfit.show();
+				piece.show();
 	  }
       });
   });
@@ -299,9 +326,9 @@
 
 <ul class="main-content">
   <li class="grid_4">
-    <div id="id_chart">
-      {{ the_div|safe }}
-    </div>
+		<div id="id_chart">
+    {{ the_div|safe }}
+		</div>
   </li>
   <li class="grid_4">
     <p>You can use the date and search forms to search through all
@@ -327,7 +354,7 @@
     </table>
   </li>
 	<li class="grid_2 maxheight">
-      {{ searchform }}
+      <p>{{ searchform }}</p>
 
       {% if workouts %}