Merge branch 'hotfix/v5.42'

2018-01-03 13:07:23 +01:00
parent caf60d28ee c8f12ccc97
commit 4e9ac1b63b
1 changed files with 5 additions and 1 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1557,7 +1557,11 @@ def getsmallrowdata_db(columns, ids=[], doclean=True, workstrokesonly=True):
    if extracols and len(ids)==1:
        w = Workout.objects.get(id=ids[0])
        row = rdata(w.csvfilename)
-        f = row.df['TimeStamp (sec)'].diff().mean()
+        try:
+            f = row.df['TimeStamp (sec)'].diff().mean()
+        except AttributeError:
+            f = 0
+            
        if f != 0 and not np.isnan(f):
            windowsize = 2 * (int(10. / (f))) + 1
        else: