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 8EF9C18FB4 for ; Tue, 13 Oct 2015 10:21:33 +0000 (UTC) Received: (qmail 49680 invoked by uid 500); 13 Oct 2015 10:21:33 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 49645 invoked by uid 500); 13 Oct 2015 10:21:33 -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 49636 invoked by uid 99); 13 Oct 2015 10:21:33 -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; Tue, 13 Oct 2015 10:21:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C1A1E03D0; Tue, 13 Oct 2015 10:21:33 +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: X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: IGNITE-843 WIP on charts time frame. Date: Tue, 13 Oct 2015 10:21:33 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/ignite-843-rc1 6e3bdf32e -> dac939f0c IGNITE-843 WIP on charts time frame. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/dac939f0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/dac939f0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/dac939f0 Branch: refs/heads/ignite-843-rc1 Commit: dac939f0c78b06a9917782b3aa33bc966205f1ae Parents: 6e3bdf3 Author: Alexey Kuznetsov Authored: Tue Oct 13 17:21:57 2015 +0700 Committer: Alexey Kuznetsov Committed: Tue Oct 13 17:21:57 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 3 +++ modules/control-center-web/src/main/js/db.js | 1 + .../control-center-web/src/main/js/routes/agent.js | 2 +- .../src/main/js/views/sql/sql.jade | 17 +++++++++++------ 4 files changed, 16 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/dac939f0/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 18737f0..f29e406 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 @@ -31,6 +31,8 @@ consoleModule.controller('sqlController', $scope.pageSizes = [50, 100, 200, 400, 800, 1000]; + $scope.timeLineSpans = [1, 5, 10, 15, 30]; + $scope.modes = $common.mkOptions(['PARTITIONED', 'REPLICATED', 'LOCAL']); $scope.timeUnit = [ @@ -274,6 +276,7 @@ consoleModule.controller('sqlController', editor: true, query: '', pageSize: $scope.pageSizes[0], + timeLineSpan: $scope.timeLineSpans[0], result: 'none', rate: { value: 1, http://git-wip-us.apache.org/repos/asf/ignite/blob/dac939f0/modules/control-center-web/src/main/js/db.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js index 97acafe..4cdcdeb 100644 --- a/modules/control-center-web/src/main/js/db.js +++ b/modules/control-center-web/src/main/js/db.js @@ -402,6 +402,7 @@ var NotebookSchema = new Schema({ editor: Boolean, result: {type: String, enum: ['none', 'table', 'bar', 'pie', 'line', 'area']}, pageSize: Number, + timeLineSpan: Number, hideSystemColumns: Boolean, cacheName: String, rate: { http://git-wip-us.apache.org/repos/asf/ignite/blob/dac939f0/modules/control-center-web/src/main/js/routes/agent.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/routes/agent.js b/modules/control-center-web/src/main/js/routes/agent.js index 3012754..c93feeb 100644 --- a/modules/control-center-web/src/main/js/routes/agent.js +++ b/modules/control-center-web/src/main/js/routes/agent.js @@ -50,7 +50,7 @@ router.get('/download/zip', function (req, res) { var config = require('../helpers/configuration-loader.js'); var agentFld = 'ignite-web-agent-1.5.0-SNAPSHOT'; - var agentZip = agentFld + '.zip'; + var agentZip = agentFld + '.zip'; // Read a zip file. fs.readFile('public/agent/' + agentZip, function(err, data) { http://git-wip-us.apache.org/repos/asf/ignite/blob/dac939f0/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 8d5e628..20dcde1 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 @@ -31,6 +31,15 @@ mixin btn-toolbar(btn, click, tip) mixin btn-toolbar-data(btn, kind, tip) i.btn.btn-default.fa(class=btn ng-click='setResult(paragraph, "#{kind}")' ng-class='{active: resultEq(paragraph, "#{kind}")}' bs-tooltip='' data-title=tip data-trigger='hover' data-placement='bottom') +mixin chart-settings(mdl) + .col-sm-2.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 + .col-sm-3 + label Show + button.select-toggle.btn.btn-default(ng-model='paragraph.timeLineSpan' bs-options='item for item in timeLineSpans' bs-select) + label min + block container .row .col-sm-12(ng-init='noteId = "#{noteId}"') @@ -148,16 +157,12 @@ block container div(ng-show='paragraph.chart() && paragraph.nonEmpty()') div(ng-show='paragraph.queryExecute()') div(ng-hide='paragraph.chartColumnsConfigured()') - .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 + +chart-settings .sql-empty-result Cannot display chart. Please configure axis using  b Chart settings div(ng-show='paragraph.chartColumnsConfigured()') div(ng-show='paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()') - .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 + +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 support 'TIME_LINE' column for X-axis