ADAM / AIAHTML5

Commit ce5f7c39fbd45c4a7755a2bcbcc8cc721893dc1f

Authored by Amrita Vishnoi
2 parents 60910f80 6b8fe475

Merge branch 'DisableZoomRevert' of http://52.6.196.163/ADAM/AIAHTML5 into Develop 

# Conflicts:
#	400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
Inline Side-by-side
Showing 1 changed file with 28 additions and 24 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ce5f7c3
... ... @@ -1411,7 +1411,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1411 1411 if (evt.ctrlKey) {
1412 1412 $rootScope.multiAnnotationIsON = true;
1413 1413  
1414   - document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
  1414 + //document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
1415 1415 }
1416 1416 else {
1417 1417 if (($rootScope.previousHighlightList != null || $rootScope.previousHighlightList != undefined) && ($rootScope.previousHighlightList.length > 0)) {
... ... @@ -1420,7 +1420,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1420 1420  
1421 1421 $rootScope.multiAnnotationIsON = false;
1422 1422  
1423   - document.getElementById("btnZoom").disabled = false;
  1423 + // document.getElementById("btnZoom").disabled = false;
1424 1424 }
1425 1425  
1426 1426 //get mouse coordinate of mirror image click
... ... @@ -1790,7 +1790,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1790 1790 $rootScope.multiAnnotationIsON = true;
1791 1791  
1792 1792 //$("#btnZoom").addClass('disabled');
1793   - document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
  1793 + // document.getElementById("btnZoom").setAttribute('disabled', 'disabled');
1794 1794 //$('#btnZoom').click(function (event) { event.preventDefault(); });
1795 1795  
1796 1796 console.log('CTRL ON')
... ... @@ -1804,7 +1804,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1804 1804 console.log('multiAnnotationIsON: ' + $rootScope.multiAnnotationIsON);
1805 1805 // document.getElementById("btnZoom").setAttribute('enabled', 'enabled');
1806 1806  
1807   - document.getElementById("btnZoom").disabled = false;
  1807 + // document.getElementById("btnZoom").disabled = false;
1808 1808 }
1809 1809  
1810 1810 var annotationText;
... ... @@ -2659,26 +2659,32 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2659 2659  
2660 2660  
2661 2661 var multiTermList = [];
2662   - angular.forEach($rootScope.previousHighlightList, function (value, key) {
2663   - var ActualTermNo = $scope.getActualTermNumber(value);
2664   - if (ActualTermNo != null) {
2665   - var TermList = $scope.getTermNumberList(ActualTermNo);
2666   - if (TermList != null) {
2667   - for (var i = 0; i < TermList.length; i++) {
2668   -
2669   - multiTermList.push(TermList[i]);
  2662 +
  2663 + angular.forEach($rootScope.previousHighlightList, function (value, key) {
  2664 + var ActualTermNo = $scope.getActualTermNumber(value);
  2665 + if (ActualTermNo != null && ActualTermNo != undefined) {
  2666 + var TermList = $scope.getTermNumberList(ActualTermNo);
  2667 + if (TermList != null) {
  2668 + for (var i = 0; i < TermList.length; i++) {
  2669 +
  2670 + multiTermList.push(TermList[i]);
  2671 + }
2670 2672 }
2671 2673 }
2672   - }
2673   -
2674   - });
2675 2674  
  2675 + });
  2676 +
2676 2677 console.log('createTermListByPreviousTermsAndHighlight is called');
2677 2678  
2678   - if ((multiTermList != undefined || multiTermList != null) && multiTermList.length > 0) {
  2679 + if ((multiTermList != undefined && multiTermList != null) && multiTermList.length > 0) {
2679 2680  
2680 2681 $timeout(function () { $scope.HighlightBodyByTermList(multiTermList); }, 50);
2681 2682 }
  2683 + else {
  2684 + $rootScope.isLoading = false;
  2685 +
  2686 + $('#spinner').css('visibility', 'hidden');
  2687 + }
2682 2688 }
2683 2689  
2684 2690  
... ... @@ -5933,8 +5939,8 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5933 5939 $("#btnTranparency").removeClass("disabled");
5934 5940 $rootScope.isTransparencyBoxActivated = false;
5935 5941 $rootScope.isNormalMode = false;
5936   -
5937   -
  5942 + $rootScope.isGenderChnage = false;
  5943 + $rootScope.isViewChange = false;
5938 5944 //if listanager is visisble then close it
5939 5945  
5940 5946 $rootScope.CloseListManager();
... ... @@ -6797,7 +6803,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6797 6803 .from($rootScope.TermNumberData.TermData.Term)
6798 6804 .where('_TermNumber == ' + iColor)
6799 6805 .select('_ActualTermNumber');
6800   - if ($scope.actualTermNo != null || actualTermNo != undefined) {
  6806 + if ($scope.actualTermNo != null && $scope.actualTermNo != undefined && $scope.actualTermNo.length>0) {
6801 6807  
6802 6808 return $scope.actualTermNo[0]._ActualTermNumber;
6803 6809 }
... ... @@ -8455,8 +8461,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8455 8461 // added the timeout to delay the compile of ul li
8456 8462 $scope.IsSearchVisible = true;
8457 8463 var isValueMatchedWithTerm = false;
8458   - for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++)
8459   - {
  8464 + for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
8460 8465 var searchFieldVal = $("#typedTermName").val();
8461 8466 if (searchFieldVal.length > 0) {
8462 8467 for (var j = 0; j <= searchFieldVal.length - 1; j++) {
... ... @@ -8473,7 +8478,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8473 8478 }
8474 8479 }
8475 8480 if (isValueMatchedWithTerm == true) {
8476   - $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id});
  8481 + $rootScope.ModifiedsearchListArray.push({ "name": $rootScope.searchListArray[i].name, "id": $rootScope.searchListArray[i].id });
8477 8482 }
8478 8483 }
8479 8484 }
... ... @@ -8486,8 +8491,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8486 8491 termListFilterHtml += '</ul>';
8487 8492 $('#searchListDiv').append(termListFilterHtml);
8488 8493 }
8489   - else
8490   - {
  8494 + else {
8491 8495 for (var i = 0; i <= $rootScope.searchListArray.length - 1; i++) {
8492 8496 termListFilterHtml += '<li><a id=' + $rootScope.searchListArray[i].id + ' href="javascript:void(0);" onclick="selectTerm(event)">' + $rootScope.searchListArray[i].name + '</a></li>';
8493 8497 }
... ...