Merge branch 'release/v10.57'

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

rowsandall_app/settings_dev.py

@@ -77,8 +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']
 

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}
         )
     ]