fixed issue with delta always being 0 in /pebble #480

Merged
merged 2 commits into from Mar 14, 2015
View
@@ -51,7 +51,7 @@ function pebble (req, res) {
}
}
- var result = { status: [ {now: now} ], bgs: sgvData, cals: calData };
+ var result = { status: [ {now: now} ], bgs: sgvData.slice(0, req.count), cals: calData };
res.setHeader('content-type', 'application/json');
res.write(JSON.stringify(result));
res.end( );
@@ -108,7 +108,7 @@ function pebble (req, res) {
}
}
, entries: function(callback) {
- var q = { count: req.count, find: { "sgv": { $exists: true }} };
+ var q = { count: req.count + 1, find: { "sgv": { $exists: true }} };
req.entries.list(q, function(err, results) {
results.forEach(function(element, index) {
View
@@ -325,9 +325,11 @@ var app = {}, browserSettings = {}, browserStorage = $.localStorage;
currentBG.text(scaleBg(value));
}
- bgButton.removeClass('urgent warning inrange');
- if (!inRetroMode()) {
+ if (!alarmingNow()) {
+ bgButton.removeClass('urgent warning inrange');
+ if (!inRetroMode()) {
bgButton.addClass(sgvToColoredRange(value));
+ }
}
currentBG.toggleClass('error-code', value < 39);
View
@@ -117,7 +117,31 @@ describe('Pebble Endpoint without Raw', function ( ) {
pebble.should.be.ok;
});
- it('/pebble', function (done) {
+ it('/pebble default(1) count', function (done) {
+ request(this.app)
+ .get('/pebble')
+ .expect(200)
+ .end(function (err, res) {
+ var bgs = res.body.bgs;
+ bgs.length.should.equal(1);
+ var bg = bgs[0];
+ bg.sgv.should.equal('82');
+ bg.bgdelta.should.equal(-2);
+ bg.trend.should.equal(4);
+ bg.direction.should.equal('Flat');
+ bg.datetime.should.equal(1422727301000);
+ should.not.exist(bg.filtered);
+ should.not.exist(bg.unfiltered);
+ should.not.exist(bg.noise);
+ should.not.exist(bg.rssi);
+ bg.battery.should.equal('100');
+
+ res.body.cals.length.should.equal(0);
+ done( );
+ });
+ });
+
+ it('/pebble?count=2', function (done) {
request(this.app)
.get('/pebble?count=2')
.expect(200)