Revize 66c042f1

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

• bugs fixed
• sensors and units sending request to new methods
• ready for observation data

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

@@ -65 +65 @@
               this.sensorGroups.push(sensorType);
               setTimeout(() => {
                 //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 );
+                GraphLoader.getGraph(null, null, null, '#vega_container_' + sensor.sensorId.toString().slice(0, 5),null );
               }, 0);
             }
           });
@@ -101 +101 @@
   }
 
   getAnalytics(range: Date[], changedDate: boolean, changedSensor: string) {
+    const groupId = changedSensor.toString().slice(0, 5);
     if (changedDate) {
       this.selectedSensors.forEach(selectSens => {
         this.analyticsService.getAnalytics$Response({unit_id: this.unitId, sensor_id: parseInt(selectSens, 10),
@@ -111 +112 @@
               return response.body;
             } else if (response.status === 204) {
               //GraphLoader.getAnalyticsGraph(null, null, null, '#vega_container_' + selectSens.toString().slice(0, 5));
-              GraphLoader.getGraph(null, null, '#vega_container_' + selectSens.toString().slice(0, 5),null );
+              GraphLoader.getGraph(null, null, null, '#vega_container_' + selectSens.toString().slice(0, 5),null );
               this.toastService.showWarningNoData();
               return response.body;
             } else {
@@ -129 +130 @@
                   //GraphLoader.getAnalyticsGraph(key, data[key].data, data[key].interval, view);
                   //GraphLoader.getGraph(this.selectedSensors, this.filteredAnalyticsData(groupId), view, true);
                 } else {
-                  GraphLoader.getGraph(null, null, view, null);
+                  GraphLoader.getGraph(null, null, null, view, null);
                 }
               }
             }
@@ -159 +160 @@
               const view = '#vega_container_' + key.slice(0, 5);
               if (this.selectedSensors.some(sens => sens.toString() === key)) {
                // GraphLoader.getAnalyticsGraph(key, data[key].data, data[key].interval, view);
-                GraphLoader.getGraph(this.selectedSensors, this.analyticsData, view, true);
+                GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), view, true);
               } else {
                 //GraphLoader.getAnalyticsGraph(null, null, null, view);
-                GraphLoader.getGraph(null, null, view, null);
+                GraphLoader.getGraph(null, null, null, view, null);
               }
             }
           }
@@ -181 +182 @@
     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.getAnalyticsGraph(null, null, null, sensorGroupElement);
-      GraphLoader.getGraph(null, null, sensorGroupElement, null);
+      GraphLoader.getGraph(null, 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.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);
+            GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), sensorGroupElement, true);
 
           } else { // get data from server for added sensor and show graph for selected sensors
             this.showGraph(false, sensorId);
@@ -196 +197 @@
         } 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, sensorGroupElement, true);
+          GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), 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.getGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement, false);
+            GraphLoader.getGraph(this.filteredSelectedSensors(groupId), this.filteredObservationData(groupId), this.filteredSensorsInfos(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.getGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement, false);
+          GraphLoader.getGraph(this.filteredSelectedSensors(groupId), this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), sensorGroupElement, false);
+
         }
       }
     }
@@ -232 +234 @@
       sen.sensorId.toString().slice(0, 5) === sensorGroupId);
   }
 
+
+  filteredSelectedSensors(sensorGroupId: string): any {
+    return this.selectedSensors.filter(sen => sen.toString().slice(0, 5) == sensorGroupId );
+  }
+
+  filteredSensorsInfos(sensorGroupId: string): any {
+    return this.sensors.filter(sen => this.selectedSensors.includes(sen.sensorId.toString()) &&
+      sen.sensorId.toString().slice(0, 5) == sensorGroupId);
+  }
+
   private getObservations(range: Date[], changedDate: boolean, changedSensorId: string) {
+    const groupId = changedSensorId.toString().slice(0, 5);
     if (changedDate) { // if changed date we need new data for all sensors
       this.observationsData = []; // empty observation data
       this.selectedSensors.forEach(selectSens => {
@@ -264 +277 @@
               setTimeout(() => {
                 console.log(this.selectedSensors);
                 //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);
+                GraphLoader.getGraph(this.filteredSelectedSensors(groupId),  this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), view, false);
               }, 10);
             }
           })
@@ -292 +305 @@
           this.observationsData.push({sensorId: changedSensorId, sensor:
               this.sensors.find(sens => sens.sensorId.toString() === changedSensorId.toString()), data: observations});
           const view = '#vega_container_' + changedSensorId.toString().slice(0, 5);
-          if (observations) {
-            console.log(this.observationsData);
-            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.getGraph(this.selectedSensors,  this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view, false);
-          }
+
+            GraphLoader.getGraph(this.filteredSelectedSensors(groupId),  this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), view, false);
         }, err => this.toastService.showError(err.error.message));
     }
   }