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

Merge tag 'logcard' into develop

Browse Source 
bug hotfix c2 logcard summary
This commit is contained in:
Sander Roosendaal
2017-02-16 19:13:13 +01:00
parent cce8c86e73 1781ab4e47
commit 274e5d953f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rowers/dataprep.py
View File

@@ -448,13 +448,13 @@ def new_workout_from_file(r,f2,
if fileformat == 'c2log':
os.remove(f2)
message = "This C2 logbook summary does not contain stroke data. Please download the Export Stroke Data file from the workout details on the C2 logbook."
return (0,message)
return (0,message,f2)
# Some people try to upload RowPro summary logs
if fileformat == 'rowprolog':
os.remove(f2)
message = "This RowPro logbook summary does not contain stroke data. Please use the Stroke Data CSV file for the individual workout in your log."
return (0,message)
return (0,message,f2)
# Sometimes people try an unsupported file type.
# Send an email to info@rowsandall.com with the file attached
@@ -469,7 +469,7 @@ def new_workout_from_file(r,f2,
else:
res = queuehigh.enqueue(handle_sendemail_unrecognized,
f2,r.user.email)
return (0,message)
return (0,message,f2)
# handle non-Painsled by converting it to painsled compatible CSV
if (fileformat != 'csv'):