ADAM / AIAHTML5

Commit 8db37d9db52331b2f5100a16a61dbc66b9d7d813

Authored by unknown
1 parent 876909d3

List Manager Clicked Issue

Inline Side-by-side
Showing 3 changed files with 27 additions and 42 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @8db37d9
... ... @@ -8256,7 +8256,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8256 8256  
8257 8257 //list manager
8258 8258 $scope.$on('listManagerEvent', function (event, data) {
8259   -
  8259 +
8260 8260 if ($rootScope.islistManagerEventAlredayDispachted == true) {
8261 8261  
8262 8262 $('#spinner').css('visibility', 'visible');
... ... @@ -8267,7 +8267,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8267 8267 console.log('optionsLength= ' + optionsLength)
8268 8268 if (optionsLength > 0)
8269 8269 $('#bodySystems').empty();
8270   -
  8270 + $("#bodySystems").css("display", "block");
  8271 + $("#AABodySystems").css("display", "none");
8271 8272  
8272 8273 var $all = $('<option id="0" selected="">All</option>').appendTo('#bodySystems');
8273 8274 $compile($all)($scope);
... ... @@ -8309,7 +8310,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8309 8310  
8310 8311  
8311 8312 });
8312   -
  8313 +
8313 8314 $scope.loadListManger = function () {
8314 8315  
8315 8316  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @8db37d9
... ... @@ -1207,16 +1207,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1207 1207 $compile($el)($scope);
1208 1208 var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1209 1209 $compile($selectedOptions)($scope);
1210   - $("#bodySystems").empty();
  1210 + $("#AABodySystems").empty();
  1211 + $("#bodySystems").css("display","none");
  1212 + $("#AABodySystems").css("display","block");
1211 1213 $("#bodySystemList li a").each(function (key, value) {
1212   - var $systemOptions = $('<option id=' + $(this).attr('id') + '>' + $(this).text() + '</option>').appendTo("#bodySystems")
  1214 + var $systemOptions = $('<option id=' + $(this).attr('id') + ' onclick="refreshTermListOnSystemSel(this.id)">' + $(this).text() + '</option>').appendTo("#AABodySystems")
1213 1215 $compile($systemOptions)($scope);
1214 1216 });
1215 1217 }
1216 1218 }, 500);
1217 1219 }
1218 1220 })
1219   -
1220 1221 },
1221 1222 function (error) {
1222 1223 // handle errors here
... ... @@ -1239,12 +1240,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1239 1240  
1240 1241  
1241 1242  
1242   - $scope.refreshTermListOnSystemSelection = function (bodySystemId) {
1243   - var bodySystemName = $("#bodySystems #" + bodySystemId).val();
1244   -
  1243 + $scope.refreshTermListOnAASystemSelection = function (bodySystemId) {
  1244 +
  1245 + var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
1245 1246 if (bodySystemName == "All") {
1246 1247 for (var j = 0; j <= $scope.pinTermData.length - 1; j++) {
1247   - var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  1248 + var $selectedOptions = $('<option id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)">' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1248 1249 $compile($selectedOptions)($scope);
1249 1250 }
1250 1251 }
... ... @@ -1268,7 +1269,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1268 1269 if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) {
1269 1270 if ($rootScope.bodySystemTermArray[j].language == "1") {
1270 1271 console.log($rootScope.bodySystemTermArray[j].text);
1271   - var $selectedOptions = $('<option id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" >' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
  1272 + var $selectedOptions = $('<option id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" onclick="onSearchItemSelection(event)">' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
1272 1273 $compile($selectedOptions)($scope);
1273 1274 }
1274 1275 }
... ... @@ -1276,7 +1277,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1276 1277 }
1277 1278 }
1278 1279 }
1279   -
1280 1280 });
1281 1281 }
1282 1282 }
... ... @@ -1497,19 +1497,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1497 1497  
1498 1498 $scope.highlightPinBasedOnSerachItem = function (event) {
1499 1499  
1500   - if ($scope.isTermListOptionClicked == true) {
1501   - $scope.searchItemId = event;
1502   - $scope.searchItemText = event.innerHTML;
1503   - $('#termList option[selected="selected"]').prop("selected", false);
1504   - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
1505   - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
1506   - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
1507   - $scope.searchFilter = event.innerHTML;
1508   - selectedTermName.placeholder = event.innerHTML;
1509   - $scope.isTermListOptionClicked = false;
1510   - }
1511   - else
1512   - {
1513 1500 $scope.searchItemId = event.currentTarget.id;
1514 1501 $scope.searchItemText = event.currentTarget.innerHTML;
1515 1502 $('#termList option[selected="selected"]').prop("selected", false);
... ... @@ -1520,8 +1507,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1520 1507 $scope.searchFilter = event.currentTarget.innerHTML;
1521 1508 selectedTermName.placeholder = event.currentTarget.innerHTML;
1522 1509  
1523   - }
1524   -
1525 1510  
1526 1511 //get data from pindata for this trem
1527 1512  
... ... @@ -1567,20 +1552,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1567 1552 }
1568 1553 }
1569 1554 }
1570   -
1571   -
1572   -
  1555 +
1573 1556 }]);
1574 1557  
1575 1558  
1576   -function refreshTermListOnSystem(bodySystemId) {
1577   - // alert('refreshTermListOnSystem is called outside');
  1559 +function refreshTermListOnSystemSel(bodySystemId) {
  1560 +
1578 1561 var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1579 1562 scope.$apply(function () {
1580   - scope.refreshTermListOnSystemSelection(bodySystemId);
  1563 + scope.refreshTermListOnAASystemSelection(bodySystemId);
1581 1564 });
1582 1565 }
1583 1566  
  1567 +
1584 1568 function showSelectedSystemPins(event) {
1585 1569 console.log('OnBodySystem chnaged is called outside ');
1586 1570 var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
... ... @@ -1629,14 +1613,14 @@ function onSearchItemSelection(event) {
1629 1613 });
1630 1614 }
1631 1615  
1632   -function onListManagerTermSelection(event) {
1633   - var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1634   - scope.isTermListOptionClicked = true;
1635   - scope.$apply(function () {
1636   - scope.highlightPinBasedOnSerachItem(event);
1637   - });
  1616 +//function onListManagerTermSelection(event) {
  1617 +// var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
  1618 +// scope.isTermListOptionClicked = true;
  1619 +// scope.$apply(function () {
  1620 +// scope.highlightPinBasedOnSerachItem1(event);
  1621 +// });
1638 1622  
1639   -}
  1623 +//}
1640 1624  
1641 1625  
1642 1626 function showHideAnnotation(event) {
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @8db37d9
... ... @@ -597,7 +597,7 @@
597 597 </div>
598 598 <div id="setting-spinner" style="display:none;position: fixed; top: 50%; left: 50%; margin-left: -50px; z-index: 1234; overflow: auto; width: 100px;">
599 599 <img id="img-spinner" src="content/images/common/loading.gif" alt="Loading">
600   - </div>
  600 + </div>
601 601 <!--Annotation Modal-->
602 602 <div class="annotationTollbar" style="width: 300px;position: fixed; top: 80px; right: 20px; display: none; z-index: 1200000;">
603 603 <div class="annotationbar">
... ... @@ -846,13 +846,13 @@
846 846 </div>
847 847  
848 848 <div id="restrictListDiv" style="display:none;">
849   -
850 849 <div class="well well-sm marginTopBtm10">
851 850 <div class="form-horizontal">
852 851 <div class="form-group">
853 852 <label class="col-sm-4 control-label" for="System">System</label>
854 853 <div class="col-sm-8">
855 854 <select id="bodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystem(this.options[this.selectedIndex].id)"></select>
  855 + <select id="AABodySystems" class="form-control" onchange="if (typeof (this.selectedIndex) != 'undefined') refreshTermListOnSystemSel(this.options[this.selectedIndex].id)" style="display:none;" ></select>
856 856 </div>
857 857 </div>
858 858 <div class="form-group">
... ...