Revize 589620f8

Re #8851 - Unit page - implementace

• fixing graph data

src/app/unit/components/unit.component.html

@@ -35 +35 @@
     <div class="row">
     Group of sensors:
       <ng-container *ngFor="let sensor of sensors">
-        <ng-container *ngIf="sensor.sensorId.toString().slice(0, 5) === group">
-          <div class="p-field-checkbox">
-            <p-checkbox name="group1" value="{{sensor.sensorId}}" [(ngModel)]="selectedSensors" [inputId]="sensor.sensorId.toString()" (onChange)="addSensorToGraph(sensor.sensorId, $event)"></p-checkbox>
+          <div *ngIf="sensor.sensorId.toString().slice(0, 5) === group" class="p-field-checkbox">
+            <p-checkbox name="{{group}}" [value]="sensor.sensorId.toString()" [(ngModel)]="selectedSensors" [inputId]="sensor.sensorId.toString()" (onChange)="addSensorToGraph(sensor.sensorId.toString(), $event)"></p-checkbox>
             <label>{{sensor.sensorId}}</label>
           </div>
-        </ng-container>
       </ng-container>
     </div>
     <div id="vega_container_{{group}}"></div>

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

@@ -30 +30 @@
   analyticsData: any[] = [];
   observationsData: any[] = [];
   sensorGroups = [];
-  selectedSensors: number[] = [];
+  selectedSensors: string[] = [];
   sensors: Sensor[];
   showAggregation = false;
   aggregationFunction: AggregationModel[];
@@ -55 +55 @@
     this.sensorService.getUnitSensors({unit_id: this.unitId}).pipe(
       tap(sens => {
         this.sensors = sens;
+        this.sensors.sort((a, b)  => a.sensorId - b.sensorId);
       }),
       tap(() => {
         if (this.sensors && this.sensors.length > 0) {
@@ -75 +76 @@
   ngOnInit(): void {
   }
 
-  showGraph(changedDate: boolean = true, changedSensor: number = null) {
+  showGraph(changedDate: boolean = true, changedSensor: string = null) {
     const range: Date[] = [moment().subtract(7, 'days').toDate(), moment().toDate()];
 
     if (this.from && !this.to || !this.from && this.to) {
@@ -98 +99 @@
     }
   }
 
-  getAnalytics(range: Date[], changedDate: boolean, changedSensor: number) {
+  getAnalytics(range: Date[], changedDate: boolean, changedSensor: string) {
     if (changedDate) {
       this.selectedSensors.forEach(selectSens => {
-        this.analyticsService.getAnalytics$Response({unit_id: this.unitId, sensor_id: selectSens,
+        this.analyticsService.getAnalytics$Response({unit_id: this.unitId, sensor_id: parseInt(selectSens, 10),
           from: moment(range[0]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3),
           to: moment(range[1]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3), interval: this.selectedAggregationFunction}).pipe(
           map((response: HttpResponse<any>) => {
@@ -133 +134 @@
         }, err => this.toastService.showError(err.error.message));
       });
     } else  {
-      this.analyticsService.getAnalytics$Response({unit_id: this.unitId, sensor_id: changedSensor,
+      this.analyticsService.getAnalytics$Response({unit_id: this.unitId, sensor_id: parseInt(changedSensor, 10),
         from: moment(range[0]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3),
         to: moment(range[1]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3), interval: this.selectedAggregationFunction}).pipe(
         map((response: HttpResponse<any>) => {
@@ -170 +171 @@
    * @param sensorId checked sensorId
    * @param event event for getting if checked or unchecked
    */
-  addSensorToGraph(sensorId: number, event) {
+  addSensorToGraph(sensorId: string, event) {
     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
@@ -190 +191 @@
         }
       } else { // use observations data
         if (event.checked) { // if checked > add to graph
-          if (this.observationsData.some(sens => sens.sensorId === sensorId)) { // if already data for selected sensor in memory
+          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)
           } else { // get data from server for added sensor and show graph for selected sensors
             this.showGraph(false, sensorId);
@@ -218 +219 @@
     return this.analyticsData.filter(sen => this.selectedSensors.includes(sen.sensorId.toString()));
   }
 
-  private getObservations(range: Date[], changedDate: boolean, changedSensorId: number) {
+  private getObservations(range: Date[], changedDate: boolean, changedSensorId: string) {
     if (changedDate) { // if changed date we need new data for all sensors
       this.observationsData = []; // empty observation data
       this.selectedSensors.forEach(selectSens => {
         this.observationService.getObservation$Response({
           unit_id: this.unitId,
-          sensor_id: selectSens,
+          sensor_id: parseInt(selectSens, 10),
           from: moment(range[0]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3),
           to: moment(range[1]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3)
         }).pipe(
@@ -250 +251 @@
               setTimeout(() => {
                 console.log(this.selectedSensors);
                 GraphLoader.getMultilineGraph(this.selectedSensors, this.filteredObservationData(selectSens.toString().slice(0, 5)), view);
-              }, 0);
+              }, 10);
             }
           })
         ).toPromise().then().catch(err => this.toastService.showError(err));
@@ -258 +259 @@
     } else {
       this.observationService.getObservation$Response({
         unit_id: this.unitId,
-        sensor_id: changedSensorId,
+        sensor_id: parseInt(changedSensorId, 10),
         from: moment(range[0]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3),
         to: moment(range[1]).format('yyyy-MM-DD HH:mm:ssZ').slice(0, -3)
       }).pipe(
@@ -278 +279 @@
               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.getMultilineGraph(this.selectedSensors, this.filteredObservationData(changedSensorId.toString().slice(0, 5)), view);
           } else {
             GraphLoader.getMultilineGraph(null, null, null);