Revize 05d4a2a9

Re #XXXX - Podpora

• fixing merge

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

@@ -64 +64 @@
             if (!this.sensorGroups.some(group => group === sensorType)) {
               this.sensorGroups.push(sensorType);
               setTimeout(() => {
-                //GraphLoader.getAnalyticsGraph(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, null, '#vega_container_' + sensor.sensorId.toString().slice(0, 5),null );
               }, 0);
             }
@@ -111 +111 @@
             if (response.status === 200) {
               return response.body;
             } else if (response.status === 204) {
-              //GraphLoader.getAnalyticsGraph(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, null, '#vega_container_' + selectSens.toString().slice(0, 5),null );
               this.toastService.showWarningNoData();
               return response.body;
@@ -127 +127 @@
               if (data[key].data) {
                 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.filteredAnalyticsData(groupId), view, true);
+                  // 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, null);
                 }
@@ -162 +162 @@
                // GraphLoader.getAnalyticsGraph(key, data[key].data, data[key].interval, view);
                 GraphLoader.getGraph(this.selectedSensors, this.analyticsData, this.filteredSensorsInfos(groupId), view, true);
               } else {
-                //GraphLoader.getAnalyticsGraph(null, null, null, view);
+                // GraphLoader.getAnalyticsGraph(null, null, null, view);
                 GraphLoader.getGraph(null, null, null, view, null);
               }
             }
@@ -181 +181 @@
     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.getAnalyticsGraph(null, null, null, sensorGroupElement);
+      // GraphLoader.getAnalyticsGraph(null, null, null, sensorGroupElement);
       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,
+            // 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);
 
@@ -195 +195 @@
             this.showGraph(false, sensorId);
           }
         } else { // remove sensor from graph
-          //GraphLoader.getAnalyticsGraph(sensorId, this.analyticsData.find(sens => sens.sensorId === sensorId).data,
+          // 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);
 
@@ -203 +203 @@
       } 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.filteredSelectedSensors(groupId), this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), sensorGroupElement, false);
-            //GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement)
+            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.filteredSelectedSensors(groupId), this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), sensorGroupElement, false);
+          // GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(groupId), sensorGroupElement)
+          GraphLoader.getGraph(this.filteredSelectedSensors(groupId), this.filteredObservationData(groupId),
+            this.filteredSensorsInfos(groupId), sensorGroupElement, false);
 
         }
       }
@@ -236 +238 @@
 
 
   filteredSelectedSensors(sensorGroupId: string): any {
-    return this.selectedSensors.filter(sen => sen.toString().slice(0, 5) == sensorGroupId );
+    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);
+      sen.sensorId.toString().slice(0, 5) === sensorGroupId);
   }
 
   private getObservations(range: Date[], changedDate: boolean, changedSensorId: string) {
@@ -276 +278 @@
               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.getGraph(this.filteredSelectedSensors(groupId),  this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), view, false);
+             // GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(selectSens.toString().slice(0, 5)), view);
+                GraphLoader.getGraph(this.filteredSelectedSensors(groupId),  this.filteredObservationData(groupId),
+                  this.filteredSensorsInfos(groupId), view, false);
               }, 10);
             }
           })
@@ -305 +308 @@
           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);
-
-            GraphLoader.getGraph(this.filteredSelectedSensors(groupId),  this.filteredObservationData(groupId), this.filteredSensorsInfos(groupId), view, false);
+          GraphLoader.getGraph(this.filteredSelectedSensors(groupId),  this.filteredObservationData(groupId),
+            this.filteredSensorsInfos(groupId), view, false);
         }, err => this.toastService.showError(err.error.message));
     }
   }