From 5709669dc5a538f73fc4c2e7f60d9113833f1d10 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Tue, 27 Feb 2018 15:48:23 +0100
Subject: [PATCH] added name to CP chart

---
 rowers/interactiveplots.py |  3 ++-
 rowers/views.py            | 13 +++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rowers/interactiveplots.py b/rowers/interactiveplots.py
index 6b3ae2e4..45726cbf 100644
--- a/rowers/interactiveplots.py
+++ b/rowers/interactiveplots.py
@@ -1382,7 +1382,7 @@ def interactive_agegroupcpchart(age,normalized=False):
     return script,div
 
 
-def interactive_otwcpchart(powerdf,promember=0):
+def interactive_otwcpchart(powerdf,promember=0,rowername=""):
     powerdf = powerdf[~(powerdf == 0).any(axis=1)]
     # plot tools
     if (promember==1):
@@ -1453,6 +1453,7 @@ def interactive_otwcpchart(powerdf,promember=0):
     plot.y_range = Range1d(0,1.5*max(theavpower))
     plot.x_range = Range1d(1,2*max(thesecs))
     plot.legend.orientation = "vertical"
+    plot.title.text = "Critical Power for "+rowername
 
     hover = plot.select(dict(type=HoverTool))
 
diff --git a/rowers/views.py b/rowers/views.py
index 409ac0d5..298d0e3c 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4149,8 +4149,8 @@ def otwrankings_view(request,theuser=0,
     try:
 	r = Rower.objects.get(user=theuser)
     except Rower.DoesNotExist:
-	allergworkouts = []
-	r=0
+	raise Http404("Rower doesn't exist")
+	
 
 	
     try:
@@ -4230,9 +4230,10 @@ def otwrankings_view(request,theuser=0,
     powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
 
 
+    rowername = rower.user.first_name+" "+rower.user.last_name
     # create interactive plot
     if len(powerdf) !=0 :
-	res = interactive_otwcpchart(powerdf,promember=promember)
+	res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername)
 	script = res[0]
 	div = res[1]
 	p1 = res[2]
@@ -4399,7 +4400,7 @@ def oterankings_view(request,theuser=0,
 	r = Rower.objects.get(user=theuser)
     except Rower.DoesNotExist:
 	allergworkouts = []
-	r=0
+        raise Http404("Rower doesn't exist")
 
 	
     try:
@@ -4483,10 +4484,10 @@ def oterankings_view(request,theuser=0,
     powerdf.sort_values(['Delta','CP'],ascending=[1,0],inplace=True)
     powerdf.drop_duplicates(subset='Delta',keep='first',inplace=True)
 
-
+    rowername = r.user.first_name+" "+r.user.last_name
     # create interactive plot
     if len(powerdf) !=0 :
-	res = interactive_otwcpchart(powerdf,promember=promember)
+	res = interactive_otwcpchart(powerdf,promember=promember,rowername=rowername)
 	script = res[0]
 	div = res[1]
 	p1 = res[2]