diff --git a/.gitignore b/.gitignore index 332c344d..d1f4d845 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ conftest.py # temporary test files /rowers/tests/testdata/temp /rowers/tests/testdata/testdata.csv.gz -rowers/tests/testdata/testdata.csv.gz /rowers/tests/testdata/testdata.tcx diff --git a/rowers/dataprep.py b/rowers/dataprep.py index 6f7bd55a..501154be 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -174,11 +174,11 @@ def workout_summary_to_df( weightvalues.append(w.weightvalue) notes.append(w.notes) tcx_link = SITE_URL+'/rowers/workout/{id}/emailtcx'.format( - id=w.id + id=encoder.encode_hex(w.id) ) tcx_links.append(tcx_link) csv_link = SITE_URL+'/rowers/workout/{id}/emailcsv'.format( - id=w.id + id=encoder.encode_hex(w.id) ) csv_links.append(csv_link) trimps.append(workout_trimp(w)[0]) diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py index e5d3f049..38198b59 100644 --- a/rowers/interactiveplots.py +++ b/rowers/interactiveplots.py @@ -318,7 +318,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'): hv.extension('bokeh') - table = hv.Table(df,[('date','Date'),('type','Workout Type')],[('duration','Duration')]) + table = hv.Table(df,[('date','Date'),('type','Workout Type')],[('duration','Minutes')]) bars=table.to.bars(['date','type'],['duration']) bars.opts( diff --git a/rowers/tasks.py b/rowers/tasks.py index 7b3ad6e9..688cb1bf 100644 --- a/rowers/tasks.py +++ b/rowers/tasks.py @@ -1801,7 +1801,7 @@ def handle_sendemail_coachrequest_accepted(email,coachname,name, } res = send_template_email(from_email,[fullemail], - subject,'coachrequestacceptedmail.html', + subject,'coachrequestacceptedemail.html', d, **kwargs) return 1 diff --git a/rowsandall_app/settings_dev.py b/rowsandall_app/settings_dev.py index 6733c420..77d59932 100644 --- a/rowsandall_app/settings_dev.py +++ b/rowsandall_app/settings_dev.py @@ -42,6 +42,7 @@ CELERY_RESULT_SERIALIZER = 'json' CELERY_TRACK_STARTED = True CELERY_SEND_TASK_SENT_EVENT = True +# GDAL_LIBRARY_PATH = 'C:/OSGeo4W64/bin/' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True