ADAM / AIAHTML5

Commit fe0ccb07207b10a08bc8e1bebb06661d7eda4e09

Authored by Amrita Vishnoi
1 parent e4aed70b

Module Service work in progress...

Inline Side-by-side
Showing 4 changed files with 29 additions and 16 deletions
150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx
View file @fe0ccb0
No preview for this file type
350-UTILITIES/Parser/XMLtoJSON_utility/XMLtoJSON_utility.v12.suo
View file @fe0ccb0
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @fe0ccb0
@@ -13,7 +13,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod @@ -13,7 +13,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
13 $scope.AllBodySystem = []; 13 $scope.AllBodySystem = [];
14 $scope.AllOrientation = []; 14 $scope.AllOrientation = [];
15 $scope.AllImageType = []; 15 $scope.AllImageType = [];
16 - $rootScope.moduleData = []; 16 + $scope.moduleData = [];
17 17
18 $scope.loadForModuleById = function (moduleId) { 18 $scope.loadForModuleById = function (moduleId) {
19 19
@@ -67,7 +67,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod @@ -67,7 +67,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
67 angular.forEach($scope.data, function (value, key) 67 angular.forEach($scope.data, function (value, key)
68 { 68 {
69 // $rootScope.moduleData = []; 69 // $rootScope.moduleData = [];
70 - $rootScope.moduleData.push({ "id": value._Id, "imageID": value._ImageId, "TileName": value._TileImageName, "DivImageTitle": value._Title }); 70 + $scope.moduleData.push({ "id": value._Id, "imageID": value._ImageId, "TileName": value._TileImageName, "DivImageTitle": value._Title });
71 // $scope.moduleData.push(value._ImageId); 71 // $scope.moduleData.push(value._ImageId);
72 // $scope.moduleData.push(value._TileImageName); 72 // $scope.moduleData.push(value._TileImageName);
73 73
@@ -112,15 +112,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod @@ -112,15 +112,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
112 var moduleItemDataToBeSaved = []; 112 var moduleItemDataToBeSaved = [];
113 113
114 114
115 - for(var i=0;i<=$rootScope.moduleData.length-1;i++) 115 + for(var i=0;i<=$scope.moduleData.length-1;i++)
116 { 116 {
117 117
118 - if ($rootScope.moduleData[i].DivImageTitle == event.target.id) 118 + if ($scope.moduleData[i].DivImageTitle == event.target.id)
119 { 119 {
120 120
121 - alert($rootScope.moduleData[i].imageID); 121 + alert($scope.moduleData[i].imageID);
122 122
123 - moduleItemDataToBeSaved.push($rootScope.moduleData[i].imageID, $rootScope.moduleData[i].id,$scope.moduleName); 123 + moduleItemDataToBeSaved.push($scope.moduleData[i].imageID, $scope.moduleData[i].id,$scope.moduleName);
124 } 124 }
125 125
126 } 126 }
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
  View file @fe0ccb0
@@ -2,14 +2,17 @@ @@ -2,14 +2,17 @@
2 var CLINICAL_ILLUSTRATION = 'Clinical Illustrations'; 2 var CLINICAL_ILLUSTRATION = 'Clinical Illustrations';
3 var CLINICAL_ANIMATION = 'Clinical Animations'; 3 var CLINICAL_ANIMATION = 'Clinical Animations';
4 var OpenedModuleItemList = []; 4 var OpenedModuleItemList = [];
  5 +var ModDetail = [];
5 6
6 -AIA.factory('ModuleService', function () 7 +AIA.factory('ModuleService', function (DataService)
7 { 8 {
8 return { 9 return {
9 SaveOpenedModules: function (moduleDetails) 10 SaveOpenedModules: function (moduleDetails)
10 { 11 {
11 - OpenedModuleItemList.push("moduleId: "+ moduleDetails[0]);  
12 - OpenedModuleItemList.push("Id:" + moduleDetails[1]); 12 + ModDetail = moduleDetails;
  13 +
  14 + OpenedModuleItemList.push("imageId: "+ moduleDetails[0]);
  15 + OpenedModuleItemList.push("moduleId:" + moduleDetails[1]);
13 OpenedModuleItemList.push("moduleName: " + moduleDetails[2]); 16 OpenedModuleItemList.push("moduleName: " + moduleDetails[2]);
14 17
15 18
@@ -42,23 +45,33 @@ AIA.factory(&#39;ModuleService&#39;, function () @@ -42,23 +45,33 @@ AIA.factory(&#39;ModuleService&#39;, function ()
42 45
43 var jsonFileForOpenModule; 46 var jsonFileForOpenModule;
44 47
45 - if (OpenedModuleItemList[2] == ATLAS_ANATOMY) 48 + if (ModDetail[2] == ATLAS_ANATOMY)
46 { 49 {
47 this.loadPinData(); 50 this.loadPinData();
48 51
49 } 52 }
50 - else if (OpenedModuleItemList[2] == CLINICAL_ANIMATION) { 53 + else if (ModDetail[2] == CLINICAL_ANIMATION) {
51 54
52 } 55 }
53 - else if (OpenedModuleItemList[3] == CLINICAL_ILLUSTRATION) { 56 + else if (ModDetail[3] == CLINICAL_ILLUSTRATION) {
54 57
55 } 58 }
56 59
57 }, 60 },
58 - loadPinData: function ()  
59 - {  
60 - var pinJsonFile = "~/../content/data/json/aa/aa_pin_data/" + OpenedModuleItemList.imageID;  
61 - alert('pinJsonFile: ' + pinJsonFile); 61 + loadPinData: function () {
  62 + var pinJsonFile = "/content/data/json/aa/aa_pin_data/aa_dat_pindata_" + ModDetail[0] + ".json";
  63 + alert('pinJsonFile: ' + pinJsonFile);
  64 + var promise = DataService.getJson(pinJsonFile);
  65 + promise.then(
  66 + function (result) {
  67 + var AtlasAnatomyPinData = result;
  68 +
  69 + var data = new jinqJs()
  70 + .from(AtlasAnatomyPinData.root.Item)
  71 + //.orderBy([{ field: '_Title', sort: 'asc' }])
  72 + .select();
  73 +
  74 + })
62 } 75 }
63 76
64 }; 77 };