diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index e1d51b0..a06b344 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -5,6 +5,8 @@ AIA.controller("TileViewListController", ["$scope", "$rootScope", "$compile", "$ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, DataService,ModuleService) { + $rootScope.OpenedTileData=[]; + $scope.genderId = ""; $scope.BodyViewData; $scope.selectedGenderBodyViewData; @@ -133,37 +135,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo 'Medial Arm': '6' } - $scope.isBodylayerdataLoaded = false; - $scope.isBodyRegionDataLoaded = false; - //currentTitleFromJson shows the current BodyView Title - $scope.currentTitleFromJson; - $scope.showme = false; - $scope.IsVisible = function () { - $scope.scroll(); - - } - - $scope.scroll = function () { - // $window.scrollTo(0, 0); - $("html,body").scrollTop(0); - //alert("scroll"); - } - - - $scope.switchGender = function () { - - var retrievedObject = localStorage.getItem('currentViewTitle'); - - if (retrievedObject == "Male Anterior") { - $scope.male = "active"; - $scope.female = ""; - } - else if (retrievedObject == "Female Anterior") { - $scope.male = ""; - $scope.female = "active"; - } - } - $scope.loadForModuleById = function (moduleId) { alert('hi'); @@ -188,335 +159,36 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } $scope.openModuleItemView = function (event) { - //alert('openModuleItemView is called') - var moduleItemDataToBeSaved = event.target.id; - - var OpendTileData = []; + alert('openModuleItemView is called') + var moduleItemDataToBeSaved = event.target.id; - OpendTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); + $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); - $rootScope.imageName = OpendTileData[3]; + $rootScope.imageName = $rootScope.OpenedTileData[3]; - $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + OpendTileData[3]; - //alert('img Name: ' +$scope.OpenItemImageName); + $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; + alert('img Name: ' + $rootScope.OpenItemImageName); var u = $location.url(); $location.url('/module-item-view'); } - //get the DA body view list based on selected gender - //get the DA body view list based on selected gender - $scope.getDAViewList = function ($event) { - - - if ($('#MainImage') != null) { - $('#MainImage').remove(); - } - $rootScope.currentActiveModuleTitle = Modules[0].Name; - - alert('mod name: ' + Modules[0].Name) - - $("#bodyViewList").empty(); - //for default load - if ($event == null || $event == undefined) { - //if ((localStorage.getItem("genderId") != "")||(localStorage.getItem("genderId")!="null")) { - // $scope.genderId = localStorage.getItem("genderId"); - //} - var selectedGender = localStorage.getItem("genderId"); - if ((selectedGender == null)) { - $scope.genderId = "Male"; - } - else - $scope.genderId = localStorage.getItem("genderId"); - - } - else { - $scope.genderId = $event.currentTarget.id; - } - - localStorage.setItem("genderId", $scope.genderId); - - var selectedGender = localStorage.getItem("genderId"); - - if (selectedGender != null) { - if (selectedGender == "Male") { - $('#Male').addClass('active'); - $('#Female').removeClass("active"); - } - else { - $('#Female').addClass('active'); - $('#Male').removeClass("active"); - } - - } - - $scope.selectedGenderBodyViewData = new jinqJs() - .from($scope.BodyViewData.BodyViews.view) - .where('_gender == ' + $scope.genderId) - .select(); - - if ($scope.selectedGenderBodyViewData != null || $scope.selectedGenderBodyViewData != undefined) { - angular.forEach($scope.selectedGenderBodyViewData, function (value, key) { - - - var userEthnicity; - var userModestysettings; - var curentEthnicity = localStorage.getItem("globalEthnicity"); - if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) { - userEthnicity = curentEthnicity; - } - else { - userEthnicity = $rootScope.globalSetting.ethnicity; - } - - var curentmodesty = localStorage.getItem("globalModesty"); - if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) { - userModestysettings = curentmodesty; - } - else { - userModestysettings = $rootScope.globalSetting.modesty; - } - - - - //var userSelectedSkintone = 'W'; - //$scope.userModestySetting = 'Y' - var thumbnailImage; - if ((value._id == 1) || (value._id == 3) || (value._id == 5) || (value._id == 6) || (value._id == 7) || (value._id == 11)) - thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity + userModestysettings)) + '.jpg'; - else { - thumbnailImage = ((value._thumbnailImage).replace('.jpg', '_' + userEthnicity)) + '.jpg'; - - } - - $scope.imagePath = "~/../content/images/DA/" + $scope.zoomInOut + "/body-views/" + value._id + '/skintone/' + userEthnicity + '/' + thumbnailImage; - - - var $el = $('
' - + '' - + '

' + value._title + '

').appendTo('#bodyViewList'); - - - $compile($el)($scope); - $(".sidebar").mCustomScrollbar({ - autoHideScrollbar: true, - //theme:"rounded" - }); - - }); - } - - }; - $scope.openView = function ($event) { - alert('openView is called in AA') + $scope.openBodyView = function () + { debugger; - - $rootScope.MenuModuleName = "DA"; - //alert($rootScope.MenuModuleName); - $rootScope.isLoading = true; - $('#spinner').css('visibility', 'visible'); - - $rootScope.currentBodyViewId = $event.currentTarget.id; - $rootScope.ViewTitle = $event.currentTarget.textContent; - - localStorage.setItem("currentViewTitleFromJson", $event.currentTarget.textContent); - localStorage.setItem("currentViewTitle", $event.currentTarget.textContent); - localStorage.setItem("currentBodyViewId", $event.currentTarget.id); - - var u = $location.url(); - $location.url('/da-body-view'); - - var view_list = angular.element($event.currentTarget); - var view_list_male_female = view_list.attr('title'); - - if (($event.currentTarget.textContent == "Female Anterior" || $event.currentTarget.textContent == "Male Anterior")) { - $rootScope.AnteriorView = "active"; - $rootScope.LateralView = ""; - $rootScope.MedialView = ""; - $rootScope.PosteriorView = ""; - $rootScope.LateralArmView = ""; - $rootScope.MedialArmView = ""; - } - if (($event.currentTarget.textContent == "Female Lateral" || $event.currentTarget.textContent == "Male Lateral")) { - $rootScope.AnteriorView = ""; - $rootScope.LateralView = "active"; - $rootScope.MedialView = ""; - $rootScope.PosteriorView = ""; - $rootScope.LateralArmView = ""; - $rootScope.MedialArmView = ""; - - - } - if (($event.currentTarget.textContent == "Female Medial" || $event.currentTarget.textContent == "Male Medial")) { - $rootScope.AnteriorView = ""; - $rootScope.LateralView = ""; - $rootScope.MedialView = "active"; - $rootScope.PosteriorView = ""; - $rootScope.LateralArmView = ""; - $rootScope.MedialArmView = ""; - - - } - if (($event.currentTarget.textContent == "Female Posterior" || $event.currentTarget.textContent == "Male Posterior")) { - $rootScope.AnteriorView = ""; - $rootScope.LateralView = ""; - $rootScope.MedialView = ""; - $rootScope.PosteriorView = "active"; - $rootScope.LateralArmView = ""; - $rootScope.MedialArmView = ""; - - } - if (($event.currentTarget.textContent == "Female Lateral Arm" || $event.currentTarget.textContent == "Male Lateral Arm")) { - $rootScope.AnteriorView = ""; - $rootScope.LateralView = ""; - $rootScope.MedialView = ""; - $rootScope.PosteriorView = ""; - $rootScope.LateralArmView = "active"; - $rootScope.MedialArmView = ""; - - - } - if (($event.currentTarget.textContent == "Female Medial Arm" || $event.currentTarget.textContent == "Male Medial Arm")) { - $rootScope.AnteriorView = ""; - $rootScope.LateralView = ""; - $rootScope.MedialView = ""; - $rootScope.PosteriorView = ""; - $rootScope.LateralArmView = ""; - $rootScope.MedialArmView = "active"; - - - } - - //$rootScope.Normal = "LeftButtonsDefaultState"; - - if (view_list_male_female == "Male") { - - $rootScope.male = "active"; - $rootScope.female = ""; - } - else { - - $rootScope.male = ""; - $rootScope.female = "active"; - } - - - } - - - //load json data for body view - $scope.loadDissectibleAnatomyData = function () { - - alert('AA: loadDissectibleAnatomyData is called'); - - $rootScope.ClearIframe(); - - //load common data - var commondataJsonPath = '~/../content/data/json/da/da_dat_common.json'; - - DataService.getAnotherJson(commondataJsonPath) - .then( - function (result) { - - $rootScope.CommonData = result; - $http({ method: 'GET', url: '~/../content/data/json/da/da_dat_contentlist.json' }).success(function (data) { - - $scope.BodyViewData = data; - - $scope.getDAViewList(); - - }) - .error(function (data, status, headers, config) { - console.log(data); - }); - - - }, - function (error) { - console.log(error.statusText) - } - ) - //load body-views data - - - // $('#daLoaderLabel').css('visibility', 'hidden') - $rootScope.isLoading = false; - - - - //push the details of open module in array $rootScope.openModules - $rootScope.openModules.push({ "ModuleId": 1 }); - - - } - - $scope.openBodyView = function () { - - //0. we will initially append container to load body - - //check if localstorage has any settings - var curentEthnicity = localStorage.getItem("globalEthnicity"); - if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) { - $rootScope.globalSetting.ethnicity = curentEthnicity; - } - - var curentmodesty = localStorage.getItem("globalModesty"); - if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) { - $rootScope.globalSetting.modesty = curentmodesty - } - - //0.1 - var currentBodyViewId = localStorage.getItem("currentBodyViewId"); - - $scope.loadSearchDataForBodyView(); - - - console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); - - var openViews; - if ($rootScope.openViews != null || $rootScope.openViews != undefined) { - if ($rootScope.openViews.length > 0) { - openViews = new jinqJs() - .from($rootScope.openViews) - .where("BodyViewId == " + currentBodyViewId) - .select(); - } - } - - // 0.2 getting corresponding body view title - //var counter = 1; - var tittle = localStorage.getItem("currentViewTitleFromJson"); - localStorage.setItem("currentViewTitle", tittle); - - //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD - //if (openViews != null && openViews != undefined) { - // angular.forEach(openViews, function (value, key) { - - // if (value.bodyView == tittle) { - // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++; - // $rootScope.currentActiveViewTitle = tittle; - // localStorage.setItem("currentViewTitle", tittle); - // } - - // }); - //} - //else { - // localStorage.setItem("currentViewTitle", tittle); - //} - - //0.3 + alert('openBodyView is called') $.jsPanel({ - id: 'daImagePanel', - selector: '.daBodyView', + id: 'aaImagePanel', + selector: '.aaBodyView', theme: 'success', - currentController: 'DAController', - parentSlug: 'da-view-list', + currentController: 'TileViewListController', + parentSlug: 'tile-view', ajax: { - url: 'app/views/da/da-view.html' + url: 'app/views/aa/atlas-anatomy-detail.html' }, - title: localStorage.getItem("currentViewTitle"), + //title: localStorage.getItem("currentViewTitle"), position: { top: 70, @@ -527,187 +199,65 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }); - console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel')) + console.log('jsPanel loaded aaImagePanel exist= ' + document.getElementById('aaImagePanel')) //0.1 - $rootScope.currentSlug = 'da-body-view'; + // $rootScope.currentSlug = 'da-body-view'; //0.2 - $rootScope.openViews.push( - { - "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, - "slug": $rootScope.currentSlug - } - ); + //$rootScope.openViews.push( + // { + // "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, + // "slug": $rootScope.currentSlug + // } + // ); //0.3 - var daBodyviewElement = angular.element(document.getElementById("daBodyview")); + var aaViewElement = angular.element(document.getElementById("aaView")); + + debugger; $timeout(function () { - $compile(daBodyviewElement.contents())($scope); + $compile(aaViewElement.contents())($scope); - console.log('html is compiled' + document.getElementById('daView')) - if (document.getElementById('daView') != null) { + //console.log('html is compiled' + document.getElementById('daView')) + if (document.getElementById('aaView') != null) { - //0.4 added some stylesheets - $('#daBodyview').css("height", $(window).outerHeight()); + alert('inside jsPanel') + ////0.4 added some stylesheets + //$('#daBodyview').css("height", $(window).outerHeight()); - $('#daBodyview').css("width", $(window).outerWidth()); + //$('#daBodyview').css("width", $(window).outerWidth()); - //1. load navigator man first - console.log('before LoadBodyViewNavigatorImage call') - $scope.LoadBodyViewNavigatorImage(); + ////1. load navigator man first + //console.log('before LoadBodyViewNavigatorImage call') + // $scope.LoadBodyViewNavigatorImage(); //$scope.loadSearchDataForBodyView(); - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); + //$scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - $scope.layerNumber = 0; + // $scope.layerNumber = 0; //2. - console.log('currentBodyViewId just before sending: ' + currentBodyViewId); - $scope.loadBodyViewData(currentBodyViewId); + // console.log('currentBodyViewId just before sending: ' + currentBodyViewId); + $scope.loadAAImage($rootScope.OpenItemImagePath); //2. load bodyRegion data - $rootScope.isLoading = true; - $rootScope.voId = localStorage.getItem("currentBodyViewId"); + //$rootScope.isLoading = true; + ////$rootScope.voId = localStorage.getItem("currentBodyViewId"); - $('#daBodyview').css("height", $(window).outerHeight()); + //$('#daBodyview').css("height", $(window).outerHeight()); - $('#daBodyview').css("width", $(window).outerWidth()); + //$('#daBodyview').css("width", $(window).outerWidth()); } }, 250); } + + $scope.loadAAImage = function (OpenedModuleItemPath) + { - //da-body-views functions - - //$scope.openBodyView = function () { - - // //0. we will initially append container to load body - - // //check if localstorage has any settings - // //var curentEthnicity = localStorage.getItem("globalEthnicity"); - // //if (typeof (curentEthnicity) !== "undefined" && curentEthnicity !== null) { - // // $rootScope.globalSetting.ethnicity = curentEthnicity; - // //} - - // //var curentmodesty = localStorage.getItem("globalModesty"); - // //if (typeof (curentmodesty) !== "undefined" && curentmodesty !== null) { - // // $rootScope.globalSetting.modesty = curentmodesty - // //} - - // //0.1 - // //var currentBodyViewId = localStorage.getItem("currentBodyViewId"); - - // //$scope.loadSearchDataForBodyView(); - - - // //console.log('currentBodyViewId pickjed from localStorage: ' + currentBodyViewId); - - // //var openViews; - // //if ($rootScope.openViews != null || $rootScope.openViews != undefined) { - // // if ($rootScope.openViews.length > 0) { - // // openViews = new jinqJs() - // // .from($rootScope.openViews) - // // .where("BodyViewId == " + currentBodyViewId) - // // .select(); - // // } - // //} - - // // 0.2 getting corresponding body view title - // //var counter = 1; - // //var tittle = localStorage.getItem("currentViewTitleFromJson"); - // //localStorage.setItem("currentViewTitle", tittle); - - // //WILL BE USED WHEN MULTI VIEWOPEN FUNCTIONALITY IS IMPELMNETD - // //if (openViews != null && openViews != undefined) { - // // angular.forEach(openViews, function (value, key) { - - // // if (value.bodyView == tittle) { - // // tittle = localStorage.getItem("currentViewTitleFromJson") + counter++; - // // $rootScope.currentActiveViewTitle = tittle; - // // localStorage.setItem("currentViewTitle", tittle); - // // } - - // // }); - // //} - // //else { - // // localStorage.setItem("currentViewTitle", tittle); - // //} - - // //0.3 - - // $.jsPanel({ - // id: 'daImagePanel', - // selector: '.daBodyView', - // theme: 'success', - // currentController: 'TileListViewController', - // parentSlug: 'tile-view-list', - // ajax: { - // url: 'app/views/aa/atlas-anatomy-detail.html' - // }, - // title: "abc", - - // position: { - // top: 70, - // left: 1, - // }, - - // size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, - - // }); - - // console.log('jsPanel loaded daImagePanel exist= ' + document.getElementById('daImagePanel')) - // //0.1 - // //$rootScope.currentSlug = 'da-body-view'; - - // //0.2 - // //$rootScope.openViews.push( - // // { - // // "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, - // // "slug": $rootScope.currentSlug - // // } - // // ); - - // //0.3 - // var daBodyviewElement = angular.element(document.getElementById("daBodyview")); - - // $timeout(function () { - // $compile(daBodyviewElement.contents())($scope); - - // console.log('html is compiled' + document.getElementById('daView')) - // if (document.getElementById('daView') != null) { - - // //0.4 added some stylesheets - // $('#daBodyview').css("height", $(window).outerHeight()); - - // $('#daBodyview').css("width", $(window).outerWidth()); - - // //1. load navigator man first - // console.log('before LoadBodyViewNavigatorImage call') - // // $scope.LoadBodyViewNavigatorImage(); - - // //$scope.loadSearchDataForBodyView(); - - // $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - - // $scope.layerNumber = 0; - - // //2. - - // //console.log('currentBodyViewId just before sending: ' + currentBodyViewId); - // // $scope.loadBodyViewData(currentBodyViewId); - - // //2. load bodyRegion data - // $rootScope.isLoading = true; - // $rootScope.voId = localStorage.getItem("currentBodyViewId"); - - // $('#daBodyview').css("height", $(window).outerHeight()); - - // $('#daBodyview').css("width", $(window).outerWidth()); - // } - // }, 250); - //} + } angular.element(document).ready(function (e) { $("#daImagePanel").resize(function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js index 42961be..4e8b606 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -45,6 +45,8 @@ AIA.service('ModuleService', function($http, DataService) { if (modName == ATLAS_ANATOMY) { + debugger; + var AADataForSelectedItem = []; var title = id; 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 c603caa..401ba2f 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 @@ -134,7 +134,7 @@ right: 0; } -
+
@@ -452,7 +452,7 @@ rootScope.$apply(function () { rootScope.isLoading = true; }) - var scope = angular.element(document.getElementById("daView")).scope(); + var scope = angular.element(document.getElementById("aaView")).scope(); scope.$apply(function () { if (scope.isTransparencyActivated) { rootScope.isLoading = false; @@ -524,7 +524,7 @@ orientation: "horizontal", stop: function (event, ui) { //alert('trans changed') - var scope = angular.element(document.getElementById("daView")).scope(); + var scope = angular.element(document.getElementById("aaView")).scope(); scope.$apply(function () { scope.onTransparencyChange(event, ui); }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html index 216e796..251bc5a 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html @@ -280,7 +280,7 @@
- +
@@ -408,6 +408,8 @@