callouts on multiflex

rowers/interactiveplots.py

@@ -1237,12 +1237,29 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='',
         )
 
     
-    TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,resize,hover'
+    TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,resize'
+
+    if groupby != 'date':
+        hover = HoverTool(names=['data'],
+                          tooltips = [
+                              (groupby,'@groupval{1.1}')
+                          ])
+    else:
+        hover = HoverTool(names=['data'],
+                          tooltips = [
+                              (groupby,'@groupval')
+                          ])
+
+    hover.mode = 'mouse'
+    TOOLS = [SaveTool(),PanTool(),BoxZoomTool(),WheelZoomTool(),
+             ResetTool(),TapTool(),ResizeTool(),hover]
+    
 
     plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type,
 		  tools=TOOLS,
 		  toolbar_location="above",
 		  toolbar_sticky=False)
+
     # add watermark
     plot.extra_y_ranges = {"watermark": watermarkrange}
     plot.extra_x_ranges = {"watermark": watermarkrange}
@@ -1293,20 +1310,6 @@ def interactive_multiflex(datadf,xparam,yparam,groupby,extratitle='',
 		minutes = ["%M"]
 	    )
 
-    hover = plot.select(dict(type=HoverTool))
-
-    
-    
-    if groupby != 'date':
-        hover.tooltips = OrderedDict([
-	    (groupby,'@groupval{1.1}'),
-	])
-    else:
-        hover.tooltips = OrderedDict([
-            (groupby,'@groupval'),
-        ])
-        
-    hover.mode = 'mouse'
 
     script,div = components(plot)
 

rowers/views.py

@@ -3515,6 +3515,9 @@ def multiflex_view(request,userid=0,
 
         else:
             return HttpResponse("invalid form")
+    else:
+        url = reverse(user_multiflex_select)
+        return HttpResponseRedirect(url)
 
     fieldlist,fielddict = dataprep.getstatsfields()
     fieldlist = [xparam,yparam,groupby,
@@ -3610,9 +3613,7 @@ def multiflex_view(request,userid=0,
                    'userid':userid,
                    'teams':get_my_teams(request.user),
                   })
-    else:
+
-        url = reverse(user_multiflex_select)
-        return HttpResponseRedirect(url)
 
 # Box plots
 @user_passes_test(ispromember,login_url="/",redirect_field_name=None)