diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index a862d05..493a81f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -71,7 +71,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout else { $scope.setActiveTab(1); $scope.reRunSearchOnLoad(); - $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') }); + $('html, body').animate({ scrollTop: localStorage.getItem('CAGridViewScroll') }, 'slow'); } @@ -403,7 +403,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout if ($scope.searchCAListViewData.length == 0) { var $el = $('
No animation found for the selected search criteria!
').appendTo('#grid-view'); $compile($el)($scope); - $('table > #ListViewDiv > #searchAnimation').remove(); + $('table > #ListViewDiv > #searchAnimation').remove(); $('#ListViewDiv').append('No animation found for the selected search criteria!'); } @@ -450,7 +450,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle); localStorage.setItem("currentBodyViewId", $event.currentTarget.id); - var CAGridViewScrollPosition = $($window).scrollTop(); + var CAGridViewScrollPosition = $($window).scrollTop(); localStorage.setItem('CAGridViewScroll', CAGridViewScrollPosition); var u = $location.url(); $location.url('/clinical-animations-detail'); @@ -580,17 +580,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout }); - var jspContentHeight = $('.jsPanel-content').height(); - var videoHeight = $('#divplayerinlineVideo div').height(); - if (videoHeight <= 0) - videoHeight = 360; - var textH = $('.video-subtitle').height(); - textH = textH + 40; - var blackBorderHeight = jspContentHeight - (videoHeight + textH); + var jspContentHeight = $('.jsPanel-content').height(); + var videoHeight = $('#divplayerinlineVideo div').height(); + if (videoHeight <= 0) + videoHeight = 360; + var textH = $('.video-subtitle').height(); + textH = textH + 40; + var blackBorderHeight = jspContentHeight - (videoHeight + textH); - if ($('.jsPanel-content').length > 0) { + if ($('.jsPanel-content').length > 0) { $('.video-subtitle').css('margin-bottom', blackBorderHeight); - $('#divplayerinlineVideo').css('background', '#fff'); + $('#divplayerinlineVideo').css('background', '#fff'); } } @@ -646,14 +646,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout var curCAListViewScroll = localStorage.getItem("CAListViewScroll"); if (typeof (curCAListViewScroll) !== "undefined" && curCAListViewScroll !== null && curCAListViewScroll !== '') { - if (typeof InstallTrigger !== 'undefined') { - - $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") }); - - } - else - { - $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll")); + if (typeof InstallTrigger !== 'undefined') { + + $('#ListViewDiv').animate({ scrollTop: localStorage.getItem("CAListViewScroll") }); + + } + else + { + $('#ListViewDiv').scrollTop(localStorage.getItem("CAListViewScroll")); } } //else { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 0ad0b3a..30e501c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -22,7 +22,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.VocabTermTxt; $scope.CommonData - $rootScope.TermNumberData; + $rootScope.TermNumberData = null; $rootScope.BodySystemData $scope.bodyViewId = 0; $rootScope.bgartData; @@ -104,7 +104,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.NavigatorData; $scope.navimgsrc; - $scope.dragdivleft = 0; + $scope.dragdivleft = 21; $scope.dragdivtop = 0; $rootScope.systemNumber = 0; @@ -2760,9 +2760,31 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { - var canvasDiv = document.getElementById('canvasDiv'); - $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition); - $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition); + + if ($rootScope.isZoomed) { + var lastSelectedAnnotation; + angular.forEach($rootScope.previousHighlightList, function (value, key) { + var ActualTermNos = $scope.getActualTermNumber(value); + lastSelectedAnnotation = ActualTermNos; + }); + + $scope.TermList = $scope.getTermNumberList(lastSelectedAnnotation); + $scope.termCoordinate = $scope.getTermCoordinate(lastSelectedAnnotation); + + console.log('last selected Annotation= ' + lastSelectedAnnotation); + console.log('termListCount= ' + $scope.TermList.length); + console.log('termCoordinate= ' + $scope.termCoordinate.x); + + + + $scope.aligneCanvasWithTerm(); + } + else { + + var canvasDiv = document.getElementById('canvasDiv'); + $('#canvasDiv').scrollTop($scope.imageVerticalScrollPosition); + $('#canvasDiv').scrollLeft($scope.imageHorizontlScrollPosition); + } } $rootScope.isLoading = false; @@ -2773,7 +2795,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } - $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2); + }; @@ -8273,7 +8295,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#termList').empty(); - $scope.loadListManger(); + if ($rootScope.TermNumberData == null) { + setTimeout(function () { $scope.loadListManger(); }, 3000); + } + else { + $scope.loadListManger(); + } $rootScope.islistManagerEventAlredayDispachted = false; } @@ -8346,7 +8373,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val(); - + $rootScope.searchSelectedText = $("#" + actualTermNumber).text(); $rootScope.slectedActualTermNumber = actualTermNumber; if (isTermListOptionClicked == true) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index 5e88343..8394d70 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -94,6 +94,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic var isOutlineOptionChecked = ""; $rootScope.forgotPwdModalShow = function () { + document.getElementById("forgetPwdForm").reset() $("#forgotPwdModal").modal("show"); $(".modal-backdrop").css("opacity",".5"); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 6fb8118..34cdf94 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -33,13 +33,71 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo selectedorientation: '', selectedimagetype: '', }; + + $scope.showTabButton = true; + $scope.isListViewDataLoaded = true; + + $scope.setActiveTab = function (tabToSet) { + + $scope.activeTab = tabToSet; + localStorage.setItem("activeTab", $scope.activeTab); + if ($scope.activeTab == 1) { + $('#grid-view').css("display","block"); + $('#list-view').css("display", "none"); + $("#demoView").remove(); + } + else + { + + $('#grid-view').css("display", "none"); + if ($scope.isListViewDataLoaded == true) { + var htm = ''; + htm += ""; + $.ajax({ + url: '~/../content/data/json/aa/aa_dat_contentlist.json', + dataType: "json", + success: function (result) { + $(result.root.Item).each(function (key, value) { + console.log(key + " " + value); + htm += "" + htm += ''; + htm += "" + }); + htm += "
Title Region SystemView Type
' + value._Title + '' + value._BodyRegion + '' + value._BodySystem + '' + value._ViewOrientation + '' + value._ImageType + '
"; + $("#list-view").html(htm); + $compile(htm)($scope); + } + }); + $('#list-view').css("display", "block"); + $scope.isListViewDataLoaded = false; + } + else + { + $('#list-view').css("display", "block"); + } + + $timeout(function () { + // if ($rootScope.isListViewRowClicked == true) { + // $rootScope.isListViewRowClicked = false; + $("#demoView").remove(); + $("#viewList").append("
" + $rootScope.listArray[0].text + "
Open
"); + var moduleItemDataToBeSavedID + $("#list-view table tbody tr").removeClass("active"); + var moduleItemDataToBeSavedID = localStorage.getItem("listViewSelectedID"); + $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active"); + $scope.isListViewButtonClicked = true; + // } + }, 2000); + } + }; + $scope.loadForModuleById = function (moduleId) { - + $scope.moduleId = moduleId; - + $scope.activeTab = 1; console.log('loadForModuleById is called') $rootScope.moduleName = Modules[moduleId].Name; - + $rootScope.currentActiveModuleTitle = $rootScope.moduleName; $scope.AllBodyRegion = BodyRegions; $scope.AllBodySystem = BodySystems; $scope.AllOrientation = ViewOrientations; @@ -57,17 +115,37 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo console.log(' error: ' + error.statusText); } ) + } + //$scope.$on('$viewContentLoaded', function (event) { + // $scope.loadForModuleById(); - - } - + //}); + $scope.isOpenBtnClicked = false; $scope.openModuleItemView = function (event) { - + + localStorage.setItem("activeTab", $scope.activeTab); //0. Get selected Image Id - var moduleItemDataToBeSaved = event.target.id; - + if ($scope.isListViewButtonClicked == true) { + if ($scope.isOpenBtnClicked == true) { + + var moduleItemDataToBeSaved = $("#demoText").html(); + $scope.isOpenBtnClicked = false; + } + else { + var moduleItemDataToBeSavedID = event.currentTarget.id; + localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID); + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text(); + } + } + else + { + var moduleItemDataToBeSaved = event.target.id; + localStorage.setItem("listViewSelectedID", event.currentTarget.id); + $scope.isListViewButtonClicked = false; + } + //1.Filter selected module ietem data and get the pushed opened moduile array object $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); @@ -77,8 +155,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.bodySystemName = $rootScope.OpenedTileData[2]; $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; $scope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; - - //3. set opened module item title + $rootScope.listArray = []; + $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved }); + //3. set opened module item ti localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]); //3. Navigate to the Module-item-view @@ -86,6 +165,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $location.url('/module-item-view'); } + + $scope.openListViewModuleItem = function (event) { + + $("#demoView").remove(); + var moduleItemDataToBeSavedID = event.currentTarget.id; + $("#list-view table tbody tr").removeClass("active"); + localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID); + $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active"); + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text(); + $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData); + $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3]; + $rootScope.listArray = []; + $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved }); + $("#viewList").append("
" + moduleItemDataToBeSaved + "
Open
"); + } + + $scope.openModuleItem = function () { var jsContentURL; var moduleItemViewDivId; @@ -145,8 +241,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (document.getElementById('aaDetailPageDiv') != null) { //0.4 added some stylesheets - $('#aaBodyView').css("height", $(window).outerHeight()); - $('#aaBodyView').css("width", $(window).outerWidth()); + $('.aaBodyView').css("height", $(window).outerHeight() - $('.navbar-fixed-top').height()); + $('.aaBodyView').css("width", $(window).outerWidth()); + $rootScope.canvasDivHeight = $('.aaBodyView').height(); + + $('.canvasDivClass').css("height", $rootScope.canvasDivHeight); $scope.currentTitleFromJson = localStorage.getItem("currentViewTitle"); $("#modItemImage").attr('src', $rootScope.OpenItemImagePath); @@ -158,8 +257,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.relativeDimesion = 0; $("#modItemImage").css("width", $rootScope.ViewImageWidth + "px"); - - //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'; @@ -169,14 +266,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo canvas.style.left = '0px'; canvas.style.top = '0px'; canvas.style.position = "absolute"; - //canvas.addEventListener('click', function () { - // alert('canvas clicked'); - // var clickedPint = $scope.getMousePos(event); - // alert('x: ' + clickedPint.x + ', y:' + clickedPint.y); - //}) $("#canvasDiv").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 @@ -213,13 +304,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo - + angular.element(document).ready(function (e) { $("#ImagePanel").resize(function () { $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition); $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); }); + $(document).on("click", "#ImagePanel .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { + $scope.setActiveTab(parseInt(localStorage.getItem("activeTab"))); + //if (localStorage.getItem("activeTab") != null) { + + // $rootScope.isListViewRowClicked = true; + //} + }); }) $scope.showAllPins = function () { @@ -313,7 +411,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.moduleLandingData = result; $scope.selectedAAListViewData = new jinqJs() .from($scope.moduleLandingData.data.root.Item) - //.orderBy([{ field: '_Title', sort: 'asc' }]) + .orderBy([{ field: '_Title', sort: 'asc' }]) .select(); $('#grid-view').empty(); @@ -329,7 +427,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo if (posbodyregion > -1) { selectimg = true; count = count + 1; - } else { selectimg = false; @@ -380,12 +477,13 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.imagePath = "../content/images/aa/thumbnails/" + value._TileImageName; - var $el = $('
' - + '
' - + '' - + '

' + value._Title + '

').appendTo('#grid-view'); - + + var $el = $('
' + + '
' + + '' + + '

' + value._Title + '

').appendTo('#grid-view'); + $compile($el)($scope); $(".sidebar").mCustomScrollbar({ @@ -479,12 +577,10 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo else { $scope.showAllPins(); } - } + } else { $scope.selectedSystemName = event.currentTarget.title; - - // get termText info var promise = ModuleService.getTermTextDataForPin($scope.moduleName) .then( @@ -1080,50 +1176,108 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo function (response) { $scope.AAPinTermData = response.data.PinTermData.TermData; + $rootScope.isLoading = false; $('#setting-spinner').css('visibility', 'hidden'); - + $scope.pinTermData = []; var primaryLexicon = $rootScope.lexiconLanguageArray[0].id; $scope.matchedLanguageTermData = new jinqJs() .from($scope.AAPinTermData) .where('_LanguageId == ' + primaryLexicon) .select(); - + for (var i = 0; i < $scope.matchedLanguageTermData.length; i++) { - $scope.pinTermData.push({ "LanguageId": $scope.matchedLanguageTermData[i]._LanguageId, "TermNumber": $scope.matchedLanguageTermData[i]._TermNumber, "TermTxt": $scope.matchedLanguageTermData[i]._TermText }); - + $scope.pinTermData.push({ "LanguageId": $scope.matchedLanguageTermData[i]._LanguageId, "TermNumber": $scope.matchedLanguageTermData[i]._TermNumber, "TermTxt": $scope.matchedLanguageTermData[i]._TermText}); } $scope.$watch('$scope.pinTermData', function (newValue, oldValue, scope) { if ($('#termlistfilter').html() != "") - $('#termlistfilter').empty() + $('#termList').empty(); + $('#termlistfilter').empty() if ($scope.pinTermData.length > 0) { $timeout(function () { console.log('pinTermData= ' + $scope.pinTermData.length); - for (var j = 0; j < $scope.pinTermData.length; j++) { var $el = $('
  • ' + $scope.pinTermData[j].TermTxt + '
    • ').appendTo('#termlistfilter') $compile($el)($scope); - + var $selectedOptions = $('').appendTo("#termList") + $compile($selectedOptions)($scope); + $("#bodySystems").empty(); + $("#bodySystemList li a").each(function (key, value) { + var $systemOptions = $('').appendTo("#bodySystems") + $compile($systemOptions)($scope); + }); } - }, 500); } }) - + }, function (error) { // handle errors here console.log(' error: ' + error.statusText); } ) - } - $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo) { + $scope.$on('listManagerEvent', function (event, data) { + $("#viewName").empty(); + $("#viewName").append(""); + + $rootScope.isLoading = false; + $('#spinner').css('visibility', 'hidden'); + + }); + + + + $scope.refreshTermListOnSystemSelection = function (bodySystemId) { + var bodySystemName = $("#bodySystems #" + bodySystemId).val(); + + if (bodySystemName == "All") { + for (var j = 0; j <= $scope.pinTermData.length - 1; j++) { + var $selectedOptions = $('').appendTo("#termList") + $compile($selectedOptions)($scope); + } + } + else { + var imageId = $rootScope.imageId; + $scope.pinDataUrl = "aa_dat_pinterm_" + imageId; + $rootScope.bodySystemTermArray = []; + $('#termList').empty(); + $.ajax({ + url: '~/../content/data/json/aa/aa_pinterm/' + $scope.pinDataUrl + '.json', + type: 'GET', + dataType: "json", + async: false, + success: function (result) { + $(result.PinTermData.TermData).each(function (key, value) { + $rootScope.bodySystemTermArray.push({ "termNumbr": result.PinTermData.TermData[key]._TermNumber, "text": result.PinTermData.TermData[key]._TermText, "language": result.PinTermData.TermData[key]._LanguageId }); + }); + for (var i = 0; i <= $scope.aaPinData.length - 1; i++) { + if ($scope.aaPinData[i]._BodySystemName.toLowerCase() == bodySystemName.toLowerCase()) { + for (var j = 0 ; j <= $rootScope.bodySystemTermArray.length - 1; j++) { + if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) { + if ($rootScope.bodySystemTermArray[j].language == "1") { + console.log($rootScope.bodySystemTermArray[j].text); + var $selectedOptions = $('').appendTo("#termList") + $compile($selectedOptions)($scope); + } + } + } + } + } + } + + }); + } + } + $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo) { + + var languageArray = $rootScope.lexiconLanguageArray; if ($scope.AAPinTermData != null || $scope.AAPinTermData != undefined) { @@ -1132,34 +1286,22 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo .from($scope.AAPinTermData) .where('_TermNumber == ' + actualTermNo) .select(); - + if ($scope.matchedTermNoData != null || $scope.matchedTermNoData != undefined) { - + for (var j = 0; j <= languageArray.length - 1; j++) { - + $scope.matchedLanguageTermNoData = new jinqJs() .from($scope.matchedTermNoData) .where('_LanguageId == ' + languageArray[j].id) .select(); - var termText = $scope.matchedLanguageTermNoData[0]._TermText; - $scope.MultiLanguageAnnationArray.push(termText); - - }; - - - } - } } - - - - $scope.hidePins = function () { $rootScope.isLoading = true; @@ -1184,6 +1326,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $rootScope.isLoading = false; $('#spinner').css('visibility', 'hidden'); + $(".tooltip-custom").removeClass("btn-primary"); + $(".tooltip-custom").addClass("btn-black"); + $("#hidePinBtn").addClass("btn-primary"); } $scope.showAllPinsAfterHide = function (event) { @@ -1204,6 +1349,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $scope.showSystemPins($scope.aaPinData, false); } $scope.showSpeechBubble(); + $(".tooltip-custom").removeClass("btn-primary"); + $(".tooltip-custom").addClass("btn-black"); + $("#allPinBtn").addClass("btn-primary"); }; @@ -1224,7 +1372,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } $scope.showSpeechBubble(); - + $(".tooltip-custom").removeClass("btn-primary"); + $(".tooltip-custom").addClass("btn-black"); + $("#selectedPin").addClass("btn-primary"); }; @@ -1341,16 +1491,32 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } $scope.highlightPinBasedOnSerachItem = function (event) { + + if ($scope.isTermListOptionClicked == true) { + $scope.searchItemId = event; + $scope.searchItemText = event.innerHTML; + $('#termList option[selected="selected"]').prop("selected", false); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); + $scope.searchFilter = event.innerHTML; + selectedTermName.placeholder = event.innerHTML; + $scope.isTermListOptionClicked = false; + } + else + { + $scope.searchItemId = event.currentTarget.id; + $scope.searchItemText = event.currentTarget.innerHTML; + $('#termList option[selected="selected"]').prop("selected", false); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); + + $scope.searchFilter = event.currentTarget.innerHTML; + selectedTermName.placeholder = event.currentTarget.innerHTML; - $scope.searchItemId = event.currentTarget.id; - $scope.searchItemText = event.currentTarget.innerHTML; - $('#termList option[selected="selected"]').prop("selected", false); - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); + } - $scope.searchFilter = event.currentTarget.innerHTML; - selectedTermName.placeholder = event.currentTarget.innerHTML; //get data from pindata for this trem @@ -1396,8 +1562,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo } } } + + + }]); + +function refreshTermListOnSystem(bodySystemId) { + // alert('refreshTermListOnSystem is called outside'); + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + scope.$apply(function () { + scope.refreshTermListOnSystemSelection(bodySystemId); + }); +} + function showSelectedSystemPins(event) { console.log('OnBodySystem chnaged is called outside '); var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); @@ -1446,6 +1624,16 @@ function onSearchItemSelection(event) { }); } +function onListManagerTermSelection(event) { + var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); + scope.isTermListOptionClicked = true; + scope.$apply(function () { + scope.highlightPinBasedOnSerachItem(event); + }); + +} + + function showHideAnnotation(event) { var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope(); @@ -1463,6 +1651,34 @@ function showSelectedPins(event) { }); } + +function openModuleItemView(event) { + var scope = angular.element(document.getElementById("list-view")).scope(); + scope.isListViewButtonClicked = true; + scope.$apply(function () { + scope.openModuleItemView(event); + }); +} + +function openListViewModuleItem(event) { + + var scope = angular.element(document.getElementById("list-view")).scope(); + scope.isListViewButtonClicked = true; + scope.$apply(function () { + scope.openListViewModuleItem(event); + }); +} + +function openCurrentView(event) { + + var scope = angular.element(document.getElementById("list-view")).scope(); + scope.isOpenBtnClicked = true; + scope.$apply(function () { + scope.openModuleItemView(event); + }); + +} + function onZoom(scope) { //$(".common-drag").remove(); 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 32876ad..18ebf96 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 @@ -16,11 +16,48 @@ left: 0; right: 0; } - .active - { - margin-left:15px!important; + + .active { + margin-left: 15px !important; + } + + .tools1 { + left: -96px; + } + + .tooltip-custom + .tooltip > .tooltip-inner { + background-color: #fff; + border: 1px solid #000; + color: #000; + border-radius: 0; + } + + .tooltip-custom + .tooltip > .tooltip-arrow { + display: none; + } + + + .custom-tooltip { + background-color: #333; + border: 0 none; + color: #fff !important; + left: -52px; + /*opacity: 0.9;*/ + padding: 7px; + position: absolute; + text-align: center; + top: 45px; + width: 120px; + display: none; + z-index: 120000; + border: 1px solid #000; + color: #000; + border-radius: 0; + } + + .pad0 { + padding: 0; } - .tools1{left:-96px;}
    @@ -34,12 +71,12 @@
    -
    -
    -
    -
    - - +
    +
    +
    +
    +
    Select System
    +
    -
    +

    Zoom

    @@ -136,17 +173,17 @@
    -
    +
    + +
    +
    @@ -156,12 +193,27 @@
    - + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html index 8f56970..cb230d1 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html @@ -82,7 +82,7 @@ --> -
    +
    @@ -96,7 +96,8 @@
    -
    +
    +