ADAM / AIAHTML5

Commit 1b2bf24e9705e65ed8ec79448ad215aaaa63cd71

Authored by Nikita Kulshreshtha
2 parents 5d5c0b93 429e9e6a

merged Develop branch

Inline Side-by-side
Showing 4 changed files with 133 additions and 152 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @1b2bf24
... ... @@ -15,17 +15,21 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
15 15 $scope.query = {
16 16 SearchText: '',
17 17 SearchTextByAlphabet: '',
  18 + SelectedDiv: ''
18 19 };
  20 + var Count = 200;
  21 + localStorage.setItem("ImageCount", Count);
  22 + var searchByText = $rootScope.getLocalStorageValue("SearchText");
  23 + var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
  24 + var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView");
  25 +
  26 + $timeout(function () {
  27 + $("#ListViewDiv").on('scroll', function () {
  28 + if ($scope.query.SelectedDiv == 2) {
19 29  
20   - $(document).ready(function () {
21   - $timeout(function () {
22   - var Count = 200;
23   - localStorage.setItem("ImageCount", Count);
24   - var searchByText = $rootScope.getLocalStorageValue("SearchText");
25   - var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
26   - $("#ListViewDiv").on('scroll', function () {
27 30 if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight - 10) {
28 31 Count += 100;
  32 + //$(window).scrollTop(0);
29 33 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
30 34 if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') {
31 35 $scope.query.SearchText = searchByText;
... ... @@ -49,16 +53,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
49 53 $scope.ApplySearch($scope.query);
50 54 }
51 55 }
52   - });
53   - }, 10);
54   - });
  56 + }
  57 + });
55 58  
56   - $(document).ready(function () {
57   - var Count = 200;
58   - localStorage.setItem("ImageCount", Count);
59   - var searchByText = $rootScope.getLocalStorageValue("SearchText");
60   - var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
61   - $(window).scroll(function () {
  59 + }, 10);
  60 +
  61 + $(window).scroll(function () {
  62 + if ($scope.query.SelectedDiv == 1) {
62 63 if ($(window).scrollTop() == $(document).height() - $(window).height()) {
63 64 Count += 100;
64 65 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
... ... @@ -84,25 +85,40 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
84 85 $scope.ApplySearch($scope.query);
85 86 }
86 87 }
87   - });
88   -
  88 + }
89 89 });
90 90  
  91 +
91 92 $scope.setActiveTab = function (tabToSet) {
92 93 $scope.activeTab = tabToSet;
93 94 localStorage.setItem("currentAITabView", $scope.activeTab);
94 95 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
  96 + var searchText = $rootScope.getLocalStorageValue("SearchText");
95 97 if (tabToSet == 2) {
96 98 var curSelectedRowId = $rootScope.getLocalStorageValue("AISelectedRowId");
97 99 $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).addClass("selected");
98 100 $scope.idSelected = $rootScope.getLocalStorageValue("currentAIImageId");
99 101 var selectedImageId = $rootScope.getLocalStorageValue("currentAIImageId");
100   - $scope.ReloadListViewImageDiv(selectedImageId, ImageCount);
  102 + if (searchText != '') {
  103 + $scope.ApplySearch(searchText);
  104 + }
  105 + else {
  106 + $scope.ReloadListViewImageDiv(selectedImageId, ImageCount);
  107 + }
  108 +
  109 + $scope.query.SelectedDiv = tabToSet;
101 110 }
102 111 else {
103 112 $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
104 113 $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).removeClass('selected');
105   - $scope.loadAllAI(ImageCount);
  114 + $scope.query.SelectedDiv = tabToSet;
  115 + if (searchText != '') {
  116 + $scope.ApplySearch(searchText);
  117 + }
  118 + else {
  119 + $scope.loadAllAI(ImageCount);
  120 + }
  121 +
106 122 }
107 123 };
108 124  
... ... @@ -202,8 +218,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
202 218 console.log(' $scope.IllustrationData = ' + error.statusText);
203 219 }
204 220 );
205   -
206   -
207 221 };
208 222  
209 223 $scope.loadAllAI = function (ImageCount) {
... ... @@ -239,8 +253,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
239 253  
240 254 $timeout(function () {
241 255 $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
242   - if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images") {
243   - //$('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
  256 + if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images" && $scope.query.SelectedDiv == 1) {
  257 + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
244 258 }
245 259 }, 100);
246 260  
... ... @@ -311,12 +325,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
311 325 $scope.Reset = function (query) {
312 326 $('ul li span').removeAttr("style");
313 327 query.SearchText = "";
  328 + $scope.idSelected = '';
314 329 //set localstorage values
315 330 localStorage.setItem("SearchText", '');
316 331 localStorage.setItem("SearchByAlphabet", '');
317 332 localStorage.setItem("AIListViewScroll", '');
318 333 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
319   - if ($('.selected').hasClass("selected")) { $('.selected').removeClass("selected"); }
  334 + if ($('.selected').hasClass("selected")) {
  335 + $('.selected').removeClass("selected");
  336 + }
320 337  
321 338 $('#ListViewDiv').scrollTop(0);
322 339  
... ... @@ -331,27 +348,29 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
331 348  
332 349 $scope.ApplySearch = function (query) {
333 350 $('ul li span').removeAttr("style");
  351 + $scope.idSelected = '';
  352 + $scope.hiderow = false;
334 353 var currentSearchtext = $rootScope.getLocalStorageValue("SearchText");
335 354 localStorage.setItem("SearchText", '');
336 355 if (currentSearchtext == "undefined" || (currentSearchtext == null || currentSearchtext == "")) {
337   - if (query.SearchText == "undefined" || (query.SearchText == null || query.SearchText == "")) {
  356 + if ($scope.query.SearchText == "undefined" || ($scope.query.SearchText == null || $scope.query.SearchText == "")) {
338 357 $rootScope.errorMessage = AIAConstants.PLEASE_ENTER_SEARCH_TEXT;
339 358 $("#messageModal").modal('show');
340   - // alert("Please enter the text !")
341 359 return false;
342 360 }
343 361 }
  362 +
344 363  
  364 + //$scope.filterstring = false;
  365 + while ($scope.searchAIListViewData.length) {
  366 + $scope.searchAIListViewData.pop();
  367 + }
  368 +
345 369 $rootScope.isLoading = true;
346 370 $('#aiSpinner').css('visibility', 'visible');
347 371 $scope.DisableUI();
348 372 $scope.filterstring = true;
349   -
350   - //while ($scope.searchAIListViewData.length) {
351   - // $scope.searchAIListViewData.pop();
352   - //}
353   -
354   - if (typeof (query.SearchText) !== "undefined" && (query.SearchText !== null && query.SearchText !== "")) {
  373 + if (typeof ($scope.query.SearchText) !== "undefined" && ($scope.query.SearchText !== null && $scope.query.SearchText !== "")) {
355 374 localStorage.setItem("SearchText", query.SearchText);
356 375 }
357 376 else {
... ... @@ -369,13 +388,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
369 388 .select();
370 389  
371 390 $('#grid-view').empty();
372   -
373 391 angular.forEach($scope.selectedAIListViewData, function (value, key) {
374 392  
375 393 var selectimg = true;
376 394 //var count = 0;
377   - if (typeof (query.SearchText) !== "undefined" && (query.SearchText !== null && query.SearchText !== "")) {
378   - var SearchText = query.SearchText
  395 + if (typeof ($scope.query.SearchText) !== "undefined" && ($scope.query.SearchText !== null && $scope.query.SearchText !== "")) {
  396 + var SearchText = $scope.query.SearchText
379 397 var posbodyregion = value._Title.toLowerCase().indexOf(SearchText.toLowerCase());
380 398 if (posbodyregion > -1) {
381 399 selectimg = true;
... ... @@ -397,11 +415,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
397 415  
398 416 $compile($el)($scope);
399 417  
400   -
401   - //$(".sidebar").mCustomScrollbar({
402   - // autoHideScrollbar: true,
403   - // //theme:"rounded"
404   - //});
405 418 $scope.searchAIListViewData.push(
406 419 {
407 420 "_id": value._id,
... ... @@ -426,6 +439,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
426 439 $('#aiSpinner').css('visibility', 'hidden');
427 440 setTimeout(function () {
428 441 $scope.EnableUI();
  442 +
429 443 }, 10);
430 444  
431 445 },
... ... @@ -446,23 +460,28 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
446 460 document.getElementById("imgParent").style.pointerEvents = "auto";
447 461 document.getElementById("imgParent").style.opacity = "1.0";
448 462 }
449   -
450 463 $scope.counter = 1;
451 464 $scope.ApplySearchByAlphabet = function (SearchTextByAlphabet) {
452   - $rootScope.SearchTextByAlphabet = SearchTextByAlphabet
  465 + $rootScope.SearchTextByAlphabet = SearchTextByAlphabet;
  466 + localStorage.setItem("SearchByAlphabet", '');
453 467 $rootScope.isLoading = true;
  468 + $scope.idSelected = '';
  469 + $scope.hiderow = false;
454 470 $('#aiSpinner').css('visibility', 'visible');
455 471 $scope.DisableUI();
456 472 $('ul li span').removeAttr("style");
457 473 $('#' + $rootScope.SearchTextByAlphabet).css({ "color": "white", "background-color": "#1B92D0" });
458 474 $scope.filterstring = true;
  475 + while ($scope.searchAIListViewData.length) {
  476 + $scope.searchAIListViewData.pop();
  477 + }
  478 +
459 479 if (typeof (SearchTextByAlphabet) !== "undefined" && (SearchTextByAlphabet !== null && SearchTextByAlphabet !== "")) {
460 480 localStorage.setItem("SearchByAlphabet", SearchTextByAlphabet);
461 481 }
462 482 else {
463 483 localStorage.setItem("SearchByAlphabet", '');
464 484 }
465   -
466 485 var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
467 486 promise.then(
468 487 function (result) {
... ... @@ -474,6 +493,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
474 493  
475 494 $('#grid-view').empty();
476 495  
  496 +
477 497 angular.forEach($scope.selectedAIListViewData, function (value, key) {
478 498  
479 499 var selectimg = true;
... ... @@ -504,6 +524,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
504 524 "_contentImage": value._contentImage,
505 525 "_ThumbnailImage": value._ThumbnailImage,
506 526 });
  527 +
507 528 }
508 529  
509 530 });
... ... @@ -517,7 +538,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
517 538 $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>');
518 539 }
519 540 $rootScope.isLoading = false;
520   -
  541 +
521 542 setTimeout(function () {
522 543 $scope.EnableUI();
523 544 }, 10);
... ... @@ -525,10 +546,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
525 546 function (error) {
526 547 console.log(' $scope.IllustrationData = ' + error.statusText);
527 548 }
528   -
529 549 );
530   -
531   -
532 550 }
533 551  
534 552  
... ... @@ -639,10 +657,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
639 657 $("#aiImagePanel .img-thumbnail").css("min-height", $("#aiImagePanel .jsPanel-content").height());
640 658 $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
641 659 var jspContentHeight = $('.jsPanel-content').height();
642   -
643   -
644   -
645   -
646 660 }
647 661 },
648 662 function (error) {
... ... @@ -677,8 +691,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
677 691 $rootScope.isLoading = true;
678 692 $('#aiSpinner').css('visibility', 'visible');
679 693 $('#aiSpinner').css('zIndex', '20000');
680   - //$scope.DisableUI();
681   -
682 694 var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
683 695 promise.then(
684 696 function (result) {
... ... @@ -708,9 +720,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
708 720 }
709 721 $rootScope.isLoading = false;
710 722 $('#aiSpinner').css('visibility', 'hidden');
711   - //setTimeout(function () {
712   - // $scope.EnableUI();
713   - //}, 10);
  723 +
714 724 },
715 725 function (error) {
716 726 // handle errors here
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @1b2bf24
... ... @@ -148,6 +148,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
148 148 $scope.currentTitleFromJson;
149 149 $scope.showTabButton = false;
150 150  
  151 +
  152 +
  153 +
  154 +
151 155 $scope.IsVisible = function () {
152 156 $scope.scroll();
153 157  
... ... @@ -2060,7 +2064,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
2060 2064 var canvasDiv = document.getElementById('canvasDiv');
2061 2065 $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
2062 2066 if ($scope.isLayerChange == true) {
2063   - $scope.isLayerChange = false;
  2067 + $scope.isLayerChange = false;
2064 2068 }
2065 2069  
2066 2070 if (evt.ctrlKey) {
... ... @@ -3021,7 +3025,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
3021 3025  
3022 3026  
3023 3027 $scope.HighlightBodyByTermListForBodySystem = function (TermList) {
3024   -
  3028 +
3025 3029 $scope.isScrolledToHighlightedBR = false;
3026 3030 //disable the background till the system gets highlighted.
3027 3031 $scope.DisableUI();
... ... @@ -3400,7 +3404,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
3400 3404 var annotationText;
3401 3405 var annotation = [];
3402 3406 //0
3403   - var figLeafTermNo = 5868; // to do declare constant for this
  3407 + var figLeafTermNo = 5868;
3404 3408  
3405 3409 if (parseInt(termNumber) != parseInt(figLeafTermNo)) {
3406 3410 $scope.TermNumber = termNumber;
... ... @@ -4953,8 +4957,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
4953 4957  
4954 4958 var tranparencyLayer;
4955 4959  
4956   - var currentLayer = $scope.layerNumberBeforeTBDraw;
4957   -
  4960 + var currentLayer = $scope.layerNumberBeforeTBDraw;
4958 4961 if (currentLayer == $rootScope.totalLayers) {
4959 4962  
4960 4963 tranparencyLayer = currentLayer;
... ... @@ -8506,32 +8509,33 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$filter&quot;,&quot;$
8506 8509 if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
8507 8510 $(".custom-tooltip").toggle();
8508 8511 }
  8512 + //START BUG#22814
  8513 + // Here updating structureDropdown with the mapped values only on the basis of BodyViewID
  8514 +
  8515 + var systemNumberByViewID = new jinqJs()
  8516 + .from($rootScope.BodySystemData.BodySystem.BodySystemTerm)
  8517 + .distinct('_SystemNumber')
  8518 + .orderBy([{ field: '_SystemNumber', sort: 'asc' }])
  8519 + .select('_SystemNumber');
  8520 +
  8521 +
  8522 + $('#structureDropdown').html("");
8509 8523 var currentBodyViewId = $rootScope.voId;
8510   - var systemListHtml = '<ul class="dropdown-menu" aria-labelledby="dropdownMenu2"><li><a href="#" title="Current Structure">Current Structure</a></li> <li role="separator" class="divider"></li>'
  8524 + var systemListHtml = '<li><a href="#" title="Current Structure">Current Structure</a></li> <li role="separator" class="divider"></li>'
8511 8525 var systemList = $rootScope.CommonData.DACommonData.BodySystems.Item;
8512 8526  
8513 8527 angular.forEach(systemList, function (value, key) {
8514   -
8515   - systemListHtml = systemListHtml + '<li><a href="#" id="' + value._BodySystemId + '" title="' + value._Name + '">' + value._Name + '</a></li>'
  8528 + angular.forEach(systemNumberByViewID, function (valueSystemNumber, keySystemNumber) {
  8529 + if (value._BodySystemId == valueSystemNumber._SystemNumber) {
  8530 + systemListHtml = systemListHtml + '<li><a href="#" id="' + value._BodySystemId + '" title="' + value._Name + '" onclick="OnBodySystemSelection(event)">' + value._Name + '</a></li>'
  8531 + }
  8532 + })
8516 8533 })
8517 8534  
8518   - systemListHtml = systemListHtml + '</ul>';
8519   - $('#bodySystem').append(systemListHtml);
8520   -
8521   -
8522   - // var bodySystemDataPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_body_system_term_' + currentBodyViewId + '.json';
8523   - // DataService.getJson(bodySystemDataPath)
8524   - //.then(
8525   - // function (result) {
8526   -
8527   - // $rootScope.BodySystemData = result;
8528   -
8529   - // },
8530   - // function (error) {
8531   - // console.log(error.statusText)
8532   - // }
8533   - // )
  8535 + systemListHtml = systemListHtml;
8534 8536  
  8537 + //END BUG#22814
  8538 + $('#structureDropdown').append(systemListHtml);
8535 8539 }
8536 8540  
8537 8541 $scope.GetBodySystemData = function (currentBodyViewId) {
... ... @@ -9891,7 +9895,7 @@ function OnViewChange(event) {
9891 9895 function OnBodySystemSelection(event) {
9892 9896 console.log('OnBodySystem chnaged is called outside ');
9893 9897 var scope = angular.element(document.getElementById("daView")).scope();
9894   -
  9898 +
9895 9899  
9896 9900 scope.$apply(function () {
9897 9901 scope.HighlightBodyByBodySystem(event);
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
  View file @1b2bf24
... ... @@ -8,47 +8,47 @@
8 8 <form class="form-inline padd5">
9 9 <div class="form-group">
10 10 <label for="exampleInputName2" class="text-primary">Search</label>
11   - <input type="text" ng-change="hideListViewDiv()" ng-model="query.SearchText" class="form-control input-sm col-sm" id="txtSerachInput" placeholder="">
  11 + <input type="text" ng-model="query.SearchText" class="form-control input-sm col-sm" id="txtSerachInput" placeholder="">
12 12 </div>
13 13 <button type="button" class="btn btn-primary btn-sm" ng-click="ApplySearch(query)" style="margin-right:2px;">
14 14 <i class="fa fa-search"></i>
15 15 </button>
16 16 </form>
17   - <nav>
18   - <ul class="pagination pagination-sm no-margin" style="cursor: pointer;">
19   - <li><span id="A" ng-click="ApplySearchByAlphabet('A')"> A</span></li>
20   - <li><span id="B" ng-click="ApplySearchByAlphabet('B')"> B</span></li>
21   - <li><span id="C" ng-click="ApplySearchByAlphabet('C')"> C</span></li>
22   - <li><span id="D" ng-click="ApplySearchByAlphabet('D')"> D</span></li>
23   - <li><span id="E" ng-click="ApplySearchByAlphabet('E')"> E</span></li>
24   - <li><span id="F" ng-click="ApplySearchByAlphabet('F')"> F</span></li>
25   - <li><span id="G" ng-click="ApplySearchByAlphabet('G')"> G</span></li>
26   - <li><span id="H" ng-click="ApplySearchByAlphabet('H')"> H</span></li>
27   - <li><span id="I" ng-click="ApplySearchByAlphabet('I')"> I</span></li>
28   - <li><span id="J" ng-click="ApplySearchByAlphabet('J')"> J</span></li>
29   - <li><span id="K" ng-click="ApplySearchByAlphabet('K')"> K</span></li>
30   - <li><span id="L" ng-click="ApplySearchByAlphabet('L')"> L</span></li>
31   - <li><span id="M" ng-click="ApplySearchByAlphabet('M')"> M</span></li>
32   - <li><span id="N" ng-click="ApplySearchByAlphabet('N')"> N</span></li>
33   - <li><span id="O" ng-click="ApplySearchByAlphabet('O')"> O</span></li>
34   - <li><span id="P" ng-click="ApplySearchByAlphabet('P')"> P</span></li>
35   - <li><span id="Q" ng-click="ApplySearchByAlphabet('Q')"> Q</span></li>
36   - <li><span id="R" ng-click="ApplySearchByAlphabet('R')"> R</span></li>
37   - <li><span id="S" ng-click="ApplySearchByAlphabet('S')"> S</span></li>
38   - <li><span id="T" ng-click="ApplySearchByAlphabet('T')"> T</span></li>
39   - <li><span id="U" ng-click="ApplySearchByAlphabet('U')"> U</span></li>
40   - <li><span id="V" ng-click="ApplySearchByAlphabet('V')"> V</span></li>
41   - <li><span id="W" ng-click="ApplySearchByAlphabet('W')"> W</span></li>
42   - <li><span id="X" ng-click="ApplySearchByAlphabet('X')"> X</span></li>
43   - <li><span id="Y" ng-click="ApplySearchByAlphabet('Y')"> Y</span></li>
44   - <li><span id="Z" ng-click="ApplySearchByAlphabet('Z')"> Z</span></li>
  17 + <nav>
  18 + <ul class="pagination pagination-sm no-margin" style="cursor: pointer;">
  19 + <li><span id="A" ng-click="ApplySearchByAlphabet('A')"> A</span></li>
  20 + <li><span id="B" ng-click="ApplySearchByAlphabet('B')"> B</span></li>
  21 + <li><span id="C" ng-click="ApplySearchByAlphabet('C')"> C</span></li>
  22 + <li><span id="D" ng-click="ApplySearchByAlphabet('D')"> D</span></li>
  23 + <li><span id="E" ng-click="ApplySearchByAlphabet('E')"> E</span></li>
  24 + <li><span id="F" ng-click="ApplySearchByAlphabet('F')"> F</span></li>
  25 + <li><span id="G" ng-click="ApplySearchByAlphabet('G')"> G</span></li>
  26 + <li><span id="H" ng-click="ApplySearchByAlphabet('H')"> H</span></li>
  27 + <li><span id="I" ng-click="ApplySearchByAlphabet('I')"> I</span></li>
  28 + <li><span id="J" ng-click="ApplySearchByAlphabet('J')"> J</span></li>
  29 + <li><span id="K" ng-click="ApplySearchByAlphabet('K')"> K</span></li>
  30 + <li><span id="L" ng-click="ApplySearchByAlphabet('L')"> L</span></li>
  31 + <li><span id="M" ng-click="ApplySearchByAlphabet('M')"> M</span></li>
  32 + <li><span id="N" ng-click="ApplySearchByAlphabet('N')"> N</span></li>
  33 + <li><span id="O" ng-click="ApplySearchByAlphabet('O')"> O</span></li>
  34 + <li><span id="P" ng-click="ApplySearchByAlphabet('P')"> P</span></li>
  35 + <li><span id="Q" ng-click="ApplySearchByAlphabet('Q')"> Q</span></li>
  36 + <li><span id="R" ng-click="ApplySearchByAlphabet('R')"> R</span></li>
  37 + <li><span id="S" ng-click="ApplySearchByAlphabet('S')"> S</span></li>
  38 + <li><span id="T" ng-click="ApplySearchByAlphabet('T')"> T</span></li>
  39 + <li><span id="U" ng-click="ApplySearchByAlphabet('U')"> U</span></li>
  40 + <li><span id="V" ng-click="ApplySearchByAlphabet('V')"> V</span></li>
  41 + <li><span id="W" ng-click="ApplySearchByAlphabet('W')"> W</span></li>
  42 + <li><span id="X" ng-click="ApplySearchByAlphabet('X')"> X</span></li>
  43 + <li><span id="Y" ng-click="ApplySearchByAlphabet('Y')"> Y</span></li>
  44 + <li><span id="Z" ng-click="ApplySearchByAlphabet('Z')"> Z</span></li>
  45 +
  46 + </ul>
  47 + <button type="button" class="btn btn-primary btn-sm" ng-click="Reset(query)" style="margin-bottom:23px"><i class="fa fa-eye"></i>Show All</button>
  48 + </nav>
45 49  
46   - </ul>
47   - <button type="button" class="btn btn-primary btn-sm" ng-click="Reset(query)" style="margin-bottom:23px"><i class="fa fa-eye"></i>Show All</button>
48   - </nav>
49   -
50 50 </div>
51   -
  51 +
52 52 </div>
53 53 </div>
54 54 </div>
... ... @@ -97,7 +97,7 @@
97 97 </div>
98 98 </div>
99 99 </div>
100   - <div id="aiSpinner" class="spinner" ng-show="isLoading" style="visibility: hidden; opacity: 1; width: 100%; height: 100%; top: 0; bottom: 0%; left: 0; right: 0%; margin-left: 0px;">
  100 + <div id="aiSpinner" class="spinner" ng-show="isLoading" style="visibility: hidden; opacity: 1; width: 100%; height: 100%; top: 0; bottom: 0%; left: 0; right: 0%; margin-left: 0px;">
101 101 <img id="img-spinner" class="spinner" src="content/images/common/loading.gif" alt="Loading" />
102 102 </div>
103 103 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @1b2bf24
... ... @@ -169,40 +169,7 @@
169 169 <div class="col-xs-6 dropdown hover-tool">
170 170 <div class="custom-tooltip">Highlight Options</div>
171 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>
172   - <ul class="dropdown-menu" id="structureDropdown">
173   - <li ng-class="CurrentStructure">
174   - <a href="#" title="Current Structure"
175   - onclick="OnBodySystemSelection(event)">Current Structure</a>
176   - </li>
177   -
178   -
179   - <li role="separator" class="divider"></li>
180   - <!--<li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" ng-click="HighlightBodyByBodySystem($event)">Cardiovascular</a></li>
181   - <li ng-class="Digestive"><a href="#" title="Digestive" id="2" ng-click="HighlightBodyByBodySystem($event)">Digestive</a></li>
182   - <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" ng-click="HighlightBodyByBodySystem($event)">Endocrine</a></li>
183   - <li ng-class="Immune"><a href="#" title="Immune" id="4" ng-click="HighlightBodyByBodySystem($event)">Immune</a></li>
184   - <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" ng-click="HighlightBodyByBodySystem($event)">Integumentary</a></li>
185   - <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" ng-click="HighlightBodyByBodySystem($event)">Lymphatic</a></li>
186   - <li ng-class="Muscular"><a href="#" title="Muscular" id="7" ng-click="HighlightBodyByBodySystem($event)">Muscular</a></li>
187   - <li ng-class="Nervous"><a href="#" title="Nervous" id="8" ng-click="HighlightBodyByBodySystem($event)">Nervous</a></li>
188   - <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" ng-click="HighlightBodyByBodySystem($event)">Reproductive</a></li>
189   - <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" ng-click="HighlightBodyByBodySystem($event)">Respiratory</a></li>
190   - <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" ng-click="HighlightBodyByBodySystem($event)">Skeletal</a></li>
191   - <li ng-class="Urinary"><a href="#" title="Urinary" id="12" ng-click="HighlightBodyByBodySystem($event)">Urinary</a></li>-->
192   -
193   - <li ng-class="Cardiovascular"><a href="#" title="Cardiovascular" id="1" onclick="OnBodySystemSelection(event)">Cardiovascular</a></li>
194   - <li ng-class="Digestive"><a href="#" title="Digestive" id="2" onclick="OnBodySystemSelection(event)">Digestive</a></li>
195   - <li ng-class="Endocrine"><a href="#" title="Endocrine" id="3" onclick="OnBodySystemSelection(event)">Endocrine</a></li>
196   - <li ng-class="Immune"><a href="#" title="Immune" id="4" onclick="OnBodySystemSelection(event)">Immune</a></li>
197   - <li ng-class="Integumentary"><a href="#" title="Integumentary" id="5" onclick="OnBodySystemSelection(event)">Integumentary</a></li>
198   - <li ng-class="Lymphatic"><a href="#" title="Lymphatic" id="6" onclick="OnBodySystemSelection(event)">Lymphatic</a></li>
199   - <li ng-class="Muscular"><a href="#" title="Muscular" id="7" onclick="OnBodySystemSelection(event)">Muscular</a></li>
200   - <li ng-class="Nervous"><a href="#" title="Nervous" id="8" onclick="OnBodySystemSelection(event)">Nervous</a></li>
201   - <li ng-class="Reproductive"><a href="#" title="Reproductive" id="9" onclick="OnBodySystemSelection(event)">Reproductive</a></li>
202   - <li ng-class="Respiratory"><a href="#" title="Respiratory" id="10" onclick="OnBodySystemSelection(event)">Respiratory</a></li>
203   - <li ng-class="Skeletal"><a href="#" title="Skeletal" id="11" onclick="OnBodySystemSelection(event)">Skeletal</a></li>
204   - <li ng-class="Urinary"><a href="#" title="Urinary" id="12" onclick="OnBodySystemSelection(event)">Urinary</a></li>
205   - </ul>
  172 + <ul class="dropdown-menu" id="structureDropdown"></ul>
206 173 </div>
207 174 </div>
208 175  
... ... @@ -296,7 +263,7 @@
296 263 <div class="btn-group" style="vertical-align:top;">
297 264 <!-- <h6 class="text-center text-primary txt-white f11 col-xs-12">Search</h6>-->
298 265 <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>-->
  266 + <!-- <i class="fa fa-search"></i>-->
300 267 Search
301 268 </button>
302 269 </div>
... ...