Temporary hack to see the query for NVD3 vizs

apache · Sep 30, 2015 · 2243623 · 2243623
1 parent 5cf5019
commit 2243623
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 54 deletions.
diff --git a/panoramix/templates/panoramix/datasource.html b/panoramix/templates/panoramix/datasource.html
@@ -133,9 +133,9 @@ <h3>{{ viz.verbose_name }}
         <span class="label label-success">
           {{ "{0:0.4f}".format(results.duration.total_seconds()) }} s
         </span>
+        {% endif %}
         <span class="label label-info btn"
           data-toggle="modal" data-target="#query_modal">query</span>
-        {% endif %}
       </h3>
       <hr/>
       <div class="viz" style="height: 700px;">
@@ -159,7 +159,12 @@ <h3>{{ viz.verbose_name }}
         <h4 class="modal-title" id="myModalLabel">Query</h4>
       </div>
       <div class="modal-body">
-        <pre>{{ '' }}</pre>
+        <pre id="query_container">
+          {% if viz.query %}
+          {% else %}
+            <img width="250" src="{{ url_for('static', filename="penguins.png") }}">
+          {% endif %}
+        </pre>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

diff --git a/panoramix/templates/panoramix/viz_highcharts.html b/panoramix/templates/panoramix/viz_highcharts.html
diff --git a/panoramix/templates/panoramix/viz_nvd3.html b/panoramix/templates/panoramix/viz_nvd3.html
@@ -34,6 +34,7 @@
       loading.show();
       var url = "{{ viz.get_url(json="true")|safe }}";
       $.getJSON(url, function(data){
+        $("#query_container").html(data.query);
         nv.addGraph(function() {
           // chart_type is {{ viz.chart_type }}
           {% if viz.chart_type == 'line' %}
@@ -127,7 +128,7 @@
 
 
           token.select('.chart').append("svg")
-            .datum(data)
+            .datum(data.chart_data)
             .transition().duration(500)
             .call(chart);
 

diff --git a/panoramix/viz.py b/panoramix/viz.py
@@ -397,7 +397,7 @@ def get_df(self):
     def get_json(self):
         df = self.get_df()
         series = df.to_dict('series')
-        datas = []
+        chart_data = []
         for name in df.T.index.tolist():
             ys = series[name]
             if df[name].dtype.kind not in "biufc":
@@ -418,8 +418,13 @@ def get_json(self):
                     {'x': ds, 'y': ys[i]}
                     for i, ds in enumerate(df.timestamp)]
             }
-            datas.append(d)
-        return dumps(datas)
+            chart_data.append(d)
+            data = {
+                'chart_data': chart_data,
+                'query': self.results.query,
+                'duration': self.results.duration,
+            }
+        return dumps(data)
 
 
 class NVD3TimeSeriesBarViz(NVD3TimeSeriesViz):