Revize 05d4a2a9

Re #XXXX - Podpora

• fixing merge

src/app/dashboard/components/sensor-insert-popup/sensor-insert-popup.component.html

@@ -23 +23 @@
             <span class="input-group-text"><i class="fas fa-file-signature"></i></span>
           </div>
           <select formControlName="sensorType" id="sensorType">
-            <option [ngValue]="null" disabled>Select sensor type</option>
+            <option value="null" disabled>Select sensor type</option>
             <option *ngFor="let sensorType of sensorTypes; let i = index" [value]="sensorTypes[i].sensorType">
               {{sensorTypes[i].sensorType}}
             </option>
@@ -34 +34 @@
             <span class="input-group-text"><i class="fas fa-tint"></i></span>
           </div>
           <select formControlName="phenomenons" id="phenomenons">
-            <option [ngValue]="null" disabled>Select phenomenon</option>
+            <option value="null" disabled>Select phenomenon</option>
             <option *ngFor="let phenomenon of phenomenons; let i = index" [value]="phenomenons[i].phenomenonId">
               {{phenomenons[i].phenomenonName}} ( {{ phenomenons[i].unit}})
             </option>

src/app/dashboard/components/sensor-insert-popup/sensor-insert-popup.component.ts

@@ -53 +53 @@
     return this.formBuilder.group({
       sensorId: ['', Validators.required],
       sensorName: ['', Validators.required],
-      sensorType: ['', Validators.required],
-      phenomenons: ['', Validators.required]
+      sensorType: ['null', Validators.required],
+      phenomenons: ['null', Validators.required]
     });
   }
 

src/app/sensor/components/sensor.component.html

@@ -7 +7 @@
     </div>
     <div class="col-1"></div>
     <div class="col-xs-3">
-      <h5><span class="text-color-sensor-unit">Unit ID: {{unitId}}</span></h5>
+      <h5><span class="text-color-sensor-unit">Unit ID: <a [routerLink]="['/dashboard/unit', unitId]">{{unitId}}</a></span></h5>
     </div>
     <div class="col-1"></div>
   </div>

src/app/sensor/components/sensor.component.ts

@@ -8 +8 @@
 import {HttpResponse} from '@angular/common/http';
 import {map} from 'rxjs/operators';
 import {ToastService} from '../../shared/services/toast.service';
+import {Sensor} from '../../shared/api/endpoints/models/sensor';
+import {SensorsService} from '../../shared/api/endpoints/services/sensors.service';
 
 declare var require: any
 
@@ -31 +33 @@
   showAggregation = false;
   aggregationFunction: AggregationModel[];
   selectedAggregationFunction = 'HOUR';
+  sensor: Sensor;
 
   constructor(
     private activatedRoute: ActivatedRoute,
     private analyticsService: AnalyticsService,
     private observationService: ObservationService,
-    private toastService: ToastService
+    private toastService: ToastService,
+    private sensorsService: SensorsService
   ) {
     this.sensorId = parseInt(this.activatedRoute.snapshot.paramMap.get('sensorId'), 10);
     this.unitId = parseInt(this.activatedRoute.snapshot.paramMap.get('unitId'), 10);
@@ -50 +54 @@
   }
 
   ngOnInit(): void {
-    this.showGraph();
+    this.sensorsService.getUnitSensors({unit_id: this.unitId}).subscribe(sensors => {
+      if (sensors) {
+        this.sensor = sensors.filter(value => value.sensorId === this.sensorId)[0];
+        this.showGraph();
+      }
+    });
   }
 
   showGraph() {
@@ -94 +103 @@
       observations => {
         if (observations) {
         //  GraphLoader.getGraph(this.sensorId, observations[this.sensorId].data, observations[this.sensorId].interval, '#view');
-          GraphLoader.getGraph(this.sensorId, observations, this.getDummySensor(), '#view', true);
+          GraphLoader.getGraph(this.sensorId, observations, this.sensor, '#view', true);
         } else {
           GraphLoader.getGraph(null, null, null, '#view', null);
         }
@@ -122 +131 @@
       observations => {
         if (observations) {
          // GraphLoader.getObservationGraph(this.sensorId, observations, '#view');
-          GraphLoader.getGraph(this.sensorId, observations, this.getDummySensor(), '#view', false);
+          GraphLoader.getGraph(this.sensorId, observations, this.sensor, '#view', false);
         } else {
          // GraphLoader.getObservationGraph(null, null, null);
           GraphLoader.getGraph(null, null, null,'#view', null);

src/app/sensor/sensor.module.ts

@@ -5 +5 @@
 import {CalendarModule} from 'primeng/calendar';
 import {FormsModule} from '@angular/forms';
 import {ListboxModule} from 'primeng/listbox';
+import {RouterModule} from '@angular/router';
 
 
 
 @NgModule({
   declarations: [SensorComponent],
-  imports: [
-    CommonModule,
-    NavBarModule,
-    CalendarModule,
-    FormsModule,
-    ListboxModule
-  ]
+    imports: [
+        CommonModule,
+        NavBarModule,
+        CalendarModule,
+        FormsModule,
+        ListboxModule,
+        RouterModule
+    ]
 })
 export class SensorModule { }

src/app/shared/nav-bar/components/unit-insert-popup/unit-insert-popup.component.html

@@ -99 +99 @@
             <div class="input-group-prepend">
               <span class="input-group-text"><i class="fas fa-file-signature"></i></span>
             </div>
-            <input type="text" formControlName="sensorType" class="form-control" id="sensorType"
-                   placeholder="Sensor type"/>
+            <select formControlName="sensorType" id="sensorType">
+              <option value="null" disabled>Select sensor type</option>
+              <option *ngFor="let sensorType of sensorTypes; let i = index" [value]="sensorTypes[i].sensorType">
+                {{sensorTypes[i].sensorType}}
+              </option>
+            </select>
           </div>
           <div class="input-group form-group">
             <div class="input-group-prepend">
               <span class="input-group-text"><i class="fas fa-tint"></i></span>
             </div>
             <select formControlName="phenomenons" id="phenomenons">
-              <option [ngValue]="null" disabled>Select phenomenon</option>
+              <option value="null" disabled>Select phenomenon</option>
               <option *ngFor="let phenomenon of phenomenons; let i = index" [value]="phenomenons[i].phenomenonId">
                 {{phenomenons[i].phenomenonName}} ( {{ phenomenons[i].unit}})
               </option>
@@ -120 +124 @@
   </form>
   <p-footer>
     <div class="popup-buttons-wrapper">
-      <p-button type="button" (click)="addSensor()" class="pr-2">Add sensor</p-button>
+      <div>
+        <p-button type="button" (click)="addSensor()" class="pr-2">Add sensor</p-button>
+        <p-button *ngIf="sensors > 0" type="button" (click)="removeSensor()" class="pr-2">Remove last sensor</p-button>
+      </div>
       <div>
         <p-button icon="pi pi-times" (click)="close()" label="Close" class="pr-2"></p-button>
         <p-button icon="pi pi-check" (click)="processInsertion()" type="submit" label="Save" class="pr-2"></p-button>

src/app/shared/nav-bar/components/unit-insert-popup/unit-insert-popup.component.ts

@@ -57 +57 @@
 
   createSensor(): FormGroup {
     return this.formBuilder.group({
-      sensorId: '',
-      sensorName: '',
-      sensorType: '',
-      phenomenons: ['']
+      sensorId: ['', Validators.required],
+      sensorName: ['', Validators.required],
+      sensorType: ['null', Validators.required],
+      phenomenons: ['null', Validators.required]
     });
   }
 

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

@@ -37 +37 @@
       <ng-container *ngFor="let sensor of sensors">
           <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>
+            <label>{{sensor.sensorName}}</label>
           </div>
       </ng-container>
     </div>

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));
     }
   }