diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index fbb2ed0..54d404d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -183,6 +183,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $rootScope.cbDynamicJsonData = data; $rootScope.getCBsummary(); $scope.CBEnableUI(); + }) .error(function (data, status, headers, config) { console.log(data); @@ -192,19 +193,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } - $rootScope.OpenExistingCurriculum = function (event) { - - //OPen for diffrent html page - //$location.url(); - //$location.path(); - //if ($location.url() == "/curriculum-builder") { - // event.toElement.href = "http://localhost/curriculum-builder"; - //} - //else { - // if ($location.url() == "/curriculum-builder-detail") { - // event.toElement.href = "http://localhost/curriculum-builder-detail"; - // } - //} + $rootScope.OpenExistingCurriculum = function (event) { $("#openCBJsonFile").trigger("click"); var fileupload = document.getElementById("openCBJsonFile"); @@ -264,177 +253,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } }; - } - - - //$scope.getJsonFileFromLocal = function loadFile() { - // var fileId, file, fr; - - // if (typeof window.FileReader !== 'function') { - // alert("The file API isn't supported on this browser yet."); - // return; - // } - // fileId = document.getElementById('opencbview'); - // if (!fileId) { - // alert("File couldn't find the element."); - // } - // else if (!fileId.files) { - // alert("This browser doesn't seem to support the `files` property of file inputs."); - // } - // else if (!fileId.files[0]) { - // alert("Please select a file before clicking 'Load'"); - // } - // else { - // file = fileId.files[0]; - // fr = new FileReader(); - // fr.onload = receivedText; - // fr.readAsText(file); - - // } - - // function receivedText(e) { - // let lines = e.target.result; - - // var newArr = JSON.parse(lines); - // localStorage.setItem("cbJsonDataObject", JSON.stringify(newArr)); - // $rootScope.cbJsonData = ""; $rootScope.cbDynamicJsonData = ""; - // $rootScope.cbJsonData = JSON.parse(lines); - // $rootScope.cbDynamicJsonData = JSON.parse(lines); - // $rootScope.cbTreeFirstLabel = $rootScope.cbJsonData.slideshow.presentation.structure._label; - - // $rootScope.getCBsummary(); - // $scope.CBEnableUI(); - - // $rootScope.AutherName = ""; - // $rootScope.summary = ""; - // $rootScope.FileTitle = $rootScope.cbTreeFirstLabel; - - // $timeout(function () { - // $('#modal-CurBuilder').css("display", "block"); - // $("#CurBuilderbackground").css("display", "block"); - // }, 3000); - - // //$scope.loadSlideShowXmldata(); - // //$scope.openCurriculumDetail(); - // } - //} - - //$rootScope.OpenExistingCurriculum = function (file_Name) { - - // $("#opencbview").trigger("click"); - // var fileupload = document.getElementById("opencbview"); - - // fileupload.onchange = function () { - - // var fileName = fileupload.value; - // alert(fileName); - - // //switch ($location.url()) { - // // case '/curriculum-builder-detail': - // // $location.url('/curriculum-builder'); - // // break; - // //} - - // // $scope.fileName = file_Name; - // $('#modal-CurBuilder').css("display", "block"); - // $("#CurBuilderbackground").css("display", "block"); - // $http({ method: 'GET', url: fileName }).success(function (data) { - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); - // $rootScope.cbDynamicJsonData = data; - // $rootScope.getCBsummary(); - - // $scope.openCurriculumDetail(); - // }) - // .error(function (data, status, headers, config) { - // console.log(data); - // }); - // }; - //} + } - - //$rootScope.saveCurricullam = function (file_Name) { - // $scope.selectedNodeSingleObj.push( - // { - // "slideshow": { - // "presentation": { - // "structure": { - // "structure": [ - // { - // "_label": "Untitled Slide", - // "_id": "-1507902782", - // "_isRoot": "false", - // "_isBranch": "false", - // "_isLocked": "false" - // } - - // ], - // "_label": "Untitled Curriculum", - // "_id": "-225638207", - // "_isRoot": "true", - // "_isBranch": "true", - // "_isLocked": "false" - // }, - // "_anchor": "true", - // "_window_position": "6,10", - // "_window_size": "828,453" - // }, - // "content": { - // "element": [ - // { - // "notes": "

", - // "windows": { - // "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}}" - // }, - // "_id": "-1507902782" - // } - // ] - // } - // } - // }); - // console.log($scope.selectedNodeSingle); - // $scope.exportToFile(); - // $http({ method: 'Post', url: 'content/data/json/cb/SlideShow/json/' + $scope.fileName + '.json' }).success(function (data) { - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); - // $rootScope.cbDynamicJsonData = data; - // //$scope.getCBsummary(); - // $rootScope.cbJsonData.slideshow.content.element="Eement data"; - // $rootScope.cbDynamicJsonData.slideshow.content.element="slideshow element data"; - // $rootScope.note = "save data" - // //$scope.openCurriculumDetail(); - // }) - // .error(function (data, status, headers, config) { - // console.log(data); - // }); - - //} - //$rootScope.NewCurricullumData = function (file_Name) { - // //$rootScope.fileNames = e.target.id; - // alert('test'); - // switch ($location.url()) { - // case '/curriculum-builder-detail': - // $location.url('/curriculum-builder'); - // break; - // } - // $scope.fileName = file_Name; - // $('#modal-CurBuilder').css("display", "block"); - // $("#CurBuilderbackground").css("display", "block"); - // $http({ method: 'GET', url: 'content/data/json/cb/SlideShow/json/' + $scope.fileName + '.json' }).success(function (data) { - // localStorage.setItem("cbJsonDataObject", JSON.stringify(data)); - // $rootScope.cbJsonData = JSON.parse(localStorage.getItem("cbJsonDataObject")); - // $rootScope.cbDynamicJsonData = data; - // //$scope.getCBsummary(); - // //$rootScope.note = $rootScope.cbJsonData.slideshow.content.element; - // //$rootScope.Auther = $rootScope.cbDynamicJsonData.slideshow.content.element; - // $rootScope.note = $rootScope.cbJsonData.slideshow.content.element; - // $scope.openCurriculumDetail(); - // }) - // .error(function (data, status, headers, config) { - // console.log(data); - // }); - //} - $scope.openImagePanel = function () { var jsImageURL = 'app/views/CBuild/curriculum-builder-image.html'; @@ -613,26 +433,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } } - } - - //function getLoadNodeId(o) { - - // for (var i in o) { - - // if (o[i] !== null && typeof (o[i]) == "object") { - // if (o[i]._isBranch == "false") { - // $rootScope.firstSelectedNodeId = o[i]._id; - - - // } - - // getLoadNodeId(o[i]); - - - // } - - // } - //} + } $scope.loadNotesById = function () { @@ -729,30 +530,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } } - $scope.updateDropdownforSaveDraftCB = function (nodeid) { - var current_id = document.getElementById('cbSelect').value; - if ($rootScope.structureObjForSaveCB.length == 0) { - //$rootScope.structureObjForSaveCB = $rootScope.structure; - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure; - $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; - } - traverseSelectedObjForSaveDraftCB($rootScope.structureObjForSaveCB, current_id); - if ($rootScope.structureObjForSaveCB.length != $rootScope.stru.structure.structure.length) { - if ($scope.selectedObjforSaveDraftCB._isBranch == "true" && $scope.selectedObjforSaveDraftCB._id == nodeid) { - $('#cbSelect').append(''); - document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedNodeSingleObj).length; - } - else { - for (var i = 0; i < $rootScope.selectedObjforSaveDraftCB.length; i++) { - if ($rootScope.selectedObjforSaveDraftCB[i]._id == nodeid) { - $scope.currentSlideNumber = i + 1; - $('#cbSelect').append(''); - document.getElementById("slideNumber").innerHTML = "Slide " + $scope.currentSlideNumber + " of " + Object.keys($scope.selectedObjforSaveDraftCB).length - } - } - } - } - } + var isActive = false; //Start Code by Sandeep for TicketNo: 49226(3) $scope.DropDownSelectNodeClick = function (nodeid) { @@ -771,10 +549,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $('#cbEditorRightSideBar').css('pointer-events', 'auto'); $('#cbEditorRightSideBar').css('opacity', '1'); - - //if ($rootScope.structureObjForSaveCB.length != $rootScope.stru.structure.structure.length && $rootScope.structureObjForSaveCB.length != 0) { - // $scope.updateDropdownforSaveDraftCB(nodeid); - //} + if ($scope.selectedNodeSingleObj._isBranch == "true") { $("#cbSelect").empty(); @@ -890,22 +665,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } } } - - //$rootScope.cbRenameModelShow = function () { - // var current_id = document.getElementById('cbSelect').value; - // document.getElementById('renameInputBoxId').value = ""; - // traverseTreeSelectedSingleObj($rootScope.stru, current_id); - // if ($scope.selectedNodeSingleObj._isBranch == "true") { - // traverseTreeSelectedSingleObj($rootScope.Auther, current_id); - // document.getElementById('cbRenameDate').value = $scope.selectedNodeSingleObj.modified; - // document.getElementById('cbModelRenameBackground').style.display = "block"; - // document.getElementById('cbModelSectionRenameId').style.display = "block"; - // } - // else { - // document.getElementById('cbModelRenameBackground').style.display = "block"; - // document.getElementById('cbModelRenameId').style.display = "block"; - // } - //} + $rootScope.cbPasswordModelShow = function () { //var current_id = document.getElementById('cbSelect').value; @@ -921,102 +681,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ //document.getElementById('cbModelRenameId').style.display = "block"; // } - } - - //$rootScope.cbRenameSlide = function () { - // var current_id - // if (($rootScope.getLocalStorageValue("cbSelectId")) != '') { - // current_id = $rootScope.getLocalStorageValue("cbSelectId"); - // } - // else { - // current_id = document.getElementById('cbSelect').value; - // } - // //var current_id = document.getElementById('cbSelect').value; - // var newSlideText = document.getElementById('renameInputBoxId').value; - // var newSlideName = ("" + newSlideText + ""); - // $("#jstree").jstree('set_text', current_id, newSlideName); - // traverseTreeSelectedSingleObj($rootScope.stru, current_id); - // $scope.selectedNodeSingleObj._label = newSlideText; - // $scope.DropDownSelectNodeClick(current_id); - // console.log(JSON.stringify($rootScope.stru)); - // $rootScope.closeRenameModel(); - //} - - //$rootScope.closeRenameModel = function () { - // document.getElementById('cbModelRenameBackground').style.display = "none"; - // if (document.getElementById("cbModelRenameId").style.display == 'block') { - // document.getElementById('cbModelRenameId').style.display = "none"; - // } - // if (document.getElementById("cbModelUserPassWord").style.display == 'block') { - // document.getElementById('cbModelUserPassWord').style.display = "none"; - // } - - // if (document.getElementById("cbModelSectionRenameId").style.display == 'block') { - // document.getElementById('cbModelSectionRenameId').style.display = "none"; - // } - //} - - //$rootScope.cbRenameSection = function () { - // var nodeid - // if (($rootScope.getLocalStorageValue("cbSelectId")) != '') { - // nodeid = $rootScope.getLocalStorageValue("cbSelectId"); - // } - // else { - // nodeid = document.getElementById('cbSelect').value; - // } - - - // //var nodeid = document.getElementById('cbSelect').value; - // $scope.cbRenameDate(); - // //var newSlideName = document.getElementById('cbRenameSectionTitle').value; - // var newAuthorName = document.getElementById('cbRenameAuthor').value; - // var newSummary = document.getElementById('cbRenameSummary').value; - // var newversion = document.getElementById('cbRenameVersionNo').value; - // var newSectionText = document.getElementById('cbRenameSectionTitle').value; - // var newSlideName = ("" + newSectionText + ""); - // $("#jstree").jstree('set_text', nodeid, newSlideName); - // traverseTreeSelectedSingleObj($rootScope.stru, nodeid); - // $scope.selectedNodeSingleObj._label = newSectionText; - // $scope.selectedNodeSingleObj = ""; - // traverseTreeSelectedSingleObj($rootScope.Auther, nodeid); - // setTimeout(function () { - // $scope.selectedNodeSingleObj.summary = newSummary; - // $scope.selectedNodeSingleObj.author = newAuthorName; - // $scope.selectedNodeSingleObj.version = newversion; - // $scope.selectedNodeSingleObj.modified = $scope.dateTime; - // $scope.DropDownSelectNodeClick(nodeid); - // console.log("summary" + JSON.stringify($rootScope.cbDynamicJsonData)); - // }, 100); - // $rootScope.closeRenameModel(); - - //} - - //$scope.cbRenameDate = function () { - // var currentdate = new Date(); - // var now = new Date(); - // var year = now.getFullYear(); - // var month = now.getMonth() + 1; - // var day = now.getDate(); - // var hours = now.getHours(); - // var minute = now.getMinutes(); - // var ampm = hours >= 12 ? 'PM' : 'AM'; - // hours = hours % 12; - // hours = hours ? hours : 12; // the hour '0' should be '12' - // if (month.toString().length == 1) { - // month = '0' + month; - // } - // if (day.toString().length == 1) { - // day = '0' + day; - // } - // if (hours.toString().length == 1) { - // hours = '0' + hours; - // } - // if (minute.toString().length == 1) { - // minute = '0' + minute; - // } - - // $scope.dateTime = month + '/' + day + '/' + year + ',' + hours + ':' + minute + ' ' + ampm; - //} + } $scope.setProperties = function () { if ($scope.selectedNodeSingleObj.author != "undefined") { @@ -1176,9 +841,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $rootScope.structureObjForSaveCB[i]._label = $scope.selectedNodeSingleObj._label; //$rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; } - //else if ($rootScope.structureObjForSaveCB[i]['structure']._id == nodeid) { - // $rootScope.structureObjForSaveCB[i]['structure'] = $scope.selectedNodeSingleObj['structure']; - //} + } if ($rootScope.cbTreeFirstID == nodeid) { $rootScope.cbTreeFirstLabel = $scope.selectedNodeSingleObj._label; @@ -1187,8 +850,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ if ($rootScope.contentNotesForSaveCB.length == 0) { $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents; } - //$scope.selectedNodeSingleObj = ""; - //traverseTreeSelectedSingleObj($rootScope.Auther, nodeid); + traverseTreeSelectedSingleObj($rootScope.contentNotesForSaveCB, nodeid); setTimeout(function () { $scope.selectedNodeSingleObj.summary = newSummary; @@ -1377,37 +1039,12 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } } - //$scope.moveUP = function (currentid) { - - - // traverse($rootScope.stru, currentid); - - // console.log("cbJsonData Before" + JSON.stringify($rootScope.stru)); - // console.log("upDateJsonObj Before" + JSON.stringify($scope.selectedNodeSiblingObjs)); - // for (var j = 0; j < $scope.selectedNodeSiblingObjs.length; j++) { - - // if (($scope.selectedNodeSiblingObjs[j]._id == currentid) && ($scope.selectedNodeSiblingObjs[j - 1] != undefined)) { - // var key = $scope.selectedNodeSiblingObjs[j]; - // $scope.selectedNodeSiblingObjs[j] = $scope.selectedNodeSiblingObjs[j - 1]; - // $scope.selectedNodeSiblingObjs[j - 1] = key; - // } - - // } - // console.log("upDateJsonObjenew after" + JSON.stringify($scope.selectedNodeSiblingObjs)); - - // console.log("stru after" + JSON.stringify($rootScope.stru)); - - // console.log("structure after" + JSON.stringify($rootScope.structure)); - - - - //} + $scope.deleteSectionForCB = function (currentid, CurrentSelectedParentSpanId) { if ($rootScope.structureObjForSaveCB.length == 0) { - //$rootScope.structureObjForSaveCB = $rootScope.structure;// only Tree Array - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure; + $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; } if ($rootScope.contentNotesForSaveCB.length == 0) { @@ -1435,31 +1072,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.selectedNodeSingleObj['structure'].splice(j, 1); //$rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; } - } - - //traverse($rootScope.stru, currentid); - //for (var j = 0; j < $rootScope.structureObjForSaveCB.length; j++) { - // //if (($rootScope.structureObjForSaveCB[j]._id == currentid)) { - // if ($rootScope.structureObjForSaveCB[j]._id == currentid && $rootScope.structureObjForSaveCB[j]._isBranch == "true") { - // traverseTreeSelectedSingleObj($rootScope.stru, currentid); - // traverse($rootScope.stru, currentid); - // var childNodesForSelectedSection = $scope.selectedNodeSingleObj['structure']; - - // //if ($rootScope.structureObjForSaveCB[j]['structure'].length > 0) { - // if (childNodesForSelectedSection.length > 0) { - // for (var l = 0; l < childNodesForSelectedSection.length; l++) { - // var childId = childNodesForSelectedSection[l]._id; // Get Child ID for selected Section node - // for (var k = 0; k < $rootScope.contentNotesForSaveCB.length; k++) { - // if (($rootScope.contentNotesForSaveCB[k]._id == childId)) { - // $rootScope.contentNotesForSaveCB.splice(k, 1); - // } - // } - // } - // } - // $rootScope.structureObjForSaveCB.splice(j, 1); - // } - //} - + } //Delete notes for SavedraftCB as per Selected Section from tree @@ -1487,8 +1100,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.DeleteSlide = function (currentid, CurrentSelectedParentSpanId) { if ($rootScope.structureObjForSaveCB.length == 0) { - //$rootScope.structureObjForSaveCB = $rootScope.structure;// only Tree Array - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure; + $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; } if ($rootScope.contentNotesForSaveCB.length == 0) { @@ -1522,10 +1134,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ for (var j = 0; j < $scope.selectedNodeSiblingObjs.length; j++) { if (($scope.selectedNodeSiblingObjs[j]._id == currentid)) { - $scope.selectedNodeSiblingObjs.splice(j, 1); - - //$rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; - //$rootScope.structureObjForSaveCB = $rootScope.stru.slideshow.presentation.structure.structure; + $scope.selectedNodeSiblingObjs.splice(j, 1); //Added Code by Sandeep for Delete slide from node tree for save draft CB for (var x = 0; x < $rootScope.structureObjForSaveCB.length; x++) { @@ -1541,28 +1150,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } $rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; $scope.selectedNodeSingleObj = ""; - //traverseTreeSelectedSingleObj($rootScope.structureObjForSaveCB, currentid); - //if ($scope.selectedNodeSingleObj._isBranch == "true") { - // for (var j = 0; j < $scope.selectedNodeSingleObj['structure'].length; j++) { - // if ($scope.selectedNodeSingleObj._id == currentid) { - // var childNodesForSelectedSection = $scope.selectedNodeSingleObj['structure']; - - // if (childNodesForSelectedSection.length > 0) { - - // for (var l = 0; l < childNodesForSelectedSection.length; l++) { - // var childId = childNodesForSelectedSection[l]._id; // Get Child ID for selected Section node - // for (var k = 0; k < $rootScope.contentNotesForSaveCB.length; k++) { - // if (($rootScope.contentNotesForSaveCB[k]._id == childId)) { - // $rootScope.contentNotesForSaveCB.splice(k, 1); - // } - // } - // } - // } - // } - // $scope.selectedNodeSingleObj['structure'].splice(j, 1); - // //$rootScope.structureObjForSaveCB = $rootScope.stru.structure.structure; - // } - //} + //Delete notes for SavedraftCB as per Selected Slide from tree var deleteNotes = $rootScope.contentNotesForSaveCB @@ -1648,7 +1236,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ //$rootScope.contentNotesForSaveCB = []; //$rootScope.structureObjForSaveCB = []; } - $rootScope.updatedContentFromEditor = function (cbCurrentId) { @@ -1684,10 +1271,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ traverseTreeSelectedSingleObj($rootScope.stru, cbCurrentId); - //$scope.selectedNodeSingleObj.summary - //$scope.selectedNodeSingleObj.author - //$scope.selectedNodeSingleObj.version - //$scope.selectedNodeSingleObj.modified + if ($scope.selectedNodeSingleObj._isBranch == "false") { $rootScope.contentNotesForSaveCB.push( { @@ -1734,9 +1318,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $rootScope.cbDynamicContents = $rootScope.contentNotesForSaveCB; $rootScope.note = $rootScope.contentNotesForSaveCB; - console.log($rootScope.contentNotesForSaveCB); - //console.log(tinyMCE.activeEditor.getContent()); - //console.log($('#CBTextArea_ifr')[0].contentDocument.body.innerHTML); + console.log($rootScope.contentNotesForSaveCB); } @@ -1973,25 +1555,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ // setTimeout(function () { traverseTreeForSetIcons($rootScope.stru, currentid); }, 3000); setTimeout(function () { $("#jstree").jstree(true).set_icon(AddSlideId, "../../../content/images/CB/file.png"); }, 100); } - - //$scope.moveDown = function (currentid) { - - - // traverse($rootScope.stru, currentid); - - // for (var j = 0; j < $scope.selectedNodeSiblingObjs.length; j++) { - - // if (($scope.selectedNodeSiblingObjs[j]._id == currentid) && ($scope.selectedNodeSiblingObjs[j + 1] != undefined)) { - // var key1 = $scope.selectedNodeSiblingObjs[j]; - // $scope.selectedNodeSiblingObjs[j] = $scope.selectedNodeSiblingObjs[j + 1]; - // $scope.selectedNodeSiblingObjs[j + 1] = key1; - // break; - // } - - // } - - - //} + $scope.moveDown = function (currentid) { @@ -2664,8 +2228,8 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ containsCapturedContent: true, contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false }, //activePinArray: $rootScope.AAWindowData[i].activePinArray, - selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId, - //sliderVal: $rootScope.AAWindowData[i].sliderVal + selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId + //typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent @@ -2770,26 +2334,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } - //$rootScope.updateWindowsContentForSaveCB = function (windowData) { - // //findKeyForChange($scope.windowDataforCB, keyname) - // //if ($scope.selectedKey.length > 0) { - // // for (var x = 0 ; x < $scope.selectedKey.length; x++) { - // // if ($scope.selectedKey[x].keyname == keyname) { - // // $scope.selectedKey[x][keyname] = value; - // // } - // // } - // //} - // //else if ($scope.selectedKey != undefined && $scope.selectedKey != "") { - // // $scope.selectedKey = value; - // //} - - // //var windowContent = $scope.windowDataforCB; - // //$scope.windowDataforCB = new jinqJs() - // // .from(windowContent) - // // .update(function (column, index) { - // // column[index].keyname = value; - // // }) - // // .at(column[index].keyname = keyname); + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index da54b89..b0a6bb8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -101,7 +101,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou 'selectedPins': [], 'isShowSelectedPins': false, 'selectedSearchId': 0, - 'isShowAllPins': false + 'isShowAllPins': false, + 'canvasImageWidth': 0, + 'canvasImageHeight': 0 }); @@ -161,7 +163,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou 'selectedPins': [], 'isShowSelectedPins': false, 'selectedSearchId': 0, - 'isShowAllPins': false + 'isShowAllPins': false, + 'canvasImageWidth': 0, + 'canvasImageHeight': 0 }); @@ -477,12 +481,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $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); + // note:: in few json like "articulation" imageId as same id // get wrong detail by imageId @@ -683,16 +684,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.imageWidth = this.width; $scope.imageHeight = this.height; + $scope.SetAAwindowStoreData(windowviewid, 'canvasImageWidth', this.width); + $scope.SetAAwindowStoreData(windowviewid, 'canvasImageHeight', this.height); + $scope.currentTitleFromJson = $rootScope.getLocalStorageValue("currentViewTitle"); $("#modItemImage_" + windowviewid).attr('src', OpenItemImagePath); - $rootScope.ViewImageWidth = $("#modItemImage_" + windowviewid).width(); - $scope.ViewImageWidth = $("#modItemImage_" + windowviewid).width(); - $scope.ViewImageHeight = $("#modItemImage_" + windowviewid).height(); + var ViewImageWidth = $("#modItemImage_" + windowviewid).width(); + // $scope.ViewImageWidth = $("#modItemImage_" + windowviewid).width(); + // $scope.ViewImageHeight = $("#modItemImage_" + windowviewid).height(); $scope.relativeDimesion = 0; - $("#modItemImage_" + windowviewid).css("width", $rootScope.ViewImageWidth + "px"); + $("#modItemImage_" + windowviewid).css("width", ViewImageWidth + "px"); //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; @@ -795,75 +799,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $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) { $("#canvasDiv").attr("id", "canvasAADiv_" + windowviewid); @@ -920,7 +856,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.ToolBoxStyle("ShowSelectedPin", windowviewid); } else if ($scope.aaOpenInOtherModules.hideAllPins != undefined && $scope.aaOpenInOtherModules.hideAllPins) { - $scope.ToolBoxStyle("HidePin", windowviewid); + $scope.ToolBoxStyle("HidePin", windowviewid); } } @@ -934,9 +870,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) { $("#listManager").css("display", "none"); $("#optionsListManagerTab").removeClass("active"); + + + var ViewImageWidth = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageWidth'); + var ViewImageHeight = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageHeight'); - relativeWidth = (scope.ViewImageWidth)*(value/100); - relativeHeight = (scope.ViewImageHeight)*(value/100); + relativeWidth = (ViewImageWidth)*(value/100); + relativeHeight = (ViewImageHeight)*(value/100); // scope.sliderPercentValue = (value/100); $scope.SetAAwindowStoreData(windowviewid,'sliderPercentValue',(value/100)); @@ -976,11 +916,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.SetAAwindowStoreData(windowviewid,'isSelectedPinBtnClickedAftrSliderCange',true); switch (toolbtnID) { - case "hidePinBtn_"+windowviewid: + case "hidePinBtn_"+windowviewid: break; case "allPinBtn_"+windowviewid: - if ($("#bodySystemList_" + windowviewid+ " li.activeAASystemSelect a").attr("id") != undefined) { - scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"),windowviewid); + if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) { + var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId'); + if (selectedSearchId != undefined) { + scope.showSelectedSystemPins(selectedSearchId, windowviewid); + } + else { + scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid); + } + //if (scope.aaOpenInOtherModules.selectedSearchId != undefined) { + // scope.showSelectedSystemPins(scope.aaOpenInOtherModules.selectedSearchId, windowviewid); + //} + //else { + // scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid); + //} + } else { scope.showAllPins(windowviewid); @@ -1080,22 +1033,32 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } for (var i = 0; i < $scope.aaOpenInOtherModules.selectedCallouts.length; i++) { - + var pinId = $scope.aaOpenInOtherModules.selectedCallouts[i].pinId; + if (pinId == undefined) { CBselectedpinCordinate.push( - { - "hy": $scope.aaOpenInOtherModules.selectedCallouts[i].hy, - "ly": $scope.aaOpenInOtherModules.selectedCallouts[i].ly, - "hx": $scope.aaOpenInOtherModules.selectedCallouts[i].hx, - "lx": $scope.aaOpenInOtherModules.selectedCallouts[i].lx - }); + { + "hy": $scope.aaOpenInOtherModules.selectedCallouts[i].hy, + "ly": $scope.aaOpenInOtherModules.selectedCallouts[i].ly, + "hx": $scope.aaOpenInOtherModules.selectedCallouts[i].hx, + "lx": $scope.aaOpenInOtherModules.selectedCallouts[i].lx, + }); } + else { + CBselectedpinCordinate.push( + { + "hy": $scope.aaOpenInOtherModules.selectedCallouts[i].hy, + "ly": $scope.aaOpenInOtherModules.selectedCallouts[i].ly, + "hx": $scope.aaOpenInOtherModules.selectedCallouts[i].hx, + "lx": $scope.aaOpenInOtherModules.selectedCallouts[i].lx, + "pinId": $scope.aaOpenInOtherModules.selectedCallouts[i].pinId + }); - - //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 @@ -1133,14 +1096,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.hideSpeechBubble(windowviewid); }, 500); - } - //else { - - // //$timeout(function () { - // $scope.highlightPinBasedOnSerachItem(selectedSearchId, windowviewid); - // //}, 500); - - //} + } } $scope.ShowCBAnnotation=function(windowviewid) @@ -1539,16 +1495,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } else { + var id = event.currentTarget.id; $scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event); var SelectedSystemID = event.currentTarget.id; var SelectedSystemTitle = event.currentTarget.title; if (event.currentTarget.title == "Current Structure") { - + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0); } else { $scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]); $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []); $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []); + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id); } var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked'); @@ -1650,6 +1608,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } else { + + $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', event); + var SelectedSystemID = event; $scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event); $scope.SetAAwindowStoreData(windowviewid,'isShowSelectedSystemPinsClicked',true); @@ -1722,6 +1683,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } + + //$scope.EnableUI(); + //$rootScope.isLoading = false; + //$('#spinner').css('visibility', 'hidden'); } @@ -1835,9 +1800,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou CBselectedpinCordinate.push( { "hy": headY, - "ly": 0, + "ly": headY, "hx": headX, - "lx": 0 + "lx": headX, + "pinId": value._PinId }); }) @@ -2726,9 +2692,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.DisableUI(); $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); + + //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0); $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'); @@ -2749,6 +2718,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } } + else if ($scope.GetAAwindowStoreData(windowviewid, 'isSliderChange')) { + $scope.showAllPins(windowviewid); + } }; @@ -2756,11 +2728,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.ToolBoxStyle("ShowSelectedPin",windowviewid); $("#listManager").css("display", "none"); - $("#optionsListManagerTab").removeClass("active"); - + $("#optionsListManagerTab").removeClass("active"); + $scope.DisableUI(); $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); + + var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked'); + if (isHidePinBtnClicked) { + $scope.showAllPins(windowviewid); + setTimeout(function () { + $scope.activePinOnSliderChange(windowviewid); + }, 200); + } + $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false); $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false); $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true); @@ -2797,7 +2778,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }; - $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins,windowviewid) { + $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins, windowviewid) { if (isShowSelectedPins) { @@ -3006,11 +2987,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $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.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) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js index f99c482..6e03907 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -233,6 +233,7 @@ AIA.service('ModuleService', function ($http, DataService) { size: windowData.size, contextMenu: windowData.contextMenu, selectedSearchId: windowData.selectedSearchId + }); } else if (windowData.mType == "DISSECTIBLE_ANATOMY") { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html index 9c0ccac..b67237d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html @@ -73,7 +73,7 @@
Select System
-