finding source of unnecessary notifications

rowers/dataprep.py

@@ -425,13 +425,6 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
                 powerperc=powerperc,powerzones=r.powerzones)
     row = rdata(f2,rower=rr)
 
-    isbreakthrough = False
-    if workouttype == 'water':
-        delta,cpvalues,avgpower = datautils.getsinglecp(row.df)
-        res,btvalues = utils.isbreakthrough(delta,cpvalues,r.p0,r.p1,r.p2,r.p3,r.cpratio)
-        if res:
-            isbreakthrough = True
-            res = datautils.updatecp(delta,cpvalues,r)
 
     dtavg = row.df['TimeStamp (sec)'].diff().mean()
 
@@ -590,6 +583,21 @@ def save_workout_database(f2,r,dosmooth=True,workouttype='rower',
 
     w.save()
 
+    isbreakthrough = False
+    if workouttype == 'water':
+        df = getsmallrowdata_db(['power','workoutid','time'],ids=[w.id])
+        # delta,cpvalues,avgpower = datautils.getsinglecp(row.df)
+        thesecs = totaltime
+        maxt = 1.05*thesecs
+        logarr = datautils.getlogarr(maxt)
+        dfgrouped = df.groupby(['workoutid'])
+        delta,cpvalues,avgpower = datautils.getcp(dfgrouped,logarr)
+        
+        res,btvalues = utils.isbreakthrough(delta,cpvalues,r.p0,r.p1,r.p2,r.p3,r.cpratio)
+        if res:
+            isbreakthrough = True
+            res = datautils.updatecp(delta,cpvalues,r)
+
     # submit email task to send email about breakthrough workout
     if isbreakthrough:
         a_messages.info(r.user,'It looks like you have a new breakthrough workout')