BUG FIXING #39251

Shashi Bhushan Kumar
1 parent ce429382
Showing 2 changed files with 37 additions and 73 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -17,7 +17,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         SearchTextByAlphabet: '',
         SelectedDiv: ''
     };
-    var Count = 200;
+    var Count = 100;//Bug#39251
     localStorage.setItem("ImageCount", Count);
     var searchByText = $rootScope.getLocalStorageValue("SearchText");
     var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
@@ -28,7 +28,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             if ($scope.query.SelectedDiv == 2) {
                 if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight - 10) {
-                    Count += 100;
+                    Count += 50;//Bug#39251
                     //$(window).scrollTop(0);
                     var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
                     if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') {
@@ -61,7 +61,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $(window).scroll(function () {
         if ($scope.query.SelectedDiv == 1) {
             if ($(window).scrollTop() == $(document).height() - $(window).height()) {
-                Count += 100;
+                Count += 50;//Bug#39251
                 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
                 if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') {
                     $scope.query.SearchText = searchByText;
@@ -203,21 +203,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.LoadAIJsonData = function (ImageCount) {
         $('ul li span').removeAttr("style");
-        var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
-        promise.then(
-                  function (result) {
-                      $scope.IllustrationData = result;
+                      //Bug#39251
                       $scope.selectedAIListViewData = new jinqJs()
-                                                      .from($scope.IllustrationData.root.AIData)
+                                                      .from($rootScope.IllustrationImageData.root.AIData)
                                                       .orderBy([{ field: '_Title', sort: 'asc' }])
                                                       .select().slice(0, ImageCount);
-
-                  },
-                  function (error) {
-                      // handle errors here
-                      console.log(' $scope.IllustrationData = ' + error.statusText);
-                  }
-               );
     };
     $scope.loadAllAI = function (ImageCount) {
@@ -229,14 +219,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $('#aiSpinner').css('zIndex', '20000');
         if ($location.url() == "/ADAM-images") {
             $scope.DisableUI();
-        }
-        var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
-        promise.then(
-                  function (result) {
-                      $scope.IllustrationData = result;
+        }             //Bug#39251
                       $scope.selectedAIListViewData = new jinqJs()
-                                                      .from($scope.IllustrationData.root.AIData)
+                                                      .from($rootScope.IllustrationImageData.root.AIData)
                                                       .orderBy([{ field: '_Title', sort: 'asc' }])
                                                       .select().slice(0, ImageCount);
@@ -252,11 +238,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       $compile($e1)($scope);
                       $timeout(function () {
+               
                           $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
                           if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images" && $scope.query.SelectedDiv == 1) {
                               $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
                           }
-                      }, 100);
+                      }, 10);//Bug#39251
                       $rootScope.isLoading = false;
                       $('#aiSpinner').css('visibility', 'hidden');
@@ -266,14 +253,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           }, 10);
                       }
-
-                  },
-                  function (error) {
-                      // handle errors here
-                      console.log(' $scope.IllustrationData = ' + error.statusText);
-                  }
-               );
-
     }
     $scope.IsVisible = function () {
@@ -376,14 +355,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         else {
             localStorage.setItem("SearchText", '');
         }
-
-        var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
-        promise.then(
-                  function (result) {
-                      $scope.IllustrationData = result;
-
+                       //Bug#39251
                       $scope.selectedAIListViewData = new jinqJs()
-                                                      .from($scope.IllustrationData.root.AIData)
+                                                      .from($rootScope.IllustrationImageData.root.AIData)
+                                                       .where(function (value, key){return value._Title.toLowerCase().indexOf($scope.query.SearchText.toLowerCase());})
                                                       .orderBy([{ field: '_Title', sort: 'asc' }])
                                                       .select();
@@ -441,13 +416,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           $scope.EnableUI();
                       }, 10);
-
-                  },
-                  function (error) {
-                      // handle errors here
-                      console.log(' $scope.IllustrationData = ' + error.statusText);
-                  }
-               );
     }
     $scope.DisableUI = function () {
@@ -482,13 +450,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         else {
             localStorage.setItem("SearchByAlphabet", '');
         }
-        var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
-        promise.then(
-                  function (result) {
-                      $scope.IllustrationData = result;
-
+                      //Bug#39251
                       $scope.selectedAIListViewData = new jinqJs()
-                                                      .from($scope.IllustrationData.root.AIData)
+                                                      .from($rootScope.IllustrationImageData.root.AIData)
+                                                      .where(function (value, key) { return value._Title[0] === SearchTextByAlphabet; })
                                                       .orderBy([{ field: '_Title', sort: 'asc' }]).select();
                       $('#grid-view').empty();
@@ -538,15 +503,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                           $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>');
                       }
                       $rootScope.isLoading = false;
-                     
-                      setTimeout(function () {
-                          $scope.EnableUI();
-                      }, 10);
-                  },
-                  function (error) {
-                      console.log(' $scope.IllustrationData = ' + error.statusText);
-                  }
-               );
+                       $scope.EnableUI();
+                      //setTimeout(function () {
+                      //    $scope.EnableUI();
+                      //}, 10);
     }
@@ -691,14 +651,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.isLoading = true;
         $('#aiSpinner').css('visibility', 'visible');
         $('#aiSpinner').css('zIndex', '20000');
-        var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
-        promise.then(
-                  function (result) {
-                      $scope.IllustrationData = result;
-
+                      //Bug#39251
                       var SelectedAIthumbImage = [];
                       SelectedAIthumbImage = new jinqJs()
-                                    .from($scope.IllustrationData.root.AIData)
+                                    .from($rootScope.IllustrationImageData.root.AIData)
                                     .where('_id = ' + id)
                                     .select('_ThumbnailImage', '_id', '_Title').slice(0, imgCount);
@@ -720,13 +676,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       }
                       $rootScope.isLoading = false;
                       $('#aiSpinner').css('visibility', 'hidden');
-
-                  },
-                  function (error) {
-                      // handle errors here
-                      console.log(' $scope.AnimationData = ' + error.statusText);
-                  }
-               );
     };
     $scope.hideListViewDiv = function () {
@@ -189,6 +189,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
             }
             $rootScope.getConfigurationValues();
+            $rootScope.LoadIllustrationImageData();//Start Bug#39251
         }
     }
     $rootScope.getConfigurationValues = function () {
@@ -437,7 +438,7 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
     $scope.ValidateClientSiteUrl = function () {
-        debugger
+
         $rootScope.isCallFromSite = true;
         var siteInfo = params.split('&');
@@ -5757,6 +5758,20 @@ function ($rootScope, $scope, Modules, $log, $location, $timeout, DataService, A
     };
+    //Start Bug#39251
+    $rootScope.LoadIllustrationImageData = function () {
+        var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json');
+        promise.then(
+            function (result) {
+                $rootScope.IllustrationImageData = result;
+            },
+            function (error) {
+                // handle errors here
+                console.log(' $scope.IllustrationImageData = ' + error.statusText);
+            }
+        );
+    };
+    //END Bug#39251
 }]
 );