ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject ignite git commit: IGNITE-843 Add placeholder for sql
Date Mon, 19 Oct 2015 09:46:46 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 07805f61b -> 7fc27c0d7


IGNITE-843 Add placeholder for sql


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7fc27c0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7fc27c0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7fc27c0d

Branch: refs/heads/ignite-843-rc1
Commit: 7fc27c0d774611c10e84da9356411fe0bf3eaccd
Parents: 07805f6
Author: Andrey <anovikov@gridgain.com>
Authored: Mon Oct 19 16:47:07 2015 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Mon Oct 19 16:47:07 2015 +0700

----------------------------------------------------------------------
 .../control-center-web/src/main/js/controllers/sql-controller.js | 4 ++++
 modules/control-center-web/src/main/js/views/sql/sql.jade        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/7fc27c0d/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 d0b8457..2a3f123 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
@@ -134,6 +134,10 @@ consoleModule.controller('sqlController',
             return this.result != 'pie';
         };
 
+        paragraph.refreshExecuting = function () {
+            return paragraph.rate && paragraph.rate.stopTime
+        };
+
         Object.defineProperty(paragraph, 'gridOptions', { value: {
             enableColResize: true,
             columnDefs: [],

http://git-wip-us.apache.org/repos/asf/ignite/blob/7fc27c0d/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 5a0f196..1f1eb2f 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
@@ -171,14 +171,14 @@ block container
                                                     div(ng-show='paragraph.timeLineSupported()
|| !paragraph.chartTimeLineEnabled()')
                                                         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 support '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. Please use another column for X-axis or switch to another chart.
                                             .sql-empty-result(ng-hide='paragraph.queryExecute()')
                                                 | Charts do not support&nbsp
                                                 b Explain
                                                 | &nbspand&nbsp
                                                 b Scan
                                                 | &nbspquery
-                                        div(ng-show='paragraph.queryId && (paragraph.table()
|| paragraph.chart() && paragraph.queryExecute())')
+                                        div(ng-show='paragraph.queryId && !paragraph.refreshExecuting()
&& (paragraph.table() || paragraph.chart() && paragraph.queryExecute() &&
(paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()))')
                                             hr(style='margin-top: 0; margin-bottom: 5px')
                                             i.fa.fa-chevron-circle-right(style='float: right;margin-right:
10px;' ng-click='nextPage(paragraph)')
                                             a(style='float: right; margin-bottom: 5px;margin-right:
5px;' ng-click='nextPage(paragraph)') Next


Mime
View raw message