From 2099dde846152df47a9560648d10ead7510e291e Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 23 Oct 2019 21:25:47 +0200
Subject: [PATCH] bug fixes

---
 rowers/interactiveplots.py   | 27 ++++++++++-----------------
 rowers/views/statements.py   | 20 +++++++++-----------
 rowers/views/workoutviews.py |  1 -
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 21d48b40..95c5b5ed 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -77,6 +77,7 @@ import rowers.stravastuff as stravastuff
 from rowers.dataprep import rdata
 import rowers.dataprep as dataprep
 import rowers.metrics as metrics
+import rowers.c2stuff as c2stuff
 
 from rowers.metrics import axes,axlabels,yaxminima,yaxmaxima
 
@@ -1815,7 +1816,7 @@ def interactive_agegroupcpchart(age,normalized=False):
     fhpower = []
     
     for distance in distances:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='female',
             distance=distance,
@@ -1829,7 +1830,7 @@ def interactive_agegroupcpchart(age,normalized=False):
         except ZeroDivisionError:
             pass
     for duration in durations:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='female',
             duration=duration,
@@ -1847,7 +1848,7 @@ def interactive_agegroupcpchart(age,normalized=False):
     flpower = []
     
     for distance in distances:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='female',
             distance=distance,
@@ -1861,7 +1862,7 @@ def interactive_agegroupcpchart(age,normalized=False):
         except ZeroDivisionError:
             pass
     for duration in durations:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='female',
             duration=duration,
@@ -1879,7 +1880,7 @@ def interactive_agegroupcpchart(age,normalized=False):
     mlpower = []
     
     for distance in distances:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='male',
             distance=distance,
@@ -1893,7 +1894,7 @@ def interactive_agegroupcpchart(age,normalized=False):
         except ZeroDivisionError:
             pass
     for duration in durations:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='male',
             duration=duration,
@@ -1912,7 +1913,7 @@ def interactive_agegroupcpchart(age,normalized=False):
     mhpower = []
     
     for distance in distances:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='male',
             distance=distance,
@@ -1926,7 +1927,7 @@ def interactive_agegroupcpchart(age,normalized=False):
         except ZeroDivisionError:
             pass
     for duration in durations:
-        worldclasspower = metrics.getagegrouprecord(
+        worldclasspower = c2stuff.getagegrouprecord(
             age,
             sex='male',
             duration=duration,
@@ -4060,15 +4061,7 @@ def thumbnails_set(r,id,favorites):
     columns += [f.yparam2 for f in favorites]
 
     columns += ['time']
-    try:
-        rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True)
-    except:
-        return [
-            {'script':"",
-             'div':"",
-             'notes':""
-             }]
-        
+    rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True)
         
     rowdata.dropna(axis=1,how='all',inplace=True)
 
diff --git a/rowers/views/statements.py b/rowers/views/statements.py
index 15fd34ef..069bd438 100644
--- a/rowers/views/statements.py
+++ b/rowers/views/statements.py
@@ -256,19 +256,17 @@ def getfavorites(r,row):
     if 'speedcoach2' in row.workoutsource:
         workoutsource = 'speedcoach2'
         
-    try:
-        favorites = FavoriteChart.objects.filter(user=r,
-                                                 workouttype__in=matchworkouttypes).order_by("id")
-        favorites2 = FavoriteChart.objects.filter(user=r,
-                                                  workouttype__in=[workoutsource]).order_by("id")
+    favorites = FavoriteChart.objects.filter(user=r,
+                                             workouttype__in=matchworkouttypes).order_by("id")
+    favorites2 = FavoriteChart.objects.filter(user=r,
+                                              workouttype__in=[workoutsource]).order_by("id")
 
-        favorites = favorites | favorites2
 
-            
-        maxfav = len(favorites)-1
-    except:
-        favorites = None
-        maxfav = 0
+
+    favorites = favorites | favorites2
+    
+    maxfav = len(favorites)-1
+
 
     return favorites,maxfav
     
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 0293bfea..f8c0efbf 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -2767,7 +2767,6 @@ def workout_workflow_view(request,id):
     aantalcomments = len(comments)
 
     favorites,maxfav = getfavorites(r,row)
-    
 
     charts = get_call()