Merge branch '26672' into Develop-IPAD-MAC

Nikita Kulshreshtha
2 parents 26e1133e 0ad05f5f
Showing 2 changed files with 58 additions and 48 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -497,31 +497,31 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         //once you get id in scope push detail in jspanel content
-        var openViews;
-        if ($rootScope.openViews.length > 0) {
-            openViews = new jinqJs()
-               .from($rootScope.openViews)
-               .where("BodyViewId==" + $scope.voId)
-               .select();
-        }
+      //  var openViews;
+        //if ($rootScope.openViews.length > 0) {
+        //    openViews = new jinqJs()
+        //       .from($rootScope.openViews)
+        //       .where("BodyViewId==" + $scope.voId)
+        //       .select();
+        //}
         var counter = 1;
         var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
+        localStorage.setItem("currentViewTitle", tittle);
+        //if (openViews != null && openViews.length > 0) {
+        //    angular.forEach(openViews, function (value, key) {
-        if (openViews != null && openViews.length > 0) {
-            angular.forEach(openViews, function (value, key) {
+        //        if (value.body - views == tittle) {
+        //            tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
+        //            $rootScope.currentActiveViewTitle = tittle;
+        //            localStorage.setItem("currentViewTitle", tittle);
+        //        }
-                if (value.body - views == tittle) {
-                    tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
-                    $rootScope.currentActiveViewTitle = tittle;
-                    localStorage.setItem("currentViewTitle", tittle);
-                }
-
-            });
-        }
-        else {
-            localStorage.setItem("currentViewTitle", tittle);
+        //    });
+        //}
+        //else {
+        //    localStorage.setItem("currentViewTitle", tittle);
-        }
+        //}
         //alert($rootScope.getLocalStorageValue("currentViewTitle"));
@@ -501,7 +501,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openView = function ($event) {
-
+     
         $rootScope.MenuModuleName = "CI";
         $rootScope.disableAnnotationTB = false;
         $rootScope.CIAnotationIdentifyModeOff = true;
@@ -523,7 +523,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         }
-
         localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle);
         localStorage.setItem("currentBodyViewId", $event.currentTarget.id);
@@ -539,7 +538,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.openBodyView = function () {
-
         if ($rootScope.refreshcheck == null) {
             $location.path('/');
         }
@@ -548,36 +546,48 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $('#spinner').css('visibility', 'visible');
         $scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId");
-        // alert($scope.voId);
-
         //once you get id in scope push detail in jspanel content
-        var openViews;
-        if ($rootScope.openViews.length > 0) {
-            openViews = new jinqJs()
-               .from($rootScope.openViews)
-               .where("BodyViewId==" + $scope.voId)
-               .select();
-        }
+      //  var openViews;
+      //  console.log($rootScope.openViews);
+      //  if ($rootScope.openViews.length > 0 && $rootScope.openViews != null && $rootScope.openViews != undefined) {
+           // alert("entered");
+            //for (var i=0; i <= $rootScope.openViews.length - 1; i++) {
+            //    if ($rootScope.openViews[i].BodyViewId == $scope.voId) {
+            //        alert("success");
+            //        openViews = $rootScope.openViews;
+            //    }
+            //}
+            // openViews = $rootScope.openViews;
+
+
+            //alert($rootScope.openViews);
+            //openViews = new jinqJs()
+            //   .from($rootScope.openViews)
+            //   .where("BodyViewId==" + $scope.voId)
+            //   .select();
+        //}
+     
         var counter = 1;
         var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson");
-
-        if (openViews != null && openViews.length > 0) {
-            angular.forEach(openViews, function (value, key) {
-
-                if (value.body - views == tittle) {
-                    tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
-                    $rootScope.currentActiveViewTitle = tittle;
-                    localStorage.setItem("currentViewTitle", tittle);
-                }
-
-            });
-        }
-        else {
-            localStorage.setItem("currentViewTitle", tittle);
-
-        }
+        localStorage.setItem("currentViewTitle", tittle);
+        //if (openViews != null && openViews.length > 0 && openViews != undefined) {
+        //   // alert("aaa");
+        //    console.log(openViews);
+        //    angular.forEach(openViews, function (value, key) {
+        //        if (value.body - views == tittle) {
+        //            tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++;
+        //            $rootScope.currentActiveViewTitle = tittle;
+        //            localStorage.setItem("currentViewTitle", tittle);
+        //        }
+
+        //    });
+        //}
+        //else {
+        //    localStorage.setItem("currentViewTitle", tittle);
+
+        //}
         //alert($rootScope.getLocalStorageValue("currentViewTitle"));