Skip to content

Commit

Permalink
Fixes #56 Setting the display value as the default column value for t…
Browse files Browse the repository at this point in the history
…he data tables transformer
  • Loading branch information
twheys committed Oct 26, 2016
1 parent e924e0f commit e85e1ec
Show file tree
Hide file tree
Showing 2 changed files with 96 additions and 91 deletions.
19 changes: 12 additions & 7 deletions fireant/slicer/transformers/datatables.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,16 @@ def _render_columns(self, dataframe, display_schema):

def _render_dimension_column(self, key, display_schema):
dimension = display_schema['dimensions'][key]
render = {
'_': 'value',
}

if 'display_field' in dimension or 'display_options' in dimension:
render['display'] = 'display'
render = {
'_': 'display',
'type': 'value',
}
else:
render = {
'_': 'value',
}

return {'title': dimension['label'],
'data': '{}'.format(key),
Expand All @@ -80,7 +85,7 @@ def _render_column_level(self, metric_column, display_schema):
if not isinstance(metric_column, tuple):
return {'title': metrics[metric_column]['label'],
'data': metric_column,
'render': {'_': 'value', 'display': 'display'}}
'render': {'type': 'value', '_': 'display'}}

references = display_schema.get('references')
metric_key_idx = 1 if references else 0
Expand All @@ -102,7 +107,7 @@ def _render_column_level(self, metric_column, display_schema):
return {
'title': metric_label,
'data': path,
'render': {'_': 'value', 'display': 'display'}
'render': {'type': 'value', '_': 'display'}
}

def _render_data(self, dataframe, display_schema):
Expand Down Expand Up @@ -237,7 +242,7 @@ def _render_column_level(self, metric_column, display_schema):
return {
'title': metric_label,
'data': data,
'render': {'_': 'value', 'display': 'display'}
'render': {'type': 'value', '_': 'display'}
}

def _recurse_dimensions(self, df, dimensions, metrics, reference=None):
Expand Down
Loading

0 comments on commit e85e1ec

Please sign in to comment.