ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akuznet...@apache.org
Subject ignite git commit: IGNITE-843 Fixed TIME_LINE mode.
Date Mon, 12 Oct 2015 09:23:43 GMT
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 <akuznetsov@apache.org>
Authored: Mon Oct 12 16:24:04 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
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&nbsp
+                                            | Charts do not support&nbsp
                                             b Explain
                                             | &nbspand&nbsp
                                             b Scan


Mime
View raw message