Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Develop

Amrita Vishnoi
2 parents 2251abb2 f331f667
Showing 7 changed files with 31 additions and 12 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -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)
@@ -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
             {
@@ -37,7 +37,7 @@
     <add key="SMTPAddress" value="10.100.12.13" />
     <add key="SMTPPort" value="25" />
     <add key="EnableSSL" value="false" />
-    <add key="Site_Url" value ="//52.2.38.120"/>
+    <add key="Site_Url" value ="http://34.207.39.107/"/>
     <add key ="HostAddress" value="10.100.12.13" />
     <add key="isUserAuthenticated" value="false"/>
     <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
@@ -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) {
@@ -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