From 5bd5fac5adb2b2c3e114e8ad486a802e2c74035a Mon Sep 17 00:00:00 2001 From: Jason Calabrese Date: Mon, 6 Jul 2015 17:19:55 -0700 Subject: [PATCH] added TODO:OnlyOneCal, since only 1 cal entry is loaded we can't ignore future data --- lib/data.js | 1 + lib/plugins/ar2.js | 4 +++- lib/plugins/rawbg.js | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/data.js b/lib/data.js index 802523ba755..a2443c4522a 100644 --- a/lib/data.js +++ b/lib/data.js @@ -81,6 +81,7 @@ function init(env, ctx) { }); }, cal: function (callback) { //FIXME: date $gte????? + //TODO:OnlyOneCal - currently we only load the last cal var cq = {count: 1, find: {type: 'cal'}}; ctx.entries.list(cq, function (err, results) { if (!err && results) { diff --git a/lib/plugins/ar2.js b/lib/plugins/ar2.js index 6a037b5ad95..729b80f43df 100644 --- a/lib/plugins/ar2.js +++ b/lib/plugins/ar2.js @@ -76,7 +76,9 @@ function init() { var rawSGVs; if (sbx.properties.rawbg && sbx.extendedSettings.useRaw) { - var cal = sbx.lastEntry(sbx.data.cals); + + //TODO:OnlyOneCal - currently we only load the last cal, so we can't ignore future data + var cal = _.last(sbx.data.cals); if (cal) { rawSGVs = _.map(_.takeRight(sgvs, 2), function eachSGV(sgv) { var rawResult = rawbg.calc(sgv, cal); diff --git a/lib/plugins/rawbg.js b/lib/plugins/rawbg.js index 36c975a7d2d..d8d9ba8895e 100644 --- a/lib/plugins/rawbg.js +++ b/lib/plugins/rawbg.js @@ -1,5 +1,7 @@ 'use strict'; +var _ = require('lodash'); + function init() { function rawbg() { @@ -14,7 +16,9 @@ function init() { sbx.offerProperty('rawbg', function setRawBG ( ) { var result = { }; var currentSGV = sbx.lastSGVEntry(); - var currentCal = sbx.lastEntry(sbx.data.cals); + + //TODO:OnlyOneCal - currently we only load the last cal, so we can't ignore future data + var currentCal = _.last(sbx.data.cals); if (currentSGV && currentCal) { result.value = rawbg.calc(currentSGV, currentCal, sbx);