ADAM / AIAHTML5

Commit 442da07c65589fa4d81fcd96057429978c1e347c

Authored by Sandeep Kumar
2 parents 672a1e70 adc5afdd

Merge branch 'AIA_Develop' of https://gitlab.ebix.com/ADAM/AIAHTML5 into AIA_Develop

Inline Side-by-side
Showing 5 changed files with 52 additions and 25 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @442da07
... ... @@ -395,7 +395,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
395 395 setTimeout(function () {
396 396 var cleintht=imfgEle.clientHeight;
397 397 if(cleintht>0)
398   - $('.jsPanel-content').css('height', cleintht);
  398 + $('#CBSourceImagePanel .jsPanel-content').css('height', cleintht);
399 399 $scope.CBEnableUI();
400 400 }, 200)
401 401  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @442da07
... ... @@ -139,7 +139,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
139 139 'updatedWhiteImageMRDataList':[],
140 140 'updatedGrayDataList':[],
141 141 'updatedGrayMRDataList':[],
142   -
  142 + 'SearchTimeStampValue':0,
143 143  
144 144 });
145 145  
... ... @@ -231,7 +231,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
231 231 'updatedWhiteImageDataList':[],
232 232 'updatedWhiteImageMRDataList':[],
233 233 'updatedGrayDataList':[],
234   - 'updatedGrayMRDataList':[],
  234 + 'updatedGrayMRDataList': [],
  235 + 'SearchTimeStampValue': 0,
235 236 });
236 237  
237 238 }
... ... @@ -1235,7 +1236,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
1235 1236 $("#Skeletal").attr("id", "Skeletal_" + $rootScope.MULTI_VIEW_ID);
1236 1237 $("#Urinary").attr("id", "Urinary_" + $rootScope.MULTI_VIEW_ID);
1237 1238  
1238   - var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('<input type="text" class="form-control input-sm pull-left da-search" id="typedTermName_' + $rootScope.MULTI_VIEW_ID + '" onclick="OnSearch(event)" ondblclick="OnSearch(event)" ng-model="searchFilter" ng-change="resetSearchListView()" ng-blur="HideSearch()" placeholder=" search..." />')
  1239 + var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('<input type="text" class="form-control input-sm pull-left da-search" id="typedTermName_' + $rootScope.MULTI_VIEW_ID + '" onclick="OnSearch(event)" ondblclick="OnSearch(event)" ng-model="searchFilter" ng-keyup="resetSearchListView($event)" ng-blur="HideSearch()" placeholder=" search..." />')
1239 1240 $compile($all)($scope);
1240 1241  
1241 1242 }
... ... @@ -9690,6 +9691,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9690 9691  
9691 9692 $scope.SetwindowStoreData(windowviewid,'isSearchClicked',true);
9692 9693 console.log('ShowSearch is called');
  9694 + // clear time stamp on text box click
  9695 + $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', 0);
9693 9696  
9694 9697 var primaryLexiconIndx = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd');
9695 9698  
... ... @@ -9706,6 +9709,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9706 9709 if ($('#searchListDiv_' + windowviewid).html() != "")
9707 9710 $('#searchListDiv_' + windowviewid).empty();
9708 9711 //Delay compile of ul li so that the remove of li is completed.
  9712 + $timeout(function () {
9709 9713  
9710 9714 $scope.isSearchDataLoaded = true;
9711 9715 var ColoredImageSRC=$scope.GetwindowStoreData(windowviewid,'ColoredImageSRC');
... ... @@ -9728,10 +9732,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9728 9732 $('#spinner').css('visibility', 'hidden');
9729 9733 }
9730 9734 }
9731   -
  9735 + }, 500);
9732 9736  
9733 9737 console.log("primary language: " + vocabTermDataArray[primaryLexiconIndx].language);
9734 9738  
  9739 + $timeout(function () {
9735 9740 $rootScope.a = primaryLexiconIndx;
9736 9741  
9737 9742 $scope.vocabArray = vocabTermDataArray;
... ... @@ -9747,6 +9752,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9747 9752  
9748 9753 $("#termlistfilter_" + windowviewid).css("display", "block");
9749 9754  
  9755 + }, 150);//Bug#39757
  9756 +
9750 9757 $timeout(function () {
9751 9758  
9752 9759 $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
... ... @@ -10581,41 +10588,60 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10581 10588 }
10582 10589  
10583 10590  
10584   - $scope.resetSearchListView = function () {
  10591 + $scope.resetSearchListView = function (event) {
  10592 +
  10593 + var len = (event.target.id).split("_").length;
  10594 + var windowviewid = (event.target.id).split("_")[len - 1];
10585 10595  
10586   - // $scope.ShowSearch();
10587   - $scope.showFilteredTerms()
  10596 + var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue');
  10597 +
  10598 + //var newSearchValue = $("#typedTermName_" + windowviewid).val();
  10599 + var date = new Date();
  10600 + var newtimestamp = date.getTime();
  10601 +
  10602 + // console.log('search text value: ' + newSearchValue);
  10603 +
  10604 + var oldtimestamp = $scope.GetwindowStoreData(windowviewid, 'SearchTimeStampValue');
  10605 +
  10606 + if ((newtimestamp - oldtimestamp) > 1000) {
  10607 +
  10608 + $scope.SetwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp);
  10609 + $scope.showFilteredTerms(windowviewid);
  10610 + }
  10611 +
10588 10612 }
10589 10613  
10590   - $scope.showFilteredTerms = function () {
10591   - var len= (event.target.id).split("_").length;
10592   - var windowviewid = (event.target.id).split("_")[len-1];
  10614 +
  10615 + $scope.showFilteredTerms = function (windowviewid) {
10593 10616  
10594   - if ($('#searchListDiv_' + windowviewid).html() != "") {
10595   - $('#searchListDiv_' + windowviewid).empty();
10596   - }
  10617 + console.log('showFilteredTerms is called' );
  10618 +
  10619 + $('#searchListDiv_' + windowviewid).empty();
  10620 +
10597 10621 var vocabTermDataArray = $scope.GetwindowStoreData(windowviewid, 'vocabTermDataArray');
10598 10622 $scope.vocabArray = vocabTermDataArray;
10599 10623 $rootScope.a = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd');
10600 10624  
10601   - $scope.sFilter = $("#typedTermName_" + windowviewid).val();
  10625 + $scope.sFilter = $("#typedTermName_" + windowviewid).val();;
10602 10626 var $e2 = $('<ul id="termlistfilter_' + windowviewid + '" class="form-control dropdown-menu ng-scope" style="height:132px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"><li class="ng-scope" ng-repeat="item in vocabArray[a].vocabTermTxt| filter:{ _TermText: sFilter}| limitTo : 10">' +
10603 10627 '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
10604 10628 ' </li></ul>').appendTo('#searchListDiv_' + windowviewid);
10605 10629 $compile($e2)($scope);
10606 10630  
10607 10631 $("#termlistfilter_" + windowviewid).css("display", "block");
10608   - $timeout(function () {
10609   - $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
  10632 +
10610 10633  
10611   - if ($(this).find("a").html() == document.getElementById("typedTermName_" + windowviewid).value) {
10612   - $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
10613   - $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
10614   - }
10615   - });
  10634 + //$timeout(function () {
  10635 + // $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
  10636 +
  10637 + // if ($(this).find("a").html() == document.getElementById("typedTermName_" + windowviewid).value) {
  10638 + // $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
  10639 + // $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
  10640 + // }
  10641 + // });
10616 10642  
10617 10643  
10618   - }, 100);
  10644 + //}, 100);
10619 10645 };
10620 10646 $scope.ApplySearch = function () {
10621 10647 var len= (event.currentTarget.id).split("_").length;
... ... @@ -10744,7 +10770,7 @@ function OnSearch(event) {
10744 10770 var len= (event.currentTarget.id).split("_").length;
10745 10771 var windowviewid = (event.currentTarget.id).split("_")[len-1];
10746 10772 scope.ShowSearch(windowviewid);
10747   - });
  10773 + });
10748 10774 }
10749 10775  
10750 10776 function selectTerm(event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @442da07
... ... @@ -848,7 +848,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
848 848 $("#canvasDiv").scrollTop($rootScope.CanvasDivTopPosition);
849 849 });
850 850 // $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
851   - $(document).on("click", " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
  851 + $(document).on("click", "#" + $scope.jsPanelID +" .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
852 852  
853 853 // $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
854 854 $scope.setActiveTab(parseInt($rootScope.getLocalStorageValue("activeTab")));
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/favicon.ico 0 → 100644
View file @442da07
No preview for this file type
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @442da07
... ... @@ -14,6 +14,7 @@
14 14 <!--<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">-->
15 15 <meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1.0 maximum-scale=1.0" />
16 16 <title>A.D.A.M. Interactive Anatomy</title>
  17 + <link rel="icon" type="image/x-icon" href="/content/images/favicon.ico">
17 18  
18 19 <link href="themes/default/css/bootstrap/3.3.6/bootstrap.css?v=1.0.0" rel="stylesheet" />
19 20  
... ...