combine the iob and bolus snooze lines, and move above pump clock

nightscout · Dec 2, 2015 · d59a551 · d59a551
1 parent eec7156
commit d59a551
Showing 1 changed file with 14 additions and 8 deletions.
diff --git a/lib/plugins/openaps.js b/lib/plugins/openaps.js
@@ -75,21 +75,27 @@ function init() {
       });
     }
 
+    if (prop.openaps && prop.openaps.iob) {
+      var iobTime = moment(prop.openaps.iob.timestamp);
+      if (iobTime.isAfter(recent)) {
+        info.push({
+          label: 'IOB'
+          , value: [
+            sbx.roundInsulinForDisplayFormat(prop.openaps.iob.iob) + 'U'
+            , ', Bolus Snooze ' + sbx.roundInsulinForDisplayFormat(prop.openaps.iob.bolusiob) + 'U'
+            , timeAt(true, sbx) + timeFormat(iobTime, sbx)
+          ].join('')
+        });
+      }
+    }
+
     if (prop.pump && prop.pump.clock) {
       var pumpTime = moment(prop.pump.clock);
       if (pumpTime.isAfter(recent)) {
         info.push({label: 'Last Pump Clock', value: pumpTime.format('LT')});
       }
     }
 
-    if (prop.openaps && prop.openaps.iob) {
-      var iobTime = moment(prop.openaps.iob.timestamp);
-      if (iobTime.isAfter(recent)) {
-        info.push({label: 'IOB', value: sbx.roundInsulinForDisplayFormat(prop.openaps.iob.iob) + 'U' + timeAt(true, sbx) + timeFormat(iobTime, sbx)});
-        info.push({label: 'Bolus Snooze IOB', value: sbx.roundInsulinForDisplayFormat(prop.openaps.iob.bolusiob) + 'U'});
-      }
-    }
-
     sbx.pluginBase.updatePillText(openaps, {
       value: timeFormat(prop.status.when, sbx)
       , label: 'OpenAPS ' + prop.status.symbol