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

send email to sender of unrecognized file

Browse Source 
The email processing sends a notification message to the person who
sent a unrecognized file to the workouts@rowsandall.com email address.
This way, people will know that their email has worked and perhaps
stop sending 99 or more emails with the same unsupported file.
This commit is contained in:
Sander Roosendaal
2017-10-23 08:56:10 +02:00
parent 04d5df245b
commit 74e924a3c1
2 changed files with 296 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rowers/mailprocessing.py
View File

@@ -92,14 +92,22 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0):
# shutil.copyfileobj(f_in,f_out) # shutil.copyfileobj(f_in,f_out)
fcopy = "media/"+datafilename fcopy = "media/"+datafilename
if settings.DEBUG: if settings.DEBUG:
res = handle_sendemail_unrecognized.delay(fcopy, res = handle_sendemail_unrecognized.delay(
rower.user.email) fcopy,
rower.user.email
)
res = handle_sendemail_unrecognizedowner.delay(
rower.user.email,
rower.user.first_name
)
else: else:
res = queuehigh.enqueue(handle_sendemail_unrecognized, res = queuehigh.enqueue(handle_sendemail_unrecognized,
fcopy, fcopy,
rower.user.email) rower.user.email)
res = queuehigh.enqueue(handle_sendemail_unrecognizedowner,
rower.user.email,
rower.user.first_name
)
return 0 return 0
summary = '' summary = ''

489
rowers/tasks.py
View File

@@ -1,4 +1,4 @@
from celery import Celery,app """ Background tasks done by Celery (develop) or QR (production) """
import os import os
import time import time
import gc import gc
@@ -7,67 +7,73 @@ import shutil
import numpy as np import numpy as np
import rowingdata import rowingdata
from rowingdata import main as rmain
from rowingdata import rowingdata as rdata from rowingdata import rowingdata as rdata
import rowingdata
from async_messages import message_user,messages from celery import app
from matplotlib.backends.backend_agg import FigureCanvas from matplotlib.backends.backend_agg import FigureCanvas
#from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas #from matplotlib.backends.backend_cairo import FigureCanvasCairo as FigureCanvas
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
from matplotlib import figure
import stravalib
import pandas as pd import pandas as pd
from django_rq import job from django_rq import job
from utils import serialize_list,deserialize_list from utils import deserialize_list
from rowers.dataprepnodjango import ( from rowers.dataprepnodjango import (
update_strokedata, new_workout_from_file, update_strokedata, new_workout_from_file,
getsmallrowdata_db,read_df_sql,columndict, getsmallrowdata_db,
) )
from django.core.mail import send_mail, BadHeaderError,EmailMessage from django.core.mail import send_mail, EmailMessage
import datautils import datautils
import utils import utils
# testing task # testing task
@app.task @app.task
def add(x, y): def add(x, y):
return x + y return x + y
# create workout # create workout
@app.task @app.task
def handle_new_workout_from_file(r,f2, def handle_new_workout_from_file(r, f2,
workouttype='rower', workouttype='rower',
title='Workout', title='Workout',
makeprivate=False, makeprivate=False,
notes=''): notes=''):
return new_workout_from_file(r,f2,workouttype, return new_workout_from_file(r, f2, workouttype,
title,makeprivate,notes) title, makeprivate, notes)
# process and update workouts # process and update workouts
@app.task @app.task
def handle_updatedps(useremail,workoutids,debug=False): def handle_updatedps(useremail, workoutids, debug=False):
for wid,f1 in workoutids: for wid, f1 in workoutids:
havedata = 1 havedata = 1
try: try:
rowdata = rdata(f1) rowdata = rdata(f1)
except IOError: except IOError:
try: try:
rowdata = rdata(f1+'.csv') rowdata = rdata(f1 + '.csv')
except IOError: except IOError:
try: try:
rowdata = rdata(f1+'.gz') rowdata = rdata(f1 + '.gz')
except IOError: except IOError:
havedata = 0 havedata = 0
if havedata: if havedata:
update_strokedata(wid,rowdata.df,debug=debug) update_strokedata(wid, rowdata.df, debug=debug)
subject = "Rowsandall.com Your Distance per Stroke metric has been updated" subject = "Rowsandall.com Your Distance per Stroke metric has been updated"
message = "All your workouts now have Distance per Stroke" message = "All your workouts now have Distance per Stroke"
@@ -81,14 +87,16 @@ def handle_updatedps(useremail,workoutids,debug=False):
return 1 return 1
# send email when a breakthrough workout is uploaded # send email when a breakthrough workout is uploaded
@app.task @app.task
def handle_sendemail_breakthrough(workoutid,useremail, def handle_sendemail_breakthrough(workoutid, useremail,
userfirstname,userlastname, userfirstname, userlastname,
btvalues = pd.DataFrame().to_json()): btvalues=pd.DataFrame().to_json()):
# send email with attachment # send email with attachment
subject = "A breakthrough workout on rowsandall.com" subject = "A breakthrough workout on rowsandall.com"
message = "Dear "+userfirstname+",\n" message = "Dear " + userfirstname + ",\n"
message += "Congratulations! Your recent workout has been analyzed" message += "Congratulations! Your recent workout has been analyzed"
message += " by Rowsandall.com and it appears your fitness," message += " by Rowsandall.com and it appears your fitness,"
message += " as measured by Critical Power, has improved!" message += " as measured by Critical Power, has improved!"
@@ -98,14 +106,14 @@ def handle_sendemail_breakthrough(workoutid,useremail,
message += " http://analytics.rowsandall.com/2017/06/17/how-do-we-calculate-critical-power/ \n\n" message += " http://analytics.rowsandall.com/2017/06/17/how-do-we-calculate-critical-power/ \n\n"
message += "Link to the workout http://rowsandall.com/rowers/workout/" message += "Link to the workout http://rowsandall.com/rowers/workout/"
message += str(workoutid) message += str(workoutid)
message +="/edit\n\n" message += "/edit\n\n"
message +="To add the workout to your Ranking workouts and see the updated CP plot, click the following link:\n" message += "To add the workout to your Ranking workouts and see the updated CP plot, click the following link:\n"
message += "http://rowsandall.com/rowers/workout/" message += "http://rowsandall.com/rowers/workout/"
message += str(workoutid) message += str(workoutid)
message += "/updatecp\n\n" message += "/updatecp\n\n"
btvalues = pd.read_json(btvalues) btvalues = pd.read_json(btvalues)
btvalues.sort_values('delta',axis=0,inplace=True) btvalues.sort_values('delta', axis=0, inplace=True)
if not btvalues.empty: if not btvalues.empty:
message += "These were the breakthrough values:\n" message += "These were the breakthrough values:\n"
@@ -116,23 +124,21 @@ def handle_sendemail_breakthrough(workoutid,useremail,
message += "Time: {delta} seconds\n".format( message += "Time: {delta} seconds\n".format(
delta=delta delta=delta
) )
message += "New: {cpvalue:.0f} Watt\n".format( message += "New: {cpvalue:.0f} Watt\n".format(
cpvalue=cpvalue cpvalue=cpvalue
) )
message += "Old: {pwr:.0f} Watt\n\n".format( message += "Old: {pwr:.0f} Watt\n\n".format(
pwr=pwr pwr=pwr
) )
message += "To opt out of these email notifications, deselect the checkbox on your Profile page under Account Information.\n\n" message += "To opt out of these email notifications, deselect the checkbox on your Profile page under Account Information.\n\n"
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[useremail]) [useremail])
res = email.send() res = email.send()
@@ -140,14 +146,16 @@ def handle_sendemail_breakthrough(workoutid,useremail,
return 1 return 1
# send email when a breakthrough workout is uploaded # send email when a breakthrough workout is uploaded
@app.task @app.task
def handle_sendemail_hard(workoutid,useremail, def handle_sendemail_hard(workoutid, useremail,
userfirstname,userlastname, userfirstname, userlastname,
btvalues = pd.DataFrame().to_json()): btvalues=pd.DataFrame().to_json()):
# send email with attachment # send email with attachment
subject = "That was a pretty hard workout on rowsandall.com" subject = "That was a pretty hard workout on rowsandall.com"
message = "Dear "+userfirstname+",\n" message = "Dear " + userfirstname + ",\n"
message += "Congratulations! Your recent workout has been analyzed" message += "Congratulations! Your recent workout has been analyzed"
message += " by Rowsandall.com and it appears that it was pretty hard work." message += " by Rowsandall.com and it appears that it was pretty hard work."
message += " You were working pretty close to your Critical Power\n\n" message += " You were working pretty close to your Critical Power\n\n"
@@ -157,16 +165,15 @@ def handle_sendemail_hard(workoutid,useremail,
message += " http://analytics.rowsandall.com/2017/06/17/how-do-we-calculate-critical-power/ \n\n" message += " http://analytics.rowsandall.com/2017/06/17/how-do-we-calculate-critical-power/ \n\n"
message += "Link to the workout http://rowsandall.com/rowers/workout/" message += "Link to the workout http://rowsandall.com/rowers/workout/"
message += str(workoutid) message += str(workoutid)
message +="/edit\n\n" message += "/edit\n\n"
message += "To opt out of these email notifications, deselect the checkbox on your Profile page under Account Information.\n\n" message += "To opt out of these email notifications, deselect the checkbox on your Profile page under Account Information.\n\n"
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[useremail]) [useremail])
res = email.send() res = email.send()
@@ -176,19 +183,19 @@ def handle_sendemail_hard(workoutid,useremail,
# send email to me when an unrecognized file is uploaded # send email to me when an unrecognized file is uploaded
@app.task @app.task
def handle_sendemail_unrecognized(unrecognizedfile,useremail): def handle_sendemail_unrecognized(unrecognizedfile, useremail):
# send email with attachment # send email with attachment
fullemail = 'roosendaalsander@gmail.com' fullemail = 'roosendaalsander@gmail.com'
subject = "Unrecognized file from Rowsandall.com" subject = "Unrecognized file from Rowsandall.com"
message = "Dear Sander,\n\n" message = "Dear Sander,\n\n"
message += "Please find attached a file that someone tried to upload to rowsandall.com. The file was not recognized as a valid file type.\n\n" message += "Please find attached a file that someone tried to upload to rowsandall.com. The file was not recognized as a valid file type.\n\n"
message += "User Email "+useremail+"\n\n" message += "User Email " + useremail + "\n\n"
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
try: try:
email.attach_file(unrecognizedfile) email.attach_file(unrecognizedfile)
@@ -206,21 +213,51 @@ def handle_sendemail_unrecognized(unrecognizedfile,useremail):
return 1 return 1
# send email to owner when an unrecognized file is uploaded
@app.task
def handle_sendemail_unrecognizedowner(useremail, userfirstname):
# send email with attachment
fullemail = useremail
subject = "Unrecognized file from Rowsandall.com"
message = "Dear " + userfirstname + ",\n\n"
message += """
The file you tried to send to rowsandall.com was not recognized by
our email processing system. You may have sent a file in a format
that is not supported. Sometimes, rowing apps make file format changes.
When that happens, it takes some time for rowsandall.comm to make
the necessary changes on our side and support the app again.
The file has been sent to the developer at rowsandall.com for evaluation.
"""
message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>',
[fullemail])
res = email.send()
return 1
# Send email with TCX attachment # Send email with TCX attachment
@app.task @app.task
def handle_sendemailtcx(first_name,last_name,email,tcxfile): def handle_sendemailtcx(first_name, last_name, email, tcxfile):
# send email with attachment # send email with attachment
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
subject = "File from Rowsandall.com" subject = "File from Rowsandall.com"
message = "Dear "+first_name+",\n\n" message = "Dear " + first_name + ",\n\n"
message += "Please find attached the requested file for your workout.\n\n" message += "Please find attached the requested file for your workout.\n\n"
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
email.attach_file(tcxfile) email.attach_file(tcxfile)
@@ -230,10 +267,11 @@ def handle_sendemailtcx(first_name,last_name,email,tcxfile):
os.remove(tcxfile) os.remove(tcxfile)
return 1 return 1
@app.task @app.task
def handle_zip_file(emailfrom,subject,file): def handle_zip_file(emailfrom, subject, file):
message = "... zip processing ... " message = "... zip processing ... "
email = EmailMessage(subject,message, email = EmailMessage(subject, message,
emailfrom, emailfrom,
['workouts@rowsandall.com']) ['workouts@rowsandall.com'])
email.attach_file(file) email.attach_file(file)
@@ -242,26 +280,27 @@ def handle_zip_file(emailfrom,subject,file):
return 1 return 1
# Send email with CSV attachment # Send email with CSV attachment
@app.task @app.task
def handle_sendemailcsv(first_name,last_name,email,csvfile): def handle_sendemailcsv(first_name, last_name, email, csvfile):
# send email with attachment # send email with attachment
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
subject = "File from Rowsandall.com" subject = "File from Rowsandall.com"
message = "Dear "+first_name+",\n\n" message = "Dear " + first_name + ",\n\n"
message += "Please find attached the requested file for your workout.\n\n" message += "Please find attached the requested file for your workout.\n\n"
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
if os.path.isfile(csvfile): if os.path.isfile(csvfile):
email.attach_file(csvfile) email.attach_file(csvfile)
else: else:
csvfile2 = csvfile csvfile2 = csvfile
with gzip.open(csvfile+'.gz','rb') as f_in, open(csvfile2,'wb') as f_out: with gzip.open(csvfile + '.gz', 'rb') as f_in, open(csvfile2, 'wb') as f_out:
shutil.copyfileobj(f_in, f_out) shutil.copyfileobj(f_in, f_out)
email.attach_file(csvfile2) email.attach_file(csvfile2)
@@ -272,34 +311,37 @@ def handle_sendemailcsv(first_name,last_name,email,csvfile):
return 1 return 1
# Calculate wind and stream corrections for OTW rowing # Calculate wind and stream corrections for OTW rowing
@app.task @app.task
def handle_otwsetpower(f1,boattype,weightvalue, def handle_otwsetpower(f1, boattype, weightvalue,
first_name,last_name,email,workoutid,ps=[1,1,1,1], first_name, last_name, email, workoutid, ps=[
1, 1, 1, 1],
ratio=1.0, ratio=1.0,
debug=False): debug=False):
try: try:
rowdata = rdata(f1) rowdata = rdata(f1)
except IOError: except IOError:
try: try:
rowdata = rdata(f1+'.csv') rowdata = rdata(f1 + '.csv')
except IOError: except IOError:
rowdata = rdata(f1+'.gz') rowdata = rdata(f1 + '.gz')
weightvalue = float(weightvalue) weightvalue = float(weightvalue)
# do something with boat type # do something with boat type
boatfile = { boatfile = {
'1x':'static/rigging/1x.txt', '1x': 'static/rigging/1x.txt',
'2x':'static/rigging/2x.txt', '2x': 'static/rigging/2x.txt',
'2-':'static/rigging/2-.txt', '2-': 'static/rigging/2-.txt',
'4x':'static/rigging/4x.txt', '4x': 'static/rigging/4x.txt',
'4-':'static/rigging/4-.txt', '4-': 'static/rigging/4-.txt',
'8+':'static/rigging/8+.txt', '8+': 'static/rigging/8+.txt',
} }
try: try:
rg = rowingdata.getrigging(boatfile[boattype]) rg = rowingdata.getrigging(boatfile[boattype])
except KeyError: except KeyError:
rg = rowingdata.getrigging('static/rigging/1x.txt') rg = rowingdata.getrigging('static/rigging/1x.txt')
# do calculation, but do not overwrite NK Empower Power data # do calculation, but do not overwrite NK Empower Power data
powermeasured = False powermeasured = False
@@ -310,117 +352,119 @@ def handle_otwsetpower(f1,boattype,weightvalue,
except KeyError: except KeyError:
pass pass
rowdata.otw_setpower_silent(skiprows=5,mc=weightvalue,rg=rg, rowdata.otw_setpower_silent(skiprows=5, mc=weightvalue, rg=rg,
powermeasured=powermeasured) powermeasured=powermeasured)
# save data # save data
rowdata.write_csv(f1,gzip=True) rowdata.write_csv(f1, gzip=True)
update_strokedata(workoutid,rowdata.df,debug=debug) update_strokedata(workoutid, rowdata.df, debug=debug)
totaltime = rowdata.df['TimeStamp (sec)'].max()-rowdata.df['TimeStamp (sec)'].min() totaltime = rowdata.df['TimeStamp (sec)'].max(
) - rowdata.df['TimeStamp (sec)'].min()
try: try:
totaltime = totaltime+rowdata.df.ix[0,' ElapsedTime (sec)'] totaltime = totaltime + rowdata.df.ix[0, ' ElapsedTime (sec)']
except KeyError: except KeyError:
pass pass
df = getsmallrowdata_db(['power','workoutid','time'],ids=[workoutid]) df = getsmallrowdata_db(['power', 'workoutid', 'time'], ids=[workoutid])
thesecs = totaltime thesecs = totaltime
maxt = 1.05*thesecs maxt = 1.05 * thesecs
logarr = datautils.getlogarr(maxt) logarr = datautils.getlogarr(maxt)
dfgrouped = df.groupby(['workoutid']) dfgrouped = df.groupby(['workoutid'])
delta,cpvalues,avgpower = datautils.getcp(dfgrouped,logarr) delta, cpvalues, avgpower = datautils.getcp(dfgrouped, logarr)
#delta,cpvalues,avgpower = datautils.getsinglecp(rowdata.df) #delta,cpvalues,avgpower = datautils.getsinglecp(rowdata.df)
res,btvalues,res2 = 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,
last_name,btvalues=btvalues.to_json()) last_name, btvalues=btvalues.to_json())
# send email # send email
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
subject = "Your Rowsandall OTW calculations are ready" subject = "Your Rowsandall OTW calculations are ready"
message = "Dear "+first_name+",\n\n" message = "Dear " + first_name + ",\n\n"
message += "Your Rowsandall OTW calculations are ready.\n" message += "Your Rowsandall OTW calculations are ready.\n"
message += "Thank you for using rowsandall.com.\n\n" message += "Thank you for using rowsandall.com.\n\n"
message += "Rowsandall OTW calculations have not been fully implemented yet.\n" message += "Rowsandall OTW calculations have not been fully implemented yet.\n"
message += "We are now running an experimental version for debugging purposes. \n" message += "We are now running an experimental version for debugging purposes. \n"
message += "Your wind/stream corrected plot is available here: http://rowsandall.com/rowers/workout/" message += "Your wind/stream corrected plot is available here: http://rowsandall.com/rowers/workout/"
message += str(workoutid) message += str(workoutid)
message +="/interactiveotwplot\n\n" message += "/interactiveotwplot\n\n"
message += "Please report any bugs/inconsistencies/unexpected results at rowsandall.slack.com or by reply to this email.\n\n" message += "Please report any bugs/inconsistencies/unexpected results at rowsandall.slack.com or by reply to this email.\n\n"
message += "Best Regards, The Rowsandall Physics Department." message += "Best Regards, The Rowsandall Physics Department."
send_mail(subject, message, send_mail(subject, message,
'Rowsandall Physics Department <info@rowsandall.com>', 'Rowsandall Physics Department <info@rowsandall.com>',
[fullemail]) [fullemail])
return 1 return 1
# This function generates all the static (PNG image) plots # This function generates all the static (PNG image) plots
@app.task
def handle_makeplot(f1,f2,t,hrdata,plotnr,imagename):
hrmax = hrdata['hrmax']
hrut2 = hrdata['hrut2'] @app.task
hrut1 = hrdata['hrut1'] def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename):
hrat = hrdata['hrat']
hrtr = hrdata['hrtr'] hrmax = hrdata['hrmax']
hran = hrdata['hran'] hrut2 = hrdata['hrut2']
hrut1 = hrdata['hrut1']
hrat = hrdata['hrat']
hrtr = hrdata['hrtr']
hran = hrdata['hran']
ftp = hrdata['ftp'] ftp = hrdata['ftp']
powerzones = deserialize_list(hrdata['powerzones']) powerzones = deserialize_list(hrdata['powerzones'])
powerperc = np.array(deserialize_list(hrdata['powerperc'])).astype(int) powerperc = np.array(deserialize_list(hrdata['powerperc'])).astype(int)
rr = rowingdata.rower(hrmax=hrmax,hrut2=hrut2, rr = rowingdata.rower(hrmax=hrmax, hrut2=hrut2,
hrut1=hrut1,hrat=hrat, hrut1=hrut1, hrat=hrat,
hrtr=hrtr,hran=hran, hrtr=hrtr, hran=hran,
ftp=ftp,powerperc=powerperc, ftp=ftp, powerperc=powerperc,
powerzones=powerzones) powerzones=powerzones)
try: try:
row = rdata(f2,rower=rr) row = rdata(f2, rower=rr)
except IOError: except IOError:
row = rdata(f2+'.gz',rower=rr) row = rdata(f2 + '.gz', rower=rr)
haspower = row.df[' Power (watts)'].mean() > 50 haspower = row.df[' Power (watts)'].mean() > 50
nr_rows = len(row.df) nr_rows = len(row.df)
if (plotnr in [1,2,4,5,8,11,9,12]) and (nr_rows > 1200): if (plotnr in [1, 2, 4, 5, 8, 11, 9, 12]) and (nr_rows > 1200):
bin = int(nr_rows/1200.) bin = int(nr_rows / 1200.)
df = row.df.groupby(lambda x:x/bin).mean() df = row.df.groupby(lambda x: x / bin).mean()
row.df = df row.df = df
nr_rows = len(row.df) nr_rows = len(row.df)
if (plotnr==1): if (plotnr == 1):
fig1 = row.get_timeplot_erg(t) fig1 = row.get_timeplot_erg(t)
elif (plotnr==2): elif (plotnr == 2):
fig1 = row.get_metersplot_erg(t) fig1 = row.get_metersplot_erg(t)
elif (plotnr==3): elif (plotnr == 3):
fig1 = row.get_piechart(t) fig1 = row.get_piechart(t)
elif (plotnr==4): elif (plotnr == 4):
if haspower: if haspower:
fig1 = row.get_timeplot_otwempower(t) fig1 = row.get_timeplot_otwempower(t)
else: else:
fig1 = row.get_timeplot_otw(t) fig1 = row.get_timeplot_otw(t)
elif (plotnr==5): elif (plotnr == 5):
if haspower: if haspower:
fig1 = row.get_metersplot_otwempower(t) fig1 = row.get_metersplot_otwempower(t)
else: else:
fig1 = row.get_metersplot_otw(t) fig1 = row.get_metersplot_otw(t)
elif (plotnr==6): elif (plotnr == 6):
fig1 = row.get_piechart(t) fig1 = row.get_piechart(t)
elif (plotnr==7) or (plotnr==10): elif (plotnr == 7) or (plotnr == 10):
fig1 = row.get_metersplot_erg2(t) fig1 = row.get_metersplot_erg2(t)
elif (plotnr==8) or (plotnr==11): elif (plotnr == 8) or (plotnr == 11):
fig1 = row.get_timeplot_erg2(t) fig1 = row.get_timeplot_erg2(t)
elif (plotnr==9) or (plotnr==12): elif (plotnr == 9) or (plotnr == 12):
fig1 = row.get_time_otwpower(t) fig1 = row.get_time_otwpower(t)
elif (plotnr==13) or (plotnr==16): elif (plotnr == 13) or (plotnr == 16):
fig1 = row.get_power_piechart(t) fig1 = row.get_power_piechart(t)
canvas = FigureCanvas(fig1) canvas = FigureCanvas(fig1)
# plt.savefig('static/plots/'+imagename,format='png') # plt.savefig('static/plots/'+imagename,format='png')
canvas.print_figure('static/plots/'+imagename) canvas.print_figure('static/plots/' + imagename)
# plt.imsave(fname='static/plots/'+imagename) # plt.imsave(fname='static/plots/'+imagename)
plt.close(fig1) plt.close(fig1)
fig1.clf() fig1.clf()
@@ -430,12 +474,13 @@ def handle_makeplot(f1,f2,t,hrdata,plotnr,imagename):
# Team related remote tasks # Team related remote tasks
@app.task @app.task
def handle_sendemail_invite(email,name,code,teamname,manager): def handle_sendemail_invite(email, name, code, teamname, manager):
fullemail = name+' <'+email+'>' fullemail = name + ' <' + email + '>'
subject = 'Invitation to join team '+teamname subject = 'Invitation to join team ' + teamname
message = 'Dear '+name+',\n\n' message = 'Dear ' + name + ',\n\n'
message += manager+' is inviting you to join his team '+teamname message += manager + ' is inviting you to join his team ' + teamname
message += ' on rowsandall.com\n\n' message += ' on rowsandall.com\n\n'
message += 'By accepting the invite, you will have access to your' message += 'By accepting the invite, you will have access to your'
message += " team's workouts on rowsandall.com and your workouts will " message += " team's workouts on rowsandall.com and your workouts will "
@@ -444,82 +489,84 @@ def handle_sendemail_invite(email,name,code,teamname,manager):
message += 'If you already have an account on rowsandall.com, you can login to the site and you will find the invitation here on the Teams page:\n' message += 'If you already have an account on rowsandall.com, you can login to the site and you will find the invitation here on the Teams page:\n'
message += ' https://rowsandall.com/rowers/me/teams \n\n' message += ' https://rowsandall.com/rowers/me/teams \n\n'
message += 'You can also click the direct link: \n' message += 'You can also click the direct link: \n'
message += 'https://rowsandall.com/rowers/me/invitation/'+code+' \n\n' message += 'https://rowsandall.com/rowers/me/invitation/' + code + ' \n\n'
message += 'If you are not yet registered to rowsandall.com, ' message += 'If you are not yet registered to rowsandall.com, '
message += 'you can register for free at https://rowsandall.com/rowers/register\n' message += 'you can register for free at https://rowsandall.com/rowers/register\n'
message += 'After you set up your account, you can use the direct link: ' message += 'After you set up your account, you can use the direct link: '
message += 'https://rowsandall.com/rowers/me/invitation/'+code+' \n\n' message += 'https://rowsandall.com/rowers/me/invitation/' + code + ' \n\n'
message += 'You can also manually accept your team membership with the code.\n' message += 'You can also manually accept your team membership with the code.\n'
message += 'You will need to do this if you registered under a different email address than this one.\n' message += 'You will need to do this if you registered under a different email address than this one.\n'
message += 'Code: '+code+'\n' message += 'Code: ' + code + '\n'
message += 'Link to manually accept your team membership: ' message += 'Link to manually accept your team membership: '
message += 'https://rowsandall.com/rowers/me/invitation\n\n' message += 'https://rowsandall.com/rowers/me/invitation\n\n'
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemailnewresponse(first_name,last_name, def handle_sendemailnewresponse(first_name, last_name,
email, email,
commenter_first_name, commenter_first_name,
commenter_last_name, commenter_last_name,
comment, comment,
workoutname,workoutid,commentid): workoutname, workoutid, commentid):
fullemail = first_name+' '+last_name+' <'+email+'>' fullemail = first_name + ' ' + last_name + ' <' + email + '>'
subject = 'New comment on workout '+workoutname subject = 'New comment on workout ' + workoutname
message = 'Dear '+first_name+',\n\n' message = 'Dear ' + first_name + ',\n\n'
message += commenter_first_name+' '+commenter_last_name message += commenter_first_name + ' ' + commenter_last_name
message += ' has written a new comment on the workout ' message += ' has written a new comment on the workout '
message += workoutname+'\n\n' message += workoutname + '\n\n'
message += comment message += comment
message += '\n\n' message += '\n\n'
message += 'You can read the comment here:\n' message += 'You can read the comment here:\n'
message += 'https://rowsandall.com/rowers/workout/'+str(workoutid)+'/comment' message += 'https://rowsandall.com/rowers/workout/' + \
str(workoutid) + '/comment'
message += '\n\n' message += '\n\n'
message += 'You are receiving this email because you are subscribed ' message += 'You are receiving this email because you are subscribed '
message += 'to comments on this workout. To unsubscribe, follow this link:\n' message += 'to comments on this workout. To unsubscribe, follow this link:\n'
message += 'https://rowsandall.com/rowers/workout/'+str(workoutid)+'/unsubscribe' message += 'https://rowsandall.com/rowers/workout/' + \
str(workoutid) + '/unsubscribe'
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemailnewcomment(first_name, def handle_sendemailnewcomment(first_name,
last_name, last_name,
email, email,
commenter_first_name, commenter_first_name,
commenter_last_name, commenter_last_name,
comment,workoutname, comment, workoutname,
workoutid): workoutid):
fullemail = first_name+' '+last_name+' <'+email+'>' fullemail = first_name + ' ' + last_name + ' <' + email + '>'
subject = 'New comment on workout '+workoutname subject = 'New comment on workout ' + workoutname
message = 'Dear '+first_name+',\n\n' message = 'Dear ' + first_name + ',\n\n'
message += commenter_first_name+' '+commenter_last_name message += commenter_first_name + ' ' + commenter_last_name
message += ' has written a new comment on your workout ' message += ' has written a new comment on your workout '
message += workoutname+'\n\n' message += workoutname + '\n\n'
message += comment message += comment
message += '\n\n' message += '\n\n'
message += 'You can read the comment here:\n' message += 'You can read the comment here:\n'
message += 'https://rowsandall.com/rowers/workout/'+str(workoutid)+'/comment' message += 'https://rowsandall.com/rowers/workout/' + \
str(workoutid) + '/comment'
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
@@ -527,34 +574,34 @@ def handle_sendemailnewcomment(first_name,
@app.task @app.task
def handle_sendemail_request(email,name,code,teamname,requestor,id): def handle_sendemail_request(email, name, code, teamname, requestor, id):
fullemail = name+' <'+email+'>' fullemail = name + ' <' + email + '>'
subject = 'Request to join team '+teamname subject = 'Request to join team ' + teamname
message = 'Dear '+name+',\n\n' message = 'Dear ' + name + ',\n\n'
message += requestor+' is requesting admission to your team '+teamname message += requestor + ' is requesting admission to your team ' + teamname
message += ' on rowsandall.com\n\n' message += ' on rowsandall.com\n\n'
message += 'Click the direct link to accept: \n' message += 'Click the direct link to accept: \n'
message += 'https://rowsandall.com/rowers/me/request/'+code+' \n\n' message += 'https://rowsandall.com/rowers/me/request/' + code + ' \n\n'
message += 'Click the following link to reject the request: \n' message += 'Click the following link to reject the request: \n'
message += 'https://rowsandall.com/rowers/me/request/'+str(id)+' \n\n' message += 'https://rowsandall.com/rowers/me/request/' + str(id) + ' \n\n'
message += 'You can find all pending requests on your team management page:\n' message += 'You can find all pending requests on your team management page:\n'
message += 'https://rowsandall.com/rowers/me/teams\n\n' message += 'https://rowsandall.com/rowers/me/teams\n\n'
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemail_request_accept(email,name,teamname,managername): def handle_sendemail_request_accept(email, name, teamname, managername):
fullemail = name+' <'+email+'>' fullemail = name + ' <' + email + '>'
subject = 'Welcome to '+teamname subject = 'Welcome to ' + teamname
message = 'Dear '+name+',\n\n' message = 'Dear ' + name + ',\n\n'
message += managername message += managername
message += ' has accepted your request to be part of the team ' message += ' has accepted your request to be part of the team '
message += teamname message += teamname
@@ -562,19 +609,19 @@ def handle_sendemail_request_accept(email,name,teamname,managername):
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemail_request_reject(email,name,teamname,managername): def handle_sendemail_request_reject(email, name, teamname, managername):
fullemail = name+' <'+email+'>' fullemail = name + ' <' + email + '>'
subject = 'Your application to '+teamname+' was rejected' subject = 'Your application to ' + teamname + ' was rejected'
message = 'Dear '+name+',\n\n' message = 'Dear ' + name + ',\n\n'
message += 'Unfortunately, ' message += 'Unfortunately, '
message += managername message += managername
message += ' has rejected your request to be part of the team ' message += ' has rejected your request to be part of the team '
@@ -583,19 +630,19 @@ def handle_sendemail_request_reject(email,name,teamname,managername):
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemail_member_dropped(email,name,teamname,managername): def handle_sendemail_member_dropped(email, name, teamname, managername):
fullemail = name+' <'+email+'>' fullemail = name + ' <' + email + '>'
subject = 'You were removed from '+teamname subject = 'You were removed from ' + teamname
message = 'Dear '+name+',\n\n' message = 'Dear ' + name + ',\n\n'
message += 'Unfortunately, ' message += 'Unfortunately, '
message += managername message += managername
message += ' has removed you from the team ' message += ' has removed you from the team '
@@ -604,42 +651,42 @@ def handle_sendemail_member_dropped(email,name,teamname,managername):
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemail_team_removed(email,name,teamname,managername): def handle_sendemail_team_removed(email, name, teamname, managername):
fullemail = name+' <'+email+'>' fullemail = name + ' <' + email + '>'
subject = 'Team '+teamname+' was deleted' subject = 'Team ' + teamname + ' was deleted'
message = 'Dear '+name+',\n\n' message = 'Dear ' + name + ',\n\n'
message += managername message += managername
message += ' has decided to delete the team ' message += ' has decided to delete the team '
message += teamname message += teamname
message += '\n\n' message += '\n\n'
message += 'The '+teamname+' tag has been removed from all your ' message += 'The ' + teamname + ' tag has been removed from all your '
message += 'workouts on rowsandall.com.\n\n' message += 'workouts on rowsandall.com.\n\n'
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemail_invite_reject(email,name,teamname,managername): def handle_sendemail_invite_reject(email, name, teamname, managername):
fullemail = managername+' <'+email+'>' fullemail = managername + ' <' + email + '>'
subject = 'Your invitation to '+name+' was rejected' subject = 'Your invitation to ' + name + ' was rejected'
message = 'Dear '+managername+',\n\n' message = 'Dear ' + managername + ',\n\n'
message += 'Unfortunately, ' message += 'Unfortunately, '
message += name message += name
message += ' has rejected your invitation to be part of the team ' message += ' has rejected your invitation to be part of the team '
message += teamname message += teamname
@@ -647,33 +694,31 @@ def handle_sendemail_invite_reject(email,name,teamname,managername):
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
@app.task @app.task
def handle_sendemail_invite_accept(email,name,teamname,managername): def handle_sendemail_invite_accept(email, name, teamname, managername):
fullemail = managername+' <'+email+'>' fullemail = managername + ' <' + email + '>'
subject = 'Your invitation to '+name+' was accepted' subject = 'Your invitation to ' + name + ' was accepted'
message = 'Dear '+managername+',\n\n' message = 'Dear ' + managername + ',\n\n'
message += name+' has accepted your invitation to be part of the team '+teamname+'\n\n' message += name + ' has accepted your invitation to be part of the team ' + teamname + '\n\n'
message += "Best Regards, the Rowsandall Team" message += "Best Regards, the Rowsandall Team"
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
'Rowsandall <info@rowsandall.com>', 'Rowsandall <info@rowsandall.com>',
[fullemail]) [fullemail])
res = email.send() res = email.send()
return 1 return 1
# Another simple task for debugging purposes # Another simple task for debugging purposes
def add2(x,y): def add2(x, y):
return x+y return x + y