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

rowsandall_app/settings.py

@@ -221,11 +221,11 @@ LANGUAGE_COOKIE_NAME = 'wm_lang'
 # https://docs.djangoproject.com/en/1.9/howto/static-files/
 
 STATIC_URL = '/static/'
-STATIC_ROOT = BASE_DIR
-#STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+#STATIC_ROOT = BASE_DIR
+STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
-STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'),
-		    os.path.join(BASE_DIR, 'static/plots'),]
+STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static/plots'),]
+# os.path.join(BASE_DIR, 'static'),
 
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')

rowsandall_app/settings_dev.py

@@ -77,7 +77,12 @@ CACHES = {
 
 
 STATIC_URL = '/static/'
-#STATIC_ROOT = 'C:/python/rowsandallapp'
+STATIC_ROOT = BASE_DIR
+#STATIC_ROOT = os.path.join(BASE_DIR, 'static')
+
+STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'),
+		    os.path.join(BASE_DIR, 'static/plots'),]
+
 
 INTERNAL_IPS = ['127.0.0.1']
 
@@ -108,4 +113,3 @@ EMAIL_USE_TLS = CFG['email_use_tls']
 DEFAULT_FROM_EMAIL = 'info@rowsandall.com'
 
 SETTINGS_NAME = 'rowsandall_app.settings_dev'
-

rowsandall_app/urls.py

@@ -96,10 +96,16 @@ django.views.i18n.javascript_catalog = None
 if settings.DEBUG:
     import debug_toolbar
     import django
+    urlpatterns += [
+        re_path(r'^static/plots/(?P<path>.*)$',
+                django.views.static.serve,
+                kwargs={'document_root': settings.STATIC_ROOT+'plots/'})
+    ]
     urlpatterns += [
 #        re_path(r'^__debug__/','debug_toolbar.urls'),
         re_path(r'^static/(?P<path>.*)$',
             django.views.static.serve,
-            kwargs={'document_root': settings.STATIC_ROOT,}
+            kwargs={'document_root': settings.STATIC_ROOT,
+                    'show_indexes': True}
         )
     ]