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

Merge branch 'feature/autoqueue' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2017-10-31 14:54:41 +01:00
parent 092d24d9b2 0ecd8c588d
commit 41f348a70d
5 changed files with 151 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rowers/dataprepnodjango.py
+1 -2
View File
@@ -472,7 +472,7 @@ def delete_strokedata(id,debug=False):
engine.dispose() engine.dispose()
def update_strokedata(id,df,debug=False): def update_strokedata(id,df,debug=False):
delete_strokedata(id) delete_strokedata(id,debug=debug)
if debug: if debug:
print "updating ",id print "updating ",id
rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True, rowdata = dataprep(df,id=id,bands=True,barchart=True,otwpower=True,
@@ -935,7 +935,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
# write data if id given # write data if id given
if id != 0: if id != 0:
data['workoutid'] = id
if debug: if debug:
engine = create_engine(database_url_debug, echo=False) engine = create_engine(database_url_debug, echo=False)
else: else:
rowers/tasks.py
+52 -28
View File
@@ -30,7 +30,7 @@ from rowers.dataprepnodjango import (
) )
from django.core.mail import send_mail, EmailMessage from django.core.mail import send_mail, EmailMessage
from django.db.utils import OperationalError
import datautils import datautils
import utils import utils
@@ -50,7 +50,7 @@ def handle_new_workout_from_file(r, f2,
workouttype='rower', workouttype='rower',
title='Workout', title='Workout',
makeprivate=False, makeprivate=False,
notes=''): notes='',debug=False):
return new_workout_from_file(r, f2, workouttype, return new_workout_from_file(r, f2, workouttype,
title, makeprivate, notes) title, makeprivate, notes)
@@ -92,7 +92,8 @@ def handle_updatedps(useremail, workoutids, debug=False):
@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(),
debug=False):
# send email with attachment # send email with attachment
subject = "A breakthrough workout on rowsandall.com" subject = "A breakthrough workout on rowsandall.com"
@@ -151,7 +152,8 @@ def handle_sendemail_breakthrough(workoutid, useremail,
@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(),
debug=False):
# 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"
@@ -183,7 +185,8 @@ 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,
debug=False):
# send email with attachment # send email with attachment
fullemail = 'roosendaalsander@gmail.com' fullemail = 'roosendaalsander@gmail.com'
@@ -215,7 +218,8 @@ def handle_sendemail_unrecognized(unrecognizedfile, useremail):
# send email to owner when an unrecognized file is uploaded # send email to owner when an unrecognized file is uploaded
@app.task @app.task
def handle_sendemail_unrecognizedowner(useremail, userfirstname): def handle_sendemail_unrecognizedowner(useremail, userfirstname,
debug=False):
# send email with attachment # send email with attachment
fullemail = useremail fullemail = useremail
@@ -246,7 +250,7 @@ def handle_sendemail_unrecognizedowner(useremail, userfirstname):
# 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,debug=False):
# send email with attachment # send email with attachment
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
@@ -269,7 +273,7 @@ def handle_sendemailtcx(first_name, last_name, email, tcxfile):
@app.task @app.task
def handle_zip_file(emailfrom, subject, file): def handle_zip_file(emailfrom, subject, file,debug=False):
message = "... zip processing ... " message = "... zip processing ... "
email = EmailMessage(subject, message, email = EmailMessage(subject, message,
emailfrom, emailfrom,
@@ -283,7 +287,7 @@ def handle_zip_file(emailfrom, subject, file):
@app.task @app.task
def handle_sendemailcsv(first_name, last_name, email, csvfile): def handle_sendemailcsv(first_name, last_name, email, csvfile,debug=False):
# send email with attachment # send email with attachment
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
@@ -365,7 +369,9 @@ def handle_otwsetpower(f1, boattype, weightvalue,
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],
debug=debug)
thesecs = totaltime thesecs = totaltime
maxt = 1.05 * thesecs maxt = 1.05 * thesecs
logarr = datautils.getlogarr(maxt) logarr = datautils.getlogarr(maxt)
@@ -376,9 +382,13 @@ def handle_otwsetpower(f1, boattype, weightvalue,
res, btvalues, res2 = utils.isbreakthrough( res, btvalues, res2 = utils.isbreakthrough(
delta, cpvalues, ps[0], ps[1], ps[2], ps[3], ratio) delta, cpvalues, ps[0], ps[1], ps[2], ps[3], ratio)
if res: if res:
handle_sendemail_breakthrough(workoutid, email, try:
first_name, handle_sendemail_breakthrough(
last_name, btvalues=btvalues.to_json()) workoutid, email,
first_name,
last_name, btvalues=btvalues.to_json())
except:
pass
# send email # send email
fullemail = first_name + " " + last_name + " " + "<" + email + ">" fullemail = first_name + " " + last_name + " " + "<" + email + ">"
@@ -394,9 +404,12 @@ def handle_otwsetpower(f1, boattype, weightvalue,
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, try:
'Rowsandall Physics Department <info@rowsandall.com>', send_mail(subject, message,
[fullemail]) 'Rowsandall Physics Department <info@rowsandall.com>',
[fullemail])
except:
return 0
return 1 return 1
@@ -440,7 +453,8 @@ def handle_updatecp(rower_id,workoutids,debug=False,table='cpdata'):
return 1 return 1
@app.task @app.task
def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename): def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename,
debug=False):
hrmax = hrdata['hrmax'] hrmax = hrdata['hrmax']
hrut2 = hrdata['hrut2'] hrut2 = hrdata['hrut2']
@@ -512,7 +526,8 @@ def handle_makeplot(f1, f2, t, hrdata, plotnr, imagename):
@app.task @app.task
def handle_sendemail_invite(email, name, code, teamname, manager): def handle_sendemail_invite(email, name, code, teamname, manager,
debug=False):
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'
@@ -553,7 +568,8 @@ def handle_sendemailnewresponse(first_name, last_name,
commenter_first_name, commenter_first_name,
commenter_last_name, commenter_last_name,
comment, comment,
workoutname, workoutid, commentid): workoutname, workoutid, commentid,
debug=False):
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'
@@ -587,7 +603,8 @@ def handle_sendemailnewcomment(first_name,
commenter_first_name, commenter_first_name,
commenter_last_name, commenter_last_name,
comment, workoutname, comment, workoutname,
workoutid): workoutid,
debug=False):
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'
@@ -610,7 +627,8 @@ 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,
debug=False):
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'
@@ -634,7 +652,8 @@ def handle_sendemail_request(email, name, code, teamname, requestor, id):
@app.task @app.task
def handle_sendemail_request_accept(email, name, teamname, managername): def handle_sendemail_request_accept(email, name, teamname, managername,
debug=False):
fullemail = name + ' <' + email + '>' fullemail = name + ' <' + email + '>'
subject = 'Welcome to ' + teamname subject = 'Welcome to ' + teamname
message = 'Dear ' + name + ',\n\n' message = 'Dear ' + name + ',\n\n'
@@ -654,7 +673,8 @@ def handle_sendemail_request_accept(email, name, teamname, managername):
@app.task @app.task
def handle_sendemail_request_reject(email, name, teamname, managername): def handle_sendemail_request_reject(email, name, teamname, managername,
debug=False):
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'
@@ -675,7 +695,8 @@ def handle_sendemail_request_reject(email, name, teamname, managername):
@app.task @app.task
def handle_sendemail_member_dropped(email, name, teamname, managername): def handle_sendemail_member_dropped(email, name, teamname, managername,
debug=False):
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'
@@ -696,7 +717,8 @@ def handle_sendemail_member_dropped(email, name, teamname, managername):
@app.task @app.task
def handle_sendemail_team_removed(email, name, teamname, managername): def handle_sendemail_team_removed(email, name, teamname, managername,
debug=False):
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'
@@ -718,7 +740,8 @@ def handle_sendemail_team_removed(email, name, teamname, managername):
@app.task @app.task
def handle_sendemail_invite_reject(email, name, teamname, managername): def handle_sendemail_invite_reject(email, name, teamname, managername,
debug=False):
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'
@@ -739,7 +762,8 @@ def handle_sendemail_invite_reject(email, name, teamname, managername):
@app.task @app.task
def handle_sendemail_invite_accept(email, name, teamname, managername): def handle_sendemail_invite_accept(email, name, teamname, managername,
debug=False):
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'
@@ -756,5 +780,5 @@ def handle_sendemail_invite_accept(email, name, teamname, managername):
# Another simple task for debugging purposes # Another simple task for debugging purposes
def add2(x, y): def add2(x, y,debug=False):
return x + y return x + y
rowers/teams.py
+24 -42
View File
@@ -9,6 +9,7 @@ from django.db import IntegrityError
import uuid import uuid
from django.conf import settings from django.conf import settings
from utils import myqueue
import django_rq import django_rq
queue = django_rq.get_queue('default') queue = django_rq.get_queue('default')
@@ -289,11 +290,9 @@ def send_invite_email(id):
teamname = invitation.team.name teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemail_invite.delay(email,name,code,teamname,manager) handle_sendemail_invite,
else: email,name,code,teamname,manager)
res = queuehigh.enqueue(handle_sendemail_invite,
email,name,code,teamname,manager)
return (1,'Invitation email sent') return (1,'Invitation email sent')
@@ -303,11 +302,9 @@ def send_team_delete_mail(t,rower):
email = u.email email = u.email
name = u.first_name+' '+u.last_name name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name manager = t.manager.first_name+' '+t.manager.last_name
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemail_team_removed.delay(email,name,teamname,manager) handle_sendemail_team_removed,
else: email,name,teamname,manager)
res = queuehigh.enqueue(handle_sendemail_team_removed,
email,name,teamname,manager)
return (1,'Team delete email sent') return (1,'Team delete email sent')
@@ -319,11 +316,8 @@ def send_email_member_dropped(teamid,rower):
name = u.first_name+' '+u.last_name name = u.first_name+' '+u.last_name
manager = t.manager.first_name+' '+t.manager.last_name manager = t.manager.first_name+' '+t.manager.last_name
if settings.DEBUG: res = myqueue(queuehigh,handle_sendemail_member_dropped,
res = handle_sendemail_member_dropped.delay(email,name,teamname,manager) email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_member_dropped,
email,name,teamname,manager)
return (1,'Member dropped email sent') return (1,'Member dropped email sent')
@@ -334,12 +328,9 @@ def send_request_accept_email(rekwest):
teamname = rekwest.team.name teamname = rekwest.team.name
name = rekwest.user.first_name+' '+rekwest.user.last_name name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
res = myqueue(queuehigh,
if settings.DEBUG: handle_sendemail_request_accept,
res = handle_sendemail_request_accept.delay(email,name,teamname,manager) email,name,teamname,manager)
else:
res = queuehigh.enqueue(handle_sendemail_request_accept,
email,name,teamname,manager)
return (1,'Invitation email sent') return (1,'Invitation email sent')
@@ -351,11 +342,9 @@ def send_request_reject_email(rekwest):
name = rekwest.user.first_name+' '+rekwest.user.last_name name = rekwest.user.first_name+' '+rekwest.user.last_name
manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name manager = rekwest.team.manager.first_name+' '+rekwest.team.manager.last_name
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemail_request_reject.delay(email,name,teamname,manager) handle_sendemail_request_reject,
else: email,name,teamname,manager)
res = queuehigh.enqueue(handle_sendemail_request_reject,
email,name,teamname,manager)
return (1,'Invitation email sent') return (1,'Invitation email sent')
@@ -371,11 +360,9 @@ def send_invite_reject_email(invitation):
teamname = invitation.team.name teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemail_invite_reject.delay(email,name,teamname,manager) handle_sendemail_invite_reject,
else: email,name,teamname,manager)
res = queuehigh.enqueue(handle_sendemail_invite_reject,
email,name,teamname,manager)
return (1,'Invitation email sent') return (1,'Invitation email sent')
@@ -391,11 +378,9 @@ def send_invite_accept_email(invitation):
teamname = invitation.team.name teamname = invitation.team.name
manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name manager = invitation.team.manager.first_name+' '+invitation.team.manager.last_name
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemail_invite_accept.delay(email,name,teamname,manager) handle_sendemail_invite_accept,
else: email,name,teamname,manager)
res = queuehigh.enqueue(handle_sendemail_invite_accept,
email,name,teamname,manager)
return (1,'Invitation email sent') return (1,'Invitation email sent')
@@ -409,12 +394,9 @@ def send_request_email(rekwest):
teamname = rekwest.team.name teamname = rekwest.team.name
requestor = rekwest.user.first_name+' '+rekwest.user.last_name requestor = rekwest.user.first_name+' '+rekwest.user.last_name
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemail_request.delay(email,name,code,teamname, handle_sendemail_request,
requestor,id) email,name,code,teamname,requestor,id)
else:
res = queuehigh.enqueue(handle_sendemail_request,
email,name,code,teamname,requestor,id)
return (1,'Invitation email sent') return (1,'Invitation email sent')
rowers/utils.py
+14 -1
View File
@@ -2,6 +2,8 @@ import math
import numpy as np import numpy as np
import pandas as pd import pandas as pd
import colorsys import colorsys
from django.conf import settings
lbstoN = 4.44822 lbstoN = 4.44822
@@ -100,7 +102,7 @@ def range_to_color_hex(groupcols,palette='monochrome_blue'):
try: try:
plt = palettes[palette] plt = palettes[palette]
except KeyErro: except KeyError:
plt = palettes['monochrome_blue'] plt = palettes['monochrome_blue']
rgb = [colorsys.hsv_to_rgb((plt[0]+plt[1]*x)/360., rgb = [colorsys.hsv_to_rgb((plt[0]+plt[1]*x)/360.,
@@ -214,3 +216,14 @@ def isbreakthrough(delta,cpvalues,p0,p1,p2,p3,ratio):
return res>1,btdf,res2>1 return res>1,btdf,res2>1
def myqueue(queue,function,*args,**kwargs):
if settings.DEBUG:
kwargs['debug'] = True
print kwargs
job = function.delay(*args,**kwargs)
else:
job = queue.enqueue(function,*args,**kwargs)
return job
rowers/views.py
+57 -123
View File
@@ -188,7 +188,7 @@ def remove_asynctask(request,id):
request.session['async_tasks'] = newtasks request.session['async_tasks'] = newtasks
def get_job_result(jobid): def get_job_result(jobid):
if settings.DEBUG: if settings.EBUG:
result = celery_result.AsyncResult(jobid).result result = celery_result.AsyncResult(jobid).result
else: else:
running_job_ids = rq_registry.get_job_ids() running_job_ids = rq_registry.get_job_ids()
@@ -476,7 +476,7 @@ def splitstdata(lijst):
from utils import ( from utils import (
geo_distance,serialize_list,deserialize_list,uniqify, geo_distance,serialize_list,deserialize_list,uniqify,
str2bool,range_to_color_hex,absolute str2bool,range_to_color_hex,absolute,myqueue
) )
import datautils import datautils
@@ -1298,25 +1298,21 @@ def workout_tcxemail_view(request,id=0):
except Workout.DoesNotExist: except Workout.DoesNotExist:
raise Http404("Workout doesn't exist") raise Http404("Workout doesn't exist")
if (checkworkoutuser(request.user,w)): if (checkworkoutuser(request.user,w)):
try: tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w,dozip=False)
tcxfile,tcxmessg = stravastuff.createstravaworkoutdata(w,dozip=False) if tcxfile == 0:
if tcxfile == 0: message = "Something went wrong (TCX export) "+tcxmessg
message = "Something went wrong (TCX export) "+tcxmessg messages.error(request,message)
messages.error(request,message) url = reverse(workout_export_view,
url = reverse(workout_export_view, kwargs = {
kwargs = { 'id':str(w.id),
'id':str(w.id), })
}) return HttpResponseRedirect(url)
return HttpResponseRedirect(url) if tcxfile:
if settings.DEBUG and tcxfile: res = myqueue(queuehigh,handle_sendemailtcx,
res = handle_sendemailtcx.delay(r.user.first_name, r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email,tcxfile) r.user.email,
tcxfile)
elif tcxfile:
res = queuehigh.enqueue(handle_sendemailtcx,r.user.first_name,
r.user.last_name,
r.user.email,tcxfile)
successmessage = "The TCX file was sent to you per email" successmessage = "The TCX file was sent to you per email"
messages.info(request,successmessage) messages.info(request,successmessage)
@@ -1324,19 +1320,6 @@ def workout_tcxemail_view(request,id=0):
kwargs = { kwargs = {
'id':str(w.id), 'id':str(w.id),
}) })
except:
successmessage = ""
message = "Something went wrong (TCX export) "+str(sys.exc_info()[0])
with open("media/c2errors.log","a") as errorlog:
errorstring = str(sys.exc_info()[0])
timestr = strftime("%Y%m%d-%H%M%S")
errorlog.write(timestr+errorstring+"\r\n")
messages.error(request,message)
url = reverse(workout_export_view,
kwargs = {
'id':str(w.id),
})
response = HttpResponseRedirect(url) response = HttpResponseRedirect(url)
@@ -1366,15 +1349,11 @@ def workout_gpxemail_view(request,id=0):
row = rdata(filename) row = rdata(filename)
gpxfilename = filename[:-4]+'.gpx' gpxfilename = filename[:-4]+'.gpx'
row.exporttogpx(gpxfilename) row.exporttogpx(gpxfilename)
if settings.DEBUG: res = myqueue(queuehigh,handle_sendemailtcx,
res = handle_sendemailtcx.delay(r.user.first_name, r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email,gpxfilename) r.user.email,gpxfilename)
else:
res = queuehigh.enqueue(handle_sendemailtcx,r.user.first_name,
r.user.last_name,
r.user.email,gpxfilename)
successmessage = "The GPX file was sent to you per email" successmessage = "The GPX file was sent to you per email"
messages.info(request,successmessage) messages.info(request,successmessage)
@@ -1407,15 +1386,9 @@ def workout_csvemail_view(request,id=0):
raise Http404("Workout doesn't exist") raise Http404("Workout doesn't exist")
if (checkworkoutuser(request.user,w)): if (checkworkoutuser(request.user,w)):
csvfile = w.csvfilename csvfile = w.csvfilename
if settings.DEBUG: res = myqueue(queuehigh,handle_sendemailcsv,r.user.first_name,
res = handle_sendemailcsv.delay(r.user.first_name, r.user.last_name,
r.user.last_name, r.user.email,csvfile)
r.user.email,csvfile)
else:
res = queuehigh.enqueue(handle_sendemailcsv,r.user.first_name,
r.user.last_name,
r.user.email,csvfile)
successmessage = "The CSV file was sent to you per email" successmessage = "The CSV file was sent to you per email"
messages.info(request,successmessage) messages.info(request,successmessage)
@@ -1447,19 +1420,12 @@ def workout_csvtoadmin_view(request,id=0):
raise Http404("Workout doesn't exist") raise Http404("Workout doesn't exist")
csvfile = w.csvfilename csvfile = w.csvfilename
if settings.DEBUG: res = myqueue(queuehigh,
res = handle_sendemailcsv.delay( handle_sendemailcsv,
'Sander', 'Sander',
'Roosendaal', 'Roosendaal',
'roosendaalsander@gmail.com',csvfile) 'roosendaalsander@gmail.com',
csvfile)
else:
res = queuehigh.enqueue(
handle_sendemailcsv,
'Sander',
'Roosendaal',
'roosendaalsander@gmail.com',
csvfile)
successmessage = "The CSV file was sent to the site admin per email" successmessage = "The CSV file was sent to the site admin per email"
messages.info(request,successmessage) messages.info(request,successmessage)
@@ -2579,11 +2545,7 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
@login_required() @login_required()
def workout_test_task_view(request,id=0): def workout_test_task_view(request,id=0):
row = Workout.objects.get(id=id) row = Workout.objects.get(id=id)
if settings.DEBUG: res = myqueue(queuehigh,addcomment2,request.user.id,row.id)
res = addcomment2.delay(request.user.id,row.id)
else:
#res = queuehigh.enqueue(addcomment2,request.user.id,row.id)
res = queuehigh.enqueue(addcomment2,request.user.id,row.id)
url = reverse(workout_edit_view, url = reverse(workout_edit_view,
@@ -5663,18 +5625,12 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
last_name = u.last_name last_name = u.last_name
emailaddress = u.email emailaddress = u.email
if settings.DEBUG: job = myqueue(queuelow,
job = handle_otwsetpower.delay(f1,boattype,weightvalue, handle_otwsetpower,f1,boattype,
first_name,last_name, weightvalue,
emailaddress,id,debug=True, first_name,last_name,emailaddress,id,
ps=[r.p0,r.p1,r.p2,r.p3], ps=[r.p0,r.p1,r.p2,r.p3],
ratio=r.cpratio) ratio=r.cpratio)
else:
job = queuelow.enqueue(handle_otwsetpower,f1,boattype,
weightvalue,
first_name,last_name,emailaddress,id,
ps=[r.p0,r.p1,r.p2,r.p3],
ratio=r.cpratio)
try: try:
request.session['async_tasks'] += [(job.id,'otwsetpower')] request.session['async_tasks'] += [(job.id,'otwsetpower')]
@@ -6964,48 +6920,29 @@ def workout_comment_view(request,id=0):
if request.user != r.user: if request.user != r.user:
a_messages.info(r.user,message) a_messages.info(r.user,message)
if settings.DEBUG and request.user != r.user: res = myqueue(queuehigh,
res = handle_sendemailnewcomment.delay(r.user.first_name, handle_sendemailnewcomment,r.user.first_name,
r.user.last_name, r.user.last_name,
r.user.email, r.user.email,
request.user.first_name, request.user.first_name,
request.user.last_name, request.user.last_name,
comment,w.name, comment,w.name,w.id)
w.id)
elif request.user != r.user:
res = queuehigh.enqueue(handle_sendemailnewcomment,r.user.first_name,
r.user.last_name,
r.user.email,
request.user.first_name,
request.user.last_name,
comment,w.name,w.id)
commenters = {oc.user for oc in comments if oc.notification} commenters = {oc.user for oc in comments if oc.notification}
for u in commenters: for u in commenters:
a_messages.info(u,message) a_messages.info(u,message)
if settings.DEBUG and u != request.user and u != r.user: if u != request.user and u != r.user:
res = handle_sendemailnewresponse.delay(u.first_name, res = myqueue(queuelow,
u.last_name, handle_sendemailnewresponse,
u.email, u.first_name,
request.user.first_name, u.last_name,
request.user.last_name, u.email,
comment, request.user.first_name,
w.name, request.user.last_name,
w.id, comment,
c.id) w.name,
elif u != request.user and u != r.user: w.id,
res = queuelow.enqueue(handle_sendemailnewresponse, c.id)
u.first_name,
u.last_name,
u.email,
request.user.first_name,
request.user.last_name,
comment,
w.name,
w.id,
c.id)
url = reverse(workout_comment_view,kwargs = { url = reverse(workout_comment_view,kwargs = {
'id':id}) 'id':id})
@@ -9654,10 +9591,7 @@ def rower_calcdps_view(request):
r = getrower(request.user) r = getrower(request.user)
ws = [(w.id,w.csvfilename) for w in Workout.objects.filter(user=r)] ws = [(w.id,w.csvfilename) for w in Workout.objects.filter(user=r)]
if settings.DEBUG: res = myqueue(queue,handle_updatedps,r.user.email,ws,debug=False)
res = handle_updatedps.delay(r.user.email,ws,debug=True)
else:
queue.enqueue(handle_updatedps,r.user.email,ws,debug=False)
messages.info(request,"Your workouts are being updated in the background. You will receive email when this is done.") messages.info(request,"Your workouts are being updated in the background. You will receive email when this is done.")