Merge branch 'openaps-performance-improvement' into test-branch

aslzo · Sep 3, 2020 · 4de0434 · 4de0434
2 parents 29984ed + b7a0124
commit 4de0434
Showing 1 changed file with 34 additions and 4 deletions.
diff --git a/lib/plugins/openaps.js b/lib/plugins/openaps.js
@@ -123,12 +123,42 @@ function init (ctx) {
     }
 
     function toMoments (status) {
+      var enacted = false;
+      var notEnacted = false;
+      if (status.openaps.enacted && status.openaps.enacted.timestamp && (status.openaps.enacted.recieved || status.openaps.enacted.received)) {
+        if (status.openaps.enacted.mills) {
+          enacted = moment(status.openaps.enacted.mills);
+        } else {
+          enacted = moment(status.openaps.enacted.timestamp);
+        }
+      } else if (status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.received)) {
+        if (status.openaps.enacted.mills) {
+          moment(status.openaps.enacted.mills)
+        } else {
+          moment(status.openaps.enacted.timestamp)
+        }
+      }
+
+      var suggested = false;
+      if (status.openaps.suggested && status.openaps.suggested.mills) {
+        suggested = moment(status.openaps.suggested.mills);
+      } else if (status.openaps.suggested && status.openaps.suggested.timestamp) {
+        suggested = moment(status.openaps.suggested.timestamp);
+      }
+
+      var iob = false;
+      if (status.openaps.iob && status.openaps.iob.mills) {
+        iob = moment(status.openaps.iob.mills);
+      } else if (status.openaps.iob && status.openaps.iob.timestamp) {
+        iob = moment(status.openaps.iob.timestamp);
+      }
+
       return {
         when: moment(status.mills)
-        , enacted: status.openaps.enacted && status.openaps.enacted.timestamp && (status.openaps.enacted.recieved || status.openaps.enacted.received) && moment(status.openaps.enacted.timestamp)
-        , notEnacted: status.openaps.enacted && status.openaps.enacted.timestamp && !(status.openaps.enacted.recieved || status.openaps.enacted.received) && moment(status.openaps.enacted.timestamp)
-        , suggested: status.openaps.suggested && status.openaps.suggested.timestamp && moment(status.openaps.suggested.timestamp)
-        , iob: status.openaps.iob && status.openaps.iob.timestamp && moment(status.openaps.iob.timestamp)
+        , enacted
+        , notEnacted
+        , suggested
+        , iob
       };
     }