Merge branch 'Develop' into QA

Amrita Vishnoi
2 parents a71946ed 7a775f06
Showing 5 changed files with 33 additions and 22 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -397,12 +397,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
  
                       });
-
+                      $('table > #ListViewDiv > #searchAnimation').remove();
                       //Show Error Message in case of gridview if no data is found
                       if ($scope.searchCAListViewData.length == 0) {
-
                           var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:white;">No animation found for the selected search criteria!</strong></div>').appendTo('#grid-view');
                           $compile($el)($scope);
+                          $('table > #ListViewDiv > #searchAnimation').remove();
+                          $('#ListViewDiv').append('<tr id="searchAnimation"><td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td></tr>');
                       }
  
                   },
@@ -175,7 +175,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
  
  
                       $('#grid-view').empty();
-                      var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" ><div id="{{value._id}}" class="col-sm-3 col-md-2" title = "{{value._Title}}"  data-ng-click="openView($event)">'
+                      var $e1 = $('<ul><li ng-repeat="value in selectedCIListViewData" class="col-sm-3 col-md-2"><div id="{{value._id}}"  title = "{{value._Title}}"  data-ng-click="openView($event)">'
                               + '<div class="thumbnail" >'
                                          + '<img id="{{value._Title}}" ng-src="~/../content/images/ci/thumbnails/{{value._ThumbnailImage}}" >'//alt="{{value._Title}}" >'
                                          + '<div class="caption"><p> {{value._Title}}</p></div></a></div></div></li></ul>').appendTo('#grid-view');
@@ -288,35 +288,42 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
     }
  
     $scope.ApplySearch = function (query) {
-
+     
+       
         $scope.filterstring = true;
  
         while ($scope.searchCIListViewData.length) {
             $scope.searchCIListViewData.pop();
         }
  
-        //$('#grid-view').empty();
+      
  
         filtercount = 0;
         if (typeof (query.selectedbodyregion) !== "undefined" && (query.selectedbodyregion !== null && query.selectedbodyregion !== "")) {
             filtercount = filtercount + 1;
+
             localStorage.setItem("CICurBodyRegion", query.selectedbodyregion);
+          
         }
         else {
             localStorage.setItem("CICurBodyRegion", '');
+           
         }
  
         if (typeof (query.selectedbodysystem) !== "undefined" && (query.selectedbodysystem !== null && query.selectedbodysystem !== "")) {
             filtercount = filtercount + 1;
             localStorage.setItem("CICurBodySystem", query.selectedbodysystem);
+           
         }
         else {
             localStorage.setItem("CICurBodySystem", '');
+           
         }
  
         if (typeof (query.selectedorientation) !== "undefined" && (query.selectedorientation !== null && query.selectedorientation !== '')) {
             filtercount = filtercount + 1;
             localStorage.setItem("CICurOrientation", query.selectedorientation);
+          
         }
         else {
             localStorage.setItem("CICurOrientation", '');
@@ -325,17 +332,21 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         if (typeof (query.selectedimagetype) !== "undefined" && (query.selectedimagetype !== null && query.selectedimagetype !== '')) {
             filtercount = filtercount + 1;
             localStorage.setItem("CICurImageType", query.selectedimagetype);
+           
         }
         else {
             localStorage.setItem("CICurImageType", '');
+          
         }
  
         if (typeof (query.selectedspecialty) !== "undefined" && (query.selectedspecialty !== null && query.selectedspecialty !== '')) {
             filtercount = filtercount + 1;
             localStorage.setItem("CICurSpeciality", query.selectedspecialty);
+           
         }
         else {
             localStorage.setItem("CICurSpeciality", '');
+           
         }
  
  
@@ -454,17 +465,16 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                                   "_Summary": value._Summary
  
                               });
-
                           }
-
-
                       });
-
+                      $('table > #ListViewDiv > #searchItem').remove();
                       //Show Error Message in case of gridview if no data is found
                       if ($scope.searchCIListViewData.length == 0) {
-
                           var $el = $('<div class="col-sm-12" style="padding-left:25px;padding-top:10px;"><strong style="color:white">No illustration found for the selected search criteria!</strong></div>').appendTo('#grid-view');
                           $compile($el)($scope);
+                          $('table > #ListViewDiv > #searchItem').remove();
+                          
+                      $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>');
                       }
                   },
                   function (error) {
@@ -472,8 +482,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                       console.log(' $scope.IllustrationData = ' + error.statusText);
                   }
                );
-
-
     }
  
  
@@ -191,6 +191,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
  
     $rootScope.LogoutUser = function () {
         localStorage.removeItem('loggedInUserDetails');
+        localStorage.clear();
         document.location = '/';
         $rootScope.isVisibleLogin = true;
     }
@@ -3068,6 +3069,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
  
     $rootScope.disableAnnotationtoolOnListManager = false;
     $rootScope.ShowListManager = function () {
+     
         $rootScope.switchCanvas();
         $("#annotationpaintbrushsize").attr("href", "#");
         $("#annotationpainteraser").attr("href", "#");
@@ -3086,9 +3088,6 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
         $("#listManager").css("visibility", "visible");
  
         $('#listManager').draggable();
-
-
-
         $rootScope.islistManagerEventAlredayDispachted = true;
  
         $rootScope.$broadcast('listManagerEvent', true);
@@ -3116,10 +3115,12 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
             // $('#termList option[value="' + $rootScope.SelectedTermList + '"]').prop("selected", true);
             //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
             //$('#termList option[value="' + $rootScope.SelectedTermList + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-
-
         }
         $("#optionsListManagerTab").addClass("active");
+        var viewNameAftrSplit = $("#viewName").val().split(" ");
+        if (viewNameAftrSplit[0] == "null") {
+            document.location.href = "/";
+        }
     }
  
     $rootScope.CloseListManager = function () {
@@ -99,9 +99,9 @@
                                     {{item._MedicalSpecialty}}
                                 </td>
                             </tr>
-                            <tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
+                            <!--<tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''">
                                 <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td>
-                            </tr>
+                            </tr>-->
                         </tbody>
                     </table>
                 </div>
@@ -155,9 +155,10 @@
                                     {{item._MedicalSpecialty}}
                                 </td>
                             </tr>
-                            <tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''">
-                                <td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td>
-                            </tr>
+                            <!--<tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''">
+                            <td colspan="6"><strong id="searchItem" style="color:black;">No illustration found for the selected search criteria!</strong></td>
+                            </tr>-->
+
                         </tbody>
                     </table>
                 </div>