rev: clean

Author: unocelli

client/src/app/_models/hmi.ts

@@ -339,8 +339,8 @@ export enum GaugeEventActionType {
 }
 
 export enum GaugeEventRelativeFromType {
-    window = 'shapes.event-relativefrom-window',
-    mouse = 'shapes.event-relativefrom-mouse'
+    window = 'window',
+    mouse = 'mouse'
 }
 
 export enum GaugeEventSetValueType {

client/src/app/fuxa-view/fuxa-view.component.ts

@@ -721,9 +721,9 @@ export class FuxaViewComponent implements OnInit, AfterViewInit, OnDestroy {
         }
         card = new CardModel(id);
 
-        if (options.relativeFrom && options.relativeFrom == Utils.getEnumKey(GaugeEventRelativeFromType, GaugeEventRelativeFromType.window)) {
-            card.x = (Utils.isNumeric(options.left) ? parseInt(options.left) : 0);
-            card.y = (Utils.isNumeric(options.top) ? parseInt(options.top) : 0);
+        if (options.relativeFrom && options.relativeFrom == GaugeEventRelativeFromType.window) {
+            card.x = Utils.isNumeric(options.left) ? parseInt(options.left) : 0;
+            card.y = Utils.isNumeric(options.top) ? parseInt(options.top) : 0;
         } else {
             card.x = event.clientX + (Utils.isNumeric(options.left) ? parseInt(options.left) : 0);
             card.y = event.clientY + (Utils.isNumeric(options.top) ? parseInt(options.top) : 0);

client/src/app/gauges/gauge-property/flex-event/flex-event.component.html

@@ -42,7 +42,7 @@
                 <mat-select [(value)]="item.actparam">
                     <mat-option *ngFor="let v of views; index as i" [value]="v.id">{{v.name}}</mat-option>
                 </mat-select>
-            </div>    
+            </div>
         </ng-container>
         <ng-template #destination>
             <div class="my-form-field lbk" style="width: 200px;">
@@ -61,15 +61,15 @@
                 <span>{{'general-y' | translate}}</span>
                 <input numberOnly [(ngModel)]="item.actoptions.top" type="number" style="width: 60px">
             </div>
-            <div *ngIf="cardDestination === item.action" class="my-form-field lbk ml10 tac" style="max-width: 70px;margin-top: 5px">
+            <div *ngIf="cardDestination === item.action" class="my-form-field lbk ml10 mt5 tac" style="max-width: 70px">
                 <span>{{'gauges.property-event-single-card' | translate}}</span>
                 <mat-slide-toggle color="primary" [(ngModel)]="item.actoptions.singleCard"></mat-slide-toggle>
             </div>
-            <div class="my-form-field lbk" style="width: 240px;margin-top: 5px">
+            <div class="my-form-field lbk mt5" style="width: 240px">
                 <span>{{'gauges.property-event-destination-relative-from' | translate}}</span>
                 <mat-select [(value)]="item.actoptions.relativeFrom">
                     <mat-option *ngFor="let rf of relativeFromType | enumToArray" [value]="rf.key">
-                        {{ rf.value }}
+                        {{ 'shapes.event-relativefrom-' + rf.value | translate }}
                     </mat-option>
                 </mat-select>
             </div>
@@ -158,9 +158,9 @@
                             <input [(ngModel)]="scriptParam.value" type="text" style="width: 260px">
                         </ng-container>
                         <ng-template #enterParamValue>
-                            <input [(ngModel)]="scriptParam.value" 
-                                placeholder="{{'gauges.property-event-script-param-input-value' | translate}}" 
-                                type="text" 
+                            <input [(ngModel)]="scriptParam.value"
+                                placeholder="{{'gauges.property-event-script-param-input-value' | translate}}"
+                                type="text"
                                 style="width: 260px">
                         </ng-template>
                     </div>

client/src/app/gauges/gauge-property/flex-event/flex-event.component.ts

@@ -64,11 +64,6 @@ export class FlexEventComponent implements OnInit {
         this.viewPanels = <PanelData[]>Object.values(this.data.view?.items ?? [])?.filter((item: any) => item.type === 'svg-ext-own_ctrl-panel');//#issue on build  PanelComponent.TypeTag);
         this.enterActionType[Utils.getEnumKey(GaugeEventActionType, GaugeEventActionType.onRunScript)] = this.translateService.instant(GaugeEventActionType.onRunScript);
 
-        Object.keys(this.relativeFromType).forEach(key => {
-            console.log(this.relativeFromType[key]);
-            this.translateService.get(this.relativeFromType[key]).subscribe((txt: string) => { this.relativeFromType[key] = txt; });
-        });
-
         Object.keys(this.actionType).forEach(key => {
             this.translateService.get(this.actionType[key]).subscribe((txt: string) => { this.actionType[key] = txt; });
         });