ADAM / AIAHTML5

Commit c0ab4784d3f803df82a306fecdffec1d3c489ebc

Authored by Amrita Vishnoi
1 parent e7b3194d

Able to get data from module service to controller...

Inline Side-by-side
Showing 4 changed files with 33 additions and 134 deletions
150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx
View file @c0ab478
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
  View file @c0ab478
@@ -55,7 +55,8 @@ @@ -55,7 +55,8 @@
55 <Content Include="app\main\Link.js" /> 55 <Content Include="app\main\Link.js" />
56 <Content Include="app\services\AuthenticationService.js" /> 56 <Content Include="app\services\AuthenticationService.js" />
57 <Content Include="app\services\DataService.js" /> 57 <Content Include="app\services\DataService.js" />
58 - <Content Include="app\services\ModuleService456.js" /> 58 + <Content Include="app\services\ModuleService123 - Copy.js" />
  59 + <Content Include="app\services\ModuleServicePromiseCode.js" />
59 <Content Include="app\services\ModuleService.js" /> 60 <Content Include="app\services\ModuleService.js" />
60 <Content Include="app\utility\BitmapData.js" /> 61 <Content Include="app\utility\BitmapData.js" />
61 <Content Include="app\utility\Matrix.js" /> 62 <Content Include="app\utility\Matrix.js" />
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @c0ab478
@@ -20,22 +20,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod @@ -20,22 +20,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
20 $scope.moduleId = moduleId; 20 $scope.moduleId = moduleId;
21 21
22 console.log('loadForModuleById is called') 22 console.log('loadForModuleById is called')
23 - $scope.moduleName = Modules[moduleId].Name;  
24 -  
25 - //$scope.loadDataForModule($scope.moduleName);  
26 -  
27 - var data = ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName);  
28 -  
29 - // alert(data);  
30 - }  
31 -  
32 - $scope.$on('SendTileDataEvent', function (event, data) {  
33 -  
34 -  
35 - alert($rootScope.tileHTML); 23 + var moduleName = Modules[moduleId].Name;
  24 + var promise = ModuleService.loadModuleDataBasedOnModuleName(moduleName)
36 25
37 - })  
38 - 26 + .then(
  27 + function (result) {
  28 + $scope.moduleLandingData = result;
  29 +
  30 + console.log(JSON.stringify(result, null, 4));
  31 + },
  32 + function (error) {
  33 + // handle errors here
  34 + console.log(' error: ' + error.statusText);
  35 + }
  36 + )
  37 + },
  38 +
  39 +
39 // var abc= ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName) 40 // var abc= ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName)
40 // abc.then( 41 // abc.then(
41 // function (result) { 42 // function (result) {
400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
  View file @c0ab478
@@ -4,78 +4,10 @@ var CLINICAL_ANIMATION = &#39;Clinical Animations&#39;; @@ -4,78 +4,10 @@ var CLINICAL_ANIMATION = &#39;Clinical Animations&#39;;
4 var OpenedModuleItemList = []; 4 var OpenedModuleItemList = [];
5 var ModDetail = []; 5 var ModDetail = [];
6 6
7 -//module.service( 'Book', [ '$rootScope', function( $rootScope ) {  
8 -AIA.service('ModuleService', ['$rootScope', function ($rootScope, DataService) {  
9 - return {  
10 - SaveOpenedModules: function (moduleDetails) {  
11 - ModDetail = moduleDetails;  
12 -  
13 - OpenedModuleItemList.push("imageId: " + moduleDetails[0]);  
14 - OpenedModuleItemList.push("moduleId:" + moduleDetails[1]);  
15 - OpenedModuleItemList.push("moduleName: " + moduleDetails[2]);  
16 -  
17 -  
18 - //var moduleId = moduleDetails.moduleId;  
19 - //OpenedModuleList.push(moduleId);  
20 - //OpenedModuleList.tileViewId = moduleDetails.TileViewId;  
21 - //OpenedModuleList.tileImageName = moduleDetails.imageName;  
22 - //OpenedModuleList.tileImageSRC = moduleDetails.imagePath;  
23 -  
24 - //moduleData.push($scope.moduleId);  
25 - //moduleData.push(value._Id);  
26 - //moduleData.push(value._ImageId);  
27 - //moduleData.push(value._Title);  
28 - //moduleData.push(value._ImageName);  
29 - //moduleData.push(value._BodySystem);  
30 - //moduleData.push(value._BodyRegion);  
31 - //moduleData.push(value._ViewOrientation);  
32 - //moduleData.push(value._ImageType);  
33 - //moduleData.push(value._TileImageName);  
34 -  
35 -  
36 - console.log('called service');  
37 -  
38 -  
39 - this.renderModuleItemById();  
40 -  
41 - },  
42 -  
43 - renderModuleItemById: function () {  
44 -  
45 - var jsonFileForOpenModule;  
46 -  
47 - if (ModDetail[2] == ATLAS_ANATOMY) {  
48 - this.loadPinData();  
49 -  
50 - }  
51 - else if (ModDetail[2] == CLINICAL_ANIMATION) {  
52 -  
53 - }  
54 - else if (ModDetail[3] == CLINICAL_ILLUSTRATION) {  
55 -  
56 - }  
57 -  
58 - },  
59 - loadPinData: function () {  
60 - var pinJsonFile = "/content/data/json/aa/aa_pin_data/aa_dat_pindata_" + ModDetail[0] + ".json";  
61 - alert('pinJsonFile: ' + pinJsonFile);  
62 - var promise = DataService.getJson(pinJsonFile);  
63 - promise.then(  
64 - function (result) {  
65 - var AtlasAnatomyPinData = result;  
66 -  
67 - var data = new jinqJs()  
68 - .from(AtlasAnatomyPinData.root.Item)  
69 - //.orderBy([{ field: '_Title', sort: 'asc' }])  
70 - .select();  
71 -  
72 - })  
73 - },  
74 -  
75 - loadModuleDataBasedOnModuleName: function (moduleName) {  
76 -  
77 - alert('loadModuleDataBasedOnModuleName is called');  
78 7
  8 +AIA.service('ModuleService', function($http, DataService) {
  9 + return {
  10 + loadModuleDataBasedOnModuleName: function(moduleName) {
79 var jsonPath; 11 var jsonPath;
80 if (moduleName == ATLAS_ANATOMY) { 12 if (moduleName == ATLAS_ANATOMY) {
81 jsonPath = '~/../content/data/json/aa/aa_dat_contentlist.json'; 13 jsonPath = '~/../content/data/json/aa/aa_dat_contentlist.json';
@@ -88,52 +20,17 @@ AIA.service(&#39;ModuleService&#39;, [&#39;$rootScope&#39;, function ($rootScope, DataService) { @@ -88,52 +20,17 @@ AIA.service(&#39;ModuleService&#39;, [&#39;$rootScope&#39;, function ($rootScope, DataService) {
88 //to do, in next phase of project 20 //to do, in next phase of project
89 jsonPath = '~/../content/data/json/ci/ci_dat_contentlist.json'; 21 jsonPath = '~/../content/data/json/ci/ci_dat_contentlist.json';
90 } 22 }
91 -  
92 - var promise = DataService.getJson(jsonPath)  
93 - .then(  
94 - function (result) {  
95 - var AtlasAnatomyData = result;  
96 -  
97 - var data = new jinqJs()  
98 - .from(AtlasAnatomyData.root.Item)  
99 - .orderBy([{ field: '_Title', sort: 'asc' }])  
100 - .select();  
101 -  
102 -  
103 23
104 - angular.forEach(data, function (value, key) {  
105 - // $rootScope.moduleData = [];  
106 - //$scope.moduleData.push({ "id": value._Id, "imageID": value._ImageId, "TileName": value._TileImageName, "DivImageTitle": value._Title });  
107 - // $scope.moduleData.push(value._ImageId);  
108 - // $scope.moduleData.push(value._TileImageName);  
109 -  
110 - var ImageName = value._TileImageName;  
111 - var imagePath = "~/../content/images/aa/thumbnails/" + value._TileImageName;  
112 - //$scope.TileViewId = value._Id;  
113 -  
114 - $rootScope.tileHTML = $('<div id="' + value._Id + '" class="col-sm-3 col-md-3" title = "' + value._Title + '" data-ng-click="openModuleItem()">'  
115 - + '<div class="thumbnail" >'  
116 - + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + imagePath + '" alt="" title="" >'  
117 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>');//.appendTo('#grid-view');  
118 - debugger;  
119 - })  
120 -  
121 - //if ($rootScope.tileHTML != undefined) {  
122 - // alert('come before broadcast')  
123 - // $rootScope.$broadcast('SendTileDataEvent', true);  
124 -  
125 - //}  
126 -  
127 - },  
128 - function (error) {  
129 - // handle errors here  
130 - console.log(' $rootScope.TermNumberData= ' + error.statusText);  
131 - }  
132 - ) 24 + return $http.get(jsonPath, function (response) {
  25 +
  26 + var moduleData = new jinqJs()
  27 + .from(response.data.root.Item)
  28 + .orderBy([{ field: '_Title', sort: 'asc' }])
  29 + .select();
  30 + console.log(JSON.stringify(response, null, 4));
  31 + response.data= moduleData;
  32 + return response.data;
  33 + });
133 } 34 }
134 - }  
135 -  
136 -  
137 -  
138 -}]);  
139 -  
140 \ No newline at end of file 35 \ No newline at end of file
  36 + };
  37 +});