Revize 6842a0b0

Re #8928 - Oprava chyb vzniklých v průběhu iterace

• change graphloader calling
• fix tooltip for negative values

src/app/unit/components/unit.component.ts

@@ -137 +137 @@
   getAnalytics(range: Date[], changedDate: boolean, changedSensorId: string) {
     if (changedDate) { // if changed date we need new data for all sensors
       this.selectedSensors.forEach(selectSens => {
+        this.analyticsData = []; //empty analytics data
         this.analyticsEndpointRequest(selectSens, range);
       });
     } else  { // add data for selected sensor
@@ -165 +166 @@
       })
     ).subscribe(data => {
       if (data) {
-        this.analyticsData.push({sensorId, data: data[sensorId].data, interval: data[sensorId].interval});
+        this.analyticsData.push({sensorId, data: data[sensorId].data, interval: data[sensorId].interval,
+          sensor: this.sensors.find(sens => sens.sensorId.toString() === sensorId.toString())});
         if (data[sensorId].data) {
           const groupId = sensorId.slice(0, 5);
           const view = '#vega_container_' + groupId;
           if (this.selectedSensors.some(sens => sens.toString() === sensorId)) {
             // GraphLoader.getAnalyticsGraph(key, data[key].data, data[key].interval, view);
-            GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), view, true);
+            GraphLoader.getGraphWithInterval(this.filteredSelectedSensors(groupId), this.filteredAnalyticsData(groupId), this.filteredAnalyticsData(groupId)[0]['interval'] * 1000, this.filteredSensorsInfos(groupId)[0], view, true);
           } else {
             // GraphLoader.getAnalyticsGraph(null, null, null, view);
             GraphLoader.getGraph(null, null, null, view, null);
@@ -198 +200 @@
           if (this.analyticsData.some(sens => sens.sensorId === sensorId)) { // if already data for selected sensor in memory
             // GraphLoader.getAnalyticsGraph(sensorId, this.analyticsData.find(sens => sens.sensorId === sensorId).data,
             // this.analyticsData.find((sens => sens.sensorId === sensorId).interval, sensorGroupElement);
-            GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), sensorGroupElement, true);
+            //GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), sensorGroupElement, true);
+            GraphLoader.getGraphWithInterval(this.filteredSelectedSensors(groupId), this.filteredAnalyticsData(groupId), this.filteredAnalyticsData(groupId)[0]['interval'] * 1000, this.filteredSensorsInfos(groupId)[0], sensorGroupElement, true);
 
           } else { // get data from server for added sensor and show graph for selected sensors
             this.showGraph(false, sensorId);
@@ -206 +209 @@
         } else { // remove sensor from graph
           // GraphLoader.getAnalyticsGraph(sensorId, this.analyticsData.find(sens => sens.sensorId === sensorId).data,
           // this.analyticsData.find(sens => sens.sensorId === sensorId).interval, sensorGroupElement);
-          GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), sensorGroupElement, true);
+          GraphLoader.getGraphWithInterval(this.filteredSelectedSensors(groupId), this.filteredAnalyticsData(groupId), this.filteredAnalyticsData(groupId)[0]['interval'] * 1000, this.filteredSensorsInfos(groupId)[0], sensorGroupElement, true);
 
         }
       } else { // use observations data