Skip to content

Commit

Permalink
Tunning timeseries settings
Browse files Browse the repository at this point in the history
  • Loading branch information
mistercrunch committed Jan 12, 2016
1 parent 089a8c6 commit b6b8d04
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion panoramix/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -919,7 +919,10 @@ def query(
if df is None or df.size == 0:
raise Exception("No data was returned.")

if not is_timeseries and 'timestamp' in df.columns:
if (
not is_timeseries and
granularity == "all"
and 'timestamp' in df.columns):
del df['timestamp']

# Reordering columns
Expand Down
2 changes: 1 addition & 1 deletion panoramix/viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class TableViz(BaseViz):
'lib/dataTables/dataTables.bootstrap.css',
'widgets/viz_table.css',
]
is_timeseries = True
is_timeseries = False
js_files = [
'lib/d3.min.js',
'lib/dataTables/jquery.dataTables.min.js',
Expand Down

0 comments on commit b6b8d04

Please sign in to comment.