From 206ee219f3921339c1f937a485ff17de6a90b31b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sun, 4 Jun 2023 09:26:36 +0200
Subject: [PATCH] fixing analysis data bokeh

---
 rowers/datautils.py                        |  2 +-
 rowers/interactiveplots.py                 |  5 +++--
 rowers/templates/user_analysis_select.html | 21 ++++++++++++++-------
 rowers/views/analysisviews.py              | 17 ++---------------
 templates/newbase.html                     |  1 -
 5 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/rowers/datautils.py b/rowers/datautils.py
index 47581604..a13709f9 100644
--- a/rowers/datautils.py
+++ b/rowers/datautils.py
@@ -329,7 +329,7 @@ def getmaxwattinterval(tt, ww, i):
     w_roll = ww.rolling(i+2).mean().dropna()
     if len(w_roll):
         # now goes with # data points - should be fixed seconds
-        indexmax = w_roll.idxmax(axis=1)
+        indexmax = w_roll.idxmax(axis=0)
         #        indexmaxpos = indexmax.get_loc(indexmax)
         indexmaxpos = indexmax
         try:
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 2603e2d4..91bb53b1 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -3589,8 +3589,9 @@ def interactive_otwcpchart(powerdf, promember=0, rowername="", r=None, cpfit='da
         title = "Critical Power for "+rowername
     plot.title.text = title
 
-    xaxis = plot.select(dict(type=Axis, layout="below"))[0]
-    xaxis.formatter = PrintfTickFormatter()
+    #xaxis = plot.select(dict(type=Axis, layout="below")) #[0]
+    #print(xaxis)
+    #xaxis.formatter = PrintfTickFormatter()
 
     hover = plot.select(dict(type=HoverTool))
 
diff --git a/rowers/templates/user_analysis_select.html b/rowers/templates/user_analysis_select.html
index 45dd06ad..935fe39d 100644
--- a/rowers/templates/user_analysis_select.html
+++ b/rowers/templates/user_analysis_select.html
@@ -332,12 +332,18 @@
 </script>
 
 <div id="id_css_res">
-    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-3.1.1.min.css" type="text/css" />
-    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.1.1.min.css" type="text/css" />
 </div>
 <div id="id_js_res">
-  <script src="https://cdn.pydata.org/bokeh/release/bokeh-3.1.1.min.js"></script>
-  <script src="https://cdn.pydata.org/bokeh/release/bokeh-widgets-3.1.1.min.js"></script>
+  <script src="https://cdn.bokeh.org/bokeh/release/bokeh-3.1.1.min.js"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-widgets-3.1.1.min.js"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-tables-3.1.1.min.js"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-gl-3.1.1.min.js"
+        crossorigin="anonymous"></script>
+<script src="https://cdn.bokeh.org/bokeh/release/bokeh-mathjax-3.1.1.min.js"
+        crossorigin="anonymous"></script>
 </div>
 
 <script async="true" type="text/javascript">
@@ -533,9 +539,10 @@
   var script = json.script;
   var div = json.div;
   $("#id_sitready").remove();
-  $("#id_chart").append(div);
-  console.log(div);
-  $("#id_script").append("<script>"+script+"</s"+"cript>");
+      $("#id_chart").append(div);
+      
+      $("#id_script").append(script); 
+      /* $("#id_script").append("<script>"+script+"</s"+"cript>"); */
 
   });
   });
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index e98a5f3f..882e7412 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -535,8 +535,6 @@ def trendflexdata(workouts, options, userid=0):
                                         spmmin=spmmin, spmmax=spmmax,
                                         workmin=workmin, workmax=workmax)
 
-    scripta = script.split('\n')[2:-1]
-    script = ''.join(scripta)
 
     return(script, div)
 
@@ -583,9 +581,6 @@ def flexalldata(workouts, options):
     script = res[0]
     div = res[1]
 
-    scripta = script.split('\n')[2:-1]
-    script = ''.join(scripta)
-
     return(script, div)
 
 
@@ -620,9 +615,6 @@ def histodata(workouts, options):
                                        extratitle=extratitle,
                                        workmin=workmin, workmax=workmax)
 
-    scripta = script.split('\n')[2:-1]
-    script = ''.join(scripta)
-
     return(script, div)
 
 
@@ -718,8 +710,8 @@ def cpdata(workouts, options):
         p1 = [1, 1, 1, 1]
         ratio = 1
 
-    scripta = script.split('\n')[2:-1]
-    script = ''.join(scripta)
+    
+
 
     minutes = options['piece']
     if minutes != 0:
@@ -898,9 +890,6 @@ def comparisondata(workouts, options):
     script = res[0]
     div = res[1]
 
-    scripta = script.split('\n')[2:-1]
-    script = ''.join(scripta)
-
     return(script, div)
 
 
@@ -964,8 +953,6 @@ def boxplotdata(workouts, options):
                                        spmmin=spmmin, spmmax=spmmax,
                                        workmin=workmin, workmax=workmax)
 
-    scripta = script.split('\n')[2:-1]
-    script = ''.join(scripta)
 
     return(script, div)
 
diff --git a/templates/newbase.html b/templates/newbase.html
index 6e77fffd..1771e66e 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -60,7 +60,6 @@
       }(document, 'script', 'facebook-jssdk'));</script>
 			<script>
 				$(document).ready(function (){
-					FB.XFBML.parse();
 				})
 
 				</script>