cronapp-framework-js 2.9.0-SNAPSHOT.2 → 2.9.1-SNAPSHOT.2

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/app.js

@@ -227,7 +227,7 @@ var app = (function() {
         };
 
         $rootScope.getDashboard = function(dashboardName, params, config) {
-          DashboardService.getDashboard(dashboardName, params, config);
+          DashboardService.openDashboard(dashboardName, params, config);
         };
 
         // Query string params

package/js/dashboard/dashboard.service.js

@@ -49,15 +49,15 @@
         var m = $('#reportView .modal-body');
         if(m.get(0)) {
           m.html(frame);
-          $('#reportViewContext .modal-dialog').css('width', '95%');
+          $('#dashboardViewContext .modal-dialog').css('width', '95%');
           setTimeout(function() {
-            console.log('open[#reportViewContext]');
+            console.log('open[#dashboardViewContext]');
             $('body').append(context);
             $('#reportView').modal();
           }, 100);
         }
         else {
-          console.log('wait[#reportViewContext]');
+          console.log('wait[#dashboardViewContext]');
           setTimeout(include, 200);
         }
       }
@@ -75,15 +75,16 @@
       }
     }
   
-    this.openStimulsoftReport = function(json, parameters, config) {
+    this.openStimulsoftDashboard = function(json, parameters, datasourcesInBand, config) {
 
       var context = $('#dashboardViewContext');
       if(!context.get(0)) {
-        body.append('<div id="dashboardViewContext" ng-include="\'node_modules/cronapp-framework-js/components/dashboard/dashboard.view.html\'"></div>');
-        $compile(body)(scope);
+        var htmlViewer = $('<div id="dashboardViewContext" ng-include="\'node_modules/cronapp-framework-js/components/dashboard/dashboard.view.html\'"></div>');
+        $(body).append(htmlViewer);
+        $compile(htmlViewer)(scope);
         context = $('#dashboardViewContext');
       }
-      
+
       var h = parseInt($(window).height());
       var heightRepo = (h - 200) + "px";
       var viewerId = "StiViewer" + app.common.generateId();
@@ -109,11 +110,10 @@
         }
         return viewer;
       };
-    
+
       if (config && config.$element) {
         getViewer(config).renderHtml(config.$element[0]);
       } else {
-      
         function observeFullScreen() {
           var $contentReport;
           var $modalBody;
@@ -262,7 +262,7 @@
                 this.initializeStimulsoft($translate.use());
                 this.getContentAsString(result.data).then(
                     function (content) {
-                    this.openStimulsoftReport(content.data, result.data.parameters, result.data.datasourcesInBand, config);
+                      this.openStimulsoftDashboard(content.data, result.data.parameters, result.data.datasourcesInBand, config);
                     }.bind(this),
                     function (data) {
                       var message = cronapi.internal.getErrorMessage(data, data.statusText);