diff --git a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx
index 400691d..d47f206 100644
--- a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx
+++ b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx
diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
index 1b3c379..fc2152f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
+++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj
@@ -55,7 +55,8 @@
-
+
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 997c19b..b77859c 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -20,22 +20,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod
$scope.moduleId = moduleId;
console.log('loadForModuleById is called')
- $scope.moduleName = Modules[moduleId].Name;
-
- //$scope.loadDataForModule($scope.moduleName);
-
- var data = ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName);
-
- // alert(data);
- }
-
- $scope.$on('SendTileDataEvent', function (event, data) {
-
-
- alert($rootScope.tileHTML);
+ var moduleName = Modules[moduleId].Name;
+ var promise = ModuleService.loadModuleDataBasedOnModuleName(moduleName)
- })
-
+ .then(
+ function (result) {
+ $scope.moduleLandingData = result;
+
+ console.log(JSON.stringify(result, null, 4));
+ },
+ function (error) {
+ // handle errors here
+ console.log(' error: ' + error.statusText);
+ }
+ )
+ },
+
+
// var abc= ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName)
// abc.then(
// function (result) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
index d079b41..2ea318b 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
@@ -4,78 +4,10 @@ var CLINICAL_ANIMATION = 'Clinical Animations';
var OpenedModuleItemList = [];
var ModDetail = [];
-//module.service( 'Book', [ '$rootScope', function( $rootScope ) {
-AIA.service('ModuleService', ['$rootScope', function ($rootScope, DataService) {
- return {
- SaveOpenedModules: function (moduleDetails) {
- ModDetail = moduleDetails;
-
- OpenedModuleItemList.push("imageId: " + moduleDetails[0]);
- OpenedModuleItemList.push("moduleId:" + moduleDetails[1]);
- OpenedModuleItemList.push("moduleName: " + moduleDetails[2]);
-
-
- //var moduleId = moduleDetails.moduleId;
- //OpenedModuleList.push(moduleId);
- //OpenedModuleList.tileViewId = moduleDetails.TileViewId;
- //OpenedModuleList.tileImageName = moduleDetails.imageName;
- //OpenedModuleList.tileImageSRC = moduleDetails.imagePath;
-
- //moduleData.push($scope.moduleId);
- //moduleData.push(value._Id);
- //moduleData.push(value._ImageId);
- //moduleData.push(value._Title);
- //moduleData.push(value._ImageName);
- //moduleData.push(value._BodySystem);
- //moduleData.push(value._BodyRegion);
- //moduleData.push(value._ViewOrientation);
- //moduleData.push(value._ImageType);
- //moduleData.push(value._TileImageName);
-
-
- console.log('called service');
-
-
- this.renderModuleItemById();
-
- },
-
- renderModuleItemById: function () {
-
- var jsonFileForOpenModule;
-
- if (ModDetail[2] == ATLAS_ANATOMY) {
- this.loadPinData();
-
- }
- else if (ModDetail[2] == CLINICAL_ANIMATION) {
-
- }
- else if (ModDetail[3] == CLINICAL_ILLUSTRATION) {
-
- }
-
- },
- 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();
-
- })
- },
-
- loadModuleDataBasedOnModuleName: function (moduleName) {
-
- alert('loadModuleDataBasedOnModuleName is called');
+AIA.service('ModuleService', function($http, DataService) {
+ return {
+ loadModuleDataBasedOnModuleName: function(moduleName) {
var jsonPath;
if (moduleName == ATLAS_ANATOMY) {
jsonPath = '~/../content/data/json/aa/aa_dat_contentlist.json';
@@ -88,52 +20,17 @@ AIA.service('ModuleService', ['$rootScope', function ($rootScope, DataService) {
//to do, in next phase of project
jsonPath = '~/../content/data/json/ci/ci_dat_contentlist.json';
}
-
- var promise = DataService.getJson(jsonPath)
- .then(
- function (result) {
- var AtlasAnatomyData = result;
-
- var data = new jinqJs()
- .from(AtlasAnatomyData.root.Item)
- .orderBy([{ field: '_Title', sort: 'asc' }])
- .select();
-
-
- angular.forEach(data, function (value, key) {
- // $rootScope.moduleData = [];
- //$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);
-
- var ImageName = value._TileImageName;
- var imagePath = "~/../content/images/aa/thumbnails/" + value._TileImageName;
- //$scope.TileViewId = value._Id;
-
- $rootScope.tileHTML = $('
'
- + '
'
- + '
![]()
'
- + '
');//.appendTo('#grid-view');
- debugger;
- })
-
- //if ($rootScope.tileHTML != undefined) {
- // alert('come before broadcast')
- // $rootScope.$broadcast('SendTileDataEvent', true);
-
- //}
-
- },
- function (error) {
- // handle errors here
- console.log(' $rootScope.TermNumberData= ' + error.statusText);
- }
- )
+ return $http.get(jsonPath, function (response) {
+
+ var moduleData = new jinqJs()
+ .from(response.data.root.Item)
+ .orderBy([{ field: '_Title', sort: 'asc' }])
+ .select();
+ console.log(JSON.stringify(response, null, 4));
+ response.data= moduleData;
+ return response.data;
+ });
}
- }
-
-
-
-}]);
-
\ No newline at end of file
+ };
+});