Fix mmol BG display in OpenAPS tooltips

Author: AndyLow91

lib/plugins/openaps.js

@@ -2,7 +2,6 @@
 
 var _ = require('lodash');
 var times = require('../times');
-var consts = require('../constants');
 
 // var ALL_STATUS_FIELDS = ['status-symbol', 'status-label', 'iob', 'meal-assist', 'freq', 'rssi']; Unused variable
 
@@ -387,16 +386,15 @@ function init (ctx) {
       return value ? prefix + value : '';
     }
 
+    function displayBg (bg) {
+      return sbx.roundBGToDisplayFormat(sbx.scaleMgdl(bg));
+    }
+
     var events = [];
 
     function addSuggestion () {
       if (prop.lastSuggested) {
-        var bg = prop.lastSuggested.bg;
-        var units = sbx.settings.units;
-
-        if (units === 'mmol') {
-          bg = Math.round(bg / consts.MMOL_TO_MGDL * 10) / 10;
-        }
+        var bg = displayBg(prop.lastSuggested.bg);
 
         var valueParts = [
           valueString('BG: ', bg)
@@ -478,12 +476,7 @@ function init (ctx) {
 
     if ('enacted' === prop.status.code) {
       var canceled = prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0;
-      var bg = prop.lastEnacted.bg;
-      var units = sbx.settings.units;
-
-      if (units === 'mmol') {
-        bg = Math.round(bg / consts.MMOL_TO_MGDL * 10) / 10;
-      }
+      var bg = displayBg(prop.lastEnacted.bg);
 
       var valueParts = [
         valueString('BG: ', bg)

lib/report_plugins/daytoday.js

@@ -303,7 +303,8 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
         .on('mouseover', function(d) {
           if (options.openAps && d.openaps) {
             client.tooltip.style('display', 'block');
-            var text = '<b>BG:</b> ' + d.openaps.suggested.bg +
+            var bg = client.utils.roundBGForDisplay(client.utils.scaleMgdl(d.openaps.suggested.bg));
+            var text = '<b>BG:</b> ' + bg +
               ', ' + d.openaps.suggested.reason +
               (d.openaps.suggested.mealAssist ? ' <b>Meal Assist:</b> ' + d.openaps.suggested.mealAssist : '');
             client.tooltip.html(text)

tests/openaps.test.js

@@ -297,6 +297,34 @@ describe('openaps', function ( ) {
 
   });
 
+  it('format OpenAPS pill BG in mmol when display units are mmol', function (done) {
+    var ctx = {
+      settings: {
+        units: 'mmol'
+      }
+      , pluginBase: {
+        updatePillText: function mockedUpdatePillText (plugin, options) {
+          var bgEvent = _.find(options.info, function(entry) {
+            return entry.value.indexOf('BG: ') === 0;
+          });
+
+          should.exist(bgEvent);
+          bgEvent.value.should.startWith('BG: 8.2');
+          bgEvent.value.should.not.startWith('BG: 147');
+        }
+        , addForecastPoints: function mockAddForecastPoints () {
+          done();
+        }
+      }
+      , language: language
+    };
+
+    var sbx = sandbox.clientInit(ctx, now.valueOf(), {devicestatus: statuses});
+
+    openaps.setProperties(sbx);
+    openaps.updateVisualisation(sbx);
+  });
+
   it('check the recieved flag to see if it was received', function (done) {
     var ctx = {
       settings: {