bug fix in opaque

rowers/interactiveplots.py

@@ -59,6 +59,7 @@ import datetime
 import math
 import numpy as np
 import pandas as pd
+import holoviews as hv
 from pytz import timezone as tz,utc
 from django.utils.timezone import get_current_timezone
 from django.utils.timezone import activate
@@ -246,13 +247,6 @@ def interactive_boxchart(datadf,fieldname,extratitle=''):
 
     return script,div
 
-try:
-    import holoviews as hv
-    hv.extension('bokeh')
-    renderer = hv.renderer('bokeh')
-except ImportError:
-    pass
-
 def interactive_activitychart(workouts,startdate,enddate,stack='type'):
     
     dates = []
@@ -326,6 +320,7 @@ def interactive_activitychart(workouts,startdate,enddate,stack='type'):
 
     df.sort_values('date_sorting',inplace=True)
 
+    df.to_csv('~/s/data.csv')
     
     p = hv.Bars(df,values='duration',
 #            label = CatAttr(columns=['date'], sort=False),

rowers/templatetags/rowerfilters.py

@@ -88,7 +88,11 @@ def aantalcomments(workout):
 
 @register.filter
 def encode(id):
-    return str(encoder.encode_hex(id))
+    try:
+        result = str(encoder.encode_hex(id))
+    except TypeError:
+        result = ''
+    return result
 
 @register.filter
 def water(workout):

rowsandall_app/urls.py

@@ -87,7 +87,7 @@ urlpatterns += [
     url(r'^twitter\_callback',rowersviews.rower_process_twittercallback),
     url(r'^i18n/', include('django.conf.urls.i18n')),
     url(r'^tz_detect/', include('tz_detect.urls')),
-#    url(r'^jsi18n/', 'django.views.i18n.javascript_catalog',name='jsi18n'),
+    url(r'^jsi18n/', 'django.views.i18n.javascript_catalog',name='jsi18n'),
     ]