ADAM / AIAHTML5

Commit 7199b725cbe55cbb6ee3324fb649c9a160837116

Authored by Nikita Kulshreshtha
1 parent c81a594f

LM & search is workin. 

scroll is not done as top, left values is not getting by css prop of div in IE
Inline Side-by-side
Showing 2 changed files with 26 additions and 14 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @7199b72
... ... @@ -2425,7 +2425,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2425 2425 console.log('$scope.highlightedBR.length= ' + $scope.highlightedBR.length)
2426 2426  
2427 2427 if ($scope.highlightedBR != null || $scope.highlightedBR != undefined) {
2428   -
  2428 +
2429 2429 if ((($rootScope.viewOrientationId == '1') || ($rootScope.viewOrientationId == '4')) && ($scope.highlightedBR.length == 9)) {
2430 2430 $scope.doAligneCanvasWithTerm = true;
2431 2431 }
... ... @@ -2438,7 +2438,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2438 2438 else if ((($rootScope.viewOrientationId == '6')) && ($scope.highlightedBR.length == 1)) {
2439 2439 $scope.doAligneCanvasWithTerm = true;
2440 2440 }
2441   -
  2441 + alert('$scope.doAligneCanvasWithTerm = ' + $scope.doAligneCanvasWithTerm)
2442 2442 if ($scope.doAligneCanvasWithTerm == true) {
2443 2443  
2444 2444 if ($rootScope.isListManagerSelected == true)
... ... @@ -6809,7 +6809,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6809 6809 $scope.searchFilter = event.currentTarget.innerHTML;
6810 6810  
6811 6811 //2.
6812   - $scope.HighlightBodyOnListManagerSelection(event);
  6812 + $scope.HighlightBodyOnListManagerSelection(event.currentTarget.id);
6813 6813  
6814 6814 $scope.IsSearchVisible = false;
6815 6815 $rootScope.isNormalMode = false;
... ... @@ -6979,7 +6979,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6979 6979  
6980 6980  
6981 6981 for (var j = 0; j < $scope.VocabTermTxt.length; j++) {
6982   - var $el = $('<option title ="'+ $scope.VocabTermTxt[j]._TermText+ '" ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
  6982 + var $el = $('<option title ="' + $scope.VocabTermTxt[j]._TermText + '" id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
6983 6983 $compile($el)($scope);
6984 6984  
6985 6985 }
... ... @@ -6997,9 +6997,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6997 6997 }
6998 6998  
6999 6999  
7000   - $scope.HighlightBodyOnListManagerSelection = function (event) {
  7000 + $scope.HighlightBodyOnListManagerSelection = function (actualTermNumber) {
  7001 +
  7002 + console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber)
7001 7003 // Terms search in the Search list should be disable in the List Manager and Vice-Versa.
7002   - if ($rootScope.prevId == event.currentTarget.id) {
  7004 + if ($rootScope.prevId == actualTermNumber) {
7003 7005  
7004 7006 $rootScope.isLoading = false;
7005 7007 $('#spinner').css('visibility', 'hidden');
... ... @@ -7011,12 +7013,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7011 7013 $('#spinner').css('visibility', 'visible');
7012 7014  
7013 7015  
7014   - $rootScope.prevId = event.currentTarget.id;
  7016 + $rootScope.prevId = actualTermNumber;
7015 7017 $("#termList").find("option").attr('selected', false);
7016 7018 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
7017   - $("#termList").find("option[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  7019 + $("#termList").find("option[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
7018 7020 $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
7019   - $("div#backdrop #termlistfilter li").find("a[id=" + event.currentTarget.id + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  7021 + $("div#backdrop #termlistfilter li").find("a[id=" + actualTermNumber + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
7020 7022 $scope.terminateCurrentlyRunningWPs();
7021 7023 //debugger
7022 7024 $rootScope.isListManagerSelected = true;
... ... @@ -7037,7 +7039,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7037 7039 $rootScope.isHighlightBodyByBodySystem = false;
7038 7040  
7039 7041 //1.
7040   - $rootScope.actualTermNumber = event.currentTarget.id;//attributes[0].value;
  7042 + $rootScope.actualTermNumber = actualTermNumber;//attributes[0].value;
7041 7043 console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + $rootScope.actualTermNumber)
7042 7044  
7043 7045 //2.
... ... @@ -7232,6 +7234,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7232 7234  
7233 7235  
7234 7236 $scope.aligneCanvasWithTerm = function () {
  7237 + alert('inside align')
7235 7238 console.log('aligneCanvasWithTerm')
7236 7239 var newX = parseInt($scope.scaleValue($scope.termCoordinate.x, $scope.zoomInOut, DA[0].ZOOM_TERM_DATA));
7237 7240 var newY = parseInt($scope.scaleValue($scope.termCoordinate.y, $scope.zoomInOut, DA[0].ZOOM_TERM_DATA));
... ... @@ -7265,7 +7268,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7265 7268 else {
7266 7269 newX = maxHScrollPos;
7267 7270 }
7268   -
  7271 + alert('newX= ' + newX + ',newY= ' + newY)
7269 7272 $('#canvasDiv').scrollLeft(newX);
7270 7273 $('#canvasDiv').scrollTop(newY);
7271 7274 $scope.isLoading = false;
... ... @@ -7371,7 +7374,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7371 7374  
7372 7375  
7373 7376 for (var j = 0; j < $scope.VocabTermTxt.length; j++) {
7374   - var $el = $('<option ng-click=HighlightBodyOnListManagerSelection($event) id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
  7377 + var $el = $('<option id=' + $scope.VocabTermTxt[j]._ActualTermNumber + '>' + $scope.VocabTermTxt[j]._TermText + '</option>').appendTo('#termList')
7375 7378 $compile($el)($scope);
7376 7379 }
7377 7380  
... ... @@ -7602,4 +7605,13 @@ function OnZoom()
7602 7605 scope.$apply(function () {
7603 7606 scope.enableZoom();
7604 7607 });
  7608 +}
  7609 +
  7610 +function onListManagerTermSelection(event) {
  7611 + alert('selected')
  7612 + var scope = angular.element(document.getElementById("daView")).scope();
  7613 + scope.$apply(function () {
  7614 + scope.HighlightBodyOnListManagerSelection(event);
  7615 + });
  7616 +
7605 7617 }
7606 7618 \ No newline at end of file
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @7199b72
... ... @@ -718,7 +718,7 @@
718 718 <select class="form-control" disabled>
719 719 <option value="1" selected="">Entire View</option>
720 720 </select>
721   - </div>
  721 + </div>
722 722 </div>
723 723 </div>
724 724 </div>
... ... @@ -729,7 +729,7 @@
729 729  
730 730 <!--DA > List Manager > Multiple structure selection should not be available.-->
731 731 <div class="form-group">
732   - <select id="termList" class="form-control" size="10"></select>
  732 + <select id="termList" class="form-control" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onListManagerTermSelection(this.options[this.selectedIndex].id)"></select>
733 733 </div>
734 734  
735 735 </div>
... ...