Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 058351831F for ; Mon, 12 Oct 2015 09:23:50 +0000 (UTC) Received: (qmail 50263 invoked by uid 500); 12 Oct 2015 09:23:43 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 50227 invoked by uid 500); 12 Oct 2015 09:23:43 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 50218 invoked by uid 99); 12 Oct 2015 09:23:43 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 12 Oct 2015 09:23:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50D0DDFDE1; Mon, 12 Oct 2015 09:23:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.apache.org Message-Id: <67d4d57660c94133ab41a8c20878f7d4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 Fixed TIME_LINE mode. Date: Mon, 12 Oct 2015 09:23:43 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843 49514e8dc -> 7e16ebdb6 IGNITE-843 Fixed TIME_LINE mode. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7e16ebdb Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7e16ebdb Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7e16ebdb Branch: refs/heads/ignite-843 Commit: 7e16ebdb6b44989ae57a209fa2914976ec50c499 Parents: 49514e8 Author: Alexey Kuznetsov Authored: Mon Oct 12 16:24:04 2015 +0700 Committer: Alexey Kuznetsov Committed: Mon Oct 12 16:24:04 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 12 ++++++------ .../control-center-web/src/main/js/views/sql/sql.jade | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7e16ebdb/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 d2463b7..3b28883 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 @@ -124,7 +124,7 @@ consoleModule.controller('sqlController', }; paragraph.chartTimeLineEnabled = function () { - return !$common.isEmptyArray(this.chartKeyCols) && this.chartKeyCols[0] == TIME_LINE; + return !$common.isEmptyArray(this.chartKeyCols) && angular.equals(this.chartKeyCols[0], TIME_LINE); }; paragraph.timeLineSupported = function () { @@ -389,14 +389,14 @@ consoleModule.controller('sqlController', paragraph.gridOptions.api.setColumnDefs(columnDefs); - // Not object. + if (paragraph.chartColumns.length > 0) + paragraph.chartColumns.push(TIME_LINE); + + // We could accept onl not object columns for X axis. paragraph.chartKeyCols = _retainColumns(paragraph.chartColumns, paragraph.chartKeyCols, _notObjectType); - // Numeric. + // We could accept only numeric columns for Y axis. paragraph.chartValCols = _retainColumns(paragraph.chartColumns, paragraph.chartValCols, _numberType, paragraph.chartKeyCols[0]); - - if (paragraph.chartColumns.length > 0) - paragraph.chartColumns.push(TIME_LINE); }; $scope.toggleSystemColumns = function (paragraph) { http://git-wip-us.apache.org/repos/asf/ignite/blob/7e16ebdb/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 58b5198..de58686 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 @@ -160,9 +160,9 @@ block container 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 div(ng-repeat='chart in paragraph.charts') nvd3(options='chart.options' data='chart.data' api='chart.api') - .sql-empty-result(ng-show='!paragraph.timeLineSupported() && paragraph.chartTimeLineEnabled()') Pie chart does not supported 'TIME_LINE' column for X-axis + .sql-empty-result(ng-show='!paragraph.timeLineSupported() && paragraph.chartTimeLineEnabled()') Pie chart does not support 'TIME_LINE' column for X-axis .sql-empty-result(ng-hide='paragraph.queryExecute()') - | Charts does not support  + | Charts do not support  b Explain |  and  b Scan