IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

don't calculate cumulative value if series overrides stack to false

Browse Source
This commit is contained in:
Mitsuhiro Tanda 2015-08-13 13:16:51 +09:00
parent 5aee981590
commit caccacf52b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/app/panels/graph/graph.tooltip.js
View File

@ -58,6 +58,8 @@ function ($) {
if (scope.panel.stack) {
if (scope.panel.tooltip.value_type === 'individual') {
value = series.data[hoverIndex][1];
} else if (!series.stack) {
value = series.data[hoverIndex][1];
} else {
last_value += series.data[hoverIndex][1];
value = last_value;

20
public/test/specs/graph-tooltip-specs.js
View File

@ -73,8 +73,8 @@ define([
describeSharedTooltip("steppedLine false, stack true, individual false", function(ctx) {
ctx.setup(function() {
ctx.data = [
{ data: [[10, 15], [12, 20]], },
{ data: [[10, 2], [12, 3]], }
{ data: [[10, 15], [12, 20]], stack: true },
{ data: [[10, 2], [12, 3]], stack: true }
];
ctx.scope.panel.stack = true;
ctx.pos = { x: 11 };
@ -86,6 +86,22 @@ define([
});
describeSharedTooltip("steppedLine false, stack true, individual false, series stack false", function(ctx) {
ctx.setup(function() {
ctx.data = [
{ data: [[10, 15], [12, 20]], stack: true },
{ data: [[10, 2], [12, 3]], stack: false }
];
ctx.scope.panel.stack = true;
ctx.pos = { x: 11 };
});
it('should not show stacked value', function() {
expect(ctx.results[1].value).to.be(2);
});
});
describeSharedTooltip("steppedLine false, stack true, individual true", function(ctx) {
ctx.setup(function() {
ctx.data = [