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

Merge branch 'hotfix/v1.83'

Browse Source
This commit is contained in:
Sander Roosendaal
2017-03-28 14:53:18 +02:00
parent 4d9131c68b 61df4685ce
commit 5cec9cf4a8
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/mailprocessing.py
View File

@@ -189,7 +189,7 @@ def make_new_workout_from_email(rr,f2,name,cntr=0):
summary = ''
# handle non-Painsled
if fileformat != 'csv':
f3,summary = dataprep.handle_nonpainsled('media/'+f2,fileformat,summary)
f3,summary,oarlength,inboard = dataprep.handle_nonpainsled('media/'+f2,fileformat,summary)
else:
f3 = 'media/'+f2
@@ -227,6 +227,8 @@ def make_new_workout_from_email(rr,f2,name,cntr=0):
id,message = dataprep.save_workout_database(f2,rr,
workouttype=workouttype,
dosummary=dosummary,
inboard=inboard,
oarlength=oarlength,
title=name,
notes='imported through email')

16
rowers/management/commands/processemail.py
View File

@@ -63,15 +63,13 @@ class Command(BaseCommand):
z = zipfile.ZipFile(a.document)
for f in z.namelist():
f2 = z.extract(f,path='media/')
try:
wid = [
make_new_workout_from_email(rr,f2[6:],name)
]
res += wid
link = 'http://rowsandall.com/rowers/workout/'+str(wid)+'/edit'
dd = send_confirm(u,name,link)
except:
pass
wid = [
make_new_workout_from_email(rr,f2[6:],name)
]
res += wid
link = 'http://rowsandall.com/rowers/workout/'+str(wid[0])+'/edit'
dd = send_confirm(rr.user,name,link)
else:
# move attachment and make workout
try: