Merge Request #602 request

Amrita Vishnoi
2 parents 5a0caa54 7923eb03
Showing 1 changed file with 46 additions and 23 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -33,7 +33,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
         selectedorientation: '',
         selectedimagetype: '',
     };
-    
+    $scope.activePinArray = [];
     $scope.showTabButton = true;
     $scope.isListViewDataLoaded = true;
@@ -362,6 +362,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                  console.log(' error in showAllPins: ' + error.statusText);
              }
             )
+        if ($scope.isSliderChange == true) {
+            $timeout(function () {
+                $scope.activePinOnLayerChange();
+            }, 1000);
+         
+        }
+
     }
@@ -1049,16 +1056,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                 radius: 5 * $scope.sliderPercentValue,
                 click: function (clickedPin) {
-                    // alert('pin clciked = ' + clickedPin.name)
-
                     if (clickedPin.event.ctrlKey == false) {
                                             $scope.clickedPins = [];
                     }
-
                     var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
-                    // alert('pinId: ' + pinID);
-                    //showAnnotation();
-
                     var pinData = new jinqJs()
                                   .from($scope.aaPinData)
                                   .where("_PinId == " + pinID)
@@ -1088,7 +1089,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                 .where("_PinId == " + pinID)
                                 .select();
                     if (clickedPin.event.ctrlKey == true) {
-
+                      
+                        $scope.activePinArray.push(clickedPin.name);
                         var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
                             x1: 50, y1: 50,
                             x2: 50, y2: 50,
@@ -1096,12 +1098,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                             c1: 'rgba(100, 50, 0,0)',
                             c2: 'rgb(126, 187, 83)'
                         });
-
                         clickedPin.fillStyle = radialAfterClick;
                         $scope.showAnnotation(selectedPinData, true, true, false);
-
                     }
                     else {
+                        $scope.activePinArray = [];
+                        $scope.activePinArray.push(clickedPin.name);
                         var radial = $('#aaDetailViewCanvas').createGradient({
                             x1: 50, y1: 50,
                             x2: 50, y2: 50,
@@ -1190,12 +1192,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                                      .from($scope.AAPinTermData)
                                      .where('_LanguageId == ' + primaryLexicon)
                                      .select();
-                      var sortedTermTextArray = [];
+                     var sortedTermTextArray = [];
                       for (var i = 0; i < $scope.matchedLanguageTermData.length; i++) {
                           sortedTermTextArray.push($scope.matchedLanguageTermData[i]._TermText);
                           sortedTermTextArray.sort();
                       }
-
+                      
+                      for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
+                          for(var j = 0;j<= $scope.matchedLanguageTermData.length-1;j++){
+                              if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i])
+                              {
+                                  $scope.pinTermData.push({ "LanguageId": $scope.matchedLanguageTermData[j]._LanguageId, "TermNumber": $scope.matchedLanguageTermData[j]._TermNumber, "TermTxt": $scope.matchedLanguageTermData[j]._TermText });
+                                  break;
+                              }
+                          }
+                      }
+                     
                       for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
                           for (var j = 0; j <= $scope.matchedLanguageTermData.length - 1; j++) {
                               if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) {
@@ -1269,13 +1281,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
     $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
-      
+         $('#termList').empty();
         $rootScope.bodySystemSeletedId = bodySystemId;
         $('#termList').empty();
         var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
         if (bodySystemName == "All") {
             for (var j = 0; j <= $scope.pinTermData.length - 1; j++) {
-                var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '"  id= "' + $scope.pinTermData[j].TermNumber + '" onclick="onSearchItemSelection(event)">' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
+              
                 $compile($selectedOptions)($scope);
             }
             $("#totalTerms").empty();
@@ -1285,7 +1297,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             var imageId = $rootScope.imageId;
             $scope.pinDataUrl = "aa_dat_pinterm_" + imageId;
             $rootScope.bodySystemTermArray = [];
-         
+          
             $.ajax({
                 url: '~/../content/data/json/aa/aa_pinterm/' + $scope.pinDataUrl + '.json',
                 type: 'GET',
@@ -1589,12 +1601,26 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             }
         }
     }
- 
+    $scope.activePinOnLayerChange = function () {
+        for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
+            var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
+                x1: 50, y1: 50,
+                x2: 50, y2: 50,
+                r1: 10, r2: 30,
+               c1: 'rgba(100, 50, 0,0)',
+               c2: 'rgb(126, 187, 83)'
+            });
+            var clickedPin = $scope.activePinArray[i];
+            $('#aaDetailViewCanvas').setLayer(clickedPin, {
+                fillStyle: radialAfterClick
+            }).drawLayers();
+           
+        }
+    }
 }]);
 function refreshTermListOnSystemSel(bodySystemId) {
-  
     var rootScope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
     rootScope.$apply(function () {
         rootScope.refreshTermListOnAASystemSelection(bodySystemId);
@@ -1729,6 +1755,7 @@ function onZoom(scope) {
 $(document).ready(function () {
+    
     $(".slider").slider({
         min: 25,
         max: 100,
@@ -1736,9 +1763,6 @@ $(document).ready(function () {
         range: "min",
         orientation: "vertical",
         slide: function (event, ui) {
-          
-         
-
             var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
             scope.$apply(function () {
                 scope.sliderVal = ui.value;
@@ -1805,12 +1829,11 @@ $(document).ready(function () {
                     scope.context = canvas.getContext("2d")
                     $("#modItemImage").attr('src', scope.OpenItemImagePath);
                     scope.isSliderChange = true;
+                 
                     scope.showAllPins();
+                 
                 }
-               
-
-
             });
         }
     })