ADAM / AIAHTML5

Commit d5e33f9c7d27c20783d3c96f7ee6631bbf245029

Authored by Sandeep Kumar
1 parent d6dbb32a

Changes for Set panel Attributs for CA CI AA 3D

Inline Side-by-side
Showing 6 changed files with 138 additions and 212 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @d5e33f9
... ... @@ -327,6 +327,12 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
327 327 $scope.Set3DwindowStoreData(windowviewid, 'currentViewTitle', ThreeDTitle);
328 328 localStorage.setItem("currentViewTitle", ThreeDTitle);
329 329  
  330 + var isMaximize = $scope.ThreeDOpenInOtherModules.maximised;
  331 + var isMinimize = $scope.ThreeDOpenInOtherModules.minimised;
  332 +
  333 + $scope.Set3DwindowStoreData(windowviewid, 'maximised', isMaximize);
  334 + $scope.Set3DwindowStoreData(windowviewid, 'minimised', isMinimize);
  335 +
330 336 $scope.Set3DwindowStoreData(windowviewid, 'parentSlugName', ($location.url()).replace('/', ''));
331 337  
332 338 $scope.load3DAnimation(windowviewid);
... ... @@ -401,31 +407,24 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
401 407 height: $scope.jsPanelHeight
402 408 },
403 409  
404   - });
405   - //$scope.jsPanel3D.status = "minimized";
406   - //var max = $scope.Get3DwindowStoreData(windowviewid, 'maximised');
407   - //var min = $scope.Get3DwindowStoreData(windowviewid, 'minimised');
408   - var isMaximize = $scope.ThreeDOpenInOtherModules.maximised;
409   - var isMinimize = $scope.ThreeDOpenInOtherModules.minimised;
410   - if (isMaximize) {
411   - $scope.jsPanel3D.maximize();
412   - $scope.Set3DwindowStoreData(windowviewid, 'maximised', true);
413   - $scope.Set3DwindowStoreData(windowviewid, 'minimised', false);
414   - }
415   - else if (isMinimize) {
416   - $scope.jsPanel3D.minimize();
417   - $scope.Set3DwindowStoreData(windowviewid, 'minimised', true);
418   - $scope.Set3DwindowStoreData(windowviewid, 'maximised', false);
419   - }
420   - else {
421   - $scope.jsPanel3D.normalize();
422   - $scope.Set3DwindowStoreData(windowviewid, 'maximised', false);
423   - $scope.Set3DwindowStoreData(windowviewid, 'minimised', false);
424   - }
425   - $scope.Set3DwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
426   - $scope.Set3DwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
427   - $scope.Set3DwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
428   - $scope.Set3DwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  410 + });
  411 +
  412 + var isMaximize = $scope.Get3DwindowStoreData(windowviewid, 'maximised');
  413 + var isMinimize = $scope.Get3DwindowStoreData(windowviewid, 'minimised');
  414 + if (isMaximize) {
  415 + $scope.jsPanel3D.maximize();
  416 + }
  417 + else if (isMinimize) {
  418 + $scope.jsPanel3D.minimize();
  419 + }
  420 + else {
  421 + $scope.jsPanel3D.normalize();
  422 + }
  423 + $scope.Set3DwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
  424 + $scope.Set3DwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
  425 + $scope.Set3DwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
  426 + $scope.Set3DwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  427 +
429 428  
430 429 $rootScope.currentSlug = '3d-anatomy-details';
431 430 $scope.Set3DwindowStoreData(windowviewid, 'currentSlug', '3d-anatomy-details');
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @d5e33f9
... ... @@ -757,6 +757,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
757 757 var ciTitle = $scope.caOpenInOtherModules.anatomyTitle;
758 758 $scope.SetCAwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
759 759 localStorage.setItem("currentViewTitle", ciTitle);
  760 +
  761 + var isMaximize = $scope.caOpenInOtherModules.maximised;
  762 + var isMinimize = $scope.caOpenInOtherModules.minimised;
  763 + $scope.SetCAwindowStoreData(windowviewid, 'maximised', isMaximize);
  764 + $scope.SetCAwindowStoreData(windowviewid, 'minimised', isMinimize);
760 765  
761 766 $scope.SetCAwindowStoreData(windowviewid, 'parentSlugName', ($location.url()).replace('/', ''));
762 767  
... ... @@ -878,41 +883,22 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
878 883  
879 884  
880 885 });
881   -
882   - //var max = $scope.GetCAwindowStoreData(windowviewid, 'maximised');
883   - //var min = $scope.GetCAwindowStoreData(windowviewid, 'minimised');
884   - var isMaximize = $scope.caOpenInOtherModules.maximised;
885   - var isMinimize = $scope.caOpenInOtherModules.minimised;
886   - if (isMaximize) {
887   - $scope.jsPanelCA.maximize();
888   - $scope.SetCAwindowStoreData(windowviewid, 'maximised', true);
889   - $scope.SetCAwindowStoreData(windowviewid, 'minimised', false);
890   - }
891   - else if (isMinimize) {
892   - $scope.jsPanelCA.minimize();
893   - $scope.SetCAwindowStoreData(windowviewid, 'minimised', true);
894   - $scope.SetCAwindowStoreData(windowviewid, 'maximised', false);
895   - }
896   - else {
897   - $scope.jsPanelCA.normalize();
898   - $scope.SetCAwindowStoreData(windowviewid, 'maximised', false);
899   - $scope.SetCAwindowStoreData(windowviewid, 'minimised', false);
900   - }
901   -
902   - //$scope.jsPanelCA.on('jspanelstatechange', function () {
903   - // if ($scope.jsPanelCA.status === "maximized" || $scope.jsPanelCA.status === "normalized") {
904   - // //mypanel2.content.append("<p style='...'><i>jsPanel</i>.status changed to: " + mypanel2.status + "</p>");
905   - // var offSet = $(this).offset(); var postions = (this).position(); event.currentTarget.offset.top; event.currentTarget.offsetleft;
906   - // $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top);
907   - // $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left);
908   - // $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth);
909   - // $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight);
910   - // }
911   - //});
912   - $scope.SetCAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
913   - $scope.SetCAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
914   - $scope.SetCAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
915   - $scope.SetCAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  886 +
  887 + var isMaximize = $scope.GetCAwindowStoreData(windowviewid, 'maximised');
  888 + var isMinimize = $scope.GetCAwindowStoreData(windowviewid, 'minimised');
  889 + if (isMaximize) {
  890 + $scope.jsPanelCA.maximize();
  891 + }
  892 + else if (isMinimize) {
  893 + $scope.jsPanelCA.minimize();
  894 + }
  895 + else {
  896 + $scope.jsPanelCA.normalize();
  897 + }
  898 + $scope.SetCAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
  899 + $scope.SetCAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
  900 + $scope.SetCAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
  901 + $scope.SetCAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
916 902  
917 903 $scope.SetCAwindowStoreData(windowviewid, 'currentSlug', 'clinical-animations-detail');
918 904 $('html, body').animate({ scrollTop: 0 });
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @d5e33f9
... ... @@ -778,6 +778,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
778 778 $scope.SetCIwindowStoreData(windowviewid, 'currentViewTitle', ciTitle);
779 779 localStorage.setItem("currentViewTitle", ciTitle);
780 780  
  781 + var isMaximize = $scope.ciOpenInOtherModules.maximised;
  782 + var isMinimize = $scope.ciOpenInOtherModules.minimised;
  783 + $scope.SetCIwindowStoreData(windowviewid, 'maximised', isMaximize);
  784 + $scope.SetCIwindowStoreData(windowviewid, 'minimised', isMinimize);
  785 +
781 786 // store image for export
782 787 $rootScope.StoreTitleName(ciTitle);
783 788 $rootScope.StoreOrgImageName(selectedTileData[0]._contentImage);
... ... @@ -858,32 +863,24 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
858 863 height: $scope.jsPanelHeight
859 864 },
860 865  
861   - });
862   -
863   - //var max = $scope.GetCIwindowStoreData(windowviewid, 'maximised');
864   - //var min = $scope.GetCIwindowStoreData(windowviewid, 'minimised');
865   - var isMaximize = $scope.ciOpenInOtherModules.maximised;
866   - var isMinimize = $scope.ciOpenInOtherModules.minimised;
867   - if (isMaximize) {
868   - $scope.jsPanelCI.maximize();
869   - $scope.SetCIwindowStoreData(windowviewid, 'maximised', true);
870   - $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
871   - }
872   - else if (isMinimize) {
873   - $scope.jsPanelCI.minimize();
874   - $scope.SetCIwindowStoreData(windowviewid, 'minimised', true);
875   - $scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
876   - }
877   - else {
878   - $scope.jsPanelCI.normalize();
879   - $scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
880   - $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
881   - }
882   -
883   - $scope.SetCIwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
884   - $scope.SetCIwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
885   - $scope.SetCIwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
886   - $scope.SetCIwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  866 + });
  867 +
  868 + var isMaximize = $scope.GetCIwindowStoreData(windowviewid, 'maximised');
  869 + var isMinimize = $scope.GetCIwindowStoreData(windowviewid, 'minimised');
  870 + if (isMaximize) {
  871 + $scope.jsPanelCI.maximize();
  872 + }
  873 + else if (isMinimize) {
  874 + $scope.jsPanelCI.minimize();
  875 + }
  876 + else {
  877 + $scope.jsPanelCI.normalize();
  878 + }
  879 + $scope.SetCIwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
  880 + $scope.SetCIwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
  881 + $scope.SetCIwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
  882 + $scope.SetCIwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  883 +
887 884  
888 885 $scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail');
889 886  
... ... @@ -1031,41 +1028,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1031 1028 }
1032 1029  
1033 1030 //Created method by Sandeep for Save JSPanel Activity on the CB module
1034   - $scope.PanelActivity = function () {
1035   - //$("#" + $scope.jsPanelID).resizable({
1036   - // resize: function (event, ui) {
1037   - // var len = (event.currentTarget.id).split("_").length;
1038   - // var windowviewid = (event.currentTarget.id).split("_")[len - 1];
1039   - // $scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width);
1040   - // $scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height);
1041   -
1042   - // }
1043   - //});
1044   -
1045   - //$("#" + $scope.jsPanelID).mousemove(function (event) {
1046   - // var len = (event.currentTarget.id).split("_").length;
1047   - // var windowviewid = (event.currentTarget.id).split("_")[len - 1];
1048   - // var offSet = $(this).offset();
1049   - // $scope.SetCIwindowStoreData(windowviewid, 'top', offSet.top);
1050   - // $scope.SetCIwindowStoreData(windowviewid, 'left', offSet.left);
1051   - // $scope.SetCIwindowStoreData(windowviewid, 'width', event.currentTarget.offsetWidth);
1052   - // $scope.SetCIwindowStoreData(windowviewid, 'height', event.currentTarget.offsetHeight);
1053   -
1054   - // console.log(offSet.top, offSet.left, event.currentTarget.offsetWidth, event.currentTarget.offsetHeight)
1055   - //});
1056   -
1057   - //$("#" + $scope.jsPanelID).draggable({
1058   - // drag: function (evt) {
1059   - // //var currentPanelId = $(this).attr("id");
1060   - // var len = (event.currentTarget.id).split("_").length;
1061   - // var windowviewid = (event.currentTarget.id).split("_")[len - 1];
1062   - // //var offSet = $(this).offset();
1063   - // $scope.SetCIwindowStoreData(windowviewid, 'top', (this).offsetTop);
1064   - // $scope.SetCIwindowStoreData(windowviewid, 'left', (this).offsetLeft);
1065   - // $scope.SetCIwindowStoreData(windowviewid, 'width', (this).offsetWidth);
1066   - // $scope.SetCIwindowStoreData(windowviewid, 'height', (this).offsetHeight);
1067   - // },
1068   - //});
  1031 + $scope.PanelActivity = function () {
1069 1032  
1070 1033 $("#" + $scope.jsPanelID).resizable({
1071 1034 stop: function (event, ui) {
... ... @@ -1126,28 +1089,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1126 1089 $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
1127 1090  
1128 1091 });
1129   -
1130   - //$scope.jsPanelCI.on('jspanelstatechange', function (event) {
1131   - //var currentPanelId = $(this).attr("id");
1132   - //var len = (currentPanelId).split("_").length;
1133   - //var windowviewid = (currentPanelId).split("_")[len - 1];
1134   - //if ($scope.jsPanelCI.status === "maximized") {
1135   - // $scope.SetCIwindowStoreData(windowviewid, 'maximised', true);
1136   - // $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
1137   - // //mypanel2.content.append("<p style='...'><i>jsPanel</i>.status changed to: " + mypanel2.status + "</p>");
1138   - //}
1139   - //else if($scope.jsPanelCI.status === "minimized"){
1140   - // $scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
1141   - // $scope.SetCIwindowStoreData(windowviewid, 'minimised', true);
1142   - //}
1143   - //else {
1144   - // $scope.SetCIwindowStoreData(windowviewid, 'maximised', false);
1145   - // $scope.SetCIwindowStoreData(windowviewid, 'minimised', false);
1146   - //}
1147   - //});
1148   -
1149   -
1150   -
1151 1092 }
1152 1093  
1153 1094 }]
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @d5e33f9
... ... @@ -2325,7 +2325,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2325 2325 if ($scope.updatedWindowListForSaveCB.length > 0) {
2326 2326 for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) {
2327 2327 var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]);
2328   - $scope.selectedKey.windows.window.push(arrToStrWinObj);
  2328 + if ($scope.selectedKey.windows.window != undefined) {
  2329 + $scope.selectedKey.windows.window.push(arrToStrWinObj);
  2330 + }
  2331 +
2329 2332 }
2330 2333 }
2331 2334 //}
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @d5e33f9
... ... @@ -690,7 +690,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
690 690 $scope.SetwindowStoreData(windowviewid,'zoomInOut',$scope.daOpenInOtherModules.zoom);
691 691  
692 692 //// one layer down as compare to current running on production
693   - $scope.SetwindowStoreData(windowviewid,'layerNumber',$scope.daOpenInOtherModules.layerNumber-1);
  693 + $scope.SetwindowStoreData(windowviewid, 'layerNumber', $scope.daOpenInOtherModules.layerNumber - 1);
  694 +
  695 + var isMaximize = $scope.daOpenInOtherModules.maximised;
  696 + var isMinimize = $scope.daOpenInOtherModules.minimised;
  697 + $scope.SetwindowStoreData(windowviewid, 'maximised', isMaximize);
  698 + $scope.SetwindowStoreData(windowviewid, 'minimised', isMinimize);
694 699  
695 700 $scope.SetwindowStoreData(windowviewid,'parentSlugName',($location.url()).replace('/', ''));
696 701  
... ... @@ -861,21 +866,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
861 866 var isMaximize = $scope.GetwindowStoreData(windowviewid, 'maximised');
862 867 var isMinimize = $scope.GetwindowStoreData(windowviewid, 'minimised');
863 868 if (isMaximize) {
864   - $scope.jsPanelDA.maximize();
865   - $scope.SetwindowStoreData(windowviewid, 'maximised', true);
866   - $scope.SetwindowStoreData(windowviewid, 'minimised', false);
  869 + $scope.jsPanelDA.maximize();
867 870 }
868 871 else if (isMinimize) {
869   - $scope.jsPanelDA.minimize();
870   - $scope.SetwindowStoreData(windowviewid, 'minimised', true);
871   - $scope.SetwindowStoreData(windowviewid, 'maximised', false);
  872 + $scope.jsPanelDA.minimize();
872 873 }
873 874 else {
874   - $scope.jsPanelDA.normalize();
875   - $scope.SetwindowStoreData(windowviewid, 'maximised', false);
876   - $scope.SetwindowStoreData(windowviewid, 'minimised', false);
  875 + $scope.jsPanelDA.normalize();
877 876 }
878   -
879 877 $scope.SetwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
880 878 $scope.SetwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
881 879 $scope.SetwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
... ... @@ -9685,7 +9683,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9685 9683 var grayImageMRDataList = $scope.GetwindowStoreData(windowviewid, 'grayImageMRDataList');
9686 9684  
9687 9685 var ColoredImageSRC = $scope.GetwindowStoreData(windowviewid, 'ColoredImageSRC');
9688   - console.log('ColoredImageSRC length before gray= ' + ColoredImageSRC.length)
  9686 + //console.log('ColoredImageSRC length before gray= ' + ColoredImageSRC.length)
9689 9687  
9690 9688 angular.forEach(ColoredImageSRC, function (value, key) {
9691 9689 var grayCanvasID;
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @d5e33f9
... ... @@ -481,9 +481,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
481 481 $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId);
482 482 } else {
483 483 $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
484   - }
485   -
486   -
  484 + }
  485 + var isMaximize = $scope.aaOpenInOtherModules.maximised;
  486 + var isMinimize = $scope.aaOpenInOtherModules.minimised;
  487 + $scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize);
  488 + $scope.SetAAwindowStoreData(windowviewid, 'minimised', isMinimize);
487 489  
488 490 // note:: in few json like "articulation" imageId as same id
489 491 // get wrong detail by imageId
... ... @@ -612,31 +614,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
612 614 $rootScope.isLoading = true;
613 615 $('#spinner').css('visibility', 'visible');
614 616  
615   - //Perform Activity as per SaveCb JSPanel
616   - //var max = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
617   - //var min = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
618   - var isMaximize = $scope.aaOpenInOtherModules.maximised;
619   - var isMinimize = $scope.aaOpenInOtherModules.minimised;
620   - if (isMaximize) {
621   - $scope.jsPanelAA.maximize();
622   - $scope.SetAAwindowStoreData(windowviewid, 'maximised', true);
623   - $scope.SetAAwindowStoreData(windowviewid, 'minimised', false);
624   - }
625   - else if (isMinimize) {
626   - $scope.jsPanelAA.minimize();
627   - $scope.SetAAwindowStoreData(windowviewid, 'minimised', true);
628   - $scope.SetAAwindowStoreData(windowviewid, 'maximised', false);
629   - }
630   - else {
631   - $scope.jsPanelAA.normalize();
632   - $scope.SetAAwindowStoreData(windowviewid, 'maximised', false);
633   - $scope.SetAAwindowStoreData(windowviewid, 'minimised', false);
634   - }
635   -
636   - $scope.SetAAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
637   - $scope.SetAAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
638   - $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
639   - $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  617 + //Perform Activity as per SaveCb JSPanel
  618 +
  619 + var isMaximize = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
  620 + var isMinimize = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
  621 + if (isMaximize) {
  622 + $scope.jsPanelAA.maximize();
  623 + }
  624 + else if (isMinimize) {
  625 + $scope.jsPanelAA.minimize();
  626 + }
  627 + else {
  628 + $scope.jsPanelAA.normalize();
  629 + }
  630 + $scope.SetAAwindowStoreData(windowviewid, 'top', $scope.jsPanelTop);
  631 + $scope.SetAAwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft);
  632 + $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
  633 + $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
  634 +
640 635  
641 636 $timeout(function () {
642 637 $compile(aaViewElement.contents())($scope);
... ... @@ -769,6 +764,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
769 764 }
770 765  
771 766 $scope.Setslider = function (windowviewid) {
  767 +
772 768 $scope.convertToZoomValue(windowviewid);
773 769 var zoomLevel = $scope.zoomLevel; //$scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
774 770 $("#Vslider_" + windowviewid).slider({
... ... @@ -796,8 +792,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
796 792 step: "15"
797 793 });
798 794  
799   - $scope.setPreClickBtnCss(windowviewid)
800   - changeThumbnailSize(event, zoomLevel, windowviewid);
  795 + if ($rootScope.isCallFromOtherModule != undefined && $rootScope.isCallFromOtherModule == true) {
  796 + $scope.setPreClickBtnCss(windowviewid)
  797 + changeThumbnailSize(event, zoomLevel, windowviewid);
  798 + }
  799 +
801 800 }
802 801  
803 802 $scope.setControlsIDs = function (windowviewid) {
... ... @@ -920,19 +919,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
920 919 break;
921 920 case "allPinBtn_"+windowviewid:
922 921 if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) {
923   - var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
924   - if (selectedSearchId != undefined) {
925   - scope.showSelectedSystemPins(selectedSearchId, windowviewid);
  922 + if ($rootScope.isCallFromOtherModule != undefined && $rootScope.isCallFromOtherModule == true) {
  923 + var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
  924 + if (selectedSearchId != undefined) {
  925 + scope.showSelectedSystemPins(selectedSearchId, windowviewid);
  926 + }
  927 + else {
  928 + scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
  929 + }
926 930 }
927 931 else {
928 932 scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
929 933 }
930   - //if (scope.aaOpenInOtherModules.selectedSearchId != undefined) {
931   - // scope.showSelectedSystemPins(scope.aaOpenInOtherModules.selectedSearchId, windowviewid);
932   - //}
933   - //else {
934   - // scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
935   - //}
936 934  
937 935 }
938 936 else {
... ... @@ -1683,10 +1681,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1683 1681 }
1684 1682  
1685 1683 }
1686   -
1687   - //$scope.EnableUI();
1688   - //$rootScope.isLoading = false;
1689   - //$('#spinner').css('visibility', 'hidden');
  1684 +
  1685 +
1690 1686 }
1691 1687  
1692 1688  
... ... @@ -2709,18 +2705,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2709 2705 $scope.showSystemPins(aaPinData, false,windowviewid);
2710 2706 }
2711 2707 $scope.showSpeechBubble(windowviewid);
2712   -
  2708 + var isSliderChange = $scope.GetAAwindowStoreData(windowviewid, 'isSliderChange');
2713 2709 if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title") == "Current Structure" || $("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title") == undefined) {
2714   - var isSliderChange=$scope.GetAAwindowStoreData(windowviewid,'isSliderChange');
  2710 +
2715 2711 if (isSliderChange == true) {
2716 2712 isSliderChange = false;
2717 2713 $scope.showAllPins(windowviewid);
2718 2714  
2719 2715 }
2720 2716 }
2721   - else if ($scope.GetAAwindowStoreData(windowviewid, 'isSliderChange')) {
2722   - $scope.showAllPins(windowviewid);
2723   - }
  2717 + //if ($rootScope.isCallFromOtherModule) {
  2718 + else if (isSliderChange) {
  2719 + $scope.showAllPins(windowviewid);
  2720 + }
  2721 + //}
2724 2722  
2725 2723 };
2726 2724  
... ... @@ -2734,14 +2732,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2734 2732 $rootScope.isLoading = true;
2735 2733 $('#spinner').css('visibility', 'visible');
2736 2734  
2737   - var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
2738   - if (isHidePinBtnClicked) {
2739   - $scope.showAllPins(windowviewid);
2740   - setTimeout(function () {
2741   - $scope.activePinOnSliderChange(windowviewid);
2742   - }, 200);
2743   - }
2744   -
  2735 + //if ($rootScope.isCallFromOtherModule) {
  2736 + var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
  2737 + if (isHidePinBtnClicked) {
  2738 + $scope.showAllPins(windowviewid);
  2739 + setTimeout(function () {
  2740 + $scope.activePinOnSliderChange(windowviewid);
  2741 + }, 200);
  2742 + }
  2743 + //}
2745 2744 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
2746 2745 $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
2747 2746 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);
... ...