Merge pull request #7385 from ps2/automatic-bolus

Support automatic bolus volumes in the enacted field for loop status.
nightscout · Apr 30, 2022 · 555f699 · 555f699
2 parents d53f574 + eb8b71c
commit 555f699
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/lib/plugins/loop.js b/lib/plugins/loop.js
@@ -231,7 +231,7 @@ function init (ctx) {
         , split: false
         , targets: false
         , reasons: reasonconf
-        , otp: true 
+        , otp: true
         , submitHook: postLoopNotification
       },
       {
@@ -252,24 +252,24 @@ function init (ctx) {
       {
         val: 'Remote Carbs Entry'
         , name: 'Remote Carbs Entry'
-        , remoteCarbs: true 
-        , remoteAbsorption: true 
-        , otp: true 
+        , remoteCarbs: true
+        , remoteAbsorption: true
+        , otp: true
         , submitHook: postLoopNotification
       },
       {
         val: 'Remote Bolus Entry'
         , name: 'Remote Bolus Entry'
-        , remoteBolus: true 
-        , otp: true 
+        , remoteBolus: true
+        , otp: true
         , submitHook: postLoopNotification
       }
     ];
   };
 
   // TODO: Add event listener to customize labels
 
- 
+
   loop.updateVisualisation = function updateVisualisation (sbx) {
     var prop = sbx.properties.loop;
 
@@ -356,13 +356,20 @@ function init (ctx) {
 
     function addLastEnacted () {
       if (prop.lastEnacted) {
-        var canceled = prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0;
+        var valueParts = []
 
-        var valueParts = [
-          '<b>Temp Basal' + (canceled ? ' Canceled' : ' Started') + '</b>'
-          , canceled ? '' : ' ' + prop.lastEnacted.rate.toFixed(2) + 'U/hour for ' + prop.lastEnacted.duration + 'm'
-          , valueString(', ', prop.lastEnacted.reason)
-        ];
+        if (prop.lastEnacted.rate === 0 && prop.lastEnacted.duration === 0) {
+          valueParts.push('<b>Temp Basal Canceled</b>')
+        }
+        if (prop.lastEnacted.rate != null) {
+          valueParts.push('<b>Temp Basal Started</b>')
+          valueParts.push(' ' + prop.lastEnacted.rate.toFixed(2) + 'U/hour for ' + prop.lastEnacted.duration + 'm')
+        }
+        if (prop.lastEnacted.bolusVolume) {
+          valueParts.push('<b>Automatic Bolus</b>')
+          valueParts.push(' ' + prop.lastEnacted.bolusVolume + 'U')
+        }
+        valueParts.push(valueString(', ', prop.lastEnacted.reason))
 
         valueParts = concatIOB(valueParts);
         valueParts = concatCOB(valueParts);