Commit f7ea690cf8f19486f7ed9eb08ec515de65da6d63

Authored by Nikita Kulshreshtha
2 parents 28367072 763fb739

Merge branch 'CICAMaintainState' into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) { 2 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
3 3
4 $rootScope.currentActiveModuleTitle = pages[5].name; 4 $rootScope.currentActiveModuleTitle = pages[5].name;
5 - $scope.showme = true; 5 + $scope.showme = false;
6 $scope.threedanatomyData; 6 $scope.threedanatomyData;
7 $scope.Id; 7 $scope.Id;
8 $scope.$on('$viewContentLoaded', function (event) { 8 $scope.$on('$viewContentLoaded', function (event) {
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
1 AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log", 1 AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log",
2 function ($scope, $rootScope, pages, log) { 2 function ($scope, $rootScope, pages, log) {
3 - $scope.showme = true;  
4 - $scope.IsVisible = function () {  
5 - $scope.scroll(); 3 + //$scope.showme = true;
  4 + //$scope.IsVisible = function () {
  5 + // $scope.scroll();
6 6
7 - } 7 + //}
  8 +
  9 + $scope.setActiveTab = function (tabToSet) {
  10 + $scope.activeTab = tabToSet;
  11 + localStorage.setItem("currentAODTabView", $scope.activeTab);
  12 + };
8 13
9 $scope.scroll = function () { 14 $scope.scroll = function () {
10 // $window.scrollTo(0, 0); 15 // $window.scrollTo(0, 0);
11 $("html,body").scrollTop(0); 16 $("html,body").scrollTop(0);
12 //alert("scroll"); 17 //alert("scroll");
13 } 18 }
14 - $rootScope.currentActiveModuleTitle = pages[10].name; 19 + //$rootScope.currentActiveModuleTitle = pages[10].name;
  20 +
  21 + $scope.$on('$viewContentLoaded', function (event) {
  22 + // code that will be executed ...
  23 + // every time this view is loaded
  24 +
  25 + $scope.showme = true;
  26 + $scope.IsVisible = function () {
  27 + $scope.scroll();
  28 +
  29 + }
  30 +
  31 + $rootScope.currentActiveModuleTitle = pages[10].name;
  32 +
  33 + //set the local storage
  34 +
  35 + var curtab = localStorage.getItem("currentAODTabView");
  36 + if (curtab == 2) {
  37 + $scope.setActiveTab(2);
  38 + }
  39 + else {
  40 + $scope.setActiveTab(1);
  41 + }
  42 +
  43 + });
  44 +
15 }] 45 }]
16 46
17 47
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -13,62 +13,142 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B @@ -13,62 +13,142 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
13 $scope.SelectedCASummary = []; 13 $scope.SelectedCASummary = [];
14 $scope.filterstring = false; 14 $scope.filterstring = false;
15 $scope.query = { 15 $scope.query = {
16 - selectedbodyregion: null,  
17 - selectedbodysystem: null,  
18 - selectedspecialty: null, 16 + selectedbodyregion: '',
  17 + selectedbodysystem: '',
  18 + selectedspecialty: '',
  19 + };
  20 +
  21 + $scope.setActiveTab = function (tabToSet) {
  22 + $scope.activeTab = tabToSet;
  23 + localStorage.setItem("currentCATabView", $scope.activeTab);
19 }; 24 };
20 25
21 $scope.$on('$viewContentLoaded', function (event) { 26 $scope.$on('$viewContentLoaded', function (event) {
22 // code that will be executed ... 27 // code that will be executed ...
23 // every time this view is loaded 28 // every time this view is loaded
24 29
  30 + $scope.LoadCAJsonData();
  31 +
25 $scope.CAAllBodyRegion = BodyRegions; 32 $scope.CAAllBodyRegion = BodyRegions;
26 $scope.CAAllBodySystem = BodySystems; 33 $scope.CAAllBodySystem = BodySystems;
27 $scope.CAAllSpeciality = MedicalSpecialties; 34 $scope.CAAllSpeciality = MedicalSpecialties;
28 $scope.scroll(); 35 $scope.scroll();
29 36
  37 + //set the local storage
  38 +
  39 + var curtab = localStorage.getItem("currentCATabView");
  40 + if (curtab == 2) {
  41 + $scope.setActiveTab(2);
  42 + }
  43 + else {
  44 + $scope.setActiveTab(1);
  45 + }
  46 +
  47 + var curBodyRegion = localStorage.getItem("CACurBodyRegion");
  48 + if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !=='') {
  49 + $scope.query.selectedbodyregion = curBodyRegion;
  50 + }
  51 + else {
  52 + $scope.query.selectedbodyregion = "";
  53 + }
  54 +
  55 + var curBodySystem = localStorage.getItem("CACurBodySystem");
  56 + if (typeof (curBodySystem) !== "undefined" && curBodySystem !== null && curBodySystem !=='') {
  57 + $scope.query.selectedbodysystem = curBodySystem;
  58 + }
  59 + else {
  60 + $scope.query.selectedbodysystem = "";
  61 + }
  62 +
  63 + var curSpeciality = localStorage.getItem("CACurSpeciality");
  64 + if (typeof (curSpeciality) !== "undefined" && curSpeciality !== null && curSpeciality !== '') {
  65 + $scope.query.selectedspecialty = curSpeciality;
  66 + }
  67 + else {
  68 + $scope.query.selectedspecialty = "";
  69 + }
  70 +
  71 +
  72 + if ($scope.query.selectedbodyregion == "" && $scope.query.selectedbodysystem == "" && $scope.query.selectedspecialty == "") {
  73 + $scope.loadAllCA();
  74 + }
  75 + else {
  76 + $scope.ApplySearch($scope.query);
  77 + }
  78 +
  79 +
30 }); 80 });
31 81
32 - var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json')  
33 - promise.then(  
34 - function (result) {  
35 - $scope.AnimationData = result;  
36 - //$scope.selectedCAListViewData = $scope.AnimationData.root.CAData; 82 + $scope.LoadCAJsonData = function () {
37 83
38 - $scope.selectedCAListViewData = new jinqJs()  
39 - .from($scope.AnimationData.root.CAData)  
40 - .orderBy([{ field: '_Title', sort: 'asc' }])  
41 - .select(); 84 + var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json')
  85 + promise.then(
  86 + function (result) {
  87 + $scope.AnimationData = result;
  88 + //$scope.selectedCAListViewData = $scope.AnimationData.root.CAData;
42 89
43 - //console.log($scope.selectedCAListViewData); 90 + $scope.selectedCAListViewData = new jinqJs()
  91 + .from($scope.AnimationData.root.CAData)
  92 + .orderBy([{ field: '_Title', sort: 'asc' }])
  93 + .select();
44 94
45 - $('#grid-view').empty(); 95 + //console.log($scope.selectedCAListViewData);
46 96
47 - angular.forEach($scope.selectedCAListViewData, function (value, key) {  
48 - $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; 97 + },
  98 + function (error) {
  99 + // handle errors here
  100 + console.log(' $scope.AnimationData = ' + error.statusText);
  101 + }
  102 + );
49 103
50 104
51 - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'  
52 - + '<div class="thumbnail" >'  
53 - + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'  
54 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); 105 + };
55 106
  107 + $scope.loadAllCA = function () {
  108 +
  109 + var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json')
  110 + promise.then(
  111 + function (result) {
  112 + $scope.AnimationData = result;
  113 + //$scope.selectedCAListViewData = $scope.AnimationData.root.CAData;
  114 +
  115 + $scope.selectedCAListViewData = new jinqJs()
  116 + .from($scope.AnimationData.root.CAData)
  117 + .orderBy([{ field: '_Title', sort: 'asc' }])
  118 + .select();
  119 +
  120 + //console.log($scope.selectedCAListViewData);
  121 +
  122 + $('#grid-view').empty();
  123 +
  124 + angular.forEach($scope.selectedCAListViewData, function (value, key) {
  125 + $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
56 126
57 - $compile($el)($scope);  
58 127
59 - $(".sidebar").mCustomScrollbar({  
60 - autoHideScrollbar: true,  
61 - //theme:"rounded" 128 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  129 + + '<div class="thumbnail" >'
  130 + + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
  131 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  132 +
  133 +
  134 + $compile($el)($scope);
  135 +
  136 + $(".sidebar").mCustomScrollbar({
  137 + autoHideScrollbar: true,
  138 + //theme:"rounded"
  139 + });
  140 +
62 }); 141 });
63 142
64 - }); 143 + },
  144 + function (error) {
  145 + // handle errors here
  146 + console.log(' $scope.AnimationData = ' + error.statusText);
  147 + }
  148 + );
  149 +
65 150
66 - },  
67 - function (error) {  
68 - // handle errors here  
69 - console.log(' $scope.AnimationData = ' + error.statusText);  
70 - }  
71 - ); 151 + }
72 152
73 $scope.IsVisible = function () { 153 $scope.IsVisible = function () {
74 $scope.scroll(); 154 $scope.scroll();
@@ -113,32 +193,21 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B @@ -113,32 +193,21 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
113 193
114 $scope.Reset = function (query) { 194 $scope.Reset = function (query) {
115 195
116 - query.selectedbodyregion = null;  
117 - query.selectedbodysystem = null;  
118 - query.selectedspecialty = null; 196 + query.selectedbodyregion = "";
  197 + query.selectedbodysystem = "";
  198 + query.selectedspecialty = "";
  199 +
  200 + //set localstorage values
  201 + localStorage.setItem("CACurBodyRegion", query.selectedbodyregion);
  202 + localStorage.setItem("CACurBodySystem", query.selectedbodysystem);
  203 + localStorage.setItem("CACurSpeciality", query.selectedspecialty);
  204 +
119 $scope.filterstring = false; 205 $scope.filterstring = false;
120 while ($scope.searchCAListViewData.length) { 206 while ($scope.searchCAListViewData.length) {
121 $scope.searchCAListViewData.pop(); 207 $scope.searchCAListViewData.pop();
122 } 208 }
123 - $('#grid-view').empty();  
124 -  
125 - angular.forEach($scope.selectedCAListViewData, function (value, key) {  
126 - $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;  
127 -  
128 - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'  
129 - + '<div class="thumbnail" >'  
130 - + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'  
131 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');  
132 -  
133 -  
134 - $compile($el)($scope);  
135 -  
136 - $(".sidebar").mCustomScrollbar({  
137 - autoHideScrollbar: true,  
138 - //theme:"rounded"  
139 - });  
140 -  
141 - }); 209 +
  210 + $scope.loadAllCA();
142 211
143 } 212 }
144 213
@@ -151,106 +220,143 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B @@ -151,106 +220,143 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
151 $scope.searchCAListViewData.pop(); 220 $scope.searchCAListViewData.pop();
152 } 221 }
153 222
154 - $('#grid-view').empty(); 223 + //$('#grid-view').empty();
155 224
156 filtercount = 0; 225 filtercount = 0;
157 - if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null) { 226 + if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null && query.selectedbodyregion !== "") {
158 filtercount = filtercount + 1; 227 filtercount = filtercount + 1;
  228 + localStorage.setItem("CACurBodyRegion", query.selectedbodyregion);
159 } 229 }
160 - if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null) { 230 + else {
  231 + localStorage.setItem("CACurBodyRegion", '');
  232 + }
  233 +
  234 + if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null && query.selectedbodysystem !== "") {
161 filtercount = filtercount + 1; 235 filtercount = filtercount + 1;
  236 + localStorage.setItem("CACurBodySystem", query.selectedbodysystem);
162 } 237 }
163 - if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null) { 238 + else {
  239 + localStorage.setItem("CACurBodySystem", '');
  240 + }
  241 +
  242 + if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null && query.selectedspecialty !== "") {
164 filtercount = filtercount + 1; 243 filtercount = filtercount + 1;
  244 + localStorage.setItem("CACurSpeciality", query.selectedspecialty);
  245 + }
  246 + else {
  247 + localStorage.setItem("CACurSpeciality", '');
165 } 248 }
166 249
167 - angular.forEach($scope.selectedCAListViewData, function (value, key) { 250 + var promise = DataService.getJson('~/../content/data/json/ca/ca_dat_contentlist.json')
  251 + promise.then(
  252 + function (result) {
  253 + $scope.AnimationData = result;
  254 + //$scope.selectedCAListViewData = $scope.AnimationData.root.CAData;
168 255
169 - var selectimg = true;  
170 - var count = 0; 256 + $scope.selectedCAListViewData = new jinqJs()
  257 + .from($scope.AnimationData.root.CAData)
  258 + .orderBy([{ field: '_Title', sort: 'asc' }])
  259 + .select();
171 260
  261 + //console.log($scope.selectedCAListViewData);
172 262
173 - if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null) {  
174 - var posbodyregion = value._BodyRegion.indexOf((query.selectedbodyregion.trim()));  
175 - if (posbodyregion > -1) {  
176 - selectimg = true;  
177 - count = count + 1; 263 + $('#grid-view').empty();
178 264
179 - }  
180 - else {  
181 - selectimg = false;  
182 - count = count - 1;  
183 - } 265 + angular.forEach($scope.selectedCAListViewData, function (value, key) {
184 266
185 - } 267 + var selectimg = true;
  268 + var count = 0;
186 269
187 - if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null) {  
188 - var posbodysystem = value._BodySystem.indexOf(query.selectedbodysystem);  
189 - if (posbodysystem > -1) {  
190 - count = count + 1;  
191 - selectimg = true;  
192 - } else {  
193 - selectimg = false;  
194 - count = count - 1;  
195 - }  
196 - }  
197 270
198 - if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null) {  
199 - var posspeciality = value._MedicalSpecialty.indexOf(query.selectedspecialty);  
200 - if (posspeciality > -1) {  
201 - count = count + 1;  
202 - selectimg = true;  
203 - } else {  
204 - selectimg = false;  
205 - count = count - 1;  
206 - } 271 + if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null && query.selectedbodyregion !== "") {
  272 + var posbodyregion = value._BodyRegion.indexOf((query.selectedbodyregion.trim()));
  273 + if (posbodyregion > -1) {
  274 + selectimg = true;
  275 + count = count + 1;
207 276
208 - } 277 + }
  278 + else {
  279 + selectimg = false;
  280 + count = count - 1;
  281 + }
209 282
210 - if (selectimg === true && count >= filtercount) { 283 + }
211 284
  285 + if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null && query.selectedbodysystem !=="") {
  286 + var posbodysystem = value._BodySystem.indexOf(query.selectedbodysystem);
  287 + if (posbodysystem > -1) {
  288 + count = count + 1;
  289 + selectimg = true;
  290 + } else {
  291 + selectimg = false;
  292 + count = count - 1;
  293 + }
  294 + }
212 295
213 - $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage; 296 + if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null && query.selectedspecialty !=="") {
  297 + var posspeciality = value._MedicalSpecialty.indexOf(query.selectedspecialty);
  298 + if (posspeciality > -1) {
  299 + count = count + 1;
  300 + selectimg = true;
  301 + } else {
  302 + selectimg = false;
  303 + count = count - 1;
  304 + }
214 305
215 - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'  
216 - + '<div class="thumbnail" >'  
217 - + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'  
218 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); 306 + }
219 307
  308 + if (selectimg === true && count >= filtercount) {
220 309
221 - $compile($el)($scope);  
222 310
223 - $(".sidebar").mCustomScrollbar({  
224 - autoHideScrollbar: true,  
225 - //theme:"rounded"  
226 - }); 311 + $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
227 312
  313 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  314 + + '<div class="thumbnail" >'
  315 + + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
  316 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
228 317
229 - $scope.searchCAListViewData.push(  
230 - {  
231 - "_id": value._id,  
232 - "_ImageId": value._ImageId,  
233 - "_Title": value._Title,  
234 - "_Video": value._Video,  
235 - "_ThumbnailImage": value._ThumbnailImage,  
236 - "_BodySystem": value._BodySystem,  
237 - "_BodyRegion": value._BodyRegion,  
238 - "_MedicalSpecialty": value._MedicalSpecialty,  
239 - "_Summary": value._Summary,  
240 - "_LowerSummary": value._LowerSummary  
241 - });  
242 318
243 - } 319 + $compile($el)($scope);
244 320
  321 + $(".sidebar").mCustomScrollbar({
  322 + autoHideScrollbar: true,
  323 + //theme:"rounded"
  324 + });
245 325
246 - });  
247 326
248 - //Show Error Message in case of gridview if no data is found  
249 - if ($scope.searchCAListViewData.length == 0) { 327 + $scope.searchCAListViewData.push(
  328 + {
  329 + "_id": value._id,
  330 + "_ImageId": value._ImageId,
  331 + "_Title": value._Title,
  332 + "_Video": value._Video,
  333 + "_ThumbnailImage": value._ThumbnailImage,
  334 + "_BodySystem": value._BodySystem,
  335 + "_BodyRegion": value._BodyRegion,
  336 + "_MedicalSpecialty": value._MedicalSpecialty,
  337 + "_Summary": value._Summary,
  338 + "_LowerSummary": value._LowerSummary
  339 + });
  340 +
  341 + }
  342 +
  343 +
  344 + });
  345 +
  346 + //Show Error Message in case of gridview if no data is found
  347 + if ($scope.searchCAListViewData.length == 0) {
  348 +
  349 + 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');
  350 + $compile($el)($scope);
  351 + }
  352 +
  353 + },
  354 + function (error) {
  355 + // handle errors here
  356 + console.log(' $scope.AnimationData = ' + error.statusText);
  357 + }
  358 + );
250 359
251 - 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');  
252 - $compile($el)($scope);  
253 - }  
254 } 360 }
255 361
256 362
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -17,17 +17,24 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -17,17 +17,24 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
17 $scope.selectedCIListViewData = []; 17 $scope.selectedCIListViewData = [];
18 $scope.filterstring = false; 18 $scope.filterstring = false;
19 $scope.query = { 19 $scope.query = {
20 - selectedbodyregion: null,  
21 - selectedbodysystem: null,  
22 - selectedorientation: null,  
23 - selectedimagetype: null,  
24 - selectedspecialty: null, 20 + selectedbodyregion: '',
  21 + selectedbodysystem: '',
  22 + selectedorientation: '',
  23 + selectedimagetype: '',
  24 + selectedspecialty: '',
  25 + };
  26 +
  27 + $scope.setActiveTab = function (tabToSet) {
  28 + $scope.activeTab = tabToSet;
  29 + localStorage.setItem("currentCITabView", $scope.activeTab);
25 }; 30 };
26 31
27 $scope.$on('$viewContentLoaded', function (event) { 32 $scope.$on('$viewContentLoaded', function (event) {
28 // code that will be executed ... 33 // code that will be executed ...
29 // every time this view is loaded 34 // every time this view is loaded
30 35
  36 + $scope.LoadCIJsonData();
  37 +
31 $scope.CIAllBodyRegion = BodyRegions; 38 $scope.CIAllBodyRegion = BodyRegions;
32 $scope.CIAllBodySystem = BodySystems; 39 $scope.CIAllBodySystem = BodySystems;
33 $scope.CIAllOrientation = ViewOrientations; 40 $scope.CIAllOrientation = ViewOrientations;
@@ -37,45 +44,130 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -37,45 +44,130 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
37 //push the details of open module in array $rootScope.openModules 44 //push the details of open module in array $rootScope.openModules
38 $rootScope.openModules.push({ "ModuleId": 4 }); 45 $rootScope.openModules.push({ "ModuleId": 4 });
39 46
  47 + //set the local storage
  48 +
  49 + var curtab = localStorage.getItem("currentCITabView");
  50 + if (curtab == 2) {
  51 + $scope.setActiveTab(2);
  52 + }
  53 + else {
  54 + $scope.setActiveTab(1);
  55 + }
  56 +
  57 + var curBodyRegion = localStorage.getItem("CICurBodyRegion");
  58 + if (typeof (curBodyRegion) !== "undefined" && curBodyRegion !== null && curBodyRegion !=='') {
  59 + $scope.query.selectedbodyregion = curBodyRegion;
  60 + }
  61 + else {
  62 + $scope.query.selectedbodyregion = "";
  63 + }
  64 +
  65 + var curBodySystem = localStorage.getItem("CICurBodySystem");
  66 + if (typeof (curBodySystem) !== "undefined" && curBodySystem !== null && curBodySystem !=='') {
  67 + $scope.query.selectedbodysystem = curBodySystem;
  68 + }
  69 + else {
  70 + $scope.query.selectedbodysystem = "";
  71 + }
  72 +
  73 + var curOrientation = localStorage.getItem("CICurOrientation");
  74 + if (typeof (curOrientation) !== "undefined" && curOrientation !== null && curOrientation !=='') {
  75 + $scope.query.selectedorientation = curOrientation;
  76 + }
  77 + else {
  78 + $scope.query.selectedorientation = "";
  79 + }
  80 +
  81 + var curImageType = localStorage.getItem("CICurImageType");
  82 + if (typeof (curImageType) !== "undefined" && curImageType !== null && curImageType !=='') {
  83 + $scope.query.selectedimagetype = curImageType;
  84 + }
  85 + else {
  86 + $scope.query.selectedimagetype = "";
  87 + }
  88 +
  89 + var curSpeciality = localStorage.getItem("CICurSpeciality");
  90 + if (typeof (curSpeciality) !== "undefined" && curSpeciality !== null && curSpeciality !=='') {
  91 + $scope.query.selectedspecialty = curSpeciality;
  92 + }
  93 + else {
  94 + $scope.query.selectedspecialty = "";
  95 + }
  96 +
  97 +
  98 + if ($scope.query.selectedbodyregion == "" && $scope.query.selectedbodysystem == "" && $scope.query.selectedorientation == "" && $scope.query.selectedimagetype == "" && $scope.query.selectedspecialty == "") {
  99 + $scope.loadAllCI();
  100 + }
  101 + else {
  102 + $scope.ApplySearch($scope.query);
  103 + }
  104 +
40 }); 105 });
41 106
42 - var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')  
43 - promise.then(  
44 - function (result) {  
45 - $scope.IllustrationData = result;  
46 - //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData; 107 + $scope.LoadCIJsonData = function () {
47 108
48 - $scope.selectedCIListViewData = new jinqJs()  
49 - .from($scope.IllustrationData.root.CIData)  
50 - .orderBy([{ field: '_Title', sort: 'asc' }])  
51 - .select(); 109 + var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')
  110 + promise.then(
  111 + function (result) {
  112 + $scope.IllustrationData = result;
  113 + //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData;
52 114
53 - $('#grid-view').empty(); 115 + $scope.selectedCIListViewData = new jinqJs()
  116 + .from($scope.IllustrationData.root.CIData)
  117 + .orderBy([{ field: '_Title', sort: 'asc' }])
  118 + .select();
54 119
55 - angular.forEach($scope.selectedCIListViewData, function (value, key) {  
56 - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage; 120 + },
  121 + function (error) {
  122 + // handle errors here
  123 + console.log(' $scope.IllustrationData = ' + error.statusText);
  124 + }
  125 + );
57 126
58 - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'  
59 - + '<div class="thumbnail" >'  
60 - + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'  
61 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');  
62 127
  128 + };
63 129
64 - $compile($el)($scope); 130 + $scope.loadAllCI = function () {
  131 +
  132 + var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')
  133 + promise.then(
  134 + function (result) {
  135 + $scope.IllustrationData = result;
  136 + //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData;
  137 +
  138 + $scope.selectedCIListViewData = new jinqJs()
  139 + .from($scope.IllustrationData.root.CIData)
  140 + .orderBy([{ field: '_Title', sort: 'asc' }])
  141 + .select();
  142 +
  143 + console.log($scope.selectedCIListViewData);
  144 + $('#grid-view').empty();
  145 + angular.forEach($scope.selectedCIListViewData, function (value, key) {
  146 + $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
  147 +
  148 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  149 + + '<div class="thumbnail" >'
  150 + + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
  151 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  152 +
  153 +
  154 + $compile($el)($scope);
  155 +
  156 + $(".sidebar").mCustomScrollbar({
  157 + autoHideScrollbar: true,
  158 + //theme:"rounded"
  159 + });
65 160
66 - $(".sidebar").mCustomScrollbar({  
67 - autoHideScrollbar: true,  
68 - //theme:"rounded"  
69 }); 161 });
70 162
71 - }); 163 + },
  164 + function (error) {
  165 + // handle errors here
  166 + console.log(' $scope.IllustrationData = ' + error.statusText);
  167 + }
  168 + );
72 169
73 - },  
74 - function (error) {  
75 - // handle errors here  
76 - console.log(' $scope.IllustrationData = ' + error.statusText);  
77 - }  
78 - ); 170 + }
79 171
80 $scope.IsVisible = function () { 172 $scope.IsVisible = function () {
81 $scope.scroll(); 173 $scope.scroll();
@@ -119,40 +211,26 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -119,40 +211,26 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
119 211
120 $scope.Reset = function (query) { 212 $scope.Reset = function (query) {
121 213
122 - //query.selectedbodyregion = "";  
123 - //query.selectedbodysystem = "";  
124 - //query.selectedorientation = "";  
125 - //query.selectedimagetype = "";  
126 - //query.selectedspecialty = "";  
127 - query.selectedbodyregion = null;  
128 - query.selectedbodysystem = null;  
129 - query.selectedorientation = null;  
130 - query.selectedimagetype = null;  
131 - query.selectedspecialty = null; 214 + query.selectedbodyregion = "";
  215 + query.selectedbodysystem = "";
  216 + query.selectedorientation = "";
  217 + query.selectedimagetype = "";
  218 + query.selectedspecialty = "";
  219 +
  220 +
  221 + //set localstorage values
  222 + localStorage.setItem("CICurBodyRegion", query.selectedbodyregion);
  223 + localStorage.setItem("CICurBodySystem", query.selectedbodysystem);
  224 + localStorage.setItem("CICurOrientation", query.selectedorientation);
  225 + localStorage.setItem("CICurImageType", query.selectedimagetype);
  226 + localStorage.setItem("CICurSpeciality", query.selectedspecialty);
132 227
133 $scope.filterstring = false; 228 $scope.filterstring = false;
134 while ($scope.searchCIListViewData.length) { 229 while ($scope.searchCIListViewData.length) {
135 $scope.searchCIListViewData.pop(); 230 $scope.searchCIListViewData.pop();
136 } 231 }
137 - $('#grid-view').empty();  
138 -  
139 - angular.forEach($scope.selectedCIListViewData, function (value, key) {  
140 - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;  
141 232
142 - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'  
143 - + '<div class="thumbnail" >'  
144 - + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'  
145 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');  
146 -  
147 -  
148 - $compile($el)($scope);  
149 -  
150 - $(".sidebar").mCustomScrollbar({  
151 - autoHideScrollbar: true,  
152 - //theme:"rounded"  
153 - });  
154 -  
155 - }); 233 + $scope.loadAllCI();
156 234
157 } 235 }
158 236
@@ -164,143 +242,187 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -164,143 +242,187 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
164 $scope.searchCIListViewData.pop(); 242 $scope.searchCIListViewData.pop();
165 } 243 }
166 244
167 - $('#grid-view').empty(); 245 + //$('#grid-view').empty();
168 246
169 filtercount = 0; 247 filtercount = 0;
170 - if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null) { 248 + if (typeof (query.selectedbodyregion) !== "undefined" && (query.selectedbodyregion !== null && query.selectedbodyregion !== "")) {
171 filtercount = filtercount + 1; 249 filtercount = filtercount + 1;
  250 + localStorage.setItem("CICurBodyRegion", query.selectedbodyregion);
  251 + }
  252 + else {
  253 + localStorage.setItem("CICurBodyRegion", '');
172 } 254 }
173 - if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null) { 255 +
  256 + if (typeof (query.selectedbodysystem) !== "undefined" && (query.selectedbodysystem !== null && query.selectedbodysystem !=="")) {
174 filtercount = filtercount + 1; 257 filtercount = filtercount + 1;
  258 + localStorage.setItem("CICurBodySystem", query.selectedbodysystem);
175 } 259 }
176 - if (typeof (query.selectedorientation) !== "undefined" && query.selectedorientation !== null) { 260 + else {
  261 + localStorage.setItem("CICurBodySystem", '');
  262 + }
  263 +
  264 + if (typeof (query.selectedorientation) !== "undefined" && (query.selectedorientation !== null && query.selectedorientation !== '')) {
177 filtercount = filtercount + 1; 265 filtercount = filtercount + 1;
  266 + localStorage.setItem("CICurOrientation", query.selectedorientation);
178 } 267 }
179 - if (typeof (query.selectedimagetype) !== "undefined" && query.selectedimagetype !== null) { 268 + else {
  269 + localStorage.setItem("CICurOrientation", '');
  270 + }
  271 +
  272 + if (typeof (query.selectedimagetype) !== "undefined" && (query.selectedimagetype !== null && query.selectedimagetype !== '')) {
180 filtercount = filtercount + 1; 273 filtercount = filtercount + 1;
  274 + localStorage.setItem("CICurImageType", query.selectedimagetype);
181 } 275 }
182 - if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null) { 276 + else {
  277 + localStorage.setItem("CICurImageType", '');
  278 + }
  279 +
  280 + if (typeof (query.selectedspecialty) !== "undefined" && (query.selectedspecialty !== null && query.selectedspecialty !== '')) {
183 filtercount = filtercount + 1; 281 filtercount = filtercount + 1;
  282 + localStorage.setItem("CICurSpeciality", query.selectedspecialty);
  283 + }
  284 + else {
  285 + localStorage.setItem("CICurSpeciality", '');
184 } 286 }
185 287
186 - angular.forEach($scope.selectedCIListViewData, function (value, key) {  
187 288
188 - var selectimg = true;  
189 - var count = 0; 289 + var promise = DataService.getJson('~/../content/data/json/ci/ci_dat_contentlist.json')
  290 + promise.then(
  291 + function (result) {
  292 + $scope.IllustrationData = result;
  293 + //$scope.selectedCIListViewData = $scope.IllustrationData.root.CIData;
190 294
  295 + $scope.selectedCIListViewData = new jinqJs()
  296 + .from($scope.IllustrationData.root.CIData)
  297 + .orderBy([{ field: '_Title', sort: 'asc' }])
  298 + .select();
  299 +
  300 + $('#grid-view').empty();
  301 +
  302 + angular.forEach($scope.selectedCIListViewData, function (value, key) {
  303 +
  304 + var selectimg = true;
  305 + var count = 0;
191 306
192 - if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null) {  
193 - var posbodyregion = value._BodyRegion.indexOf((query.selectedbodyregion.trim()));  
194 - if (posbodyregion > -1) {  
195 - selectimg = true;  
196 - count = count + 1;  
197 307
198 - }  
199 - else {  
200 - selectimg = false;  
201 - count = count - 1;  
202 - } 308 + if (typeof (query.selectedbodyregion) !== "undefined" && (query.selectedbodyregion !== null && query.selectedbodyregion !== "")) {
  309 + var posbodyregion = value._BodyRegion.indexOf((query.selectedbodyregion.trim()));
  310 + if (posbodyregion > -1) {
  311 + selectimg = true;
  312 + count = count + 1;
203 313
204 - } 314 + }
  315 + else {
  316 + selectimg = false;
  317 + count = count - 1;
  318 + }
205 319
206 - if (typeof (query.selectedbodysystem) !== "undefined" && query.selectedbodysystem !== null) {  
207 - var posbodysystem = value._BodySystem.indexOf(query.selectedbodysystem);  
208 - if (posbodysystem > -1) {  
209 - count = count + 1;  
210 - selectimg = true;  
211 - } else {  
212 - selectimg = false;  
213 - count = count - 1;  
214 - }  
215 - } 320 + }
216 321
217 - if (typeof (query.selectedorientation) !== "undefined" && query.selectedorientation !== null) {  
218 - var posorientation = value._ViewOrientation.indexOf(query.selectedorientation);  
219 - if (posorientation > -1) {  
220 - count = count + 1;  
221 - selectimg = true; 322 + if (typeof (query.selectedbodysystem) !== "undefined" && (query.selectedbodysystem !== null && query.selectedbodysystem !== "")) {
  323 + var posbodysystem = value._BodySystem.indexOf(query.selectedbodysystem);
  324 + if (posbodysystem > -1) {
  325 + count = count + 1;
  326 + selectimg = true;
  327 + } else {
  328 + selectimg = false;
  329 + count = count - 1;
  330 + }
  331 + }
222 332
223 - } else {  
224 - selectimg = false;  
225 - count = count - 1;  
226 - } 333 + if (typeof (query.selectedorientation) !== "undefined" && (query.selectedorientation !== null && query.selectedorientation !== "")) {
  334 + var posorientation = value._ViewOrientation.indexOf(query.selectedorientation);
  335 + if (posorientation > -1) {
  336 + count = count + 1;
  337 + selectimg = true;
227 338
228 - } 339 + } else {
  340 + selectimg = false;
  341 + count = count - 1;
  342 + }
229 343
230 - if (typeof (query.selectedimagetype) !== "undefined" && query.selectedimagetype !== null) {  
231 - var posimagetype = value._ImageType.indexOf(query.selectedimagetype);  
232 - if (posimagetype > -1) {  
233 - count = count + 1;  
234 - selectimg = true; 344 + }
235 345
236 - } else {  
237 - selectimg = false;  
238 - count = count - 1;  
239 - } 346 + if (typeof (query.selectedimagetype) !== "undefined" && (query.selectedimagetype !== null && query.selectedimagetype !== "")) {
  347 + var posimagetype = value._ImageType.indexOf(query.selectedimagetype);
  348 + if (posimagetype > -1) {
  349 + count = count + 1;
  350 + selectimg = true;
240 351
241 - } 352 + } else {
  353 + selectimg = false;
  354 + count = count - 1;
  355 + }
242 356
243 - if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null) {  
244 - var posspeciality = value._MedicalSpecialty.indexOf(query.selectedspecialty);  
245 - if (posspeciality > -1) {  
246 - count = count + 1;  
247 - selectimg = true;  
248 - } else {  
249 - selectimg = false;  
250 - count = count - 1;  
251 - } 357 + }
252 358
253 - } 359 + if (typeof (query.selectedspecialty) !== "undefined" && (query.selectedspecialty !== null && query.selectedspecialty !== "")) {
  360 + var posspeciality = value._MedicalSpecialty.indexOf(query.selectedspecialty);
  361 + if (posspeciality > -1) {
  362 + count = count + 1;
  363 + selectimg = true;
  364 + } else {
  365 + selectimg = false;
  366 + count = count - 1;
  367 + }
254 368
255 - if (selectimg === true && count >= filtercount) { 369 + }
256 370
  371 + if (selectimg === true && count >= filtercount) {
257 372
258 - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;  
259 373
260 - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'  
261 - + '<div class="thumbnail" >'  
262 - + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'  
263 - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view'); 374 + $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
264 375
  376 + var $el = $('<div id="' + value._id + '" class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
  377 + + '<div class="thumbnail" >'
  378 + + '<img id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
  379 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
265 380
266 - $compile($el)($scope);  
267 381
268 - $(".sidebar").mCustomScrollbar({  
269 - autoHideScrollbar: true,  
270 - //theme:"rounded"  
271 - }); 382 + $compile($el)($scope);
272 383
  384 + $(".sidebar").mCustomScrollbar({
  385 + autoHideScrollbar: true,
  386 + //theme:"rounded"
  387 + });
273 388
274 - $scope.searchCIListViewData.push(  
275 - {  
276 - "_id": value._id,  
277 - "_ImageId": value._ImageId,  
278 - "_Title": value._Title,  
279 - "_contentImage": value._contentImage,  
280 - "_ThumbnailImage": value._ThumbnailImage,  
281 - "_BodySystem": value._BodySystem,  
282 - "_BodyRegion": value._BodyRegion,  
283 - "_ViewOrientation": value._ViewOrientation,  
284 - "_MedicalSpecialty": value._MedicalSpecialty,  
285 - "_ImageType": value._ImageType,  
286 - "_Summary": value._Summary  
287 389
288 - }); 390 + $scope.searchCIListViewData.push(
  391 + {
  392 + "_id": value._id,
  393 + "_ImageId": value._ImageId,
  394 + "_Title": value._Title,
  395 + "_contentImage": value._contentImage,
  396 + "_ThumbnailImage": value._ThumbnailImage,
  397 + "_BodySystem": value._BodySystem,
  398 + "_BodyRegion": value._BodyRegion,
  399 + "_ViewOrientation": value._ViewOrientation,
  400 + "_MedicalSpecialty": value._MedicalSpecialty,
  401 + "_ImageType": value._ImageType,
  402 + "_Summary": value._Summary
289 403
290 - } 404 + });
291 405
  406 + }
292 407
293 - });  
294 408
295 - //Show Error Message in case of gridview if no data is found  
296 - if ($scope.searchCIListViewData.length == 0) { 409 + });
297 410
298 - 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');  
299 - $compile($el)($scope);  
300 - }  
301 - } 411 + //Show Error Message in case of gridview if no data is found
  412 + if ($scope.searchCIListViewData.length == 0) {
302 413
  414 + 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');
  415 + $compile($el)($scope);
  416 + }
  417 + },
  418 + function (error) {
  419 + // handle errors here
  420 + console.log(' $scope.IllustrationData = ' + error.statusText);
  421 + }
  422 + );
303 423
  424 +
  425 + }
304 426
305 427
306 $scope.scroll = function () { 428 $scope.scroll = function () {
@@ -404,23 +526,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -404,23 +526,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
404 $rootScope.isLoading = false; 526 $rootScope.isLoading = false;
405 $('#spinner').css('visibility', 'hidden'); 527 $('#spinner').css('visibility', 'hidden');
406 528
407 - //$.jsPanel({  
408 - // id: 'ciImagePanel',  
409 - // selector: '.ciView',  
410 - // theme: 'success',  
411 - // currentController: 'CIController',  
412 - // parentSlug: 'clinical-illustrations',  
413 - // content: '<div class="row"><div class="col-sm-12 img-thumbnail" align="center">' +  
414 - // '<img src="' + $scope.clickedCIImage + '" alt="" title="" style="width:100%;height:auto;" class="img-responsive "></div><div class="col-sm-12 well">' +  
415 - // '<div id="sid"><p>' + $scope.clickedCISummary + '</p></div><button class="btn btn-primary pull-right">Text Off</button>'+  
416 - // '<script>$(document).ready(function(){$("button").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +  
417 - // '</div>',  
418 - // title: localStorage.getItem("currentViewTitle"),  
419 - // position: {  
420 - // top: 70,  
421 - // left: 1,  
422 - // },  
423 -  
424 $.jsPanel({ 529 $.jsPanel({
425 id: 'ciImagePanel', 530 id: 'ciImagePanel',
426 selector: '.ciView', 531 selector: '.ciView',
@@ -441,8 +546,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -441,8 +546,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
441 left: 1, 546 left: 1,
442 }, 547 },
443 548
444 - //size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },  
445 -  
446 size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 }, 549 size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
447 550
448 }); 551 });
@@ -455,25 +558,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout @@ -455,25 +558,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
455 "slug": $rootScope.currentSlug 558 "slug": $rootScope.currentSlug
456 }); 559 });
457 560
458 - //var e1 = angular.element(document.getElementById("CIView"));  
459 - //$timeout(function () {  
460 -  
461 - // //$compile(e1.contents())($scope)  
462 -  
463 - // var $el = $('<div class="row"><div class="col-sm-12 img-thumbnail" align="center">' +  
464 - // '<img src="' + $scope.clickedCIImage + '" alt="" title="" " class="img-responsive "><div class="col-sm-12 well">' +  
465 - // '<div id="sid"><p>' + $scope.clickedCISummary + '</p></div><button class="btn btn-primary pull-right">Text Off</button>' +  
466 - // '<script>$(document).ready(function(){$("button").click(function(){$("#sid").toggle();if($.trim($(this).text()) === "Text Off"){$(this).text("Text On");}else{$(this).text("Text Off");}});});</script></div>' +  
467 - // '</div></div>').appendTo('#ciView');  
468 -  
469 - // $compile($el)($scope);  
470 -  
471 - //}, 250);  
472 - // $compile(e1.contents())($scope);  
473 -  
474 - //$('#ciView').css("height", $(window).outerHeight() - 110);  
475 -  
476 - //$('#ciView').css("width", $(window).outerWidth() - 10);  
477 561
478 } 562 }
479 563
400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 4
5 5
6 <div class="row tab-content" style="padding-left:25px; width:99%"> 6 <div class="row tab-content" style="padding-left:25px; width:99%">
7 - <div role="tabpanel" class="tab-pane active" id="grid-view"> 7 + <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
8 <div class="col-sm-3 col-lg-2"> 8 <div class="col-sm-3 col-lg-2">
9 <div class="thumbnail"> 9 <div class="thumbnail">
10 <a href="clinical-animations-details.html"> 10 <a href="clinical-animations-details.html">
@@ -220,7 +220,7 @@ @@ -220,7 +220,7 @@
220 220
221 221
222 </div> 222 </div>
223 - <div role="tabpanel" class="tab-pane" id="list-view"> 223 + <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
224 <div class="col-sm-12 table-responsive "> 224 <div class="col-sm-12 table-responsive ">
225 <table class="table table-hover table-condensed bg-white"> 225 <table class="table table-hover table-condensed bg-white">
226 <thead> 226 <thead>
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <div class="col-sm-12 stickey-area clsstickydiv"> 6 <div class="col-sm-12 stickey-area clsstickydiv">
7 <div class="breadcrumb"> 7 <div class="breadcrumb">
8 <div class="row center-block"> 8 <div class="row center-block">
9 - <h5 class="text-center text-primary txt-white f15">Display Image By</h5> 9 + <h5 class="text-center text-primary txt-white f15">Display Animation By</h5>
10 <div class="col-sm-2">&nbsp;</div> 10 <div class="col-sm-2">&nbsp;</div>
11 <div class="col-md-2 col-sm-4 pad-lftrgt3"> 11 <div class="col-md-2 col-sm-4 pad-lftrgt3">
12 <div class="form-group"> 12 <div class="form-group">
@@ -43,9 +43,9 @@ @@ -43,9 +43,9 @@
43 </div> 43 </div>
44 </div> 44 </div>
45 <div class="row tab-content" style="padding-left:25px; width:99%"> 45 <div class="row tab-content" style="padding-left:25px; width:99%">
46 - <div role="tabpanel" class="tab-pane active" id="grid-view"> 46 + <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
47 </div> 47 </div>
48 - <div role="tabpanel" class="tab-pane" id="list-view"> 48 + <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
49 <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;"> 49 <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">
50 <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;"> 50 <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
51 <thead class="clstheadca"> 51 <thead class="clstheadca">
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -59,32 +59,33 @@ @@ -59,32 +59,33 @@
59 59
60 <div class="row tab-content" style="padding-left:25px; width:99%"> 60 <div class="row tab-content" style="padding-left:25px; width:99%">
61 61
62 - <div role="tabpanel" class="tab-pane active" id="grid-view">  
63 - <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData">  
64 - <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">  
65 - <div class="thumbnail">  
66 - <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">  
67 - <div class="caption">  
68 - <p>{{item._Title}}</p>  
69 - </div> 62 + <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
  63 + <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view">
  64 + <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData">
  65 + <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
  66 + <div class="thumbnail">
  67 + <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
  68 + <div class="caption">
  69 + <p>{{item._Title}}</p>
70 </div> 70 </div>
71 </div> 71 </div>
72 </div> 72 </div>
  73 + </div>
73 74
74 - <div ng-if="filterstring" ng-repeat="item in searchCIListViewData">  
75 - <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">  
76 - <div class="thumbnail">  
77 - <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">  
78 - <div class="caption">  
79 - <p>{{item._Title}}</p>  
80 - </div> 75 + <div ng-if="filterstring" ng-repeat="item in searchCIListViewData">
  76 + <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)">
  77 + <div class="thumbnail">
  78 + <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title="">
  79 + <div class="caption">
  80 + <p>{{item._Title}}</p>
81 </div> 81 </div>
82 </div> 82 </div>
83 - </div>-->  
84 -  
85 - </div> 83 + </div>
  84 + </div>-->
86 85
87 - <div role="tabpanel" class="tab-pane" id="list-view"> 86 +</div>
  87 + <!--<div role="tabpanel" class="tab-pane" id="list-view">-->
  88 + <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view">
88 <!--<div class="col-sm-12 table-responsive">--> 89 <!--<div class="col-sm-12 table-responsive">-->
89 <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;"> 90 <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">
90 <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">--> 91 <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">-->
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
@@ -9,8 +9,14 @@ @@ -9,8 +9,14 @@
9 <ul class="listgrid-view" role="tablist"> 9 <ul class="listgrid-view" role="tablist">
10 <!--<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> 10 <!--<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>
11 <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>--> 11 <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>-->
12 - <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>  
13 - <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> 12 +
  13 + <!--Working-->
  14 + <!--<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>
  15 + <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>-->
  16 +
  17 + <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>
  18 + <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>
  19 +
14 </ul> 20 </ul>
15 </div> 21 </div>
16 </div> 22 </div>