diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 2786ad2..352f475 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -1489,6 +1489,22 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ $('body,html').animate({ scrollTop: $('#' + selected_Id).position().top }, 500); } } + + + //open resoruce on slide + $scope.loadResourceOnCurrentSlide = function (id) { + + } + }] ); +function GetAIAModuleInformation(id) { + alert(id); + + var scope = angular.element(document.querySelector('[ng-controller="CurrBuildController"]')).scope(); + scope.$apply(function () { + scope.loadResourceOnCurrentSlide(id); + }); +} + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 8d2af9f..150dbb6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -493,16 +493,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $rootScope.isLoading = true; $('#spinner').css('visibility', 'visible'); - var u = $location.url(); + // var u = $location.url(); + var isopenResourceRequest = sessionStorage.getItem('isModuleOpenByOpenResource'); - if ($rootScope.isOpenResourceBtnClicked == true) { + if (isopenResourceRequest == "true") { // $rootScope.MULTI_VIEW_ID = $rootScope.MULTI_VIEW_ID + 1; - $rootScope.multiViewInfoIndex = 0; - $rootScope.multiViewInfo.push({ "Target": $event.currentTarget, "id": $rootScope.MULTI_VIEW_ID, "bodyViewID": $event.currentTarget.id, "bodyName": $event.currentTarget.textContent }); - // $rootScope.multiSearchData = []; - localStorage.setItem("multiViewInfo", JSON.stringify($rootScope.multiViewInfo)); - console.log($rootScope.multiViewInfo); - $location.url('/curriculum-builder-detail'); + //$rootScope.multiViewInfoIndex = 0; + //$rootScope.multiViewInfo.push({ "Target": $event.currentTarget, "id": $rootScope.MULTI_VIEW_ID, "bodyViewID": $event.currentTarget.id, "bodyName": $event.currentTarget.textContent }); + //// $rootScope.multiSearchData = []; + //localStorage.setItem("multiViewInfo", JSON.stringify($rootScope.multiViewInfo)); + //console.log($rootScope.multiViewInfo); + //$location.url('/curriculum-builder-detail'); + // $(document, parent.window.document).trigger('myCustomTrigger'); + + parent.GetDaViewId($event.currentTarget.id); + + parent.closeIFrame(); + } else { @@ -515,7 +522,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#spinner').css('visibility', 'hidden'); } - + //load json data for body view $scope.loadDissectibleAnatomyData = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 78871a2..a8861b7 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -127,6 +127,10 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A // break; //} + $rootScope.isModuleOpenByOpenResource = true; + + sessionStorage.setItem('isModuleOpenByOpenResource', 'true'); + $('#dvOpenResoucePanel').css('display', 'block'); // var homepath = $location.protocol() + "//" + $location.host() + ":" + $location.port() + "/"; @@ -142,7 +146,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A currentController: 'HomeController', parentSlug: 'curriculum-builder-detail', content: '