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

Graph: change to current legend value handling, if last value is null, current will pick next to last value, Closes #190

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-11-12 13:47:06 +01:00
parent 3e2c898881
commit 4eb4974909
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/components/timeSeries.js
View File

@ -112,6 +112,9 @@ function (_, kbn) {
if (result.length) { if (result.length) {
this.stats.avg = (this.stats.total / result.length); this.stats.avg = (this.stats.total / result.length);
this.stats.current = result[result.length-1][1]; this.stats.current = result[result.length-1][1];
if (this.stats.current === null && result.length > 1) {
this.stats.current = result[result.length-2][1];
}
} }
return result; return result;

9
src/test/specs/timeSeries-specs.js
View File

@ -26,6 +26,15 @@ define([
expect(points.length).to.be(4); expect(points.length).to.be(4);
expect(points[1][1]).to.be(0); expect(points[1][1]).to.be(0);
}); });
it('if last is null current should pick next to last', function() {
series = new TimeSeries({
datapoints: [[10,1], [null, 2]]
});
series.getFlotPairs('null', yAxisFormats);
expect(series.stats.current).to.be(10);
});
}); });
describe('series overrides', function() { describe('series overrides', function() {