From cae6ddccb7fb58a178497586398fca5675c22d3a Mon Sep 17 00:00:00 2001
From: Thomas Basler <thomas@familie-basler.net>
Date: Mon, 17 Oct 2022 21:13:18 +0200
Subject: [PATCH] webapp: add utils method timestampToString

---
 webapp/src/components/EventLog.vue     | 14 ++------------
 webapp/src/components/FirmwareInfo.vue | 12 ++----------
 webapp/src/utils/index.ts              |  9 +++++++++
 webapp/src/utils/time.ts               | 17 +++++++++++++++++
 4 files changed, 30 insertions(+), 22 deletions(-)
 create mode 100644 webapp/src/utils/index.ts
 create mode 100644 webapp/src/utils/time.ts

diff --git a/webapp/src/components/EventLog.vue b/webapp/src/components/EventLog.vue
index 5b14c7f..fbcf174 100644
--- a/webapp/src/components/EventLog.vue
+++ b/webapp/src/components/EventLog.vue
@@ -21,6 +21,7 @@
 
 <script lang="ts">
 import { defineComponent } from 'vue';
+import { timestampToString } from '@/utils';
 
 declare interface EventData {
     message_id: number,
@@ -41,18 +42,7 @@ export default defineComponent({
     computed: {
         timeInHours() {
             return (value: number) => {
-                const days = Math.floor(value / (24 * 60 * 60));
-                const secAfterDays = value - days * (24 * 60 * 60);
-                const hours = Math.floor(secAfterDays / (60 * 60));
-                const secAfterHours = secAfterDays - hours * (60 * 60);
-                const minutes = Math.floor(secAfterHours / 60);
-                const seconds = secAfterHours - minutes * 60;
-
-                const dHours = hours > 9 ? hours : "0" + hours;
-                const dMins = minutes > 9 ? minutes : "0" + minutes;
-                const dSecs = seconds > 9 ? seconds : "0" + seconds;
-
-                return dHours + ":" + dMins + ":" + dSecs;
+                return timestampToString(value);
             };
         },
     },
diff --git a/webapp/src/components/FirmwareInfo.vue b/webapp/src/components/FirmwareInfo.vue
index 65948d0..385d22b 100644
--- a/webapp/src/components/FirmwareInfo.vue
+++ b/webapp/src/components/FirmwareInfo.vue
@@ -56,6 +56,7 @@
 <script lang="ts">
 import { defineComponent, type PropType } from 'vue';
 import type { SystemStatus } from '@/types/SystemStatus';
+import { timestampToString } from '@/utils';
 
 export default defineComponent({
     props: {
@@ -64,16 +65,7 @@ export default defineComponent({
     computed: {
         timeInHours() {
             return (value: number) => {
-                const days = Math.floor(value / 3600 / 24);
-                const hours = Math.floor((value - days * 3600 * 24) / 3600);
-                const minutes = Math.floor((value - days * 3600 * 24 - hours * 3600) / 60);
-                const seconds = (value - days * 3600 * 24 - hours * 3600 + minutes * 60) % 60;
-
-                const dHours = hours > 9 ? hours : "0" + hours;
-                const dMins = minutes > 9 ? minutes : "0" + minutes;
-                const dSecs = seconds > 9 ? seconds : "0" + seconds;
-
-                return days + " days " + dHours + ":" + dMins + ":" + dSecs;
+                return timestampToString(value, true);
             };
         },
     },
diff --git a/webapp/src/utils/index.ts b/webapp/src/utils/index.ts
new file mode 100644
index 0000000..0db1778
--- /dev/null
+++ b/webapp/src/utils/index.ts
@@ -0,0 +1,9 @@
+import { timestampToString } from './time';
+
+export {
+    timestampToString,
+};
+
+export default {
+    timestampToString,
+}
\ No newline at end of file
diff --git a/webapp/src/utils/time.ts b/webapp/src/utils/time.ts
new file mode 100644
index 0000000..2c87796
--- /dev/null
+++ b/webapp/src/utils/time.ts
@@ -0,0 +1,17 @@
+export const timestampToString = (value: number, includeDays = false): string => {
+    const days = Math.floor(value / (24 * 60 * 60));
+    const secAfterDays = value - days * (24 * 60 * 60);
+    const hours = Math.floor(secAfterDays / (60 * 60));
+    const secAfterHours = secAfterDays - hours * (60 * 60);
+    const minutes = Math.floor(secAfterHours / 60);
+    const seconds = secAfterHours - minutes * 60;
+
+    const dHours = hours > 9 ? hours : "0" + hours;
+    const dMins = minutes > 9 ? minutes : "0" + minutes;
+    const dSecs = seconds > 9 ? seconds : "0" + seconds;
+
+    if (includeDays) {
+        return days + " days " + dHours + ":" + dMins + ":" + dSecs;
+    }
+    return dHours + ":" + dMins + ":" + dSecs;
+}
\ No newline at end of file