From 7d0586b53087547935a9a800ab375e00441b1ab3 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 10 Dec 2017 15:35:35 +0100 Subject: [PATCH] fixed email unrecognized, removed unit from TRIMP --- rowers/dataprep.py | 6 ++++-- rowers/views.py | 8 +------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/rowers/dataprep.py b/rowers/dataprep.py index e64c25e5..c9c76554 100644 --- a/rowers/dataprep.py +++ b/rowers/dataprep.py @@ -1194,13 +1194,15 @@ def new_workout_from_file(r, f2, # worth supporting if fileformat == 'unknown': message = "We couldn't recognize the file type" + f4 = f2[:-5]+'a'+f2[-5:] + copyfile(f2,f4) if settings.DEBUG: - res = handle_sendemail_unrecognized.delay(f2, + res = handle_sendemail_unrecognized.delay(f4, r.user.email) else: res = queuehigh.enqueue(handle_sendemail_unrecognized, - f2, r.user.email) + f4, r.user.email) return (0, message, f2) # handle non-Painsled by converting it to painsled compatible CSV diff --git a/rowers/views.py b/rowers/views.py index bf5f555a..1359fd5e 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -6996,7 +6996,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""): otherstats['trimp'] = { 'verbose_name': 'TRIMP', 'value': trimp, - 'unit': 'minutes' + 'unit': '' } return render(request, @@ -9098,12 +9098,6 @@ def workout_upload_view(request, a = MessageAttachment(message=msg,document=f3) a.save() os.remove(f2) -# job = myqueue( -# queuehigh, -# handle_zip_file, -# r.user.email, -# t, -# f2) messages.info( request,