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/shared/graph-loading/multigraph.ts

@@ -7 +7 @@
   isAnalytics: boolean;
   data: any [];
   interval: number;
+  legend: {};
 
-  constructor(isAnalytics: boolean, data: any [], interval: number) {
+  constructor(isAnalytics: boolean, data: any [], legend: {}, interval: number) {
     this.isAnalytics = isAnalytics;
     this.data = data;
     this.interval = interval;
+    this.legend = this.getLegend(legend);
 
   }
 
@@ -22 +24 @@
     let config1 = require('/src/vega/config/config.json');
     lodash.merge(rvalue, config1);
     let config2 = require('/src/vega/config/config-multiline.json');
+    let config3 = require('/src/vega/config/config-barline.json');
 
 
     for(let key in config2.signals) {
@@ -29 +32 @@
       rvalue.signals.push(obj);
     }
 
-    return config1;
+    for(let key in config3.signals) {
+      let obj = config3.signals[key];
+      rvalue.signals.push(obj);
+    }
+
+    return rvalue;
   }
 
   getSpec(): {} {
@@ -37 +45 @@
     const rvalue: any = {};
     const base = require('/src/vega/base/default.json');
     const body = require('/src/vega/body/multilinechart.json');
-    const tooltip = require('/src/vega/tooltip/multiline-tooltip.json');
+    const legend = require('/src/vega/miscs/legend.json');
+    const tooltip = require('/src/vega/miscs/multiline-tooltip.json');
 
-    lodash.merge(rvalue, base, body, tooltip);
+    lodash.merge(rvalue, base, body, legend, tooltip);
 
-    rvalue.data[0].values = this.data;
+    rvalue.data[1].values = this.data;
+    rvalue.data[0].values = this.legend;
     rvalue.signals[0].value = this.interval;
     rvalue.marks[0].marks[0].marks[0].marks[2].encode.enter.tooltip.signal = this.getTooltipMessage();
 
@@ -58 +68 @@
     return message;
   }
 
+  private getLegend(legend: any) {
+    if(Array.isArray(legend)) {
+      return legend[0];
+    } else {
+      return legend;
+    }
+  }
+
+
 }