1 files changed, 30 insertions, 17 deletions

diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue
index 73c5a6f2..24ad77d6 100644
--- a/src/components/_sila/Global/Chart.vue
+++ b/src/components/_sila/Global/Chart.vue
@@ -3,7 +3,7 @@
 </template>
 
 <script>
-import { setTime, setCategories } from './helpers';
+import { setCategories } from './helpers';
 import { Chart } from 'highcharts-vue';
 
 export default {
@@ -33,8 +33,8 @@ export default {
     },
   },
   computed: {
-    groupData() {
-      let tr = this.data.map((metric) => {
+    metricData() {
+      let transform = this.data.map((metric) => {
         let date = new Date(metric.Timestamp);
         let time =
           date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
@@ -45,20 +45,17 @@ export default {
         };
       });
 
-      let group = tr.reduce(function (rv, x) {
+      let group = transform.reduce(function (rv, x) {
         (rv[x['MetricProperty']] = rv[x['MetricProperty']] || []).push(x);
         return rv;
       }, {});
 
-      let arr = Object.keys(group).map((key) => {
+      let metricArr = Object.keys(group).map((key) => {
         let groupTime = group[key].reduce(function (rv, x) {
           (rv[x['Timestamp']] = rv[x['Timestamp']] || []).push(x);
           return rv;
         }, {});
 
-        this.timeData = Object.keys(groupTime).slice(-60);
-        console.log('timeData!!!!!!', this.timeData);
-
         let arr = Object.keys(groupTime).map((key) => {
           const findAverage = (arr) => {
             const { length } = arr;
@@ -75,7 +72,29 @@ export default {
         };
       });
 
-      return arr;
+      return metricArr;
+    },
+
+    metricTime() {
+      let transform = this.data.map((metric) => {
+        let date = new Date(metric.Timestamp);
+        let time =
+          date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
+        return {
+          ...metric,
+          Timestamp: time,
+          MetricValue: Math.round(metric.MetricValue),
+        };
+      });
+
+      let timeGroup = transform.reduce(function (rv, x) {
+        (rv[x['Timestamp']] = rv[x['Timestamp']] || []).push(x);
+        return rv;
+      }, {});
+
+      let timeArr = Object.keys(timeGroup).slice(-60);
+
+      return timeArr;
     },
 
     chartOptions() {
@@ -87,7 +106,7 @@ export default {
         },
         title: null,
         xAxis: {
-          categories: setTime(60, 'hour'),
+          categories: this.metricTime,
           title: null,
           labels: {
             step: 10,
@@ -137,7 +156,7 @@ export default {
             },
           ],
         },
-        series: this.groupData.map((item) => ({
+        series: this.metricData.map((item) => ({
           ...item,
           marker: {
             enabled: false,
@@ -158,12 +177,6 @@ export default {
       };
     },
   },
-
-  /*  watch: {
-    groupData() {
-      console.log('group data!!!', this.groupData);
-    },
-  },*/
 };
 </script>
 <style lang="scss">