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

rowers/templates/list_graphs.html

@@ -40,11 +40,11 @@
         </a>
         {% endif %}
         {% endif %}
-        
+
         <span>
           Page {{ graphs.number }} of {{ graphs.paginator.num_pages }}.
         </span>
-        
+
         {% if graphs.has_next %}
         {% if request.GET.q %}
         <a href="?page={{ graphs.next_page_number }}&q={{ request.GET.q }}">
@@ -69,7 +69,7 @@
   <li>
     <p class="caption">
       <a href="/rowers/graph/{{ graph.id }}/">
-	<img src="/{{ graph.filename }}" 
+	<img src="/{{ graph.filename }}"
 	     onerror="this.src='/static/img/rowingtimer.gif'"
 	     alt="{{ graph.filename }}" width="120" height="100">
       </a>
@@ -90,4 +90,4 @@
 
 {% block sidebar %}
 {% include 'menu_workouts.html' %}
-{% endblock %}                
+{% endblock %}

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

@@ -30,9 +30,9 @@ import django.views.i18n
 
 
 urlpatterns = [
-    re_path('^', include('django.contrib.auth.urls')),    
+    re_path('^', include('django.contrib.auth.urls')),
     re_path(r'^password_change_done/$',auth_views.PasswordChangeDoneView.as_view(),name='password_change_done'),
-    re_path(r'^password_change/$',auth_views.PasswordChangeView.as_view(),name='password_change'),    
+    re_path(r'^password_change/$',auth_views.PasswordChangeView.as_view(),name='password_change'),
     re_path(r'^password_reset/$',
         auth_views.PasswordResetView.as_view(),
         {'template_name': 'rowers/templates/registration/password_reset.html'},
@@ -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,}
+        re_path(r'^static/(?P<path>.*)$',
+            django.views.static.serve,
+            kwargs={'document_root': settings.STATIC_ROOT,
+                    'show_indexes': True}
         )
     ]