ADAM / AIAHTML5

Commit f30e44974f0e167cbc27fdf3a1cf30fcc9c1254c

Authored by Amrita Vishnoi
2 parents 2251abb2 f331f667

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

Inline Side-by-side
Showing 7 changed files with 31 additions and 12 deletions
400-SOURCECODE/AIAHTML5.API/Controllers/ForgotUserController.cs
  View file @f30e449
... ... @@ -49,13 +49,13 @@ namespace AIAHTML5.API.Controllers
49 49 {
50 50 logger.Debug("2. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
51 51  
52   - isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, true);
  52 + isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
53 53 }
54 54 else
55 55 {
56 56 logger.Debug("3. havePassword= " + Convert.ToBoolean(userInfo["havePassword"]));
57 57  
58   - isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, false);
  58 + isMailSent = AIAHTML5.API.Models.UserUtility.SendEmail(userData, Convert.ToBoolean(userInfo["havePassword"]));
59 59 }
60 60 logger.Debug("isMailSent= " + isMailSent);
61 61 if (isMailSent)
... ...
400-SOURCECODE/AIAHTML5.API/Models/UserUtility.cs
  View file @f30e449
... ... @@ -21,7 +21,7 @@ namespace AIAHTML5.API.Models
21 21 public static bool SendEmail(dynamic UserDetails, bool havePassword)
22 22 {
23 23 ILog logger = log4net.LogManager.GetLogger((System.Reflection.MethodBase.GetCurrentMethod().DeclaringType));
24   - logger.Debug("inside SendEmail in for isPassword =" + havePassword);
  24 + logger.Debug("inside SendEmail in for havePassword =" + havePassword);
25 25  
26 26 try
27 27 {
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll
View file @f30e449
No preview for this file type
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll.config
  View file @f30e449
... ... @@ -37,7 +37,7 @@
37 37 <add key="SMTPAddress" value="10.100.12.13" />
38 38 <add key="SMTPPort" value="25" />
39 39 <add key="EnableSSL" value="false" />
40   - <add key="Site_Url" value ="//52.2.38.120"/>
  40 + <add key="Site_Url" value ="http://34.207.39.107/"/>
41 41 <add key ="HostAddress" value="10.100.12.13" />
42 42 <add key="isUserAuthenticated" value="false"/>
43 43 <add key="AdminSupport" value="amrita.vishnoi@ebix.com,nikita.kulshreshtha@ebix.com"/>
... ...
400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb
View file @f30e449
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @f30e449
... ... @@ -428,7 +428,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
428 428 //da-body-views functions
429 429  
430 430 $scope.openBodyView = function () {
431   -
  431 + //Check if browser 'REFRESHED' or 'RELOADED'
  432 + if ($rootScope.CommonData != null) {
432 433 //0. we will initially append container to load body
433 434  
434 435 //check if localstorage has any settings
... ... @@ -455,7 +456,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
455 456 $rootScope.isVisibleLogin = false;
456 457 $scope.loadSearchDataForBodyView();
457 458  
458   -
459 459 console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId);
460 460  
461 461 var openViews;
... ... @@ -568,8 +568,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
568 568 $('#daImagePanel').css("left", '1px');
569 569  
570 570 }, 350);
  571 + }
  572 + }
  573 + else
  574 + {
  575 + //for now we are redirecting user to index page on page refresh because on refresh we lost the rootscope data and some of application
  576 + //features stopped working which were depenedent of rootscope data like List manager, annotation toolbar, settings, usermodule list, etc.
  577 +
  578 + $location.path('/');
  579 +
  580 + /*relaoding unavailable data for resolving refesh issue*/
  581 + /* console.log('Reloading json data for body view => BROWSER REFRESH ISSUE...');
  582 + $scope.loadDissectibleAnatomyData();
  583 +
  584 + if ((typeof($rootScope.MenuModuleName) == "undefined") || $rootScope.MenuModuleName == null) {
  585 + $rootScope.MenuModuleName = "DA";
  586 + }*/
  587 +
  588 +
571 589 }
572   -
573 590 }
574 591  
575 592 angular.element(document).ready(function (e) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @f30e449
... ... @@ -439,7 +439,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
439 439 $rootScope.disableMenuoption = " ";
440 440 $rootScope.disableSubMenu = "disableSubMenu";
441 441 $("#annotationToolBarOptions").addClass("disableSubMenu");
442   - $rootScope.disableFileMenu = " ";
  442 + $rootScope.disableFileMenu = "disableFileMenu";
443 443 }
444 444 else {
445 445 $("#annotationToolBarOptions").removeClass("disableSubMenu");
... ... @@ -880,8 +880,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
880 880  
881 881 $rootScope.switchCanvas();
882 882 }
883   - else if ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")
884   - {
  883 + else if (($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "transparent") || ($("#editstylebackgroundcolor span.minicolors-swatch-color").css('background-color') == "rgba(0, 0, 0, 0)")) {
885 884 // 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
886 885  
887 886 $rootScope.switchCanvas();
... ... @@ -3312,6 +3311,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3312 3311 };
3313 3312  
3314 3313 $rootScope.ShowPrintPreviewWindow = function (event) { // Print Preview
  3314 +
  3315 + $rootScope.CloseAnnotationTool();
3315 3316 $("#annotationButton").parent().addClass("disableMenuannotation");
3316 3317 $("#annotationToolBarOptions").addClass("disableMenuoption");
3317 3318 $('#dvPrintPreview').css('display', 'block');
... ... @@ -3541,9 +3542,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3541 3542  
3542 3543 }
3543 3544  
3544   - $rootScope.CheckRefresh = function (e) {
  3545 + $rootScope.CheckRefresh = function (e) {
  3546 + //Checking if 'REFRESHED' or 'RELOADED'
3545 3547 if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey))
3546   - $location.path('/');
  3548 + $location.path('/'); //Redirecting to landing page
3547 3549 };
3548 3550 }]
3549 3551 );
3550 3552 \ No newline at end of file
... ...