ADAM / AIAHTML5

Commit d6dbb32a3b6fd0c659c370aaa51f47b342635a44

Authored by Sandeep Kumar
1 parent df3b0b91

Save AA panel activity for SaveCB

Inline Side-by-side
Showing 5 changed files with 124 additions and 597 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @d6dbb32
... ... @@ -183,6 +183,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
183 183 $rootScope.cbDynamicJsonData = data;
184 184 $rootScope.getCBsummary();
185 185 $scope.CBEnableUI();
  186 +
186 187 })
187 188 .error(function (data, status, headers, config) {
188 189 console.log(data);
... ... @@ -192,19 +193,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
192 193 }
193 194  
194 195  
195   - $rootScope.OpenExistingCurriculum = function (event) {
196   -
197   - //OPen for diffrent html page
198   - //$location.url();
199   - //$location.path();
200   - //if ($location.url() == "/curriculum-builder") {
201   - // event.toElement.href = "http://localhost/curriculum-builder";
202   - //}
203   - //else {
204   - // if ($location.url() == "/curriculum-builder-detail") {
205   - // event.toElement.href = "http://localhost/curriculum-builder-detail";
206   - // }
207   - //}
  196 + $rootScope.OpenExistingCurriculum = function (event) {
208 197  
209 198 $("#openCBJsonFile").trigger("click");
210 199 var fileupload = document.getElementById("openCBJsonFile");
... ... @@ -264,177 +253,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
264 253 }
265 254 };
266 255  
267   - }
268   -
269   -
270   - //$scope.getJsonFileFromLocal = function loadFile() {
271   - // var fileId, file, fr;
272   -
273   - // if (typeof window.FileReader !== 'function') {
274   - // alert("The file API isn't supported on this browser yet.");
275   - // return;
276   - // }
277   - // fileId = document.getElementById('opencbview');
278   - // if (!fileId) {
279   - // alert("File couldn't find the element.");
280   - // }
281   - // else if (!fileId.files) {
282   - // alert("This browser doesn't seem to support the `files` property of file inputs.");
283   - // }
284   - // else if (!fileId.files[0]) {
285   - // alert("Please select a file before clicking 'Load'");
286   - // }
287   - // else {
288   - // file = fileId.files[0];
289   - // fr = new FileReader();
290   - // fr.onload = receivedText;
291   - // fr.readAsText(file);
292   -
293   - // }
294   -
295   - // function receivedText(e) {
296   - // let lines = e.target.result;
297   -
298   - // var newArr = JSON.parse(lines);
299   - // localStorage.setItem("cbJsonDataObject", JSON.stringify(newArr));
300   - // $rootScope.cbJsonData = ""; $rootScope.cbDynamicJsonData = "";
301   - // $rootScope.cbJsonData = JSON.parse(lines);
302   - // $rootScope.cbDynamicJsonData = JSON.parse(lines);
303   - // $rootScope.cbTreeFirstLabel = $rootScope.cbJsonData.slideshow.presentation.structure._label;
304   -
305   - // $rootScope.getCBsummary();
306   - // $scope.CBEnableUI();
307   -
308   - // $rootScope.AutherName = "";
309   - // $rootScope.summary = "";
310   - // $rootScope.FileTitle = $rootScope.cbTreeFirstLabel;
311   -
312   - // $timeout(function () {
313   - // $('#modal-CurBuilder').css("display", "block");
314   - // $("#CurBuilderbackground").css("display", "block");
315   - // }, 3000);
316   -
317   - // //$scope.loadSlideShowXmldata();
318   - // //$scope.openCurriculumDetail();
319   - // }
320   - //}
321   -
322   - //$rootScope.OpenExistingCurriculum = function (file_Name) {
323   -
324   - // $("#opencbview").trigger("click");
325   - // var fileupload = document.getElementById("opencbview");
326   -
327   - // fileupload.onchange = function () {
328   -
329   - // var fileName = fileupload.value;
330   - // alert(fileName);
331   -
332   - // //switch ($location.url()) {
333   - // // case '/curriculum-builder-detail':
334   - // // $location.url('/curriculum-builder');
335   - // // break;
336   - // //}
337   -
338   - // // $scope.fileName = file_Name;
339   - // $('#modal-CurBuilder').css("display", "block");
340   - // $("#CurBuilderbackground").css("display", "block");
341   - // $http({ method: 'GET', url: fileName }).success(function (data) {
342   - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data));
343   - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject"));
344   - // $rootScope.cbDynamicJsonData = data;
345   - // $rootScope.getCBsummary();
346   -
347   - // $scope.openCurriculumDetail();
348   - // })
349   - // .error(function (data, status, headers, config) {
350   - // console.log(data);
351   - // });
352   - // };
353   - //}
  256 + }
354 257  
355   -
356   - //$rootScope.saveCurricullam = function (file_Name) {
357   - // $scope.selectedNodeSingleObj.push(
358   - // {
359   - // "slideshow": {
360   - // "presentation": {
361   - // "structure": {
362   - // "structure": [
363   - // {
364   - // "_label": "Untitled Slide",
365   - // "_id": "-1507902782",
366   - // "_isRoot": "false",
367   - // "_isBranch": "false",
368   - // "_isLocked": "false"
369   - // }
370   -
371   - // ],
372   - // "_label": "Untitled Curriculum",
373   - // "_id": "-225638207",
374   - // "_isRoot": "true",
375   - // "_isBranch": "true",
376   - // "_isLocked": "false"
377   - // },
378   - // "_anchor": "true",
379   - // "_window_position": "6,10",
380   - // "_window_size": "828,453"
381   - // },
382   - // "content": {
383   - // "element": [
384   - // {
385   - // "notes": "<TEXTFORMAT LEADING=\"2\"><P ALIGN=\"LEFT\"><FONT FACE=\"Microsoft Sans Serif\" SIZE=\"13\" COLOR=\"#000000\" LETTERSPACING=\"0\" KERNING=\"0\"> </FONT></P></TEXTFORMAT><TEXTFORMAT LEADING=\"2\"><P ALIGN=\"LEFT\"><FONT FACE=\"Microsoft Sans Serif\" SIZE=\"13\" COLOR=\"#000000\" LETTERSPACING=\"0\" KERNING=\"0\"> </FONT></P></TEXTFORMAT><TEXTFORMAT LEADING=\"2\"><P ALIGN=\"LEFT\"><FONT FACE=\"Microsoft Sans Serif\" SIZE=\"13\" COLOR=\"#000000\" LETTERSPACING=\"0\" KERNING=\"0\"> </FONT></P></TEXTFORMAT>",
386   - // "windows": {
387   - // "window": "{\"windowTitle\":\"Hand (Post/Ant)\",\"selectedCallouts\":[],\"annotationData\":\"\",\"minimised\":false,\"scrollPosition\":{\"vertical\":78,\"horizontal\":120},\"selectedStructureID\":7446,\"maximised\":false,\"size\":{\"width\":800,\"height\":753},\"id\":\"424\",\"showSelectedPins\":true,\"scaleIndex\":0,\"bodySystemId\":11,\"windowListId\":\"0\",\"imageId\":\"424\",\"position\":{\"x\":840,\"y\":10},\"mType\":\"ATLAS_ANATOMY\",\"hideCallOuts\":true,\"containsCapturedContent\":true,\"selectedPins\":[\"32783\"],\"contextMenu\":{\"hideLeftBar\":false,\"hideTitleBar\":false,\"hideTopToolBar\":false,\"lockResize\":false}}"
388   - // },
389   - // "_id": "-1507902782"
390   - // }
391   - // ]
392   - // }
393   - // }
394   - // });
395   - // console.log($scope.selectedNodeSingle);
396   - // $scope.exportToFile();
397   - // $http({ method: 'Post', url: 'content/data/json/cb/SlideShow/json/' + $scope.fileName + '.json' }).success(function (data) {
398   - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data));
399   - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject"));
400   - // $rootScope.cbDynamicJsonData = data;
401   - // //$scope.getCBsummary();
402   - // $rootScope.cbJsonData.slideshow.content.element="Eement data";
403   - // $rootScope.cbDynamicJsonData.slideshow.content.element="slideshow element data";
404   - // $rootScope.note = "save data"
405   - // //$scope.openCurriculumDetail();
406   - // })
407   - // .error(function (data, status, headers, config) {
408   - // console.log(data);
409   - // });
410   -
411   - //}
412   - //$rootScope.NewCurricullumData = function (file_Name) {
413   - // //$rootScope.fileNames = e.target.id;
414   - // alert('test');
415   - // switch ($location.url()) {
416   - // case '/curriculum-builder-detail':
417   - // $location.url('/curriculum-builder');
418   - // break;
419   - // }
420   - // $scope.fileName = file_Name;
421   - // $('#modal-CurBuilder').css("display", "block");
422   - // $("#CurBuilderbackground").css("display", "block");
423   - // $http({ method: 'GET', url: 'content/data/json/cb/SlideShow/json/' + $scope.fileName + '.json' }).success(function (data) {
424   - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data));
425   - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject"));
426   - // $rootScope.cbDynamicJsonData = data;
427   - // //$scope.getCBsummary();
428   - // //$rootScope.note = $rootScope.cbJsonData.slideshow.content.element;
429   - // //$rootScope.Auther = $rootScope.cbDynamicJsonData.slideshow.content.element;
430   - // $rootScope.note = $rootScope.cbJsonData.slideshow.content.element;
431   - // $scope.openCurriculumDetail();
432   - // })
433   - // .error(function (data, status, headers, config) {
434   - // console.log(data);
435   - // });
436   - //}
437   -
438 258 $scope.openImagePanel = function () {
439 259  
440 260 var jsImageURL = 'app/views/CBuild/curriculum-builder-image.html';
... ... @@ -613,26 +433,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
613 433 }
614 434  
615 435 }
616   - }
617   -
618   - //function getLoadNodeId(o) {
619   -
620   - // for (var i in o) {
621   -
622   - // if (o[i] !== null && typeof (o[i]) == "object") {
623   - // if (o[i]._isBranch == "false") {
624   - // $rootScope.firstSelectedNodeId = o[i]._id;
625   -
626   -
627   - // }
628   -
629   - // getLoadNodeId(o[i]);
630   -
631   -
632   - // }
633   -
634   - // }
635   - //}
  436 + }
636 437  
637 438 $scope.loadNotesById = function () {
638 439  
... ... @@ -729,30 +530,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
729 530 }
730 531 }
731 532  
732   - $scope.updateDropdownforSaveDraftCB = function (nodeid) {
733   - var current_id = document.getElementById('cbSelect').value;
734   - if ($rootScope.structureObjForSaveCB.length == 0) {
735   - //$rootScope.structureObjForSaveCB = $rootScope.structure;
736   - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure;
737   - $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
738   - }
739   - traverseSelectedObjForSaveDraftCB($rootScope.structureObjForSaveCB, current_id);
740   - if ($rootScope.structureObjForSaveCB.length != $rootScope.stru.structure.structure.length) {
741   - if ($scope.selectedObjforSaveDraftCB._isBranch == "true" && $scope.selectedObjforSaveDraftCB._id == nodeid) {
742   - $('#cbSelect').append('<option selected value="' + $scope.selectedNodeSingleObj._id + '">' + $scope.selectedNodeSingleObj._label + '</option>');
743   - document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length;
744   - }
745   - else {
746   - for (var i = 0; i < $rootScope.selectedObjforSaveDraftCB.length; i++) {
747   - if ($rootScope.selectedObjforSaveDraftCB[i]._id == nodeid) {
748   - $scope.currentSlideNumber = i + 1;
749   - $('#cbSelect').append('<option value="' + $rootScope.selectedObjforSaveDraftCB[i]._id + '">' + $rootScope.selectedObjforSaveDraftCB[i]._label + '</option>');
750   - document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedObjforSaveDraftCB).length
751   - }
752   - }
753   - }
754   - }
755   - }
  533 +
756 534 var isActive = false;
757 535 //Start Code by Sandeep for TicketNo: 49226(3)
758 536 $scope.DropDownSelectNodeClick = function (nodeid) {
... ... @@ -771,10 +549,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
771 549  
772 550 $('#cbEditorRightSideBar').css('pointer-events', 'auto');
773 551 $('#cbEditorRightSideBar').css('opacity', '1');
774   -
775   - //if ($rootScope.structureObjForSaveCB.length != $rootScope.stru.structure.structure.length && $rootScope.structureObjForSaveCB.length != 0) {
776   - // $scope.updateDropdownforSaveDraftCB(nodeid);
777   - //}
  552 +
778 553 if ($scope.selectedNodeSingleObj._isBranch == "true") {
779 554  
780 555 $("#cbSelect").empty();
... ... @@ -890,22 +665,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
890 665 }
891 666 }
892 667 }
893   -
894   - //$rootScope.cbRenameModelShow = function () {
895   - // var current_id = document.getElementById('cbSelect').value;
896   - // document.getElementById('renameInputBoxId').value = "";
897   - // traverseTreeSelectedSingleObj($rootScope.stru, current_id);
898   - // if ($scope.selectedNodeSingleObj._isBranch == "true") {
899   - // traverseTreeSelectedSingleObj($rootScope.Auther, current_id);
900   - // document.getElementById('cbRenameDate').value = $scope.selectedNodeSingleObj.modified;
901   - // document.getElementById('cbModelRenameBackground').style.display = "block";
902   - // document.getElementById('cbModelSectionRenameId').style.display = "block";
903   - // }
904   - // else {
905   - // document.getElementById('cbModelRenameBackground').style.display = "block";
906   - // document.getElementById('cbModelRenameId').style.display = "block";
907   - // }
908   - //}
  668 +
909 669  
910 670 $rootScope.cbPasswordModelShow = function () {
911 671 //var current_id = document.getElementById('cbSelect').value;
... ... @@ -921,102 +681,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
921 681 //document.getElementById('cbModelRenameId').style.display = "block";
922 682 // }
923 683  
924   - }
925   -
926   - //$rootScope.cbRenameSlide = function () {
927   - // var current_id
928   - // if (($rootScope.getLocalStorageValue("cbSelectId")) != '') {
929   - // current_id = $rootScope.getLocalStorageValue("cbSelectId");
930   - // }
931   - // else {
932   - // current_id = document.getElementById('cbSelect').value;
933   - // }
934   - // //var current_id = document.getElementById('cbSelect').value;
935   - // var newSlideText = document.getElementById('renameInputBoxId').value;
936   - // var newSlideName = ("<span id=" + current_id + " class='ng-binding ng-scope'>" + newSlideText + "</span>");
937   - // $("#jstree").jstree('set_text', current_id, newSlideName);
938   - // traverseTreeSelectedSingleObj($rootScope.stru, current_id);
939   - // $scope.selectedNodeSingleObj._label = newSlideText;
940   - // $scope.DropDownSelectNodeClick(current_id);
941   - // console.log(JSON.stringify($rootScope.stru));
942   - // $rootScope.closeRenameModel();
943   - //}
944   -
945   - //$rootScope.closeRenameModel = function () {
946   - // document.getElementById('cbModelRenameBackground').style.display = "none";
947   - // if (document.getElementById("cbModelRenameId").style.display == 'block') {
948   - // document.getElementById('cbModelRenameId').style.display = "none";
949   - // }
950   - // if (document.getElementById("cbModelUserPassWord").style.display == 'block') {
951   - // document.getElementById('cbModelUserPassWord').style.display = "none";
952   - // }
953   -
954   - // if (document.getElementById("cbModelSectionRenameId").style.display == 'block') {
955   - // document.getElementById('cbModelSectionRenameId').style.display = "none";
956   - // }
957   - //}
958   -
959   - //$rootScope.cbRenameSection = function () {
960   - // var nodeid
961   - // if (($rootScope.getLocalStorageValue("cbSelectId")) != '') {
962   - // nodeid = $rootScope.getLocalStorageValue("cbSelectId");
963   - // }
964   - // else {
965   - // nodeid = document.getElementById('cbSelect').value;
966   - // }
967   -
968   -
969   - // //var nodeid = document.getElementById('cbSelect').value;
970   - // $scope.cbRenameDate();
971   - // //var newSlideName = document.getElementById('cbRenameSectionTitle').value;
972   - // var newAuthorName = document.getElementById('cbRenameAuthor').value;
973   - // var newSummary = document.getElementById('cbRenameSummary').value;
974   - // var newversion = document.getElementById('cbRenameVersionNo').value;
975   - // var newSectionText = document.getElementById('cbRenameSectionTitle').value;
976   - // var newSlideName = ("<span id=" + nodeid + " class='ng-binding ng-scope'>" + newSectionText + "</span>");
977   - // $("#jstree").jstree('set_text', nodeid, newSlideName);
978   - // traverseTreeSelectedSingleObj($rootScope.stru, nodeid);
979   - // $scope.selectedNodeSingleObj._label = newSectionText;
980   - // $scope.selectedNodeSingleObj = "";
981   - // traverseTreeSelectedSingleObj($rootScope.Auther, nodeid);
982   - // setTimeout(function () {
983   - // $scope.selectedNodeSingleObj.summary = newSummary;
984   - // $scope.selectedNodeSingleObj.author = newAuthorName;
985   - // $scope.selectedNodeSingleObj.version = newversion;
986   - // $scope.selectedNodeSingleObj.modified = $scope.dateTime;
987   - // $scope.DropDownSelectNodeClick(nodeid);
988   - // console.log("summary" + JSON.stringify($rootScope.cbDynamicJsonData));
989   - // }, 100);
990   - // $rootScope.closeRenameModel();
991   -
992   - //}
993   -
994   - //$scope.cbRenameDate = function () {
995   - // var currentdate = new Date();
996   - // var now = new Date();
997   - // var year = now.getFullYear();
998   - // var month = now.getMonth() + 1;
999   - // var day = now.getDate();
1000   - // var hours = now.getHours();
1001   - // var minute = now.getMinutes();
1002   - // var ampm = hours >= 12 ? 'PM' : 'AM';
1003   - // hours = hours % 12;
1004   - // hours = hours ? hours : 12; // the hour '0' should be '12'
1005   - // if (month.toString().length == 1) {
1006   - // month = '0' + month;
1007   - // }
1008   - // if (day.toString().length == 1) {
1009   - // day = '0' + day;
1010   - // }
1011   - // if (hours.toString().length == 1) {
1012   - // hours = '0' + hours;
1013   - // }
1014   - // if (minute.toString().length == 1) {
1015   - // minute = '0' + minute;
1016   - // }
1017   -
1018   - // $scope.dateTime = month + '/' + day + '/' + year + ',' + hours + ':' + minute + ' ' + ampm;
1019   - //}
  684 + }
1020 685  
1021 686 $scope.setProperties = function () {
1022 687 if ($scope.selectedNodeSingleObj.author != "undefined") {
... ... @@ -1176,9 +841,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1176 841 $rootScope.structureObjForSaveCB[i]._label = $scope.selectedNodeSingleObj._label;
1177 842 //$rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure'];
1178 843 }
1179   - //else if ($rootScope.structureObjForSaveCB[i]['structure']._id == nodeid) {
1180   - // $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure'];
1181   - //}
  844 +
1182 845 }
1183 846 if ($rootScope.cbTreeFirstID == nodeid) {
1184 847 $rootScope.cbTreeFirstLabel = $scope.selectedNodeSingleObj._label;
... ... @@ -1187,8 +850,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1187 850 if ($rootScope.contentNotesForSaveCB.length == 0) {
1188 851 $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents;
1189 852 }
1190   - //$scope.selectedNodeSingleObj = "";
1191   - //traverseTreeSelectedSingleObj($rootScope.Auther, nodeid);
  853 +
1192 854 traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, nodeid);
1193 855 setTimeout(function () {
1194 856 $scope.selectedNodeSingleObj.summary = newSummary;
... ... @@ -1377,37 +1039,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1377 1039 }
1378 1040 }
1379 1041  
1380   - //$scope.moveUP = function (currentid) {
1381   -
1382   -
1383   - // traverse($rootScope.stru, currentid);
1384   -
1385   - // console.log("cbJsonData Before" + JSON.stringify($rootScope.stru));
1386   - // console.log("upDateJsonObj Before" + JSON.stringify($scope.selectedNodeSiblingObjs));
1387   - // for (var j = 0; j < $scope.selectedNodeSiblingObjs.length; j++) {
1388   -
1389   - // if (($scope.selectedNodeSiblingObjs[j]._id == currentid) && ($scope.selectedNodeSiblingObjs[j - 1] != undefined)) {
1390   - // var key = $scope.selectedNodeSiblingObjs[j];
1391   - // $scope.selectedNodeSiblingObjs[j] = $scope.selectedNodeSiblingObjs[j - 1];
1392   - // $scope.selectedNodeSiblingObjs[j - 1] = key;
1393   - // }
1394   -
1395   - // }
1396   - // console.log("upDateJsonObjenew after" + JSON.stringify($scope.selectedNodeSiblingObjs));
1397   -
1398   - // console.log("stru after" + JSON.stringify($rootScope.stru));
1399   -
1400   - // console.log("structure after" + JSON.stringify($rootScope.structure));
1401   -
1402   -
1403   -
1404   - //}
  1042 +
1405 1043  
1406 1044 $scope.deleteSectionForCB = function (currentid, CurrentSelectedParentSpanId) {
1407 1045  
1408 1046 if ($rootScope.structureObjForSaveCB.length == 0) {
1409   - //$rootScope.structureObjForSaveCB = $rootScope.structure;// only Tree Array
1410   - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure;
  1047 +
1411 1048 $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
1412 1049 }
1413 1050 if ($rootScope.contentNotesForSaveCB.length == 0) {
... ... @@ -1435,31 +1072,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1435 1072 $scope.selectedNodeSingleObj['structure'].splice(j, 1);
1436 1073 //$rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
1437 1074 }
1438   - }
1439   -
1440   - //traverse($rootScope.stru, currentid);
1441   - //for (var j = 0; j < $rootScope.structureObjForSaveCB.length; j++) {
1442   - // //if (($rootScope.structureObjForSaveCB[j]._id == currentid)) {
1443   - // if ($rootScope.structureObjForSaveCB[j]._id == currentid && $rootScope.structureObjForSaveCB[j]._isBranch == "true") {
1444   - // traverseTreeSelectedSingleObj($rootScope.stru, currentid);
1445   - // traverse($rootScope.stru, currentid);
1446   - // var childNodesForSelectedSection = $scope.selectedNodeSingleObj['structure'];
1447   -
1448   - // //if ($rootScope.structureObjForSaveCB[j]['structure'].length > 0) {
1449   - // if (childNodesForSelectedSection.length > 0) {
1450   - // for (var l = 0; l < childNodesForSelectedSection.length; l++) {
1451   - // var childId = childNodesForSelectedSection[l]._id; // Get Child ID for selected Section node
1452   - // for (var k = 0; k < $rootScope.contentNotesForSaveCB.length; k++) {
1453   - // if (($rootScope.contentNotesForSaveCB[k]._id == childId)) {
1454   - // $rootScope.contentNotesForSaveCB.splice(k, 1);
1455   - // }
1456   - // }
1457   - // }
1458   - // }
1459   - // $rootScope.structureObjForSaveCB.splice(j, 1);
1460   - // }
1461   - //}
1462   -
  1075 + }
1463 1076  
1464 1077  
1465 1078 //Delete notes for SavedraftCB as per Selected Section from tree
... ... @@ -1487,8 +1100,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1487 1100  
1488 1101 $scope.DeleteSlide = function (currentid, CurrentSelectedParentSpanId) {
1489 1102 if ($rootScope.structureObjForSaveCB.length == 0) {
1490   - //$rootScope.structureObjForSaveCB = $rootScope.structure;// only Tree Array
1491   - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure;
  1103 +
1492 1104 $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
1493 1105 }
1494 1106 if ($rootScope.contentNotesForSaveCB.length == 0) {
... ... @@ -1522,10 +1134,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1522 1134  
1523 1135 for (var j = 0; j < $scope.selectedNodeSiblingObjs.length; j++) {
1524 1136 if (($scope.selectedNodeSiblingObjs[j]._id == currentid)) {
1525   - $scope.selectedNodeSiblingObjs.splice(j, 1);
1526   -
1527   - //$rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
1528   - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure;
  1137 + $scope.selectedNodeSiblingObjs.splice(j, 1);
1529 1138  
1530 1139 //Added Code by Sandeep for Delete slide from node tree for save draft CB
1531 1140 for (var x = 0; x < $rootScope.structureObjForSaveCB.length; x++) {
... ... @@ -1541,28 +1150,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1541 1150 }
1542 1151 $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
1543 1152 $scope.selectedNodeSingleObj = "";
1544   - //traverseTreeSelectedSingleObj($rootScope.structureObjForSaveCB, currentid);
1545   - //if ($scope.selectedNodeSingleObj._isBranch == "true") {
1546   - // for (var j = 0; j < $scope.selectedNodeSingleObj['structure'].length; j++) {
1547   - // if ($scope.selectedNodeSingleObj._id == currentid) {
1548   - // var childNodesForSelectedSection = $scope.selectedNodeSingleObj['structure'];
1549   -
1550   - // if (childNodesForSelectedSection.length > 0) {
1551   -
1552   - // for (var l = 0; l < childNodesForSelectedSection.length; l++) {
1553   - // var childId = childNodesForSelectedSection[l]._id; // Get Child ID for selected Section node
1554   - // for (var k = 0; k < $rootScope.contentNotesForSaveCB.length; k++) {
1555   - // if (($rootScope.contentNotesForSaveCB[k]._id == childId)) {
1556   - // $rootScope.contentNotesForSaveCB.splice(k, 1);
1557   - // }
1558   - // }
1559   - // }
1560   - // }
1561   - // }
1562   - // $scope.selectedNodeSingleObj['structure'].splice(j, 1);
1563   - // //$rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure;
1564   - // }
1565   - //}
  1153 +
1566 1154  
1567 1155 //Delete notes for SavedraftCB as per Selected Slide from tree
1568 1156 var deleteNotes = $rootScope.contentNotesForSaveCB
... ... @@ -1648,7 +1236,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1648 1236 //$rootScope.contentNotesForSaveCB = [];
1649 1237 //$rootScope.structureObjForSaveCB = [];
1650 1238 }
1651   -
1652 1239  
1653 1240  
1654 1241 $rootScope.updatedContentFromEditor = function (cbCurrentId) {
... ... @@ -1684,10 +1271,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1684 1271  
1685 1272  
1686 1273 traverseTreeSelectedSingleObj($rootScope.stru, cbCurrentId);
1687   - //$scope.selectedNodeSingleObj.summary
1688   - //$scope.selectedNodeSingleObj.author
1689   - //$scope.selectedNodeSingleObj.version
1690   - //$scope.selectedNodeSingleObj.modified
  1274 +
1691 1275 if ($scope.selectedNodeSingleObj._isBranch == "false") {
1692 1276 $rootScope.contentNotesForSaveCB.push(
1693 1277 {
... ... @@ -1734,9 +1318,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1734 1318 $rootScope.cbDynamicContents = $rootScope.contentNotesForSaveCB;
1735 1319 $rootScope.note = $rootScope.contentNotesForSaveCB;
1736 1320  
1737   - console.log($rootScope.contentNotesForSaveCB);
1738   - //console.log(tinyMCE.activeEditor.getContent());
1739   - //console.log($('#CBTextArea_ifr')[0].contentDocument.body.innerHTML);
  1321 + console.log($rootScope.contentNotesForSaveCB);
1740 1322  
1741 1323 }
1742 1324  
... ... @@ -1973,25 +1555,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
1973 1555 // setTimeout(function () { traverseTreeForSetIcons($rootScope.stru, currentid); }, 3000);
1974 1556 setTimeout(function () { $("#jstree").jstree(true).set_icon(AddSlideId, "../../../content/images/CB/file.png"); }, 100);
1975 1557 }
1976   -
1977   - //$scope.moveDown = function (currentid) {
1978   -
1979   -
1980   - // traverse($rootScope.stru, currentid);
1981   -
1982   - // for (var j = 0; j < $scope.selectedNodeSiblingObjs.length; j++) {
1983   -
1984   - // if (($scope.selectedNodeSiblingObjs[j]._id == currentid) && ($scope.selectedNodeSiblingObjs[j + 1] != undefined)) {
1985   - // var key1 = $scope.selectedNodeSiblingObjs[j];
1986   - // $scope.selectedNodeSiblingObjs[j] = $scope.selectedNodeSiblingObjs[j + 1];
1987   - // $scope.selectedNodeSiblingObjs[j + 1] = key1;
1988   - // break;
1989   - // }
1990   -
1991   - // }
1992   -
1993   -
1994   - //}
  1558 +
1995 1559  
1996 1560 $scope.moveDown = function (currentid) {
1997 1561  
... ... @@ -2664,8 +2228,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2664 2228 containsCapturedContent: true,
2665 2229 contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
2666 2230 //activePinArray: $rootScope.AAWindowData[i].activePinArray,
2667   - selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId,
2668   - //sliderVal: $rootScope.AAWindowData[i].sliderVal
  2231 + selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId
  2232 + //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent
2669 2233  
2670 2234  
2671 2235  
... ... @@ -2770,26 +2334,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
2770 2334 }
2771 2335  
2772 2336  
2773   - //$rootScope.updateWindowsContentForSaveCB = function (windowData) {
2774   - // //findKeyForChange($scope.windowDataforCB, keyname)
2775   - // //if ($scope.selectedKey.length > 0) {
2776   - // // for (var x = 0 ; x < $scope.selectedKey.length; x++) {
2777   - // // if ($scope.selectedKey[x].keyname == keyname) {
2778   - // // $scope.selectedKey[x][keyname] = value;
2779   - // // }
2780   - // // }
2781   - // //}
2782   - // //else if ($scope.selectedKey != undefined && $scope.selectedKey != "") {
2783   - // // $scope.selectedKey = value;
2784   - // //}
2785   -
2786   - // //var windowContent = $scope.windowDataforCB;
2787   - // //$scope.windowDataforCB = new jinqJs()
2788   - // // .from(windowContent)
2789   - // // .update(function (column, index) {
2790   - // // column[index].keyname = value;
2791   - // // })
2792   - // // .at(column[index].keyname = keyname);
  2337 +
2793 2338  
2794 2339  
2795 2340  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @d6dbb32
... ... @@ -101,7 +101,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
101 101 'selectedPins': [],
102 102 'isShowSelectedPins': false,
103 103 'selectedSearchId': 0,
104   - 'isShowAllPins': false
  104 + 'isShowAllPins': false,
  105 + 'canvasImageWidth': 0,
  106 + 'canvasImageHeight': 0
105 107  
106 108  
107 109 });
... ... @@ -161,7 +163,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
161 163 'selectedPins': [],
162 164 'isShowSelectedPins': false,
163 165 'selectedSearchId': 0,
164   - 'isShowAllPins': false
  166 + 'isShowAllPins': false,
  167 + 'canvasImageWidth': 0,
  168 + 'canvasImageHeight': 0
165 169  
166 170 });
167 171  
... ... @@ -477,12 +481,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
477 481 $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId);
478 482 } else {
479 483 $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
480   - }
481   -
  484 + }
482 485  
483   - //var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
484   - //selectedPins.push($scope.aaOpenInOtherModules.selectedPins);
485   - //$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
  486 +
486 487  
487 488 // note:: in few json like "articulation" imageId as same id
488 489 // get wrong detail by imageId
... ... @@ -683,16 +684,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
683 684 $scope.imageWidth = this.width;
684 685 $scope.imageHeight = this.height;
685 686  
  687 + $scope.SetAAwindowStoreData(windowviewid, 'canvasImageWidth', this.width);
  688 + $scope.SetAAwindowStoreData(windowviewid, 'canvasImageHeight', this.height);
  689 +
686 690 $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle");
687 691 $("#modItemImage_" + windowviewid).attr('src', OpenItemImagePath);
688 692  
689 693  
690   - $rootScope.ViewImageWidth = $("#modItemImage_" + windowviewid).width();
691   - $scope.ViewImageWidth = $("#modItemImage_" + windowviewid).width();
692   - $scope.ViewImageHeight = $("#modItemImage_" + windowviewid).height();
  694 + var ViewImageWidth = $("#modItemImage_" + windowviewid).width();
  695 + // $scope.ViewImageWidth = $("#modItemImage_" + windowviewid).width();
  696 + // $scope.ViewImageHeight = $("#modItemImage_" + windowviewid).height();
693 697  
694 698 $scope.relativeDimesion = 0;
695   - $("#modItemImage_" + windowviewid).css("width", $rootScope.ViewImageWidth + "px");
  699 + $("#modItemImage_" + windowviewid).css("width", ViewImageWidth + "px");
696 700 //0.5 create canvas on the top of image so that I can draw a line over the canvas.
697 701 var canvas = document.createElement('canvas');
698 702 canvas.id = 'aaDetailViewCanvas_'+windowviewid;
... ... @@ -795,75 +799,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
795 799 $scope.setPreClickBtnCss(windowviewid)
796 800 changeThumbnailSize(event, zoomLevel, windowviewid);
797 801 }
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   - }
866   -
  802 +
867 803 $scope.setControlsIDs = function (windowviewid) {
868 804  
869 805 $("#canvasDiv").attr("id", "canvasAADiv_" + windowviewid);
... ... @@ -920,7 +856,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
920 856 $scope.ToolBoxStyle("ShowSelectedPin", windowviewid);
921 857 }
922 858 else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins) {
923   - $scope.ToolBoxStyle("HidePin", windowviewid);
  859 + $scope.ToolBoxStyle("HidePin", windowviewid);
924 860 }
925 861 }
926 862  
... ... @@ -934,9 +870,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
934 870 if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
935 871 $("#listManager").css("display", "none");
936 872 $("#optionsListManagerTab").removeClass("active");
  873 +
  874 +
  875 + var ViewImageWidth = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageWidth');
  876 + var ViewImageHeight = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageHeight');
937 877  
938   - relativeWidth = (scope.ViewImageWidth)*(value/100);
939   - relativeHeight = (scope.ViewImageHeight)*(value/100);
  878 + relativeWidth = (ViewImageWidth)*(value/100);
  879 + relativeHeight = (ViewImageHeight)*(value/100);
940 880 // scope.sliderPercentValue = (value/100);
941 881 $scope.SetAAwindowStoreData(windowviewid,'sliderPercentValue',(value/100));
942 882  
... ... @@ -976,11 +916,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
976 916 $scope.SetAAwindowStoreData(windowviewid,'isSelectedPinBtnClickedAftrSliderCange',true);
977 917  
978 918 switch (toolbtnID) {
979   - case "hidePinBtn_"+windowviewid:
  919 + case "hidePinBtn_"+windowviewid:
980 920 break;
981 921 case "allPinBtn_"+windowviewid:
982   - if ($("#bodySystemList_" + windowviewid+ " li.activeAASystemSelect a").attr("id") != undefined) {
983   - scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"),windowviewid);
  922 + 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);
  926 + }
  927 + else {
  928 + scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
  929 + }
  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 +
984 937 }
985 938 else {
986 939 scope.showAllPins(windowviewid);
... ... @@ -1080,22 +1033,32 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1080 1033 }
1081 1034  
1082 1035 for (var i = 0; i < $scope.aaOpenInOtherModules.selectedCallouts.length; i++) {
1083   -
  1036 + var pinId = $scope.aaOpenInOtherModules.selectedCallouts[i].pinId;
  1037 + if (pinId == undefined) {
1084 1038 CBselectedpinCordinate.push(
1085   - {
1086   - "hy": $scope.aaOpenInOtherModules.selectedCallouts[i].hy,
1087   - "ly": $scope.aaOpenInOtherModules.selectedCallouts[i].ly,
1088   - "hx": $scope.aaOpenInOtherModules.selectedCallouts[i].hx,
1089   - "lx": $scope.aaOpenInOtherModules.selectedCallouts[i].lx
1090   - });
  1039 + {
  1040 + "hy": $scope.aaOpenInOtherModules.selectedCallouts[i].hy,
  1041 + "ly": $scope.aaOpenInOtherModules.selectedCallouts[i].ly,
  1042 + "hx": $scope.aaOpenInOtherModules.selectedCallouts[i].hx,
  1043 + "lx": $scope.aaOpenInOtherModules.selectedCallouts[i].lx,
  1044 + });
1091 1045  
1092 1046 }
  1047 + else {
  1048 + CBselectedpinCordinate.push(
  1049 + {
  1050 + "hy": $scope.aaOpenInOtherModules.selectedCallouts[i].hy,
  1051 + "ly": $scope.aaOpenInOtherModules.selectedCallouts[i].ly,
  1052 + "hx": $scope.aaOpenInOtherModules.selectedCallouts[i].hx,
  1053 + "lx": $scope.aaOpenInOtherModules.selectedCallouts[i].lx,
  1054 + "pinId": $scope.aaOpenInOtherModules.selectedCallouts[i].pinId
  1055 + });
1093 1056  
1094   -
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');
  1057 + }
  1058 +
  1059 + }
  1060 +
  1061 +
1099 1062 if ($scope.aaOpenInOtherModules.showSelectedPins != undefined && $scope.aaOpenInOtherModules.showSelectedPins)
1100 1063 {
1101 1064 //show selected pin
... ... @@ -1133,14 +1096,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1133 1096 $scope.hideSpeechBubble(windowviewid);
1134 1097  
1135 1098 }, 500);
1136   - }
1137   - //else {
1138   -
1139   - // //$timeout(function () {
1140   - // $scope.highlightPinBasedOnSerachItem(selectedSearchId, windowviewid);
1141   - // //}, 500);
1142   -
1143   - //}
  1099 + }
1144 1100 }
1145 1101  
1146 1102 $scope.ShowCBAnnotation=function(windowviewid)
... ... @@ -1539,16 +1495,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1539 1495  
1540 1496 }
1541 1497 else {
  1498 + var id = event.currentTarget.id;
1542 1499 $scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event);
1543 1500 var SelectedSystemID = event.currentTarget.id;
1544 1501 var SelectedSystemTitle = event.currentTarget.title;
1545 1502 if (event.currentTarget.title == "Current Structure") {
1546   -
  1503 + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
1547 1504 }
1548 1505 else {
1549 1506 $scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
1550 1507 $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
1551 1508 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
  1509 + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
1552 1510 }
1553 1511  
1554 1512 var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
... ... @@ -1650,6 +1608,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1650 1608 }
1651 1609  
1652 1610 else {
  1611 +
  1612 + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', event);
  1613 +
1653 1614 var SelectedSystemID = event;
1654 1615 $scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event);
1655 1616 $scope.SetAAwindowStoreData(windowviewid,'isShowSelectedSystemPinsClicked',true);
... ... @@ -1722,6 +1683,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1722 1683 }
1723 1684  
1724 1685 }
  1686 +
  1687 + //$scope.EnableUI();
  1688 + //$rootScope.isLoading = false;
  1689 + //$('#spinner').css('visibility', 'hidden');
1725 1690 }
1726 1691  
1727 1692  
... ... @@ -1835,9 +1800,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1835 1800 CBselectedpinCordinate.push(
1836 1801 {
1837 1802 "hy": headY,
1838   - "ly": 0,
  1803 + "ly": headY,
1839 1804 "hx": headX,
1840   - "lx": 0
  1805 + "lx": headX,
  1806 + "pinId": value._PinId
1841 1807 });
1842 1808 })
1843 1809  
... ... @@ -2726,9 +2692,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2726 2692 $scope.DisableUI();
2727 2693 $rootScope.isLoading = true;
2728 2694 $('#spinner').css('visibility', 'visible');
  2695 +
  2696 + //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
2729 2697 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
2730 2698 $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
2731 2699 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
  2700 +
2732 2701 var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
2733 2702 if (selectedSystemName != null && selectedSystemName != undefined) {
2734 2703 var selectedSystemPinData=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemPinData');
... ... @@ -2749,6 +2718,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2749 2718  
2750 2719 }
2751 2720 }
  2721 + else if ($scope.GetAAwindowStoreData(windowviewid, 'isSliderChange')) {
  2722 + $scope.showAllPins(windowviewid);
  2723 + }
2752 2724  
2753 2725 };
2754 2726  
... ... @@ -2756,11 +2728,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2756 2728  
2757 2729 $scope.ToolBoxStyle("ShowSelectedPin",windowviewid);
2758 2730 $("#listManager").css("display", "none");
2759   - $("#optionsListManagerTab").removeClass("active");
2760   -
  2731 + $("#optionsListManagerTab").removeClass("active");
  2732 +
2761 2733 $scope.DisableUI();
2762 2734 $rootScope.isLoading = true;
2763 2735 $('#spinner').css('visibility', 'visible');
  2736 +
  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 +
2764 2745 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
2765 2746 $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
2766 2747 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);
... ... @@ -2797,7 +2778,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2797 2778  
2798 2779 };
2799 2780  
2800   - $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins,windowviewid) {
  2781 + $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins, windowviewid) {
2801 2782  
2802 2783 if (isShowSelectedPins) {
2803 2784  
... ... @@ -3006,11 +2987,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3006 2987  
3007 2988 $scope.IsSearchVisible = false;
3008 2989  
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;
  2990 + //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
  2991 + //$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
  2992 + //$scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
  2993 + //$scope.SetAAwindowStoreData(windowviewid, 'showSelectedPins', false);
  2994 + //$rootScope.AAWindowLoadComplete = true;
3014 2995 }
3015 2996  
3016 2997 $scope.ShowHideAnnotation = function (event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
  View file @d6dbb32
... ... @@ -233,6 +233,7 @@ AIA.service(&#39;ModuleService&#39;, function ($http, DataService) {
233 233 size: windowData.size,
234 234 contextMenu: windowData.contextMenu,
235 235 selectedSearchId: windowData.selectedSearchId
  236 +
236 237 });
237 238 }
238 239 else if (windowData.mType == "DISSECTIBLE_ANATOMY") {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @d6dbb32
... ... @@ -73,7 +73,7 @@
73 73 <div class="col-sm-6">
74 74 <div class="custom-tooltip">Select System</div>
75 75 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu221" style="background-position: 10px -49px;" onclick="systemChange(event)"></button>
76   - <ul class="tool-dropdown-menu" id="bodySystemList">
  76 + <ul class="tool-dropdown-menu" id="bodySystemList" style="height:270px; overflow:auto">
77 77 <li><a id="0" href="#" title="Current Structure" onclick="showSelectedSystemPins(event)">All</a></li>
78 78 <li role="separator" class="divider"></li>
79 79 <li class="disabledSelectedSystem"><a id="1" href="#" title="Cardiovascular" onclick="showSelectedSystemPins(event)">Cardiovascular</a></li>
... ...
400-SOURCECODE/AIAHTML5.Web/content/data/json/cb/SlideShow/json/Articulations.json
  View file @d6dbb32
... ... @@ -246,8 +246,8 @@
246 246 "notes": "<TEXTFORMAT LEADING=\"2\"><P ALIGN=\"LEFT\"><FONT FACE=\"Microsoft Sans Serif\" SIZE=\"13\" COLOR=\"#000000\" LETTERSPACING=\"0\" KERNING=\"0\">The third type of immovable joint is special in that it joins a tooth to a bone. The Trigeminal Nerve-V2 illustration demonstrates the position of the molars embedded in sockets of the maxilla. The roots of the teeth are surrounded by bone. Actually, the teeth are connected to the bone by a very strong layer of dense connective tissue called the peridontal ligament. This illustration shows branches of the trigeminal nerve called alveolar nerves entering the roots of each molar.</FONT></P></TEXTFORMAT><TEXTFORMAT LEADING=\"2\"><P ALIGN=\"LEFT\"><FONT FACE=\"Microsoft Sans Serif\" SIZE=\"13\" COLOR=\"#000000\" LETTERSPACING=\"0\" KERNING=\"0\"> </FONT></P></TEXTFORMAT><TEXTFORMAT LEADING=\"2\"><P ALIGN=\"LEFT\"><FONT FACE=\"Microsoft Sans Serif\" SIZE=\"13\" COLOR=\"#000000\" LETTERSPACING=\"0\" KERNING=\"0\">The Skull (Lat) 2 radiograph shows the upper and lower molars.</FONT></P></TEXTFORMAT>",
247 247 "windows": {
248 248 "window": [
249   - "{\"windowTitle\":\"Skull (Lat) 2\",\"hideAllPins\":true,\"selectedCallouts\":[],\"annotationData\":\"\",\"minimised\":false,\"scrollPosition\":{\"vertical\":279,\"horizontal\":313},\"selectedStructureID\":0,\"maximised\":false,\"size\":{\"width\":800,\"height\":297},\"id\":\"492\",\"hideCallOuts\":false,\"scaleIndex\":0,\"bodySystemId\":1,\"windowListId\":\"0\",\"imageId\":\"492\",\"position\":{\"x\":840,\"y\":263},\"mType\":\"ATLAS_ANATOMY\",\"containsCapturedContent\":true,\"selectedPins\":[],\"contextMenu\":{\"hideLeftBar\":false,\"hideTitleBar\":false,\"hideTopToolBar\":false,\"lockResize\":false}}",
250   - "{\"windowTitle\":\"Trigeminal Nerve-V2\",\"hideAllPins\":true,\"selectedCallouts\":[],\"annotationData\":\"\",\"minimised\":false,\"scrollPosition\":{\"vertical\":145,\"horizontal\":264},\"selectedStructureID\":0,\"maximised\":false,\"size\":{\"width\":800,\"height\":261},\"id\":\"388\",\"hideCallOuts\":false,\"scaleIndex\":1,\"bodySystemId\":1,\"windowListId\":\"0\",\"imageId\":\"388\",\"position\":{\"x\":840,\"y\":10},\"mType\":\"ATLAS_ANATOMY\",\"containsCapturedContent\":true,\"selectedPins\":[],\"contextMenu\":{\"hideLeftBar\":false,\"hideTitleBar\":false,\"hideTopToolBar\":false,\"lockResize\":false}}"
  249 + "{\"windowTitle\":\"Skull (Lat) 2\",\"hideAllPins\":true,\"selectedCallouts\":[],\"annotationData\":\"\",\"minimised\":false,\"scrollPosition\":{\"vertical\":279,\"horizontal\":313},\"selectedStructureID\":0,\"maximised\":false,\"size\":{\"width\":800,\"height\":297},\"id\":\"492\",\"hideCallOuts\":false,\"scaleIndex\":0,\"bodySystemId\":0,\"windowListId\":\"0\",\"imageId\":\"492\",\"position\":{\"x\":840,\"y\":263},\"mType\":\"ATLAS_ANATOMY\",\"containsCapturedContent\":true,\"selectedPins\":[],\"contextMenu\":{\"hideLeftBar\":false,\"hideTitleBar\":false,\"hideTopToolBar\":false,\"lockResize\":false}}",
  250 + "{\"windowTitle\":\"Trigeminal Nerve-V2\",\"hideAllPins\":true,\"selectedCallouts\":[],\"annotationData\":\"\",\"minimised\":false,\"scrollPosition\":{\"vertical\":145,\"horizontal\":264},\"selectedStructureID\":0,\"maximised\":false,\"size\":{\"width\":800,\"height\":261},\"id\":\"388\",\"hideCallOuts\":false,\"scaleIndex\":1,\"bodySystemId\":0,\"windowListId\":\"0\",\"imageId\":\"388\",\"position\":{\"x\":840,\"y\":10},\"mType\":\"ATLAS_ANATOMY\",\"containsCapturedContent\":true,\"selectedPins\":[],\"contextMenu\":{\"hideLeftBar\":false,\"hideTitleBar\":false,\"hideTopToolBar\":false,\"lockResize\":false}}"
251 251 ]
252 252 },
253 253 "_id": "119019513"
... ...