@flexem/fc-gui 3.0.0-alpha.43 → 3.0.0-alpha.45

package/elements/main-element.js

@@ -59,7 +59,7 @@ export class MainElement {
             const category = $(element).data('model').category;
             switch (category) {
                 case GuiConsts.components.numericalDisplayKey:
-                    const numericalDisplayElement = new NumericalDisplayElement(element, this.injector, this.bsModalService, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.graphStore, this.context.operationRecordService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId);
+                    const numericalDisplayElement = new NumericalDisplayElement(element, this.injector, this.bsModalService, this.context.permissionChecker, this.variableCommunicator, this.context.configStore.graphStore, this.context.operationRecordService, this.context.releasedVariableService, this.context.securityChecker, this.context.configStore.variableStore, this.injector.get(LOCALIZATION), this.signalRAppId);
                     this.elements.push(numericalDisplayElement);
                     break;
                 case GuiConsts.components.imageKey:

package/elements/numerical-display/numerical-display-element.d.ts

@@ -3,7 +3,7 @@ import { BsModalService } from 'ngx-bootstrap/modal';
 import { GraphStore, VariableStore } from '../../config';
 import { Localization } from '../../localization';
 import { NumericalDisplay } from '../../model';
-import { PermissionChecker, OperationRecordService } from '../../service';
+import { PermissionChecker, OperationRecordService, ReleasedVariableService } from '../../service';
 import { VariableCommunicator } from '../../communication';
 import { ReadableElement } from '../base/readable-element';
 import { SecurityChecker } from '../../security';
@@ -11,6 +11,7 @@ export declare class NumericalDisplayElement extends ReadableElement {
     private readonly modalService;
     private readonly graphStore;
     private readonly operationRecordService;
+    private readonly releasedVariableService;
     private readonly securityChecker;
     private readonly dataTypeService;
     private readonly fractionDigitService;
@@ -23,9 +24,10 @@ export declare class NumericalDisplayElement extends ReadableElement {
     private enableDataParsed;
     private writeValueMmodalRef;
     private writeValue;
-    private originalValue;
+    private showValue;
+    private numericalOperation;
     get writeVariableName(): string;
-    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string);
+    constructor(element: HTMLElement, injector: Injector, modalService: BsModalService, permissionChecker: PermissionChecker, variableCommunicator: VariableCommunicator, graphStore: GraphStore, operationRecordService: OperationRecordService, releasedVariableService: ReleasedVariableService, securityChecker: SecurityChecker, variableStore: VariableStore, localization: Localization, signalRAppId: string);
     dispose(): void;
     initElement(): any;
     private checkElementPassword;

package/elements/numerical-display/numerical-display-element.js

@@ -12,11 +12,12 @@ import { VerifyPasswordModalComponent } from '../../modal/verify-password/verify
 import { isNil } from 'lodash';
 import { FCloudDataType } from '../../model/shared/data-type/fcloud-data-Type';
 export class NumericalDisplayElement extends ReadableElement {
-    constructor(element, injector, modalService, permissionChecker, variableCommunicator, graphStore, operationRecordService, securityChecker, variableStore, localization, signalRAppId) {
+    constructor(element, injector, modalService, permissionChecker, variableCommunicator, graphStore, operationRecordService, releasedVariableService, securityChecker, variableStore, localization, signalRAppId) {
         super(element, permissionChecker, variableCommunicator, variableStore, localization, signalRAppId);
         this.modalService = modalService;
         this.graphStore = graphStore;
         this.operationRecordService = operationRecordService;
+        this.releasedVariableService = releasedVariableService;
         this.securityChecker = securityChecker;
         this.displayText = '';
         this.enableDataParsed = false;
@@ -51,6 +52,12 @@ export class NumericalDisplayElement extends ReadableElement {
         }
     }
     initElement() {
+        this.releasedVariableService.getVariablesWithValueTransform().subscribe(result => {
+            const variablesTransform = result.filter(item => item.name === this.writeVariableName);
+            if (variablesTransform && variablesTransform.length && JSON.parse(variablesTransform[0].valueTransform).Type !== 0) {
+                this.numericalOperation = true;
+            }
+        });
         const { rootElement } = this;
         rootElement.selectAll('*').remove();
         let width = null, height = null;
@@ -181,11 +188,11 @@ export class NumericalDisplayElement extends ReadableElement {
             if (result) {
                 const writeValue = this.dataTypeService.formatToDecimal(this.model.version, result.value, this.model.dataType);
                 this.writeValue = writeValue;
-                this.originalValue = result.originalValue;
-                if (this.displayText.toString() !== this.originalValue) {
+                this.showValue = result.showValue;
+                if (!this.numericalOperation && +this.displayText !== +this.showValue) {
                     this.variableCommunicator.write(this.writeVariableName, writeValue).subscribe();
                     setTimeout(() => {
-                        if (this.displayText.toString() !== this.originalValue) {
+                        if (+this.displayText !== +this.showValue) {
                             this.writeValueMmodalRef.content.isSubmitting = false;
                             this.writeValueMmodalRef.content.showValidationErrorInfo(this.localization.writeValueTimeout);
                         }
@@ -224,7 +231,7 @@ export class NumericalDisplayElement extends ReadableElement {
         var _a;
         this.displayText = this.formatNumericalDisplayText(this.model.dataType, this.model.fractionDigits, value);
         this.updateDisplayText(this.formatDisplayTextUnit(this.displayText));
-        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && this.displayText.toString() === this.originalValue) {
+        if (((_a = this.writeValueMmodalRef) === null || _a === void 0 ? void 0 : _a.content) && +this.displayText !== +this.showValue) {
             this.writeValueMmodalRef.hide();
             this.writeValueMmodalRef.content.hideValidationErrorInfo();
             this.recordOperation(this.writeValue);

package/elements/numerical-display/numerical-display-element.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":22,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":42,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":43,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":44,"character":39},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":45,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":46,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":47,"character":37},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":48,"character":49},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":49,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":50,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":51,"character":22},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":4,"metadata":{"NumericalDisplayElement":{"__symbolic":"class","extends":{"__symbolic":"reference","module":"../base/readable-element","name":"ReadableElement","line":22,"character":45},"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"error","message":"Could not resolve type","line":43,"character":25,"context":{"typeName":"HTMLElement"}},{"__symbolic":"reference","module":"@angular/core","name":"Injector","line":44,"character":18},{"__symbolic":"reference","module":"ngx-bootstrap/modal","name":"BsModalService","line":45,"character":39},{"__symbolic":"reference","module":"../../service","name":"PermissionChecker","line":46,"character":27},{"__symbolic":"reference","module":"../../communication","name":"VariableCommunicator","line":47,"character":30},{"__symbolic":"reference","module":"../../config","name":"GraphStore","line":48,"character":37},{"__symbolic":"reference","module":"../../service","name":"OperationRecordService","line":49,"character":49},{"__symbolic":"reference","module":"../../service","name":"ReleasedVariableService","line":50,"character":50},{"__symbolic":"reference","module":"../../security","name":"SecurityChecker","line":51,"character":42},{"__symbolic":"reference","module":"../../config","name":"VariableStore","line":52,"character":23},{"__symbolic":"reference","module":"../../localization","name":"Localization","line":53,"character":22},{"__symbolic":"reference","name":"string"}]}],"dispose":[{"__symbolic":"method"}],"initElement":[{"__symbolic":"method"}],"checkElementPassword":[{"__symbolic":"method"}],"initVariableText":[{"__symbolic":"method"}],"initGraphAndText":[{"__symbolic":"method"}],"doWriteValue":[{"__symbolic":"method"}],"recordOperation":[{"__symbolic":"method"}],"changeStates":[{"__symbolic":"method"}],"updateVariableValue":[{"__symbolic":"method"}],"updateDisplayText":[{"__symbolic":"method"}],"rebuildTextElement":[{"__symbolic":"method"}],"formatNumericalDisplayText":[{"__symbolic":"method"}],"formatFloatDisplayText":[{"__symbolic":"method"}],"isNumeric":[{"__symbolic":"method"}],"formatDisplayTextUnit":[{"__symbolic":"method"}]}}}}]

package/gui/gui-context.d.ts

@@ -1,12 +1,13 @@
 import { ConfigStore } from '../config';
 import { VariableCommunicator } from '../communication';
 import { SecurityChecker } from '../security';
-import { VideoService, WeatherService, PermissionChecker, OperationRecordService } from '../service';
+import { VideoService, WeatherService, PermissionChecker, OperationRecordService, ReleasedVariableService } from '../service';
 export interface GuiContext {
     readonly configStore: ConfigStore;
     readonly variableCommunicator: VariableCommunicator;
     readonly permissionChecker: PermissionChecker;
     readonly operationRecordService: OperationRecordService;
+    readonly releasedVariableService: ReleasedVariableService;
     readonly securityChecker: SecurityChecker;
     readonly videoService: VideoService;
     readonly weatherService: WeatherService;

package/modal/write-value/write-value-modal.component.js

@@ -100,7 +100,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
     }
     save() {
         this.isSubmitting = true;
-        const originalValue = this.value;
+        const showValue = this.value;
         if (this.args.enableDataParsed) {
             if (this.enableNumericalOperation) {
                 this.value = this.numericalOperationService.getWriteValue(this.args.version, this.value, this.numericalOperation, this.dataType, this.fractionDigits);
@@ -109,7 +109,7 @@ let WriteValueModalComponent = class WriteValueModalComponent {
                 this.value = this.formatWriteValue();
             }
         }
-        this.onClosed({ value: this.value, originalValue });
+        this.onClosed({ value: this.value, showValue });
     }
     close() {
         this.bsModalRef.hide();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"main": "bundles/fc-gui.umd.js",
-	"version": "3.0.0-alpha.43",
+	"version": "3.0.0-alpha.45",
 	"module": "public_api.js",
 	"typings": "public_api.d.ts",
 	"license": "UNLICENSED",

package/service/index.d.ts

@@ -1,4 +1,5 @@
 export { WeatherService } from './weather.service';
 export { PermissionChecker } from './permission-checker';
+export { ReleasedVariableService } from './released-variable';
 export * from './operation-record';
 export * from './video';

package/service/index.metadata.json

@@ -1 +1 @@
-[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./operation-record"},{"from":"./video"}]}]
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./weather.service","export":["WeatherService"]},{"from":"./permission-checker","export":["PermissionChecker"]},{"from":"./released-variable","export":["ReleasedVariableService"]},{"from":"./operation-record"},{"from":"./video"}]}]

package/service/released-variable/index.d.ts

@@ -0,0 +1 @@
+export { ReleasedVariableService } from './released-variable.service';

package/service/released-variable/index.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{},"exports":[{"from":"./released-variable.service","export":["ReleasedVariableService"]}]}]

package/service/released-variable/released-variable.service.d.ts

@@ -0,0 +1,4 @@
+import { Observable } from 'rxjs';
+export interface ReleasedVariableService {
+    getVariablesWithValueTransform(): Observable<any>;
+}

package/service/released-variable/released-variable.service.metadata.json

@@ -0,0 +1 @@
+[{"__symbolic":"module","version":4,"metadata":{"ReleasedVariableService":{"__symbolic":"interface"}}}]