@eqproject/eqp-dynamic-module 2.9.13 → 2.9.14

package/fesm2015/eqproject-eqp-dynamic-module.mjs

@@ -5514,13 +5514,33 @@ class ActionButtonFieldTemplateComponent {
         fireTrigger.trigger.formulas = actionButton.formulas;
         fireTrigger.form = null; // Verrà impostato a livello superiore
         fireTrigger.formulas = actionButton.formulas;
-        fireTrigger.record = null;
+        fireTrigger.record = this.record;
         fireTrigger.userPatient = null; // Verrà impostato a livello superiore
         fireTrigger.userMedicalExamination = null;
-        this.onFireTrigger(fireTrigger);
-    }
-    onFireTrigger(ev) {
-        this.fireTrigger.emit(ev);
+        this.evaluateFormulasAndFireTrigger(fireTrigger);
+    }
+    evaluateFormulasAndFireTrigger(triggerToFire) {
+        // Il trigger va sparato. Valuto le funzioni interne
+        var formulas = JSON.parse(JSON.stringify(triggerToFire.formulas));
+        GlobalService.debugLog("checkTriggers - evaluate formulas ", formulas);
+        if (formulas != null && Object.keys(formulas).length > 0) {
+            Object.keys(formulas).forEach((key) => {
+                var formula = formulas[key].value;
+                GlobalService.debugLog("checkTriggers - formulas[key] ", formulas[key]);
+                var temp;
+                if (formulas[key].type == TriggerPropertyTypeEnum.DMMODULE) {
+                    temp = formula;
+                }
+                else {
+                    temp = UtilityHelperService.EvaluateFieldFormula(formula, this.record, null);
+                }
+                formulas[key] = temp;
+            });
+        }
+        // Le formule inviate in input al modulo dinamico, valutate nel contesto del trigger e del record
+        triggerToFire.formulas = formulas;
+        // Sparo il trigger all'esterno
+        this.fireTrigger.emit(triggerToFire);
     }
 }
 ActionButtonFieldTemplateComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ActionButtonFieldTemplateComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
@@ -5561,7 +5581,11 @@ class DynamicModuleFieldFixComponent {
     }
     updateField() {
         if (this.fieldTemplate && this.fieldTemplate.length > 0) {
-            this.fieldTemplate.forEach(f => f.updateField());
+            this.fieldTemplate.forEach((f) => {
+                if (f != null && typeof f.updateField === 'function') {
+                    f.updateField();
+                }
+            });
         }
     }
     ngOnInit() {
@@ -5922,7 +5946,11 @@ class AddFormRecordComponent {
      */
     onRecordChange() {
         if (this.fieldTemplate && this.fieldTemplate.length > 0) {
-            this.fieldTemplate.forEach((f) => f.updateField());
+            this.fieldTemplate.forEach((f) => {
+                if (f != null && typeof f.updateField === 'function') {
+                    f.updateField();
+                }
+            });
         }
     }
     //#endregion onRecordChange
@@ -10841,17 +10869,31 @@ class ActionButtonCreatorComponent {
         if (this.actionButton != null && this.actionButton.execution != null) {
             this.selectedFormula = {};
             this.selectedFormula.key = this.actionButton.execution;
+            /*
+            if (this.actionButtonField == null){
+              this.formulaFieldsStructure = new Array<any>();
+              this.formulas.forEach((res) => {
+                this.formulaFieldsStructure.push({"key": res.key, "type": this.formulas[this.selectedFormula.key][res].type, "tooltip": this.formulas[this.selectedFormula.key][res].tooltip});
+              });
+    
+              Object.keys(this.actionButton.formulasTemp).forEach((res) => {
+                this.formulaFieldsStructure.find(x => x.key == res).value = this.actionButton.formulasTemp[res].value;
+              });
+            } else {
+              this.formulaFieldsStructure.push(this.actionButton.formulas);
+            }
+    
+            */
             if (this.actionButtonField == null) {
-                this.formulaFieldsStructure = new Array();
-                Object.keys(this.formulas[this.selectedFormula.key]).forEach((res) => {
-                    this.formulaFieldsStructure.push({ "key": res, "type": this.formulas[this.selectedFormula.key][res].type, "tooltip": this.formulas[this.selectedFormula.key][res].tooltip });
-                });
-                Object.keys(this.actionButton.formulasTemp).forEach((res) => {
-                    this.formulaFieldsStructure.find(x => x.key == res).value = this.actionButton.formulasTemp[res].value;
+                Object.keys(this.actionButton.formulasTemp).forEach((key) => {
+                    if (!this.isAnActionKey(key, this.actionButton, this.formulas)) {
+                        return;
+                    }
+                    this.formulaFieldsStructure.push(this.actionButton.formulasTemp[key]);
                 });
             }
             else {
-                this.formulaFieldsStructure.push(this.actionButton.formulas);
+                this.formulaFieldsStructure = this.actionButtonField.formulas;
             }
         }
         if (this.actionButton == null) {
@@ -10899,6 +10941,9 @@ class ActionButtonCreatorComponent {
             this.onSaveRecord.emit(null);
         }
         else {
+            if (this.actionButton.ButtonUniqueId == null) {
+                this.actionButton.ButtonUniqueId = this.generateGUID();
+            }
             this.actionButton.ButtonCode = this.selectedFormula.key;
             this.formulaFieldsStructure.forEach((formulaField) => {
                 if (typeof this.actionButton.formulas == "undefined") {
@@ -10908,15 +10953,20 @@ class ActionButtonCreatorComponent {
                 this.actionButton.execution = this.selectedFormula.key;
             });
             this.isSaving = true;
+            console.log("ActionButtonCreatorComponent saveOrExitForm()", this.actionButton);
             this.onSaveRecord.emit(this.actionButton);
         }
     }
+    generateGUID() {
+        const timestamp = new Date().getTime();
+        const randomNum = Math.floor(Math.random() * 1000000);
+        return `${timestamp}-${randomNum}`;
+    }
     changeSomething() {
         this.actionButton.ButtonCode = this.selectedFormula.key;
         if (!this.actionButton.formulasTemp) {
             this.actionButton.formulasTemp = {};
         }
-        console.log("CHANGE SOMETHING", this.actionButton, this.formulaFieldsStructure);
         this.formulaFieldsStructure.forEach((formulaField) => {
             if (typeof this.actionButton.formulas == "undefined") {
                 this.actionButton.formulas = {};
@@ -10967,6 +11017,11 @@ class ActionButtonCreatorComponent {
         GlobalService.debugLog('@@trigger-creator:onChangeFormula formulaFieldsStructure', this.formulaFieldsStructure);
         this.changeSomething();
     }
+    isAnActionKey(key, field, formulas) {
+        var code = field.ButtonCode;
+        var els = formulas[code];
+        return (Object.keys(els).find(x => x == key) != null);
+    }
 }
 ActionButtonCreatorComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.10", ngImport: i0, type: ActionButtonCreatorComponent, deps: [{ token: i1$3.MatDialog }, { token: UtilityHelperService }], target: i0.ɵɵFactoryTarget.Component });
 ActionButtonCreatorComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.2.10", type: ActionButtonCreatorComponent, selector: "action-button-creator", inputs: { form: "form", actionButton: "actionButton", actionButtonField: "actionButtonField", formulas: "formulas", endPointConfiguration: "endPointConfiguration", InField: "InField" }, outputs: { onSaveRecord: "onSaveRecord", onChangeSomething: "onChangeSomething" }, viewQueries: [{ propertyName: "dialogFormula", first: true, predicate: ["dialogFormula"], descendants: true, static: true }], ngImport: i0, template: "\r\n<mat-card class=\"add-form-field\">\r\n    <mat-card-header *ngIf=\"!InField\">\r\n        <mat-card-title>\r\n            {{actionButton != null ? \"Modifica\" : \"Aggiungi\"}} actionButton\r\n        </mat-card-title>\r\n    </mat-card-header>\r\n\r\n    <mat-card-content>\r\n\r\n    <div class=\"container-fluid containerContent padder\">\r\n\r\n        <div class=\"row\">\r\n            <div class=\"col-3\">Tipo Action Button</div>\r\n            <div class=\"col-9\">\r\n                <eqp-select [arrayData]=\"formulaKeys\" [(ngModelInput)]=\"selectedFormula\"\r\n                [arrayKeyProperty]=\"'key'\" [arrayValueProperty]=\"'key'\" [showCancelButton]=\"true\" (ngModelInputChange)=\"onChangeFormula($event)\">\r\n                </eqp-select>            \r\n            </div>\r\n        </div>\r\n  \r\n          <div class=\"row\">\r\n            <div class=\"col-3\">Etichetta</div>\r\n            <div class=\"col-9\">\r\n                <mat-form-field>\r\n                    <mat-label  class=\"pt-1\"> Etichetta </mat-label>\r\n                    <input matInput [(ngModel)]=\"actionButton.ButtonLabel\" [readonly]=\"false\" [required]=\"true\" (keyup)=\"changeSomething()\">\r\n                </mat-form-field>\r\n            </div>\r\n          </div>\r\n  \r\n          <div class=\"row\">\r\n            <div class=\"col-3\">Icona (<a href='https://www.angularjswiki.com/angular/angular-material-icons-list-mat-icon-list' target=\"_blank\">lista</a>)</div>\r\n            <div class=\"col-9\">\r\n                <mat-form-field>\r\n                    <mat-label  class=\"pt-1\"> Icona Material (<a href='https://www.angularjswiki.com/angular/angular-material-icons-list-mat-icon-list' target=\"_blank\">lista</a>) </mat-label>\r\n                    <input matInput [(ngModel)]=\"actionButton.Icon\" [readonly]=\"false\" [required]=\"true\" (keyup)=\"changeSomething()\">\r\n                </mat-form-field>\r\n            </div>\r\n          </div>   \r\n          \r\n          <div class=\"row\" *ngIf=\"!InField\">\r\n            <div class=\"col-3\">Sezioni</div>\r\n            <div class=\"col-9\">\r\n                <mat-label  class=\"pt-1\"> Sezioni </mat-label>\r\n                <eqp-select\r\n                  [enumData]=\"actionsFlag\"\r\n                  [isSearchable]=\"true\"\r\n                  [isMultiSelect] = \"true\"\r\n                  [(ngModelInput)]=\"actionButton.ShowIn\"        \r\n                  (ngModelInputChange)=\"changeSomething()\"             \r\n                >\r\n                </eqp-select>\r\n            </div>\r\n          </div>   \r\n\r\n        <div class=\"row\" *ngFor=\"let formulaField of formulaFieldsStructure\">\r\n            <div class=\"col-3\">{{formulaField.key}}</div>\r\n            <div class=\"col-9\" *ngIf=\"formulaField.type == triggerPropertyType.STRING\">\r\n                <mat-form-field>\r\n                    <mat-label  class=\"pt-1\"> {{formulaField.key}}</mat-label>\r\n                    <input matInput [readonly]=\"false\" [required]=\"false\" [matTooltip]=\"formulaField.tooltip\" (click)=\"openFormulaDialog(formulaField)\" [(ngModel)]=\"formulaField.value\" (ngModelChange)=\"onFormulaFieldChange(formulaField)\">\r\n                </mat-form-field>\r\n            </div>\r\n            <div class=\"col-9\" *ngIf=\"formulaField.type == triggerPropertyType.DMMODULE\">\r\n                <eqp-select [placeholder]=\"'Seleziona modulo'\" [arrayData]=\"forms\" [(ngModelInput)]=\"formulaField.object\" [isSearchable]=\"true\"\r\n                [arrayKeyProperty]=\"'ID'\" [arrayValueProperty]=\"'Name'\" [ngModelOptions]=\"{ standalone: true }\" (ngModelInputChange)=\"onEqpSelectModule($event, formulaField)\">\r\n                </eqp-select>\r\n            </div>\r\n        </div>\r\n\r\n    </div>\r\n\r\n    </mat-card-content>\r\n    <mat-card-footer *ngIf=\"!InField\">\r\n        <div class=\"d-flex justify-content-end mt-2 mb-1 me-3\"> \r\n            <button class=\"mr-2\" mat-raised-button type=\"button\" (click)=\"saveOrExitForm(true)\">\r\n                Annulla\r\n            </button>\r\n            <button class=\"mr-2\" mat-raised-button color=\"primary\" type=\"button\"\r\n                (click)=\"saveOrExitForm(false)\" [disabled]=\"isSaving\">\r\n                <span *ngIf=\"!isSaving\">Salva</span>\r\n                <span *ngIf=\"isSaving\">Salvataggio in Corso...</span>\r\n            </button>\r\n        </div>\r\n    </mat-card-footer>\r\n\r\n</mat-card>\r\n\r\n<!--DIALOG PER SEMPLIFICARE LA SCRITTURA DEL CAMPO FORMULA-->\r\n<ng-template #dialogFormula>\r\n    <eqp-dynamic-module-add-formula-component>\r\n    </eqp-dynamic-module-add-formula-component>\r\n</ng-template>", styles: [""], dependencies: [{ kind: "component", type: i2.MatButton, selector: "    button[mat-button], button[mat-raised-button], button[mat-flat-button],    button[mat-stroked-button]  ", inputs: ["disabled", "disableRipple", "color"], exportAs: ["matButton"] }, { kind: "directive", type: i1$1.MatInput, selector: "input[matInput], textarea[matInput], select[matNativeControl],      input[matNativeControl], textarea[matNativeControl]", inputs: ["disabled", "id", "placeholder", "name", "required", "type", "errorStateMatcher", "aria-describedby", "value", "readonly"], exportAs: ["matInput"] }, { kind: "component", type: i2$2.MatFormField, selector: "mat-form-field", inputs: ["hideRequiredMarker", "color", "floatLabel", "appearance", "subscriptSizing", "hintLabel"], exportAs: ["matFormField"] }, { kind: "directive", type: i2$2.MatLabel, selector: "mat-label" }, { kind: "component", type: i6.MatCard, selector: "mat-card", inputs: ["appearance"], exportAs: ["matCard"] }, { kind: "directive", type: i6.MatCardContent, selector: "mat-card-content" }, { kind: "directive", type: i6.MatCardFooter, selector: "mat-card-footer" }, { kind: "component", type: i6.MatCardHeader, selector: "mat-card-header" }, { kind: "directive", type: i6.MatCardTitle, selector: "mat-card-title, [mat-card-title], [matCardTitle]" }, { kind: "directive", type: i3$4.MatTooltip, selector: "[matTooltip]", exportAs: ["matTooltip"] }, { kind: "directive", type: i3.DefaultValueAccessor, selector: "input:not([type=checkbox])[formControlName],textarea[formControlName],input:not([type=checkbox])[formControl],textarea[formControl],input:not([type=checkbox])[ngModel],textarea[ngModel],[ngDefaultControl]" }, { kind: "directive", type: i3.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i3.RequiredValidator, selector: ":not([type=checkbox])[required][formControlName],:not([type=checkbox])[required][formControl],:not([type=checkbox])[required][ngModel]", inputs: ["required"] }, { kind: "directive", type: i3.NgModel, selector: "[ngModel]:not([formControlName]):not([formControl])", inputs: ["name", "disabled", "ngModel", "ngModelOptions"], outputs: ["ngModelChange"], exportAs: ["ngModel"] }, { kind: "directive", type: i2$1.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2$1.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "component", type: i2$3.EqpSelectComponent, selector: "eqp-select", inputs: ["placeholder", "enumData", "enumDataToExclude", "arrayData", "arrayKeyProperty", "arrayValueProperty", "ngModelOptions", "ngModelInput", "formGroupInput", "formControlNameInput", "isRequired", "isDisabled", "isMultiLanguage", "multilanguagePrefixKey", "isAlphabeticalOrderable", "suffixIcon", "prefixIcon", "isMultiSelect", "includeFullObject", "showCancelButton", "isSearchable", "searchText", "noResultSearchText", "data"], outputs: ["ngModelInputChange"] }, { kind: "component", type: AddFormulaComponent, selector: "eqp-dynamic-module-add-formula-component" }] });
@@ -11844,15 +11899,22 @@ class AddFormFieldComponent {
             }
             if (this.field.FieldType == FieldTypeEnum["Bottone azione"]) {
                 if ((this.field.formulasTemp != null)) {
+                    this.field.formulas = new Array();
                     var formulas = this.field.formulasTemp;
                     var keys = Object.keys(formulas);
-                    var key = keys[0];
-                    var ktv = new KeyTypeValue();
-                    ktv.key = key;
-                    ktv.tooltip = formulas[key].tooltip;
-                    ktv.type = formulas[key].type;
-                    ktv.value = formulas[key].value;
-                    this.field.formulas = ktv;
+                    if (keys.length > 0) {
+                        keys.forEach((key) => {
+                            if (!this.isAnActionKey(key, this.field, formulas)) {
+                                return;
+                            }
+                            var ktv = new KeyTypeValue();
+                            ktv.key = key;
+                            ktv.tooltip = formulas[key].tooltip;
+                            ktv.type = formulas[key].type;
+                            ktv.value = formulas[key].value;
+                            this.field.formulas.push(ktv);
+                        });
+                    }
                 }
             }
             this.setCodeToExtraFields();
@@ -11864,19 +11926,30 @@ class AddFormFieldComponent {
         }
     }
     //#endregion saveAndExitAddField
+    isAnActionKey(key, field, formulas) {
+        console.log("isAnActionKey", key, field, formulas);
+        return true;
+        /*var code = field.ButtonCode;
+        var els = formulas[code];
+        return (Object.keys(els).find(x => x == key) != null);*/
+    }
     setCodeToExtraFields() {
-        this.form.FldExtraConfigValues.filter(x => x.FieldConfigParentFieldCode === undefined).forEach((ufields) => {
-            ufields.FieldConfigParentFieldCode = this.field.Name;
-            if (typeof ufields.FieldConfigValue == "boolean") {
-                ufields.FieldConfigValue = ufields.FieldConfigValue ? "true" : "false";
-            }
-        });
-        this.form.ObjectFldExtraConfigValues.filter(x => x.FieldConfigParentFieldCode === undefined).forEach((ufields) => {
-            ufields.FieldConfigParentFieldCode = this.field.Name;
-            if (typeof ufields.FieldConfigValue == "boolean") {
-                ufields.FieldConfigValue = ufields.FieldConfigValue ? "true" : "false";
-            }
-        });
+        if (this.form.FldExtraConfigValues != null && this.form.FldExtraConfigValues.length > 0) {
+            this.form.FldExtraConfigValues.filter(x => x.FieldConfigParentFieldCode === undefined).forEach((ufields) => {
+                ufields.FieldConfigParentFieldCode = this.field.Name;
+                if (typeof ufields.FieldConfigValue == "boolean") {
+                    ufields.FieldConfigValue = ufields.FieldConfigValue ? "true" : "false";
+                }
+            });
+        }
+        if (this.form.ObjectFldExtraConfigValues != null && this.form.ObjectFldExtraConfigValues.length > 0) {
+            this.form.ObjectFldExtraConfigValues.filter(x => x.FieldConfigParentFieldCode === undefined).forEach((ufields) => {
+                ufields.FieldConfigParentFieldCode = this.field.Name;
+                if (typeof ufields.FieldConfigValue == "boolean") {
+                    ufields.FieldConfigValue = ufields.FieldConfigValue ? "true" : "false";
+                }
+            });
+        }
     }
     //#region restoreBaseFieldProperties
     /**
@@ -13466,7 +13539,7 @@ class EqpDynamicModuleConfiguratorComponent {
     saveActionButtons(element) {
         if (element != null) {
             if (this.form.ActionButtons != null) {
-                var existsActionButtons = this.form.ActionButtons.find(x => x.ButtonCode == element.ButtonCode);
+                var existsActionButtons = this.form.ActionButtons.find(x => x.ButtonUniqueId == element.ButtonUniqueId);
                 if (existsActionButtons == null) {
                     // Nuovo trigger
                     this.form.ActionButtons.push(element);