Revize a3d61638

Re #8790 - Úprava sensoru - formulář, endpoint

+ OpenAPI definition for editing sensor
+ form for sensor edition

src/app/dashboard/components/dashboard.component.html

@@ -21 +21 @@
         </div>
       </p-header>
       <div>
-        <app-sensors *ngFor="let sensor of unit.sensors" [sensor]="sensor" [unitId]="unit.unit.unitId"></app-sensors>
+        <app-sensors *ngFor="let sensor of unit.sensors" [sensor]="sensor" [unitId]="unit.unit.unitId" [phenomenons]="phenomenons"></app-sensors>
       </div>
     </p-accordionTab>
 </p-accordion>

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

@@ -1 @@
-<p-dialog [visible]="isVisible" [closable]="false" [draggable]="false" header="Add sensor to unit - {{unit?.unitId}}" [style]="{width: '70vw'}"
+<p-dialog [visible]="isVisible" [modal]="true" [closable]="false" [draggable]="false" header="Add sensor to unit - {{unit?.unitId}}" [style]="{width: '70vw'}"
           [baseZIndex]="10000" (onShow)="clearFormArray()">
 
   <form [formGroup]="insertForm">
@@ -27 +27 @@
         </div>
         <div class="input-group form-group">
           <div class="input-group-prepend">
-            <span class="input-group-text">Sensor name</span>
+            <span class="input-group-text">Sensor phenomeon</span>
           </div>
           <select formControlName="phenomenons" id="phenomenons">
             <option *ngFor="let phenomenon of phenomenons; let i = index" [value]="phenomenons[i].phenomenonId">

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

@@ -1 @@
-<p-dialog [visible]="isVisible" [closable]="false" [draggable]="false" header="Nejlepsi popup" [style]="{width: '50vw'}" [baseZIndex]="10000">
-  {{ sensor | json}}
+<p-dialog [visible]="isVisible" [closable]="false" [modal]="true" [draggable]="false" header="Sensor {{sensor?.sensorId}} editation!" [style]="{width: '50vw'}" [baseZIndex]="10000">
+  <form [formGroup]="insertForm">
+      <div class="input-group form-group">
+        <div class="input-group-prepend">
+          <span class="input-group-text">Sensor name</span>
+        </div>
+        <input type="text" formControlName="sensorName" class="form-control" id="sensorName"
+               placeholder="{{sensor.sensorName}}"/>
+      </div>
+      <div class="input-group form-group">
+        <div class="input-group-prepend">
+          <span class="input-group-text">Sensor type</span>
+        </div>
+        <input type="text" formControlName="sensorType" class="form-control" id="sensorType"
+               placeholder="{{sensor.sensorType}}"/>
+      </div>
+      <div class="input-group form-group">
+        <div class="input-group-prepend">
+          <span class="input-group-text">Sensor phenomen</span>
+        </div>
+        <select formControlName="phenomenon" id="phenomenon">
+          <ng-container *ngFor="let phenomenon of phenomenons; let i = index">
+            <option [value]="phenomenon.phenomenonId" [selected]="phenomenon.phenomenonName === sensor.phenomenon.phenomenonName">
+              {{phenomenon.phenomenonName}} ({{phenomenon.unit}})
+            </option>
+          </ng-container>
+        </select>
+      </div>
+  </form>
   <p-footer>
     <div class="row justify-content-end align-items-center">
       <div>
-        <p-button icon="pi pi-check" type="submit" label="Uložit" class="pr-2"></p-button>
+        <p-button icon="pi pi-check" (click)="processSensorEdition()" type="submit" label="Uložit" class="pr-2"></p-button>
         <p-button icon="pi pi-times" (click)="close()" label="Zavřít" class="pr-2"></p-button>
       </div>
     </div>

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

@@ -1 +1 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
+import {FormBuilder, FormGroup, Validators} from '@angular/forms';
+import {ManagementService} from '../../../shared/api/endpoints/services/management.service';
 
 @Component({
   selector: 'app-sensor-popup',
@@ -7 +9 @@
 })
 export class SensorPopupComponent implements OnInit {
 
+  insertForm: FormGroup;
+
   @Input() isVisible;
   @Input() sensor;
+  @Input() phenomenons;
+  @Input() unitId;
   @Output() isVisibleChange: EventEmitter<boolean> = new EventEmitter<boolean>();
 
-  constructor() { }
+  constructor(
+    private formBuilder: FormBuilder,
+    private managementService: ManagementService
+  ) {
+    this.initForm();
+  }
 
   ngOnInit(): void {
   }
@@ -20 +31 @@
     this.isVisibleChange.emit(false);
   }
 
+  initForm() {
+    this.insertForm = this.formBuilder.group({
+      sensorName: ['', Validators.required],
+      sensorType: ['', Validators.required],
+      phenomenon: ['', Validators.required]
+    });
+    setTimeout(() => {
+      this.insertForm.controls.phenomenon.setValue(this.sensor.phenomenon.phenomenonId, {onlySelf: true});
+      this.insertForm.controls.sensorType.setValue(this.sensor.sensorType);
+      this.insertForm.controls.sensorName.setValue(this.sensor.sensorName);
+    }, 0);
+  }
+
+  processSensorEdition() {
+    if (this.insertForm.valid) {
+/*      this.managementService.updateSensor({body: {
+        unit: {
+          unit_id: this.unitId
+        },
+          sensors: [
+            {
+              sensor_id: this.sensor.sensorId,
+              sensor_type: this.insertForm.controls.sensorType.value,
+              sensor_name: this.insertForm.controls.sensorName.value,
+              phenomenon: {
+                phenomenon_id: this.insertForm.controls.phenomenon.value.phenomenonId
+              }
+            }
+          ]
+        }}).toPromise();*/
+    }
+  }
 }

src/app/dashboard/components/sensors/sensors.component.html

@@ -9 +9 @@
   </div>
 </div>
 
-<app-sensor-popup [(isVisible)]="showSensorPopup" [sensor]="editedSensor"></app-sensor-popup>
+<app-sensor-popup *ngIf="editedSensor" [(isVisible)]="showSensorPopup" [sensor]="editedSensor" [phenomenons]="phenomenons" [unitId]="unitId"></app-sensor-popup>

src/app/dashboard/components/sensors/sensors.component.ts

@@ -13 +13 @@
 
   @Input() sensor: Sensor;
   @Input() unitId: number;
+  @Input() phenomenons;
   showSensorPopup = false;
   editedSensor: Sensor;
   constructor(

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

@@ -1 @@
-<p-dialog [visible]="isVisible" [closable]="false" [draggable]="false" header="Add unit!" [style]="{width: '70vw'}"
+<p-dialog [visible]="isVisible" [modal]="true" [closable]="false" [draggable]="false" header="Add unit!" [style]="{width: '70vw'}"
           [baseZIndex]="10000" (onShow)="clearFormArray()">
 
   <form [formGroup]="insertForm">

src/app/dashboard/components/unit-popup/unit-popup.component.html

@@ -1 @@
-<p-dialog [visible]="isVisible" [closable]="false" [draggable]="false" header="Edit unit - {{ unit?.unitId}}" [style]="{width: '50vw'}" [baseZIndex]="10000">
+<p-dialog [visible]="isVisible" [modal]="true" [closable]="false" [draggable]="false" header="Edit unit - {{ unit?.unitId}}" [style]="{width: '50vw'}" [baseZIndex]="10000">
 
   <form [formGroup]="insertForm">
     <div class="input-group form-group">

src/app/shared/api/endpoints/services/management.service.ts

@@ -243 +243 @@
     );
   }
 
+  /**
+   * Path part for operation updateSensor
+   */
+  static readonly UpdateSensorPath = '/senslog15/ManagementService?Operation=UpdateSensor';
+
+  /**
+   * Update Sensor.
+   *
+   *
+   *
+   * This method provides access to the full `HttpResponse`, allowing access to response headers.
+   * To access only the response body, use `updateSensor()` instead.
+   *
+   * This method sends `application/json` and handles request body of type `application/json`.
+   */
+  updateSensor$Response(params: {
+    body: { 'unit'?: InsertUnit, 'sensors'?: Array<InsertSensor> }
+  }): Observable<StrictHttpResponse<void>> {
+
+    const rb = new RequestBuilder(this.rootUrl, ManagementService.UpdateSensorPath, 'put');
+    if (params) {
+      rb.body(params.body, 'application/json');
+    }
+
+    return this.http.request(rb.build({
+      responseType: 'text',
+      accept: '*/*'
+    })).pipe(
+      filter((r: any) => r instanceof HttpResponse),
+      map((r: HttpResponse<any>) => {
+        return (r as HttpResponse<any>).clone({ body: undefined }) as StrictHttpResponse<void>;
+      })
+    );
+  }
+
+  /**
+   * Update Sensor.
+   *
+   *
+   *
+   * This method provides access to only to the response body.
+   * To access the full response (for headers, for example), `updateSensor$Response()` instead.
+   *
+   * This method sends `application/json` and handles request body of type `application/json`.
+   */
+  updateSensor(params: {
+    body: { 'unit'?: InsertUnit, 'sensors'?: Array<InsertSensor> }
+  }): Observable<void> {
+
+    return this.updateSensor$Response(params).pipe(
+      map((r: StrictHttpResponse<void>) => r.body as void)
+    );
+  }
+
 }

src/app/shared/api/openapi.yaml

@@ -284 +284 @@
                   items:
                     $ref: '#/components/schemas/InsertSensor'
 
-
+  /senslog15/ManagementService?Operation=UpdateSensor:
+    put:
+      tags:
+        - management
+      summary: Update Sensor
+      operationId: updateSensor
+      responses:
+        200:
+          description: updated
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                unit:
+                  $ref: '#/components/schemas/InsertUnit'
+                sensors:
+                  type: array
+                  items:
+                    $ref: '#/components/schemas/InsertSensor'
 components:
   schemas:
     InsertUnit: