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/10/21 10:30:55 UTC
ignite git commit: IGNITE-1748 Fixed charts update after "next" click.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 8c76a4d78 -> b45a48a82
IGNITE-1748 Fixed charts update after "next" click.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b45a48a8
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b45a48a8
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b45a48a8
Branch: refs/heads/ignite-843-rc1
Commit: b45a48a8292bf72e68ac0128f93c5cdf9ef75b4a
Parents: 8c76a4d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Oct 21 15:30:51 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Oct 21 15:30:51 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 28 ++++++++++++++++++++
1 file changed, 28 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/b45a48a8/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 fe341b3..95ef9a6 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
@@ -643,6 +643,13 @@ consoleModule.controller('sqlController',
paragraph.rows = res.rows;
+ if (paragraph.chart()) {
+ if (paragraph.result == 'pie')
+ _updatePieChartsWithData(paragraph, _pieChartDatum(paragraph));
+ else
+ _updateChartsWithData(paragraph, _chartDatum(paragraph));
+ }
+
paragraph.gridOptions.api.setRowData(res.rows);
_showLoading(paragraph, false);
@@ -975,6 +982,27 @@ consoleModule.controller('sqlController',
});
}
+ function _updatePieChartsWithData(paragraph, newDatum) {
+ $timeout(function () {
+ _.forEach(paragraph.charts, function (chart) {
+ var chartDatum = chart.data;
+
+ chartDatum.length = 0;
+
+ _.forEach(newDatum, function (series) {
+ if (chart.options.title.text == series.key)
+ _.forEach(series.values, function (v) {
+ chartDatum.push(v);
+ });
+ });
+ });
+
+ _.forEach(paragraph.charts, function (chart) {
+ chart.api.update();
+ });
+ });
+ }
+
function _barChart(paragraph) {
var datum = _chartDatum(paragraph);