Bugfix for time series bar chart

apache · Oct 16, 2015 · 9d61ee2 · 9d61ee2
1 parent 9605962
commit 9d61ee2
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/panoramix/static/widgets/viz_nvd3.js b/panoramix/static/widgets/viz_nvd3.js
@@ -1,5 +1,4 @@
 function viz_nvd3(data_attribute) {
-
   var token_name = data_attribute['token'];
   var json_callback = data_attribute['json_endpoint'];
 
@@ -58,6 +57,15 @@ function viz_nvd3(data_attribute) {
                 chart.y2Axis.tickFormat(d3.format('.3p'));
             }
           }
+        } else if (viz_type === 'bar') {
+          var chart = nv.models.multiBarChart()
+              .showControls(true)
+              .groupSpacing(0.1);
+          chart.xAxis
+            .showMaxMin(false)
+            .tickFormat(function (d) {return tickMultiFormat(UTC(new Date(d))); });
+          chart.showLegend(viz.form_data.show_legend);
+          chart.yAxis.tickFormat(d3.format('.3s'));
 
         } else if (viz_type === 'dist_bar') {
           var chart = nv.models.multiBarChart()
@@ -152,6 +160,7 @@ function viz_nvd3(data_attribute) {
 
 [
   'area',
+  'bar',
   'bubble',
   'column',
   'compare',

diff --git a/panoramix/views.py b/panoramix/views.py
@@ -282,8 +282,11 @@ def datasource(self, datasource_type, datasource_id):
         action = request.args.get('action')
         if action == 'save':
             session = db.session()
+
+            # TODO use form processing form wtforms
             d = request.args.to_dict(flat=False)
             del d['action']
+            del d['previous_viz_type']
             as_list = ('metrics', 'groupby')
             for k in d:
                 v = d.get(k)

diff --git a/panoramix/viz.py b/panoramix/viz.py
@@ -38,6 +38,7 @@ def __init__(self, datasource, form_data):
         self.request = request
         self.viz_type = form_data.get("viz_type")
 
+        # TODO refactor all form related logic out of here and into forms.py
         ff = FormFactory(self)
         form_class = ff.get_form()
         defaults = form_class().data.copy()
@@ -52,10 +53,11 @@ def __init__(self, datasource, form_data):
             for k, v in form.errors.items():
                 if not data.get('json') and not data.get('async'):
                     flash("{}: {}".format(k, " ".join(v)), 'danger')
-        data = {
-            k: form.data[k]
-            for k in form_data.keys()
-            if k in form.data}
+        if previous_viz_type != self.viz_type:
+            data = {
+                k: form.data[k]
+                for k in form_data.keys()
+                if k in form.data}
         defaults.update(data)
         self.form_data = defaults