Commit b830a9b46d9216ce191cc346df8ae293050b6e92
merged branch
Showing
3 changed files
with
39 additions
and
14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
| ... | ... | @@ -7759,7 +7759,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 7759 | 7759 | } |
| 7760 | 7760 | |
| 7761 | 7761 | |
| 7762 | - $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber) { | |
| 7762 | + $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber, isTermListOptionClicked) { | |
| 7763 | + //$rootScope.SelectedTermList = $("#termList").find("option[id=" + actualTermNumber + "]").val(); | |
| 7764 | + | |
| 7765 | + $rootScope.slectedActualTermNumber = actualTermNumber; | |
| 7766 | + | |
| 7767 | + if (isTermListOptionClicked == true) { | |
| 7768 | + $scope.searchFilter = ''; | |
| 7769 | + } | |
| 7763 | 7770 | |
| 7764 | 7771 | $scope.CloseTransparencyBox(); |
| 7765 | 7772 | |
| ... | ... | @@ -8060,8 +8067,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
| 8060 | 8067 | return Math.round(iReturnValue / nExistingZoom); |
| 8061 | 8068 | } |
| 8062 | 8069 | |
| 8063 | - $scope.refreshTermListOnSystemSelection = function (bodysystemId) { | |
| 8064 | - | |
| 8070 | + $rootScope.refreshTermListOnSystemSelection = function (bodysystemId) { | |
| 8071 | + $rootScope.selectedBodySystemId = bodysystemId; | |
| 8072 | + $rootScope.selectedBodySystemName = $('#bodySystems option[id="' + bodysystemId + '"]').val(); | |
| 8065 | 8073 | $('#termList').empty(); |
| 8066 | 8074 | // $('#termList').innerHTML = ''; |
| 8067 | 8075 | |
| ... | ... | @@ -8460,11 +8468,11 @@ function OnZoom() |
| 8460 | 8468 | }); |
| 8461 | 8469 | } |
| 8462 | 8470 | |
| 8463 | -function onListManagerTermSelection(id) { | |
| 8471 | +function onListManagerTermSelection(id, isTermListOptionClicked) { | |
| 8464 | 8472 | |
| 8465 | 8473 | var scope = angular.element(document.getElementById("daView")).scope(); |
| 8466 | 8474 | scope.$apply(function () { |
| 8467 | - scope.HighlightBodyOnListManagerSelection(id); | |
| 8475 | + scope.HighlightBodyOnListManagerSelection(id, isTermListOptionClicked); | |
| 8468 | 8476 | }); |
| 8469 | 8477 | |
| 8470 | 8478 | } | ... | ... |
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
| ... | ... | @@ -2542,23 +2542,39 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic |
| 2542 | 2542 | $('#listManager').css('display', 'block'); |
| 2543 | 2543 | $("#listManager").css("visibility", "visible"); |
| 2544 | 2544 | |
| 2545 | - // $('#termList option[selected="selected"]').prop("selected", false); | |
| 2546 | - // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").prop("selected", true); | |
| 2547 | - // $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 2548 | - // $("#termList").find("option[value=" + $rootScope.searchSelectedText + "]").css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 2549 | 2545 | $('#listManager').draggable(); |
| 2550 | 2546 | |
| 2551 | 2547 | |
| 2552 | 2548 | $rootScope.islistManagerEventAlredayDispachted = true; |
| 2553 | 2549 | |
| 2554 | 2550 | $rootScope.$broadcast('listManagerEvent', true); |
| 2551 | + | |
| 2552 | + if ($rootScope.selectedBodySystemName == undefined && $rootScope.slectedActualTermNumber == undefined) { | |
| 2553 | + $('#termList option[selected="selected"]').prop("selected", false); | |
| 2554 | + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); | |
| 2555 | + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 2556 | + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 2557 | + } | |
| 2558 | + else { | |
| 2555 | 2559 | |
| 2556 | - $('#termList option[selected="selected"]').prop("selected", false); | |
| 2557 | - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true); | |
| 2558 | - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 2559 | - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 2560 | + if ($rootScope.selectedBodySystemId == undefined) { | |
| 2561 | + $rootScope.selectedBodySystemId = 0; | |
| 2562 | + $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId); | |
| 2563 | + } | |
| 2564 | + else { | |
| 2565 | + $rootScope.refreshTermListOnSystemSelection($rootScope.selectedBodySystemId); | |
| 2566 | + } | |
| 2567 | + | |
| 2568 | + $('#bodySystems option[selected="selected"]').prop("selected", false); | |
| 2569 | + $('#bodySystems option[value="' + $rootScope.selectedBodySystemName + '"]').prop("selected", true); | |
| 2570 | + | |
| 2571 | + // $('#termList option[selected="selected"]').prop("selected", false); | |
| 2572 | + // $('#termList option[value="' + $rootScope.SelectedTermList + '"]').prop("selected", true); | |
| 2573 | + //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); | |
| 2574 | + //$('#termList option[value="' + $rootScope.SelectedTermList + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" }); | |
| 2560 | 2575 | |
| 2561 | 2576 | $("#optionsListManagerTab").addClass("active"); |
| 2577 | + } | |
| 2562 | 2578 | } |
| 2563 | 2579 | |
| 2564 | 2580 | $rootScope.CloseListManager = function () { | ... | ... |
400-SOURCECODE/AIAHTML5.Web/index.html
| ... | ... | @@ -793,6 +793,7 @@ |
| 793 | 793 | left: 140px; |
| 794 | 794 | display: none; |
| 795 | 795 | z-index: 780000; |
| 796 | + height:auto!important; | |
| 796 | 797 | } |
| 797 | 798 | |
| 798 | 799 | #listManager .annotation-modal-header { |
| ... | ... | @@ -866,7 +867,7 @@ |
| 866 | 867 | |
| 867 | 868 | <!--DA > List Manager > Multiple structure selection should not be available.--> |
| 868 | 869 | <div class="form-group"> |
| 869 | - <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select> | |
| 870 | + <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id, true)"></select> | |
| 870 | 871 | </div> |
| 871 | 872 | |
| 872 | 873 | </div> | ... | ... |