diff --git a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx index 6272248..724238a 100644 --- a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx +++ b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx diff --git a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo index 2d5b389..19af432 100644 --- a/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo +++ b/350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 0239bf2..2f0ca3d 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -13,7 +13,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod $scope.AllBodySystem = []; $scope.AllOrientation = []; $scope.AllImageType = []; - $rootScope.moduleData = []; + $scope.moduleData = []; $scope.loadForModuleById = function (moduleId) { @@ -67,7 +67,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod angular.forEach($scope.data, function (value, key) { // $rootScope.moduleData = []; - $rootScope.moduleData.push({ "id": value._Id, "imageID": value._ImageId, "TileName": value._TileImageName, "DivImageTitle": value._Title }); + $scope.moduleData.push({ "id": value._Id, "imageID": value._ImageId, "TileName": value._TileImageName, "DivImageTitle": value._Title }); // $scope.moduleData.push(value._ImageId); // $scope.moduleData.push(value._TileImageName); @@ -112,15 +112,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod var moduleItemDataToBeSaved = []; - for(var i=0;i<=$rootScope.moduleData.length-1;i++) + for(var i=0;i<=$scope.moduleData.length-1;i++) { - if ($rootScope.moduleData[i].DivImageTitle == event.target.id) + if ($scope.moduleData[i].DivImageTitle == event.target.id) { - alert($rootScope.moduleData[i].imageID); + alert($scope.moduleData[i].imageID); - moduleItemDataToBeSaved.push($rootScope.moduleData[i].imageID, $rootScope.moduleData[i].id,$scope.moduleName); + moduleItemDataToBeSaved.push($scope.moduleData[i].imageID, $scope.moduleData[i].id,$scope.moduleName); } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js index 17d4113..32b1757 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -2,14 +2,17 @@ var CLINICAL_ILLUSTRATION = 'Clinical Illustrations'; var CLINICAL_ANIMATION = 'Clinical Animations'; var OpenedModuleItemList = []; +var ModDetail = []; -AIA.factory('ModuleService', function () +AIA.factory('ModuleService', function (DataService) { return { SaveOpenedModules: function (moduleDetails) { - OpenedModuleItemList.push("moduleId: "+ moduleDetails[0]); - OpenedModuleItemList.push("Id:" + moduleDetails[1]); + ModDetail = moduleDetails; + + OpenedModuleItemList.push("imageId: "+ moduleDetails[0]); + OpenedModuleItemList.push("moduleId:" + moduleDetails[1]); OpenedModuleItemList.push("moduleName: " + moduleDetails[2]); @@ -42,23 +45,33 @@ AIA.factory('ModuleService', function () var jsonFileForOpenModule; - if (OpenedModuleItemList[2] == ATLAS_ANATOMY) + if (ModDetail[2] == ATLAS_ANATOMY) { this.loadPinData(); } - else if (OpenedModuleItemList[2] == CLINICAL_ANIMATION) { + else if (ModDetail[2] == CLINICAL_ANIMATION) { } - else if (OpenedModuleItemList[3] == CLINICAL_ILLUSTRATION) { + else if (ModDetail[3] == CLINICAL_ILLUSTRATION) { } }, - loadPinData: function () - { - var pinJsonFile = "~/../content/data/json/aa/aa_pin_data/" + OpenedModuleItemList.imageID; - alert('pinJsonFile: ' + pinJsonFile); + loadPinData: function () { + var pinJsonFile = "/content/data/json/aa/aa_pin_data/aa_dat_pindata_" + ModDetail[0] + ".json"; + alert('pinJsonFile: ' + pinJsonFile); + var promise = DataService.getJson(pinJsonFile); + promise.then( + function (result) { + var AtlasAnatomyPinData = result; + + var data = new jinqJs() + .from(AtlasAnatomyPinData.root.Item) + //.orderBy([{ field: '_Title', sort: 'asc' }]) + .select(); + + }) } };