From adc5afdd88e1c2dfbcddade92f30b0c8cb841fe8 Mon Sep 17 00:00:00 2001 From: birendra.kumar Date: Tue, 24 Dec 2019 11:38:28 +0530 Subject: [PATCH] bug fixes in DA and panel close issue --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js | 72 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico | Bin 0 -> 5430 bytes 400-SOURCECODE/AIAHTML5.Web/index.aspx | 1 + 5 files changed, 52 insertions(+), 25 deletions(-) create mode 100644 400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js index 6445b97..3c9d734 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js @@ -390,7 +390,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $ setTimeout(function () { var cleintht=imfgEle.clientHeight; if(cleintht>0) - $('.jsPanel-content').css('height', cleintht); + $('#CBSourceImagePanel .jsPanel-content').css('height', cleintht); $scope.CBEnableUI(); }, 200) diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index 0864d37..5392df4 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -139,7 +139,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l 'updatedWhiteImageMRDataList':[], 'updatedGrayDataList':[], 'updatedGrayMRDataList':[], - + 'SearchTimeStampValue':0, }); @@ -231,7 +231,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l 'updatedWhiteImageDataList':[], 'updatedWhiteImageMRDataList':[], 'updatedGrayDataList':[], - 'updatedGrayMRDataList':[], + 'updatedGrayMRDataList': [], + 'SearchTimeStampValue': 0, }); } @@ -1235,7 +1236,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $("#Skeletal").attr("id", "Skeletal_" + $rootScope.MULTI_VIEW_ID); $("#Urinary").attr("id", "Urinary_" + $rootScope.MULTI_VIEW_ID); - var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('') + var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('') $compile($all)($scope); } @@ -9690,6 +9691,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.SetwindowStoreData(windowviewid,'isSearchClicked',true); console.log('ShowSearch is called'); + // clear time stamp on text box click + $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', 0); var primaryLexiconIndx = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd'); @@ -9706,6 +9709,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l if ($('#searchListDiv_' + windowviewid).html() != "") $('#searchListDiv_' + windowviewid).empty(); //Delay compile of ul li so that the remove of li is completed. + $timeout(function () { $scope.isSearchDataLoaded = true; var ColoredImageSRC=$scope.GetwindowStoreData(windowviewid,'ColoredImageSRC'); @@ -9728,10 +9732,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $('#spinner').css('visibility', 'hidden'); } } - + }, 500); console.log("primary language: " + vocabTermDataArray[primaryLexiconIndx].language); + $timeout(function () { $rootScope.a = primaryLexiconIndx; $scope.vocabArray = vocabTermDataArray; @@ -9747,6 +9752,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $("#termlistfilter_" + windowviewid).css("display", "block"); + }, 150);//Bug#39757 + $timeout(function () { $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) { @@ -10581,41 +10588,60 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } - $scope.resetSearchListView = function () { + $scope.resetSearchListView = function (event) { + + var len = (event.target.id).split("_").length; + var windowviewid = (event.target.id).split("_")[len - 1]; - // $scope.ShowSearch(); - $scope.showFilteredTerms() + var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue'); + + //var newSearchValue = $("#typedTermName_" + windowviewid).val(); + var date = new Date(); + var newtimestamp = date.getTime(); + + // console.log('search text value: ' + newSearchValue); + + var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue'); + + if ((newtimestamp - oldtimestamp) > 1000) { + + $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp); + $scope.showFilteredTerms(windowviewid); + } + } - $scope.showFilteredTerms = function () { - var len= (event.target.id).split("_").length; - var windowviewid = (event.target.id).split("_")[len-1]; + + $scope.showFilteredTerms = function (windowviewid) { - if ($('#searchListDiv_' + windowviewid).html() != "") { - $('#searchListDiv_' + windowviewid).empty(); - } + console.log('showFilteredTerms is called' ); + + $('#searchListDiv_' + windowviewid).empty(); + var vocabTermDataArray = $scope.GetwindowStoreData(windowviewid, 'vocabTermDataArray'); $scope.vocabArray = vocabTermDataArray; $rootScope.a = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd'); - $scope.sFilter = $("#typedTermName_" + windowviewid).val(); + $scope.sFilter = $("#typedTermName_" + windowviewid).val();; var $e2 = $('').appendTo('#searchListDiv_' + windowviewid); $compile($e2)($scope); $("#termlistfilter_" + windowviewid).css("display", "block"); - $timeout(function () { - $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) { + - if ($(this).find("a").html() == document.getElementById("typedTermName_" + windowviewid).value) { - $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" }); - $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" }); - } - }); + //$timeout(function () { + // $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) { + + // if ($(this).find("a").html() == document.getElementById("typedTermName_" + windowviewid).value) { + // $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" }); + // $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" }); + // } + // }); - }, 100); + //}, 100); }; $scope.ApplySearch = function () { var len= (event.currentTarget.id).split("_").length; @@ -10744,7 +10770,7 @@ function OnSearch(event) { var len= (event.currentTarget.id).split("_").length; var windowviewid = (event.currentTarget.id).split("_")[len-1]; scope.ShowSearch(windowviewid); - }); + }); } function selectTerm(event) { diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index b866b7a..b93dc8b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -848,7 +848,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition); }); // $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) { - $(document).on("click", " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { + $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { // $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () { $scope.setActiveTab(parseInt($rootScope.getLocalStorageValue("activeTab"))); diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico b/400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico new file mode 100644 index 0000000..705ee19 Binary files /dev/null and b/400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico differ diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx index 1900dcc..fe72734 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.aspx +++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx @@ -14,6 +14,7 @@ A.D.A.M. Interactive Anatomy + -- libgit2 0.21.4