#29 minor issues

- lookup in metric/dimension picker by name/key. - fixed issue with double dimension allocation when exporting.
joola · Oct 25, 2015 · 4cc8a3b · 4cc8a3b
1 parent 8e45d18
commit 4cc8a3b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/lib/viz/DimensionPicker.js b/src/lib/viz/DimensionPicker.js
@@ -96,7 +96,7 @@ var DimensionPicker = module.exports = function (options, callback) {
 
           list.forEach(function (dimension) {
             var collection = {key: dimension.collection};
-            var $li = $$('<div class="dimensionOption" data-member="' + dimension.key + '">' + (dimension.name || dimension.key) + '</div>');
+            var $li = $$('<div class="dimensionOption" data-member="' + (dimension.name || dimension.key) + '">' + (dimension.name || dimension.key) + '</div>');
             $li.off('click');
             $li.on('click', function (e) {
               var $this = $$(this);
@@ -303,4 +303,4 @@ joola.events.on('core.init.finish', function () {
   }
 });
 
-util.inherits(DimensionPicker, events.EventEmitter);
+util.inherits(DimensionPicker, events.EventEmitter);
diff --git a/src/lib/viz/MetricPicker.js b/src/lib/viz/MetricPicker.js
@@ -83,13 +83,13 @@ var MetricPicker = module.exports = function (options, callback) {
           list = _.sortBy(list, function (item) {
             return item.name || item.key;
           });
-          
+
           list.forEach(function (metric) {
             var collection = {key: metric.collection};
             if (typeof collection !== 'object')
               collection = {key: collection};
 
-            var $li = $$('<div class="metricOption" data-member="' + collection.key + '.' + metric.key + '">' + (metric.name || metric.key) + '</div>');
+            var $li = $$('<div class="metricOption" data-member="' + collection.key + '.' + (metric.name || metric.key) + '">' + (metric.name || metric.key) + '</div>');
             $li.off('click');
             $li.on('click', function (e) {
               var $this = $$(this);
@@ -298,4 +298,4 @@ joola.events.on('core.init.finish', function () {
   }
 });
 
-util.inherits(MetricPicker, events.EventEmitter);
+util.inherits(MetricPicker, events.EventEmitter);
diff --git a/src/lib/viz/Table.js b/src/lib/viz/Table.js
@@ -110,8 +110,8 @@ var Table = module.exports = function (options, callback) {
 
     this.export = function (canvas) {
       var data = [];
-      var dimensions = [self.options.query[0].dimensions[0]];
       var collection = [self.options.query[0].collection];
+      var dimensions =[];
       var metrics = [];
       var headers = [];
       self.options.query[0].dimensions.forEach(function (d) {