Merge branch 'release/v14.97'

rowers/dataprep.py

@@ -1200,7 +1200,10 @@ def fetchcp_new(rower,workouts):
     if len(data)>1:
         df = pd.concat(data,axis=0)
 
-    df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
+    try:
+        df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
+    except KeyError:
+        pd.Series(),pd.Series(),0,pd.DataFrame()
 
 
     df = df.sort_values(['delta']).reset_index()
@@ -1216,7 +1219,7 @@ def setcp(workout,background=False,recurrance=True):
             return pd.DataFrame(),pd.Series(),pd.Series()
     except KeyError:
         return pd.DataFrame(),pd.Series(),pd.Series()
-    
+
     if background:
         job = myqueue(queuelow,handle_setcp,strokesdf,filename,workout.id)
         return pd.DataFrame({'delta':[],'cp':[]}),pd.Series(),pd.Series()

rowers/interactiveplots.py

@@ -106,7 +106,7 @@ from pandas.core.groupby.groupby import DataError
 
 def newtestpower(x):
     try:
-        if abs(x['testpower'] - x['testdup']) < 1:
+        if abs(x['testpower'] - x['testdup']) < 0.2:
             return np.nan
     except (AttributeError,TypeError):
         return np.nan
@@ -198,7 +198,7 @@ def build_goldmedalstandards(workouts,kfitness):
     #    fitnesses.append(np.nan)
 
     for w in workouts:
-        ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=90),
+        ids = [w.id for w in workouts.filter(date__gte=w.date-datetime.timedelta(days=42),
                                              date__lte=w.date)]
 
 

rowers/views/analysisviews.py

@@ -1652,15 +1652,26 @@ def performancemanager_view(request,userid=0,mode='rower',
             'dofatigue':dofatigue,
             })
 
-    script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
-        theuser,startdate=startdate,enddate=enddate,
-        kfitness = kfitness,
-        kfatigue = kfatigue,
-        metricchoice = metricchoice,
-        doform = doform,
-        dofatigue = dofatigue,
-        showtests = True,
-    )
+    if not is_ajax:
+        script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
+            theuser,startdate=startdate,enddate=enddate,
+            kfitness = kfitness,
+            kfatigue = kfatigue,
+            metricchoice = metricchoice,
+            doform = doform,
+            dofatigue = dofatigue,
+            showtests = True,
+            )
+    else:
+        script, thediv, endfitness, endfatigue, endform, ids = performance_chart(
+            theuser,startdate=startdate,enddate=enddate,
+            kfitness = kfitness,
+            kfatigue = kfatigue,
+            metricchoice = metricchoice,
+            doform = doform,
+            dofatigue = dofatigue,
+            showtests = False,
+            )
 
     ids = pd.Series(ids).dropna().values