diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index e5b26ff..0c238af 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -404,8 +404,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A } - // disable export image option for demo and for cross the Image limit - if (result.LicenseInfo.LicenseTypeId == 5 || result.UserExportImageDetail.isExportImage == false) { + // disable export image option for demo account + if (result.LicenseInfo.LicenseTypeId == 5 ) { $rootScope.exportImage = "exportImage"; } @@ -693,10 +693,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A } - // disable export image option for demo and for cross the Image limit - if(result.LicenseInfo.LicenseTypeId==5 || result.UserExportImageDetail.isExportImage==false) + // disable export image option for demo account + if(result.LicenseInfo.LicenseTypeId==5) { - $rootScope.exportImage = "disableSubMenu"; + $rootScope.exportImage = "exportImage"; } $rootScope.userData = result; @@ -5429,25 +5429,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A }; - $rootScope.ShowExportImageWindow = function () { - - var $ua = navigator.userAgent; - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { - $(".export-image-ipad").modal("show").draggable({ handle: ".modal-header" }); - - $(".modal-backdrop").css("opacity", ".5"); - $(".modal-backdrop").css("z-index", "1200001"); - } - else { - $(".export-image").modal("show").draggable({ handle: ".modal-header" }); - - $(".modal-backdrop").css("opacity", ".5"); - $(".modal-backdrop").css("z-index", "1200001"); - } - }; - - - + $rootScope.ShowPrintWindow = function () { // Print Active Viewer html2canvas($("#canvasDiv"), { onrendered: function (canvas) { @@ -5828,7 +5810,8 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A 'Title': null, 'ModuleName': null, 'ImageName': null, - 'OriginalFileName': null + 'OriginalFileName': null, + 'LimitOverMessage': 'This License has exceeded the maximum limit of export image.
Please contact administrator.' }); @@ -5884,6 +5867,42 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A } + $rootScope.ShowExportImageWindow = function () { + + var userid = $rootScope.userData.Id; + var isExportedImage = $scope.GetUserExportImageData(userid, 'isExportImage'); + + if (isExportedImage) + { + var $ua = navigator.userAgent; + if (($ua.match(/(iPod|iPhone|iPad|android)/i))) { + $(".export-image-ipad").modal("show").draggable({ handle: ".modal-header" }); + + $(".modal-backdrop").css("opacity", ".5"); + $(".modal-backdrop").css("z-index", "1200001"); + } + else + { + $(".export-image").modal("show").draggable({ handle: ".modal-header" }); + + $(".modal-backdrop").css("opacity", ".5"); + $(".modal-backdrop").css("z-index", "1200001"); + } + + } + else + { + var exptAlertMessage = $scope.GetUserExportImageData(userid, 'LimitOverMessage'); + + $(".export-image-message").modal("show").draggable({ handle: ".modal-header" }); + + $(".modal-backdrop").css("opacity", ".5"); + $(".modal-backdrop").css("z-index", "1200001"); + document.getElementById("expMessage").innerHTML = exptAlertMessage; + + } + + }; $rootScope.SaveImagefile = function () { $("#canvasDiv").append(""); @@ -5924,10 +5943,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A $scope.UpdateUserExportImageData(userid,'isExportImage',result.isExportImage); // disable export image option when export Image limit over - if(result.isExportImage==false) - { - $rootScope.exportImage = "disableSubMenu"; - } + //if(result.isExportImage==false) + //{ + // $rootScope.exportImage = "exportImage"; + //} } }), diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx index aab0230..b20c4bf 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.aspx +++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx @@ -1120,6 +1120,36 @@ + + + +