Merge tag '4.26' into develop
bugfix mail processing
This commit is contained in:
@@ -190,13 +190,19 @@ def handle_sendemail_unrecognized(unrecognizedfile,useremail):
|
|||||||
'Rowsandall <info@rowsandall.com>',
|
'Rowsandall <info@rowsandall.com>',
|
||||||
[fullemail])
|
[fullemail])
|
||||||
|
|
||||||
|
try:
|
||||||
email.attach_file(unrecognizedfile)
|
email.attach_file(unrecognizedfile)
|
||||||
|
except IOError:
|
||||||
|
pass
|
||||||
|
|
||||||
res = email.send()
|
res = email.send()
|
||||||
|
|
||||||
# remove tcx file
|
# remove tcx file
|
||||||
os.remove(unrecognizedfile)
|
try:
|
||||||
|
os.remove(unrecognizedfile)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
|
|
||||||
@@ -325,7 +331,7 @@ def handle_otwsetpower(f1,boattype,weightvalue,
|
|||||||
|
|
||||||
|
|
||||||
#delta,cpvalues,avgpower = datautils.getsinglecp(rowdata.df)
|
#delta,cpvalues,avgpower = datautils.getsinglecp(rowdata.df)
|
||||||
res,btvalues = utils.isbreakthrough(delta,cpvalues,ps[0],ps[1],ps[2],ps[3],ratio)
|
res,btvalues,res2 = utils.isbreakthrough(delta,cpvalues,ps[0],ps[1],ps[2],ps[3],ratio)
|
||||||
if res:
|
if res:
|
||||||
handle_sendemail_breakthrough(workoutid,email,
|
handle_sendemail_breakthrough(workoutid,email,
|
||||||
first_name,
|
first_name,
|
||||||
|
|||||||
Reference in New Issue
Block a user