Fix Time Diff

dfpc-coe · Feb 14, 2024 · d5af9f2 · d5af9f2
1 parent fbf17cb
commit d5af9f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 29 deletions.
diff --git a/api/web/src/components/Import.vue b/api/web/src/components/Import.vue
@@ -69,6 +69,7 @@
 <script>
 import Status from './util/Status.vue';
 import PageFooter from './PageFooter.vue';
+import timeDiff from '../timediff.js';
 import {
     TablerNone,
     TablerBreadCrumb,
@@ -100,6 +101,9 @@ export default {
         if (this.interval) clearInterval(this.interval);
     },
     methods: {
+        timeDiff(update) {
+            return timeDiff(update);
+        },
         fetch: async function() {
             this.loading = true;
             const url = window.stdurl(`/api/import/${this.$route.params.import}`);
@@ -109,21 +113,6 @@ export default {
                 this.loading = false;
             }
         },
-        timeDiff: function(updated) {
-            const msPerMinute = 60 * 1000;
-            const msPerHour = msPerMinute * 60;
-            const msPerDay = msPerHour * 24;
-            const msPerMonth = msPerDay * 30;
-            const msPerYear = msPerDay * 365;
-            const elapsed = +(new Date()) - updated;
-
-            if (elapsed < msPerMinute) return Math.round(elapsed/1000) + ' seconds ago';
-            if (elapsed < msPerHour) return Math.round(elapsed/msPerMinute) + ' minutes ago';
-            if (elapsed < msPerDay ) return Math.round(elapsed/msPerHour ) + ' hours ago';
-            if (elapsed < msPerMonth) return '~' + Math.round(elapsed/msPerDay) + ' days ago';
-            if (elapsed < msPerYear) return '~' + Math.round(elapsed/msPerMonth) + ' months ago';
-            return '~' + Math.round(elapsed/msPerYear ) + ' years ago';
-        },
     },
     components: {
         Status,

diff --git a/api/web/src/components/Layers.vue b/api/web/src/components/Layers.vue
@@ -92,6 +92,7 @@
 <script>
 import PageFooter from './PageFooter.vue';
 import LayerStatus from './Layer/utils/Status.vue';
+import timeDiff from '../timediff.js';
 import {
     TablerNone,
     TablerPager,
@@ -134,20 +135,8 @@ export default {
         await this.fetchList();
     },
     methods: {
-        timeDiff: function(updated) {
-            const msPerMinute = 60 * 1000;
-            const msPerHour = msPerMinute * 60;
-            const msPerDay = msPerHour * 24;
-            const msPerMonth = msPerDay * 30;
-            const msPerYear = msPerDay * 365;
-            const elapsed = +(new Date()) - updated;
-
-            if (elapsed < msPerMinute) return Math.round(elapsed/1000) + ' seconds ago';
-            if (elapsed < msPerHour) return Math.round(elapsed/msPerMinute) + ' minutes ago';
-            if (elapsed < msPerDay ) return Math.round(elapsed/msPerHour ) + ' hours ago';
-            if (elapsed < msPerMonth) return '~' + Math.round(elapsed/msPerDay) + ' days ago';
-            if (elapsed < msPerYear) return '~' + Math.round(elapsed/msPerMonth) + ' months ago';
-            return '~' + Math.round(elapsed/msPerYear ) + ' years ago';
+        timeDiff(update) {
+            return timeDiff(update);
         },
         fetchList: async function() {
             this.loading = true;