From 1461deb21722c4d8dc68744ac6d3eb8258a042f3 Mon Sep 17 00:00:00 2001 From: amrita.vishnoi Date: Thu, 8 Jun 2017 16:55:41 +0530 Subject: [PATCH] Some AA bug fixes- --- 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll | Bin 32256 -> 0 bytes 400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb | Bin 46592 -> 0 bytes 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj | 9 ++++----- 400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------- 400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html | 12 ++++++------ 6 files changed, 64 insertions(+), 63 deletions(-) diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll index 918257a..6b7ae92 100644 Binary files a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll and b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.dll differ diff --git a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb index 4e74bc8..ae33648 100644 Binary files a/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb and b/400-SOURCECODE/AIAHTML5.API/bin/AIAHTML5.API.pdb differ diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj index de2feb3..f5125a3 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj @@ -569,7 +569,6 @@ - @@ -593,16 +592,15 @@ - - + - - + + @@ -44717,6 +44715,7 @@ + diff --git a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user index 7b4788a..dbebe52 100644 --- a/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user +++ b/400-SOURCECODE/AIAHTML5.Web/AIAHTML5.Web.csproj.user @@ -1,4 +1,4 @@ - + ProjectFiles diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 2065605..05a4ec9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -100,71 +100,73 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } - $.jsPanel({ - id: 'ImagePanel', - selector: '.aaBodyView', - theme: 'success', - currentController: 'TileViewListController', - parentSlug: 'tile-view', - ajax: { - url: jsContentURL - }, - title: localStorage.getItem("currentViewTitle"), + //1. create a jsPanel and load the module item view + if ($rootScope.moduleName == ATLAS_ANATOMY) { + $.jsPanel({ + id: 'ImagePanel', + selector: '.aaBodyView', + theme: 'success', + currentController: 'TileViewListController', + parentSlug: 'tile-view-list', + ajax: { + url: jsContentURL + }, + title: localStorage.getItem("currentViewTitle"), - position: { - top: 70, - left: 1, - }, + position: { + top: 70, + left: 1, + }, - size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, + size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, - }); + }); - console.log('jsPanel loaded ImagePanel exist= ' + document.getElementById('ImagePanel')) + console.log('jsPanel loaded ImagePanel exist= ' + document.getElementById('ImagePanel')) - //0.3 - var aaViewElement = angular.element(document.getElementById(moduleItemViewDivId)); + //0.3 + var aaViewElement = angular.element(document.getElementById(moduleItemViewDivId)); - //0.4 for Opening module item, load it into image - var openedImage = new Image(); - openedImage.name = $rootScope.OpenItemImagePath; - openedImage.onload = getImageHeightWidth; - openedImage.onerror = loadFailure; - openedImage.src = $rootScope.OpenItemImagePath; + //0.4 for Opening module item, load it into image + var openedImage = new Image(); + openedImage.name = $rootScope.OpenItemImagePath; + openedImage.onload = getImageHeightWidth; + openedImage.onerror = loadFailure; + openedImage.src = $rootScope.OpenItemImagePath; - $timeout(function () { - $compile(aaViewElement.contents())($scope); + $timeout(function () { + $compile(aaViewElement.contents())($scope); - if (document.getElementById('aaDetailPageDiv') != null) { + if (document.getElementById('aaDetailPageDiv') != null) { - //0.4 added some stylesheets - $('#aaBodyView').css("height", $(window).outerHeight()); - $('#aaBodyView').css("width", $(window).outerWidth()); + //0.4 added some stylesheets + $('#aaBodyView').css("height", $(window).outerHeight()); + $('#aaBodyView').css("width", $(window).outerWidth()); - $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); - $("#modItemImage").attr('src', $rootScope.OpenItemImagePath); + $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); + $("#modItemImage").attr('src', $rootScope.OpenItemImagePath); - //0.5 create canvas on the top of image so that I can draw a line over the canvas. - var canvas = document.createElement('canvas'); - canvas.id = 'aaDetailViewCanvas'; - canvas.height = parseInt(($scope.imageHeight)); - canvas.width = parseInt($scope.imageWidth); - canvas.style.left = '0px'; - canvas.style.top = '0px'; - canvas.style.position = "absolute"; + //0.5 create canvas on the top of image so that I can draw a line over the canvas. + var canvas = document.createElement('canvas'); + canvas.id = 'aaDetailViewCanvas'; + canvas.height = parseInt(($scope.imageHeight)); + canvas.width = parseInt($scope.imageWidth); + canvas.style.left = '0px'; + canvas.style.top = '0px'; + canvas.style.position = "absolute"; - $("#imageDiv").append(canvas); - $scope.context = canvas.getContext("2d") + $("#imageDiv").append(canvas); + $scope.context = canvas.getContext("2d") - //6. Show all pins on AA opened item - $scope.showAllPins(); - //7. Highlight all system body list in left side - $scope.highlightBodySystemList(); - } - }, 1050); + //6. Show all pins on AA opened item + $scope.showAllPins(); + //7. Highlight all system body list in left side + $scope.highlightBodySystemList(); + } + }, 1050); + } } - $scope.highlightBodySystemList = function () { $rootScope.bodySystemNames = $rootScope.bodySystemName.trim().split(/\s*,\s*/); var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a"); @@ -173,7 +175,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo //var boldTag = lis[i]; for (var j = 0; j < $rootScope.bodySystemNames.length; j++) { if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) { - $("#" + i).removeClass("disabled"); + $("#" + i).parent().removeClass("disabled"); } } 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 1e5859a..d708650 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 @@ -20,17 +20,17 @@ @@ -72,7 +72,7 @@
-
    -- libgit2 0.21.4