You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/11 05:41:18 UTC
ignite git commit: IGNITE-843 Fixed charts after execute.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 f2d30063f -> 8fe821cea
IGNITE-843 Fixed charts after execute.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/8fe821ce
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/8fe821ce
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/8fe821ce
Branch: refs/heads/ignite-843
Commit: 8fe821ceaf71e8c92e38dd03d8d5f48929eac08d
Parents: f2d3006
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 11 10:41:56 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 11 10:41:56 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 44 +++++++++-----------
.../src/main/js/views/sql/sql.jade | 2 +-
2 files changed, 21 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fe821ce/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index a713fc0..23f411a 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -72,6 +72,16 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
var paragraphId = 0;
+ function enhanceParagraph(paragraph) {
+ paragraph.chart = function () {
+ return this.result != 'table' && this.result != 'none';
+ };
+
+ paragraph.nonEmpty = function () {
+ return this.rows && this.rows.length > 0;
+ };
+ }
+
$scope.aceInit = function (editor) {
editor.setAutoScrollEditorIntoView(true);
editor.$blockScrolling = Infinity;
@@ -96,6 +106,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
_.forEach(notebook.paragraphs, function (paragraph) {
paragraph.id = paragraphId++;
+
+ enhanceParagraph(paragraph);
});
if (!notebook.paragraphs || notebook.paragraphs.length == 0)
@@ -193,7 +205,6 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
query: '',
pageSize: $scope.pageSizes[0],
result: 'none',
- chart: false,
hideSystemColumns: true,
disabledSystemColumns: false,
rate: {
@@ -203,6 +214,8 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
}
};
+ enhanceParagraph(paragraph);
+
if ($scope.caches && $scope.caches.length > 0)
paragraph.cache = $scope.caches[0];
@@ -212,29 +225,12 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
};
$scope.setResult = function (paragraph, new_result) {
- paragraph.result = paragraph.result === new_result ? 'none' : new_result;
-
- paragraph.chart = new_result != 'table' && paragraph.result != 'none' && paragraph.rows && paragraph.rows.length > 0;
-
- if (paragraph.chart) {
- switch (new_result) {
- case 'bar':
- _barChart(paragraph);
- break;
+ var changed = paragraph.result != new_result;
- case 'pie':
- _pieChart(paragraph);
- break;
-
- case 'line':
- _lineChart(paragraph);
- break;
+ paragraph.result = paragraph.result === new_result ? 'none' : new_result;
- case 'area':
- _areaChart(paragraph);
- break;
- }
- }
+ if (changed && paragraph.chart())
+ $scope.applyChartSettings(paragraph);
};
$scope.resultEq = function(paragraph, result) {
@@ -346,7 +342,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
if (paragraph.result == 'none')
paragraph.result = 'table';
- else if (paragraph.chart)
+ else if (paragraph.chart())
$scope.applyChartSettings(paragraph);
}
};
@@ -618,7 +614,7 @@ controlCenterModule.controller('sqlController', ['$scope', '$window','$controlle
}
$scope.applyChartSettings = function (paragraph) {
- if (paragraph.chart && paragraph.rows && paragraph.rows.length > 0) {
+ if (paragraph.chart() && paragraph.nonEmpty()) {
switch (paragraph.result) {
case 'bar':
_barChart(paragraph);
http://git-wip-us.apache.org/repos/asf/ignite/blob/8fe821ce/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index b30f57b..b33dee5 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -133,7 +133,7 @@ block container
tbody
tr(ng-repeat='row in displayedResult track by $index')
td(ng-repeat='val in row track by $index' ng-if='paragraph.columnFilter(paragraph.meta[$index])') {{ val }}
- div(ng-show='paragraph.rows && paragraph.chart')
+ div(ng-show='paragraph.chart() && paragraph.nonEmpty()')
.chart-settings-link
i.fa.fa-chevron-circle-down
a(ng-show='paragraph.chart' ng-click='$event.stopPropagation()' bs-popover data-template-url='chart-settings' data-placement='bottom' data-auto-close='1' data-trigger='click') Chart settings