From 2c1e6c590987a1245c27fde9ff23b39e5826d33e Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 14 Sep 2021 19:46:59 +0200 Subject: [PATCH] bug fixes --- rowers/dataprep.py | 5 ++++- rowers/garmin_stuff.py | 1 + rowers/views/analysisviews.py | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index b15c9832..9376a416 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2540,7 +2540,10 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput df = pd.read_parquet(f,columns=columns) data.append(df) - df = pd.concat(data,axis=0) + try: + df = pd.concat(data,axis=0) + except ValueError: + return pd.DataFrame() # df = dd.concat(data,axis=0) else: diff --git a/rowers/garmin_stuff.py b/rowers/garmin_stuff.py index f82334a7..c6c3973d 100644 --- a/rowers/garmin_stuff.py +++ b/rowers/garmin_stuff.py @@ -550,6 +550,7 @@ def garmin_workouts_from_details(data): samples = activity['samples'] df = pd.DataFrame(samples) df.rename(columns=columns,inplace=True) + try: pace = 500./df[' AverageBoatSpeed (m/s)'] except KeyError: diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 327c5d83..d9fba0dc 100644 --- a/rowers/views/analysisviews.py +++ b/rowers/views/analysisviews.py @@ -2507,7 +2507,7 @@ def history_view_data(request,userid=0): ddict['hrmean'] = int(wavg(ddf,'hr','deltat')) try: ddict['hrmax'] = ddf['hr'].max().astype(int) - except (ValueError, AttributeError): # pragma: no cover + except (KeyError, ValueError, AttributeError): # pragma: no cover ddict['hrmax'] = 0 ddict['powermean'] = int(wavg(ddf,'power','deltat'))