Merge branch 'CALandscapeIssue' into Develop-IPAD-MAC

Nikita Kulshreshtha
2 parents 0b600801 70339905
Showing 1 changed file with 12 additions and 5 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1411,6 +1411,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $scope.pinDataUrl = "aa_dat_pinterm_" + imageId;
             $rootScope.bodySystemTermArray = [];
             $rootScope.sortedListArray = [];
+            $rootScope.duplicateListArray = [];
             $.ajax({
                 url: '~/../content/data/json/aa/aa_pinterm/' + $scope.pinDataUrl + '.json',
                 type: 'GET',
@@ -1424,16 +1425,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
                         if ($scope.aaPinData[i]._BodySystemName.toLowerCase() == bodySystemName.toLowerCase()) {
                             for (var j = 0 ; j <= $rootScope.bodySystemTermArray.length - 1; j++) {
                                 if ($scope.aaPinData[i]._TermId == $rootScope.bodySystemTermArray[j].termNumbr) {
-                                    if ($rootScope.bodySystemTermArray[j].language == "1") {
+                                    if ($rootScope.bodySystemTermArray[j].language == $rootScope.lexiconLanguageArray[0].id) {
                                         console.log($rootScope.bodySystemTermArray[j].text);
-                                        $rootScope.sortedListArray.push({ "title": $rootScope.bodySystemTermArray[j].text, "id": $rootScope.bodySystemTermArray[j].termNumbr });
-                                        
+                                        $rootScope.duplicateListArray.push({ "title": $rootScope.bodySystemTermArray[j].text, "id": $rootScope.bodySystemTermArray[j].termNumbr });
                                     }
                                 }
                             }
                         }
                     }
-
+                    var temp = [];
+                    for (var i = 0; i <= $rootScope.duplicateListArray.length - 1; i++) {
+                        var termID = $rootScope.duplicateListArray[i].id;
+                        if ($.inArray(termID, temp) == -1) {
+                            temp.push(termID);
+                            $rootScope.sortedListArray.push({ "title": $rotScope.duplicateListArray[i].title, "id": termID });
+                        }
+                    }
                     for (var i = 0; i <= $rootScope.sortedListArray.length - 1; i++) {
@@ -1466,7 +1473,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
             $("#totalTerms").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
         }
     }
-    $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo) {
+    $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo) { 
         var languageArray = $rootScope.lexiconLanguageArray;