diff --git a/150-DOCUMENTATION/AIA-TimelinesFormatted.xlsx b/150-DOCUMENTATION/AIA-TimelinesFormatted.xlsx new file mode 100644 index 0000000..cac574e --- /dev/null +++ b/150-DOCUMENTATION/AIA-TimelinesFormatted.xlsx diff --git a/150-DOCUMENTATION/AIA-TimelinesV1.0.xlsx b/150-DOCUMENTATION/AIA-TimelinesV1.0.xlsx new file mode 100644 index 0000000..7bf34c1 --- /dev/null +++ b/150-DOCUMENTATION/AIA-TimelinesV1.0.xlsx diff --git a/150-DOCUMENTATION/AIA-TimelinesV1.2.xlsx b/150-DOCUMENTATION/AIA-TimelinesV1.2.xlsx new file mode 100644 index 0000000..40ab3c0 --- /dev/null +++ b/150-DOCUMENTATION/AIA-TimelinesV1.2.xlsx diff --git a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx index 8821484..0580f73 100644 --- a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx +++ b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 9ef0aac..ef995df 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -1696,6 +1696,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo // } var maskCanvas = document.getElementById(maskCanvasId); var maskCanvasContext = maskCanvas.getContext("2d"); + RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y); annotationText = $scope.GetAnnotationText(parseInt(RGBColor)); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 38cf193..0f4a089 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -135,31 +135,47 @@ function ($scope, $rootScope, $compile, $http, $log, $location, BodyRegions, Bod $scope.openModuleItem = function (event) { - debugger; + // debugger; var moduleItemDataToBeSaved = event.target.id; + + var OpendTileData = []; - // var moduleItemDataToBeSaved = []; - - - // for(var i=0;i<=$scope.moduleData.length-1;i++) - // { - - // if ($scope.moduleData[i].DivImageTitle == event.target.id) - // { - - // alert($scope.moduleData[i].imageID); - - // moduleItemDataToBeSaved.push($scope.moduleData[i].imageID, $scope.moduleData[i].id,$scope.moduleName); - // } - - // } - - ModuleService.SaveOpenedModules(moduleItemDataToBeSaved, $scope.moduleLandingData); - - ////var isSaved= ModuleService.SaveOpenedModules(moduleDetails); - + OpendTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); + alert('openModuleItem is called'); } + $scope.openView = function ($event) { + //$rootScope.disableAnnotationTB = false; + //$rootScope.CIAnotationIdentifyModeOff = true; + //$rootScope.currentBodyViewId = $event.currentTarget.id; + //if ($event.currentTarget.textContent !== null && typeof ($event.currentTarget.textContent) !== "undefined") { + // var CITitle = []; + // CITitle = new jinqJs() + // .from($scope.selectedCIListViewData) + // .where('_id = ' + $event.currentTarget.id) + // .select('_Title'); + + // // console.log(CITitle); + // // console.log($scope.selectedCIListViewData); + + // $rootScope.ViewTitle = CITitle[0]._Title; + //} + //else { + // $rootScope.ViewTitle = $event.currentTarget.textContent; + + //} + + + //localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle); + //localStorage.setItem("currentBodyViewId", $event.currentTarget.id); + + var u = $location.url(); + $location.url('/atlas-anatomy-detail.html'); + + // console.log($location.url('/clinical-illustrations-detail')); + + } + }]); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js index 7d673b1..5aaa249 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js @@ -31,31 +31,43 @@ AIA.service('ModuleService', function($http, DataService) { .from(response.data.root.Item) .orderBy([{field: '_Title', sort: 'asc' }]) .select(); - console.log(JSON.stringify(response, null, 4)); - response.data= moduleData; - return response.data; + // console.log(JSON.stringify(response, null, 4)); + // response.data= moduleData; + // return response.data; + return moduleData; }); }, - SaveOpenedModules: function (id,moduleJson) { + GetOpenedTileData: function (id,moduleJson) { if (modName == ATLAS_ANATOMY) { + var AADataForSelectedItem = []; + var title = id; + alert(moduleJson.data.root.Item.length); var selectedTileData = new jinqJs() .from(moduleJson.data.root.Item) - .where("_Title =="+ id) + .where("_Title == " + title) .select(); - - alert(selectedTileData); + AADataForSelectedItem.push("imageId: " + selectedTileData[0]._ImageId); + AADataForSelectedItem.push("BodyRegion:" + selectedTileData[0]._BodyRegion); + AADataForSelectedItem.push("BodySystem: " + selectedTileData[0]._BodySystem); + AADataForSelectedItem.push("ImageName: " + selectedTileData[0]._ImageName); + AADataForSelectedItem.push("ImageType:" + selectedTileData[0]._ImageType); + AADataForSelectedItem.push("TileImageName: " + selectedTileData[0]._TileImageName); + + AADataForSelectedItem.push("ViewOrientation: " + selectedTileData[0]._ViewOrientation); + + return AADataForSelectedItem; } - //OpenedModuleItemList.push("imageId: " + moduleDetails[0]); + //OpenedModuleItemList.push("imageId: " + moduleDetails[0]); //OpenedModuleItemList.push("moduleId:" + moduleDetails[1]); //OpenedModuleItemList.push("moduleName: " + moduleDetails[2]); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService456.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService456.js deleted file mode 100644 index 4b6fcd1..0000000 --- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService456.js +++ /dev/null @@ -1,72 +0,0 @@ -var ATLAS_ANATOMY = 'Atlas Anatomy'; -var CLINICAL_ILLUSTRATION = 'Clinical Illustrations'; -var CLINICAL_ANIMATION = 'Clinical Animations'; -var OpenedModuleItemList = []; -var ModDetail = []; - -AIA.service("ModuleService", function ($http, $q, DataService) { - - var deferred = $q.defer(); - - this.loadModuleDataBasedOnModuleName = function (moduleName) { - var tileHtml; - - - var jsonPath; - if (moduleName == ATLAS_ANATOMY) { - jsonPath = '~/../content/data/json/aa/aa_dat_contentlist.json'; - } - else if (moduleName == CLINICAL_ANIMATION) { - //to do, in next phase of project - jsonPath = '~/../content/data/json/ca/ca_dat_contentlist.json'; - } - else if (moduleName == CLINICAL_ILLUSTRATION) { - //to do, in next phase of project - jsonPath = '~/../content/data/json/ci/ci_dat_contentlist.json'; - } - - var promise = DataService.getJson(jsonPath) - promise.then( - function (result) { - var AtlasAnatomyData = result; - - var data = new jinqJs() - .from(AtlasAnatomyData.root.Item) - .orderBy([{ field: '_Title', sort: 'asc' }]) - .select(); - - var tileHTML; - - 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; - - tileHTML = $('
' - + '
' - + '' - + '

' + value._Title + '

');//.appendTo('#grid-view'); - }) - var deferred = $q.defer(); - return tileHTML - .then(function (response) { - // promise is fulfilled - //debugger; - deferred.resolve(response.data); - // promise is returned - return deferred.promise; - }, function (response) { - // the following line rejects the promise - deferred.reject(response); - // promise is returned - return deferred.promise; - }) - ; - } - )} -}); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/atlas-anatomy-detail.html new file mode 100644 index 0000000..72f2f87 --- /dev/null +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/atlas-anatomy-detail.html @@ -0,0 +1,368 @@ + + + + + + +A.D.A.M. Interactive Anatomy + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+ + + +

1st & 2nd Intercostal Spaces

+ +
+
+
+
+
+
+
+
+
+ + + +
+
+
+
+

Zoom

+
+
+
+ +
+
+
+
+
+ + + +
+   + +
+ + +
+
+ +
    +
    • +
+
+ +
+
+
+
+
+
+
+ +
+
+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file