add transform time

3 files changed, 18 insertions, 5 deletions

diff --git a/src/components/_sila/AppHeader/AppHeader.vue b/src/components/_sila/AppHeader/AppHeader.vue
index 22c15482..fd0fe497 100644
--- a/src/components/_sila/AppHeader/AppHeader.vue
+++ b/src/components/_sila/AppHeader/AppHeader.vue
@@ -225,6 +225,8 @@ import IconNotification from '@carbon/icons-vue/es/notification/20';
 import StatusIcon from '@/components/Global/StatusIcon';
 import LoadingBar from '@/components/Global/LoadingBar';
 
+import { hhMM } from '@/utilities/_sila/transformTime';
+
 export default {
   name: 'AppHeader',
   components: {
@@ -260,7 +262,11 @@ export default {
       return this.assetTag || this.modelType || this.serialNumber;
     },
     bmcTime() {
-      return this.$store.getters['global/bmcTime']?.toLocaleTimeString();
+      if (!this.$store.getters['global/bmcTime']) {
+        return;
+      }
+
+      return hhMM(this.$store.getters['global/bmcTime']);
     },
     assetTag() {
       return this.$store.getters['global/assetTag'];
diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue
index 19491f68..b818b258 100644
--- a/src/components/_sila/Global/Chart.vue
+++ b/src/components/_sila/Global/Chart.vue
@@ -4,6 +4,7 @@
 
 <script>
 import { Chart } from 'highcharts-vue';
+import { hhMM } from '@/utilities/_sila/transformTime';
 
 export default {
   components: {
@@ -61,14 +62,13 @@ export default {
         return metric.Value !== 'nan';
       });
 
-      filteredData.sort((a, b) => {
+      /*filteredData.sort((a, b) => {
         return new Date(a.Timestamp) - new Date(b.Timestamp);
-      });
+      });*/
 
       let transform = filteredData.map((metric) => {
         let date = new Date(metric.Timestamp);
-        let time =
-          date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
+        let time = hhMM(date);
         return {
           ...metric,
           Timestamp: time,
diff --git a/src/utilities/_sila/transformTime.js b/src/utilities/_sila/transformTime.js
new file mode 100644
index 00000000..f242b800
--- /dev/null
+++ b/src/utilities/_sila/transformTime.js
@@ -0,0 +1,7 @@
+export function hhMM(date) {
+  return (
+    String(date.getHours()).padStart(2, '0') +
+    ':' +
+    String(date.getMinutes()).padStart(2, '0')
+  );
+}