ADAM / AIAHTML5

Commit 41f627f12471ea607c5f50cb552f1a5d6d52d067

Authored by Amrita Vishnoi
2 parents 3e9deb74 cbbdf630

Merge branch 'IEAnnotationIssue_1' into Develop

Inline Side-by-side
Showing 2 changed files with 23 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @41f627f
... ... @@ -3646,6 +3646,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3646 3646 if (viewNameAftrSplit[0] == "null") {
3647 3647 document.location.href = "/";
3648 3648 }
  3649 +
  3650 + if ($location.url() == "/module-item-view") {
  3651 + $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
  3652 + }
  3653 + else {
  3654 + $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id, true)");
  3655 + }
  3656 +
3649 3657 }
3650 3658  
3651 3659 $rootScope.CloseListManager = function () {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @41f627f
... ... @@ -1280,9 +1280,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1280 1280 $('#termList').empty();
1281 1281 $('#termlistfilter').empty();
1282 1282 for (var j = 0; j < $scope.pinTermData.length; j++) {
1283   - var $el = $('<li><a id= "' + $scope.pinTermData[j].TermNumber + '" href="" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter')
  1283 + var $el = $('<li><a id= "' + $scope.pinTermData[j].TermNumber + '" href="" onclick="onSearchItemSelection(this.id)" >' + $scope.pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter')
  1284 + //var $el = $('<li><a id= "' + $scope.pinTermData[j].TermNumber + '" href="" >' + $scope.pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter')
1284 1285 $compile($el)($scope);
1285   - var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  1286 + var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1286 1287  
1287 1288 $compile($selectedOptions)($scope);
1288 1289  
... ... @@ -1339,7 +1340,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1339 1340 var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
1340 1341 if (bodySystemName == "All") {
1341 1342 for (var j = 0; j <= $scope.pinTermData.length - 1; j++) {
1342   - var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  1343 + var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '">' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1343 1344  
1344 1345 $compile($selectedOptions)($scope);
1345 1346  
... ... @@ -1367,7 +1368,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1367 1368 if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) {
1368 1369 if ($rootScope.bodySystemTermArray[j].language == "1") {
1369 1370 console.log($rootScope.bodySystemTermArray[j].text);
1370   - var $selectedOptions = $('<option title= "' + $rootScope.bodySystemTermArray[j].text + '" id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" onclick="onSearchItemSelection(event)">' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
  1371 + var $selectedOptions = $('<option title= "' + $rootScope.bodySystemTermArray[j].text + '" id= "' + $rootScope.bodySystemTermArray[j].termNumbr + '" >' + $rootScope.bodySystemTermArray[j].text + '</option>').appendTo("#termList")
1371 1372 $compile($selectedOptions)($scope);
1372 1373 }
1373 1374 }
... ... @@ -1617,11 +1618,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1617 1618  
1618 1619 }
1619 1620  
1620   - $scope.highlightPinBasedOnSerachItem = function (event) {
1621   -
1622   - $scope.searchItemId = event.currentTarget.id;
1623   - $scope.searchItemText = event.currentTarget.innerHTML;
1624   - $rootScope.searchSelectedText = $("#" + event.currentTarget.id).text();
  1621 + $scope.highlightPinBasedOnSerachItem = function (id) {
  1622 + $scope.searchItemId = id;
  1623 + $scope.searchItemText = $("#" + id).text();
  1624 + $rootScope.searchSelectedText = $("#"+id).text();
1625 1625 $('#termList option[selected="selected"]').prop("selected", false);
1626 1626 $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
1627 1627 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
... ... @@ -1629,8 +1629,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1629 1629  
1630 1630 $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
1631 1631 $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" });
1632   - $scope.searchFilter = event.currentTarget.innerHTML;
1633   - selectedTermName.placeholder = event.currentTarget.innerHTML;
  1632 + $scope.searchFilter = $("#"+id).text();
  1633 + selectedTermName.placeholder = $("#"+id).text();
1634 1634  
1635 1635  
1636 1636 //get data from pindata for this trem
... ... @@ -1814,11 +1814,12 @@ function hideSearchList(event) {
1814 1814 });
1815 1815 }
1816 1816  
1817   -function onSearchItemSelection(event) {
1818   - console.log('AA hide search is called')
  1817 +function onSearchItemSelection(id) {
  1818 +
  1819 + console.log('AA hide search is called');
1819 1820 var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1820 1821 scope.$apply(function () {
1821   - scope.highlightPinBasedOnSerachItem(event);
  1822 + scope.highlightPinBasedOnSerachItem(id);
1822 1823 });
1823 1824 }
1824 1825  
... ...