on server entry time is 'x' on the client it's 'date'

nightscout · Jul 6, 2015 · 3f41d1d · 3f41d1d
1 parent 4d2263a
commit 3f41d1d
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/lib/sandbox.js b/lib/sandbox.js
@@ -115,7 +115,7 @@ function init ( ) {
 
   sbx.lastEntry = function lastEntry (entries) {
     return _.findLast(entries, function notInTheFuture (entry) {
-      return entry.x <= sbx.time;
+      return entryToTime(entry) <= sbx.time;
     });
   };
 
@@ -129,10 +129,14 @@ function init ( ) {
   };
 
   sbx.lastSGVMills = function lastSGVMills ( ) {
-    var last = sbx.lastSGVEntry();
-    return (last && last.x) || (last && last.date && (new Date(last.date)).getTime()) || 0;
+    return entryToTime(sbx.lastSGVEntry());
   };
 
+  function entryToTime(entry) {
+    //FIXME: field mismatch between server and client :(
+    return (entry && entry.x) || (entry && entry.date && (new Date(entry.date)).getTime()) || 0;
+  }
+
   sbx.lastScaledSGV = function lastScaledSVG ( ) {
     return sbx.scaleBg(sbx.lastSGV());
   };