From 4c0b19ea963696f921f31a31cb065810c5e2ec6d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 19 Nov 2019 13:10:46 +0100 Subject: [PATCH 1/5] bug fix --- rowers/dataprep.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index f041b8ab..e6324de8 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -2051,6 +2051,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) From e0b8513e63d2528b3506d6d7b60a230bb7d3fff6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Tue, 19 Nov 2019 20:51:58 +0100 Subject: [PATCH 2/5] hot fix --- rowers/dataprepnodjango.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index ab1f8506..be8855d0 100644 --- a/rowers/dataprepnodjango.py +++ b/rowers/dataprepnodjango.py @@ -729,7 +729,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 From 729c2ab37055e675420a188212f0bc0794938ce6 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 25 Nov 2019 13:15:51 +0100 Subject: [PATCH 3/5] quick fix --- rowsandall_app/settings.py | 12 ++++++------ rowsandall_app/settings_dev.py | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index 5863adaa..de0f9951 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -133,7 +133,7 @@ TEMPLATES = [ # 'django.template.loaders.app_directories.Loader', # ], }, - + }, ] @@ -205,8 +205,8 @@ TIME_ZONE = 'UTC' TZ_DETECT_COUNTRIES = ('US','DE','GB','CZ','FR','IT') LOCALE_PATHS = ( - os.path.join(BASE_DIR, 'locale'), -# os.path.join(BASE_DIR, 'cvkbrno/locale'), + os.path.join(BASE_DIR, 'locale'), +# os.path.join(BASE_DIR, 'cvkbrno/locale'), ) LANGUAGES = ( @@ -221,8 +221,8 @@ 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'),] @@ -452,7 +452,7 @@ try: BRAINTREE_MERCHANT_ACCOUNT_ID = CFG['braintree_merchant_account_id'] except KeyError: BRAINTREE_MERCHANT_ACCOUNT_ID = 'rowsandallEUR' - + try: BRAINTREE_PUBLIC_KEY = CFG['braintree_public_key'] except KeyError: diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 3f161559..0c8fd8af 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -20,7 +20,7 @@ except KeyError: if 'test' in sys.argv: TESTING = True - + if TESTING or use_sqlite: DATABASES = { 'default': { @@ -33,7 +33,7 @@ if TESTING or use_sqlite: # 'CHARSET': 'utf8', # 'COLLATION': 'utf8_general_ci', # }, - + # 'slave': { # 'ENGINE': 'django.db.backends.mysql', # 'NAME': 'rowsanda_107501', @@ -41,8 +41,8 @@ if TESTING or use_sqlite: # } } - - + + BROKER_URL = 'redis://localhost:6379/0' CELERY_RESULT_BACKEND = 'redis://localhost:6379/0' CELERY_IGNORE_RESULT = False @@ -78,6 +78,7 @@ CACHES = { STATIC_URL = '/static/' #STATIC_ROOT = 'C:/python/rowsandallapp' +STATIC_ROOT = BASE_DIR INTERNAL_IPS = ['127.0.0.1'] @@ -108,4 +109,3 @@ EMAIL_USE_TLS = CFG['email_use_tls'] DEFAULT_FROM_EMAIL = 'info@rowsandall.com' SETTINGS_NAME = 'rowsandall_app.settings_dev' - From 8b46d8a1e45ec66820c51c8981160895279d27e4 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 25 Nov 2019 13:20:31 +0100 Subject: [PATCH 4/5] settings --- rowsandall_app/settings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rowsandall_app/settings.py b/rowsandall_app/settings.py index de0f9951..a916a5f2 100644 --- a/rowsandall_app/settings.py +++ b/rowsandall_app/settings.py @@ -224,8 +224,8 @@ STATIC_URL = '/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') From daf57063c1855deb4633156b6e31bab7aa02f948 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 25 Nov 2019 20:39:01 +0100 Subject: [PATCH 5/5] small fixes --- rowers/dataprepnodjango.py | 3 +++ rowers/templates/list_graphs.html | 8 ++++---- rowsandall_app/settings_dev.py | 6 +++++- rowsandall_app/urls.py | 16 +++++++++++----- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/rowers/dataprepnodjango.py b/rowers/dataprepnodjango.py index be8855d0..52400767 100644 --- a/rowers/dataprepnodjango.py +++ b/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 diff --git a/rowers/templates/list_graphs.html b/rowers/templates/list_graphs.html index 0b9a82df..8cb6eac3 100644 --- a/rowers/templates/list_graphs.html +++ b/rowers/templates/list_graphs.html @@ -40,11 +40,11 @@ {% endif %} {% endif %} - + Page {{ graphs.number }} of {{ graphs.paginator.num_pages }}. - + {% if graphs.has_next %} {% if request.GET.q %} @@ -69,7 +69,7 @@

  • - {{ graph.filename }} @@ -90,4 +90,4 @@ {% block sidebar %} {% include 'menu_workouts.html' %} -{% endblock %} +{% endblock %} diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 0c8fd8af..ad4c57c1 100644 --- a/rowsandall_app/settings_dev.py +++ b/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'] diff --git a/rowsandall_app/urls.py b/rowsandall_app/urls.py index 24ee7a28..ec1b60df 100644 --- a/rowsandall_app/urls.py +++ b/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.*)$', + django.views.static.serve, + kwargs={'document_root': settings.STATIC_ROOT+'plots/'}) + ] urlpatterns += [ # re_path(r'^__debug__/','debug_toolbar.urls'), - re_path(r'^static/(?P.*)$', - django.views.static.serve, - kwargs={'document_root': settings.STATIC_ROOT,} + re_path(r'^static/(?P.*)$', + django.views.static.serve, + kwargs={'document_root': settings.STATIC_ROOT, + 'show_indexes': True} ) ]