From 6dda955115867b094790f2e4cbdb50d3d8c13834 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 22 Aug 2023 22:37:48 +0200
Subject: [PATCH 1/3] fixing plannedsessions_view

---
 rowers/dataprep.py        |  6 ++----
 rowers/views/planviews.py | 15 +++++++++------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 582815e0..4100b8d5 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -126,8 +126,7 @@ def rscore_approx(row):
         else:
             dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
             dd = dd/3600
-            print(row['rpe'],dd,rpetotss[row['rpe']])
-            return rpetotss[row['rpe']]*dd
+            return int(rpetotss[row['rpe']]*dd)
     if row['rscore'] < 0:
         w = Workout.objects.get(id=row['id'])
         trimp, hrtss = workout_trimp(w)
@@ -135,12 +134,11 @@ def rscore_approx(row):
         if row['rpe'] and row['rpe'] > 0:
             dd = 3600*row['duration'].hour+60*row['duration'].minute+row['duration'].second
             dd = dd/3600
-            return rpetotss[row['rpe']]*dd
+            return int(rpetotss[row['rpe']]*dd)
         else:  # pragma: no cover
             minutes = row['duration'].hour*60+row['duration'].minute
             return minutes
 
-    print('boer')
     return 0
 
 
diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py
index 3d5df328..a3a424ad 100644
--- a/rowers/views/planviews.py
+++ b/rowers/views/planviews.py
@@ -1518,12 +1518,15 @@ def plannedsessions_view(request,
     for w in ws:
         thetrimp, hrtss = dataprep.workout_trimp(w)
         totals['trimp'] += thetrimp
-        tss = dataprep.workout_rscore(w)[0]
-        if not np.isnan(tss) and tss != 0:
-            totals['rscore'] += tss
-        elif tss == 0:
-            totals['rscore'] += hrtss
-            tss = hrtss
+        row = {
+                'rscore': w.rscore,
+                'hrtss': w.hrtss,
+                'rpe': w.rpe,
+                'duration': w.duration,
+                'id': w.id
+            }
+        tss = dataprep.rscore_approx(row)
+        totals['rscore'] += tss
         totals['distance'] += w.distance
         totals['time'] += timefield_to_seconds_duration(w.duration)
         if w.plannedsession:  # pragma: no cover

From 64043efe694f4cff1387031c019d77d5c2e9f5cf Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Fri, 25 Aug 2023 08:35:07 +0200
Subject: [PATCH 2/3] fix

---
 rowers/tasks.py                       |  10 +++++++---
 rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4000 bytes
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/rowers/tasks.py b/rowers/tasks.py
index 41e28396..a037a37d 100644
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -359,7 +359,7 @@ def uploadactivity(access_token, filename, description='',
             with gzip.GzipFile(fileobj=data_gz, mode="w") as gzf:
                 gzf.write(s)
     except FileNotFoundError:
-        return 0
+        return 0, 0, 0, 0
 
     headers = {
         'Content-Type': 'application/json',
@@ -2644,8 +2644,12 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
     nr_rows = len(row.df)
     if (plotnr in [1, 2, 4, 5, 8, 11, 9, 12]) and (nr_rows > 1200):  # pragma: no cover
         bin = int(nr_rows / 1200.)
-        df = row.df.groupby(lambda x: x / bin).mean()
-        row.df = df
+        try:
+            df = df.select_types(['number'])
+            df = row.df.groupby(lambda x: x / bin).mean()
+            row.df = df
+        except TypeError:
+            pass
     nr_rows = len(row.df)
     if (plotnr == 1):
         fig1 = row.get_timeplot_erg(t, pacerange=oterange, **kwargs)
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 36a4f21404174daa2d6a2adab29507b6b876aaa4..7d923d8c8cd85302b8de99618701228a13dccbf1 100644
GIT binary patch
literal 4000
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
GfB^vOTuB-L

literal 3999
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
F0RW?-L6-mk


From 075baa19bebbc772199997df6ec7d867f7be424d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 28 Aug 2023 19:30:41 +0200
Subject: [PATCH 3/3] fixes

---
 rowers/nkimportutils.py               |   2 +-
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/rowers/nkimportutils.py b/rowers/nkimportutils.py
index e8394bec..b2d495f4 100644
--- a/rowers/nkimportutils.py
+++ b/rowers/nkimportutils.py
@@ -110,7 +110,7 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
         'seatNumber': seatNumber,
     }
 
-    # dologging('nklog.log',json.dumps(uploadoptions))
+    dologging('nklog.log',json.dumps(uploadoptions))
 
     session = requests.session()
     newHeaders = {'Content-type': 'application/json', 'Accept': 'text/plain'}
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 7d923d8c8cd85302b8de99618701228a13dccbf1..a6ad89e0c831506c6f96950100605d0273d61695 100644
GIT binary patch
literal 4000
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
GfB^uGJ}f!_

literal 4000
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
GfB^vOTuB-L