#197 Finish chart csv download

TheHive-Project · Nov 21, 2017 · 8bb3570 · 8bb3570
1 parent 7627bb4
commit 8bb3570
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/ui/app/scripts/directives/dashboard/bar.js b/ui/app/scripts/directives/dashboard/bar.js
@@ -119,7 +119,11 @@
                 scope.getCsv = function() {
                     var dates = scope.data._date;
                     var keys = _.keys(scope.data);
-                    var csv = [{data: keys.join(';')}];
+                    var headers = _.extend({_date: 'Date'}, scope.names);
+
+                    var csv = [{data: _.map(keys, function(key){
+                        return headers[key] || key;
+                    }).join(';')}];
 
                     var row = [];
                     for(var i=0; i<dates.length; i++) {

diff --git a/ui/app/scripts/directives/dashboard/donut.js b/ui/app/scripts/directives/dashboard/donut.js
@@ -28,7 +28,7 @@
 
                         _.each(field.values, function(val, index) {
                             if(!names[val]) {
-                                names[val] = field.labels[index] || null;
+                                names[val] = field.labels[index] || val;
                             }
                         });
                     }

diff --git a/ui/app/scripts/directives/dashboard/line.js b/ui/app/scripts/directives/dashboard/line.js
@@ -160,10 +160,10 @@
                 scope.getCsv = function() {
                     var dates = scope.data._date;
                     var keys = _.keys(scope.data);
+                    var headers = _.extend({_date: 'Date'}, scope.names);
 
-                    // TODO update headers
                     var csv = [{data: _.map(keys, function(key){
-                        return scope.names[key] || key;
+                        return headers[key] || key;
                     }).join(';')}];
 
                     var row = [];