sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

bug fixes

Browse Source
This commit is contained in:
Sander Roosendaal
2021-09-14 19:46:59 +02:00
parent 86f86b5f53
commit 2c1e6c5909
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
rowers/dataprep.py
View File

@@ -2540,7 +2540,10 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
df = pd.read_parquet(f,columns=columns) df = pd.read_parquet(f,columns=columns)
data.append(df) 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) # df = dd.concat(data,axis=0)
else: else:

1
rowers/garmin_stuff.py
View File

@@ -550,6 +550,7 @@ def garmin_workouts_from_details(data):
samples = activity['samples'] samples = activity['samples']
df = pd.DataFrame(samples) df = pd.DataFrame(samples)
df.rename(columns=columns,inplace=True) df.rename(columns=columns,inplace=True)
try: try:
pace = 500./df[' AverageBoatSpeed (m/s)'] pace = 500./df[' AverageBoatSpeed (m/s)']
except KeyError: except KeyError:

2
rowers/views/analysisviews.py
View File

@@ -2507,7 +2507,7 @@ def history_view_data(request,userid=0):
ddict['hrmean'] = int(wavg(ddf,'hr','deltat')) ddict['hrmean'] = int(wavg(ddf,'hr','deltat'))
try: try:
ddict['hrmax'] = ddf['hr'].max().astype(int) ddict['hrmax'] = ddf['hr'].max().astype(int)
except (ValueError, AttributeError): # pragma: no cover except (KeyError, ValueError, AttributeError): # pragma: no cover
ddict['hrmax'] = 0 ddict['hrmax'] = 0
ddict['powermean'] = int(wavg(ddf,'power','deltat')) ddict['powermean'] = int(wavg(ddf,'power','deltat'))