From b920cbd50e948c54840e8214f55dc77146990ec7 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 6 Jan 2021 18:10:38 +0100
Subject: [PATCH] small fix - bars didn't reload with the red in performance
 chart

---
 rowers/interactiveplots.py | 53 +++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 32 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index f8910f8f..dacd6799 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -182,20 +182,6 @@ def build_goldmedalstandards(workouts,kfitness):
 
     df.sort_values(['workoutdt'],inplace=True)
 
-    #for id, row in df.iterrows():
-    #    d = row['workoutdt']
-    #    dd = d-datetime.timedelta(days=90)
-    #    mask = df['workoutdt']>dd
-    #    mask2 = df['workoutdt']<=d
-    #    df2 = df.where(mask & mask2)
-    #    powertest = df2['goldmedalstandard'].max()
-    #    idx = df2['goldmedalstandard'].argmax()
-    #    durationtest = df2['goldmedalduration'].values[idx]
-    #    dates.append(d)
-    #    testpower.append(powertest)
-    #    testduration.append(durationtest)
-    #    fatigues.append(np.nan)
-    #    fitnesses.append(np.nan)
 
     for w in workouts:
         ids = [ww.id for ww in workouts.filter(date__gte=w.date-datetime.timedelta(days=42),
@@ -1995,25 +1981,27 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
 
     outids = []
 
-    if showtests:
-        workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
-                                          date__lte=enddate,
-                                          workouttype__in=mytypes.rowtypes,
-                                          duplicate=False)
-        dates,testpower,testduration,fatigues,fitnesses,impulses, outids = build_goldmedalstandards(
-            workouts,kfitness
+
+    workouts = Workout.objects.filter(user=user.rower,date__gte=startdate,
+                                      date__lte=enddate,
+                                      workouttype__in=mytypes.rowtypes,
+                                      duplicate=False)
+    dates,testpower,testduration,fatigues,fitnesses,impulses, outids = build_goldmedalstandards(
+        workouts,kfitness
         )
 
-        df = pd.DataFrame({
-            'id': outids,
-            'date':dates,
-            'testpower':testpower,
-            'testduration':testduration,
-            'fatigue':fatigues,
-            'fitness':fitnesses,
-            'impulse':impulses,
-        })
-        df.sort_values(['date'],inplace=True)
+
+    df = pd.DataFrame({
+        'id': outids,
+        'date':dates,
+        'testpower':testpower,
+        'testduration':testduration,
+        'fatigue':fatigues,
+        'fitness':fitnesses,
+        'impulse':impulses,
+    })
+    df.sort_values(['date'],inplace=True)
+    if showtests:
         df['testdup'] = df['testpower'].shift(1)
         df['testpower'] = df.apply(lambda x: newtestpower(x),axis=1)
         df['id'] = df.apply(lambda x: newtestpowerid(x),axis=1)
@@ -2030,7 +2018,8 @@ def performance_chart(user,startdate=None,enddate=None,kfitness=42,kfatigue=7,
         fitnesses = df['fitness'].values.tolist()
         testduration = df['testduration'].values.tolist()
         impulses = df['impulse'].tolist()
-        outids = df['id'].unique()
+
+    outids = df['id'].unique()
 
     fatigues,fitnesses,dates,testpower,testduration,impulses = getfatigues(fatigues,
                                                      fitnesses,