sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v10.57'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-11-26 13:18:35 +01:00
parent 8b46d8a1e4 daf57063c1
commit 6ce47ca3cf
4 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rowers/dataprepnodjango.py
View File

@@ -13,6 +13,9 @@ from rowingdata import empower_bug_correction,get_empower_rigging
from time import strftime from time import strftime
from pandas import DataFrame,Series from pandas import DataFrame,Series
import shutil
from shutil import copyfile
import pandas as pd import pandas as pd
import numpy as np import numpy as np
import itertools import itertools

8
rowers/templates/list_graphs.html
View File

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

6
rowsandall_app/settings_dev.py
View File

@@ -77,8 +77,12 @@ CACHES = {
STATIC_URL = '/static/' STATIC_URL = '/static/'
#STATIC_ROOT = 'C:/python/rowsandallapp'
STATIC_ROOT = BASE_DIR 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'] INTERNAL_IPS = ['127.0.0.1']

16
rowsandall_app/urls.py
View File

@@ -30,9 +30,9 @@ import django.views.i18n
urlpatterns = [ 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_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/$', re_path(r'^password_reset/$',
auth_views.PasswordResetView.as_view(), auth_views.PasswordResetView.as_view(),
{'template_name': 'rowers/templates/registration/password_reset.html'}, {'template_name': 'rowers/templates/registration/password_reset.html'},
@@ -96,10 +96,16 @@ django.views.i18n.javascript_catalog = None
if settings.DEBUG: if settings.DEBUG:
import debug_toolbar import debug_toolbar
import django import django
urlpatterns += [
re_path(r'^static/plots/(?P<path>.*)$',
django.views.static.serve,
kwargs={'document_root': settings.STATIC_ROOT+'plots/'})
]
urlpatterns += [ urlpatterns += [
# re_path(r'^__debug__/','debug_toolbar.urls'), # re_path(r'^__debug__/','debug_toolbar.urls'),
re_path(r'^static/(?P<path>.*)$', re_path(r'^static/(?P<path>.*)$',
django.views.static.serve, django.views.static.serve,
kwargs={'document_root': settings.STATIC_ROOT,} kwargs={'document_root': settings.STATIC_ROOT,
'show_indexes': True}
) )
] ]