Merge branch 'AIA_BUGS' into Develop

Nikita Kulshreshtha
2 parents 96f40699 89bf88dc
Showing 2 changed files with 84 additions and 82 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
400-SOURCECODE/AIAHTML5.Web/app/views/ai/ai-view.html
@@ -15,17 +15,21 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     $scope.query = {
         SearchText: '',
         SearchTextByAlphabet: '',
+        SelectedDiv: ''
     };
+    var Count = 200;
+    localStorage.setItem("ImageCount", Count);
+    var searchByText = $rootScope.getLocalStorageValue("SearchText");
+    var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
+    var SelectCurrTab = $rootScope.getLocalStorageValue("currentAITabView");
+
+    $timeout(function () {
+        $("#ListViewDiv").on('scroll', function () {
+            if ($scope.query.SelectedDiv == 2) {
-    $(document).ready(function () {
-        $timeout(function () {
-            var Count = 200;
-            localStorage.setItem("ImageCount", Count);
-            var searchByText = $rootScope.getLocalStorageValue("SearchText");
-            var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
-            $("#ListViewDiv").on('scroll', function () {
                 if ($(this).scrollTop() + $(this).innerHeight() >= $(this)[0].scrollHeight - 10) {
                     Count += 100;
+                    //$(window).scrollTop(0);
                     var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
                     if (typeof (searchByText) !== "undefined" && searchByText !== null && searchByText !== '') {
                         $scope.query.SearchText = searchByText;
@@ -49,16 +53,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                         $scope.ApplySearch($scope.query);
                     }
                 }
-            });
-        }, 10);
-    });
+            }
+        });
-    $(document).ready(function () {
-        var Count = 200;
-        localStorage.setItem("ImageCount", Count);
-        var searchByText = $rootScope.getLocalStorageValue("SearchText");
-        var searchTextByAlphabet = $rootScope.getLocalStorageValue("SearchByAlphabet");
-        $(window).scroll(function () {
+    }, 10);
+
+    $(window).scroll(function () {
+        if ($scope.query.SelectedDiv == 1) {
             if ($(window).scrollTop() == $(document).height() - $(window).height()) {
                 Count += 100;
                 var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
@@ -84,25 +85,40 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     $scope.ApplySearch($scope.query);
                 }
             }
-        });
-
+        }
     });
+
     $scope.setActiveTab = function (tabToSet) {
         $scope.activeTab = tabToSet;
         localStorage.setItem("currentAITabView", $scope.activeTab);
         var ImageCount = $rootScope.getLocalStorageValue("ImageCount");
+        var searchText = $rootScope.getLocalStorageValue("SearchText");
         if (tabToSet == 2) {
             var curSelectedRowId = $rootScope.getLocalStorageValue("AISelectedRowId");
             $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).addClass("selected");
             $scope.idSelected = $rootScope.getLocalStorageValue("currentAIImageId");
             var selectedImageId = $rootScope.getLocalStorageValue("currentAIImageId");
-            $scope.ReloadListViewImageDiv(selectedImageId, ImageCount);
+            if (searchText != '') {
+                $scope.ApplySearch(searchText);
+            }
+            else {
+                $scope.ReloadListViewImageDiv(selectedImageId, ImageCount);
+            }
+
+            $scope.query.SelectedDiv = tabToSet;
         }
         else {
             $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
             $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).removeClass('selected');
-            $scope.loadAllAI(ImageCount);
+            $scope.query.SelectedDiv = tabToSet;
+            if (searchText != '') {
+                $scope.ApplySearch(searchText);
+            }
+            else {
+                $scope.loadAllAI(ImageCount);
+            }
+
         }
     };
@@ -202,8 +218,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       console.log(' $scope.IllustrationData = ' + error.statusText);
                   }
                );
-
-
     };
     $scope.loadAllAI = function (ImageCount) {
@@ -239,8 +253,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       $timeout(function () {
                           $('#' + $rootScope.getLocalStorageValue("currentAIImageId")).find('.thumbnail').addClass('HightLightThumbnail');
-                          if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images") {
-                              //$('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
+                          if ($rootScope.getLocalStorageValue('AIGridViewScroll') !== null && $location.url() == "/ADAM-images" && $scope.query.SelectedDiv == 1) {
+                              $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AIGridViewScroll') });
                           }
                       }, 100);
@@ -334,24 +348,22 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         var currentSearchtext = $rootScope.getLocalStorageValue("SearchText");
         localStorage.setItem("SearchText", '');
         if (currentSearchtext == "undefined" || (currentSearchtext == null || currentSearchtext == "")) {
-            if (query.SearchText == "undefined" || (query.SearchText == null || query.SearchText == "")) {
+            if ($scope.query.SearchText == "undefined" || ($scope.query.SearchText == null || $scope.query.SearchText == "")) {
                 $rootScope.errorMessage = AIAConstants.PLEASE_ENTER_SEARCH_TEXT;
                 $("#messageModal").modal('show');
-                // alert("Please enter the text !")
                 return false;
             }
         }
+        while ($scope.searchAIListViewData.length) {
+            $scope.searchAIListViewData.pop();
+        }
+
         $rootScope.isLoading = true;
         $('#aiSpinner').css('visibility', 'visible');
         $scope.DisableUI();
         $scope.filterstring = true;
-
-        //while ($scope.searchAIListViewData.length) {
-        //    $scope.searchAIListViewData.pop();
-        //}
-
-        if (typeof (query.SearchText) !== "undefined" && (query.SearchText !== null && query.SearchText !== "")) {
+        if (typeof ($scope.query.SearchText) !== "undefined" && ($scope.query.SearchText !== null && $scope.query.SearchText !== "")) {
             localStorage.setItem("SearchText", query.SearchText);
         }
         else {
@@ -369,13 +381,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                                                       .select();
                       $('#grid-view').empty();
-
                       angular.forEach($scope.selectedAIListViewData, function (value, key) {
                           var selectimg = true;
                           //var count = 0;
-                          if (typeof (query.SearchText) !== "undefined" && (query.SearchText !== null && query.SearchText !== "")) {
-                              var SearchText = query.SearchText
+                          if (typeof ($scope.query.SearchText) !== "undefined" && ($scope.query.SearchText !== null && $scope.query.SearchText !== "")) {
+                              var SearchText = $scope.query.SearchText
                               var posbodyregion = value._Title.toLowerCase().indexOf(SearchText.toLowerCase());
                               if (posbodyregion > -1) {
                                   selectimg = true;
@@ -397,11 +408,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                               $compile($el)($scope);
-
-                              //$(".sidebar").mCustomScrollbar({
-                              //    autoHideScrollbar: true,
-                              //    //theme:"rounded"
-                              //});
                               $scope.searchAIListViewData.push(
                               {
                                   "_id": value._id,
@@ -426,6 +432,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       $('#aiSpinner').css('visibility', 'hidden');
                       setTimeout(function () {
                           $scope.EnableUI();
+
                       }, 10);
                   },
@@ -446,7 +453,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         document.getElementById("imgParent").style.pointerEvents = "auto";
         document.getElementById("imgParent").style.opacity = "1.0";
     }
-
     $scope.counter = 1;
     $scope.ApplySearchByAlphabet = function (SearchTextByAlphabet) {
         $rootScope.SearchTextByAlphabet = SearchTextByAlphabet
@@ -462,7 +468,6 @@ 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) {
@@ -474,6 +479,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       $('#grid-view').empty();
+
                       angular.forEach($scope.selectedAIListViewData, function (value, key) {
                           var selectimg = true;
@@ -677,8 +683,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.isLoading = true;
         $('#aiSpinner').css('visibility', 'visible');
         $('#aiSpinner').css('zIndex', '20000');
-        //$scope.DisableUI();
-
         var promise = DataService.getJson('~/../content/data/json/ai/ai_dat_contentlist.json')
         promise.then(
                   function (result) {
@@ -708,9 +712,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       }
                       $rootScope.isLoading = false;
                       $('#aiSpinner').css('visibility', 'hidden');
-                      //setTimeout(function () {
-                      //    $scope.EnableUI();
-                      //}, 10);
+
                   },
                   function (error) {
                       // handle errors here
@@ -8,47 +8,47 @@
                         <form class="form-inline padd5">
                             <div class="form-group">
                                 <label for="exampleInputName2" class="text-primary">Search</label>
-                                <input type="text" ng-change="hideListViewDiv()" ng-model="query.SearchText" class="form-control input-sm col-sm" id="txtSerachInput" placeholder="">
+                                <input type="text" ng-model="query.SearchText" class="form-control input-sm col-sm" id="txtSerachInput" placeholder="">
                             </div>
                             <button type="button" class="btn btn-primary btn-sm" ng-click="ApplySearch(query)" style="margin-right:2px;">
                                 <i class="fa fa-search"></i>
                             </button>
                         </form>
-                            <nav>
-                                <ul class="pagination pagination-sm no-margin" style="cursor: pointer;">
-                                    <li><span id="A" ng-click="ApplySearchByAlphabet('A')"> A</span></li>
-                                    <li><span id="B" ng-click="ApplySearchByAlphabet('B')"> B</span></li>
-                                    <li><span id="C" ng-click="ApplySearchByAlphabet('C')"> C</span></li>
-                                    <li><span id="D" ng-click="ApplySearchByAlphabet('D')"> D</span></li>
-                                    <li><span id="E" ng-click="ApplySearchByAlphabet('E')"> E</span></li>
-                                    <li><span id="F" ng-click="ApplySearchByAlphabet('F')"> F</span></li>
-                                    <li><span id="G" ng-click="ApplySearchByAlphabet('G')"> G</span></li>
-                                    <li><span id="H" ng-click="ApplySearchByAlphabet('H')"> H</span></li>
-                                    <li><span id="I" ng-click="ApplySearchByAlphabet('I')"> I</span></li>
-                                    <li><span id="J" ng-click="ApplySearchByAlphabet('J')"> J</span></li>
-                                    <li><span id="K" ng-click="ApplySearchByAlphabet('K')"> K</span></li>
-                                    <li><span id="L" ng-click="ApplySearchByAlphabet('L')"> L</span></li>
-                                    <li><span id="M" ng-click="ApplySearchByAlphabet('M')"> M</span></li>
-                                    <li><span id="N" ng-click="ApplySearchByAlphabet('N')"> N</span></li>
-                                    <li><span id="O" ng-click="ApplySearchByAlphabet('O')"> O</span></li>
-                                    <li><span id="P" ng-click="ApplySearchByAlphabet('P')"> P</span></li>
-                                    <li><span id="Q" ng-click="ApplySearchByAlphabet('Q')"> Q</span></li>
-                                    <li><span id="R" ng-click="ApplySearchByAlphabet('R')"> R</span></li>
-                                    <li><span id="S" ng-click="ApplySearchByAlphabet('S')"> S</span></li>
-                                    <li><span id="T" ng-click="ApplySearchByAlphabet('T')"> T</span></li>
-                                    <li><span id="U" ng-click="ApplySearchByAlphabet('U')"> U</span></li>
-                                    <li><span id="V" ng-click="ApplySearchByAlphabet('V')"> V</span></li>
-                                    <li><span id="W" ng-click="ApplySearchByAlphabet('W')"> W</span></li>
-                                    <li><span id="X" ng-click="ApplySearchByAlphabet('X')"> X</span></li>
-                                    <li><span id="Y" ng-click="ApplySearchByAlphabet('Y')"> Y</span></li>
-                                    <li><span id="Z" ng-click="ApplySearchByAlphabet('Z')"> Z</span></li>
+                        <nav>
+                            <ul class="pagination pagination-sm no-margin" style="cursor: pointer;">
+                                <li><span id="A" ng-click="ApplySearchByAlphabet('A')"> A</span></li>
+                                <li><span id="B" ng-click="ApplySearchByAlphabet('B')"> B</span></li>
+                                <li><span id="C" ng-click="ApplySearchByAlphabet('C')"> C</span></li>
+                                <li><span id="D" ng-click="ApplySearchByAlphabet('D')"> D</span></li>
+                                <li><span id="E" ng-click="ApplySearchByAlphabet('E')"> E</span></li>
+                                <li><span id="F" ng-click="ApplySearchByAlphabet('F')"> F</span></li>
+                                <li><span id="G" ng-click="ApplySearchByAlphabet('G')"> G</span></li>
+                                <li><span id="H" ng-click="ApplySearchByAlphabet('H')"> H</span></li>
+                                <li><span id="I" ng-click="ApplySearchByAlphabet('I')"> I</span></li>
+                                <li><span id="J" ng-click="ApplySearchByAlphabet('J')"> J</span></li>
+                                <li><span id="K" ng-click="ApplySearchByAlphabet('K')"> K</span></li>
+                                <li><span id="L" ng-click="ApplySearchByAlphabet('L')"> L</span></li>
+                                <li><span id="M" ng-click="ApplySearchByAlphabet('M')"> M</span></li>
+                                <li><span id="N" ng-click="ApplySearchByAlphabet('N')"> N</span></li>
+                                <li><span id="O" ng-click="ApplySearchByAlphabet('O')"> O</span></li>
+                                <li><span id="P" ng-click="ApplySearchByAlphabet('P')"> P</span></li>
+                                <li><span id="Q" ng-click="ApplySearchByAlphabet('Q')"> Q</span></li>
+                                <li><span id="R" ng-click="ApplySearchByAlphabet('R')"> R</span></li>
+                                <li><span id="S" ng-click="ApplySearchByAlphabet('S')"> S</span></li>
+                                <li><span id="T" ng-click="ApplySearchByAlphabet('T')"> T</span></li>
+                                <li><span id="U" ng-click="ApplySearchByAlphabet('U')"> U</span></li>
+                                <li><span id="V" ng-click="ApplySearchByAlphabet('V')"> V</span></li>
+                                <li><span id="W" ng-click="ApplySearchByAlphabet('W')"> W</span></li>
+                                <li><span id="X" ng-click="ApplySearchByAlphabet('X')"> X</span></li>
+                                <li><span id="Y" ng-click="ApplySearchByAlphabet('Y')"> Y</span></li>
+                                <li><span id="Z" ng-click="ApplySearchByAlphabet('Z')"> Z</span></li>
+
+                            </ul>
+                            <button type="button" class="btn btn-primary btn-sm" ng-click="Reset(query)" style="margin-bottom:23px"><i class="fa fa-eye"></i>Show All</button>
+                        </nav>
-                                </ul>
-                                <button type="button" class="btn btn-primary btn-sm" ng-click="Reset(query)" style="margin-bottom:23px"><i class="fa fa-eye"></i>Show All</button>
-                            </nav>
-                        
                     </div>
-                    
+
                 </div>
             </div>
         </div>
@@ -97,7 +97,7 @@
             </div>
         </div>
     </div>
-    <div id="aiSpinner" class="spinner"  ng-show="isLoading" style="visibility: hidden; opacity: 1; width: 100%; height: 100%; top: 0; bottom: 0%; left: 0; right: 0%; margin-left: 0px;">
+    <div id="aiSpinner" class="spinner" ng-show="isLoading" style="visibility: hidden; opacity: 1; width: 100%; height: 100%; top: 0; bottom: 0%; left: 0; right: 0%; margin-left: 0px;">
         <img id="img-spinner" class="spinner" src="content/images/common/loading.gif" alt="Loading" />
     </div>
 </div>