merge 10.17.2016

lib/language.js

@@ -4087,7 +4087,7 @@ function init() {
       ,sk: 'Spustenie senzoru'
       ,nl: 'CGM Sensor start'
       }
-    ,'CGM Sensor Change' : {
+    ,'CGM Sensor Insert' : {
       cs: 'Výměna sensoru'
       ,de: 'CGM Sensor Wechsel'
       ,es: 'Cambio de sensor'

lib/plugins/cannulaage.js

@@ -88,7 +88,7 @@ cage.findLatestTimeChange = function findLatestTimeChange (sbx) {
     sendNotification = cannulaInfo.age === prefs.warn;
     message = 'Time to change cannula';
     cannulaInfo.level = levels.WARN;
-  } else  if (cannulaInfo.age > prefs.info) {
+  } else  if (cannulaInfo.age >= prefs.info) {
     sendNotification = cannulaInfo.age === prefs.info;
     message = 'Change cannula soon';
     cannulaInfo.level = levels.INFO;

lib/plugins/careportal.js

@@ -66,7 +66,7 @@ function init() {
         , bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
       }
       , { val: 'Sensor Change'
-        , name: 'CGM Sensor Change'
+        , name: 'CGM Sensor Insert'
         , bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
       }
       , { val: 'Insulin Change'

lib/plugins/insulinage.js

@@ -86,7 +86,7 @@ iage.findLatestTimeChange = function findLatestTimeChange(sbx) {
     sendNotification = insulinInfo.age === prefs.warn;
     message = 'Time to change insulin reservoir';
     insulinInfo.level = levels.WARN;
-  } else  if (insulinInfo.age > prefs.info) {
+  } else  if (insulinInfo.age >= prefs.info) {
     sendNotification = insulinInfo.age === prefs.info;
     message = 'Change insulin reservoir soon';
     insulinInfo.level = levels.INFO;

lib/plugins/sensorage.js

@@ -38,15 +38,23 @@ sage.checkNotifications = function checkNotifications(sbx) {
 };
 
 function minButValid(record) {
-  if (!record['Sensor Start'].found && record['Sensor Change'].found) {
-    return 'Sensor Change';
-  } else if (!record['Sensor Change'].found && record['Sensor Start'].found) {
-    return 'Sensor Start';
-  } else if (record['Sensor Change'].treatmentDate >= record['Sensor Start'].treatmentDate) {
-    return 'Sensor Change';
-  } else {
-    return 'Sensor Start';
+  var events = [ ];
+
+  var start = record['Sensor Start'];
+  if (start && start.found) {
+    events.push({eventType: 'Sensor Start', treatmentDate: start.treatmentDate});
   }
+
+  var change = record['Sensor Change'];
+  if (change && change.found) {
+    events.push({eventType: 'Sensor Change', treatmentDate: change.treatmentDate});
+  }
+
+  var sorted = _.sortBy(events, 'treatmentDate');
+
+  var mostRecent = _.last(sorted);
+
+  return (mostRecent && mostRecent.eventType) || 'Sensor Start';
 }
 
 sage.findLatestTimeChange = function findLatestTimeChange(sbx) {
@@ -91,6 +99,11 @@ sage.findLatestTimeChange = function findLatestTimeChange(sbx) {
       }
     });
   });
+
+  if (returnValue['Sensor Change'].found && returnValue['Sensor Start'].found &&
+    returnValue['Sensor Change'].treatmentDate >= returnValue['Sensor Start'].treatmentDate) {
+    returnValue['Sensor Start'].found = false;
+  }
 
   returnValue.min = minButValid(returnValue);
 
@@ -103,12 +116,12 @@ sage.findLatestTimeChange = function findLatestTimeChange(sbx) {
 
   sensorInfo.level = levels.NONE;
 
-  if (sensorInfo.age > prefs.urgent) {
+  if (sensorInfo.age >= prefs.urgent) {
     sendNotification = sensorInfo.age === prefs.urgent;
     message = 'Sensor change/restart overdue!';
     sound = 'persistent';
     sensorInfo.level = levels.URGENT;
-  } else if (sensorInfo.age > prefs.warn) {
+  } else if (sensorInfo.age >= prefs.warn) {
     sendNotification = sensorInfo.age === prefs.warn;
     message = 'Time to change/restart sensor';
     sensorInfo.level = levels.WARN;
@@ -120,7 +133,7 @@ sage.findLatestTimeChange = function findLatestTimeChange(sbx) {
 
   if (prefs.enableAlerts && sendNotification && sensorInfo.minFractions <= 30) {
     sensorInfo.notification = {
-      title: 'Sensor age ' + sensorInfo.days + ' days' + sensorInfo.hours +' hours'
+      title: 'Sensor age ' + sensorInfo.days + ' days ' + sensorInfo.hours + ' hours'
       , message: message
       , pushoverSound: sound
       , level: sensorInfo.level
@@ -144,7 +157,8 @@ sage.updateVisualisation = function updateVisualisation (sbx) {
 
   ['Sensor Change', 'Sensor Start'].forEach( function eachEvent(event) {
     if (latest[event].found) {
-      info.push( { label: event, value: new Date(latest[event].treatmentDate).toLocaleString() } );
+      var label = event === 'Sensor Change' ? 'Sensor Insert' : event;
+      info.push( { label: label, value: new Date(latest[event].treatmentDate).toLocaleString() } );
       shownAge = '';
       if (latest[event].age > 24) {
         shownAge += latest[event].days + ' days ';

tests/sensorage.test.js

@@ -0,0 +1,162 @@
+'use strict';
+
+var should = require('should');
+var times = require('../lib/times');
+var levels = require('../lib/levels');
+
+describe('sage', function ( ) {
+  var sage = require('../lib/plugins/sensorage')();
+  var sandbox = require('../lib/sandbox')();
+  var env = require('../env')();
+  var ctx = {};
+  ctx.ddata = require('../lib/data/ddata')();
+  ctx.notifications = require('../lib/notifications')(env, ctx);
+
+  function prepareSandbox ( ) {
+    var sbx = require('../lib/sandbox')().serverInit(env, ctx);
+    return sbx;
+  }
+
+  it('set a pill to the current age since start with change', function (done) {
+
+    var data = {
+      sensorTreatments: [
+        {eventType: 'Sensor Change', notes: 'Foo', mills: Date.now() - times.days(15).msecs}
+        , {eventType: 'Sensor Start', notes: 'Bar', mills: Date.now() - times.days(3).msecs}
+        ]
+    };
+
+    var ctx = {
+      settings: {}
+      , pluginBase: {
+        updatePillText: function mockedUpdatePillText(plugin, options) {
+          options.value.should.equal('3d0h');
+          options.info[0].label.should.equal('Sensor Insert');
+          options.info[1].should.match({ label: 'Duration', value: '15 days 0 hours' });
+          options.info[2].should.match({ label: 'Notes:', value: 'Foo' });
+          options.info[3].label.should.equal('Sensor Start');
+          options.info[4].should.match({ label: 'Duration', value: '3 days 0 hours' });
+          options.info[5].should.match({ label: 'Notes:', value: 'Bar' });
+          done();
+        }
+      }
+    };
+
+    var sbx = sandbox.clientInit(ctx, Date.now(), data);
+    sage.updateVisualisation(sbx);
+
+  });
+
+  it('set a pill to the current age since start without change', function (done) {
+
+    var data = {
+      sensorTreatments: [
+        {eventType: 'Sensor Start', notes: 'Bar', mills: Date.now() - times.days(3).msecs}
+      ]
+    };
+
+    var ctx = {
+      settings: {}
+      , pluginBase: {
+        updatePillText: function mockedUpdatePillText(plugin, options) {
+          options.value.should.equal('3d0h');
+          options.info[0].label.should.equal('Sensor Start');
+          options.info[1].should.match({ label: 'Duration', value: '3 days 0 hours' });
+          options.info[2].should.match({ label: 'Notes:', value: 'Bar' });
+          done();
+        }
+      }
+    };
+
+    var sbx = sandbox.clientInit(ctx, Date.now(), data);
+    sage.updateVisualisation(sbx);
+
+  });
+
+  it('set a pill to the current age since change without start', function (done) {
+
+    var data = {
+      sensorTreatments: [
+        {eventType: 'Sensor Change', notes: 'Foo', mills: Date.now() - times.days(3).msecs}
+      ]
+    };
+
+    var ctx = {
+      settings: {}
+      , pluginBase: {
+        updatePillText: function mockedUpdatePillText(plugin, options) {
+          options.value.should.equal('3d0h');
+          options.info[0].label.should.equal('Sensor Insert');
+          options.info[1].should.match({ label: 'Duration', value: '3 days 0 hours' });
+          options.info[2].should.match({ label: 'Notes:', value: 'Foo' });
+          done();
+        }
+      }
+    };
+
+    var sbx = sandbox.clientInit(ctx, Date.now(), data);
+    sage.updateVisualisation(sbx);
+
+  });
+
+  it('set a pill to the current age since change after start', function (done) {
+
+    var data = {
+      sensorTreatments: [
+        {eventType: 'Sensor Start', notes: 'Bar', mills: Date.now() - times.days(10).msecs}
+        , {eventType: 'Sensor Change', notes: 'Foo', mills: Date.now() - times.days(3).msecs}
+      ]
+    };
+
+    var ctx = {
+      settings: {}
+      , pluginBase: {
+        updatePillText: function mockedUpdatePillText(plugin, options) {
+          options.value.should.equal('3d0h');
+          options.info.length.should.equal(3);
+          options.info[0].label.should.equal('Sensor Insert');
+          options.info[1].should.match({ label: 'Duration', value: '3 days 0 hours' });
+          options.info[2].should.match({ label: 'Notes:', value: 'Foo' });
+          done();
+        }
+      }
+    };
+
+    var sbx = sandbox.clientInit(ctx, Date.now(), data);
+    sage.updateVisualisation(sbx);
+
+  });
+
+  it('trigger an alarm when sensor is 6 days and 22 hours old', function (done) {
+    ctx.notifications.initRequests();
+
+    var before = Date.now() - times.days(6).msecs - times.hours(22).msecs;
+
+    ctx.ddata.sensorTreatments = [{eventType: 'Sensor Start', mills: before}];
+
+    var sbx = prepareSandbox();
+    sbx.extendedSettings = { 'enableAlerts': true };
+    sage.checkNotifications(sbx);
+
+    var highest = ctx.notifications.findHighestAlarm('SAGE');
+    highest.level.should.equal(levels.URGENT);
+    highest.title.should.equal('Sensor age 6 days 22 hours');
+    done();
+  });
+
+  it('not trigger an alarm when sensor is 6 days and 23 hours old', function (done) {
+    ctx.notifications.initRequests();
+
+    var before = Date.now() - times.days(6).msecs - times.hours(23).msecs;
+
+    ctx.ddata.sensorTreatments = [{eventType: 'Sensor Start', mills: before}];
+
+    var sbx = prepareSandbox();
+    sbx.extendedSettings = { 'enableAlerts': true };
+    sage.checkNotifications(sbx);
+
+    should.not.exist(ctx.notifications.findHighestAlarm('SAGE'));
+    done();
+  });
+
+});