ADAM / AIAHTML5

Commit e180d3c0625b5a7949670dd6624e9a58e798930e

Authored by Nikita Kulshreshtha
2 parents 318ffb97 5049713a

Merge branch 'Develop' of http://gitlab.ebix.com/ADAM/AIAHTML5 into QA

Inline Side-by-side
Showing 2 changed files with 230 additions and 95 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @e180d3c
... ... @@ -9000,47 +9000,47 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9000 9000 }
9001 9001  
9002 9002 $scope.jumpToTerm = function (event) {
9003   -
9004   - $rootScope.searchSelectedText = $('#' + event.currentTarget.id).text();
9005   - $('#termList option[selected="selected"]').prop("selected", false);
9006   - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
9007   - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
9008   - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
  9003 + if ($rootScope.searchSelectedText != $('#' + event.currentTarget.id).text()) {
  9004 + $rootScope.searchSelectedText = $('#' + event.currentTarget.id).text();
  9005 + $('#termList option[selected="selected"]').prop("selected", false);
  9006 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  9007 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  9008 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
9009 9009  
9010 9010  
9011   - $rootScope.isLoading = true;
  9011 + $rootScope.isLoading = true;
9012 9012  
9013   - $('#spinner').css('visibility', 'visible');
9014   - //1.
9015   - $scope.searchFilter = event.currentTarget.innerHTML;
  9013 + $('#spinner').css('visibility', 'visible');
  9014 + //1.
  9015 + $scope.searchFilter = event.currentTarget.innerHTML;
9016 9016  
9017   - //2.
9018   - $scope.HighlightBodyOnListManagerSelection(event.currentTarget.id);
  9017 + //2.
  9018 + $scope.HighlightBodyOnListManagerSelection(event.currentTarget.id);
9019 9019  
9020   - $scope.IsSearchVisible = false;
9021   - $rootScope.isNormalMode = false;
  9020 + $scope.IsSearchVisible = false;
  9021 + $rootScope.isNormalMode = false;
9022 9022  
9023   - //Highlight only Highlight button
  9023 + //Highlight only Highlight button
9024 9024  
9025   - $("#btnHighLight").addClass("btn-primary");
9026   - $("#btnHighLight").removeClass("btn-black");
  9025 + $("#btnHighLight").addClass("btn-primary");
  9026 + $("#btnHighLight").removeClass("btn-black");
9027 9027  
9028   - if (!$("#btnNormalMode").hasClass("btn-black")) {
9029   - $("#btnNormalMode").addClass("btn-black");
9030   - }
  9028 + if (!$("#btnNormalMode").hasClass("btn-black")) {
  9029 + $("#btnNormalMode").addClass("btn-black");
  9030 + }
9031 9031  
9032   - if (!$("#btnExtract").hasClass("btn-black")) {
9033   - $("#btnExtract").addClass("btn-black");
9034   - }
  9032 + if (!$("#btnExtract").hasClass("btn-black")) {
  9033 + $("#btnExtract").addClass("btn-black");
  9034 + }
9035 9035  
9036   - if ($("#btnExtract").hasClass("btn-primary")) {
9037   - $("#btnExtract").removeClass("btn-primary");
9038   - }
  9036 + if ($("#btnExtract").hasClass("btn-primary")) {
  9037 + $("#btnExtract").removeClass("btn-primary");
  9038 + }
9039 9039  
9040   - if ($("#btnNormalMode").hasClass("btn-primary")) {
9041   - $("#btnNormalMode").removeClass("btn-primary");
  9040 + if ($("#btnNormalMode").hasClass("btn-primary")) {
  9041 + $("#btnNormalMode").removeClass("btn-primary");
  9042 + }
9042 9043 }
9043   -
9044 9044 }
9045 9045  
9046 9046 //Function to set the vertical and horizontal scroll position of CanvasDiv as per the Navigator
... ... @@ -9801,9 +9801,61 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9801 9801  
9802 9802 $scope.resetSearchListView = function () {
9803 9803  
9804   - $scope.ShowSearch();
  9804 + // $scope.ShowSearch();
  9805 + $scope.showFilteredTerms()
  9806 + }
  9807 + $scope.showFilteredTerms = function () {
  9808 +
  9809 + if ($('#searchListDiv').html() != "") {
  9810 + $('#searchListDiv').empty();
  9811 + }
  9812 + $rootScope.a = $scope.primaryLexiconInd;
  9813 + var $e2 = $('<ul id="termlistfilter" class="form-control dropdown-menu ng-scope" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"><li class="ng-scope" ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: searchFilter}| limitTo : 10">' +
  9814 + '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
  9815 + ' </li></ul>').appendTo('#searchListDiv')
  9816 + $compile($e2)($scope);
  9817 + document.getElementById("termlistfilter").style.display = "block";
  9818 + $timeout(function () {
  9819 + $("#backdrop > #searchListDiv > #termlistfilter > li").each(function (key, value) {
  9820 + if ($(this).find("a").html() == document.getElementById("typedTermName").value) {
  9821 + $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
  9822 + $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
  9823 + }
  9824 + });
  9825 + }, 100);
  9826 + };
  9827 +
  9828 + $scope.ApplySearch = function () {
  9829 + $rootScope.isLoading = false;
  9830 + $('#spinner').css('visibility', 'hidden');
  9831 +
  9832 + $('#searchedTermListPopUp').css('display', 'block');
  9833 + $("#searchedTermListPopUp").css("visibility", "visible");
  9834 +
  9835 + $('#searchedTermListPopUp').draggable();
  9836 +
  9837 + $scope.FillSearchList();
9805 9838 }
  9839 + $scope.FillSearchList = function () {
  9840 + if ($('#searchTermListUl').html() != "") {
  9841 + $('#searchTermListUl').empty();
  9842 + }
  9843 + $rootScope.a = $scope.primaryLexiconInd;
  9844 + $scope.sFilter = $("#typedTermName").val();
  9845 + var $e2 = $('<li class="ng-scope" ng-repeat="item in vocabTermDataArray[a].vocabTermTxt| filter:{ _TermText: sFilter}">' +
  9846 + '<a id="{{item._ActualTermNumber}}" href="" onclick="selectTerm(event)">{{item._TermText}}</a>' +
  9847 + ' </li>').appendTo('#searchTermListUl')
  9848 + $compile($e2)($scope);
  9849 +
  9850 + $rootScope.isLoading = false;
  9851 + $('#spinner').css('visibility', 'hidden');
9806 9852  
  9853 + }
  9854 + $scope.closeSerachTermListPopUp = function () {
  9855 + $('#searchedTermListPopUp').css('display', 'none');
  9856 + $("#searchedTermListPopUp").css("visibility", "hidden");
  9857 +
  9858 + }
9807 9859 }])
9808 9860  
9809 9861 function OnGenderChange(event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @e180d3c
... ... @@ -36,7 +36,7 @@
36 36 border: solid;
37 37 position: absolute;
38 38 /*Bug #24255: Mac > DA > Body Navigator is not appear properly.*/
39   - height:14px !important;
  39 + height: 14px !important;
40 40 }
41 41  
42 42 #wrapper {
... ... @@ -46,7 +46,7 @@
46 46 margin: 20px auto;
47 47 }
48 48  
49   - .tooltip-custom + .tooltip > .tooltip-inner {
  49 + .tooltip-custom + .tooltip > .tooltip-inner {
50 50 background-color: #fff;
51 51 border: 1px solid #000;
52 52 color: #000;
... ... @@ -111,7 +111,10 @@
111 111 color: #000;
112 112 border-radius: 0;
113 113 }
114   - .pad0{padding:0;}
  114 +
  115 + .pad0 {
  116 + padding: 0;
  117 + }
115 118 </style>
116 119 <!--Annotation Toolbar: Jcanvas-->
117 120 <style>
... ... @@ -132,7 +135,6 @@
132 135 left: 0;
133 136 right: 0;
134 137 }
135   -
136 138 </style>
137 139 <div class=" " id="daView" ng-controller="DAController">
138 140 <div class="pos-relative leftToolBar tools pull-left">
... ... @@ -168,9 +170,11 @@
168 170 <div class="custom-tooltip">Highlight Options</div>
169 171 <button class="btn btn-black btn-sm pull-right marginTop5 dropdown-toggle" type="button" id="dropdownMenu2" ng-click="LoadBodySystemData($event)"><img src="content/images/icon-highlight.png" alt="" title=""></button>
170 172 <ul class="dropdown-menu" id="structureDropdown">
171   - <li ng-class="CurrentStructure" ><a href="#" title="Current Structure"
172   - onclick="OnBodySystemSelection(event)">Current Structure</a></li>
173   -
  173 + <li ng-class="CurrentStructure">
  174 + <a href="#" title="Current Structure"
  175 + onclick="OnBodySystemSelection(event)">Current Structure</a>
  176 + </li>
  177 +
174 178  
175 179 <li role="separator" class="divider"></li>
176 180 <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
... ... @@ -274,11 +278,10 @@
274 278 <div class="">
275 279 <div class="input-group col-sm-8 col-xs-7 col-md-10 pull-left">
276 280  
277   - <input type="text" class="form-control input-sm pull-left" id="typedTermName" onclick="OnSearch()" ondblclick="OnSearch()" ng-model="searchFilter" ng-change="resetSearchListView()" ng-blur="HideSearch()" placeholder=" search...">
278   -
  281 + <!--<input type="text" class="form-control input-sm pull-left" id="typedTermName" onclick="OnSearch()" ng-model="searchFilter" ng-blur="HideSearch()" ng-change="resetSearchListView()" placeholder=" search..." >-->
  282 + <input type="text" class="form-control input-sm pull-left" id="typedTermName" onclick="OnSearch()" ng-model="searchFilter" ng-change="showFilteredTerms()" ng-blur="HideSearch()" placeholder=" search..." ng-model-options="{debounce: 500}">
279 283 <div id="backdrop" ng-show="IsSearchVisible">
280 284 <div id="searchListDiv" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
281   -
282 285 </div>
283 286 </div>
284 287  
... ... @@ -290,6 +293,12 @@
290 293 <i class="fa fa-caret-down" style="font-size:20px;"></i>
291 294 </button>
292 295 </div>
  296 + <div class="btn-group" style="vertical-align:top;">
  297 + <!-- <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6>-->
  298 + <button type="button" class="btn btn-primary btn-sm col-xs-12" ng-click="ApplySearch()" style="margin-right:2px;">
  299 + <i class="fa fa-search"></i>
  300 + </button>
  301 + </div>
293 302 <div class="btn-group open" id="da-body-nav">
294 303 <button type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-primary dropdown-toggle btn-sm" id="navigatorBtn">
295 304 <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
... ... @@ -383,36 +392,36 @@
383 392 </div>
384 393 </div>
385 394 <div class="modal fade" id="daMessageModal" role="dialog" style="top:20%;">
386   -
387   - <div class="modal-dialog modal-sm">
388   -
389   -
390   -
391   - <div class="modal-content">
392   -
393   -
  395 +
  396 + <div class="modal-dialog modal-sm">
  397 +
  398 +
  399 +
  400 + <div class="modal-content">
  401 +
  402 +
394 403 <div class="modal-header">
395   -
  404 +
396 405 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
397   -
398   - </div>
399   -
400   - <div class="modal-title"></div>
401   -
402   - <!--<div class="modal-body">"No body system"</div>-->
403   -
404   - <div class="modal-header"><p data-ng-bind ="message" style="font-size:15px;"></p></div>
405   -
406   -
407   -
  406 +
  407 + </div>
  408 +
  409 + <div class="modal-title"></div>
  410 +
  411 + <!--<div class="modal-body">"No body system"</div>-->
  412 +
  413 + <div class="modal-header"><p data-ng-bind="message" style="font-size:15px;"></p></div>
  414 +
  415 +
  416 +
408 417 <div class="modal-footer"> <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal">OK</button></div>
409   -
410   -
  418 +
  419 +
411 420 </div>
412   -
413   -
  421 +
  422 +
414 423 </div>
415   -
  424 +
416 425 </div>
417 426  
418 427  
... ... @@ -431,6 +440,83 @@
431 440 </div>
432 441 </div>
433 442 </div>
  443 + <style>
  444 + #searchedTermListPopUp {
  445 + background: #fff;
  446 + border-radius: 3px;
  447 + border: 1px solid #ededed;
  448 + -webkit-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
  449 + -moz-box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
  450 + box-shadow: 0px 0px 2px 1px rgba(173,173,173,1);
  451 + width: 350px;
  452 + position: absolute;
  453 + top: 170px;
  454 + left: 140px;
  455 + display: none;
  456 + z-index: 780000;
  457 + height: auto !important;
  458 + }
  459 +
  460 + #searchedTermListPopUp .annotation-modal-header {
  461 + background: #818f44;
  462 + padding: 2px 10px;
  463 + }
  464 +
  465 + #searchedTermListPopUp .annotation-modal-header h4 {
  466 + color: #fff;
  467 + font-size: 15px;
  468 + line-height: 20px;
  469 + }
  470 +
  471 + #searchedTermListPopUp .modal-header .close {
  472 + color: #fff;
  473 + margin: 0;
  474 + opacity: 10;
  475 + text-shadow: none;
  476 + }
  477 +
  478 + #searchedTermListPopUp .modal-footer {
  479 + padding: 5px 10px;
  480 + }
  481 + </style>
  482 +
  483 +
  484 +
  485 + <div id="searchedTermListPopUp" style="">
  486 + <div class="modal-header annotation-modal-header">
  487 + <button type="button" class="close" aria-label="Close" ng-click="closeSerachTermListPopUp()"><span aria-hidden="true">&times;</span></button>
  488 + <h4 class="modal-title" id="myModalLabel">Search List</h4>
  489 + </div>
  490 + <div class="modal-body">
  491 + <div class="row paddingTopBtm10">
  492 + <div class="col-sm-12">
  493 +
  494 +
  495 + <div style="">
  496 +
  497 +
  498 + <!--DA > List Manager > Multiple structure selection should not be available.-->
  499 + <div class="form-group">
  500 + <!--<select id="searchTermList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id, true)"></select>-->
  501 + <ul id="searchTermListUl" class="form-control dropdown-menu" style="height:200px;width:100%;overflow-y:scroll;position:absolute;display:block;z-index:60001;"></ul>
  502 +
  503 + </div>
  504 +
  505 + </div>
  506 + <div style="clear:both;"></div>
  507 +
  508 +
  509 +
  510 +
  511 + </div>
  512 + </div>
  513 +
  514 + </div>
  515 + <div class="modal-footer" id="totalTerms">
  516 + <!--<span class="pull-left marginTop5">424 Structures</span>-->
  517 + <!--<button data-dismiss="modal" class="btn btn-primary" type="button"><i class="fa fa-arrow-circle-right"></i></button>-->
  518 + </div>
  519 + </div>
434 520 </div>
435 521 <!--<script src="../../../libs/jquery/1.11.4/jquery-ui.js"></script>-->
436 522 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
... ... @@ -444,7 +530,7 @@
444 530 <script>
445 531 $(window).load(function () {
446 532 $(".stickey-area").sticky();
447   -
  533 +
448 534  
449 535 });</script>
450 536 <script>
... ... @@ -462,14 +548,12 @@
462 548 && (e.which < 37 // arrow keys
463 549 || e.which > 40)
464 550 && (e.keyCode < 96 // Dissectible Anatomy > Num Lock is not working for enter the layer.
465   - || e.keyCode > 105))
466   -
467   - {
  551 + || e.keyCode > 105)) {
468 552 e.preventDefault();
469 553 return false;
470 554 }
471 555 });
472   -
  556 +
473 557 });
474 558  
475 559 </script>
... ... @@ -485,10 +569,10 @@
485 569 <script>
486 570 $(function () {
487 571  
488   -
489   - // issue in navigator image in internet explorer
  572 +
  573 + // issue in navigator image in internet explorer
490 574 if ($.browser.msie == true) {
491   - $("#navigatorDiv").css({"min-width":"auto", "min-height":"auto"});
  575 + $("#navigatorDiv").css({ "min-width": "auto", "min-height": "auto" });
492 576 $("#containment-wrapper").css("min-width", "auto");
493 577 }
494 578 $("#transparencyScale").draggable();
... ... @@ -501,30 +585,29 @@
501 585 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
502 586  
503 587 }
504   - else
505   - {
506   - $("#dropdownMenu2").mouseover(function () {
507   - $(".custom-tooltip").css("display", "block");
508   - });
509   - $("#dropdownMenu2").mouseout(function () {
510   - $(".custom-tooltip").css("display", "none");
511   - });
  588 + else {
  589 + $("#dropdownMenu2").mouseover(function () {
  590 + $(".custom-tooltip").css("display", "block");
  591 + });
  592 + $("#dropdownMenu2").mouseout(function () {
  593 + $(".custom-tooltip").css("display", "none");
  594 + });
512 595  
513   - $("#dropdownMenu4").mouseover(function () {
514   - $(".custom-tooltip1").css("display", "block");
515   - });
516   - $("#dropdownMenu4").mouseout(function () {
517   - $(".custom-tooltip1").css("display", "none");
518   - });
  596 + $("#dropdownMenu4").mouseover(function () {
  597 + $(".custom-tooltip1").css("display", "block");
  598 + });
  599 + $("#dropdownMenu4").mouseout(function () {
  600 + $(".custom-tooltip1").css("display", "none");
  601 + });
  602 +
  603 + $("#dropdownMenu3").mouseover(function () {
  604 + $(".custom-tooltip2").css("display", "block");
  605 + });
  606 + $("#dropdownMenu3").mouseout(function () {
  607 + $(".custom-tooltip2").css("display", "none");
  608 + });
  609 + }
519 610  
520   - $("#dropdownMenu3").mouseover(function () {
521   - $(".custom-tooltip2").css("display", "block");
522   - });
523   - $("#dropdownMenu3").mouseout(function () {
524   - $(".custom-tooltip2").css("display", "none");
525   - });
526   - }
527   -
528 611 });
529 612 </script>
530 613 <script>
... ...