Changes for AA and DA Module to SaveCB

Sandeep Kumar
1 parent a11203d2
Showing 5 changed files with 313 additions and 54 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html
@@ -1044,6 +1044,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         if ($scope.selectedNodeSingleObj._label != "undefined") {
             $('#cbRenameSectionTitle').val($scope.selectedNodeSingleObj._label);
         }
+        if ($scope.selectedNodeSingleObj._isLocked != "undefined") {
+            if ($scope.selectedNodeSingleObj._isLocked != "false" && $scope.selectedNodeSingleObj._isLocked != false) {
+                $('#cbCheckLocked').prop('checked', true);
+            }
+            else {
+                $('#cbCheckLocked').prop('checked', false);
+            }
+        }
         if ($scope.selectedNodeSingleObj._isBranch == "true") {
             //traverseTreeSelectedSingleObj($rootScope.Auther, current_id);
             traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, current_id);
@@ -1103,6 +1111,33 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         if (document.getElementById("cbModelSectionRenameId").style.display == 'block') {
             document.getElementById('cbModelSectionRenameId').style.display = "none";
         }
+    }    
+
+    $scope.cbSlideLocked = function () {       
+        var nodeid;
+        if (($rootScope.getLocalStorageValue("cbSelectId")) != '') {
+            nodeid = $rootScope.getLocalStorageValue("cbSelectId");
+        }
+        else {
+            nodeid = document.getElementById('cbSelect').value;
+        }
+        var password = $('#cbPassword').val(); //document.getElementById('cbPassword').value;
+        var confirm_password = $('#cbConfirmPassWord').val(); //document.getElementById('cbConfirmPassWord').value;
+        if (password != confirm_password) {
+            $('#errorMsg').text('Password do not match!');
+            return false;
+        }
+        $('#errorMsg').text('');
+        $rootScope.closeRenameModel();
+        traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
+
+        if ($scope.selectedNodeSingleObj._isBranch == "true") {
+            if ($rootScope.contentNotesForSaveCB.length == 0) {
+                $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;
+            }
+            traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, nodeid);
+            $scope.selectedNodeSingleObj.password = password;
+        }       
     }
     $rootScope.cbRenameSection = function () {
@@ -1115,15 +1150,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         }
         //var nodeid = document.getElementById('cbSelect').value;
         $scope.cbRenameDate();
+        traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
         //var newSlideName = document.getElementById('cbRenameSectionTitle').value;
+        
+        var newLockedFlag = $('#cbCheckLocked').is(':checked');
         var newAuthorName = document.getElementById('cbRenameAuthor').value;
         var newSummary = document.getElementById('cbRenameSummary').value;
         var newversion = document.getElementById('cbRenameVersionNo').value;
         var newSectionText = document.getElementById('cbRenameSectionTitle').value;
+        if (newSectionText == ""){
+            newSectionText = $scope.selectedNodeSingleObj._label;
+        }
         var newSlideName = ("<span id=" + nodeid + " class='ng-binding ng-scope'>" + newSectionText + "</span>");
-        $("#jstree").jstree('set_text', nodeid, newSlideName);
-        traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
+        $("#jstree").jstree('set_text', nodeid, newSlideName);        
         $scope.selectedNodeSingleObj._label = newSectionText;
+        $scope.selectedNodeSingleObj._isLocked = newLockedFlag;
+
         //Update Save Draft object for rename section
         if ($rootScope.structureObjForSaveCB.length == 0) {
             $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
@@ -2606,9 +2648,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
                             height: $rootScope.AAWindowData[i].height
                         },
                         id: $rootScope.AAWindowData[i].id,
-                        showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedSystemPinsClicked,
+                        showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins,
                         hideCallOuts: false,//N
-                        showAllPins: $rootScope.AAWindowData[i].isShowBodyWithCBPinData,//N
+                        showAllPins: $rootScope.AAWindowData[i].isShowAllPins,
                         scaleIndex: $rootScope.AAWindowData[i].sliderVal,
                         bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID,
                         windowListId: "0",//N
@@ -2621,8 +2663,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
                         mType: $rootScope.AAWindowData[i].moduleName,
                         containsCapturedContent: true,
                         contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
-                        activePinArray: $rootScope.AAWindowData[i].activePinArray, // Selected PINID on Body
-                        sliderVal: $rootScope.AAWindowData[i].sliderVal
+                        //activePinArray: $rootScope.AAWindowData[i].activePinArray,
+                        selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId,
+                        //sliderVal: $rootScope.AAWindowData[i].sliderVal
+                        
                 });                   
@@ -2657,13 +2701,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
                     //    vertical: $rootScope.DaWindowData[i].verticalScroll,
                     //    horizontal: $rootScope.DaWindowData[i].horizontalScroll
                     //},                    
-                    selectedPins: $rootScope.DaWindowData[i].clickedPins,
+                    //selectedPins: $rootScope.DaWindowData[i].clickedPins,
                     maximised: $rootScope.DaWindowData[i].maximised,
                     size: {
                         width: $rootScope.DaWindowData[i].width,
                         height: $rootScope.DaWindowData[i].height
                     },
-                    id: $rootScope.DaWindowData[i].imageId,
+                    id: $rootScope.DaWindowData[i].voId,
                     //showSelectedPins: $rootScope.DaWindowData[i].isShowSelectedSystemPinsClicked,
                    // hideCallOuts: false,//N
                     //showAllPins: $rootScope.DaWindowData[i].isShowBodyWithCBPinData,//N
@@ -2711,14 +2755,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
         $scope.saveCAWindowActivity(currentId);
         $scope.save3DWindowActivity(currentId);            
         //$scope.savePicWindowActivity($scope.windowDataforCB);
-        if ($scope.updatedWindowListForSaveCB.length > 0) {
+        //if ($scope.updatedWindowListForSaveCB.length > 0) {
             findKeyForChange($rootScope.contentNotesForSaveCB, currentId);
             $scope.selectedKey.windows.window = [];
-            for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) {
-                var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]);
-                $scope.selectedKey.windows.window.push(arrToStrWinObj);
-            }            
-        }
+            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);
+                }
+            }
+        //}
         $scope.updatedWindowListForSaveCB = [];
         console.log($rootScope.contentNotesForSaveCB);
     }   
@@ -139,7 +139,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         'updatedWhiteImageMRDataList':[],
                         'updatedGrayDataList':[],
                         'updatedGrayMRDataList':[],
-                        'SearchTimeStampValue':0,
+                        'SearchTimeStampValue': 0,
+                        'top': 0,
+                        'left': 0,
+                        'width': 0,
+                        'height': 0,
+                        'minimised': false,
+                        'maximised': false,
+                        'id': 0
                     });          
@@ -233,6 +240,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         'updatedGrayDataList':[],
                         'updatedGrayMRDataList': [],
                         'SearchTimeStampValue': 0,
+                        'top': 0,
+                        'left': 0,
+                        'width': 0,
+                        'height': 0,
+                        'minimised': false,
+                        'maximised': false,
+                        'id': 0
                     });          
                 }          
@@ -844,14 +858,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                     var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
                     //Perform Activity as per SaveCB JSPanel
-                    var max = $scope.GetwindowStoreData(windowviewid, 'maximised');
-                    var min = $scope.GetwindowStoreData(windowviewid, 'minimised');
-                    if ($scope.jsPanelDA.status === "maximized" && max) {
+                    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);
                     }
-                    else if ($scope.jsPanelDA.status === "minimized" && min) {
+                    else if (isMinimize) {
                         $scope.jsPanelDA.minimize();
                         $scope.SetwindowStoreData(windowviewid, 'minimised', true);
                         $scope.SetwindowStoreData(windowviewid, 'maximised', false);
@@ -98,7 +98,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     'minimised': false,
                     'maximised': false,
                     'id': 0,
-                    'selectedPins': []                   
+                    'selectedPins': [],
+                    'isShowSelectedPins': false,
+                    'selectedSearchId': 0,
+                    'isShowAllPins': false
+
                 });          
@@ -154,7 +158,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     'minimised': false,
                     'maximised': false,
                     'id': 0,
-                    'selectedPins': []                    
+                    'selectedPins': [],
+                    'isShowSelectedPins': false,
+                    'selectedSearchId': 0,
+                    'isShowAllPins': false
                 });          
@@ -463,6 +470,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                           // set zoom level And SelectedPins
                                             $scope.SetAAwindowStoreData(windowviewid, 'sliderVal', $scope.aaOpenInOtherModules.zoomLevel);
+                                            $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', $scope.aaOpenInOtherModules.showAllPins);
+                                            $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', $scope.aaOpenInOtherModules.hideAllPins);
+                                            $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
+                                            if ($scope.aaOpenInOtherModules.selectedSearchId != undefined) {
+                                                $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId);
+                                            } else {
+                                                $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
+                                            }
+                                           
+
                                             //var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
                                             //selectedPins.push($scope.aaOpenInOtherModules.selectedPins);
                                             //$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
@@ -688,9 +705,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         $("#canvasAADiv_" + windowviewid).append(canvas);
                         $scope.context = canvas.getContext("2d")
-                        //6. Show all pins on AA opened item
-                           
-                        $scope.showAllPins(windowviewid);
+                        //6. Show all pins on AA opened item        
+                     
+                        $scope.showAllPins(windowviewid);                       
+                        
                         //$scope.showSelectedPins(windowviewid);
                         $timeout(function () {
@@ -717,9 +735,38 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $scope.PanelActivity();
     }
+    $scope.convertToZoomValue = function (windowviewid) {
+        var zoomValue = $scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
+        switch (zoomValue) {
+            case 0:
+                $scope.zoomLevel = 100;
+                break;
+            case 1:
+                $scope.zoomLevel = 85;
+                break;
+            //case 2:
+            //    $scope.zoomLevel = ;
+            //    break;
+            case 3:
+                $scope.zoomLevel = 55;
+                break;
+            //case 4:
+            //    $scope.zoomLevel = 55;
+            //    break;
+            //case 5:
+            //    $scope.zoomLevel = 40;
+            //    break;
+            //case 6:
+            //    $scope.zoomLevel = 25;
+                //    break;
+            default:
+                $scope.zoomLevel = zoomValue;
+        }
+    }
     $scope.Setslider = function (windowviewid) {
-        var zoomLevel = $scope.GetAAwindowStoreData(windowviewid,'sliderVal');
+        $scope.convertToZoomValue(windowviewid);
+        var zoomLevel = $scope.zoomLevel; //$scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
         $("#Vslider_" + windowviewid).slider({
             min: 25,
             max: 100,
@@ -745,9 +792,77 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         step: "15"
         });
+        $scope.setPreClickBtnCss(windowviewid)
         changeThumbnailSize(event, zoomLevel, windowviewid);
     }
+    function changeThumbnailSizeTest(event, value, windowviewid) {
+        var scope = angular.element(document.getElementById("aaBodyView")).scope();
+        scope.$apply(function () {
+            $scope.SetAAwindowStoreData(windowviewid, 'sliderVal', value)
+            scope.removeSpeechBubble(windowviewid);
+            var relativeWidth = 0;
+            var relativeHeight = 0;
+            if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
+                $("#listManager").css("display", "none");
+                $("#optionsListManagerTab").removeClass("active");
+
+                relativeWidth = (scope.ViewImageWidth) * (value / 100);
+                relativeHeight = (scope.ViewImageHeight) * (value / 100);
+                // scope.sliderPercentValue = (value/100);
+                $scope.SetAAwindowStoreData(windowviewid, 'sliderPercentValue', (value / 100));
+
+                $("#modItemImage_" + windowviewid).css("width", relativeWidth + "px");
+                $("#modItemImage_" + windowviewid).css("height", relativeHeight + "px");
+                $("#aaDetailViewCanvas_" + windowviewid).css("width", relativeWidth + "px");
+                $("#modItemImage_" + windowviewid).css("height", relativeHeight + "px");
+                $("#modItemImage_" + windowviewid).attr('src', '');
+                $("#aaDetailViewCanvas_" + windowviewid).remove();
+                //0.5 create canvas on the top of image so that I can draw a line over the canvas.
+                var canvas = document.createElement('canvas');
+                canvas.id = "aaDetailViewCanvas_" + windowviewid;
+                canvas.className = 'aaCanvas';
+                canvas.height = relativeHeight + 10;
+                canvas.width = relativeWidth + 10;
+                canvas.style.left = '0px';
+                canvas.style.top = '0px';
+                canvas.style.position = "absolute";
+                $("#canvasAADiv_" + windowviewid).append(canvas);
+                scope.context = canvas.getContext("2d")
+                var OpenItemImagePath = $scope.GetAAwindowStoreData(windowviewid, 'OpenItemImagePath');
+                $("#modItemImage_" + windowviewid).attr('src', OpenItemImagePath);
+                $scope.SetAAwindowStoreData(windowviewid, 'isSliderChange', true);
+                $scope.SetAAwindowStoreData(windowviewid, 'isSelectedPinBtnClickedAftrSliderCange', true);                
+
+                //$scope.GetAAwindowStoreData(windowviewid,'isShowAllPins');
+                //$scope.GetAAwindowStoreData(windowviewid,'showSelectedPins');
+                //$scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
+
+
+                if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins) {
+                    if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) {
+                        scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
+                    }
+                    else {
+                        scope.showAllPins(windowviewid);
+                    }                   
+                }
+            else if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins) {
+
+                    scope.showAllPins(windowviewid);
+                    setTimeout(function () {
+                        console.log(scope.allPinDataArray);
+                        scope.activePinOnSliderChange(windowviewid);
+                    }, 1000);
+                   
+                }
+            else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins) {
+                    
+                }
+
+            }
+        });
+    }
     $scope.setControlsIDs = function (windowviewid) {
@@ -797,6 +912,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         });
     }
+    $scope.setPreClickBtnCss = function (windowviewid) {
+        if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins) {
+            $scope.ToolBoxStyle("ShowAllPin", windowviewid);
+        }
+        else if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins) {           
+            $scope.ToolBoxStyle("ShowSelectedPin", windowviewid);
+        }
+        else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins) {
+            $scope.ToolBoxStyle("HidePin", windowviewid);
+        }
+    }
     function changeThumbnailSize(event, value,windowviewid) {
         var scope = angular.element(document.getElementById("aaBodyView")).scope();
@@ -871,6 +997,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
         });
     }
+
     $scope.highlightBodySystemList = function (windowviewid) {
         var SelectedSystemID=  $scope.GetAAwindowStoreData(windowviewid,'SelectedSystemID');
@@ -897,6 +1024,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         }
     }
+
     function loadFailure() {
         console.log('unable to load opened module ietem');
         return true;
@@ -947,8 +1075,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         clickedPins.push({ 'id': pinid});
                     }
             }
-
-            $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
+            if (selectedPins != undefined) {
+                $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
+            }            
                 for (var i = 0; i < $scope.aaOpenInOtherModules.selectedCallouts.length; i++) {
@@ -963,9 +1092,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                     }
-      
-        if($scope.aaOpenInOtherModules.showSelectedPins!=undefined)
-        {
+         //var isShowPins = $scope.GetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData');
+         //var isHidePins = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
+        //var showSelectedPins = $scope.GetAAwindowStoreData(windowviewid, 'isShowSelectedSystemPinsClicked');
+         var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
+         if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins)
+           {
             //show selected pin
             $scope.activePinOnLayerChange(windowviewid);
@@ -977,7 +1109,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 }, 1000);          
         }
-        else if($scope.aaOpenInOtherModules.showAllPins!=undefined)
+        else if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins)
         {
             //Show all pins
@@ -990,19 +1122,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 }, 500);
         }
-        else if($scope.aaOpenInOtherModules.hideAllPins!=undefined)
+        else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins)
         {
             //hide all pins
             $rootScope.hidePins(windowviewid);
              $timeout(function () {
-                $scope.ShowCBAnnotation(windowviewid);
+                 $scope.ShowCBAnnotation(windowviewid);
+                 $scope.hideSpeechBubble(windowviewid);
                 }, 500);
         }
-   
-       
+        //else {
+
+        //    //$timeout(function () {
+        //        $scope.highlightPinBasedOnSerachItem(selectedSearchId, windowviewid);
+        //    //}, 500);
+
+        //}       
     }
     $scope.ShowCBAnnotation=function(windowviewid)
@@ -1673,12 +1811,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             if (pinDataWithFirstTermNumber.length > 1) {
                 isSameTermWithMultiPin = true;
             }
+            var selectedPins=$scope.GetAAwindowStoreData(windowviewid,'selectedPins');
             var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
             angular.forEach(pinDataWithFirstTermNumber, function (value, key) {
                 if (isBodySystemSelected == true) {
                     clickedPins.push({ 'id': value._PinId });
-                   
+                    //selectedPins.push(value._PinId);
                     $scope.SetAAwindowStoreData(windowviewid,'isBodySystemSelected',false);
                 }
                 var headX = (parseInt(value._HeadX));
@@ -1690,6 +1829,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 {
                     $scope.removeSpeechBubble(windowviewid);
                 }
+
+                //Save Cordinate for show annotation as per Pin
+                var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
+                CBselectedpinCordinate.push(
+                                        {
+                                            "hy": headY,
+                                            "ly": 0,
+                                            "hx": headX,
+                                            "lx": 0
+                                        });
             })
         }
@@ -1832,11 +1981,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         // birendra 
         //  
-        $scope.ShowHideAnnotationText(windowviewid); 
+        $scope.ShowHideAnnotationText(windowviewid);        
     }
-    $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y,lx,ly, PinId,windowviewid) {
+    $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, lx, ly, PinId, windowviewid) {        
+
        var prctValue = $scope.GetAAwindowStoreData(windowviewid,'sliderPercentValue');
         x = x * prctValue;
         y = y * prctValue;
@@ -2029,6 +2179,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $('.common-drag').draggable(
         {
             drag: function (evt) {
+            //stop: function (evt) {
                 var clickedSpeechBubbleId = $(this).attr("id");
                 var len=  (clickedSpeechBubbleId).split("_").length;
                 var windowviewid = (clickedSpeechBubbleId).split("_")[len-1];
@@ -2215,10 +2366,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                      .where("_TermId == " + pinTermNumber)
                                      .select();
                 if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
-
+                    var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
                     var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins'); 
                     for (var i = 0; i < pinWithSameTerm.length; i++) {
-                        clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
+                        clickedPins.push({ 'id': pinWithSameTerm[i]._PinId });
+                        selectedPins.push(pinWithSameTerm[i]._PinId);
                     }
                 }
@@ -2543,7 +2695,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
         $scope.hideSpeechBubble(windowviewid);
-        $scope.SetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData', false);
+        $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
+        $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
         $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', true);
         var aaPinData =  $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
@@ -2573,8 +2726,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $scope.DisableUI();
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
+        $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
         $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
-        
+        $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
         var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
         if (selectedSystemName != null && selectedSystemName != undefined) {
             var selectedSystemPinData=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemPinData');
@@ -2595,8 +2749,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
         }
-
-        $scope.SetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData', true);
+        
     };
     $scope.showSelectedPins = function (windowviewid) {
@@ -2608,8 +2761,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $scope.DisableUI();
         $rootScope.isLoading = true;
         $('#spinner').css('visibility', 'visible');
-        $scope.SetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData', false);
-        $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
+        $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
+        $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
+        $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);
         var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
         if (selectedSystemName != null && selectedSystemName != undefined) {
             var selectedSystemPinData=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemPinData');
@@ -2771,13 +2925,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     }
-    $scope.highlightPinBasedOnSerachItem = function (id,windowviewid) {
+    $scope.highlightPinBasedOnSerachItem = function (id, windowviewid) {        
         if(windowviewid==undefined) // call also from also home controller list manager
         windowviewid= $rootScope.MULTI_VIEW_ID;       
         $scope.showAllPinsAfterHide(windowviewid);
-
+        //if (id == undefined) {
+        //    id = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
+        //}
         $scope.searchItemText = $("#" + id).val();
         $rootScope.searchSelectedText = $("#" + id).val();
         $('#termList option[selected="selected"]').prop("selected", false);
@@ -2848,7 +3004,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         $("#canvasAADiv_" + windowviewid).scrollTop(annotationTopPos[0]);
      },500);
-        $scope.IsSearchVisible = false;
+      $scope.IsSearchVisible = false;
+
+      $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
+      $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
+      $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
+      $scope.SetAAwindowStoreData(windowviewid, 'showSelectedPins', false);
+      $rootScope.AAWindowLoadComplete = true;
     }
     $scope.ShowHideAnnotation = function (event) {
@@ -231,7 +231,8 @@ AIA.service(&#39;ModuleService&#39;, function ($http, DataService) {
                     id:windowData.id,
                     position: windowData.position,
                     size: windowData.size,
-                    contextMenu:windowData.contextMenu
+                    contextMenu: windowData.contextMenu,
+                    selectedSearchId: windowData.selectedSearchId
                 });
             }
             else if (windowData.mType == "DISSECTIBLE_ANATOMY") {
@@ -238,7 +238,7 @@
                                         <div class="col-sm-9">
                                             <div class="checkbox">
                                                 <label>
-                                                    <input type="checkbox"> Locked
+                                                    <input type="checkbox" id="cbCheckLocked"> Locked
                                                 </label>
                                             </div>
                                         </div>
@@ -276,22 +276,25 @@
                                     <div class="form-group marginTop10">
                                         <label for="hyperlink" class="col-sm-3 control-label">Password</label>
                                         <div class="col-sm-9">
-                                            <input type="password" class="form-control" id="cbPassword">
+                                            <input type="password" class="form-control" id="cbPassword" required  name="password">
                                         </div>
                                     </div>
                                     <div class="form-group marginTop10">
                                         <label for="hyperlink" class="col-sm-3 control-label">Confirm PassWord</label>
                                         <div class="col-sm-9">
-                                            <input type="password" class="form-control" id="cbConfirmPassWord">
+                                            <input type="password" class="form-control" id="cbConfirmPassWord" required name="confirmpassword">
                                         </div>
+                                        
                                     </div>                                
                                 </div>
+                               
                             </div>
                         </div>
                     </div>
                     <div class="modal-footer">
-                        <button type="button" class="btn btn-primary btn-sm" ng-click="cbRenameSection()">Ok</button>
+                        <span id="errorMsg" style="color: red"></span>
+                        <button type="button" class="btn btn-primary btn-sm"  ng-click="cbSlideLocked()" id="btnOK">Ok</button>
                         <button type="button" class="btn btn-primary btn-sm" ng-click="closeRenameModel()">Cancel</button>
                     </div>
                 </div>
@@ -317,6 +320,39 @@
             main.toggleClass('active');
         });
     });
+
+    //var allowsubmit = false;
+    //$(function () {
+    //    $('#cbPassword').keyup(function (e) {
+    //        var pass = $(this).val();
+    //        //var confpass = $('#cbConfirmPassWord').val();
+    //        if (pass.length < 3) {
+    //            $('#errorMsg').text('Password must contain at least 3 characters!');
+    //            $("#btnOK").attr('disabled', 'disabled');
+
+    //        } else {
+    //            $('#errorMsg').text('');
+    //            allowsubmit = true;
+    //            //$("#btnOK").removeAttr('disabled');
+    //        }
+    //    });
+
+    //    //on keypress 
+    //    $('#cbConfirmPassWord').keyup(function (e) {
+    //        var pass = $('#cbPassword').val();
+    //        var confpass = $(this).val();           
+    //        if (pass == confpass) {               
+    //            $('#errorMsg').text('');
+    //            allowsubmit = true;
+    //            $("#btnOK").removeAttr('disabled');               
+    //        } else {                
+    //            $('#errorMsg').text('Password not matching');
+    //            allowsubmit = false;
+    //            $("#btnOK").attr('disabled', 'disabled');               
+    //        }
+    //    });
+    //});
+
 </script>
 <script>
     function callEditorOnInit()