Add 'show/hide totals' option to pivot table vis (#3101)

apache · Jul 26, 2017 · 4268513 · 4268513
1 parent 7654eef
commit 4268513
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/superset/assets/javascripts/explore/stores/controls.jsx b/superset/assets/javascripts/explore/stores/controls.jsx
@@ -218,6 +218,14 @@ export const controls = {
  description: null,
  },
 
+ pivot_margins: {
+ type: 'CheckboxControl',
+ label: 'Show totals',
+ renderTrigger: false,
+ default: true,
+ description: 'Display total row/column',
+ },
+
  show_markers: {
  type: 'CheckboxControl',
  label: 'Show Markers',

diff --git a/superset/assets/javascripts/explore/stores/visTypes.js b/superset/assets/javascripts/explore/stores/visTypes.js
@@ -337,7 +337,7 @@ export const visTypes = {
  controlSetRows: [
  ['groupby', 'columns'],
  ['metrics', 'pandas_aggfunc'],
- ['number_format'],
+ ['number_format', 'pivot_margins'],
  ],
  },
  ],

diff --git a/superset/viz.py b/superset/viz.py
@@ -394,7 +394,7 @@ def get_data(self, df):
  columns=self.form_data.get('columns'),
  values=self.form_data.get('metrics'),
  aggfunc=self.form_data.get('pandas_aggfunc'),
- margins=True,
+ margins=self.form_data.get('pivot_margins'),
  )
  return dict(
  columns=list(df.columns),