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-1870 Added function to value tooltip in TIME_LINE mode.
Date Mon, 16 Nov 2015 09:31:00 GMT
Repository: ignite
Updated Branches:
  refs/heads/ignite-843-rc1 e82135d02 -> 5234f19c9


IGNITE-1870 Added function to value tooltip in 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/5234f19c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5234f19c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5234f19c

Branch: refs/heads/ignite-843-rc1
Commit: 5234f19c94d89534a7ae5c70a530fd041e17b22a
Parents: e82135d
Author: Alexey Kuznetsov <akuznetsov@apache.org>
Authored: Mon Nov 16 16:31:22 2015 +0700
Committer: Alexey Kuznetsov <akuznetsov@apache.org>
Committed: Mon Nov 16 16:31:22 2015 +0700

----------------------------------------------------------------------
 .../src/main/js/controllers/sql-controller.js               | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/5234f19c/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 0f765b8..7aaa2f9 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
@@ -994,11 +994,12 @@ consoleModule.controller('sqlController',
 
                 if (paragraph.chartTimeLineEnabled()) {
                     var aggFx = valCol.aggFx;
+                    var colLbl = valCol.label + ' [' + aggFx + ']';
 
                     if (paragraph.charts && paragraph.charts.length == 1)
                         datum = paragraph.charts[0].data;
 
-                    var chartData = _.find(datum, {key: valCol.label});
+                    var chartData = _.find(datum, {series: valCol.label});
 
                     var leftBound = new Date();
                     leftBound.setMinutes(leftBound.getMinutes() - parseInt(paragraph.timeLineSpan));
@@ -1025,7 +1026,7 @@ consoleModule.controller('sqlController',
                                 });
                         });
 
-                        datum.push({key: valCol.label, values: values});
+                        datum.push({series: valCol.label, key: colLbl, values: values});
                     }
                 }
                 else {
@@ -1045,7 +1046,7 @@ consoleModule.controller('sqlController',
                         return v;
                     });
 
-                    datum.push({key: valCol.label, values: values});
+                    datum.push({series: valCol.label, key: valCol.label, values: values});
                 }
             });
         }
@@ -1073,7 +1074,7 @@ consoleModule.controller('sqlController',
                     return v;
                 });
 
-                datum.push({key: valCol.label, values: values});
+                datum.push({series: valCol.label, key: valCol.label, values: values});
             });
         }
 


Mime
View raw message