Callable fields, Morris preUnits, postUnits & ykeys, DjangoJSONEncoder

graphos/encoders.py

@@ -0,0 +1,5 @@
+from django.core.serializers.json import DjangoJSONEncoder
+
+
+class GraphosEncoder(DjangoJSONEncoder):
+    pass

graphos/renderers/base.py

@@ -3,19 +3,22 @@
 from django.template.loader import render_to_string
 from ..exceptions import GraphosException
 from ..utils import DEFAULT_HEIGHT, DEFAULT_WIDTH, get_random_string
+from ..encoders import GraphosEncoder
 
 
 class BaseChart(object):
 
     def __init__(self, data_source, html_id=None,
                  width=None, height=None,
-                 options=None, *args, **kwargs):
+                 options=None, encoder=GraphosEncoder, 
+                 *args, **kwargs):
         self.data_source = data_source
         self.html_id = html_id or get_random_string()
         self.height = height or DEFAULT_HEIGHT
         self.width = width or DEFAULT_WIDTH
         self.options = options or {}
         self.header = data_source.get_header()
+        self.encoder = encoder
         self.context_data = kwargs
 
     def get_data(self):
@@ -31,7 +34,7 @@ def get_options(self):
         return options
 
     def get_options_json(self):
-        return json.dumps(self.get_options())
+        return json.dumps(self.get_options(), cls=self.encoder)
 
     def get_template(self):
         raise GraphosException("Not Implemented")

graphos/renderers/flot.py

@@ -28,7 +28,7 @@ def get_series_objects(self):
         return series_objects
 
     def get_series_objects_json(self):
-        return json.dumps(self.get_series_objects())
+        return json.dumps(self.get_series_objects(), cls=self.encoder)
 
     def get_options(self):
         options = get_default_options()

graphos/renderers/highcharts.py

@@ -15,10 +15,10 @@ def get_series(self):
         serieses = []
         for i, name in enumerate(series_names):
             serieses.append({"name": name, "data": column(data, i+1)[1:]})
-        return json.dumps(serieses)
+        return json.dumps(serieses, cls=self.encoder)
 
     def get_categories(self):
-        return json.dumps(column(self.get_data(), 0)[1:])
+        return json.dumps(column(self.get_data(), 0)[1:], cls=self.encoder)
 
     def get_x_axis_title(self):
         return self.get_data()[0][0]

graphos/renderers/morris.py

@@ -11,13 +11,16 @@ def get_data_json(self):
         for row in data_only:
             rows.append(dict(zip(header, row)))
 
-        return json.dumps(rows)
+        return json.dumps(rows, cls=self.encoder)
 
     def get_category_key(self):
         return self.data_source.get_header()[0]
 
     def get_y_keys(self):
-        return json.dumps(self.data_source.get_header()[1:])
+        try:
+            return json.dumps(self.options['ykeys'], cls=self.encoder)
+        except KeyError:
+            return json.dumps(self.data_source.get_header()[1:], cls=self.encoder)
 
 
     def get_template(self):
@@ -37,10 +40,10 @@ def chart_type(self):
 class DonutChart(BaseMorrisChart):
     def get_data_json(self):
         data_only = self.get_data()[1:]
-        return json.dumps([{"label": el[0], "value": el[1]} for el in data_only])
+        return json.dumps([{"label": el[0], "value": el[1]} for el in data_only], cls=self.encoder)
 
     def chart_type(self):
         return "Donut"
 
     def get_template(self):
-        return "graphos/morris/donut_chart.html"
+        return "graphos/morris/donut_chart.html"

graphos/renderers/yui.py

@@ -12,7 +12,7 @@ def get_data_json(self):
         for row in data_only:
             rows.append(dict(zip(header, row)))
 
-        return json.dumps(rows)
+        return json.dumps(rows, cls=self.encoder)
 
     def get_category_key(self):
         return self.data_source.get_header()[0]
@@ -34,4 +34,4 @@ def get_template(self):
 
 class PieChart(BaseYuiChart):
     def get_template(self):
-        return "graphos/yui/pie_chart.html"
+        return "graphos/yui/pie_chart.html"

graphos/sources/model.py

@@ -5,7 +5,8 @@
 def get_field_values(row, fields):
     data = []
     for field in fields:
-        data.append(getattr(row, field))
+        value = getattr(row, field)
+        data.append(value if not callable(value) else value())
     return data
 
 

graphos/templates/graphos/morris/chart.html

@@ -12,6 +12,9 @@
   ykeys: {{ chart.get_y_keys|safe }},
   // Labels for the ykeys -- will be displayed when you hover over the
   // chart.
-  labels: {{ chart.get_y_keys|safe }}
+  labels: {{ chart.get_y_keys|safe }},
+  // post units
+  postUnits: '{{ chart.get_options.postUnits|safe }}',
+  preUnits: '{{ chart.get_options.preUnits|safe }}',
 });
-</script>
+</script>