Revize 8cca41c0

Re #8775 - Agregovat grafy se stejným typem sensoru

• graph loading decomposition
• some bugs fixed

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

@@ -64 +64 @@
             if (!this.sensorGroups.some(group => group === sensorType)) {
               this.sensorGroups.push(sensorType);
               setTimeout(() => {
-                GraphLoader.getGraph(null, null, null, '#vega_container_' + sensor.sensorId.toString().slice(0, 5));
+                //GraphLoader.getAnalyticsGraph(null, null, null, '#vega_container_' + sensor.sensorId.toString().slice(0, 5));
+                GraphLoader.getGraph(null, null, '#vega_container_' + sensor.sensorId.toString().slice(0, 5),null );
               }, 0);
             }
           });
@@ -109 +110 @@
             if (response.status === 200) {
               return response.body;
             } else if (response.status === 204) {
-              GraphLoader.getGraph(null, null, null, '#vega_container_' + selectSens.toString().slice(0, 5));
+              //GraphLoader.getAnalyticsGraph(null, null, null, '#vega_container_' + selectSens.toString().slice(0, 5));
+              GraphLoader.getGraph(null, null, '#vega_container_' + selectSens.toString().slice(0, 5),null );
               this.toastService.showWarningNoData();
               return response.body;
             } else {
@@ -124 +126 @@
               if (data[key].data) {
                 const view = '#vega_container_' + key.slice(0, 5);
                 if (this.selectedSensors.some(sens => sens.toString() === key)) {
-                  GraphLoader.getGraph(key, data[key].data, data[key].interval, view);
+                  //GraphLoader.getAnalyticsGraph(key, data[key].data, data[key].interval, view);
+                  //GraphLoader.getGraph(this.selectedSensors, this.filteredAnalyticsData(groupId), view, true);
                 } else {
-                  GraphLoader.getGraph(null, null, null, view);
+                  GraphLoader.getGraph(null, null, view, null);
                 }
               }
             }
@@ -155 +158 @@
             if (data[key].data) {
               const view = '#vega_container_' + key.slice(0, 5);
               if (this.selectedSensors.some(sens => sens.toString() === key)) {
-                GraphLoader.getGraph(key, data[key].data, data[key].interval, view);
+               // GraphLoader.getAnalyticsGraph(key, data[key].data, data[key].interval, view);
+                GraphLoader.getGraph(this.selectedSensors, this.analyticsData, view, true);
               } else {
-                GraphLoader.getGraph(null, null, null, view);
+                //GraphLoader.getAnalyticsGraph(null, null, null, view);
+                GraphLoader.getGraph(null, null, view, null);
               }
             }
           }
@@ -175 +180 @@
     const groupId = sensorId.toString().slice(0, 5);
     const sensorGroupElement = '#vega_container_' + groupId;
     if (!this.selectedSensors.find(sensId => sensId.toString().slice(0, 5) === groupId)) { // if group of sensors is empty show empty graph
-      GraphLoader.getGraph(null, null, null, sensorGroupElement);
+      //GraphLoader.getAnalyticsGraph(null, null, null, sensorGroupElement);
+      GraphLoader.getGraph(null, null, sensorGroupElement, null);
     } else {
       if (this.useAnalyticsData) { // use analytics data
         if (event.checked) { // if checked > add to graph
           if (this.analyticsData.some(sens => sens.sensorId === sensorId)) { // if already data for selected sensor in memory
-            GraphLoader.getGraph(sensorId, this.analyticsData.find(sens => sens.sensorId === sensorId).data,
-              this.analyticsData.find(sens => sens.sensorId === sensorId).interval, sensorGroupElement);
+            //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, sensorGroupElement, true);
+
           } else { // get data from server for added sensor and show graph for selected sensors
             this.showGraph(false, sensorId);
           }
         } else { // remove sensor from graph
-          GraphLoader.getGraph(sensorId, this.analyticsData.find(sens => sens.sensorId === sensorId).data,
-            this.analyticsData.find(sens => sens.sensorId === sensorId).interval, sensorGroupElement);
+          //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, sensorGroupElement, true);
+
         }
       } else { // use observations data
         if (event.checked) { // if checked > add to graph
           if (this.observationsData.some(sens => sens.sensorId.toString() === sensorId)) { // if already data for selected sensor in memory
-            GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement)
+            GraphLoader.getGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement, false);
+            //GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement)
           } else { // get data from server for added sensor and show graph for selected sensors
             this.showGraph(false, sensorId);
           }
         } else { // remove sensor from graph
-          GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement)
+          //GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement)
+          GraphLoader.getGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement, false);
         }
       }
     }
@@ -215 +227 @@
   /**
    * Filter analytics data only fro selected sensors.
    */
-  filteredAnalyticsData(): any {
-    return this.analyticsData.filter(sen => this.selectedSensors.includes(sen.sensorId.toString()));
+  filteredAnalyticsData(sensorGroupId: string): any {
+    return this.analyticsData.filter(sen => this.selectedSensors.includes(sen.sensorId.toString()) &&
+      sen.sensorId.toString().slice(0, 5) === sensorGroupId);
   }
 
   private getObservations(range: Date[], changedDate: boolean, changedSensorId: string) {
@@ -250 +263 @@
               const view = '#vega_container_' + selectSens.toString().slice(0, 5);
               setTimeout(() => {
                 console.log(this.selectedSensors);
-                GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(selectSens.toString().slice(0, 5)), view);
+                //GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(selectSens.toString().slice(0, 5)), view);
+                GraphLoader.getGraph(this.selectedSensors,  this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view, false);
               }, 10);
             }
           })
@@ -280 +294 @@
           const view = '#vega_container_' + changedSensorId.toString().slice(0, 5);
           if (observations) {
             console.log(this.observationsData);
-            GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view);
+            GraphLoader.getGraph(this.selectedSensors,  this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view, false);
+            //GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view);
           } else {
-            GraphLoader.getMultilineGraph(null, null, null);
+            //GraphLoader.getMultilineGraph(null, null, null);
+            GraphLoader.getGraph(this.selectedSensors,  this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view, false);
           }
         }, err => this.toastService.showError(err.error.message));
     }