added TODO:OnlyOneCal, since only 1 cal entry is loaded we can't igno…

…re future data
nightscout · Jul 7, 2015 · 5bd5fac · 5bd5fac
1 parent 09ea5c5
commit 5bd5fac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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);