fixes

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)
+                try:
-                if startenddict:
+                    df = pl.scan_parquet(f)
-                    try:
+                    if startenddict:
-                        startsecond, endsecond = startenddict[id]
+                        try:
-                        df = df.filter(pl.col("time") >= 1.0e3*startsecond,
+                            startsecond, endsecond = startenddict[id]
-                                       pl.col("time") <= 1.0e3*endsecond)
+                            df = df.filter(pl.col("time") >= 1.0e3*startsecond,
-                        df = df.with_columns(time = pl.col("time")-1.0e3*startsecond)
+                                           pl.col("time") <= 1.0e3*endsecond)
-                        if 'cumdist' in columns:
+                            df = df.with_columns(time = pl.col("time")-1.0e3*startsecond)
-                            df = df.collect()
+                            if 'cumdist' in columns:
-                            df = df.with_columns(cumdist = pl.col("cumdist")-df[0, "cumdist"]).lazy()
+                                df = df.collect()
-                    except KeyError:
+                                df = df.with_columns(cumdist = pl.col("cumdist")-df[0, "cumdist"]).lazy()
-                        pass
+                        except KeyError:
-                data.append(df)
+                            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

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({
+    try:
-        "testpower" :df['testpower'],
+        df2 = pl.DataFrame({
-        "testduration":df['testduration'].apply(
+            "testpower" :df['testpower'],
-            lambda x: totaltime_sec_to_string(x, shorten=True)),
+            "testduration":df['testduration'].apply(
-        "fitness":df['fitness'],
+                lambda x: totaltime_sec_to_string(x, shorten=True)),
-        "fatigue":df['fatigue'],
+            "fitness":df['fitness'],
-        "form":df['form'],
+            "fatigue":df['fatigue'],
-        "impulse":df['impulse'],
+            "form":df['form'],
-        "date": df['date'].dt.strftime('%Y-%m-%d'),
+            "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)

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>
+

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(),

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,

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)

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',

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'),

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