From 1a082d8908b5b81de53b361f3ce3b0209cbb1ecd Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sun, 4 Jun 2023 16:53:55 +0200
Subject: [PATCH] 3.6.0 for py39

---
 rowers/dataprep.py                    |  12 ++++++------
 rowers/dataroutines.py                |  10 +++++-----
 rowers/interactiveplots.py            |   2 +-
 rowers/scoring.py                     |   2 ++
 rowers/tasks.py                       |   3 ++-
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 3999 bytes
 templates/newbase.html                |   2 --
 7 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index c042b4af..d68d01d4 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -786,9 +786,9 @@ def split_workout(r, parent, splitsecond, splitmode):
     data1.fillna(method='bfill', inplace=True)
 
     # Some new stuff to try out
-    data1 = data1.groupby('time', axis=0).mean()
-    data1['time'] = data1.index
-    data1.reset_index(drop=True, inplace=True)
+    #data1 = data1.groupby('time', axis=0).mean()
+    #data1['time'] = data1.index
+    #data1.reset_index(drop=True, inplace=True)
 
     data2 = data2.sort_values(['time'])
     data2 = data2.interpolate(method='linear', axis=0, limit_direction='both',
@@ -796,9 +796,9 @@ def split_workout(r, parent, splitsecond, splitmode):
     data2.fillna(method='bfill', inplace=True)
 
     # Some new stuff to try out
-    data2 = data2.groupby('time', axis=0).mean()
-    data2['time'] = data2.index
-    data2.reset_index(drop=True, inplace=True)
+    #data2 = data2.groupby('time', axis=0).mean()
+    #data2['time'] = data2.index
+    #data2.reset_index(drop=True, inplace=True)
 
     data1['pace'] = data1['pace'] / 1000.
     data2['pace'] = data2['pace'] / 1000.
diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 1d439969..74d82a9b 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1480,7 +1480,7 @@ def datafusion(id1, id2, columns, offset):
         'fpace',
         'workoutid',
         'id'],
-        1, errors='ignore')
+        axis=1, errors='ignore')
 
     # Add coordinates to DataFrame
     latitude, longitude = get_latlon(id1)
@@ -1503,7 +1503,7 @@ def datafusion(id1, id2, columns, offset):
 
     for c in df1.columns:
         if c not in keep1:
-            df1 = df1.drop(c, 1, errors='ignore')
+            df1 = df1.drop(c, axis=1, errors='ignore')
 
     df = pd.concat([df1, df2], ignore_index=True)
     df = df.sort_values(['time'])
@@ -1512,9 +1512,9 @@ def datafusion(id1, id2, columns, offset):
     df.fillna(method='bfill', inplace=True)
 
     # Some new stuff to try out
-    df = df.groupby('time', axis=0).mean()
-    df['time'] = df.index
-    df.reset_index(drop=True, inplace=True)
+    #df = df.groupby('time',axis=0).mean()
+    #df['time'] = df.index
+    #df.reset_index(drop=True, inplace=True)
 
     df['time'] = df['time'] / 1000.
     df['pace'] = df['pace'] / 1000.
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 91bb53b1..c8da52f2 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -4655,7 +4655,7 @@ def interactive_chart(id=0, promember=0, intervaldata={}):
     ])
 
     hover.mode = 'mouse'
-    hover.names = ["spm", "pace"]
+    # hover.name = ["spm", "pace"]
 
     script, div = components(plot)
 
diff --git a/rowers/scoring.py b/rowers/scoring.py
index ab692240..678f3a62 100644
--- a/rowers/scoring.py
+++ b/rowers/scoring.py
@@ -137,6 +137,8 @@ def save_scoring(name, user, filename, id=0, notes=""):
                 adaptiveclass = 'None'
         except KeyError:  # pragma: no cover
             adaptiveclass = 'None'
+        except AttributeError:
+            adaptiveclass = 'None'
 
         try:
             skillclass = row['SkillClass']
diff --git a/rowers/tasks.py b/rowers/tasks.py
index fa27043c..99ab4353 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -3691,12 +3691,13 @@ def handle_c2_async_workout(alldata, userid, c2token, c2id, delaysec,
     newc2id = workout.uploadedtoc2
 
     parkedids = []
-    with open('c2blocked.json', 'r') as c2blocked:
+    with open('c2blocked.json', 'a+') as c2blocked:
         try:
             jsondata = json.load(c2blocked)
             parkedids = jsondata['ids']
         except JSONDecodeError:  # pragma: no cover
             parkedids = []
+        
 
     newparkedids = [id for id in parkedids if id != newc2id]
     with open('c2blocked.json', 'wt') as c2blocked:
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 4d0a992ce943143fa3defe13b65bf38115b24992..d34d12c1e78589ea84a4c24a8b4484e1b80cd5f5 100644
GIT binary patch
literal 3999
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
F0RTcDI&%O3

literal 4000
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
GfB^u#j6oOx

diff --git a/templates/newbase.html b/templates/newbase.html
index 1771e66e..b2c32821 100644
--- a/templates/newbase.html
+++ b/templates/newbase.html
@@ -12,8 +12,6 @@
     <title>{% block title %}Rowsandall Rowing Data Analytics{% endblock %}</title>
     {% analytical_head_top %}
 
-    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-1.0.4.min.css" type="text/css" />
-    <link rel="stylesheet" href="https://cdn.pydata.org/bokeh/release/bokeh-widgets-1.0.4.min.css" type="text/css" />
     <link rel="stylesheet" type="text/css" href="/static/admin/css/forms.css"/>
     <link rel="stylesheet" type="text/css" href="/static/admin/css/widgets.css"/>
     <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" >