Merge branch 'master' into issue-192

NASA-AMMOS · Mar 10, 2021 · 2351b2c · 2351b2c
2 parents 34af797 + 6cfa654
commit 2351b2c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ait/gui/static/js/ait/dtype.js b/ait/gui/static/js/ait/dtype.js
@@ -206,7 +206,13 @@ class Time32Type extends TimeType
 class Time64Type extends TimeType
 {
     decode (raw) {
-        const parts = String(raw).split('.').map(x => parseInt(x))
+        let parts = [0, 0]
+        if (raw % 1 === 0) {
+            parts = [parseInt(raw), 0]
+        } else {
+            parts = String(raw).split('.').map(x => parseInt(x))
+        }
+
         return new Date(GPSEpoch + (parts[0] * 1000) + (parts[1] / 1e6))
     }
 }

diff --git a/ait/gui/static/package-lock.json b/ait/gui/static/package-lock.json