You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/10/14 11:19:48 UTC
[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 <ak...@apache.org>
Authored: Wed Oct 14 16:20:09 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
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;
}
}