cronapp-framework-js 2.8.31 → 2.8.35

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

@@ -3373,7 +3373,7 @@
             var parent = element.parent();
             $(parent).append('<input style="width: 100%;" '+ id + name + ' class="cronSelect"/>');
             var $element = $(parent).find('input.cronSelect');
-            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
+            var cronDisabled = attrs.cronDisabled;
             var options = await app.kendoHelper.getConfigCombobox(select, scope);
             options.close = attrs.ngClose ? function (){scope.$eval(attrs.ngClose)}: undefined;
             options.dataBound = attrs.ngDataBound ? function (){scope.$eval(attrs.ngDataBound)}: undefined;
@@ -3528,7 +3528,7 @@
             var self = this;
             var parentDS = {};
             var textField = null;
-            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
+            var cronDisabled = attrs.cronDisabled;
             try {
               select = JSON.parse(attrs.options);
               parentDS = this.getActive(attrs.ngModel);
@@ -3912,7 +3912,7 @@
             var modelGetter = $parse(attrs['ngModel']);
             var modelSetter = modelGetter.assign;
             var model = attrs['ngModel'];
-            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
+            var cronDisabled = attrs.cronDisabled;
 
             var _self = this;
             var select = {};
@@ -4123,7 +4123,7 @@
             options.select = attrs.ngSelect ? function (){scope.$eval(attrs.ngSelect);}: undefined;
             var parent = element.parent();
             var id = attrs.id ? ' id="' + attrs.id + '"' : '';
-            var cronDisabled = attrs.cronDisabled ? attrs.cronDisabled : 'true';
+            var cronDisabled = attrs.cronDisabled;
             var name = attrs.name ? ' name="' + attrs.name + '"' : '';
             var validationmessage = attrs.validationmessage ? ' validationmessage="' + attrs.validationmessage + '"' : '';
             var required = '';
@@ -4321,7 +4321,7 @@
             });
             resizeObserver.observe(slider.wrapper[0])
 
-            if (attrs.ngRequired || attrs.required) {
+            if (attrs.ngRequired === 'true' || attrs.required) {
               var id = attrs.id ? ' id="input' + app.common.generateId() + '"' : '';
               var name = attrs.name ? ' name="input' + app.common.generateId() + '"' : '';
               var parent = element.parent();
@@ -4741,7 +4741,7 @@
                   let idMenu = attrs.idMenu;
 
                   // Capturar o  json do menu
-                  let menuOptions = $(`#${idMenu}`)[0].children[0].attributes['options'];
+                  let menuOptions = $(`#${idMenu}`)[0].parentElement.attributes['options'];
                   menuOptions = JSON.parse(menuOptions.value);
                   let subMenuOptions = menuOptions.subMenuOptions;
 
@@ -4758,9 +4758,9 @@
 
                   function inicio(items) {
                     let x = false;
-
+    
                     for (let i in items) {
-
+    
                       let action = items[i].action;
                       if (action && action != "") {
                         action = action.replace("cronapi.screen.changeView('", '');
@@ -4769,38 +4769,58 @@
                       } else {
                         action = null
                       }
-
-                      if(items[i].level === 1){
-                        arrayPaiBreadcrumb = []
+    
+                      if (items[i].level === 1) {
+                        arrayPaiBreadcrumb = [];
                       }
-                      if (!action) {
-                        arrayPaiBreadcrumb.push({
-                          level: items[i].level,
-                          title: items[i].title,
-                          href: '#'
-                        });
-                      } else if (action) {
-                        arrayPaiBreadcrumb.push({
-                          level: items[i].level,
-                          title: items[i].title,
-                          href: document.location.origin + '/' + action.join("/")
-                        });
+    
+                      if (arrayPaiBreadcrumb.length != 0 && items[i].level === arrayPaiBreadcrumb[arrayPaiBreadcrumb.length - 1].level) {
+                        if (!action) {
+                          arrayPaiBreadcrumb[arrayPaiBreadcrumb.length - 1] = {
+                            level: items[i].level,
+                            title: items[i].title,
+                            href: '#'
+                          };
+    
+                        } else if (action) {
+                          arrayPaiBreadcrumb[arrayPaiBreadcrumb.length - 1] = {
+                            level: items[i].level,
+                            title: items[i].title,
+                            href: document.location.origin + '/' + action.join("/")
+                          };
+    
+                        }
+    
+                      } else {
+                        if (!action) {
+                          arrayPaiBreadcrumb.push({
+                            level: items[i].level,
+                            title: items[i].title,
+                            href: '#'
+                          });
+                        } else if (action) {
+                          arrayPaiBreadcrumb.push({
+                            level: items[i].level,
+                            title: items[i].title,
+                            href: document.location.origin + '/' + action.join("/")
+                          });
+                        }
                       }
-
+    
                       if (items[i].menuItems.length > 0) {
                         inicio(items[i].menuItems);
-
+    
                       } else {
-                        if(action){
+                        if (action) {
                           if (action[action.length - 1] === page[page.length - 1]) {
-                            x = true
+                            x = true;
                           }
                         }
                       }
-
+    
                       if (x) {
                         for (let y in arrayPaiBreadcrumb) {
-
+    
                           if (y == 0 && arrayPaiBreadcrumb[y].level == 1) {
                             breadcrumb.push({
                               type: "rootitem",
@@ -4822,11 +4842,12 @@
                               type: "item",
                               href: arrayPaiBreadcrumb[y].href,
                               text: arrayPaiBreadcrumb[y].title,
-                              showText: true
+                              showText: true,
+                              showIcon: false
                             })
                           }
                         }
-
+    
                         return breadcrumb
                       }
                     }
@@ -5072,6 +5093,42 @@
         }
       })
 
+      .directive('cronOrderedList', function ($compile, $sce, $parse) {
+        'use strict';
+        return {
+          restrict: 'EA',
+          replace: true,
+          link: function (scope, element, attrs, ngModelCtrl) {
+  
+            let attributeValue = attrs.attributeValue;
+            let orderedAttributeValue = attrs.orderedAttributeValue
+            let listType = attrs.listType;
+            let content = element[0].children[0].children;
+            content = $(content);
+            let templateDyn = '';
+            let contentUL = '';
+  
+            $.each(content, function (i, item) {
+              contentUL = contentUL + item.outerHTML;
+            });
+  
+            switch (listType) {
+              case 'numbered-list':
+                templateDyn = `<ol style="list-style-type: ${attributeValue}">${contentUL}</ol>`
+                break
+  
+              case 'ordered-list':
+                templateDyn = `<ul style="list-style-type: ${orderedAttributeValue}">${contentUL}</ul>`
+                break
+            }
+  
+            templateDyn = $(templateDyn);
+            $(element).replaceWith(templateDyn);
+            $compile(templateDyn)(scope);
+          }
+        }
+      })
+
 }(app));
 
 function maskDirectiveAsDate($compile, $translate, $parse) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cronapp-framework-js",
-  "version": "2.8.31",
+  "version": "2.8.35",
   "description": "Javascript library for CronApp's projects",
   "main": "cronapp.framework.js",
   "scripts": {
@@ -41,13 +41,13 @@
   "dependencies": {
     "ng-mask": "3.0.12",
     "pace": "HubSpot/pace#v0.7.8",
-    "raphael": "DmitryBaranovskiy/raphael#v2.1.4",
+    "raphael": "DmitryBaranovskiy/raphael#v2.3.0",
     "ui-select-infinity": "hyzhak/ui-select-infinity#v0.1.5",
     "angular-ui-router": "1.0.29",
     "eonasdan-bootstrap-datetimepicker": "^4.17.49",
     "natives": "1.1.6",
     "angular": "1.8.2",
-    "angular-ui-bootstrap": "0.13.0",
+    "angular-ui-bootstrap": "0.14.0",
     "angular-chart.js": "1.1.1",
     "angular-cookies": "1.5.8",
     "angular-dynamic-locale": "0.1.32",