Bug #5262 Maintain state after detail page is closed

Bug #7960 CI > Maintain state of the List View Bug #7962 CA > Maintain state of the List View Bug #2316 Navigation to Clinical Illustrations Module Listview and grid view state have to be maintained in all the modules which show it in the main menu. 3danatomy should not have listview and gridview so removed from it.

Bug #5262 Maintain state after detail page is closed
Bug #7960 CI > Maintain state of the List View Bug #7962 CA > Maintain state of the List View Bug #2316 Navigation to Clinical Illustrations Module Listview and grid view state have to be maintained in all the modules which show it in the main menu. 3danatomy should not have listview and gridview so removed from it.
Mitali Srivastava
1 parent 51b75071
Showing 8 changed files with 99 additions and 32 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -2,7 +2,7 @@
 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
     $rootScope.currentActiveModuleTitle = pages[5].name;
-    $scope.showme = true;
+    $scope.showme = false;
     $scope.threedanatomyData;
     $scope.Id;
     $scope.$on('$viewContentLoaded', function (event) {
 AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log",
 function ($scope, $rootScope, pages, log) {
-    $scope.showme = true;
-    $scope.IsVisible = function () {
-        $scope.scroll();
+    //$scope.showme = true;
+    //$scope.IsVisible = function () {
+    //    $scope.scroll();
-    }
+    //}
+
+    $scope.setActiveTab = function (tabToSet) {
+        $scope.activeTab = tabToSet;
+        localStorage.setItem("currentAODTabView", $scope.activeTab);
+    };
     $scope.scroll = function () {
         // $window.scrollTo(0, 0);
         $("html,body").scrollTop(0);
         //alert("scroll");
     }
-    $rootScope.currentActiveModuleTitle = pages[10].name;
+    //$rootScope.currentActiveModuleTitle = pages[10].name;
+
+    $scope.$on('$viewContentLoaded', function (event) {
+        // code that will be executed ... 
+        // every time this view is loaded
+
+        $scope.showme = true;
+        $scope.IsVisible = function () {
+            $scope.scroll();
+
+        }
+
+        $rootScope.currentActiveModuleTitle = pages[10].name;
+
+        //set the local storage
+
+        var curtab = localStorage.getItem("currentAODTabView");
+        if (curtab == 2) {
+            $scope.setActiveTab(2);
+        }
+        else {
+            $scope.setActiveTab(1);
+        }
+
+    });
+
 }]
@@ -18,6 +18,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
         selectedspecialty: '',
     };
+    $scope.setActiveTab = function (tabToSet) {
+        $scope.activeTab = tabToSet;
+        localStorage.setItem("currentCATabView", $scope.activeTab);
+    };
+
     $scope.$on('$viewContentLoaded', function (event) {
         // code that will be executed ... 
         // every time this view is loaded
@@ -30,6 +35,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
         $scope.scroll();
         //set the local storage
+
+        var curtab = localStorage.getItem("currentCATabView");
+        if (curtab == 2) {
+            $scope.setActiveTab(2);
+        }
+        else {
+            $scope.setActiveTab(1);
+        }
+
         var curBodyRegion = localStorage.getItem("CACurBodyRegion");
         if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null) {
             $scope.query.selectedbodyregion = curBodyRegion;
@@ -24,6 +24,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         selectedspecialty: '',
     };
+    $scope.setActiveTab = function (tabToSet) {
+        $scope.activeTab = tabToSet;
+        localStorage.setItem("currentCITabView", $scope.activeTab);
+    };
+
     $scope.$on('$viewContentLoaded', function (event) {
         // code that will be executed ... 
         // every time this view is loaded
@@ -40,6 +45,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $rootScope.openModules.push({ "ModuleId": 4 });
         //set the local storage
+
+        var curtab = localStorage.getItem("currentCITabView");
+        if (curtab == 2) {
+            $scope.setActiveTab(2);
+        }
+        else {
+            $scope.setActiveTab(1);
+        }
+
         var curBodyRegion = localStorage.getItem("CICurBodyRegion");
         if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null) {
             $scope.query.selectedbodyregion = curBodyRegion;
@@ -126,7 +140,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                                                       .orderBy([{ field: '_Title', sort: 'asc' }])
                                                       .select();
-                      console.log($scope.selectedCIListViewData);
+                      //console.log($scope.selectedCIListViewData);
                       $('#grid-view').empty();
                       angular.forEach($scope.selectedCIListViewData, function (value, key) {
                           $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
@@ -4,7 +4,7 @@
         <div class="row tab-content" style="padding-left:25px; width:99%">
-            <div role="tabpanel" class="tab-pane active" id="grid-view">
+            <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
                 <div class="col-sm-3 col-lg-2">
                     <div class="thumbnail">
                         <a href="clinical-animations-details.html">
@@ -220,7 +220,7 @@
             </div>
-            <div role="tabpanel" class="tab-pane" id="list-view">
+            <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
                 <div class="col-sm-12 table-responsive ">
                     <table class="table table-hover table-condensed bg-white">
                         <thead>
@@ -6,7 +6,7 @@
             <div class="col-sm-12 stickey-area clsstickydiv">
                 <div class="breadcrumb">
                     <div class="row center-block">
-                        <h5 class="text-center text-primary txt-white f15">Display Image By</h5>
+                        <h5 class="text-center text-primary txt-white f15">Display Animation By</h5>
                         <div class="col-sm-2">&nbsp;</div>
                         <div class="col-md-2 col-sm-4 pad-lftrgt3">
                             <div class="form-group">
@@ -43,9 +43,9 @@
             </div>
         </div>
         <div class="row tab-content" style="padding-left:25px; width:99%">
-            <div role="tabpanel" class="tab-pane active" id="grid-view">
+            <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
             </div>
-            <div role="tabpanel" class="tab-pane" id="list-view">
+            <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
                 <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">
                     <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
                         <thead class="clstheadca">
@@ -59,32 +59,35 @@
         <div class="row tab-content" style="padding-left:25px; width:99%">
-            <div role="tabpanel" class="tab-pane active" id="grid-view">
-                <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData">
-            <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
-                <div class="thumbnail">
-                    <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
-                    <div class="caption">
-                        <p>{{item._Title}}</p>
-                    </div>
+            <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
+        <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
+    <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData">
+        <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
+            <div class="thumbnail">
+                <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
+                <div class="caption">
+                    <p>{{item._Title}}</p>
                 </div>
             </div>
         </div>
+    </div>
-        <div ng-if="filterstring" ng-repeat="item in searchCIListViewData">
-            <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
-                <div class="thumbnail">
-                    <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
-                    <div class="caption">
-                        <p>{{item._Title}}</p>
-                    </div>
+    <div ng-if="filterstring" ng-repeat="item in searchCIListViewData">
+        <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
+            <div class="thumbnail">
+                <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
+                <div class="caption">
+                    <p>{{item._Title}}</p>
                 </div>
             </div>
-        </div>-->
+        </div>
+    </div>-->
-            </div>
+</div>
-            <div role="tabpanel" class="tab-pane" id="list-view">
+di
+       <!--<div role="tabpanel" class="tab-pane" id="list-view">-->
+            <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
                 <!--<div class="col-sm-12 table-responsive">-->
                 <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">
                     <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">-->
@@ -9,8 +9,14 @@
                 <ul class="listgrid-view" role="tablist">
                     <!--<li role="presentation" class="active" title="Image View"><a href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab" class="" ><i class=" fa fa-image"></i></a></li>
                     <li role="presentation" title="List View"><a href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab" class="" ><i class="fa fa-list-alt"></i></a></li>-->
-                    <li role="presentation" class="active" title="Image View"><i class=" fa fa-image txt-white cur-pot" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li>
-                    <li role="presentation" title="List View"><i class="fa fa-list-alt txt-white cur-pot" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li>
+
+                    <!--Working-->
+                    <!--<li role="presentation" class="active" title="Image View"><i class=" fa fa-image txt-white cur-pot" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li>
+                    <li role="presentation" title="List View"><i class="fa fa-list-alt txt-white cur-pot" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li>-->
+
+                    <li role="presentation" ng-class="{'active':activeTab==1}" title="Image View"><i class=" fa fa-image txt-white cur-pot" ng-click="setActiveTab(1)" href="#grid-view" aria-controls="grid-view" role="tab" data-toggle="tab"></i></li>
+                    <li role="presentation" ng-class="{'active':activeTab==2}" title="List View"><i class="fa fa-list-alt txt-white cur-pot" ng-click="setActiveTab(2)" href="#list-view" aria-controls="list-view" role="tab" data-toggle="tab"></i></li>
+
                 </ul>
             </div>
         </div>