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 C19831877C for ; Wed, 14 Oct 2015 09:19:47 +0000 (UTC) Received: (qmail 78791 invoked by uid 500); 14 Oct 2015 09:19:47 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 78758 invoked by uid 500); 14 Oct 2015 09:19:47 -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 78749 invoked by uid 99); 14 Oct 2015 09:19:47 -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; Wed, 14 Oct 2015 09:19:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D1104DFDEF; Wed, 14 Oct 2015 09:19:46 +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 Date: Wed, 14 Oct 2015 09:19:48 -0000 Message-Id: In-Reply-To: <7a9b4f1a21d94cb18a26095935010cbd@git.apache.org> References: <7a9b4f1a21d94cb18a26095935010cbd@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/3] ignite git commit: IGNITE-1595 WIP on charts with time line. IGNITE-1595 WIP on charts with time line. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d12dcbbd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d12dcbbd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d12dcbbd Branch: refs/heads/ignite-843-rc1 Commit: d12dcbbdfb7f3dbac3f3c7add93931a3d28bdd9f Parents: 6c90344 Author: Alexey Kuznetsov Authored: Wed Oct 14 16:20:09 2015 +0700 Committer: Alexey Kuznetsov Committed: Wed Oct 14 16:20:09 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/sql-controller.js | 10 +++++++++- .../src/main/js/public/stylesheets/style.scss | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d12dcbbd/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 3d04ddf..94034d1 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 @@ -796,7 +796,15 @@ consoleModule.controller('sqlController', else { var tm = new Date(); - values = _.map(chartHistory, function (history) { + var span = parseInt(paragraph.timeLineSpan); + + tm.setMinutes(tm.getMinutes() - span); + + var filteredChartHistory = _.filter(chartHistory, function (history) { + return history.tm > tm; + }); + + values = _.map(filteredChartHistory, function (history) { return { x: history.tm, y: _chartNumber(history.rows[0], valCol.value, index++) http://git-wip-us.apache.org/repos/asf/ignite/blob/d12dcbbd/modules/control-center-web/src/main/js/public/stylesheets/style.scss ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss index 4e77d93..5fa1f97 100644 --- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss +++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss @@ -1529,7 +1529,7 @@ a { } div { - margin-left: 5px; + margin-left: 20px; display: inline-block; } }