Merge branch 'develop' into feature/embeddedvideo

rowers/dataprep.py

@@ -2173,6 +2173,8 @@ def read_df_sql(id):
         if rowdata and len(rowdata.df):
             data = dataprep(rowdata.df,id=id,bands=True,otwpower=True,barchart=True)
             df = pd.read_parquet(f)
+        else:
+            df = pd.DataFrame()
 
     df = df.fillna(value=0)
 

rowers/dataprepnodjango.py

@@ -13,6 +13,9 @@ from rowingdata import empower_bug_correction,get_empower_rigging
 from time import strftime
 from pandas import DataFrame,Series
 
+import shutil
+from shutil import copyfile
+
 import pandas as pd
 import numpy as np
 import itertools
@@ -729,7 +732,7 @@ def getsmallrowdata_db(columns,ids=[],debug=False):
         try:
             df = pd.read_parquet(csvfilenames[0],columns=columns,engine='pyarrow')
         except (OSError,IndexError):
-            pass
+            df = pd.DataFrame()
 
 
     return df