diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 63831d8..d753ea3 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -303,52 +303,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } - $scope.openImagePanel = function () { - - var jsImageURL = 'app/views/CBuild/curriculum-builder-image.html'; - $.jsPanel({ - id: 'CBSourceImagePanel', - selector: '.CBBodyView', - theme: 'success', - currentController: 'CurrBuildController', - parentSlug: 'curriculum-builder-detail', - ajax: { - url: jsImageURL - }, - title: $rootScope.windowstitle, - - position: { - top: 600, - left: 10, - }, - controls: { buttons: 'closeonly' }, - size: { width: 850, height: 503 }, - - }); - - setTimeout(function () { - - $scope.ImagePanelclick(); - var imfgEle = document.getElementById("imgtag"); - if (imfgEle!=null) - imfgEle.src = "data:image/png;base64," + $rootScope.windowsimageSource; - - setTimeout(function () { - var cleintht=imfgEle.clientHeight; - if(cleintht>0) - $('#CBSourceImagePanel .jsPanel-content').css('height', cleintht); - $scope.CBEnableUI(); - }, 200) - - }, 200) - } - - $scope.ImagePanelclick = function () { - $("#CBSourceImagePanel").on('click', function (event) { - var pnlName=event.currentTarget.id; - $scope.$emit("cBEnableDisableMenuOption",pnlName); - }); - } $rootScope.getCBsummary = function () { $rootScope.summary = $rootScope.cbJsonData.slideshow.content.element[0].summary; $rootScope.AutherName = $rootScope.cbJsonData.slideshow.content.element[0].author; @@ -504,6 +458,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#AddSlide").addClass("cbAddSection"); $("#AddSection").addClass("cbAddSection"); $("#openResourceId").removeClass("openResources"); + $("#openPictureId").removeClass("OpenPitures"); } if ($scope.selectedNodeSingleObj._isBranch == "true") { @@ -512,6 +467,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $("#AddSlide").removeClass("cbAddSection"); $("#AddSection").removeClass("cbAddSection"); $("#openResourceId").addClass("openResources"); + $("#openPictureId").addClass("OpenPitures"); } $scope.DropDownSelectNodeClick(nodeid); $scope.SelectedNotes = ""; @@ -522,8 +478,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ // clear module data ModuleService.ClearWinData(); - $('#CBSourceImagePanel').remove(); - + $("#viwerSelect").empty(); $("#viwerSelect").hide(); if ($('#cbparentcustomDiv').html() != "") { @@ -587,7 +542,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $rootScope.updatedContentFromEditor(currentCb_id);//Calling for Update Note for Save CB if (isActive) { - $scope.updateWindowsContentForSaveCB(currentCb_id);// Calling for Update Window content for Save Cb + $scope.updateWindowsContentForSaveCB(currentCb_id,true);// Calling for Update Window content for Save Cb } isActive = true; traverseTreeSelectedSingleObj($rootScope.stru, nodeid); @@ -997,9 +952,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ else { createNodeId = parentid; - - //open other modules - // $scope.loadContentOfSelectedSlide(current_id); } var AddSlideId = ""; @@ -1226,7 +1178,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } $rootScope.updatedContentFromEditor(cbCurrentId); - $scope.updateWindowsContentForSaveCB(cbCurrentId); + $scope.updateWindowsContentForSaveCB(cbCurrentId,false); $rootScope.dynamicUpdatedJsonForSaveCB = { @@ -1658,10 +1610,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.loadContentOfSelectedSlide = function (id) { - // alert("Id" + id); console.log("id= " + id) - //var content = $rootScope.cbJsonData.slideshow.content.element; - if ($rootScope.contentNotesForSaveCB.length == 0) { $rootScope.contentNotesForSaveCB = $rootScope.cbDynamicContents; } @@ -1673,143 +1622,99 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ .select(); // console.log('contenctForSelectedSlide' + contenctForSelectedSlide[0].notes) var windowsInSelectedSlide = contenctForSelectedSlide[0].windows; + var allwindowData = windowsInSelectedSlide.window; + if(!Array.isArray(allwindowData)) + { + allwindowData=[]; + allwindowData.push(windowsInSelectedSlide.window); + } + var windowData; - var imageSourc; var DawindowId = 0; var AtlasWindowId = 0; var CIWindowId = 0; var CAWindowId = 0; var ThreeDWindowId = 0; + var ADAMIMGWindowId = 0; + var LabWindowId = 0; + var PicWindowId = 0; //check for multiple windows, if Array.isArray==true - if (allwindowData != undefined && Array.isArray(allwindowData)) { + if (allwindowData != undefined) { for (var i = 0; i < allwindowData.length; i++) { - if (allwindowData[i].indexOf('imageSource') != -1) { - // var subS = allwindowData[i].substring(allwindowData.indexOf('imageSource'), allwindowData[i].length - 1); - // var subS1 = allwindowData[i].split('imageSource'); - // windowData = JSON.parse(subS1[0]); - // imageSourc = subS1[1]; - - - windowData = JSON.parse(allwindowData[i]) - - if (windowData.mType == "MY_PICTURES") { - $rootScope.windowsimageSource = windowData.imageSource; - $rootScope.windowstitle = windowData.windowTitle; - $scope.openImagePanel(); + windowData = JSON.parse(allwindowData[i]); + if (windowData.mType == "MY_PICTURES") { + ModuleService.setModuleData(windowData, PicWindowId); + PicWindowId = PicWindowId + 1; + + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); } } - else { - - windowData = JSON.parse(allwindowData[i]) + else if (windowData.mType == "DISSECTIBLE_ANATOMY") { + ModuleService.setModuleData(windowData, DawindowId); + DawindowId = DawindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); - // **** Use this code when all module complted - // var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - // if (isFound == -1) { - // $scope.LoadModuleName.push(windowData.mType); - // } - - if (windowData.mType == "DISSECTIBLE_ANATOMY") { - ModuleService.setModuleData(windowData, DawindowId); - DawindowId = DawindowId + 1; - - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); - - } - - } - else if (windowData.mType == "ATLAS_ANATOMY") { - ModuleService.setModuleData(windowData, AtlasWindowId); - AtlasWindowId = AtlasWindowId + 1; - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); - } - } - else if (windowData.mType == "CLINICAL_ILLUSTRATIONS") { - ModuleService.setModuleData(windowData, CIWindowId); - CIWindowId = CIWindowId + 1; - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); - } - } - else if (windowData.mType == "CLINICAL_ANIMATIONS") { - ModuleService.setModuleData(windowData, CAWindowId); - CAWindowId = CAWindowId + 1; - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); - } - } - else if (windowData.mType == "THREE_D_ANATOMY") { - ModuleService.setModuleData(windowData, ThreeDWindowId); - ThreeDWindowId = ThreeDWindowId + 1; - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); - } } } - } - } - else { - // single window - windowData = JSON.parse(allwindowData); - - if (windowData.mType == "MY_PICTURES") { - $rootScope.windowsimageSource = windowData.imageSource; - $rootScope.windowstitle = windowData.windowTitle; - $scope.openImagePanel(); - - } - else if (windowData.mType == "DISSECTIBLE_ANATOMY") { - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); + else if (windowData.mType == "ATLAS_ANATOMY") { + ModuleService.setModuleData(windowData, AtlasWindowId); + AtlasWindowId = AtlasWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } } - - ModuleService.setModuleData(windowData, DawindowId); - } - else if (windowData.mType == "ATLAS_ANATOMY") { - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); + else if (windowData.mType == "CLINICAL_ILLUSTRATIONS") { + ModuleService.setModuleData(windowData, CIWindowId); + CIWindowId = CIWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } } - ModuleService.setModuleData(windowData, AtlasWindowId); - } - else if (windowData.mType == "CLINICAL_ILLUSTRATIONS") { - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); + else if (windowData.mType == "CLINICAL_ANIMATIONS") { + ModuleService.setModuleData(windowData, CAWindowId); + CAWindowId = CAWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } } - ModuleService.setModuleData(windowData, CIWindowId); - - } - else if (windowData.mType == "CLINICAL_ANIMATIONS") { - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); + else if (windowData.mType == "THREE_D_ANATOMY") { + ModuleService.setModuleData(windowData, ThreeDWindowId); + ThreeDWindowId = ThreeDWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } } - ModuleService.setModuleData(windowData, CAWindowId); - - } - else if (windowData.mType == "THREE_D_ANATOMY") { - var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) - if (isFound == -1) { - $scope.LoadModuleName.push(windowData.mType); + else if (windowData.mType == "ADAM_IMAGES") { + ModuleService.setModuleData(windowData, ADAMIMGWindowId); + ADAMIMGWindowId = ADAMIMGWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } + } + else if (windowData.mType == "LAB_EXERCISE") { + ModuleService.setModuleData(windowData, LabWindowId); + LabWindowId = LabWindowId + 1; + var isFound = jQuery.inArray(windowData.mType, $scope.LoadModuleName) + if (isFound == -1) { + $scope.LoadModuleName.push(windowData.mType); + } } - ModuleService.setModuleData(windowData, ThreeDWindowId); - } - } - + // intially call module at index 0 $scope.$emit("LoadModuleComplete", ""); @@ -1890,10 +1795,35 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ case "LAB_EXERCISE": $scope.loadLabExerciseModule(moduleName); break; + case "MY_PICTURES": + $scope.loadMyPictureModule(moduleName); + break; } } + $scope.loadMyPictureModule = function (moduleName) { + + var picData = ModuleService.getModuleData(moduleName); + + if (picData != undefined && picData.length > 0) { + $rootScope.isCallFromOtherModule = true; + + var picSectionExist = document.getElementById('picCustomModuleDiv'); + + if (picSectionExist == null) { + $('#cbparentcustomDiv').append($('
')); + $e = $('#picCustomModuleDiv').append(""); + $compile($e)($scope); + } + else { + // open lab panel on same slide by open resource + $rootScope.OpenMyPictureViewMain(); + } + + } + } + $scope.loadLabExerciseModule = function (moduleName) { var labData = ModuleService.getModuleData(moduleName); @@ -2196,7 +2126,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } //Save DISSECTIBLE_ANATOMY activity for CB - $scope.saveCIWindowActivity = function (currentId) { + $scope.saveCIWindowActivity = function (isNotSaved) { if ($rootScope.CIWindowData != undefined && $rootScope.CIWindowData.length > 0 ) { for (var i = 0; i < $rootScope.CIWindowData.length; i++) { $scope.updatedWindowListForSaveCB.push({ @@ -2224,13 +2154,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ }); } + if(isNotSaved) $rootScope.CIWindowData = []; } } //Save CLINICAL_ANIMATIONS activity for CB - $scope.saveCAWindowActivity = function (currentId) { + $scope.saveCAWindowActivity = function (isNotSaved) { if ($rootScope.CAWindowData != undefined && $rootScope.CAWindowData.length > 0) { for (var i = 0; i < $rootScope.CAWindowData.length; i++) { $scope.updatedWindowListForSaveCB.push({ @@ -2258,12 +2189,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ }); } + if(isNotSaved) $rootScope.CAWindowData = []; } } //Save THREE_D_ANATOMY activity for CB - $scope.save3DWindowActivity = function (currentId) { + $scope.save3DWindowActivity = function (isNotSaved) { if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) { for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) { $scope.updatedWindowListForSaveCB.push({ @@ -2293,44 +2225,46 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ }); } + if(isNotSaved) $rootScope.TheeDWindowData = []; } } //Save MY_PICTURES activity for CB - $scope.saveMyPictureWindowActivity = function (currentId) { - // if ($rootScope.TheeDWindowData != undefined && $rootScope.TheeDWindowData.length > 0) { - for (var i = 0; i < $rootScope.TheeDWindowData.length; i++) { + $scope.saveMyPictureWindowActivity = function (isNotSaved) { + for (var i = 0; i < $rootScope.PICWindowData.length; i++) { $scope.updatedWindowListForSaveCB.push({ - - containsCapturedContent: true,//$rootScope.TheeDWindowData[i] // N - //annotationData: "",//$rootScope.TheeDWindowData[i] N + + containsCapturedContent: true, + annotationData: $rootScope.PICWindowData[i].annotationData, contextMenu: { lockResize: true, hideTitleBar: true }, position: { - top: $rootScope.TheeDWindowData[i].top, - left: $rootScope.TheeDWindowData[i].left, + top: $rootScope.PICWindowData[i].top, + left: $rootScope.PICWindowData[i].left, }, size: { - height: $rootScope.TheeDWindowData[i].height, - width: $rootScope.TheeDWindowData[i].width + height: $rootScope.PICWindowData[i].height, + width: $rootScope.PICWindowData[i].width }, - imageId: $rootScope.TheeDWindowData[i].imageId, - minimised: $rootScope.TheeDWindowData[i].minimised, - windowTitle: $rootScope.TheeDWindowData[i].currentViewTitle, - maximised: $rootScope.TheeDWindowData[i].maximised, - mType: $rootScope.TheeDWindowData[i].moduleName, - id: $rootScope.TheeDWindowData[i].imageId, - windowListId: 0, //$rootScope.TheeDWindowData[i] // N + imageId: $rootScope.PICWindowData[i].imageId, + minimised: $rootScope.PICWindowData[i].minimised, + windowTitle: $rootScope.PICWindowData[i].currentViewTitle, + maximised: $rootScope.PICWindowData[i].maximised, + mType: $rootScope.PICWindowData[i].moduleName, + id: $rootScope.PICWindowData[i].imageId, + windowListId: 0, scrollPosition: { vertical: 0, horizontal: 0 }, - imageSource: "" + imageSource: $rootScope.PICWindowData[i].imageSource }); + } - //$rootScope.TheeDWindowData = []; - //} + if(isNotSaved) + $rootScope.PICWindowData = []; + } //Save ATLAS_ANATOMY activity for CB - $scope.saveAAWindowActivity = function () { + $scope.saveAAWindowActivity = function (isNotSaved) { if ($rootScope.AAWindowData != undefined && $rootScope.AAWindowData.length > 0) { for (var i = 0; i < $rootScope.AAWindowData.length; i++) { @@ -2376,12 +2310,13 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ }); } + if(isNotSaved) $rootScope.AAWindowData = []; } } //Save DISSECTIBLE_ANATOMY activity for CB - $scope.saveDAWindowActivity = function () { + $scope.saveDAWindowActivity = function (isNotSaved) { if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) { for (var i = 0; i < $rootScope.DaWindowData.length; i++) { @@ -2448,20 +2383,19 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ }); } + if(isNotSaved) $rootScope.DaWindowData = []; } } - $scope.updateWindowsContentForSaveCB = function (currentId) { - - $scope.saveDAWindowActivity(currentId); - $scope.saveAAWindowActivity(currentId); - $scope.saveCIWindowActivity(currentId); - $scope.saveCAWindowActivity(currentId); - $scope.save3DWindowActivity(currentId); - - //$scope.savePicWindowActivity($scope.windowDataforCB); - //if ($scope.updatedWindowListForSaveCB.length > 0) { + $scope.updateWindowsContentForSaveCB = function (currentId,isNotSaved) { + $scope.saveMyPictureWindowActivity(isNotSaved); + $scope.saveDAWindowActivity(isNotSaved); + $scope.saveAAWindowActivity(isNotSaved); + $scope.saveCIWindowActivity(isNotSaved); + $scope.saveCAWindowActivity(isNotSaved); + $scope.save3DWindowActivity(isNotSaved); + findKeyForChange($rootScope.contentNotesForSaveCB, currentId); $scope.selectedKey.windows.window = []; if ($scope.updatedWindowListForSaveCB.length > 0) { @@ -2473,7 +2407,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ } } - //} $scope.updatedWindowListForSaveCB = []; console.log($rootScope.contentNotesForSaveCB); } @@ -2482,6 +2415,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $scope.loadResourceOnCurrentSlide = function (newWindowData) { var newwindowNo = 0; + $scope.LoadModuleName=[]; var ExistData = ModuleService.getModuleData(newWindowData.mType); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index d7a4d76..44f6251 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -109,6 +109,74 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data var isfilloptionChecked = ""; var isOutlineOptionChecked = ""; + $rootScope.OpenMyPicture = function () { + $rootScope.CloseListManager(); + $rootScope.CloseAnnotationTool(); + + // close list if opened in DA + var searchedTermListPopUp = $("#HomeContainerDiv").find("div[id*='searchedTermListPopUp']"); + for (var i = 0 ; i < searchedTermListPopUp.length; i++) { + var windowviewid = (searchedTermListPopUp[i].id).split('_')[1]; + $('#searchedTermListPopUp_' + windowviewid).css('display', 'none'); + $('#searchedTermListPopUp_' + windowviewid).css("visibility", "hidden"); + $('#searchTermListUl_' + windowviewid).empty(); + } + + var fileupload = document.getElementById("myPictureFile"); + $timeout(function () { + $(fileupload).trigger('click'); + }, 300); + + $(fileupload).val('');//old file path + fileupload.onchange = function (e) { + + var fileId, file, objFileRead; + if (typeof window.FileReader !== 'function') { + alert("The file API isn't supported on this browser yet."); + return; + } + fileId = document.getElementById('myPictureFile'); + 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]; + var extension = file.name.split(".")[1]; + if (extension == "jpg" || extension == "jpeg" || extension == "png") { + + var reader = new FileReader(); + reader.onloadend = function () { + + //set default module data + var PicOpenData = { + "mType": 'MY_PICTURES', + "imageSource":reader.result, + "windowTitle": file.name.split(".")[0], + "size": { height: 500, width: 800 } + }; + AIAModuleOpenResourceInfo(PicOpenData); + + } + if (file) { + reader.readAsDataURL(file); + } + } + else + { + alert("Please select a file format type jpg/jpeg or png"); + } + + } + }; + + } + $rootScope.openResource = function () { $rootScope.CloseListManager(); @@ -261,9 +329,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $scope.AIAModuleOpenResourceInfo = function (newWindowData) { - $timeout(function () { + $timeout(function () { if(newWindowData.mType=="cbFileData") - { + { // when override exist cb $rootScope.isCallFromOtherModule = false; sessionStorage.setItem("ExitsCBFileDetail", JSON.stringify(newWindowData)); $location.url('/curriculum-builder'); @@ -288,12 +356,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data ModuleService.setModuleData(newWindowData, newwindowNo); } - - if ($location.url() == "/curriculum-builder") { - - // open exist cb here - } - else if ($location.url() == "/curriculum-builder-detail") { + + if ($location.url() == "/curriculum-builder-detail") { window.parent.AIAModuleOpenResoureInCB(newWindowData); } @@ -424,6 +488,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data } break; + case "MY_PICTURES": + var picSectionExist = document.getElementById('picCustomModuleDiv'); + + if (picSectionExist == null ||picSectionExist==undefined) { + $(BasemoduleDivId).append($('
')); + var html = $('#picCustomModuleDiv').append(""); + $compile(html)($scope); + } + else { + // open another picture + $rootScope.OpenMyPictureViewMain(); + } + + break; } } @@ -1696,7 +1774,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#labExPdfOption").addClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1716,7 +1794,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#optiontSetting").addClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1734,7 +1812,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#annotationToolBarOptions").removeClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1752,7 +1830,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#optionsListManagerTab").addClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1774,7 +1852,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $rootScope.saveCurriculam = "saveCurriculam"; $("#labExPdfOption").addClass("disableSubMenu"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").addClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $("#fileMenuAnchor").removeClass("disableFileMenu"); $rootScope.exportImage = "exportImage"; @@ -1788,7 +1866,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $rootScope.openCurriculum = ""; $rootScope.saveCurriculam = ""; $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); + $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.exportImage = "exportImage"; } @@ -1801,7 +1880,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#optiontSetting").addClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1819,7 +1898,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#optionsListManagerTab").addClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1836,7 +1915,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#optionsListManagerTab").addClass("disableSubMenu"); $("#fileMenuAnchor").removeClass("disableFileMenu"); $("#openResourceId").removeClass("openResources"); - $rootScope.OpenPitures = "OpenPitures"; + $("#openPictureId").removeClass("OpenPitures"); $rootScope.disableMenuoption = "disableMenuoption"; $rootScope.newCurriculum = "newCurriculum"; $rootScope.openCurriculum = "openCurriculum"; @@ -1942,6 +2021,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $("#Menuoptionid").removeClass("disableMenuoption"); $("#annotationToolBarOptions").removeClass("disableSubMenu"); } + else if(paneld.match('picImagePanel')) + { + $("#annotationButton").removeClass("disableMenuoption"); + $("#Menuoptionid").removeClass("disableMenuoption"); + $("#annotationToolBarOptions").removeClass("disableSubMenu"); + } else if(paneld.match('ciImagePanel')) { $("#annotationButton").removeClass("disableMenuoption"); @@ -1968,7 +2053,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $rootScope.resetMenuOption = function () { $timeout(function () { $rootScope.disableTopMenuOption(); - //if ($location.url() != "/curriculum-builder-detail") { var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { @@ -1976,19 +2060,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $rootScope.enableTopMenuOption(paneld); } } - - // } + }, 500); } // enable/disable option Panel click - $rootScope.resetMenuOptionOnClick = function (moduleName) { - //if ($location.url() != "/curriculum-builder-detail") { - $rootScope.disableTopMenuOption(); + $rootScope.resetMenuOptionOnClick = function (moduleName) { + $rootScope.disableTopMenuOption(); + $rootScope.enableTopMenuOption(moduleName); - $rootScope.enableTopMenuOption(moduleName); - // } - } // CB: reset panel top position when if any module closed @@ -2000,10 +2080,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data firsttopPosition = 680; } - // if ($location.url() != "/curriculum-builder-detail") { - $rootScope.disableTopMenuOption(); - // } - + $rootScope.disableTopMenuOption(); + var moduleImagePanel = $("div[id*='ImagePanel']"); if (moduleImagePanel.length > 0) { @@ -2024,20 +2102,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data } //Reset menu option like list manager,annotation when close module - - // if ($location.url() != "/curriculum-builder-detail") { - var moduleName = moduleImagePanel[index].id; - $rootScope.enableTopMenuOption(moduleName); - // } - + var moduleName = moduleImagePanel[index].id; + $rootScope.enableTopMenuOption(moduleName); + } } - - //if ($location.url() != "/curriculum-builder-detail") { + // list manger already open then refresh it or close $scope.updateListManagerView(panelName); - // } - + }, 500); } @@ -2172,18 +2245,17 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; var PanelElement= $scope.GetPanelElement(paneld); - var canvasPaintElement = PanelElement.canvasPaintElement; - if (canvasPaintElement == undefined) continue; + var canvasElement = PanelElement.canvasElement; + if (canvasElement == undefined) continue; - $scope.onDrawingCanvasOnModule(PanelElement.canvasElement); + $scope.onDrawingCanvasOnModule(canvasElement); - var canvasPaintId = canvasPaintElement.id; $rootScope.isAnnotatiomToolBarPopupActive = true; $rootScope.isAnnotatiomToolBarPopupClosed = false; $rootScope.isAnnotaionToolBarDrawingModeActive = false; @@ -2241,14 +2313,16 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data else if(paneld.match("ciImagePanel")) { $rootScope.ciAnnotationToolEvent(MultiWinId); - // $scope.loadpaintonshow(canvasPaintId); - } else if(paneld.match("aiImagePanel")) { $rootScope.aiAnnotationToolEvent(MultiWinId); } + else if(paneld.match("picImagePanel")) + { + $rootScope.picAnnotationToolEvent(MultiWinId); + } } } @@ -2299,11 +2373,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; - + if (paneld.match("daImagePanel")) { if ($("#transparencyScale_" + MultiWinId).css("display") == "block") { @@ -2387,7 +2461,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -2561,7 +2635,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { $rootScope.switchCanvas(paneld); if(paneld.match("AAImagePanel")) @@ -2632,7 +2706,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -2696,7 +2770,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -2740,7 +2814,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { $rootScope.switchCanvas(paneld); if(paneld.match("AAImagePanel")) @@ -2766,7 +2840,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -2828,7 +2902,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -2910,7 +2984,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; // var MultiWinId = (paneld).split("_")[len - 1]; @@ -3098,7 +3172,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -3139,7 +3213,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -3179,7 +3253,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -3218,7 +3292,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -3360,11 +3434,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data PanelElement.canvasPaintElement = document.getElementById('canvasPaintAI_' + MultiWinId); PanelElement.canvasDivElement = document.getElementById('canvasDivAI_' + MultiWinId); } - else if (paneld.match("CBSourceImagePanel")) { - // for my picture - PanelElement.canvasDivElement = document.getElementById('ImageDiv'); + else if (paneld.match("picImagePanel")) { + PanelElement.canvasElement=document.getElementById('canvasPIC_' + MultiWinId); + PanelElement.canvasPaintElement = document.getElementById('canvasPaintPIC_' + MultiWinId); + PanelElement.canvasDivElement = document.getElementById('canvasDivPIC_' + MultiWinId); } - + return PanelElement; } @@ -3379,7 +3454,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { if ($("#annotationpaintbrushsize").hasClass('activebtncolor')) { $("#annotationpaintbrushsize").removeClass('activebtncolor') @@ -3574,7 +3649,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -3595,6 +3670,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data { $rootScope.aiAnnotationToolEvent(MultiWinId); } + else if(paneld.match("picImagePanel")) + { + $rootScope.picAnnotationToolEvent(MultiWinId); + } //for paint brush $rootScope.switchCanvasToPaintCanvas(paneld); @@ -5331,7 +5410,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $scope.onDrawingCanvasOnModule = function (annotationCanvas) { //remove old event listener - //event code modified .work of only DA,AA,CI,AI + //event code modified .work of only DA,AA,CI,AI,PIC annotationCanvas.removeEventListener("mousedown", $rootScope.OnPaintCanvasMouseDown); annotationCanvas.removeEventListener("touchstart", $rootScope.OnPaintCanvasMouseDown); annotationCanvas.removeEventListener("mouseup", $rootScope.OnPaintCanvasMouseUp); @@ -5694,7 +5773,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -5928,7 +6007,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $('#bodySystems').empty(); $('#termList').empty(); $('#viewName').empty(); - var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='ThreeDImagePanel']").not("div[id*='ciImagePanel']").not("div[id*='aiImagePanel']").not("div[id*='labImagePanel']"); + var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='ThreeDImagePanel']").not("div[id*='ciImagePanel']").not("div[id*='aiImagePanel']").not("div[id*='picImagePanel']"); if (modulePanel != undefined && modulePanel.length>0) { for (var i = 0 ; i < modulePanel.length; i++) { var paneld = modulePanel[i].id; @@ -5954,7 +6033,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data $('#bodySystems').empty(); $('#termList').empty(); $('#viewName').empty(); - var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='ThreeDImagePanel']").not("div[id*='ciImagePanel']").not("div[id*='aiImagePanel']").not("div[id*='labImagePanel']"); + var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']").not("div[id*='caImagePanel']").not("div[id*='ThreeDImagePanel']").not("div[id*='ciImagePanel']").not("div[id*='aiImagePanel']").not("div[id*='labImagePanel']").not("div[id*='picImagePanel']"); if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; @@ -6079,7 +6158,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; @@ -6767,7 +6846,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data imageToPrint.src = dataURL; - OpenJSPanel(); // open jsPanel here + OpenJSPanel(panelTitle); // open jsPanel here if ($('#jsPanel-1').length > 0) { // $('.jsPanel-btn-norm').attr('style', 'display: block'); } @@ -6900,7 +6979,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data } - function OpenJSPanel() { + function OpenJSPanel(panelTitle) { var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']"); if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { @@ -6922,7 +7001,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data ajax: { url: 'app/views/home/printPreview.html' }, - title: $rootScope.getLocalStorageValue("currentViewTitle"), + title: panelTitle, position: { top: 70, left: 1, @@ -7187,7 +7266,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data if (modulePanel != undefined && modulePanel.length>0) { for (var index = 0 ; index < modulePanel.length; index++) { var paneld = modulePanel[index].id; - if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")) + if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel")) { var len = (paneld).split("_").length; var MultiWinId = (paneld).split("_")[len - 1]; diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js new file mode 100644 index 0000000..0646e86 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js @@ -0,0 +1,375 @@ +'use strict'; + +AIA.controller("MyPictureController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout","ModuleService", "$interval", +function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout, ModuleService, $interval) { + + $scope.initializePICWindowData = function (windowviewid, isOpenWithExistsModule, openPanelNo) { + if (isOpenWithExistsModule || openPanelNo == 0) { + if ($rootScope.PICWindowData != undefined) { + $rootScope.PICWindowData.length = 0; + } + else { + $rootScope.PICWindowData = []; + } + + $rootScope.PICWindowData.push( + { + 'multiwinid': windowviewid, + 'imageSource': [], + 'moduleName': '', + 'currentViewTitle': '', + 'parentSlugName': '', + 'currentSlug': '', + 'imageId': '', + 'top': 0, + 'left': 0, + 'width': 0, + 'height': 0, + 'minimised': false, + 'maximised': false, + 'annotationData':{shapeStates:[],paintCanvasState:[]}, + }); + + } + else { + var isNewWindow = true; + for (var k = 0; k < $rootScope.PICWindowData.length; k++) { + if ($rootScope.PICWindowData[k].multiwinid == windowviewid) { + isNewWindow = false; + break; + } + } + + if (isNewWindow) { + $rootScope.PICWindowData.push( + { + 'multiwinid': windowviewid, + 'imageSource': [], + 'moduleName': '', + 'currentViewTitle': '', + 'parentSlugName': '', + 'currentSlug': '', + 'imageId': '', + 'top': 0, + 'left': 0, + 'width': 0, + 'height': 0, + 'minimised': false, + 'maximised': false, + 'annotationData':{shapeStates:[],paintCanvasState:[]}, + }); + + } + } + } + + $scope.GetPICwindowStoreData = function (windowviewid, keyname) { + for (var x = 0 ; x < $rootScope.PICWindowData.length; x++) { + + if ($rootScope.PICWindowData[x].multiwinid == windowviewid) { + return $rootScope.PICWindowData[x][keyname]; + } + } + } + + $scope.SetPICwindowStoreData = function (windowviewid, keyname, value) { + for (var x = 0 ; x < $rootScope.PICWindowData.length; x++) { + + if ($rootScope.PICWindowData[x].multiwinid == windowviewid) { + $rootScope.PICWindowData[x][keyname] = value; + } + } + } + + // access from home controller + $rootScope.GetPICwindowData=function(windowviewid,keyname) + { + for(var x=0 ;x < $rootScope.PICWindowData.length;x++){ + + if($rootScope.PICWindowData[x].multiwinid==windowviewid) + { + return $rootScope.PICWindowData[x][keyname]; + } + } + } + // access from home controller + $rootScope.SetPICwindowData=function(windowviewid,keyname,data) { + for(var x=0 ;x < $rootScope.PICWindowData.length;x++){ + + if($rootScope.PICWindowData[x].multiwinid==windowviewid) + { + $rootScope.PICWindowData[x][keyname]=data; + } + } + } + + $scope.RemoveJSPanel = function (panelid) { + + var len = (panelid).split("_").length; + var windowviewid = (panelid).split("_")[len - 1]; + + // remove old stored data after close panel + for (var index = 0 ; index < $rootScope.PICWindowData.length; index++) { + + if ($rootScope.PICWindowData[index].multiwinid == windowviewid) { + + if (index != -1) { + // remove module which one is loaded + $scope.PICWindowData.splice(index, 1); + if ($('#' + panelid).html() != undefined) { + + $('#' + panelid).remove(); + + } + $rootScope.resetjsPanelTop(panelid); + } + } + } + } + $scope.PanelActivity = function () { + + $("#" + $scope.jsPanelID).resizable({ + stop: function (event, ui) { + var len = (event.currentTarget.id).split("_").length; + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; + $scope.SetPICwindowStoreData(windowviewid, 'width', ui.size.width); + $scope.SetPICwindowStoreData(windowviewid, 'height', ui.size.height); + } + }); + + $("#" + $scope.jsPanelID).draggable({ + stop: function (event, ui) { + var len = (event.currentTarget.id).split("_").length; + var windowviewid = (event.currentTarget.id).split("_")[len - 1]; + //var offSets = $(this).offset(); var postions = (this).position(); (this).offsetTop (this).offsetLeft + $scope.SetPICwindowStoreData(windowviewid, 'top', ui.position.top); + $scope.SetPICwindowStoreData(windowviewid, 'left', ui.position.left); + } + }); + // close panel + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { + + var panelid = $(event.target).parent().parent().parent().parent().attr('id'); + + $scope.RemoveJSPanel(panelid); + + }); + } + + $rootScope.OpenMyPictureViewMain = function () { + if ($rootScope.isCallFromOtherModule) { + $scope.PicModuleData = ModuleService.getModuleData("MY_PICTURES"); + $scope.readyToLoad = true; + $rootScope.PicLoadComplete = false; + $scope.wincount = 1; + var winlen = $scope.PicModuleData.length; + var timeint = null; + timeint = $interval(function () { + + if ($scope.readyToLoad == true) { + var windata = $scope.PicModuleData[$scope.wincount - 1]; + $scope.OpenPictureView(windata); + + } + $scope.readyToLoad = false; + if ($scope.wincount < winlen && $rootScope.PicLoadComplete == true) { + $scope.wincount = $scope.wincount + 1; + $rootScope.PicLoadComplete = false; + $scope.readyToLoad = true; + } + + if ($scope.wincount == winlen && $rootScope.PicLoadComplete == true) { + $scope.stopInterval(); + $scope.$emit("LoadModuleComplete", "MY_PICTURES"); + } + + + }, 100); + + $scope.stopInterval = function () { + if (angular.isDefined(timeint)) { + $interval.cancel(timeint); + timeint = undefined; + } + + }; + + } + + } + + $scope.OpenPictureView = function (picModuleData) { + + $scope.picOpenInOtherModules = picModuleData; + $rootScope.MULTI_VIEW_ID += 1; + var windowviewid = $rootScope.MULTI_VIEW_ID; + + $scope.initializePICWindowData(windowviewid, false, $scope.picOpenInOtherModules.currentWindowId); + + var moduleName = $scope.picOpenInOtherModules.mType; + $scope.SetPICwindowStoreData(windowviewid, 'moduleName', moduleName); + // serial no of imageid + var imageId = $scope.picOpenInOtherModules.id; + + $scope.SetPICwindowStoreData(windowviewid, 'imageId', imageId); + + var imageSource=$scope.picOpenInOtherModules.imageSource; + + $scope.SetPICwindowStoreData(windowviewid, 'imageSource', imageSource); + + var aiTitle = $scope.picOpenInOtherModules.anatomyTitle; + $scope.SetPICwindowStoreData(windowviewid, 'currentViewTitle', aiTitle); + localStorage.setItem("currentViewTitle", aiTitle); + var isMaximize = $scope.picOpenInOtherModules.maximised; + var isMinimize = $scope.picOpenInOtherModules.minimised; + $scope.SetPICwindowStoreData(windowviewid, 'maximised', isMaximize); + $scope.SetPICwindowStoreData(windowviewid, 'minimised', isMinimize); + + // store image for export + $rootScope.StoreTitleName(aiTitle); + $rootScope.StoreOrgImageName(aiTitle); + + $scope.SetPICwindowStoreData(windowviewid, 'parentSlugName', ($location.url()).replace('/', '')); + + $scope.loadMyPicture(windowviewid); + + } + + $scope.loadMyPicture = function (windowviewid) { + + $scope.jsPanelID = 'picImagePanel' + '_' + windowviewid; + + var selectedpicture = $scope.GetPICwindowStoreData(windowviewid, 'imageSource'); + + if (selectedpicture.indexOf('base64') == -1) { + selectedpicture="data:image/png;base64,"+selectedpicture; + } + var tittle = $scope.GetPICwindowStoreData(windowviewid, 'currentViewTitle'); + + // open JS panel for curriculum with define cornonate in CB jason + $scope.jsPanelWidth = $scope.picOpenInOtherModules.size.width;//1000; + $scope.jsPanelHeight = $scope.picOpenInOtherModules.size.height; + if ($scope.picOpenInOtherModules.size.height > 540) + $scope.jsPanelHeight = 540; + $scope.jsPanelLeft = 320; + $scope.jsPanelTop = $rootScope.cBModulejsPanelTop(); + if($location.url()!= "/curriculum-builder-detail") { + $scope.jsPanelLeft = 1; + } + + $scope.jsPanelPIC = $.jsPanel({ + id: $scope.jsPanelID, + selector: '.picView', + theme: 'success', + currentController: 'MyPictureController', + parentSlug: $scope.GetPICwindowStoreData(windowviewid, 'parentSlugName'), + content: '
' + + '
' + + '' + + + '
', + + title: tittle, + position: { + top: $scope.jsPanelTop, + left: $scope.jsPanelLeft + }, + + size: { + width: $scope.jsPanelWidth, + height: $scope.jsPanelHeight + }, + + }); + + $('#canvasDivPIC_' + windowviewid + ' img').load(function () { + + var isMaximize = $scope.GetPICwindowStoreData(windowviewid, 'maximised'); + var isMinimize = $scope.GetPICwindowStoreData(windowviewid, 'minimised'); + if (isMaximize) { + $scope.jsPanelPIC.maximize(); + } + else if (isMinimize) { + $scope.jsPanelPIC.minimize(); + } + else { + $scope.jsPanelPIC.normalize(); + } + $scope.SetPICwindowStoreData(windowviewid, 'top', $scope.jsPanelTop); + $scope.SetPICwindowStoreData(windowviewid, 'left', $scope.jsPanelLeft); + $scope.SetPICwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth); + $scope.SetPICwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight); + + + $scope.JsPanelclick(windowviewid); + $scope.$emit("cBEnableDisableMenuOption", $scope.jsPanelID); + + var canvas = document.getElementById("canvasPIC_" + windowviewid); + var canvasPaint = document.getElementById("canvasPaintPIC_" + windowviewid); + + canvas.height = $("#" + $scope.jsPanelID + " .jsPanel-content").height(); + canvasPaint.height = $("#" + $scope.jsPanelID + " .jsPanel-content").height(); + + var annotationData= $scope.picOpenInOtherModules.annotationData; + // load annotation + if(annotationData!="" && annotationData!=undefined) + { + if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0) + { + //first draw shape and then store in object + $rootScope.LoadCBSavedAnnotation("canvasPIC_"+windowviewid,"canvasPaintPIC_"+windowviewid,annotationData); + } + } + + $rootScope.PicLoadComplete = true; + }); + + $scope.SetPICwindowStoreData(windowviewid, 'currentSlug', 'my-picture'); + + $("#" + $scope.jsPanelID + " .img-thumbnail").css("min-height", $("#" + $scope.jsPanelID + " .jsPanel-content").height()); + $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important') + + $('#PicView').css("height", $(window).outerHeight() - 65); + + $('#PicView').css("width", $(window).outerWidth() - 15); + + var canvasDIvHeight = $("#" + $scope.jsPanelID + " .jsPanel-content").height(); + + $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight); + + $scope.PanelActivity(); + } + $rootScope.picAnnotationToolEvent = function (windowviewid) { + + $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(255,255,255)") + $('#editstylebackgroundcolor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" }); + $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", "rgb(0,0,0)") + $('#outlineColor .minicolors >.minicolors-panel > .minicolors-grid >.minicolors-picker').css({ "top": "145px", "left": "4px" }); + + $('#canvasPIC_'+windowviewid).css("display", "block"); + $('#canvasPaintPIC_'+windowviewid).css("display", "block"); + + } + + $scope.JsPanelclick = function (windowviewid) { + + //reset option list manager and annotation + //call when module loaded + $rootScope.resetMenuOption(); + + // call from while open module in CB + $("#picImagePanel_" + windowviewid).on('click', function (event) { + + var pnlName = event.currentTarget.id; + $rootScope.resetMenuOptionOnClick(pnlName); + $scope.$emit("cBEnableDisableMenuOption", pnlName); + + // store image for export while click on panel + + var currentViewTitle = $scope.GetPICwindowStoreData(windowviewid, 'currentViewTitle'); + $rootScope.StoreTitleName(currentViewTitle); + $rootScope.StoreOrgImageName(currentViewTitle); + }); + } + + }]) \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index e702fad..1b67b4d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -3280,41 +3280,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.SetAAwindowStoreData(windowviewid, 'left', ui.position.left); } }); - $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { - - var panelid = $(event.target).parent().parent().parent().parent().attr('id'); - - $scope.RemoveJSPanel(panelid); - - $scope.setActiveTab(parseInt($rootScope.getLocalStorageValue("activeTab"))); - $(".tools").css("z-index", "15000"); - - }); - - + $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) { var panelid = $(event.target).parent().parent().parent().parent().attr('id'); - var len = (panelid).split("_").length; - var windowviewid = (panelid).split("_")[len - 1]; - - // remove old stored data after close panel - for (var index = 0 ; index < $rootScope.AAWindowData.length; index++) { - - if ($rootScope.AAWindowData[index].multiwinid == windowviewid) { - - if (index != -1) { - // remove module which one is loaded - $scope.AAWindowData.splice(index, 1); - if ($('#' + panelid).html() != undefined) { - - $('#' + panelid).remove(); - - } - $rootScope.resetjsPanelTop(); - } - } - } + $scope.RemoveJSPanel(panelid); $scope.setActiveTab(parseInt($rootScope.getLocalStorageValue("activeTab"))); $(".tools").css("z-index", "15000"); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js b/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js index b3c4cce..5cd45d8 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/directives/AIADirectives.js @@ -46,4 +46,11 @@ AIA.directive('labExerciseDirective', function (ModuleService) { templateUrl: 'app/views/LabExerc/lab-exercise-view.html', } +}); +AIA.directive('myPictureDirective', function (ModuleService) { + return { + //restrict: 'E', + templateUrl: 'app/views/MyPicture/MyPicture.html', + + } }); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js index 30c4c13..67ec89c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js @@ -209,6 +209,14 @@ AIA.constant('pages', [ pageController: '3dAController' }, + { //added for mypicture + name: 'MyPicture', + pageSlug: 'my-picture', + pageUrl: 'app/views/MyPicture/MyPicture.html', + pageController: 'MyPictureController' + + }, + ]); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js index cd3d55d..3a23b41 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -15,6 +15,7 @@ moduleDataObj.CAData = []; moduleDataObj.ThreeDData = []; moduleDataObj.AIData = []; moduleDataObj.LabData = []; +moduleDataObj.PICData = []; AIA.service('ModuleService', function ($http, DataService) { return { @@ -150,12 +151,32 @@ AIA.service('ModuleService', function ($http, DataService) { return moduleDataObj.AIData; else if (moduleName == "LAB_EXERCISE") return moduleDataObj.LabData; + else if (moduleName == "MY_PICTURES") + return moduleDataObj.PICData; }, setModuleData: function (windowData, windowId) { - if (windowData.mType == "LAB_EXERCISE") { + if (windowData.mType == "MY_PICTURES") { + moduleDataObj.PICData.push({ + currentWindowId: windowId, + mType: windowData.mType, + containsCapturedContent: windowData.containsCapturedContent, + anatomyTitle: windowData.windowTitle, + scrollPosition: windowData.scrollPosition, + imageId: windowData.imageId, + imageSource: windowData.imageSource, + maximised: windowData.maximised, + minimised: windowData.minimised, + id: windowData.id, + position: windowData.position, + size: windowData.size, + contextMenu: windowData.contextMenu, + annotationData: windowData.annotationData + }); + } + else if (windowData.mType == "LAB_EXERCISE") { moduleDataObj.LabData.push({ currentWindowId: windowId, mType: windowData.mType, @@ -324,6 +345,7 @@ AIA.service('ModuleService', function ($http, DataService) { moduleDataObj.ThreeDData = []; moduleDataObj.AIData = []; moduleDataObj.LabData = []; + moduleDataObj.PICData = []; }, ClearWinDataByModule: function (moduleName) { @@ -353,7 +375,10 @@ AIA.service('ModuleService', function ($http, DataService) { else if (moduleName == "LAB_EXERCISE") { moduleDataObj.LabData = []; } - + else if (moduleName == "MY_PICTURES") { + moduleDataObj.PICData = []; + } + }, diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/MyPicture/MyPicture.html b/400-SOURCECODE/AIAHTML5.Web/app/views/MyPicture/MyPicture.html new file mode 100644 index 0000000..3c155d4 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/MyPicture/MyPicture.html @@ -0,0 +1,9 @@ +
+
+
+ +
\ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 96c32eb..cafad97 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -4,7 +4,7 @@