diff --git a/panoramix/highchart.py b/panoramix/highchart.py index 295d80537920e..9f3cf2d48d186 100644 --- a/panoramix/highchart.py +++ b/panoramix/highchart.py @@ -16,7 +16,6 @@ def json(self): .replace("\n", " ") ) - @property def javascript_cmd(self): js = self.json diff --git a/panoramix/models.py b/panoramix/models.py index 575764dc79266..20197e90cefbe 100644 --- a/panoramix/models.py +++ b/panoramix/models.py @@ -33,15 +33,17 @@ class Slice(Model, AuditMixin): __tablename__ = 'slices' id = Column(Integer, primary_key=True) slice_name = Column(String(250)) - datasource_id = Column(Integer, ForeignKey('datasources.id')) + druid_datasource_id = Column(Integer, ForeignKey('datasources.id')) table_id = Column(Integer, ForeignKey('tables.id')) datasource_type = Column(String(200)) datasource_name = Column(String(2000)) viz_type = Column(String(250)) params = Column(Text) - table = relationship('Table', backref='slices') - druid_datasource = relationship('Datasource', backref='slices') + table = relationship( + 'Table', foreign_keys=[table_id], backref='slices') + druid_datasource = relationship( + 'Datasource', foreign_keys=[druid_datasource_id], backref='slices') def __repr__(self): return self.slice_name @@ -50,6 +52,11 @@ def __repr__(self): def datasource(self): return self.table or self.druid_datasource + @property + def datasource_id(self): + datasource = self.datasource + return datasource.id if datasource else None + @property def slice_link(self): d = json.loads(self.params) @@ -69,6 +76,9 @@ def css_files(self): from panoramix.viz import viz_types return viz_types[self.viz_type].css_files + def get_viz(self): + pass + dashboard_slices = Table('dashboard_slices', Model.metadata, Column('id', Integer, primary_key=True), diff --git a/panoramix/templates/panoramix/dashboard.html b/panoramix/templates/panoramix/dashboard.html index d56ea6f8c0d1f..23fc55519a3ba 100644 --- a/panoramix/templates/panoramix/dashboard.html +++ b/panoramix/templates/panoramix/dashboard.html @@ -73,7 +73,7 @@
{{ slice.slice_name }}
widget_base_dimensions: [150, 150], resize: {enabled: true} }); - var url = "/panoramix/table/2/?flt_col_0=gender&datasource_id=2&flt_op_0=in&viz_type=pie&since=50%20years%20ago&until=now&metrics=total&limit=10&granularity=one%20day&datasource_name=baby_names&slice_name=Pie&where=&groupby=name&flt_eq_0=&datasource_type=table&standalone=true&skip_libs=true"; + var url = "/panoramix/table/2/?flt_col_0=gender&rolling_periods=&datasource_id=2&flt_op_0=in&slice_name=Super%20Slice&viz_type=line&since=50%20years%20ago&groupby=name&metrics=total&limit=25&flt_eq_0=&granularity=one%20day&datasource_name=baby_names&where=&until=now&rolling_type=mean&datasource_type=table&skip_libs=true&standalone=true"; $.ajax({ url: url, success: function(result){ @@ -81,7 +81,7 @@
{{ slice.slice_name }}
}, async: true, }); - var url = "/panoramix/table/2/?flt_col_0=gender&rolling_periods=&datasource_id=2&flt_op_0=in&slice_name=Super%20Slice&viz_type=line&since=50%20years%20ago&groupby=name&metrics=total&limit=25&flt_eq_0=&granularity=one%20day&datasource_name=baby_names&where=&until=now&rolling_type=mean&datasource_type=table&standalone=true&skip_libs=true"; + var url = "/panoramix/table/2/?flt_col_0=gender&datasource_id=2&flt_op_0=in&viz_type=pie&since=50%20years%20ago&until=now&metrics=total&limit=10&granularity=one%20day&datasource_name=baby_names&slice_name=Pie&where=&groupby=name&flt_eq_0=&datasource_type=table&skip_libs=true&standalone=true"; $.ajax({ url: url, success: function(result){ diff --git a/panoramix/templates/panoramix/viz_highcharts.html b/panoramix/templates/panoramix/viz_highcharts.html index 25a78f4e067ba..140e2e25cfbe2 100644 --- a/panoramix/templates/panoramix/viz_highcharts.html +++ b/panoramix/templates/panoramix/viz_highcharts.html @@ -1,8 +1,7 @@ {% macro viz_html(viz) %} -
- - -
+
+ +
{% endmacro %} {% macro viz_js(viz) %} @@ -24,10 +23,11 @@ console.log(url); $.getJSON(url, function(data){ console.log(data); - new Highcharts.{{ viz.chart_call }}(data); + $("#{{ viz.token }}").highcharts('{{ viz.chart_call }}', data); }) - .fail(function() { - console.log( "error" ); + .fail(function(xhr) { + var err = '
' + xhr.responseText + '
'; + $("#{{ viz.token }}").html(err); }); }); diff --git a/panoramix/templates/panoramix/viz_table.html b/panoramix/templates/panoramix/viz_table.html index fa3a2d3a6ddd8..b08a147048f95 100644 --- a/panoramix/templates/panoramix/viz_table.html +++ b/panoramix/templates/panoramix/viz_table.html @@ -26,7 +26,7 @@ {% else %} -