From 3f7d5c4d3c5a0e80fe34a728c2a3634c07069f0d Mon Sep 17 00:00:00 2001
From: Vitalii Lysak <v.lysak@dunice.net>
Date: Mon, 25 Jul 2022 16:07:51 +0300
Subject: upd chart for fan

---
 src/components/_sila/Global/Chart.vue            | 22 ++++++++++++++++------
 src/views/_sila/Fans/Dynamic/FansDynamicPage.vue |  1 +
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue
index d17a5042..d478e615 100644
--- a/src/components/_sila/Global/Chart.vue
+++ b/src/components/_sila/Global/Chart.vue
@@ -60,8 +60,13 @@ export default {
 
       let transform = filteredData.map((metric) => {
         let date = new Date(metric.Timestamp);
-        let time =
-          date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
+        let time;
+        if (this.timeScale === 'hour') {
+          time =
+            date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
+        } else {
+          time = date.getHours() + ':00';
+        }
         return {
           ...metric,
           Timestamp: time,
@@ -94,7 +99,7 @@ export default {
 
         return {
           name: key,
-          data: arr.slice(-60),
+          data: arr,
           color: this.colors[index],
         };
       });
@@ -109,8 +114,13 @@ export default {
 
       let transform = filteredData.map((metric) => {
         let date = new Date(metric.Timestamp);
-        let time =
-          date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
+        let time;
+        if (this.timeScale === 'hour') {
+          time =
+            date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0');
+        } else {
+          time = date.getHours() + ':00';
+        }
         return {
           ...metric,
           Timestamp: time,
@@ -123,7 +133,7 @@ export default {
         return rv;
       }, {});
 
-      let timeArr = Object.keys(timeGroup).slice(-60);
+      let timeArr = Object.keys(timeGroup);
 
       return timeArr;
     },
diff --git a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
index a1a95ae8..c0c9bfa2 100644
--- a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
+++ b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue
@@ -45,6 +45,7 @@
       <chart
         type="fans"
         :colors="colors"
+        :time-scale="timeScale"
         :data="filteredSensors"
         :warning="fanSpeedWarninig"
         :shutdown="fanSpeedShutdown"
-- 
cgit v1.2.3