From 11f9956b4b729137831b911dd4581ee6c5e4b16b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 20 May 2024 16:15:41 +0200
Subject: [PATCH 1/4] first changes

---
 rowers/models.py        |  3 +++
 rowers/nkimportutils.py | 10 ++++++++++
 2 files changed, 13 insertions(+)

diff --git a/rowers/models.py b/rowers/models.py
index a05de7c5..be3247eb 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3626,6 +3626,9 @@ class Workout(models.Model):
     # empower stuff
     inboard = models.FloatField(default=0.88)
     oarlength = models.FloatField(default=2.89)
+    seatnumber = models.IntegerField(default=1)
+    boatname = models.CharField(default='', blank=True, null=True, max_length=150)
+    empowerside = models.CharField(default='starboard', blank=True, null=True, max_length=150)
 
     notes = models.CharField(blank=True, null=True, max_length=1000)
     summary = models.TextField(blank=True)
diff --git a/rowers/nkimportutils.py b/rowers/nkimportutils.py
index 9d682a54..67d65f85 100644
--- a/rowers/nkimportutils.py
+++ b/rowers/nkimportutils.py
@@ -82,6 +82,14 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
             oarlockfirmware = oarlocksession["firmwareVersion"]
         except KeyError:
             oarlockfirmware = ''
+        try:
+            boatName = oarlocksession["boatName"]
+        except:
+            boatName = ''
+        try:
+            portStarboard = oarlocksession["portStarboard"]
+        except:
+            portStarboard = 1
     else:  # pragma: no cover
         # boatName = ''
         oarLength = 289
@@ -108,6 +116,8 @@ def add_workout_from_data(userid, nkid, data, strokedata, source='nk', splitdata
         'totalDistance': totalDistance,
         'useImpeller': useImpeller,
         'seatNumber': seatNumber,
+        'boatName': boatName,
+        'portStarboard': portStarboard,
     }
 
     dologging('nklog.log',json.dumps(uploadoptions))

From 7733298f5c201c418b261455e9f111deeceed872 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Mon, 20 May 2024 19:37:09 +0200
Subject: [PATCH 2/4] initial

---
 rowers/dataprep.py                    |  14 ++++++++++++++
 rowers/models.py                      |   9 ++++++---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4001 -> 4000 bytes
 rowers/views/workoutviews.py          |  10 ++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index cc8f199f..c14d7d2d 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1126,6 +1126,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                           summary='',
                           makeprivate=False,
                           oarlength=2.89, inboard=0.88,
+                          boatname='',
+                          empowerside='port',
+                          seatnumber=1,
                           forceunit='lbs',
                           consistencychecks=False,
                           startdatetime='',
@@ -1343,6 +1346,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
             w.startdatetime = workoutstartdatetime
             w.inboard = inboard
             w.oarlength = oarlength
+            w.seatnumber = seatnumber
+            w.boatname = boatname
+            w.empowerside = empowerside
             w.timezone = timezone_str
             w.privacy = privacy
             w.impeller = impeller
@@ -1367,6 +1373,9 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                     maxhr=maxhr, averagehr=averagehr,
                     startdatetime=workoutstartdatetime,
                     inboard=inboard, oarlength=oarlength,
+                    boatname=boatname,
+                    empowerside=empowerside,
+                    seatnumber=seatnumber,
                     timezone=timezone_str,
                     privacy=privacy,
                     impeller=impeller)
@@ -1418,6 +1427,9 @@ def new_workout_from_file(r, f2,
                           oarlockfirmware='',
                           inboard=None,
                           oarlength=None,
+                          boatname='',
+                          seatnumber=1,
+                          empowerside='port',
                           impeller=False,
                           uploadoptions={'boattype': '1x', 'workouttype': 'rower'}):
     message = ""
@@ -1583,6 +1595,8 @@ def new_workout_from_file(r, f2,
         startdatetime=startdatetime,
         rpe=rpe,
         inboard=inboard, oarlength=oarlength,
+        seatnumber=seatnumber, boatname=boatname,
+        empowerside=empowerside,
         title=title,
         forceunit='N',
         impeller=impeller,
diff --git a/rowers/models.py b/rowers/models.py
index be3247eb..bfa22a1c 100644
--- a/rowers/models.py
+++ b/rowers/models.py
@@ -3626,9 +3626,9 @@ class Workout(models.Model):
     # empower stuff
     inboard = models.FloatField(default=0.88)
     oarlength = models.FloatField(default=2.89)
-    seatnumber = models.IntegerField(default=1)
-    boatname = models.CharField(default='', blank=True, null=True, max_length=150)
-    empowerside = models.CharField(default='starboard', blank=True, null=True, max_length=150)
+    seatnumber = models.IntegerField(default=1, verbose_name='Seat Number')
+    boatname = models.CharField(default='', blank=True, null=True, max_length=150, verbose_name='Boat Name')
+    empowerside = models.CharField(default='starboard', blank=True, null=True, max_length=150, verbose_name='Empower Oarlock side')
 
     notes = models.CharField(blank=True, null=True, max_length=1000)
     summary = models.TextField(blank=True)
@@ -4363,6 +4363,9 @@ class WorkoutForm(ModelForm):
                   'distance',
                   'workouttype',
                   'boattype',
+                  'boatname',
+                  'seatnumber',
+                  'empowerside',
                   'dragfactor',
                   'weightcategory',
                   'adaptiveclass',
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 5735f7614f22223299640ba0ea69b552e3d679e0..e5817eac44f785015da56eb72ff0e7cb57406732 100644
GIT binary patch
literal 4000
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
GfB^u;^-ECz

literal 4001
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
H#DD<+|LQ%G

diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index e4b49aef..4151a620 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -4855,6 +4855,13 @@ def workout_upload_api(request):
     inboard = post_data.get('inboard', None)
     oarlength = post_data.get('oarlength', None)
     useImpeller = post_data.get('useImpeller', False)
+    seatnumber = post_data.get('seatNumber', 1)
+    boatname = post_data.get('boatName','')
+    portStarboard = post_data.get('portStarboard', 1)
+    empowerside = 'port'
+    if portStarboard == 1:
+        empowerside = 'starboard'
+        
 
     totalDistance = post_data.get('totalDistance', None)
     elapsedTime = post_data.get('elapsedTime', None)
@@ -4946,6 +4953,9 @@ def workout_upload_api(request):
             oarlength=oarlength,
             impeller=useImpeller,
             workoutid=workoutid,
+            empowerside=empowerside,
+            boatname=boatname,
+            seatnumber=seatnumber,
         )
 
         if id == 0:  # pragma: no cover

From 59ab7aaae4232ff686d67c5d7c3e77cbf4ac174d Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 21 May 2024 08:51:50 +0200
Subject: [PATCH 3/4] fixes

---
 rowers/dataroutines.py                |  37 +++++++++++++++-----------
 rowers/interactiveplots.py            |  32 +++++++++++++++-------
 rowers/templates/panel_empower.html   |  22 +++++++++++++++
 rowers/tests/test_cpchart.py          |   3 +++
 rowers/tests/test_races.py            |   3 +++
 rowers/tests/test_settings.py         |   3 +++
 rowers/tests/test_uploads.py          |   3 +++
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 rowers/utils.py                       |   1 +
 rowers/views/workoutviews.py          |  13 +++++++++
 10 files changed, 91 insertions(+), 26 deletions(-)
 create mode 100644 rowers/templates/panel_empower.html

diff --git a/rowers/dataroutines.py b/rowers/dataroutines.py
index 8ad8d38a..a3e06805 100644
--- a/rowers/dataroutines.py
+++ b/rowers/dataroutines.py
@@ -1554,19 +1554,22 @@ def read_data(columns, ids=[], doclean=True, workstrokesonly=True, debug=False,
                 _ = dataplep(rowdata.df, id=id,
                                  bands=True, otwpower=True, barchart=True,
                                  polars=True)
-                df = pl.scan_parquet(f)
-                if startenddict:
-                    try:
-                        startsecond, endsecond = startenddict[id]
-                        df = df.filter(pl.col("time") >= 1.0e3*startsecond,
-                                       pl.col("time") <= 1.0e3*endsecond)
-                        df = df.with_columns(time = pl.col("time")-1.0e3*startsecond)
-                        if 'cumdist' in columns:
-                            df = df.collect()
-                            df = df.with_columns(cumdist = pl.col("cumdist")-df[0, "cumdist"]).lazy()
-                    except KeyError:
-                        pass
-                data.append(df)
+                try:
+                    df = pl.scan_parquet(f)
+                    if startenddict:
+                        try:
+                            startsecond, endsecond = startenddict[id]
+                            df = df.filter(pl.col("time") >= 1.0e3*startsecond,
+                                           pl.col("time") <= 1.0e3*endsecond)
+                            df = df.with_columns(time = pl.col("time")-1.0e3*startsecond)
+                            if 'cumdist' in columns:
+                                df = df.collect()
+                                df = df.with_columns(cumdist = pl.col("cumdist")-df[0, "cumdist"]).lazy()
+                        except KeyError:
+                            pass
+                    data.append(df)
+                except ComputeError:
+                    pass
 
     try:
         data = pl.collect_all(data)
@@ -2169,14 +2172,16 @@ def dataplep(rowdatadf, id=0, inboard=0.88, forceunit='lbs', bands=True, barchar
         df = df.with_columns((pl.col(" AverageDriveForce (lbs)")/pl.col(" PeakDriveForce (lbs)")).alias("forceratio"))
     else:
         df = df.with_columns((pl.lit(0)).alias("forceratio"))
-    f = df['TimeStamp (sec)'].diff().mean()
+    try:
+        f = df['TimeStamp (sec)'].diff().mean()
+    except TypeError:
+        f = 0
+    windowsize = 1
     if f != 0 and not np.isinf(f):
         try:
             windowsize = 2 * (int(10. / (f))) + 1
         except ValueError:
             windowsize = 1
-    else:
-        windowsize = 1
 
     if windowsize <= 3:
         windowsize = 5
diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 20989940..4ca7676b 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -22,7 +22,7 @@ import polars as pl
 import pytz
 
 from rowers.rower_rules import ispromember
-from polars.exceptions import ColumnNotFoundError
+from polars.exceptions import ColumnNotFoundError, ComputeError
 
 from scipy.interpolate import griddata
 from scipy.signal import savgol_filter
@@ -758,16 +758,28 @@ def performance_chart(user, startdate=None, enddate=None, kfitness=42, kfatigue=
 
     df = df.filter(pl.col("date") > startdate)
 
-    df2 = pl.DataFrame({
-        "testpower" :df['testpower'],
-        "testduration":df['testduration'].apply(
-            lambda x: totaltime_sec_to_string(x, shorten=True)),
-        "fitness":df['fitness'],
-        "fatigue":df['fatigue'],
-        "form":df['form'],
-        "impulse":df['impulse'],
-        "date": df['date'].dt.strftime('%Y-%m-%d'),
+    try:
+        df2 = pl.DataFrame({
+            "testpower" :df['testpower'],
+            "testduration":df['testduration'].apply(
+                lambda x: totaltime_sec_to_string(x, shorten=True)),
+            "fitness":df['fitness'],
+            "fatigue":df['fatigue'],
+            "form":df['form'],
+            "impulse":df['impulse'],
+            "date": df['date'].dt.strftime('%Y-%m-%d'),
         })
+    except ComputeError:
+        df2 = pl.DataFrame({
+            "testpower" :df['testpower'],
+            "fitness":df['fitness'],
+            "fatigue":df['fatigue'],
+            "form":df['form'],
+            "impulse":df['impulse'],
+            "date": df['date'].dt.strftime('%Y-%m-%d'),
+        })
+        df2 = df2.with_columns((pl.lit("--")).alias("testduration"))
+        
 
 
     df2 = df2.fill_nan(0)
diff --git a/rowers/templates/panel_empower.html b/rowers/templates/panel_empower.html
new file mode 100644
index 00000000..2cd66d26
--- /dev/null
+++ b/rowers/templates/panel_empower.html
@@ -0,0 +1,22 @@
+{% load rowerfilters %}
+{% load tz %}
+<ul class="main-content">
+  <li class="grid_2">
+    <table width=100%>
+      <tr>
+        {% localtime on %}  
+        <th>Seat Number:</th><td>{{ workout.seatnumber}}</td>
+        {% endlocaltime %}
+      </tr><tr>
+        <th>Empower side:</th><td>{{ workout.empowerside }}</td>
+      </tr><tr>
+        <th>Boat name:</th><td>{{ workout.boatname }}</td>
+      </tr><tr>
+        <th>Oar length:</th><td>{{ workout.oarlength }}</td>
+      </tr><tr>
+        <th>Oar inboard:</th><td>{{ workout.inboard }}</td>
+      </tr>
+    </table>
+  </li>
+</ul>
+
diff --git a/rowers/tests/test_cpchart.py b/rowers/tests/test_cpchart.py
index 6f46c0cf..3c6fd404 100644
--- a/rowers/tests/test_cpchart.py
+++ b/rowers/tests/test_cpchart.py
@@ -95,6 +95,9 @@ class CPChartTest(TestCase):
             'distance': 500,
             'workouttype': 'rower',
             'boattype': '1x',
+            'boatname': 'CatchUp',
+            'empowerside': 'starboard',
+            'seatnumber': 1,
             'weightcategory': 'hwt',
             'adaptiveclass': 'None',
             'notes': faker.text(),
diff --git a/rowers/tests/test_races.py b/rowers/tests/test_races.py
index ebf0ac06..e783db2e 100644
--- a/rowers/tests/test_races.py
+++ b/rowers/tests/test_races.py
@@ -1121,6 +1121,9 @@ class IndoorChallengesTest(TestCase):
             'adaptiveclass': 'None',
             'notes': faker.text(),
             'rankingpiece': True,
+            'empowerside': 'port',
+            'boatname': 'Dolfijn',
+            'seatnumber': 1,
             'duplicate': False,
             'avghr': '160',
             'avgpwr': 0,
diff --git a/rowers/tests/test_settings.py b/rowers/tests/test_settings.py
index 86dc231d..504139fa 100644
--- a/rowers/tests/test_settings.py
+++ b/rowers/tests/test_settings.py
@@ -34,6 +34,9 @@ class DataTest(TestCase):
             'workouttype':'water',
             'rpe':1,
             'boattype':'1x',
+            'boatname': 'BOAT1',
+            'empowerside': 'port',
+            'seatnumber': 4,
             'private':False,
             }
         form = WorkoutForm(data=form_data)
diff --git a/rowers/tests/test_uploads.py b/rowers/tests/test_uploads.py
index b27a198a..f93418e8 100644
--- a/rowers/tests/test_uploads.py
+++ b/rowers/tests/test_uploads.py
@@ -101,6 +101,9 @@ class ViewTest(TestCase):
             'rpe':4,
             'dragfactor':'112',
             'raceid':0,
+            'seatnumber': 1,
+            'boatname': '',
+            'empowerside': 'port',
             'landingpage':'workout_edit_view',
             'private':True,
             'notes':'noot mies',
diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index e5817eac44f785015da56eb72ff0e7cb57406732..8d223ed87f75f5c8b7bde0924f4418860cff8c81 100644
GIT binary patch
literal 4000
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
GfB^vM#3e5P

literal 4000
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
GfB^u;^-ECz

diff --git a/rowers/utils.py b/rowers/utils.py
index 7f96a94a..49443593 100644
--- a/rowers/utils.py
+++ b/rowers/utils.py
@@ -64,6 +64,7 @@ workflowmiddlepanel = (
     ('panel_summary.html', 'Summary'),
     ('panel_map.html', 'Map'),
     ('panel_comments.html', 'Basic Info and Links'),
+    ('panel_empower.html', 'Empower Oarlock Info'),
     ('panel_notes.html', 'Workout Notes'),
     ('panel_shortcomment.html', 'Comment Link'),
     ('panel_middlesocial.html', 'Social Media Share Buttons'),
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 4151a620..8e74ee2f 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -680,6 +680,9 @@ def addmanual_view(request, raceid=0):
             privacy = form.cleaned_data.get('privacy', 'visible')
             rankingpiece = form.cleaned_data.get('rankingpiece', False)
             duplicate = form.cleaned_data.get('duplicate', False)
+            seatnumber = form.cleaned_data.get('seatnumber', 1)
+            boatname = form.cleaned_data.get('boatname', '')
+            empowerside = form.cleaned_data.get('empowerside','port')
 
             if private:  # pragma: no cover
                 privacy = 'private'
@@ -723,6 +726,9 @@ def addmanual_view(request, raceid=0):
                 w.rpe = rpe
                 w.workouttype = workouttype
                 w.boattype = boattype
+                w.boatname = boatname
+                w.empowerside = empowerside
+                w.seatnumber = seatnumber
                 w.distance = distance
                 w.duration = duration
                 w.save()
@@ -4385,6 +4391,10 @@ def workout_edit_view(request, id=0, message="", successmessage=""):
                 'rankingpiece', Workout.objects.get(id=row.id).rankingpiece)
             duplicate = form.cleaned_data.get(
                 'duplicate', Workout.objects.get(id=row.id).duplicate)
+            seatnumber = form.cleaned_data.get('seatnumber', 1)
+            boatname = form.cleaned_data.get('boatname', '')
+            empowerside = form.cleaned_data.get('empowerside','port')
+            
 
             if private:
                 privacy = 'private'
@@ -4438,6 +4448,9 @@ def workout_edit_view(request, id=0, message="", successmessage=""):
             row.rankingpiece = rankingpiece
             row.timezone = thetimezone
             row.plannedsession = ps
+            row.boatname = boatname
+            row.empowerside = empowerside
+            row.seatnumber = seatnumber
 
             dragchanged = False
             if newdragfactor != row.dragfactor:  # pragma: no cover

From 5174fec00aa155e6fa313c46a036676731984eb2 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <sanderroosendaal@proton.me>
Date: Tue, 21 May 2024 09:05:20 +0200
Subject: [PATCH 4/4] tested

---
 rowers/tests/testdata/testdata.tcx.gz | Bin 4000 -> 4000 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/rowers/tests/testdata/testdata.tcx.gz b/rowers/tests/testdata/testdata.tcx.gz
index 8d223ed87f75f5c8b7bde0924f4418860cff8c81..045577743e9f829d44c660aba593d21f082c80b5 100644
GIT binary patch
delta 257
zcmV+c0sj7=AD|xwABzYG?L@H#st$izdf{D&F9Ljb-2Zs6*d1_ZcczcOF@L`NwAy`t
z@ZchGJiGX?@6#^5Jr`$hH{JSWcXG0QTIu6zef+ZPyL8@e_jV;JpN>1Y|GIy5c5&r3
zxqp6svO4Pe^wTe2jLUO>b+Yu`&#zY}FE4-Y@9BL^hhBL&AGSQ{{*x}5odt1MKYzX3
zYMnNF`Ly45!{wv>;`|5C(@h`#wmeyOn`PpVKYe&~SMKZJakoBx^ziVPr<u+6&)xQ4
z(_8%X_34Xcx-)<u0CxW$EUtX9d-B`Iba-crdbLi^;Xy*Vym*+N#*1|6!#n>2`DXFO
H#DD<+rZSNa

delta 257
zcmV+c0sj7=AD|xwABzYG!#c4Bst$kh3uj+gpd<M1xc~8Bu{+?-?o1zlWBz>kX|?<Q
z;K4=Wcy{q&-=|%AdoIr2Zo2i$?&M_qw9?1b`uJtncj>&{?(IrcJ{@;(|8@WB?BdF6
za{v7NWOdZ_>8D@57?<b%>SXD=pI@&|US9s(-_!e;4!!blK5Ti?{U=>AI}35He*Sv5
z)jDnV@@c>AhRa9$#rY4Or<*?fZF#cnHp|2zfBNv~uH4tb<8FQY=;7fnPcxhCpS$h9
zrnmU%>(dv@bY}oR0POxhSX}vH_vE*a>F~}L^=h4-!-Ir!dGRnkjTh<Chj;!5`+#e8
H#DD<+ikF<n