From 64c3e183bab19a7b3768edda01d78cc809bb56d9 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Fri, 30 Dec 2016 14:21:37 +0900 Subject: [PATCH 1/3] Make exported data file name more explicit --- .../src/app/notebook/paragraph/result/result.controller.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js index 77227a7b3a2..00dc75d2756 100644 --- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js @@ -580,6 +580,9 @@ import zeppelin from '../../../zeppelin'; $scope.exportToDSV = function(delimiter) { var dsv = ''; + var currentTime = moment().format('YYYY-MM-DD hh:mm:ss A'); + var exportedFileName = paragraph.title ? paragraph.title + '_' + currentTime : 'Exported data_' + currentTime; + for (var titleIndex in tableData.columns) { dsv += tableData.columns[titleIndex].name + delimiter; } @@ -603,7 +606,7 @@ import zeppelin from '../../../zeppelin'; } else if (delimiter === ',') { extension = 'csv'; } - saveAsService.saveAs(dsv, 'data', extension); + saveAsService.saveAs(dsv, exportedFileName, extension); }; $scope.getBase64ImageSrc = function(base64Data) { From d7d00872859d8d4f91e11875bbcd8e1012c8e2a6 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Tue, 3 Jan 2017 23:38:22 +0900 Subject: [PATCH 2/3] Change timestamp to dateFinished instead of currentTime --- .../src/app/notebook/paragraph/result/result.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js index 00dc75d2756..275fd47523b 100644 --- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js @@ -580,8 +580,8 @@ import zeppelin from '../../../zeppelin'; $scope.exportToDSV = function(delimiter) { var dsv = ''; - var currentTime = moment().format('YYYY-MM-DD hh:mm:ss A'); - var exportedFileName = paragraph.title ? paragraph.title + '_' + currentTime : 'Exported data_' + currentTime; + var dateFinished = moment(paragraph.dateFinished).format('YYYY-MM-DD hh:mm:ss A'); + var exportedFileName = paragraph.title ? paragraph.title + '_' + dateFinished : 'Exported data_' + dateFinished; for (var titleIndex in tableData.columns) { dsv += tableData.columns[titleIndex].name + delimiter; From beb7558245034864bccc91a67e393e0c75f21004 Mon Sep 17 00:00:00 2001 From: AhyoungRyu Date: Wed, 4 Jan 2017 11:11:53 +0900 Subject: [PATCH 3/3] Change exported filename prefix: 'Exported_data' to 'data' --- .../src/app/notebook/paragraph/result/result.controller.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js index 275fd47523b..d180bfbce34 100644 --- a/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js +++ b/zeppelin-web/src/app/notebook/paragraph/result/result.controller.js @@ -581,7 +581,7 @@ import zeppelin from '../../../zeppelin'; $scope.exportToDSV = function(delimiter) { var dsv = ''; var dateFinished = moment(paragraph.dateFinished).format('YYYY-MM-DD hh:mm:ss A'); - var exportedFileName = paragraph.title ? paragraph.title + '_' + dateFinished : 'Exported data_' + dateFinished; + var exportedFileName = paragraph.title ? paragraph.title + '_' + dateFinished : 'data_' + dateFinished; for (var titleIndex in tableData.columns) { dsv += tableData.columns[titleIndex].name + delimiter;