diff --git a/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs b/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
index 2d705a2..23b138f 100644
--- a/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
@@ -49,13 +49,13 @@ namespace AIAHTML5.API.Controllers
{
logger.Debug("2. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
- isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, true);
+ isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
}
else
{
logger.Debug("3. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
- isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, false);
+ isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
}
logger.Debug("isMailSent= " + isMailSent);
if (isMailSent)
diff --git a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
index f42e1ab..eacecc5 100644
--- a/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
+++ b/400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
@@ -21,7 +21,7 @@ namespace AIAHTML5.API.Models
public static bool SendEmail(dynamic UserDetails, bool havePassword)
{
ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
- logger.Debug("inside SendEmail in for isPassword =" + havePassword);
+ logger.Debug("inside SendEmail in for havePassword =" + havePassword);
try
{
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
index 5f45e5f..43e95c0 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
index a3f2c58..f7d8a30 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
@@ -37,7 +37,7 @@
-
+
diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
index 6afcfb5..ff0b095 100644
--- a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
+++ b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 2e37ee0..50e1884 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -428,7 +428,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
//da-body-views functions
$scope.openBodyView = function () {
-
+ //Check if browser 'REFRESHED' or 'RELOADED'
+ if ($rootScope.CommonData != null) {
//0. we will initially append container to load body
//check if localstorage has any settings
@@ -455,7 +456,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$rootScope.isVisibleLogin = false;
$scope.loadSearchDataForBodyView();
-
console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
var openViews;
@@ -568,8 +568,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
$('#daImagePanel').css("left", '1px');
}, 350);
+ }
+ }
+ else
+ {
+ //for now we are redirecting user to index page on page refresh because on refresh we lost the rootscope data and some of application
+ //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc.
+
+ $location.path('/');
+
+ /*relaoding unavailable data for resolving refesh issue*/
+ /* console.log('Reloading json data for body view => BROWSER REFRESH ISSUE...');
+ $scope.loadDissectibleAnatomyData();
+
+ if ((typeof($rootScope.MenuModuleName) == "undefined") || $rootScope.MenuModuleName == null) {
+ $rootScope.MenuModuleName = "DA";
+ }*/
+
+
}
-
}
angular.element(document).ready(function (e) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 111dc7f..25fb047 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -439,7 +439,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$rootScope.disableMenuoption = " ";
$rootScope.disableSubMenu = "disableSubMenu";
$("#annotationToolBarOptions").addClass("disableSubMenu");
- $rootScope.disableFileMenu = " ";
+ $rootScope.disableFileMenu = "disableFileMenu";
}
else {
$("#annotationToolBarOptions").removeClass("disableSubMenu");
@@ -880,8 +880,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$rootScope.switchCanvas();
}
- else if ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")
- {
+ else if (($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "transparent") || ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")) {
// we are switching canvas from paint to draw to prevent paint because it does not take transparent color and we need control default black color for the case where user has unchecked fill option from Edit Shape Style window
$rootScope.switchCanvas();
@@ -3312,6 +3311,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
};
$rootScope.ShowPrintPreviewWindow = function (event) { // Print Preview
+
+ $rootScope.CloseAnnotationTool();
$("#annotationButton").parent().addClass("disableMenuannotation");
$("#annotationToolBarOptions").addClass("disableMenuoption");
$('#dvPrintPreview').css('display', 'block');
@@ -3541,9 +3542,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
}
- $rootScope.CheckRefresh = function (e) {
+ $rootScope.CheckRefresh = function (e) {
+ //Checking if 'REFRESHED' or 'RELOADED'
if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
- $location.path('/');
+ $location.path('/'); //Redirecting to landing page
};
}]
);
\ No newline at end of file