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

fixed email unrecognized, removed unit from TRIMP

Browse Source
This commit is contained in:
Sander Roosendaal
2017-12-10 15:35:35 +01:00
parent 963fa554c5
commit 7d0586b530
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -1194,13 +1194,15 @@ def new_workout_from_file(r, f2,
# worth supporting # worth supporting
if fileformat == 'unknown': if fileformat == 'unknown':
message = "We couldn't recognize the file type" message = "We couldn't recognize the file type"
f4 = f2[:-5]+'a'+f2[-5:]
copyfile(f2,f4)
if settings.DEBUG: if settings.DEBUG:
res = handle_sendemail_unrecognized.delay(f2, res = handle_sendemail_unrecognized.delay(f4,
r.user.email) r.user.email)
else: else:
res = queuehigh.enqueue(handle_sendemail_unrecognized, res = queuehigh.enqueue(handle_sendemail_unrecognized,
f2, r.user.email) f4, r.user.email)
return (0, message, f2) return (0, message, f2)
# handle non-Painsled by converting it to painsled compatible CSV # handle non-Painsled by converting it to painsled compatible CSV

8
rowers/views.py
View File

@@ -6996,7 +6996,7 @@ def workout_stats_view(request,id=0,message="",successmessage=""):
otherstats['trimp'] = { otherstats['trimp'] = {
'verbose_name': 'TRIMP', 'verbose_name': 'TRIMP',
'value': trimp, 'value': trimp,
'unit': 'minutes' 'unit': ''
} }
return render(request, return render(request,
@@ -9098,12 +9098,6 @@ def workout_upload_view(request,
a = MessageAttachment(message=msg,document=f3) a = MessageAttachment(message=msg,document=f3)
a.save() a.save()
os.remove(f2) os.remove(f2)
# job = myqueue(
# queuehigh,
# handle_zip_file,
# r.user.email,
# t,
# f2)
messages.info( messages.info(
request, request,