monitoring ftp

rowers/views/statements.py

@@ -242,6 +242,7 @@ from rowers.rows import handle_uploaded_file, handle_uploaded_image
 from rowers.plannedsessions import *
 from rowers.tasks import handle_makeplot, handle_otwsetpower, handle_sendemailtcx, handle_sendemailcsv
 from rowers.tasks import (
+    handle_sendemail_newftp,
     instroke_static,
     fetch_rojabo_session,
     handle_sendemail_unrecognized, handle_sendemailnewcomment,

rowers/views/userviews.py

@@ -650,14 +650,13 @@ def rower_prefs_view(request, userid=0, message=""):
             successmessage = "Your Heart Rate data were changed"
             messages.info(request, successmessage)
     elif request.method == 'POST' and "ftp" in request.POST:
-        powerform = RowerPowerForm(request.POST)
+        powerform = RowerPowerForm(request.POST, instance=r)
         if powerform.is_valid():
+            powerform.save(commit=True)
             cd = powerform.cleaned_data
             hrftp = cd['hrftp']
             if hrftp == 0:  # pragma: no cover
                 hrftp = int((r.an+r.tr)/2.)
-            ftp = cd['ftp']
-            otwslack = cd['otwslack']
             cogganzones = cd['cogganzones']
 
             powerfrac = 100*np.array([r.pw_ut2,
@@ -674,7 +673,6 @@ def rower_prefs_view(request, userid=0, message=""):
                           'Anaerobic']
                 r.powerzones = powerzones
 
-            r.ftp = max(min(ftp, 650), 50)
             ut2, ut1, at, tr, an = (r.ftp*powerfrac/100.).astype(int)
             r.pw_ut2 = ut2
             r.pw_ut1 = ut1
@@ -682,7 +680,6 @@ def rower_prefs_view(request, userid=0, message=""):
             r.pw_tr = tr
             r.pw_an = an
             r.hrftp = hrftp
-            r.otwslack = max(min(otwslack, 50), 0)
             r.save()
             powerzonesform = RowerPowerZonesForm(instance=r)