cronapp-framework-js 2.8.37 → 2.8.38

package/dist/js/reports/parameters.controller.js

@@ -1 +1 @@
-(function(){'use strict';function a(a,b,c,d,e){function f(a){c.openURLContent(a.data)}b.getDescription=function(a){var b=a.name;return a.description&&(b=a.description,-1<b.indexOf("{{")&&-1<b.indexOf("}}")&&(b=b.replace("{{","").replace("}}",""),b=window.cronapi.i18n.translate(b,[]))),b},b.cloneElement=function(a){return angular.copy(a)},b.isVisibleParam=function(a){if("DATA_LIMIT"==a.name)return!1;return!(""!==a.value)||!(""!=a.value)};var g=d.reportName.match(/\/(.*?)(.*?)(\.jrxml|\.report)/);b.report=d,b.report.name=g[2],b.htmlParameters=e,b.onPrint=function(){b.report.reportName.endsWith(".report")?c.openStimulsoftReport(b.report.contentData,b.report.parameters,b.report.datasourcesInBand):c.getPDFAsFile(b.report).then(f)},b.onCancel=function(){a.dismiss("cancel")}}angular.module("custom.controllers").controller("ParameterController",a).filter("trusted",["$sce",function(a){return function(b){return a.trustAsHtml(b)}}]).directive("compile",["$compile","$timeout",function(a,b){return{restrict:"A",link:function(c,d){b(function(){a(d.contents())(c)})}}}]).directive("formatDate",function(){return{require:"ngModel",link:function(a,b,c,d){d.$formatters.push(function(a){return a?new Date(a):null})}}}),a.$inject=["$modalInstance","$scope","ReportService","report","htmlParameters"]})();
+(function(){"use strict";function a(a,b,c,d,e){function f(a){c.openURLContent(a.data)}b.getDescription=function(a){var b=a.name;return a.description&&(b=a.description,-1<b.indexOf("{{")&&-1<b.indexOf("}}")&&(b=b.replace("{{","").replace("}}",""),b=window.cronapi.i18n.translate(b,[]))),b},b.cloneElement=function(a){return angular.copy(a)},b.isVisibleParam=function(a){if("DATA_LIMIT"==a.name)return!1;return!(""!==a.value)||!(""!=a.value)};var g=d.reportName.match(/\/(.*?)(.*?)(\.jrxml|\.report)/);b.report=d,b.report.name=g[2],b.htmlParameters=e,b.onPrint=function(){b.report.reportName.endsWith(".report")?c.openStimulsoftReport(b.report.contentData,b.report.parameters,b.report.datasourcesInBand):c.getPDFAsFile(b.report).then(f)},b.onCancel=function(){a.dismiss("cancel")}}angular.module("custom.controllers").controller("ParameterController",a).filter("trusted",["$sce",function(a){return function(b){return a.trustAsHtml(b)}}]).directive("compile",["$compile","$timeout",function(a,b){return{restrict:"A",link:function(c,d){b(function(){a(d.contents())(c)})}}}]).directive("formatDate",function(){return{require:"ngModel",link:function(a,b,c,d){d.$formatters.push(function(a){return a?new Date(a):null})}}}),a.$inject=["$modalInstance","$scope","ReportService","report","htmlParameters"]})();

package/js/directives.js

@@ -1786,40 +1786,47 @@
             }
             return obj;
           },
-          generateToolbarButtonCall: function(toolbarButton, scope, options) {
+          removeSpecialChar: function(value) {
+              return value.replace(/[^a-zA-Z0-9]/g, "").toLowerCase();
+          },
+          generateToolbarButtonCall: function(toolbarButton, scope, options, attrs) {
             var buttonCall;
             var generateObjTemplate = function(functionToCall, title, iconClass) {
               var obj = {
                 template: function() {
-                  var buttonId = app.common.generateId();
-                  return createTemplateButton(buttonId, functionToCall, title, iconClass);
+                  return createTemplateButton(functionToCall, title, iconClass);
                 }.bind(this)
               };
               return obj;
             }.bind(this);
 
-            var createTemplateButton = function(buttonId, functionToCall, title, iconClass) {
+            var createTemplateButton = function(functionToCall, title, iconClass) {
               var template = '';
 
               let security = toolbarButton.security ? `cronapp-security="${toolbarButton.security}"` : "";
 
+              let modelName = this.removeSpecialChar(attrs.ngModel);
+              let buttonType = this.removeSpecialChar(toolbarButton.type);
+              let buttonDesc = toolbarButton.title ? this.removeSpecialChar(toolbarButton.title): this.removeSpecialChar(toolbarButton.iconClass);
+              let buttonId = `${modelName}-${buttonType}-${buttonDesc}`;
+
               if (toolbarButton.type == "SaveOrCancelChanges") {
                 if (toolbarButton.saveButton)
-                  template = '<a #SECURITY# role="button" class="saveorcancelchanges k-button k-button-icontext k-grid-save-changes" id="#BUTTONID#" href="javascript:void(0)"><span class="k-icon k-i-check"></span>#TITLE#</a>';
+                  template = '<a #SECURITY# role="button" class="saveorcancelchanges k-button k-button-icontext k-grid-save-changes" data-id="#BUTTONID#" href="javascript:void(0)"><span class="k-icon k-i-check"></span>#TITLE#</a>';
                 else
-                  template = '<a #SECURITY# role="button" class="saveorcancelchanges k-button k-button-icontext k-grid-cancel-changes" id="#BUTTONID#" href="javascript:void(0)"><span class="k-icon k-i-cancel" ></span>#TITLE#</a>';
+                  template = '<a #SECURITY# role="button" class="saveorcancelchanges k-button k-button-icontext k-grid-cancel-changes" data-id="#BUTTONID#" href="javascript:void(0)"><span class="k-icon k-i-cancel" ></span>#TITLE#</a>';
               }
               else if (toolbarButton.type == "Blockly" || toolbarButton.type == "Customized") {
-                template = '<a #SECURITY# class="k-button k-grid-custom" id="#BUTTONID#" href="javascript:void(0)"><span class="#ICONCLASS#" ></span>#TITLE#</a>';
+                template = '<a #SECURITY# class="k-button k-grid-custom" data-id="#BUTTONID#" href="javascript:void(0)"><span class="#ICONCLASS#" ></span>#TITLE#</a>';
               }
               else if (toolbarButton.type == "Native" && toolbarButton.title == 'create') {
-                template = '<a #SECURITY# role="button" id="#BUTTONID#" class="k-button k-button-icontext k-grid-add" href="javascript:void(0)"><span class="k-icon k-i-plus"></span>{{"Add" | translate}}</a>';
+                template = '<a #SECURITY# role="button" data-id="#BUTTONID#" class="k-button k-button-icontext k-grid-add" href="javascript:void(0)"><span class="k-icon k-i-plus"></span>{{"Add" | translate}}</a>';
               }
               else if (toolbarButton.type == "Native" && toolbarButton.title == 'excel') {
-                template = '<a #SECURITY# role="button" id="#BUTTONID#" class="k-button k-button-icontext k-grid-excel" href="javascript:void(0)"><span class="k-icon k-i-file-excel"></span>{{"exportExcel" | translate}}</a>';
+                template = '<a #SECURITY# role="button" data-id="#BUTTONID#" class="k-button k-button-icontext k-grid-excel" href="javascript:void(0)"><span class="k-icon k-i-file-excel"></span>{{"exportExcel" | translate}}</a>';
               }
               else if (toolbarButton.type == "Native" && toolbarButton.title == 'pdf') {
-                template = '<a #SECURITY# role="button" id="#BUTTONID#" class="k-button k-button-icontext k-grid-pdf" href="javascript:void(0)"><span class="k-icon k-i-file-pdf"></span>{{"exportPDF" | translate}}</a>';
+                template = '<a #SECURITY# role="button" data-id="#BUTTONID#" class="k-button k-button-icontext k-grid-pdf" href="javascript:void(0)"><span class="k-icon k-i-file-pdf"></span>{{"exportPDF" | translate}}</a>';
               }
 
               template = template
@@ -1832,13 +1839,14 @@
               var cronappDatasource = eval(options.dataSourceScreen.entityDataSource.name);
 
               var waitRender = setInterval(function() {
-                if ($('#' + buttonId).length > 0) {
+                if ($(`[data-id=${buttonId}]`).length > 0) {
                   scope.safeApply(function() {
-                    var x = angular.element($('#' + buttonId ));
+                    var x = angular.element($(`[data-id=${buttonId}]`));
                     $compile(x)(scope);
+                    $(`[data-id=${buttonId}]`).attr('id', buttonId);
                   });
 
-                  $('#' + buttonId).click(function() {
+                  $(`[data-id=${buttonId}]`).click(function() {
 
                     var currentGrid = options.refComponent;
                     var selectedRows = [];
@@ -2048,7 +2056,7 @@
             return widthDevice;
           },
 
-          getColumns: function(options, datasource, scope, tooltips) {
+          getColumns: function(options, datasource, scope, tooltips, attrs) {
             var helperDirective = this;
 
             function getTemplate(column) {
@@ -2214,6 +2222,28 @@
 
             }
 
+            function setIdCommandButton(idForCommand, command) {
+              let waitRender = setInterval(() => {
+                if ($(`.k-grid-${idForCommand}`).is(":visible")) {
+                  clearInterval(waitRender);
+                  var currentGrid = options.refComponent;
+
+                  $(`.k-grid-${idForCommand}`).each((idx,elem) => {
+                    let $elem = $(elem);
+                    if (!$elem.attr('id')) {
+                      let item = currentGrid.dataItem($elem.closest('tr'));
+
+                      let modelName = this.removeSpecialChar(attrs.ngModel);
+                      let key = item["_objectKey"];
+                      let id = `${modelName}-${command}-${key}`;
+                      $elem.attr('id', id);
+                    }
+                  });
+
+                }
+              }, 200);
+            }
+
             function getCommandForEditButtonDatabase(opt, command) {
               var cmd;
               let idForCommand = app.common.generateId();
@@ -2254,6 +2284,7 @@
                   text: { edit: " ", update: " ", cancel: " " },
                 };
               }
+              setIdCommandButton.bind(this)(idForCommand, command);
               return cmd;
             }
 
@@ -2285,6 +2316,7 @@
                   template: template
                 };
               }
+              setIdCommandButton.bind(this)(idForCommand, command);
               return cmd;
             }
 
@@ -2516,6 +2548,7 @@
                     attributes: getAttributes(column)
                   };
                   columns.push(addColumn);
+                  setIdCommandButton.bind(this)(idForCommand, column.dataType);
                 }
                 else if (column.dataType == "Selectable") {
                   var checkColumn = {
@@ -2541,7 +2574,7 @@
 
             return pageable;
           },
-          getToolbar: function(options, scope) {
+          getToolbar: function(options, scope, attrs) {
 
             function generateToolbarTemplate(toolbarButton) {
               let security = toolbarButton.security ? `cronapp-security="${toolbarButton.security}" class` : "class";
@@ -2567,7 +2600,7 @@
                     else {
                       toolbarButton.methodCall += "cronapi.internal.focusFormInput();"
                     }
-                    var button = this.generateToolbarButtonCall(toolbarButton, scope, options);
+                    var button = this.generateToolbarButtonCall(toolbarButton, scope, options, attrs);
                     toolbar.push(button);
 
                     if (!options.hideModalButtons) {
@@ -2575,7 +2608,7 @@
                     }
                   }
                   else {
-                    let toolbarOp = this.generateToolbarButtonCall(toolbarButton, scope, options);
+                    let toolbarOp = this.generateToolbarButtonCall(toolbarButton, scope, options, attrs);
                     toolbar.push(toolbarOp);
                   }
                 }
@@ -2587,12 +2620,12 @@
                 }
               }
               else if (toolbarButton.type == "Blockly" || toolbarButton.type == "Customized") {
-                var buttonBlockly = this.generateToolbarButtonCall(toolbarButton, scope, options);
+                var buttonBlockly = this.generateToolbarButtonCall(toolbarButton, scope, options, attrs);
                 toolbar.push(buttonBlockly);
               }
               else if (toolbarButton.type == "SaveOrCancelChanges") {
                 if (options.editable != 'no') {
-                  var buttonSaveOrCancel = this.generateToolbarButtonCall(toolbarButton, scope, options);
+                  var buttonSaveOrCancel = this.generateToolbarButtonCall(toolbarButton, scope, options, attrs);
                   toolbar.push(buttonSaveOrCancel);
                 }
               }
@@ -2816,9 +2849,9 @@
 
             var datasource = app.kendoHelper.getDataSource(options.dataSourceScreen.entityDataSource, scope, options.allowPaging, options.pageCount, options.columns, options.groupings);
 
-            var columns = this.getColumns(options, datasource, scope, tooltips);
+            var columns = this.getColumns(options, datasource, scope, tooltips, attrs);
             var pageAble = this.getPageAble(options);
-            var toolbar = this.getToolbar(options, scope);
+            var toolbar = this.getToolbar(options, scope, attrs);
             var editable = this.getEditable(options);
             var filterable = anyFilterableColumn(options);
 
@@ -2918,6 +2951,28 @@
                 }
 
                 compileListing(e);
+
+                $(".k-command-cell a[class*='k-grid-']").each((idx, elem) => {
+                  let $elem = $(elem);
+                  if (!$elem.attr('id')) {
+                    let item = this.dataItem($elem.closest('tr'));
+                    let command = 'destroy';
+                    if ($elem.hasClass('k-grid-update')) {
+                      command = 'update';
+                    }
+                    else if ($elem.hasClass('k-grid-cancel')) {
+                      command = 'cancel';
+                    }
+                    else if ($elem.hasClass('k-grid-edit')) {
+                      command = 'edit';
+                    }
+
+                    let modelName = helperDirective.removeSpecialChar(attrs.ngModel);
+                    let key = item["_objectKey"];
+                    let id = `${modelName}-${command}-${key}`;
+                    $elem.attr('id', id);
+                  }
+                });
               },
               cancel: function(e) {
                 var cronappDatasource = this.dataSource.transport.options.cronappDatasource;
@@ -3698,6 +3753,7 @@
                     var found = _goTo(_scope, combobox, combobox.dataItem());
 
                     if (!found) {
+                      combobox.isEvaluating = true;
                       dataSourceScreen.findObj([value], false, (dataresult) => {
                         if (Array.isArray(dataresult)) {
                           dataresult = dataresult[0];
@@ -3707,6 +3763,7 @@
                           _goTo(_scope, combobox, dataresult);
                           modelSetter(_scope, value);
                         }
+                        combobox.isEvaluating = false;
                       });
                     }
                   }
@@ -4571,79 +4628,42 @@
 
       .directive('cronDynamicMenu', ['$compile', '$translate', function ($compile, $translate) {
         'use strict';
-        const populateSubitems = (item) => {
-          var subitem = item.menuItems;
-          var templateSubitens = '';
-
-          subitem.forEach((subitem) => {
-            var securitySubitem = (subitem.security && subitem.security != null) ? ' cronapp-security="' + subitem.security + '" ' : '';
-            var actionSubitem = (subitem.action && subitem.action != null) ? ' ng-click="' + subitem.action + '" ' : '';
-            var hideSubitem = (subitem.hide && subitem.hide != null) ? ' ng-hide="' + subitem.hide + '" ' : '';
-            var iconClassSubitem = (subitem.iconClass && subitem.iconClass != null) ? '<i class="' + subitem.iconClass + '"></i>&nbsp;' : '';
-            var titleSubitem = '<span></span>';
-            var caretSubitem = (subitem.menuItems && Array.isArray(subitem.menuItems) && (subitem.menuItems.length > 0)) ? '<span class="caret submenu"></span>' : '';
-
-            if (subitem.title) {
-              titleSubitem = '<span>' + $translate.instant(subitem.title) + '</span>';
-            }
-
-            if (subitem.menuItems.length > 0) {
-              templateSubitens = templateSubitens + '<li class="dropdown-submenu">\
-                      <a class="dropdown-item dropdown-toggle" role="button" aria-haspopup="true" aria-expanded="false" href=""' + securitySubitem + actionSubitem + '>' + iconClassSubitem + titleSubitem + caretSubitem + '</a>\
-                      ' + populateItems(subitem.menuItems) + '\
-                    </li>';
-
-            } else {
-              templateSubitens = templateSubitens + '<li class="dropdown-submenu">\
-                      <a  role="button" aria-haspopup="true" aria-expanded="false" href=""' + securitySubitem + actionSubitem + '>' + iconClassSubitem + titleSubitem + caretSubitem + '</a>\
-                    </li>';
-            }
-          });
-
-          if (templateSubitens != '') {
-            templateSubitens = '<ul class="dropdown-menu">' + templateSubitens + '</ul>';
-          }
-
-          return templateSubitens;
-        };
-
         const populateItems = (items) => {
           var templateItens = '';
 
           if (items && items.length > 0 && Array.isArray(items)) {
             items.forEach(function (item) {
 
-              var security = (item.security && item.security != null) ? ' cronapp-security="' + item.security + '" ' : '';
-              var action = (item.action && item.action != null) ? ' ng-click="' + item.action + '" ' : '';
-              var hide = (item.hide && item.hide != null) ? ' ng-hide="' + item.hide + '" ' : '';
-              var iconClass = (item.iconClass && item.iconClass != null) ? '<i class="' + item.iconClass + '"></i>&nbsp;' : '';
-              var title = '<span></span>';
-              var caret = (item.menuItems && Array.isArray(item.menuItems) && (item.menuItems.length > 0)) ? '<span class="caret submenu"></span>' : '';
+              var security = (item.security && item.security != null) ? ` cronapp-security="${item.security }" ` : '';
+              var action = (item.action && item.action != null) ? ` ng-click="${item.action}" ` : '';
+              var hide = (item.hide && item.hide != null) ? ` ng-hide="${item.hide}"  ` : '';
+              var iconClass = (item.iconClass && item.iconClass != null) ? `<i class="${item.iconClass}" id="menu-tag-i-${item.id}"></i>&nbsp;` : '';
+              var title = `<span id="menu-tag-span-${item.id}"></span>`;
+              var caret = (item.menuItems && Array.isArray(item.menuItems) && (item.menuItems.length > 0)) ? `<span class="caret submenu" id="menu-tag-span-sub-${item.id}"></span>` : '';
 
               if (item.title) {
-                title = '<span>' + $translate.instant(item.title) + '</span>';
+                title =  `<span id="menu-tag-span-${item.id}">${$translate.instant(item.title)}</span>`;
               }
 
               if (item.menuItems.length > 0) {
-                templateItens = templateItens + '\
-                        <li class="dropdown-submenu" ' + security + hide + '> \
-                          <a  href="" ' + action + ' class="dropdown-item dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">' + iconClass + title + caret + ' </a> \
-                            ' + populateSubitems(item) + '\
-                        </li>';
+                templateItens = templateItens + `
+                <li class="dropdown-submenu" ${security}${hide} id="menu-tag-li-sub-${item.id}"> \
+                  <a  href="" ${action} id="menu-tag-a-sub-${item.id}" class="dropdown-item dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"> ${iconClass} ${title} ${caret} </a> \
+                    ${populateItems(item.menuItems)}\
+                </li>`;
               } else {
-                templateItens = templateItens + '\
-                        <li class="dropdown-submenu" ' + security + hide + '> \
-                          <a  href="" ' + action + ' class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">' + iconClass + title + caret + ' </a> \
-                        </li>';
+                templateItens = templateItens + `
+                <li class="dropdown-submenu" ${security} ${hide} id="menu-tag-li-${item.id}"> \
+                  <a  href="" ${action} id="menu-tag-a-${item.id}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">${iconClass} ${title} ${caret} </a> 
+                </li>`;
               }
 
             });
 
             if (templateItens != '') {
-              templateItens = '<ul class="dropdown-menu">' + templateItens + '</ul>';
+              templateItens = `<ul class="dropdown-menu" id="menu-tag-ul-${items[0].id}">${templateItens}</ul>`;
             }
           }
-
           return templateItens;
         }
         return {
@@ -4655,24 +4675,24 @@
 
               menuOptions.subMenuOptions.forEach(function (menu) {
 
-                var security = (menu.security && menu.security != null) ? ' cronapp-security="' + menu.security + '" ' : '';
-                var action = (menu.action && menu.action != null) ? ' ng-click="' + menu.action + '" ' : '';
-                var caret = (menu.menuItems && Array.isArray(menu.menuItems) && (menu.menuItems.length > 0)) ? '<span class="caret"></span>' : '';
-                var hide = (menu.hide && menu.hide != null) ? ' ng-hide="' + menu.hide + '" ' : '';
-                var iconClass = (menu.iconClass && menu.iconClass != null) ? '<i class="' + menu.iconClass + '"></i>&nbsp;' : '';
-                var title = '<span></span>'
+                var security = (menu.security && menu.security != null) ? ` cronapp-security="${menu.security}" ` : '';
+                var action = (menu.action && menu.action != null) ? ` ng-click="${menu.action }" ` : '';
+                var caret = (menu.menuItems && Array.isArray(menu.menuItems) && (menu.menuItems.length > 0)) ? `<span class="caret" id="menu-tag-span-sub-${menu.id}"></span>` : '';
+                var hide = (menu.hide && menu.hide != null) ? ` ng-hide="${menu.hide}" ` : '';
+                var iconClass = (menu.iconClass && menu.iconClass != null) ? `<i class="${menu.iconClass}"></i>&nbsp;` : '';
+                var title = `<span id="menu-tag-span-${menu.id}"></span>`;
 
                 if (menu.title) {
-                  title = '<span>' + $translate.instant(menu.title) + '</span>';
+                  title = `<span id="menu-tag-span-${menu.id}">${$translate.instant(menu.title)}</span>`;
                 }
 
-                template = template + '\
-                      <li class="dropdown nav-item '+ (isVertical ? 'col-md-12 padding-0' : '') + '"' + security + hide + '>\
-                        <a href="" ' + action + ' class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">\
-                        ' + iconClass + title + caret + '\
-                        </a> \
-                        ' + populateItems(menu.menuItems) + '\
-                      </li>';
+                template = template + `
+                <li class="dropdown nav-item ${(isVertical ? 'col-md-12 padding-0' : '')}" ${security} ${hide} id="menu-tag-li-sub-${menu.id}">
+                  <a href="" ${action} id="menu-tag-a-sub-${menu.id}" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">\
+                  ${iconClass} ${title} ${caret}
+                  </a>
+                  ${populateItems(menu.menuItems)}
+                </li>`;
 
               })
             }
@@ -4684,14 +4704,14 @@
               //Somente fica na vertical se for o menu principal da IDE (E estiver configurado para isso)
               let isVertical = element.closest('.crn-navigator-vertical').length;
 
-              var TEMPLATE_MAIN = '<ul  class="nav navbar-nav ' + (isVertical ? 'col-md-12 padding-0' : '') + ' " style="float:left"></ul>';
               var options = {};
               try {
                 options = JSON.parse(attrs.options);
               } catch (e) {
                 console.log('CronDynamicMenu: Invalid configuration!')
               }
-
+              let baseId = options && options.subMenuOptions ? options.subMenuOptions[0].id : "first";
+              var TEMPLATE_MAIN = `<ul id="menu-tag-ul-base-${baseId}" class="nav navbar-nav ${(isVertical ? 'col-md-12 padding-0' : '')}" style="float:left"></ul>`;
               var main = $(TEMPLATE_MAIN);
               main.attr('id', attrs.id);
 
@@ -4733,7 +4753,6 @@
                   return false;
                 });
               }
-
             });
           }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.8.37",
+  "version": "2.8.38",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {

package/cronapp-framework-js.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>