Support pump status upload display override (nightscout#6698)

ivalkou · Apr 8, 2021 · 521b874 · 521b874
1 parent d543035
commit 521b874
Show file tree

Hide file tree

Showing 2 changed files with 77 additions and 1 deletion.
diff --git a/lib/plugins/pump.js b/lib/plugins/pump.js
@@ -225,7 +225,11 @@ function init (ctx) {
   function updateReservoir (prefs, result) {
     if (result.reservoir) {
       result.reservoir.label = 'Reservoir';
-      result.reservoir.display = result.reservoir.value.toPrecision(3) + 'U';
+      if (result.reservoir_display_override) {
+        result.reservoir.display = result.reservoir_display_override;
+      } else {
+        result.reservoir.display = result.reservoir.value.toPrecision(3) + 'U';
+      }
       if (result.reservoir.value < prefs.urgentRes) {
         result.reservoir.level = levels.URGENT;
         result.reservoir.message = 'URGENT: Pump Reservoir Low';
@@ -301,6 +305,7 @@ function init (ctx) {
       level: levels.NONE
       , clock: pump.clock ? { value: moment(pump.clock) } : null
       , reservoir: pump.reservoir || pump.reservoir === 0 ? { value: pump.reservoir } : null
+      , reservoir_display_override: pump.reservoir_display_override || null
       , manufacturer: pump.manufacturer
       , model: pump.model
       , extended: pump.extended || null

diff --git a/tests/pump.test.js b/tests/pump.test.js
@@ -51,12 +51,54 @@ var statuses = [{
   }
 }];
 
+
+var statuses2 = [{
+  created_at: '2015-12-05T17:35:00.000Z'
+  , device: 'openaps://farawaypi'
+  , pump: {
+    battery: {
+      status: 'normal',
+      voltage: 1.52
+    },
+    status: {
+      status: 'normal',
+      bolusing: false,
+      suspended: false
+    },
+    reservoir: 86.4,
+    reservoir_display_override: '50+U',
+    clock: '2015-12-05T17:32:00.000Z'
+  }
+}, {
+  created_at: '2015-12-05T19:05:00.000Z'
+  , device: 'openaps://abusypi'
+  , pump: {
+    battery: {
+      status: 'normal',
+      voltage: 1.52
+    },
+    status: {
+      status: 'normal',
+      bolusing: false,
+      suspended: false
+    },
+    reservoir: 86.4,
+    reservoir_display_override: '50+U',
+    clock: '2015-12-05T19:02:00.000Z'
+  }
+}];
+
+
 var now = moment(statuses[1].created_at);
 
 _.forEach(statuses, function updateMills (status) {
   status.mills = moment(status.created_at).valueOf();
 });
 
+_.forEach(statuses2, function updateMills (status) {
+  status.mills = moment(status.created_at).valueOf();
+});
+
 describe('pump', function ( ) {
 
   it('set the property and update the pill', function (done) {
@@ -92,7 +134,36 @@ describe('pump', function ( ) {
     };
 
     pump.setProperties(sbx);
+    pump.updateVisualisation(sbx);
+
+  });
 
+  it('use reservoir_display_override when available', function (done) {
+    var ctx = {
+      settings: {
+        units: 'mmol'
+      }
+      , pluginBase: {
+        updatePillText: function mockedUpdatePillText(plugin, options) {
+          options.label.should.equal('Pump');
+          options.value.should.equal('50+U');
+          done();
+        }
+      }
+      , language: language
+      , levels: levels
+    };
+
+    var sbx = sandbox.clientInit(ctx, now.valueOf(), {devicestatus: statuses2});
+
+    var unmockedOfferProperty = sbx.offerProperty;
+    sbx.offerProperty = function mockedOfferProperty (name, setter) {
+      name.should.equal('pump');
+      sbx.offerProperty = unmockedOfferProperty;
+      unmockedOfferProperty(name, setter);
+    };
+
+    pump.setProperties(sbx);
     pump.updateVisualisation(sbx);
 
   });