From 896d9423e1ba553320a8a4ce6163c8c5ef072651 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sat, 25 May 2024 15:14:16 +0200
Subject: [PATCH 1/2] fix

---
 rowers/models.py                      |  13 +++++++++++--
 rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 3999 bytes
 rowers/views/analysisviews.py         |   3 ++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/rowers/models.py b/rowers/models.py
index e5da3360..08b45b26 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3697,13 +3697,22 @@ class Workout(models.Model):
 
     def __str__(self):
 
+        try:
+            dates = self.date.strftime('%Y-%m-%d')
+        except AttributeError:
+            dates = ''
+        try:
+            durations = self.duration.strftime("%H:%M:%S"),
+        except AttributeError:
+            durations = ''
+
         elements = dict(
-            date = self.date.strftime('%Y-%m-%d'),
+            date = dates,
             name = self.name,
             distance = str(self.distance)+'m',
             ownerfirst = self.user.user.first_name,
             ownerlast = self.user.user.last_name,
-            duration = self.duration.strftime("%H:%M:%S"),
+            duration = durations,
             boattype = self.boattype,
             workouttype = self.workouttype,
             seatnumber = 'seat '+str(self.seatnumber),
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 424ee975e150b79c4f23dda4c83f346e85ed0c76..8f7a45403b2c784b4c366ae2ef550ef8022ef921 100644
GIT binary patch
delta 36
scmbO)KVP0*zMF%C_fg<R_LY2W^-324mvBtp#`lmzYOjFJkp@Nv0NSSv2><{9

delta 36
scmbO)KVP0*zMF$X$3I{r`$|5xZyfyx%6cYm<9o<4&(PfXNCP7S0NxY~ivR!s

diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 587db08d..327cce0b 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -2229,7 +2229,8 @@ def history_view_data(request, userid=0):
          df = df.with_columns(pl.col('time').diff().clip(lower_bound=0).alias("deltat"))
     except KeyError: # pragma: no cover
         pass
-
+    except ColumnNotFoundError:
+        pass
 
     totalmeters, totalhours, totalminutes, totalseconds = get_totals(
         g_workouts)

From d367b5e97b73abd7bc2708b625f76227f661f280 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Sun, 26 May 2024 13:51:53 +0200
Subject: [PATCH 2/2] tested

---
 rowers/interactiveplots.py            |   5 +++--
 rowers/models.py                      |   2 +-
 rowers/tests/testdata/testdata.tcx.gz | Bin 3999 -> 4000 bytes
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 3da01562..779511d8 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1721,9 +1721,10 @@ def interactive_flexchart_stacked(id, r, xparam='time',
                 if metricsdicts[column]['maysmooth']:
                     nrsteps = int(log2(r.usersmooth))
                     for i in range(nrsteps):
+                        column_ew = utils.ewmovingaverage(
+                            rowdata[column], 5)
                         rowdata = rowdata.with_columns(
-                          utils.ewmovingaverage(
-                            rowdata[column], 5).alias(column)  
+                            column = column_ew
                         ) 
             except KeyError:
                 pass
diff --git a/rowers/models.py b/rowers/models.py
index 08b45b26..178394db 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3702,7 +3702,7 @@ class Workout(models.Model):
         except AttributeError:
             dates = ''
         try:
-            durations = self.duration.strftime("%H:%M:%S"),
+            durations = self.duration.strftime("%H:%M:%S")
         except AttributeError:
             durations = ''
 
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 8f7a45403b2c784b4c366ae2ef550ef8022ef921..2cc0fd32811c3fdcee8aa618db0b58b09a4cb9fd 100644
GIT binary patch
delta 258
zcmV+d0sa1;AD|xxABzYGLm*SJ2dNH!@MnZ>>5h)zyW{?cgT?NEJG(P|{EhkZ<)_u|
z`-6uUiR0PDhkc)Q>Fv2Vd%Nk@FT0bI?bAvhSL@@KUEihicDuJLQTcS-!GqWRtFwzM
zugQb+^OMz4*QcL;`C?q2`>T_s?|yo{I(d2dbAL<kV><N8!}+k~Y4@LW$?Pm~xcd3)
z-B#<g*~_Q>wi_-V?HA`ic#&@U@Ym(ZvfC^Zhy3Zoqq}ln2T!{7@#9B_KR?TCwtw!n
z|B~L~XRlBHSf)DzxCgNN|6p<Di`|poKBmJvThyy{dJYd0%H_qQ^fdlRmp;7nKOxw#
I1jK*=05OW0`Tzg`

delta 257
zcmV+c0sj7=AD<rwABzYG4dPL;2dNH!e<ILPqzLfcasR`?Vt2ru-I+fA#{Bv6(`xtq
z!NZHh@$BNmzR$Y!_FSC3-E`}h-O0)JX{C>=_3_KD@6vg@-P@I@d^+yn!R!9j*~OLD
z<iYv*$?B-<(@(#AF)q*j)ydL#KfPX^yuAFmzoqvv9eU;AeAx1|`%k)Lb{1T4{rvTA
zt99D!<<oxK4VRDhi}N46NH=}>>+)pTZI+2c{`BF|UAeD=C*At^@uS0^pJg`NKX==I
zNpJD9*Qb9h)13j_1K9n4u(<NY?#XW-)8U;h>eV_uhldH}^5Ri?8h@lqAKv*N8odxa
H#DD<+580s>