"; - if (string.IsNullOrEmpty(sender)) + // if (string.IsNullOrEmpty(sender)) senderEmailId = Convert.ToString(ConfigurationManager.AppSettings["SenderEmailAddress"]); - else - senderEmailId = sender; + // else + // senderEmailId = sender; emailMessage += mailBody; diff --git a/400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs b/400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs index 960420c..31f4d1b 100644 --- a/400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs +++ b/400-SOURCECODE/AIAHTML5.API/Utility/EmailUtility.cs @@ -31,6 +31,9 @@ namespace AIAHTML5.API.Utility public void SendMail(MailMessage mm) { + ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType)); + //logger.Debug("inside SendMail"); + try { SmtpClient smtp = new SmtpClient(); @@ -39,11 +42,13 @@ namespace AIAHTML5.API.Utility System.Net.NetworkCredential NetworkCred = new System.Net.NetworkCredential(mm.From.ToString(), ConfigurationManager.AppSettings["SenderPassword"]); smtp.Credentials = NetworkCred; smtp.Port = Convert.ToInt32(ConfigurationManager.AppSettings["SMTPPort"]); - smtp.EnableSsl = false; + // smtp.EnableSsl = false; smtp.Send(mm); } catch (Exception e) - { + { + logger.Fatal("Exception inside SendMail. Ex= " + e.Message + "....STACKTRACE = " + e.StackTrace); + throw; } } @@ -136,7 +141,7 @@ namespace AIAHTML5.API.Utility catch (Exception ex) { logger.Fatal("exception in SendSmtpEmail.msg= " + ex.Message + ", stacktarce= " + ex.StackTrace); - throw ex; + throw ; } } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f32faaa..6a439d6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -513,8 +513,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l else { $rootScope.isVisibleLogin = false; - $rootScope.loadSearchData(); - + console.log('currentBodyViewId picked from localStorage: ' + currentBodyViewId); var openViews; @@ -536,8 +535,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var tittle = $rootScope.getLocalStorageValue("currentViewTitle"); $rootScope.StoreTitleName(tittle); - // store image for export - $scope.LoadImageToExport(); + $rootScope.loadSearchData(); + + //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD //if (openViews != null && openViews != undefined) { @@ -910,8 +910,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } } - // store image for export - $scope.LoadImageToExport(); + //console.log("s" + $rootScope.vocabTermDataArray); //call watch on '$scope.VocabTermTxt and compile
- on first time load
@@ -922,6 +921,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//}, true);
}
+ // store image for export
+ $scope.LoadImageToExport();
}
@@ -8029,8 +8030,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// store image for export
var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
$rootScope.StoreTitleName(tittle);
- $scope.LoadImageToExport();
-
+
$rootScope.isLoading = true;
}
@@ -8066,7 +8066,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// store image for export
var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
$rootScope.StoreTitleName(tittle);
- $scope.LoadImageToExport();
+
$rootScope.isLoading = true;
@@ -8362,8 +8362,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// store image for export
var tittle = $rootScope.getLocalStorageValue("currentViewTitle");
$rootScope.StoreTitleName(tittle);
- $scope.LoadImageToExport();
-
+
$rootScope.openViews.push(
{
"module": $rootScope.currentActiveModuleTitle, "bodyView": $rootScope.getLocalStorageValue("currentViewTitle"), "state": 'max', "BodyViewId": $rootScope.voId,
@@ -8452,6 +8451,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.loadNavigatorForSelectedBodyView(data.bodyViewId);
+ // store image for export
+ $scope.LoadImageToExport();
+
})
//Reload DA controller Body View after setting Change
$scope.$on('reloadDABodyViewEvent', function (event, data) {
@@ -8475,6 +8477,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.loadNavigatorForSelectedBodyView(data.reloadDABodyViewId);
+ // store image for export
+ $scope.LoadImageToExport();
+
if ($scope.layerNumber != 0) {
$scope.EnableUI();
}
@@ -8488,10 +8493,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.loadNavigatorForSelectedBodyView = function (currentBodyViewId) {
-
- // store image for export
- $scope.LoadImageToExport();
-
if ($rootScope.NavigatorData != null || $rootScope.NavigatorData != undefined) {
var navdtlOrient = new jinqJs()
.from($rootScope.NavigatorData.Navigtor.ViewOrientation)
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 9f6ff8a..0c238af 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -364,106 +364,102 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
$location.path('/');
}
- else {
- if (result.LicenseInfo != null && result.LicenseInfo.IsTermAccepted)
- {
-
+ else
+ {
+ //1. set haveRoleAdmin = false because LicenseInfo is not null
+
+ if (result.LicenseTypeId != 5) {
+
+ $rootScope.haveRoleAdmin = true;
+
+ }
+ if (result.UserTypeId == 8) {
+
+ $rootScope.haveRoleAdmin = false;
+ }
+
+ // Remove Admin Link for LicenseEditionId 3/4 of student
+ if (result.EditionId == 3 || result.EditionId == 4) {
+ $rootScope.haveRoleAdmin = false;
+
+ }
+
+ if (result.LicenseInfo != null) {
+
// set license id
- $scope.UpdateUserExportImageData(result.Id,'LicenseId',result.LicenseId)
+ $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
- // set license type :note 5 for demo/test license
- $scope.UpdateUserExportImageData(result.Id,'LicenseTypeId',result.LicenseInfo.LicenseTypeId);
-
- if(result.UserExportImageDetail!=null)
- {
+ // set license type :note 5 for demo/test license
+ $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
+
+ if (result.UserExportImageDetail != null) {
// set already export image count
- $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
-
- // set Image limit
- $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
+ $scope.UpdateUserExportImageData(result.Id, 'CountExportImage', result.UserExportImageDetail.CountExportedImage);
- // set is enable for export image
- $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
- }
-
-
- // disable export image option for demo and for cross the Image limit
- if(result.LicenseInfo.LicenseTypeId==5 || result.UserExportImageDetail.isExportImage==false)
- {
- $rootScope.exportImage = "disableSubMenu";
- }
+ // set Image limit
+ $scope.UpdateUserExportImageData(result.Id, 'ExptImageLimit', result.UserExportImageDetail.ExptImageLimit);
- //0.
- $rootScope.userData = result;
- $rootScope.userModules = result.Modules;
-
- //1. set haveRoleAdmin = false because LicenseInfo is not null
-
- if (result.LicenseTypeId != 5 ) {
+ // set is enable for export image
+ $scope.UpdateUserExportImageData(result.Id, 'isExportImage', result.UserExportImageDetail.isExportImage);
+ }
- $rootScope.haveRoleAdmin = true;
- }
- if (result.UserTypeId == 8)
- {
-
- $rootScope.haveRoleAdmin = false;
+ // disable export image option for demo account
+ if (result.LicenseInfo.LicenseTypeId == 5 ) {
+ $rootScope.exportImage = "exportImage";
}
- // Remove Admin Link for LicenseEditionId 3/4 of student
- if(result.EditionId==3 ||result.EditionId==4)
- {
- $rootScope.haveRoleAdmin = false;
- }
+ if (result.LicenseInfo.IsTermAccepted) {
- $("#modestyDiv").css("pointer-events", "none");
- $("#modestyDiv").css("opacity", 0.5);
- //2.
- if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
+ //0.
+ $rootScope.userData = result;
+ $rootScope.userModules = result.Modules;
- localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
- }
+ $("#modestyDiv").css("pointer-events", "none");
+ $("#modestyDiv").css("opacity", 0.5);
+ //2.
+ if ($scope.currentUserDetails == null || $scope.currentUserDetails == undefined || $scope.currentUserDetails == "") {
- // 3.ShowAssignedModulesPopup
- //isCommingSoonModel =true only when user comes first time on application and login
- if (isCommingSoonModel == true)
- {
+ localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+ }
- // ShowAssignedModulesPopup(result.Modules);
- }
+ // 3.ShowAssignedModulesPopup
+ //isCommingSoonModel =true only when user comes first time on application and login
+ if (isCommingSoonModel == true) {
- //4.
- if($scope.rememberChk)
- {
-
- $scope.saveRemeberMeDetails(result, userInfo);
- }
-
- //5.
+ // ShowAssignedModulesPopup(result.Modules);
+ }
+
+ //4.
+ if ($scope.rememberChk) {
+
+ $scope.saveRemeberMeDetails(result, userInfo);
+ }
+
+ //5.
sessionStorage.setItem("loginSession", "true");
$rootScope.isVisibleLogin = false;
-
- //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
+
+ //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
localStorage.setItem('isCommingSoonModel', false);
-
- $location.path('/');
- }
- else {
- if ($('#dvTerms').length > 0) {
- $('#dvTerms').html(result.TermsAndConditionsText);
+ $location.path('/');
}
- $rootScope.isVisibleLogin = true;
- $('#dvTermCondition').fadeIn();
- $rootScope.userData = result;
- $rootScope.haveRoleAdmin = false;
- localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
- $location.path('/');
+ else {
+ if ($('#dvTerms').length > 0) {
+ $('#dvTerms').html(result.TermsAndConditionsText);
+ }
+ $rootScope.isVisibleLogin = true;
+ $('#dvTermCondition').fadeIn();
+ $rootScope.userData = result;
+ localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+ $location.path('/');
+ }
+
}
- }
-
-
+
+ }
}
@@ -697,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;
@@ -5433,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) {
@@ -5832,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.' }); @@ -5888,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("
");
@@ -5928,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 @@
+
+
+
+