ADAM / AIAHTML5

Commit df3b0b9122bf5cebf1cea6b58102271a2b683a63

Authored by Sandeep Kumar
1 parent a11203d2

Changes for AA and DA Module to SaveCB

Inline Side-by-side
Showing 5 changed files with 313 additions and 54 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @df3b0b9
... ... @@ -1044,6 +1044,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1044 1044 if ($scope.selectedNodeSingleObj._label != "undefined") {
1045 1045 $('#cbRenameSectionTitle').val($scope.selectedNodeSingleObj._label);
1046 1046 }
  1047 + if ($scope.selectedNodeSingleObj._isLocked != "undefined") {
  1048 + if ($scope.selectedNodeSingleObj._isLocked != "false" && $scope.selectedNodeSingleObj._isLocked != false) {
  1049 + $('#cbCheckLocked').prop('checked', true);
  1050 + }
  1051 + else {
  1052 + $('#cbCheckLocked').prop('checked', false);
  1053 + }
  1054 + }
1047 1055 if ($scope.selectedNodeSingleObj._isBranch == "true") {
1048 1056 //traverseTreeSelectedSingleObj($rootScope.Auther, current_id);
1049 1057 traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, current_id);
... ... @@ -1103,6 +1111,33 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1103 1111 if (document.getElementById("cbModelSectionRenameId").style.display == 'block') {
1104 1112 document.getElementById('cbModelSectionRenameId').style.display = "none";
1105 1113 }
  1114 + }
  1115 +
  1116 + $scope.cbSlideLocked = function () {
  1117 + var nodeid;
  1118 + if (($rootScope.getLocalStorageValue("cbSelectId")) != '') {
  1119 + nodeid = $rootScope.getLocalStorageValue("cbSelectId");
  1120 + }
  1121 + else {
  1122 + nodeid = document.getElementById('cbSelect').value;
  1123 + }
  1124 + var password = $('#cbPassword').val(); //document.getElementById('cbPassword').value;
  1125 + var confirm_password = $('#cbConfirmPassWord').val(); //document.getElementById('cbConfirmPassWord').value;
  1126 + if (password != confirm_password) {
  1127 + $('#errorMsg').text('Password do not match!');
  1128 + return false;
  1129 + }
  1130 + $('#errorMsg').text('');
  1131 + $rootScope.closeRenameModel();
  1132 + traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
  1133 +
  1134 + if ($scope.selectedNodeSingleObj._isBranch == "true") {
  1135 + if ($rootScope.contentNotesForSaveCB.length == 0) {
  1136 + $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;
  1137 + }
  1138 + traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, nodeid);
  1139 + $scope.selectedNodeSingleObj.password = password;
  1140 + }
1106 1141 }
1107 1142  
1108 1143 $rootScope.cbRenameSection = function () {
... ... @@ -1115,15 +1150,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1115 1150 }
1116 1151 //var nodeid = document.getElementById('cbSelect').value;
1117 1152 $scope.cbRenameDate();
  1153 + traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
1118 1154 //var newSlideName = document.getElementById('cbRenameSectionTitle').value;
  1155 +
  1156 + var newLockedFlag = $('#cbCheckLocked').is(':checked');
1119 1157 var newAuthorName = document.getElementById('cbRenameAuthor').value;
1120 1158 var newSummary = document.getElementById('cbRenameSummary').value;
1121 1159 var newversion = document.getElementById('cbRenameVersionNo').value;
1122 1160 var newSectionText = document.getElementById('cbRenameSectionTitle').value;
  1161 + if (newSectionText == ""){
  1162 + newSectionText = $scope.selectedNodeSingleObj._label;
  1163 + }
1123 1164 var newSlideName = ("<span id=" + nodeid + " class='ng-binding ng-scope'>" + newSectionText + "</span>");
1124   - $("#jstree").jstree('set_text', nodeid, newSlideName);
1125   - traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
  1165 + $("#jstree").jstree('set_text', nodeid, newSlideName);
1126 1166 $scope.selectedNodeSingleObj._label = newSectionText;
  1167 + $scope.selectedNodeSingleObj._isLocked = newLockedFlag;
  1168 +
1127 1169 //Update Save Draft object for rename section
1128 1170 if ($rootScope.structureObjForSaveCB.length == 0) {
1129 1171 $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
... ... @@ -2606,9 +2648,9 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2606 2648 height: $rootScope.AAWindowData[i].height
2607 2649 },
2608 2650 id: $rootScope.AAWindowData[i].id,
2609   - showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedSystemPinsClicked,
  2651 + showSelectedPins: $rootScope.AAWindowData[i].isShowSelectedPins,
2610 2652 hideCallOuts: false,//N
2611   - showAllPins: $rootScope.AAWindowData[i].isShowBodyWithCBPinData,//N
  2653 + showAllPins: $rootScope.AAWindowData[i].isShowAllPins,
2612 2654 scaleIndex: $rootScope.AAWindowData[i].sliderVal,
2613 2655 bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID,
2614 2656 windowListId: "0",//N
... ... @@ -2621,8 +2663,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2621 2663 mType: $rootScope.AAWindowData[i].moduleName,
2622 2664 containsCapturedContent: true,
2623 2665 contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
2624   - activePinArray: $rootScope.AAWindowData[i].activePinArray, // Selected PINID on Body
2625   - sliderVal: $rootScope.AAWindowData[i].sliderVal
  2666 + //activePinArray: $rootScope.AAWindowData[i].activePinArray,
  2667 + selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId,
  2668 + //sliderVal: $rootScope.AAWindowData[i].sliderVal
  2669 +
2626 2670  
2627 2671  
2628 2672 });
... ... @@ -2657,13 +2701,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2657 2701 // vertical: $rootScope.DaWindowData[i].verticalScroll,
2658 2702 // horizontal: $rootScope.DaWindowData[i].horizontalScroll
2659 2703 //},
2660   - selectedPins: $rootScope.DaWindowData[i].clickedPins,
  2704 + //selectedPins: $rootScope.DaWindowData[i].clickedPins,
2661 2705 maximised: $rootScope.DaWindowData[i].maximised,
2662 2706 size: {
2663 2707 width: $rootScope.DaWindowData[i].width,
2664 2708 height: $rootScope.DaWindowData[i].height
2665 2709 },
2666   - id: $rootScope.DaWindowData[i].imageId,
  2710 + id: $rootScope.DaWindowData[i].voId,
2667 2711 //showSelectedPins: $rootScope.DaWindowData[i].isShowSelectedSystemPinsClicked,
2668 2712 // hideCallOuts: false,//N
2669 2713 //showAllPins: $rootScope.DaWindowData[i].isShowBodyWithCBPinData,//N
... ... @@ -2711,14 +2755,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2711 2755 $scope.saveCAWindowActivity(currentId);
2712 2756 $scope.save3DWindowActivity(currentId);
2713 2757 //$scope.savePicWindowActivity($scope.windowDataforCB);
2714   - if ($scope.updatedWindowListForSaveCB.length > 0) {
  2758 + //if ($scope.updatedWindowListForSaveCB.length > 0) {
2715 2759 findKeyForChange($rootScope.contentNotesForSaveCB, currentId);
2716 2760 $scope.selectedKey.windows.window = [];
2717   - for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) {
2718   - var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]);
2719   - $scope.selectedKey.windows.window.push(arrToStrWinObj);
2720   - }
2721   - }
  2761 + if ($scope.updatedWindowListForSaveCB.length > 0) {
  2762 + for (var s = 0; s < $scope.updatedWindowListForSaveCB.length; s++) {
  2763 + var arrToStrWinObj = JSON.stringify($scope.updatedWindowListForSaveCB[s]);
  2764 + $scope.selectedKey.windows.window.push(arrToStrWinObj);
  2765 + }
  2766 + }
  2767 + //}
2722 2768 $scope.updatedWindowListForSaveCB = [];
2723 2769 console.log($rootScope.contentNotesForSaveCB);
2724 2770 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @df3b0b9
... ... @@ -139,7 +139,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
139 139 'updatedWhiteImageMRDataList':[],
140 140 'updatedGrayDataList':[],
141 141 'updatedGrayMRDataList':[],
142   - 'SearchTimeStampValue':0,
  142 + 'SearchTimeStampValue': 0,
  143 + 'top': 0,
  144 + 'left': 0,
  145 + 'width': 0,
  146 + 'height': 0,
  147 + 'minimised': false,
  148 + 'maximised': false,
  149 + 'id': 0
143 150  
144 151 });
145 152  
... ... @@ -233,6 +240,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
233 240 'updatedGrayDataList':[],
234 241 'updatedGrayMRDataList': [],
235 242 'SearchTimeStampValue': 0,
  243 + 'top': 0,
  244 + 'left': 0,
  245 + 'width': 0,
  246 + 'height': 0,
  247 + 'minimised': false,
  248 + 'maximised': false,
  249 + 'id': 0
236 250 });
237 251  
238 252 }
... ... @@ -844,14 +858,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
844 858 var daBodyviewElement = angular.element(document.getElementById("daBodyview"));
845 859  
846 860 //Perform Activity as per SaveCB JSPanel
847   - var max = $scope.GetwindowStoreData(windowviewid, 'maximised');
848   - var min = $scope.GetwindowStoreData(windowviewid, 'minimised');
849   - if ($scope.jsPanelDA.status === "maximized" && max) {
  861 + var isMaximize = $scope.GetwindowStoreData(windowviewid, 'maximised');
  862 + var isMinimize = $scope.GetwindowStoreData(windowviewid, 'minimised');
  863 + if (isMaximize) {
850 864 $scope.jsPanelDA.maximize();
851 865 $scope.SetwindowStoreData(windowviewid, 'maximised', true);
852 866 $scope.SetwindowStoreData(windowviewid, 'minimised', false);
853 867 }
854   - else if ($scope.jsPanelDA.status === "minimized" && min) {
  868 + else if (isMinimize) {
855 869 $scope.jsPanelDA.minimize();
856 870 $scope.SetwindowStoreData(windowviewid, 'minimised', true);
857 871 $scope.SetwindowStoreData(windowviewid, 'maximised', false);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @df3b0b9
... ... @@ -98,7 +98,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
98 98 'minimised': false,
99 99 'maximised': false,
100 100 'id': 0,
101   - 'selectedPins': []
  101 + 'selectedPins': [],
  102 + 'isShowSelectedPins': false,
  103 + 'selectedSearchId': 0,
  104 + 'isShowAllPins': false
  105 +
102 106  
103 107 });
104 108  
... ... @@ -154,7 +158,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
154 158 'minimised': false,
155 159 'maximised': false,
156 160 'id': 0,
157   - 'selectedPins': []
  161 + 'selectedPins': [],
  162 + 'isShowSelectedPins': false,
  163 + 'selectedSearchId': 0,
  164 + 'isShowAllPins': false
158 165  
159 166 });
160 167  
... ... @@ -463,6 +470,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
463 470 // set zoom level And SelectedPins
464 471 $scope.SetAAwindowStoreData(windowviewid, 'sliderVal', $scope.aaOpenInOtherModules.zoomLevel);
465 472  
  473 + $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', $scope.aaOpenInOtherModules.showAllPins);
  474 + $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', $scope.aaOpenInOtherModules.hideAllPins);
  475 + $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
  476 + if ($scope.aaOpenInOtherModules.selectedSearchId != undefined) {
  477 + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId);
  478 + } else {
  479 + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
  480 + }
  481 +
  482 +
466 483 //var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
467 484 //selectedPins.push($scope.aaOpenInOtherModules.selectedPins);
468 485 //$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
... ... @@ -688,9 +705,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
688 705 $("#canvasAADiv_" + windowviewid).append(canvas);
689 706 $scope.context = canvas.getContext("2d")
690 707  
691   - //6. Show all pins on AA opened item
692   -
693   - $scope.showAllPins(windowviewid);
  708 + //6. Show all pins on AA opened item
  709 +
  710 + $scope.showAllPins(windowviewid);
  711 +
694 712 //$scope.showSelectedPins(windowviewid);
695 713  
696 714 $timeout(function () {
... ... @@ -717,9 +735,38 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
717 735 $scope.PanelActivity();
718 736 }
719 737  
  738 + $scope.convertToZoomValue = function (windowviewid) {
  739 + var zoomValue = $scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
  740 + switch (zoomValue) {
  741 + case 0:
  742 + $scope.zoomLevel = 100;
  743 + break;
  744 + case 1:
  745 + $scope.zoomLevel = 85;
  746 + break;
  747 + //case 2:
  748 + // $scope.zoomLevel = ;
  749 + // break;
  750 + case 3:
  751 + $scope.zoomLevel = 55;
  752 + break;
  753 + //case 4:
  754 + // $scope.zoomLevel = 55;
  755 + // break;
  756 + //case 5:
  757 + // $scope.zoomLevel = 40;
  758 + // break;
  759 + //case 6:
  760 + // $scope.zoomLevel = 25;
  761 + // break;
  762 + default:
  763 + $scope.zoomLevel = zoomValue;
  764 + }
  765 + }
720 766  
721 767 $scope.Setslider = function (windowviewid) {
722   - var zoomLevel = $scope.GetAAwindowStoreData(windowviewid,'sliderVal');
  768 + $scope.convertToZoomValue(windowviewid);
  769 + var zoomLevel = $scope.zoomLevel; //$scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
723 770 $("#Vslider_" + windowviewid).slider({
724 771 min: 25,
725 772 max: 100,
... ... @@ -745,9 +792,77 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
745 792 step: "15"
746 793 });
747 794  
  795 + $scope.setPreClickBtnCss(windowviewid)
748 796 changeThumbnailSize(event, zoomLevel, windowviewid);
749 797 }
750 798  
  799 + function changeThumbnailSizeTest(event, value, windowviewid) {
  800 + var scope = angular.element(document.getElementById("aaBodyView")).scope();
  801 + scope.$apply(function () {
  802 + $scope.SetAAwindowStoreData(windowviewid, 'sliderVal', value)
  803 + scope.removeSpeechBubble(windowviewid);
  804 + var relativeWidth = 0;
  805 + var relativeHeight = 0;
  806 + if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
  807 + $("#listManager").css("display", "none");
  808 + $("#optionsListManagerTab").removeClass("active");
  809 +
  810 + relativeWidth = (scope.ViewImageWidth) * (value / 100);
  811 + relativeHeight = (scope.ViewImageHeight) * (value / 100);
  812 + // scope.sliderPercentValue = (value/100);
  813 + $scope.SetAAwindowStoreData(windowviewid, 'sliderPercentValue', (value / 100));
  814 +
  815 + $("#modItemImage_" + windowviewid).css("width", relativeWidth + "px");
  816 + $("#modItemImage_" + windowviewid).css("height", relativeHeight + "px");
  817 + $("#aaDetailViewCanvas_" + windowviewid).css("width", relativeWidth + "px");
  818 + $("#modItemImage_" + windowviewid).css("height", relativeHeight + "px");
  819 + $("#modItemImage_" + windowviewid).attr('src', '');
  820 + $("#aaDetailViewCanvas_" + windowviewid).remove();
  821 + //0.5 create canvas on the top of image so that I can draw a line over the canvas.
  822 + var canvas = document.createElement('canvas');
  823 + canvas.id = "aaDetailViewCanvas_" + windowviewid;
  824 + canvas.className = 'aaCanvas';
  825 + canvas.height = relativeHeight + 10;
  826 + canvas.width = relativeWidth + 10;
  827 + canvas.style.left = '0px';
  828 + canvas.style.top = '0px';
  829 + canvas.style.position = "absolute";
  830 + $("#canvasAADiv_" + windowviewid).append(canvas);
  831 + scope.context = canvas.getContext("2d")
  832 + var OpenItemImagePath = $scope.GetAAwindowStoreData(windowviewid, 'OpenItemImagePath');
  833 + $("#modItemImage_" + windowviewid).attr('src', OpenItemImagePath);
  834 + $scope.SetAAwindowStoreData(windowviewid, 'isSliderChange', true);
  835 + $scope.SetAAwindowStoreData(windowviewid, 'isSelectedPinBtnClickedAftrSliderCange', true);
  836 +
  837 + //$scope.GetAAwindowStoreData(windowviewid,'isShowAllPins');
  838 + //$scope.GetAAwindowStoreData(windowviewid,'showSelectedPins');
  839 + //$scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
  840 +
  841 +
  842 + if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins) {
  843 + if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) {
  844 + scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
  845 + }
  846 + else {
  847 + scope.showAllPins(windowviewid);
  848 + }
  849 + }
  850 + else if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins) {
  851 +
  852 + scope.showAllPins(windowviewid);
  853 + setTimeout(function () {
  854 + console.log(scope.allPinDataArray);
  855 + scope.activePinOnSliderChange(windowviewid);
  856 + }, 1000);
  857 +
  858 + }
  859 + else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins) {
  860 +
  861 + }
  862 +
  863 + }
  864 + });
  865 + }
751 866  
752 867 $scope.setControlsIDs = function (windowviewid) {
753 868  
... ... @@ -797,6 +912,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
797 912 });
798 913 }
799 914  
  915 + $scope.setPreClickBtnCss = function (windowviewid) {
  916 + if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins) {
  917 + $scope.ToolBoxStyle("ShowAllPin", windowviewid);
  918 + }
  919 + else if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins) {
  920 + $scope.ToolBoxStyle("ShowSelectedPin", windowviewid);
  921 + }
  922 + else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins) {
  923 + $scope.ToolBoxStyle("HidePin", windowviewid);
  924 + }
  925 + }
800 926  
801 927 function changeThumbnailSize(event, value,windowviewid) {
802 928 var scope = angular.element(document.getElementById("aaBodyView")).scope();
... ... @@ -871,6 +997,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
871 997 }
872 998 });
873 999 }
  1000 +
874 1001 $scope.highlightBodySystemList = function (windowviewid) {
875 1002  
876 1003 var SelectedSystemID= $scope.GetAAwindowStoreData(windowviewid,'SelectedSystemID');
... ... @@ -897,6 +1024,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
897 1024 }
898 1025  
899 1026 }
  1027 +
900 1028 function loadFailure() {
901 1029 console.log('unable to load opened module ietem');
902 1030 return true;
... ... @@ -947,8 +1075,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
947 1075 clickedPins.push({ 'id': pinid});
948 1076 }
949 1077 }
950   -
951   - $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
  1078 + if (selectedPins != undefined) {
  1079 + $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
  1080 + }
952 1081  
953 1082 for (var i = 0; i < $scope.aaOpenInOtherModules.selectedCallouts.length; i++) {
954 1083  
... ... @@ -963,9 +1092,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
963 1092 }
964 1093  
965 1094  
966   -
967   - if($scope.aaOpenInOtherModules.showSelectedPins!=undefined)
968   - {
  1095 + //var isShowPins = $scope.GetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData');
  1096 + //var isHidePins = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
  1097 + //var showSelectedPins = $scope.GetAAwindowStoreData(windowviewid, 'isShowSelectedSystemPinsClicked');
  1098 + var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
  1099 + if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins)
  1100 + {
969 1101 //show selected pin
970 1102  
971 1103 $scope.activePinOnLayerChange(windowviewid);
... ... @@ -977,7 +1109,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
977 1109 }, 1000);
978 1110  
979 1111 }
980   - else if($scope.aaOpenInOtherModules.showAllPins!=undefined)
  1112 + else if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins)
981 1113 {
982 1114 //Show all pins
983 1115  
... ... @@ -990,19 +1122,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
990 1122  
991 1123 }, 500);
992 1124 }
993   - else if($scope.aaOpenInOtherModules.hideAllPins!=undefined)
  1125 + else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins)
994 1126 {
995 1127 //hide all pins
996 1128  
997 1129 $rootScope.hidePins(windowviewid);
998 1130 $timeout(function () {
999 1131  
1000   - $scope.ShowCBAnnotation(windowviewid);
  1132 + $scope.ShowCBAnnotation(windowviewid);
  1133 + $scope.hideSpeechBubble(windowviewid);
1001 1134  
1002 1135 }, 500);
1003 1136 }
1004   -
1005   -
  1137 + //else {
  1138 +
  1139 + // //$timeout(function () {
  1140 + // $scope.highlightPinBasedOnSerachItem(selectedSearchId, windowviewid);
  1141 + // //}, 500);
  1142 +
  1143 + //}
1006 1144 }
1007 1145  
1008 1146 $scope.ShowCBAnnotation=function(windowviewid)
... ... @@ -1673,12 +1811,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1673 1811 if (pinDataWithFirstTermNumber.length > 1) {
1674 1812 isSameTermWithMultiPin = true;
1675 1813 }
  1814 + var selectedPins=$scope.GetAAwindowStoreData(windowviewid,'selectedPins');
1676 1815 var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
1677 1816 angular.forEach(pinDataWithFirstTermNumber, function (value, key) {
1678 1817 if (isBodySystemSelected == true) {
1679 1818  
1680 1819 clickedPins.push({ 'id': value._PinId });
1681   -
  1820 + //selectedPins.push(value._PinId);
1682 1821 $scope.SetAAwindowStoreData(windowviewid,'isBodySystemSelected',false);
1683 1822 }
1684 1823 var headX = (parseInt(value._HeadX));
... ... @@ -1690,6 +1829,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1690 1829 {
1691 1830 $scope.removeSpeechBubble(windowviewid);
1692 1831 }
  1832 +
  1833 + //Save Cordinate for show annotation as per Pin
  1834 + var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
  1835 + CBselectedpinCordinate.push(
  1836 + {
  1837 + "hy": headY,
  1838 + "ly": 0,
  1839 + "hx": headX,
  1840 + "lx": 0
  1841 + });
1693 1842 })
1694 1843  
1695 1844 }
... ... @@ -1832,11 +1981,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1832 1981  
1833 1982 // birendra
1834 1983 //
1835   - $scope.ShowHideAnnotationText(windowviewid);
  1984 + $scope.ShowHideAnnotationText(windowviewid);
1836 1985  
1837 1986 }
1838 1987  
1839   - $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y,lx,ly, PinId,windowviewid) {
  1988 + $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, lx, ly, PinId, windowviewid) {
  1989 +
1840 1990 var prctValue = $scope.GetAAwindowStoreData(windowviewid,'sliderPercentValue');
1841 1991 x = x * prctValue;
1842 1992 y = y * prctValue;
... ... @@ -2029,6 +2179,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2029 2179 $('.common-drag').draggable(
2030 2180 {
2031 2181 drag: function (evt) {
  2182 + //stop: function (evt) {
2032 2183 var clickedSpeechBubbleId = $(this).attr("id");
2033 2184 var len= (clickedSpeechBubbleId).split("_").length;
2034 2185 var windowviewid = (clickedSpeechBubbleId).split("_")[len-1];
... ... @@ -2215,10 +2366,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2215 2366 .where("_TermId == " + pinTermNumber)
2216 2367 .select();
2217 2368 if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
2218   -
  2369 + var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
2219 2370 var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
2220 2371 for (var i = 0; i < pinWithSameTerm.length; i++) {
2221   - clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
  2372 + clickedPins.push({ 'id': pinWithSameTerm[i]._PinId });
  2373 + selectedPins.push(pinWithSameTerm[i]._PinId);
2222 2374 }
2223 2375 }
2224 2376  
... ... @@ -2543,7 +2695,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2543 2695 $rootScope.isLoading = true;
2544 2696 $('#spinner').css('visibility', 'visible');
2545 2697 $scope.hideSpeechBubble(windowviewid);
2546   - $scope.SetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData', false);
  2698 + $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
  2699 + $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
2547 2700 $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', true);
2548 2701  
2549 2702 var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
... ... @@ -2573,8 +2726,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2573 2726 $scope.DisableUI();
2574 2727 $rootScope.isLoading = true;
2575 2728 $('#spinner').css('visibility', 'visible');
  2729 + $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
2576 2730 $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
2577   -
  2731 + $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
2578 2732 var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
2579 2733 if (selectedSystemName != null && selectedSystemName != undefined) {
2580 2734 var selectedSystemPinData=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemPinData');
... ... @@ -2595,8 +2749,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2595 2749  
2596 2750 }
2597 2751 }
2598   -
2599   - $scope.SetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData', true);
  2752 +
2600 2753 };
2601 2754  
2602 2755 $scope.showSelectedPins = function (windowviewid) {
... ... @@ -2608,8 +2761,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2608 2761 $scope.DisableUI();
2609 2762 $rootScope.isLoading = true;
2610 2763 $('#spinner').css('visibility', 'visible');
2611   - $scope.SetAAwindowStoreData(windowviewid, 'isShowBodyWithCBPinData', false);
2612   - $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
  2764 + $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
  2765 + $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
  2766 + $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);
2613 2767 var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
2614 2768 if (selectedSystemName != null && selectedSystemName != undefined) {
2615 2769 var selectedSystemPinData=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemPinData');
... ... @@ -2771,13 +2925,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2771 2925  
2772 2926 }
2773 2927  
2774   - $scope.highlightPinBasedOnSerachItem = function (id,windowviewid) {
  2928 + $scope.highlightPinBasedOnSerachItem = function (id, windowviewid) {
2775 2929  
2776 2930 if(windowviewid==undefined) // call also from also home controller list manager
2777 2931 windowviewid= $rootScope.MULTI_VIEW_ID;
2778 2932  
2779 2933 $scope.showAllPinsAfterHide(windowviewid);
2780   -
  2934 + //if (id == undefined) {
  2935 + // id = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
  2936 + //}
2781 2937 $scope.searchItemText = $("#" + id).val();
2782 2938 $rootScope.searchSelectedText = $("#" + id).val();
2783 2939 $('#termList option[selected="selected"]').prop("selected", false);
... ... @@ -2848,7 +3004,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2848 3004 $("#canvasAADiv_" + windowviewid).scrollTop(annotationTopPos[0]);
2849 3005 },500);
2850 3006  
2851   - $scope.IsSearchVisible = false;
  3007 + $scope.IsSearchVisible = false;
  3008 +
  3009 + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
  3010 + $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
  3011 + $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
  3012 + $scope.SetAAwindowStoreData(windowviewid, 'showSelectedPins', false);
  3013 + $rootScope.AAWindowLoadComplete = true;
2852 3014 }
2853 3015  
2854 3016 $scope.ShowHideAnnotation = function (event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
  View file @df3b0b9
... ... @@ -231,7 +231,8 @@ AIA.service(&#39;ModuleService&#39;, function ($http, DataService) {
231 231 id:windowData.id,
232 232 position: windowData.position,
233 233 size: windowData.size,
234   - contextMenu:windowData.contextMenu
  234 + contextMenu: windowData.contextMenu,
  235 + selectedSearchId: windowData.selectedSearchId
235 236 });
236 237 }
237 238 else if (windowData.mType == "DISSECTIBLE_ANATOMY") {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/curriculum-builder-detail.html
  View file @df3b0b9
... ... @@ -238,7 +238,7 @@
238 238 <div class="col-sm-9">
239 239 <div class="checkbox">
240 240 <label>
241   - <input type="checkbox"> Locked
  241 + <input type="checkbox" id="cbCheckLocked"> Locked
242 242 </label>
243 243 </div>
244 244 </div>
... ... @@ -276,22 +276,25 @@
276 276 <div class="form-group marginTop10">
277 277 <label for="hyperlink" class="col-sm-3 control-label">Password</label>
278 278 <div class="col-sm-9">
279   - <input type="password" class="form-control" id="cbPassword">
  279 + <input type="password" class="form-control" id="cbPassword" required name="password">
280 280 </div>
281 281 </div>
282 282  
283 283 <div class="form-group marginTop10">
284 284 <label for="hyperlink" class="col-sm-3 control-label">Confirm PassWord</label>
285 285 <div class="col-sm-9">
286   - <input type="password" class="form-control" id="cbConfirmPassWord">
  286 + <input type="password" class="form-control" id="cbConfirmPassWord" required name="confirmpassword">
287 287 </div>
  288 +
288 289 </div>
289 290 </div>
  291 +
290 292 </div>
291 293 </div>
292 294 </div>
293 295 <div class="modal-footer">
294   - <button type="button" class="btn btn-primary btn-sm" ng-click="cbRenameSection()">Ok</button>
  296 + <span id="errorMsg" style="color: red"></span>
  297 + <button type="button" class="btn btn-primary btn-sm" ng-click="cbSlideLocked()" id="btnOK">Ok</button>
295 298 <button type="button" class="btn btn-primary btn-sm" ng-click="closeRenameModel()">Cancel</button>
296 299 </div>
297 300 </div>
... ... @@ -317,6 +320,39 @@
317 320 main.toggleClass('active');
318 321 });
319 322 });
  323 +
  324 + //var allowsubmit = false;
  325 + //$(function () {
  326 + // $('#cbPassword').keyup(function (e) {
  327 + // var pass = $(this).val();
  328 + // //var confpass = $('#cbConfirmPassWord').val();
  329 + // if (pass.length < 3) {
  330 + // $('#errorMsg').text('Password must contain at least 3 characters!');
  331 + // $("#btnOK").attr('disabled', 'disabled');
  332 +
  333 + // } else {
  334 + // $('#errorMsg').text('');
  335 + // allowsubmit = true;
  336 + // //$("#btnOK").removeAttr('disabled');
  337 + // }
  338 + // });
  339 +
  340 + // //on keypress
  341 + // $('#cbConfirmPassWord').keyup(function (e) {
  342 + // var pass = $('#cbPassword').val();
  343 + // var confpass = $(this).val();
  344 + // if (pass == confpass) {
  345 + // $('#errorMsg').text('');
  346 + // allowsubmit = true;
  347 + // $("#btnOK").removeAttr('disabled');
  348 + // } else {
  349 + // $('#errorMsg').text('Password not matching');
  350 + // allowsubmit = false;
  351 + // $("#btnOK").attr('disabled', 'disabled');
  352 + // }
  353 + // });
  354 + //});
  355 +
320 356 </script>
321 357 <script>
322 358 function callEditorOnInit()
... ...