Merge branch 'release/v3.27'

rowers/datautils.py

@@ -180,8 +180,8 @@ def getmaxwattinterval(tt,ww,i):
             if testres:
                 deltat = 1.0e-3*(t_0-t_1)
                 wmax = w_roll.ix[indexmax]
-                if wmax > 800 or wmax*5.0e-4*deltat > 800.0:
-                    wmax = 0
+                #if wmax > 800 or wmax*5.0e-4*deltat > 800.0:
+                #    wmax = 0
             else:
                 wmax = 0
                 deltat = 0

rowers/tasks.py

@@ -179,6 +179,7 @@ def handle_sendemailcsv(first_name,last_name,email,csvfile):
 @app.task
 def handle_otwsetpower(f1,boattype,weightvalue,
                        first_name,last_name,email,workoutid,ps=[1,1,1,1],
+                       ratio=1.0,
                        debug=False):
     try:
         rowdata = rdata(f1)
@@ -221,7 +222,7 @@ def handle_otwsetpower(f1,boattype,weightvalue,
     update_strokedata(workoutid,rowdata.df,debug=debug)
 
     delta,cpvalues,avgpower = datautils.getsinglecp(rowdata.df)
-    if utils.isbreakthrough(delta,cpvalues,ps[0],ps[1],ps[2],ps[3]):
+    if utils.isbreakthrough(delta,cpvalues,ps[0],ps[1],ps[2],ps[3],ratio):
         handle_sendemail_breakthrough(workoutid,email,
                                       first_name,
                                       last_name)

rowers/views.py

@@ -4404,17 +4404,23 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
 
 	    # do power calculation (asynchronous)
 	    u = request.user
+            r = Rower.objects.get(user=u)
 	    first_name = u.first_name
 	    last_name = u.last_name
 	    emailaddress = u.email
 	    
 	    if settings.DEBUG:	    
 		res = handle_otwsetpower.delay(f1,boattype,weightvalue,
-					       first_name,last_name,emailaddress,id,debug=True)
+					       first_name,last_name,
+                                               emailaddress,id,debug=True,
+                                               ps=[r.p0,r.p1,r.p2,r.p3],
+                                               ratio=r.cpratio)
 	    else:
 		res = queuelow.enqueue(handle_otwsetpower,f1,boattype,
 				    weightvalue,
-				    first_name,last_name,emailaddress,id)
+				       first_name,last_name,emailaddress,id,
+                                       ps=[r.p0,r.p1,r.p2,r.p3],
+                                       ratio=r.cpratio)
 
 	    
 	    successmessage = "Your calculations have been submitted. You will receive an email when they are done."