diff --git a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx index e35856e..8a13074 100644 --- a/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx +++ b/150-DOCUMENTATION/Scrum/AIA_DailyScrum.xlsx diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index a06b344..8dc09e3 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -137,8 +137,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.loadForModuleById = function (moduleId) { - alert('hi'); - $scope.moduleId = moduleId; console.log('loadForModuleById is called') @@ -176,10 +174,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.openBodyView = function () { - debugger; - alert('openBodyView is called') - - $.jsPanel({ + $.jsPanel({ id: 'aaImagePanel', selector: '.aaBodyView', theme: 'success', @@ -200,90 +195,50 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo }); console.log('jsPanel loaded aaImagePanel exist= ' + document.getElementById('aaImagePanel')) - //0.1 - // $rootScope.currentSlug = 'da-body-view'; - - //0.2 - //$rootScope.openViews.push( - // { - // "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": $rootScope.currentBodyViewId, - // "slug": $rootScope.currentSlug - // } - // ); - + //0.3 - var aaViewElement = angular.element(document.getElementById("aaView")); + var aaViewElement = angular.element(document.getElementById("aaDetailPageDiv")); - debugger; - - $timeout(function () { - $compile(aaViewElement.contents())($scope); + $timeout(function () { + $compile(aaViewElement.contents())($scope); + alert('aaView val: ' + document.getElementById('aaDetailPageDiv')); //console.log('html is compiled' + document.getElementById('daView')) - if (document.getElementById('aaView') != null) { + if (document.getElementById('aaDetailPageDiv') != null) { - alert('inside jsPanel') + ////0.4 added some stylesheets - //$('#daBodyview').css("height", $(window).outerHeight()); - - //$('#daBodyview').css("width", $(window).outerWidth()); + $('#aaBodyView').css("height", $(window).outerHeight()); - ////1. load navigator man first - //console.log('before LoadBodyViewNavigatorImage call') - // $scope.LoadBodyViewNavigatorImage(); + $('#aaBodyView').css("width", $(window).outerWidth()); - //$scope.loadSearchDataForBodyView(); - - //$scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - - // $scope.layerNumber = 0; - - //2. - - // console.log('currentBodyViewId just before sending: ' + currentBodyViewId); - $scope.loadAAImage($rootScope.OpenItemImagePath); + + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - //2. load bodyRegion data - //$rootScope.isLoading = true; - ////$rootScope.voId = localStorage.getItem("currentBodyViewId"); + $scope.loadAAImage($rootScope.OpenItemImagePath); - //$('#daBodyview').css("height", $(window).outerHeight()); + //$('#aaBodyView').css("height", $(window).outerHeight()); - //$('#daBodyview').css("width", $(window).outerWidth()); + //$('#aaBodyView').css("width", $(window).outerWidth()); } }, 250); } $scope.loadAAImage = function (OpenedModuleItemPath) { + //var imgNode = document.getElementById('modItemImage'); + //imgNode.src = $rootScope.OpenItemImagePath; + var imageNode = "''"; + $('#imageDiv').append(imageNode); } angular.element(document).ready(function (e) { - $("#daImagePanel").resize(function () { - $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition); - $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); - }); - - $(document).on("mouseover", "#termList option", function (e) { - $('#termList option[selected="selected"]').attr("selected", false); - $(this).attr("selected", true); - }); - - $(document).keypress(function (e) { - if ($('#termList option[selected="selected"]').attr("id") == "undefined") { - return false; - } - else { - var originator = e.keyCode || e.which; - // alert($('#termList option[selected="selected"]').attr("id")); - if ($('#termList option[selected="selected"]').attr("id")) { - if (e.keyCode == 13) { - onListManagerTermSelection($('#termList option[selected="selected"]').attr("id")); - } - } - } - }); + $("#aaImagePanel").resize(function () { + $("#imageDiv").scrollLeft($rootScope.CanvasDivLeftPosition); + $("#imageDiv").scrollTop($rootScope.CanvasDivTopPosition); + }); + }) $scope.loadSearchDataForBodyView = function () { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html index 401ba2f..bded6e6 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html @@ -1,564 +1,157 @@ - - - - - - - -
-
-
-
-
- -
-
- - -
-
- -
- -
-
- -
-
- -
-
-
-
- -
- -
-
Highlight Options
- - -
-
- -
-
-
Gender
- - -
- -
-
View
- - -
-
- -
- -
- -
+ +
+ + + + + + +
+
- - - -
-
- -
-
-
- -
-
- -
-
+
+
+
+
+ +
- - - -
+
+
+
+

Zoom

+
-
+
- - - -
-
- - -
-
- - + + +
+   +
- -
-
- - - +
    +
    • +
+
-
+
-
- - -
- - -
-
-
-
-
-
-
- - - -