diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js index d98479b..d8a0b32 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js @@ -327,6 +327,12 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location $scope.Set3DwindowStoreData(windowviewid, 'currentViewTitle', ThreeDTitle); localStorage.setItem("currentViewTitle", ThreeDTitle); + var isMaximize = $scope.ThreeDOpenInOtherModules.maximised; + var isMinimize = $scope.ThreeDOpenInOtherModules.minimised; + + $scope.Set3DwindowStoreData(windowviewid, 'maximised', isMaximize); + $scope.Set3DwindowStoreData(windowviewid, 'minimised', isMinimize); + $scope.Set3DwindowStoreData(windowviewid, 'parentSlugName', ($location.url()).replace('/', '')); $scope.load3DAnimation(windowviewid); @@ -401,31 +407,24 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location height: $scope.jsPanelHeight }, - }); - //$scope.jsPanel3D.status = "minimized"; - //var max = $scope.Get3DwindowStoreData(windowviewid, 'maximised'); - //var min = $scope.Get3DwindowStoreData(windowviewid, 'minimised'); - var isMaximize = $scope.ThreeDOpenInOtherModules.maximised; - var isMinimize = $scope.ThreeDOpenInOtherModules.minimised; - if (isMaximize) { - $scope.jsPanel3D.maximize(); - $scope.Set3DwindowStoreData(windowviewid, 'maximised', true); - $scope.Set3DwindowStoreData(windowviewid, 'minimised', false); - } - else if (isMinimize) { - $scope.jsPanel3D.minimize(); - $scope.Set3DwindowStoreData(windowviewid, 'minimised', true); - $scope.Set3DwindowStoreData(windowviewid, 'maximised', false); - } - else { - $scope.jsPanel3D.normalize(); - $scope.Set3DwindowStoreData(windowviewid, 'maximised', false); - $scope.Set3DwindowStoreData(windowviewid, 'minimised', false); - } - $scope.Set3DwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); - $scope.Set3DwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); - $scope.Set3DwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); - $scope.Set3DwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + }); + + var isMaximize = $scope.Get3DwindowStoreData(windowviewid, 'maximised'); + var isMinimize = $scope.Get3DwindowStoreData(windowviewid, 'minimised'); + if (isMaximize) { + $scope.jsPanel3D.maximize(); + } + else if (isMinimize) { + $scope.jsPanel3D.minimize(); + } + else { + $scope.jsPanel3D.normalize(); + } + $scope.Set3DwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); + $scope.Set3DwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); + $scope.Set3DwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); + $scope.Set3DwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + $rootScope.currentSlug = '3d-anatomy-details'; $scope.Set3DwindowStoreData(windowviewid, 'currentSlug', '3d-anatomy-details'); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index e482996..b7f45b8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -757,6 +757,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var ciTitle = $scope.caOpenInOtherModules.anatomyTitle; $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', ciTitle); localStorage.setItem("currentViewTitle", ciTitle); + + var isMaximize = $scope.caOpenInOtherModules.maximised; + var isMinimize = $scope.caOpenInOtherModules.minimised; + $scope.SetCAwindowStoreData(windowviewid, 'maximised', isMaximize); + $scope.SetCAwindowStoreData(windowviewid, 'minimised', isMinimize); $scope.SetCAwindowStoreData(windowviewid, 'parentSlugName', ($location.url()).replace('/', '')); @@ -878,41 +883,22 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }); - - //var max = $scope.GetCAwindowStoreData(windowviewid, 'maximised'); - //var min = $scope.GetCAwindowStoreData(windowviewid, 'minimised'); - var isMaximize = $scope.caOpenInOtherModules.maximised; - var isMinimize = $scope.caOpenInOtherModules.minimised; - if (isMaximize) { - $scope.jsPanelCA.maximize(); - $scope.SetCAwindowStoreData(windowviewid, 'maximised', true); - $scope.SetCAwindowStoreData(windowviewid, 'minimised', false); - } - else if (isMinimize) { - $scope.jsPanelCA.minimize(); - $scope.SetCAwindowStoreData(windowviewid, 'minimised', true); - $scope.SetCAwindowStoreData(windowviewid, 'maximised', false); - } - else { - $scope.jsPanelCA.normalize(); - $scope.SetCAwindowStoreData(windowviewid, 'maximised', false); - $scope.SetCAwindowStoreData(windowviewid, 'minimised', false); - } - - //$scope.jsPanelCA.on('jspanelstatechange', function () { - // if ($scope.jsPanelCA.status === "maximized" || $scope.jsPanelCA.status === "normalized") { - // //mypanel2.content.append("

jsPanel.status changed to: " + mypanel2.status + "

"); - // var offSet = $(this).offset(); var postions = (this).position(); event.currentTarget.offset.top; event.currentTarget.offsetleft; - // $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top); - // $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left); - // $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth); - // $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight); - // } - //}); - $scope.SetCAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); - $scope.SetCAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); - $scope.SetCAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); - $scope.SetCAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + + var isMaximize = $scope.GetCAwindowStoreData(windowviewid, 'maximised'); + var isMinimize = $scope.GetCAwindowStoreData(windowviewid, 'minimised'); + if (isMaximize) { + $scope.jsPanelCA.maximize(); + } + else if (isMinimize) { + $scope.jsPanelCA.minimize(); + } + else { + $scope.jsPanelCA.normalize(); + } + $scope.SetCAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); + $scope.SetCAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); + $scope.SetCAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); + $scope.SetCAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); $scope.SetCAwindowStoreData(windowviewid, 'currentSlug', 'clinical-animations-detail'); $('html, body').animate({ scrollTop: 0 }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 87726fb..d42cb19 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -778,6 +778,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle); localStorage.setItem("currentViewTitle", ciTitle); + var isMaximize = $scope.ciOpenInOtherModules.maximised; + var isMinimize = $scope.ciOpenInOtherModules.minimised; + $scope.SetCIwindowStoreData(windowviewid, 'maximised', isMaximize); + $scope.SetCIwindowStoreData(windowviewid, 'minimised', isMinimize); + // store image for export $rootScope.StoreTitleName(ciTitle); $rootScope.StoreOrgImageName(selectedTileData[0]._contentImage); @@ -858,32 +863,24 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout height: $scope.jsPanelHeight }, - }); - - //var max = $scope.GetCIwindowStoreData(windowviewid, 'maximised'); - //var min = $scope.GetCIwindowStoreData(windowviewid, 'minimised'); - var isMaximize = $scope.ciOpenInOtherModules.maximised; - var isMinimize = $scope.ciOpenInOtherModules.minimised; - if (isMaximize) { - $scope.jsPanelCI.maximize(); - $scope.SetCIwindowStoreData(windowviewid, 'maximised', true); - $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); - } - else if (isMinimize) { - $scope.jsPanelCI.minimize(); - $scope.SetCIwindowStoreData(windowviewid, 'minimised', true); - $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); - } - else { - $scope.jsPanelCI.normalize(); - $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); - $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); - } - - $scope.SetCIwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); - $scope.SetCIwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); - $scope.SetCIwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); - $scope.SetCIwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + }); + + var isMaximize = $scope.GetCIwindowStoreData(windowviewid, 'maximised'); + var isMinimize = $scope.GetCIwindowStoreData(windowviewid, 'minimised'); + if (isMaximize) { + $scope.jsPanelCI.maximize(); + } + else if (isMinimize) { + $scope.jsPanelCI.minimize(); + } + else { + $scope.jsPanelCI.normalize(); + } + $scope.SetCIwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); + $scope.SetCIwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); + $scope.SetCIwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); + $scope.SetCIwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + $scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail'); @@ -1031,41 +1028,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } //Created method by Sandeep for Save JSPanel Activity on the CB module - $scope.PanelActivity = function () { - //$("#" + $scope.jsPanelID).resizable({ - // resize: function (event, ui) { - // var len = (event.currentTarget.id).split("_").length; - // var windowviewid = (event.currentTarget.id).split("_")[len - 1]; - // $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width); - // $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height); - - // } - //}); - - //$("#" + $scope.jsPanelID).mousemove(function (event) { - // var len = (event.currentTarget.id).split("_").length; - // var windowviewid = (event.currentTarget.id).split("_")[len - 1]; - // var offSet = $(this).offset(); - // $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top); - // $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left); - // $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth); - // $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight); - - // console.log(offSet.top, offSet.left, event.currentTarget.offsetWidth, event.currentTarget.offsetHeight) - //}); - - //$("#" + $scope.jsPanelID).draggable({ - // drag: function (evt) { - // //var currentPanelId = $(this).attr("id"); - // var len = (event.currentTarget.id).split("_").length; - // var windowviewid = (event.currentTarget.id).split("_")[len - 1]; - // //var offSet = $(this).offset(); - // $scope.SetCIwindowStoreData(windowviewid, 'top', (this).offsetTop); - // $scope.SetCIwindowStoreData(windowviewid, 'left', (this).offsetLeft); - // $scope.SetCIwindowStoreData(windowviewid, 'width', (this).offsetWidth); - // $scope.SetCIwindowStoreData(windowviewid, 'height', (this).offsetHeight); - // }, - //}); + $scope.PanelActivity = function () { $("#" + $scope.jsPanelID).resizable({ stop: function (event, ui) { @@ -1126,28 +1089,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); }); - - //$scope.jsPanelCI.on('jspanelstatechange', function (event) { - //var currentPanelId = $(this).attr("id"); - //var len = (currentPanelId).split("_").length; - //var windowviewid = (currentPanelId).split("_")[len - 1]; - //if ($scope.jsPanelCI.status === "maximized") { - // $scope.SetCIwindowStoreData(windowviewid, 'maximised', true); - // $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); - // //mypanel2.content.append("

jsPanel.status changed to: " + mypanel2.status + "

"); - //} - //else if($scope.jsPanelCI.status === "minimized"){ - // $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); - // $scope.SetCIwindowStoreData(windowviewid, 'minimised', true); - //} - //else { - // $scope.SetCIwindowStoreData(windowviewid, 'maximised', false); - // $scope.SetCIwindowStoreData(windowviewid, 'minimised', false); - //} - //}); - - - } }] diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 54d404d..db5247b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -2325,7 +2325,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if ($scope.updatedWindowListForSaveCB.length > 0) { for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) { var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]); - $scope.selectedKey.windows.window.push(arrToStrWinObj); + if ($scope.selectedKey.windows.window != undefined) { + $scope.selectedKey.windows.window.push(arrToStrWinObj); + } + } } //} diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 4aa57f1..0cca3d9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -690,7 +690,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.SetwindowStoreData(windowviewid,'zoomInOut',$scope.daOpenInOtherModules.zoom); //// one layer down as compare to current running on production - $scope.SetwindowStoreData(windowviewid,'layerNumber',$scope.daOpenInOtherModules.layerNumber-1); + $scope.SetwindowStoreData(windowviewid, 'layerNumber', $scope.daOpenInOtherModules.layerNumber - 1); + + var isMaximize = $scope.daOpenInOtherModules.maximised; + var isMinimize = $scope.daOpenInOtherModules.minimised; + $scope.SetwindowStoreData(windowviewid, 'maximised', isMaximize); + $scope.SetwindowStoreData(windowviewid, 'minimised', isMinimize); $scope.SetwindowStoreData(windowviewid,'parentSlugName',($location.url()).replace('/', '')); @@ -861,21 +866,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var isMaximize = $scope.GetwindowStoreData(windowviewid, 'maximised'); var isMinimize = $scope.GetwindowStoreData(windowviewid, 'minimised'); if (isMaximize) { - $scope.jsPanelDA.maximize(); - $scope.SetwindowStoreData(windowviewid, 'maximised', true); - $scope.SetwindowStoreData(windowviewid, 'minimised', false); + $scope.jsPanelDA.maximize(); } else if (isMinimize) { - $scope.jsPanelDA.minimize(); - $scope.SetwindowStoreData(windowviewid, 'minimised', true); - $scope.SetwindowStoreData(windowviewid, 'maximised', false); + $scope.jsPanelDA.minimize(); } else { - $scope.jsPanelDA.normalize(); - $scope.SetwindowStoreData(windowviewid, 'maximised', false); - $scope.SetwindowStoreData(windowviewid, 'minimised', false); + $scope.jsPanelDA.normalize(); } - $scope.SetwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); $scope.SetwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); $scope.SetwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); @@ -9685,7 +9683,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l var grayImageMRDataList = $scope.GetwindowStoreData(windowviewid, 'grayImageMRDataList'); var ColoredImageSRC = $scope.GetwindowStoreData(windowviewid, 'ColoredImageSRC'); - console.log('ColoredImageSRC length before gray= ' + ColoredImageSRC.length) + //console.log('ColoredImageSRC length before gray= ' + ColoredImageSRC.length) angular.forEach(ColoredImageSRC, function (value, key) { var grayCanvasID; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index b0a6bb8..2791818 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -481,9 +481,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId); } else { $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0); - } - - + } + var isMaximize = $scope.aaOpenInOtherModules.maximised; + var isMinimize = $scope.aaOpenInOtherModules.minimised; + $scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize); + $scope.SetAAwindowStoreData(windowviewid, 'minimised', isMinimize); // note:: in few json like "articulation" imageId as same id // get wrong detail by imageId @@ -612,31 +614,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); - //Perform Activity as per SaveCb JSPanel - //var max = $scope.GetAAwindowStoreData(windowviewid, 'maximised'); - //var min = $scope.GetAAwindowStoreData(windowviewid, 'minimised'); - var isMaximize = $scope.aaOpenInOtherModules.maximised; - var isMinimize = $scope.aaOpenInOtherModules.minimised; - if (isMaximize) { - $scope.jsPanelAA.maximize(); - $scope.SetAAwindowStoreData(windowviewid, 'maximised', true); - $scope.SetAAwindowStoreData(windowviewid, 'minimised', false); - } - else if (isMinimize) { - $scope.jsPanelAA.minimize(); - $scope.SetAAwindowStoreData(windowviewid, 'minimised', true); - $scope.SetAAwindowStoreData(windowviewid, 'maximised', false); - } - else { - $scope.jsPanelAA.normalize(); - $scope.SetAAwindowStoreData(windowviewid, 'maximised', false); - $scope.SetAAwindowStoreData(windowviewid, 'minimised', false); - } - - $scope.SetAAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); - $scope.SetAAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); - $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); - $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + //Perform Activity as per SaveCb JSPanel + + var isMaximize = $scope.GetAAwindowStoreData(windowviewid, 'maximised'); + var isMinimize = $scope.GetAAwindowStoreData(windowviewid, 'minimised'); + if (isMaximize) { + $scope.jsPanelAA.maximize(); + } + else if (isMinimize) { + $scope.jsPanelAA.minimize(); + } + else { + $scope.jsPanelAA.normalize(); + } + $scope.SetAAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); + $scope.SetAAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); + $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); + $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + $timeout(function () { $compile(aaViewElement.contents())($scope); @@ -769,6 +764,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.Setslider = function (windowviewid) { + $scope.convertToZoomValue(windowviewid); var zoomLevel = $scope.zoomLevel; //$scope.GetAAwindowStoreData(windowviewid, 'sliderVal'); $("#Vslider_" + windowviewid).slider({ @@ -796,8 +792,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou step: "15" }); - $scope.setPreClickBtnCss(windowviewid) - changeThumbnailSize(event, zoomLevel, windowviewid); + if ($rootScope.isCallFromOtherModule != undefined && $rootScope.isCallFromOtherModule == true) { + $scope.setPreClickBtnCss(windowviewid) + changeThumbnailSize(event, zoomLevel, windowviewid); + } + } $scope.setControlsIDs = function (windowviewid) { @@ -920,19 +919,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou break; case "allPinBtn_"+windowviewid: if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) { - var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId'); - if (selectedSearchId != undefined) { - scope.showSelectedSystemPins(selectedSearchId, windowviewid); + if ($rootScope.isCallFromOtherModule != undefined && $rootScope.isCallFromOtherModule == true) { + var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId'); + if (selectedSearchId != undefined) { + scope.showSelectedSystemPins(selectedSearchId, windowviewid); + } + else { + scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid); + } } else { scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid); } - //if (scope.aaOpenInOtherModules.selectedSearchId != undefined) { - // scope.showSelectedSystemPins(scope.aaOpenInOtherModules.selectedSearchId, windowviewid); - //} - //else { - // scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid); - //} } else { @@ -1683,10 +1681,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } - - //$scope.EnableUI(); - //$rootScope.isLoading = false; - //$('#spinner').css('visibility', 'hidden'); + + } @@ -2709,18 +2705,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.showSystemPins(aaPinData, false,windowviewid); } $scope.showSpeechBubble(windowviewid); - + var isSliderChange = $scope.GetAAwindowStoreData(windowviewid, 'isSliderChange'); if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title") == "Current Structure" || $("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title") == undefined) { - var isSliderChange=$scope.GetAAwindowStoreData(windowviewid,'isSliderChange'); + if (isSliderChange == true) { isSliderChange = false; $scope.showAllPins(windowviewid); } } - else if ($scope.GetAAwindowStoreData(windowviewid, 'isSliderChange')) { - $scope.showAllPins(windowviewid); - } + //if ($rootScope.isCallFromOtherModule) { + else if (isSliderChange) { + $scope.showAllPins(windowviewid); + } + //} }; @@ -2734,14 +2732,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); - var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked'); - if (isHidePinBtnClicked) { - $scope.showAllPins(windowviewid); - setTimeout(function () { - $scope.activePinOnSliderChange(windowviewid); - }, 200); - } - + //if ($rootScope.isCallFromOtherModule) { + var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked'); + if (isHidePinBtnClicked) { + $scope.showAllPins(windowviewid); + setTimeout(function () { + $scope.activePinOnSliderChange(windowviewid); + }, 200); + } + //} $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false); $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false); $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);