ADAM / AIAHTML5

Commit c9a15b9a611394d1e609be3b06856e427d2ff29c

Authored by unknown
2 parents d8c4bc8e 583d94c1

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into Bugs_AN1

Inline Side-by-side
Showing 13 changed files with 927 additions and 513 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @c9a15b9
... ... @@ -2,7 +2,7 @@
2 2 function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location, $document, $sce, $compile) {
3 3  
4 4 $rootScope.currentActiveModuleTitle = pages[5].name;
5   - $scope.showme = true;
  5 + $scope.showme = false;
6 6 $scope.threedanatomyData;
7 7 $scope.Id;
8 8 $scope.$on('$viewContentLoaded', function (event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @c9a15b9
1 1 AIA.controller("AODController", ["$scope", "$rootScope", "pages", "$log",
2 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 14 $scope.scroll = function () {
10 15 // $window.scrollTo(0, 0);
11 16 $("html,body").scrollTop(0);
12 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
  View file @c9a15b9
... ... @@ -13,62 +13,142 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
13 13 $scope.SelectedCASummary = [];
14 14 $scope.filterstring = false;
15 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 26 $scope.$on('$viewContentLoaded', function (event) {
22 27 // code that will be executed ...
23 28 // every time this view is loaded
24 29  
  30 + $scope.LoadCAJsonData();
  31 +
25 32 $scope.CAAllBodyRegion = BodyRegions;
26 33 $scope.CAAllBodySystem = BodySystems;
27 34 $scope.CAAllSpeciality = MedicalSpecialties;
28 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 153 $scope.IsVisible = function () {
74 154 $scope.scroll();
... ... @@ -113,32 +193,21 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, pages, B
113 193  
114 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 205 $scope.filterstring = false;
120 206 while ($scope.searchCAListViewData.length) {
121 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 220 $scope.searchCAListViewData.pop();
152 221 }
153 222  
154   - $('#grid-view').empty();
  223 + //$('#grid-view').empty();
155 224  
156 225 filtercount = 0;
157   - if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null) {
  226 + if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null && query.selectedbodyregion !== "") {
158 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 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 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
  View file @c9a15b9
... ... @@ -17,17 +17,24 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
17 17 $scope.selectedCIListViewData = [];
18 18 $scope.filterstring = false;
19 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 32 $scope.$on('$viewContentLoaded', function (event) {
28 33 // code that will be executed ...
29 34 // every time this view is loaded
30 35  
  36 + $scope.LoadCIJsonData();
  37 +
31 38 $scope.CIAllBodyRegion = BodyRegions;
32 39 $scope.CIAllBodySystem = BodySystems;
33 40 $scope.CIAllOrientation = ViewOrientations;
... ... @@ -37,45 +44,130 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
37 44 //push the details of open module in array $rootScope.openModules
38 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;
  114 +
  115 + $scope.selectedCIListViewData = new jinqJs()
  116 + .from($scope.IllustrationData.root.CIData)
  117 + .orderBy([{ field: '_Title', sort: 'asc' }])
  118 + .select();
  119 +
  120 + },
  121 + function (error) {
  122 + // handle errors here
  123 + console.log(' $scope.IllustrationData = ' + error.statusText);
  124 + }
  125 + );
  126 +
  127 +
  128 + };
  129 +
  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;
52 137  
53   - $('#grid-view').empty();
  138 + $scope.selectedCIListViewData = new jinqJs()
  139 + .from($scope.IllustrationData.root.CIData)
  140 + .orderBy([{ field: '_Title', sort: 'asc' }])
  141 + .select();
54 142  
55   - angular.forEach($scope.selectedCIListViewData, function (value, key) {
56   - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
  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;
57 147  
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');
  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');
62 152  
63 153  
64   - $compile($el)($scope);
  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 172 $scope.IsVisible = function () {
81 173 $scope.scroll();
... ... @@ -119,40 +211,26 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
119 211  
120 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 228 $scope.filterstring = false;
134 229 while ($scope.searchCIListViewData.length) {
135 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 242 $scope.searchCIListViewData.pop();
165 243 }
166 244  
167   - $('#grid-view').empty();
  245 + //$('#grid-view').empty();
168 246  
169 247 filtercount = 0;
170   - if (typeof (query.selectedbodyregion) !== "undefined" && query.selectedbodyregion !== null) {
  248 + if (typeof (query.selectedbodyregion) !== "undefined" && (query.selectedbodyregion !== null && query.selectedbodyregion !== "")) {
171 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 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 265 filtercount = filtercount + 1;
  266 + localStorage.setItem("CICurOrientation", query.selectedorientation);
  267 + }
  268 + else {
  269 + localStorage.setItem("CICurOrientation", '');
178 270 }
179   - if (typeof (query.selectedimagetype) !== "undefined" && query.selectedimagetype !== null) {
  271 +
  272 + if (typeof (query.selectedimagetype) !== "undefined" && (query.selectedimagetype !== null && query.selectedimagetype !== '')) {
180 273 filtercount = filtercount + 1;
  274 + localStorage.setItem("CICurImageType", query.selectedimagetype);
  275 + }
  276 + else {
  277 + localStorage.setItem("CICurImageType", '');
181 278 }
182   - if (typeof (query.selectedspecialty) !== "undefined" && query.selectedspecialty !== null) {
  279 +
  280 + if (typeof (query.selectedspecialty) !== "undefined" && (query.selectedspecialty !== null && query.selectedspecialty !== '')) {
183 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();
191 299  
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;
  300 + $('#grid-view').empty();
197 301  
198   - }
199   - else {
200   - selectimg = false;
201   - count = count - 1;
202   - }
  302 + angular.forEach($scope.selectedCIListViewData, function (value, key) {
203 303  
204   - }
  304 + var selectimg = true;
  305 + var count = 0;
205 306  
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   - }
216 307  
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;
  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;
222 313  
223   - } else {
224   - selectimg = false;
225   - count = count - 1;
226   - }
  314 + }
  315 + else {
  316 + selectimg = false;
  317 + count = count - 1;
  318 + }
227 319  
228   - }
  320 + }
229 321  
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;
  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 + }
235 332  
236   - } else {
237   - selectimg = false;
238   - count = count - 1;
239   - }
  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;
240 338  
241   - }
  339 + } else {
  340 + selectimg = false;
  341 + count = count - 1;
  342 + }
242 343  
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   - }
  344 + }
252 345  
253   - }
  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;
254 351  
255   - if (selectimg === true && count >= filtercount) {
  352 + } else {
  353 + selectimg = false;
  354 + count = count - 1;
  355 + }
256 356  
  357 + }
257 358  
258   - $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
  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 + }
259 368  
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');
  369 + }
264 370  
  371 + if (selectimg === true && count >= filtercount) {
265 372  
266   - $compile($el)($scope);
267 373  
268   - $(".sidebar").mCustomScrollbar({
269   - autoHideScrollbar: true,
270   - //theme:"rounded"
271   - });
  374 + $scope.imagePath = "~/../content/images/ci/thumbnails/" + value._ThumbnailImage;
272 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');
273 380  
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 381  
288   - });
  382 + $compile($el)($scope);
289 383  
290   - }
  384 + $(".sidebar").mCustomScrollbar({
  385 + autoHideScrollbar: true,
  386 + //theme:"rounded"
  387 + });
291 388  
292 389  
293   - });
  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
294 403  
295   - //Show Error Message in case of gridview if no data is found
296   - if ($scope.searchCIListViewData.length == 0) {
  404 + });
297 405  
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   - }
  406 + }
302 407  
303 408  
  409 + });
  410 +
  411 + //Show Error Message in case of gridview if no data is found
  412 + if ($scope.searchCIListViewData.length == 0) {
  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 + );
  423 +
  424 +
  425 + }
304 426  
305 427  
306 428 $scope.scroll = function () {
... ... @@ -406,23 +528,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
406 528 $rootScope.isLoading = false;
407 529 $('#spinner').css('visibility', 'hidden');
408 530  
409   - //$.jsPanel({
410   - // id: 'ciImagePanel',
411   - // selector: '.ciView',
412   - // theme: 'success',
413   - // currentController: 'CIController',
414   - // parentSlug: 'clinical-illustrations',
415   - // content: '<div class="row"><div class="col-sm-12 img-thumbnail" align="center">' +
416   - // '<img src="' + $scope.clickedCIImage + '" alt="" title="" style="width:100%;height:auto;" class="img-responsive "></div><div class="col-sm-12 well">' +
417   - // '<div id="sid"><p>' + $scope.clickedCISummary + '</p></div><button class="btn btn-primary pull-right">Text Off</button>'+
418   - // '<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>' +
419   - // '</div>',
420   - // title: localStorage.getItem("currentViewTitle"),
421   - // position: {
422   - // top: 70,
423   - // left: 1,
424   - // },
425   -
426 531 $.jsPanel({
427 532 id: 'ciImagePanel',
428 533 selector: '.ciView',
... ... @@ -444,8 +549,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
444 549 left: 1,
445 550 },
446 551  
447   - //size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
448   -
449 552 size: { width: $(window).outerWidth() - 10, height: $(window).outerHeight() - 110 },
450 553  
451 554 });
... ... @@ -458,25 +561,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
458 561 "slug": $rootScope.currentSlug
459 562 });
460 563  
461   - //var e1 = angular.element(document.getElementById("CIView"));
462   - //$timeout(function () {
463   -
464   - // //$compile(e1.contents())($scope)
465   -
466   - // var $el = $('<div class="row"><div class="col-sm-12 img-thumbnail" align="center">' +
467   - // '<img src="' + $scope.clickedCIImage + '" alt="" title="" " class="img-responsive "><div class="col-sm-12 well">' +
468   - // '<div id="sid"><p>' + $scope.clickedCISummary + '</p></div><button class="btn btn-primary pull-right">Text Off</button>' +
469   - // '<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>' +
470   - // '</div></div>').appendTo('#ciView');
471   -
472   - // $compile($el)($scope);
473   -
474   - //}, 250);
475   - // $compile(e1.contents())($scope);
476   -
477   - //$('#ciView').css("height", $(window).outerHeight() - 110);
478   -
479   - //$('#ciView').css("width", $(window).outerWidth() - 10);
480 564  
481 565 }
482 566  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @c9a15b9
... ... @@ -1470,14 +1470,16 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1470 1470  
1471 1471 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId + '_MR');
1472 1472  
1473   - var width = imageCanvas.width;
1474   - var ht = imageCanvas.height;
  1473 + if (imageCanvas != null || imageCanvas != undefined) {
  1474 + var width = imageCanvas.width;
  1475 + var ht = imageCanvas.height;
  1476 +
  1477 + var coloredCanvasContext = imageCanvas.getContext("2d");
  1478 + var coloredImageData = coloredCanvasContext.getImageData(0, 0, width, ht);
  1479 + var coloredImageDataVar = coloredImageData;
1475 1480  
1476   - var coloredCanvasContext = imageCanvas.getContext("2d");
1477   - var coloredImageData = coloredCanvasContext.getImageData(0, 0, width, ht);
1478   - var coloredImageDataVar = coloredImageData;
1479   -
1480 1481 $rootScope.coloredImageMRCanvasList[parseInt(bodyRegionId)] = coloredImageDataVar;
  1482 + }
1481 1483  
1482 1484  
1483 1485  
... ... @@ -1505,7 +1507,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1505 1507 }
1506 1508  
1507 1509 if ($scope.isEligibleForHighlight == true) {
1508   - if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
  1510 + if ($scope.isExtract == true) {
  1511 + $rootScope.isLoading = true;
  1512 + $('#spinner').css('visibility', 'visible');
  1513 + $scope.highLightBody();
  1514 + }
  1515 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $rootScope.isHighlightBodyByBodySystem == true) {
  1516 +
  1517 + console.log('1. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1509 1518  
1510 1519 $rootScope.isLoading = true;
1511 1520 $('#spinner').css('visibility', 'visible');
... ... @@ -1824,15 +1833,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1824 1833  
1825 1834 var imageCanvas = document.getElementById('imageCanvas' + bodyRegionId);
1826 1835  
1827   - var width = imageCanvas.width;
1828   - var ht = imageCanvas.height;
  1836 + if (imageCanvas != null || imageCanvas != undefined) {
  1837 + var width = imageCanvas.width;
  1838 + var ht = imageCanvas.height;
1829 1839  
1830   - var coloredCanvasContext = imageCanvas.getContext("2d");
1831   - var coloredImageData = coloredCanvasContext.getImageData(0, 0, width, ht);
1832   - var coloredImageDataVar = coloredImageData;
1833   -
  1840 + var coloredCanvasContext = imageCanvas.getContext("2d");
  1841 + var coloredImageData = coloredCanvasContext.getImageData(0, 0, width, ht);
  1842 + var coloredImageDataVar = coloredImageData;
1834 1843  
1835   - $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
  1844 +
  1845 + $rootScope.coloredImageCanvasList[parseInt(bodyRegionId - 1)] = coloredImageDataVar;
  1846 + }
1836 1847 //
1837 1848  
1838 1849 if (($scope.ColoredImageSRC != null || $scope.ColoredImageSRC != undefined)) {
... ... @@ -1853,10 +1864,17 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
1853 1864 $scope.isEligibleForHighlight = false;
1854 1865 }
1855 1866  
  1867 +
1856 1868 if ($scope.isEligibleForHighlight == true) {
1857 1869  
1858   - if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
  1870 + if ($scope.isExtract == true) {
  1871 + $rootScope.isLoading = true;
  1872 + $('#spinner').css('visibility', 'visible');
  1873 + $scope.highLightBody();
  1874 + }
  1875 + else if ($rootScope.isHighLight == true || ($rootScope.isListManagerSelected == true) || (($rootScope.isGenderChnage == true) && ($rootScope.isHighLight == true)) || (($rootScope.isViewChange == true) && ($rootScope.isHighLight == true)) || $scope.isExtract == true || $rootScope.isHighlightBodyByBodySystem == true) {
1859 1876  
  1877 + console.log('2. $rootScope.isHighLight= ' + $rootScope.isHighLight)
1860 1878  
1861 1879 $rootScope.isLoading = true;
1862 1880 $('#spinner').css('visibility', 'visible');
... ... @@ -2625,30 +2643,55 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
2625 2643  
2626 2644 $('#layerChangeSlider').slider("option", "value", parseInt($rootScope.totalLayers) - parseInt($scope.layerNumber));
2627 2645 }
2628   -
  2646 + $rootScope.PreviouslayerNumbr = 0;
2629 2647 $scope.LayerChangeOnMouseUpDown = function (e) {
2630 2648 //'x' button is displaying inside the input box in IE browser.
2631 2649  
2632 2650 if (e.currentTarget.id == "incrmntVal") {
  2651 + //Dissectible Anatomy > Inappropriate Text in Layer Input box.
  2652 + if ($("#txtlayerNumber").val() == '') {
  2653 + var layerInputVal = 0;
  2654 +
  2655 + var layerInputValInc = parseInt(layerInputVal);
  2656 + $scope.layerNumber = parseInt(layerInputValInc);
  2657 + $("#txtlayerNumber").val($scope.layerNumber);
  2658 + // $rootScope.PreviouslayerNumbr = $scope.layerNumber;
  2659 +
  2660 + }
  2661 + else {
  2662 + var layerInputVal = $("#txtlayerNumber").val();
  2663 + if (layerInputVal != $rootScope.totalLayers) {
  2664 + var layerInputValInc = parseInt(layerInputVal) + 1;
  2665 + $scope.layerNumber = parseInt(layerInputValInc);
  2666 + $("#txtlayerNumber").val($scope.layerNumber);
  2667 + $rootScope.PreviouslayerNumbr = $scope.layerNumber;
  2668 + }
2633 2669  
2634   - var layerInputVal = $("#txtlayerNumber").val();
2635   - if (layerInputVal != $rootScope.totalLayers) {
2636   - var layerInputValInc = parseInt(layerInputVal) + 1;
2637   - $scope.layerNumber = parseInt(layerInputValInc);
2638   - $("#txtlayerNumber").val($scope.layerNumber);
2639 2670 }
2640 2671  
2641 2672 }
2642 2673 else {
2643 2674  
2644   - var layerInputVal = $("#txtlayerNumber").val();
2645   - if (layerInputVal > 0) {
2646   - var layerInputValDec = parseInt(layerInputVal) - 1;
  2675 + //Dissectible Anatomy > Inappropriate Text in Layer Input box.
  2676 + if ($("#txtlayerNumber").val() == '') {
  2677 + var layerInputVal = 0;
  2678 + var layerInputValDec = parseInt(layerInputVal);
2647 2679 $scope.layerNumber = parseInt(layerInputValDec);
2648 2680 $("#txtlayerNumber").val($scope.layerNumber);
2649   - }
2650   -
  2681 + // $rootScope.PreviouslayerNumbr = $scope.layerNumber;
2651 2682  
  2683 + }
  2684 + else
  2685 + {
  2686 + var layerInputVal = $("#txtlayerNumber").val();
  2687 + if (layerInputVal > 0) {
  2688 + var layerInputValDec = parseInt(layerInputVal) - 1;
  2689 + $scope.layerNumber = parseInt(layerInputValDec);
  2690 + $("#txtlayerNumber").val($scope.layerNumber);
  2691 + $rootScope.PreviouslayerNumbr = $scope.layerNumber;
  2692 + }
  2693 + }
  2694 +
2652 2695 }
2653 2696 $scope.LayerChange();
2654 2697  
... ... @@ -4857,10 +4900,14 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
4857 4900 $scope.CalculateImageCordinates($rootScope.viewOrientationId);
4858 4901  
4859 4902 //3.
4860   - if ($scope.zoomInOut == 25)
4861   - $('#canvasDiv').scrollLeft(0)
4862   - else
4863   - $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
  4903 + if ($scope.zoomInOut == 25) {
  4904 + if ($('#canvasDiv') != null)
  4905 + $('#canvasDiv').scrollLeft(0)
  4906 + }
  4907 + else {
  4908 + if ($('#canvasDiv') != null)
  4909 + $('#canvasDiv').scrollLeft($('#canvasDiv').width() / 2)
  4910 + }
4864 4911  
4865 4912 //remove annotation speech bubble
4866 4913 if ($('#dot').length > 0) {
... ... @@ -5160,6 +5207,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5160 5207 }
5161 5208 }
5162 5209  
  5210 + // #7972 Mozilla Firefox> Incorrect navigation
  5211 + $("#canvasDiv").scroll(function (event) {
  5212 + $rootScope.CanvasDivTopPosition = $("#canvasDiv").scrollTop();
  5213 + $rootScope.CanvasDivLeftPosition = $("#canvasDiv").scrollLeft();
  5214 +
  5215 + });
  5216 +
  5217 +
  5218 +
5163 5219 $scope.enableExtract = function (isCalledFromButton) {
5164 5220  
5165 5221 console.log('isCalledFromButton= ' + isCalledFromButton);
... ... @@ -5607,6 +5663,24 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
5607 5663  
5608 5664 context.putImageData(DAData.data, 0, 0)
5609 5665  
  5666 +
  5667 + //NIKI- to resolve lateral arm black issue in mode
  5668 +
  5669 + if ($rootScope.viewOrientationId == 5 && (value.bodyRegionId == 6 || value.bodyRegionId == 4)) {
  5670 +
  5671 + var imgData = context.getImageData(0, 0, width, ht);
  5672 + var data = imgData.data;
  5673 + var c = 0;
  5674 + for (var i = 0; i < data.length; i += 4) {
  5675 + if (data[i] == data[i + 1] && data[i + 1] == data[i + 2] && data[i + 2] === 0) {
  5676 + data[i + 3] = 0;
  5677 + }
  5678 +
  5679 + }
  5680 + context.putImageData(imgData, 0, 0);
  5681 + }
  5682 +
  5683 +
5610 5684 var grayImageData = context.getImageData(0, 0, width, ht);
5611 5685 var grayImageImageDataVar = grayImageData.data;
5612 5686  
... ... @@ -6709,6 +6783,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6709 6783 x: $scope.offsetX1, y: $scope.offsetY1,
6710 6784 width: $scope.x - $scope.offsetX1,
6711 6785 height: $scope.y - $scope.offsetY1,
  6786 + add: function (layer) {
  6787 +
  6788 + $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
  6789 +
  6790 + },
6712 6791 click: function (layer) {
6713 6792  
6714 6793 $rootScope.canvasLayerNameCollection = [];
... ... @@ -6725,6 +6804,29 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6725 6804 }).drawLayers();
6726 6805  
6727 6806 },
  6807 + dblclick: function (layer) {
  6808 +
  6809 +
  6810 + $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
  6811 + $("#annotationTextModal").modal("toggle");
  6812 +
  6813 + $("#text_area").val('');
  6814 + $("#text_area").css({ " font-family": "'Verdana, sans-serif'", "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
  6815 +
  6816 +
  6817 + $("#text-italic").removeClass("ActiveFormattingButtonClass");
  6818 +
  6819 + $("#text-bold").removeClass("ActiveFormattingButtonClass");
  6820 +
  6821 + $("#text-underline").removeClass("ActiveFormattingButtonClass");
  6822 +
  6823 + $("#text-left").removeClass("ActiveFormattingButtonClass");
  6824 +
  6825 + $("#text-right").removeClass("ActiveFormattingButtonClass");
  6826 +
  6827 + $("#text-center").removeClass("ActiveFormattingButtonClass");
  6828 +
  6829 + },
6728 6830 mouseout: function (layer) {
6729 6831 $rootScope.canvasLayerNameCollection = [];
6730 6832 $('#canvas').setLayer(layer.name, {
... ... @@ -6759,25 +6861,25 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6759 6861  
6760 6862 $("#annotationTextModal").modal("toggle");
6761 6863 $('.btnCursor').trigger('click');
6762   -
  6864 +
6763 6865 $("#text_area").val('');
6764   -
  6866 +
6765 6867 $("#text_area").css({ " font-family": 'Verdana, sans-serif', "font-size": "14px", "font-weight": "normal", "font-style": "normal", "color": "#000", "text-align": "left", "text-decoration": "none" });
6766   -
6767   - $("#text-italic").removeClass("ActiveFormattingButtonClass");
6768   -
6769   - $("#text-bold").removeClass("ActiveFormattingButtonClass");
6770   -
6771   - $("#text-underline").removeClass("ActiveFormattingButtonClass");
6772   -
6773   - $("#text-left").removeClass("ActiveFormattingButtonClass");
6774   -
6775   - $("#text-right").removeClass("ActiveFormattingButtonClass");
6776   -
6777   - $("#text-center").removeClass("ActiveFormattingButtonClass");
6778   -
  6868 +
  6869 + $("#text-italic").removeClass("ActiveFormattingButtonClass");
  6870 +
  6871 + $("#text-bold").removeClass("ActiveFormattingButtonClass");
  6872 +
  6873 + $("#text-underline").removeClass("ActiveFormattingButtonClass");
  6874 +
  6875 + $("#text-left").removeClass("ActiveFormattingButtonClass");
  6876 +
  6877 + $("#text-right").removeClass("ActiveFormattingButtonClass");
  6878 +
  6879 + $("#text-center").removeClass("ActiveFormattingButtonClass");
  6880 +
6779 6881 $(".btn-annotation").removeClass("activebtncolor");
6780   -
  6882 +
6781 6883 $('.btnCursor').addClass('activebtncolor');
6782 6884 break;
6783 6885  
... ... @@ -6811,6 +6913,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6811 6913  
6812 6914  
6813 6915 $rootScope.saveText = function () {
  6916 +
6814 6917 // this part will work first time when save button will be clicked
6815 6918 if ($rootScope.IsTextAlreadySave == false) {
6816 6919 // getting textarea style properties
... ... @@ -6832,9 +6935,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6832 6935 $('#canvas').drawText({
6833 6936 layer: true,
6834 6937 draggable: true,
6835   - name: 'TextArea_' + $rootScope.resetText,
6836   - groups: ['TextArea_' + $rootScope.resetText],
6837   - dragGroups: ['TextArea_' + $rootScope.resetText],
  6938 + name: 'TextAreaNew_' + $rootScope.resetText,
  6939 + groups: ['TextAreaNew_' + $rootScope.resetText],
  6940 + dragGroups: ['TextAreaNew_' + $rootScope.resetText],
6838 6941 fillStyle: $rootScope.fontColor,
6839 6942 fontStyle: $rootScope.fontWeight + " " + $rootScope.fontStyle,
6840 6943 fontSize: $rootScope.fontSizes,
... ... @@ -6842,10 +6945,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6842 6945 align: $rootScope.textAlignmt,
6843 6946 strokeWidth: 0,
6844 6947 text: $rootScope.textArea,
6845   - x: $scope.offsetX1, y: $scope.offsetY1,
6846   - maxWidth: $scope.x - $scope.offsetX1,
6847   - maxHeight: $scope.y - $scope.offsetY1,
  6948 + x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
  6949 + maxWidth: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
  6950 + maxHeight: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
6848 6951 add: function (layer) {
  6952 + // alert(layer.maxWidth);
6849 6953 $rootScope.TextPropertyArray.push({ Text1: '', Align: '', FontColor: '', FontSize: '', FontStyle: '', FontFamily: '' });
6850 6954 $rootScope.TextPropertyArray.push({ Text1: layer.text, Align: layer.align, FontColor: layer.fillStyle, FontSize: layer.fontSize, FontStyle: layer.fontStyle, FontFamily: layer.fontFamily, TextDecoration: $rootScope.underlineText });
6851 6955 }
... ... @@ -6855,20 +6959,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6855 6959 name: 'TextArea1_' + $rootScope.resetText,
6856 6960 layer: true,
6857 6961 draggable: true,
6858   - groups: ['TextArea_' + $rootScope.resetText],
6859   - dragGroups: ['TextArea_' + $rootScope.resetText],
  6962 + groups: ['TextAreaNew_' + $rootScope.resetText],
  6963 + dragGroups: ['TextAreaNew_' + $rootScope.resetText],
6860 6964 opacity: $rootScope.shapestyleOpacity,
6861 6965 strokeStyle: $rootScope.shapestyleborderColor,
6862 6966 strokeWidth: $rootScope.shapestyleborderWidth,
6863   - x: $scope.offsetX1, y: $scope.offsetY1,
6864   - width: $scope.x - $scope.offsetX1,
6865   - height: $scope.y - $scope.offsetY1,
  6967 + x: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].x, y: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].y,
  6968 + width: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].width,
  6969 + height: $rootScope.rectDimension[$rootScope.rectDimension.length - 1].height,
6866 6970 click: function (layer) {
6867 6971 $rootScope.shapeTypeText = "textAreaRect";
6868 6972  
6869 6973 var layerNameSplit = layer.name;
6870 6974 var splitedName = layerNameSplit.split("_");
6871   - var textValName = "TextArea_";
  6975 + var textValName = "TextAreaNew_";
6872 6976 var concatinateResult = textValName.concat(splitedName[1]);
6873 6977 $rootScope.canvasLayerNameCollection = [];
6874 6978 $rootScope.canvasLayerNameCollection.push({ textareaRectangle: layer.name, textareaString: concatinateResult });
... ... @@ -6884,13 +6988,20 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6884 6988 }).drawLayers();
6885 6989 },
6886 6990 dblclick: function (layer) {
  6991 +
  6992 + $rootScope.isTextAreaClosedButtonActive = false;
6887 6993 $rootScope.IsTextAlreadySave = true;
6888 6994  
6889 6995 var _rectLayerOnSave = layer.name;
6890 6996 var _rectLayerOnSaveSplit = _rectLayerOnSave.split("_");
6891   - var TextAreaRectName = "TextArea_";
  6997 + var TextAreaRectName = "TextAreaNew_";
6892 6998 var TextAreaRectNameConcatenated = TextAreaRectName.concat(_rectLayerOnSaveSplit[1]);
6893   - $rootScope.modifySavedText.push({ TextName: layer.name, RectText: TextAreaRectNameConcatenated });
  6999 +
  7000 + $rootScope.layerNameArr = layer.name;
  7001 + $rootScope.rectTextArr = TextAreaRectNameConcatenated;
  7002 + // $rootScope.modifySavedText.push({ TextName: '', RectText: ''});
  7003 + // $rootScope.modifySavedText.push({ TextName: layer.name, RectText: TextAreaRectNameConcatenated });
  7004 +
6894 7005 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
6895 7006 var _rectLayerOnSaveSplitInt;
6896 7007 //if (_rectLayerOnSaveSplit[1] >= 3)
... ... @@ -6899,11 +7010,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6899 7010 // _rectLayerOnSaveSplitInt = parseInt(_rectLayerOnSaveSplit[1]);
6900 7011  
6901 7012 _rectLayerOnSaveSplitInt = parseInt(_rectLayerOnSaveSplit[1]);
  7013 +
6902 7014 var b = $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Text1;
6903 7015 $("#text_area").val(b);
6904 7016 var fontStyleProp = $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontStyle;
6905   - var fontWeightProp = fontStyleProp.split(" ");
6906   -
  7017 + var fontWeightProp = fontStyleProp.split(" ");
  7018 +
6907 7019 $("#text_area").css("font-size", $rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].FontSize);
6908 7020 $("#text_area").css("font-weight", fontWeightProp[0]);
6909 7021 $("#text_area").css("font-style", fontWeightProp[1]);
... ... @@ -6916,96 +7028,89 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
6916 7028  
6917 7029  
6918 7030 //adding text text decoration active class in text edit pop-up
6919   -
6920   - if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].TextDecoration == "underline") {
6921   -
6922   - $("#text-underline").addClass("ActiveFormattingButtonClass");
6923   -
6924   - }
6925   -
6926   - else {
6927   -
6928   - $("#text-underline").removeClass("ActiveFormattingButtonClass");
6929   -
6930   - }
6931   -
6932 7031  
6933   -
6934   - //adding text font weight active class in text edit pop-up
6935   -
6936   - if (fontWeightProp[0] == 700) {
6937   -
6938   -
6939   -
6940   - $("#text-bold").addClass("ActiveFormattingButtonClass");
6941   -
6942   - }
6943   -
6944   - else
6945   -
6946   - {
6947   -
6948   - $("#text-bold").removeClass("ActiveFormattingButtonClass");
6949   -
  7032 + if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].TextDecoration == "underline") {
  7033 +
  7034 + $("#text-underline").addClass("ActiveFormattingButtonClass");
  7035 +
6950 7036 }
6951   -
6952   - //adding text font style active class in text edit pop-up
6953   -
6954   - if (fontWeightProp[1] == "italic") {
6955   -
6956   -
6957   - $("#text-italic").addClass("ActiveFormattingButtonClass");
6958   - }
6959   - else
6960   -
6961   - {
6962   - $("#text-italic").removeClass("ActiveFormattingButtonClass");
6963   -
6964 7037  
6965   -
6966   - }
6967   -
  7038 + else {
6968 7039  
6969   -
6970   - //adding text alignment active class in text edit pop-up
6971   -
6972   - if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Align == "left") {
6973   -
6974   - $("#text-right").removeClass("ActiveFormattingButtonClass");
6975   -
6976   - $("#text-center").removeClass("ActiveFormattingButtonClass")
6977   -
6978   - $("#text-left").addClass("ActiveFormattingButtonClass");
6979   -
6980   - }
6981   -
6982   - else if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Align == "right") {
  7040 + $("#text-underline").removeClass("ActiveFormattingButtonClass");
6983 7041  
  7042 + }
6984 7043  
6985 7044  
6986   - $("#text-center").removeClass("ActiveFormattingButtonClass")
6987 7045  
6988   - $("#text-left").removeClass("ActiveFormattingButtonClass");
  7046 + //adding text font weight active class in text edit pop-up
6989 7047  
6990   - $("#text-right").addClass("ActiveFormattingButtonClass");
  7048 + if (fontWeightProp[0] == 700) {
6991 7049  
6992 7050  
6993 7051  
6994   - }
  7052 + $("#text-bold").addClass("ActiveFormattingButtonClass");
6995 7053  
6996   - else if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Align == "center") {
  7054 + }
6997 7055  
6998   - $("#text-left").removeClass("ActiveFormattingButtonClass");
  7056 + else {
6999 7057  
7000   - $("#text-right").removeClass("ActiveFormattingButtonClass");
  7058 + $("#text-bold").removeClass("ActiveFormattingButtonClass");
7001 7059  
7002   - $("#text-center").addClass("ActiveFormattingButtonClass");
  7060 + }
7003 7061  
  7062 + //adding text font style active class in text edit pop-up
7004 7063  
  7064 + if (fontWeightProp[1] == "italic") {
  7065 +
  7066 +
  7067 + $("#text-italic").addClass("ActiveFormattingButtonClass");
  7068 + }
  7069 + else {
  7070 + $("#text-italic").removeClass("ActiveFormattingButtonClass");
  7071 +
  7072 +
  7073 + }
  7074 +
  7075 + //adding text alignment active class in text edit pop-up
  7076 +
  7077 + if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Align == "left") {
  7078 +
  7079 + $("#text-right").removeClass("ActiveFormattingButtonClass");
  7080 +
  7081 + $("#text-center").removeClass("ActiveFormattingButtonClass")
  7082 +
  7083 + $("#text-left").addClass("ActiveFormattingButtonClass");
  7084 +
  7085 + }
  7086 +
  7087 + else if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Align == "right") {
  7088 +
  7089 +
  7090 +
  7091 + $("#text-center").removeClass("ActiveFormattingButtonClass")
  7092 +
  7093 + $("#text-left").removeClass("ActiveFormattingButtonClass");
  7094 +
  7095 + $("#text-right").addClass("ActiveFormattingButtonClass");
  7096 +
  7097 +
  7098 +
  7099 + }
  7100 +
  7101 + else if ($rootScope.TextPropertyArray[_rectLayerOnSaveSplitInt].Align == "center") {
  7102 +
  7103 + $("#text-left").removeClass("ActiveFormattingButtonClass");
  7104 +
  7105 + $("#text-right").removeClass("ActiveFormattingButtonClass");
  7106 +
  7107 + $("#text-center").addClass("ActiveFormattingButtonClass");
  7108 +
  7109 +
  7110 +
  7111 + }
7005 7112  
7006   - }
7007 7113  
7008   -
7009 7114 _rectLayerOnSaveSplitInt = ''; b = '';
7010 7115 $("#annotationTextModal").modal("toggle");
7011 7116 },
... ... @@ -7041,22 +7146,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7041 7146  
7042 7147  
7043 7148 $("#text-italic").removeClass("ActiveFormattingButtonClass");
7044   -
7045   - $("#text-bold").removeClass("ActiveFormattingButtonClass");
7046   -
7047   - $("#text-underline").removeClass("ActiveFormattingButtonClass");
7048   -
7049   - $("#text-left").removeClass("ActiveFormattingButtonClass");
7050   -
7051   - $("#text-right").removeClass("ActiveFormattingButtonClass");
7052   -
7053   - $("#text-center").removeClass("ActiveFormattingButtonClass");
  7149 +
  7150 + $("#text-bold").removeClass("ActiveFormattingButtonClass");
  7151 +
  7152 + $("#text-underline").removeClass("ActiveFormattingButtonClass");
  7153 +
  7154 + $("#text-left").removeClass("ActiveFormattingButtonClass");
  7155 +
  7156 + $("#text-right").removeClass("ActiveFormattingButtonClass");
  7157 +
  7158 + $("#text-center").removeClass("ActiveFormattingButtonClass");
7054 7159  
7055 7160  
7056 7161 }
7057 7162  
7058 7163 // this part will work second time when save button will be clicked
7059 7164 else {
  7165 +
7060 7166 // getting textarea style properties
7061 7167 var _modifiedText = $("#text_area").val();
7062 7168 var _modifiedFontSize = $("#text_area").css("font-size");
... ... @@ -7068,8 +7174,15 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7068 7174 var _modifiedFontDecoration = $("#text_area").css("text-decoration");
7069 7175  
7070 7176 // deleting previous textarea
7071   - $("#canvas").removeLayer($rootScope.modifySavedText[0].RectText).drawLayers();
7072   - $("#canvas").removeLayer($rootScope.modifySavedText[0].TextName).drawLayers();
  7177 +
  7178 + // var a = $rootScope.modifySavedTextIndexNumber;
  7179 + // alert(a);
  7180 + // alert($rootScope.modifySavedText.length);
  7181 + // alert($rootScope.modifySavedText[a].RectText);
  7182 +
  7183 + $("#canvas").removeLayer($rootScope.layerNameArr).drawLayers();
  7184 + $("#canvas").removeLayer($rootScope.rectTextArr).drawLayers();
  7185 +
7073 7186 $rootScope.resetTextRectSave = $rootScope.ObjectIndexSave++;
7074 7187 $rootScope.resetTextSave = $rootScope.ObjectIndexSave++;
7075 7188  
... ... @@ -7128,12 +7241,23 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7128 7241 },
7129 7242 dblclick: function (layer) {
7130 7243  
  7244 + $rootScope.isTextAreaClosedButtonActive = false;
7131 7245 $rootScope.IsTextAlreadySave = true;
7132 7246 var _rectLayerOnSave = layer.name;
7133 7247 var _rectLayerOnSaveSplit = _rectLayerOnSave.split("_");
7134 7248 var RectNameAfterEdit = "TextAreaAfterEdit_";
7135 7249 var RectNameAfterEditResult = RectNameAfterEdit.concat(_rectLayerOnSaveSplit[1]);
7136   - $rootScope.modifySavedText.push({ TextName: layer.name, RectText: RectNameAfterEditResult });
  7250 + $rootScope.modifySavedTextIndexNumber = _rectLayerOnSaveSplit[1];
  7251 +
  7252 +
  7253 +
  7254 + // $rootScope.modifySavedText.push({ TextName: '', RectText: '' });
  7255 + // $rootScope.modifySavedText.push({ TextName: layer.name, RectText: RectNameAfterEditResult });
  7256 +
  7257 + $rootScope.layerNameArr = layer.name;
  7258 + $rootScope.rectTextArr = RectNameAfterEditResult;
  7259 +
  7260 +
7137 7261 $rootScope.rectDimension.push({ width: layer.width, height: layer.height, x: layer.x, y: layer.y });
7138 7262 $("#text_area").val(_modifiedText);
7139 7263 $("#text_area").css("font-size", _modifiedFontSize);
... ... @@ -7196,9 +7320,6 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7196 7320 }
7197 7321  
7198 7322  
7199   -
7200   -
7201   -
7202 7323 $("#annotationTextModal").modal("toggle");
7203 7324 },
7204 7325 mouseout: function (layer) {
... ... @@ -7228,7 +7349,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7228 7349  
7229 7350 }
7230 7351 });
7231   - $rootScope.modifySavedText = [];
  7352 + // $rootScope.modifySavedText = [];
7232 7353  
7233 7354 }
7234 7355 }
... ... @@ -7236,8 +7357,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
7236 7357 // deleting text area on close button
7237 7358 $rootScope.closeModal = function () {
7238 7359  
7239   - $("#canvas").removeLayer('TextArea_' + $rootScope.resetText).drawLayers();
7240   - $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
  7360 +
  7361 + if ($rootScope.isTextAreaClosedButtonActive == true) {
  7362 + $("#canvas").removeLayer('TextArea_' + $rootScope.resetText).drawLayers();
  7363 + $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
  7364 +
  7365 + }
7241 7366  
7242 7367 }
7243 7368  
... ... @@ -8244,15 +8369,29 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8244 8369 });
8245 8370  
8246 8371 }
8247   -
  8372 +
8248 8373 $scope.LayerChangeBasedOnKeyPressed = function (e) {
8249   -
  8374 + // Dissectible Anatomy > Should not display blank page if no layer is selected.
  8375 +
  8376 +
8250 8377 if (e.keyCode == 13) {
8251   - $scope.LayerChange();
  8378 +
  8379 + if ($("#txtlayerNumber").val() == '')
  8380 + {
  8381 +
  8382 + $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr);
  8383 + }
  8384 + else
  8385 + {
  8386 + $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val();
  8387 + $scope.LayerChange();
  8388 + }
  8389 +
  8390 +
8252 8391 }
8253 8392  
8254 8393 // 'x' button is displaying inside the input box in IE browser.
8255   - if (e.which == 38) {
  8394 + if (e.keyCode == 38) {
8256 8395  
8257 8396  
8258 8397 var layerInputVal = $("#txtlayerNumber").val();
... ... @@ -8260,26 +8399,55 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
8260 8399 var layerInputValInc = parseInt(layerInputVal) + 1;
8261 8400 $scope.layerNumber = parseInt(layerInputValInc);
8262 8401 $("#txtlayerNumber").val($scope.layerNumber);
  8402 + $rootScope.PreviouslayerNumbr = $scope.layerNumber;
8263 8403 }
8264 8404  
8265 8405  
8266 8406 }
8267 8407  
8268 8408 // 'x' button is displaying inside the input box in IE browser.
8269   - if (e.which == 40) {
  8409 + if (e.keyCode == 40) {
8270 8410 var layerInputVal = $("#txtlayerNumber").val();
8271 8411 if (layerInputVal > 0) {
8272 8412 var layerInputValDec = parseInt(layerInputVal) - 1;
8273 8413 $scope.layerNumber = parseInt(layerInputValDec);
8274 8414 $("#txtlayerNumber").val($scope.layerNumber);
  8415 + $rootScope.PreviouslayerNumbr = $scope.layerNumber;
8275 8416 }
8276 8417 }
8277 8418  
8278   -
8279 8419 }
8280 8420  
8281 8421  
8282   -
  8422 + $scope.LayerValueChangeBasedOnKeyUp = function (e) {
  8423 +
  8424 + var keyUplayerNumber = parseInt($("#txtlayerNumber").val());
  8425 +
  8426 + if (isNaN(keyUplayerNumber))
  8427 + {
  8428 +
  8429 + }
  8430 + else {
  8431 +
  8432 + if (keyUplayerNumber > $rootScope.totalLayers) {
  8433 +
  8434 + $("#txtlayerNumber").val($rootScope.totalLayers);
  8435 + $scope.layerNumber = parseInt($rootScope.totalLayers);
  8436 +
  8437 + }
  8438 + else {
  8439 +
  8440 + $("#txtlayerNumber").val(keyUplayerNumber);
  8441 + $scope.layerNumber = parseInt(keyUplayerNumber);
  8442 +
  8443 +
  8444 + }
  8445 +
  8446 + }
  8447 +
  8448 +
  8449 + }
  8450 +
8283 8451  
8284 8452  
8285 8453 }]
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @c9a15b9
... ... @@ -119,6 +119,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
119 119 //annotation tool custom events
120 120 $rootScope.ShowAnnotationWindow = function () {
121 121 //7904
  122 +
  123 + $("#OnIdentify").addClass("annotationtoolbartab");
122 124 $("#annotationToolBarOptions").addClass("active");
123 125 $("#annotationButton").addClass("active");
124 126  
... ... @@ -131,6 +133,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
131 133  
132 134 $rootScope.CloseAnnotationTool = function () {
133 135 console.log('close');
  136 + $("#OnIdentify").removeClass("annotationtoolbartab");
  137 + $("#DrawMode").removeClass("annotationtoolbartab");
134 138 $('.btnCursor').removeClass('activebtncolor');
135 139 $("#annotationButton").removeClass("active");
136 140 $("#annotationToolBarOptions").removeClass("active");
... ... @@ -143,6 +147,9 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
143 147 }
144 148 $rootScope.CIAnotationIdentifyModeOff = false;
145 149 $rootScope.OnIdentifyClick = function () {
  150 +
  151 + $("#OnIdentify").addClass("annotationtoolbartab");
  152 + $("#DrawMode").removeClass("annotationtoolbartab");
146 153 // $rootScope.isIdetifyClicked = true;
147 154 // $rootScope.isDrawingToolSelected = false;
148 155 // debugger;
... ... @@ -163,7 +170,8 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
163 170  
164 171  
165 172 $rootScope.DrawingMode = function () {
166   -
  173 + $("#OnIdentify").removeClass("annotationtoolbartab");
  174 + $("#DrawMode").addClass("annotationtoolbartab");
167 175 $('.btnCursor').addClass('activebtncolor');
168 176 $rootScope.switchCanvas();
169 177 $("#canvasPaint").css("display", "block");
... ... @@ -376,7 +384,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
376 384 // $("#canvas").removeLayer("TextRect_" + $rootScope.resetTextRect).drawLayers();
377 385  
378 386 //Edit Shape Style popup should open at it's default position
379   - $("#modeleditstyle").css({ "left": "0", "right": "0", "margin": "0 auto", "top":"70px"});
  387 + $("#modeleditstyle").css({ "left": "40%", "right": "0", "top":"70px"});
380 388  
381 389 }
382 390  
... ... @@ -415,7 +423,7 @@ AIA.controller(&quot;HomeController&quot;, [&quot;$rootScope&quot;, &quot;Modules&quot;, &quot;$log&quot;, &quot;$location&quot;,
415 423 document.getElementById('modelbackground').style.display = "none";
416 424 document.getElementById('modeleditstyle').style.display = "none";
417 425 //Edit Shape Style popup should open at it's default position
418   - $("#modeleditstyle").css({"left":"0", "right":"0", "margin":"0 auto", "top":"70px"});
  426 + $("#modeleditstyle").css({"left":"40%", "right":"0", "top":"70px"});
419 427  
420 428  
421 429 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
  View file @c9a15b9
... ... @@ -4,7 +4,7 @@
4 4  
5 5  
6 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 8 <div class="col-sm-3 col-lg-2">
9 9 <div class="thumbnail">
10 10 <a href="clinical-animations-details.html">
... ... @@ -220,7 +220,7 @@
220 220  
221 221  
222 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 224 <div class="col-sm-12 table-responsive ">
225 225 <table class="table table-hover table-condensed bg-white">
226 226 <thead>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
  View file @c9a15b9
... ... @@ -6,7 +6,7 @@
6 6 <div class="col-sm-12 stickey-area clsstickydiv">
7 7 <div class="breadcrumb">
8 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 10 <div class="col-sm-2">&nbsp;</div>
11 11 <div class="col-md-2 col-sm-4 pad-lftrgt3">
12 12 <div class="form-group">
... ... @@ -43,9 +43,9 @@
43 43 </div>
44 44 </div>
45 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 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 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 50 <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
51 51 <thead class="clstheadca">
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
  View file @c9a15b9
... ... @@ -59,32 +59,33 @@
59 59  
60 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 70 </div>
71 71 </div>
72 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 81 </div>
82 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 89 <!--<div class="col-sm-12 table-responsive">-->
89 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 91 <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">-->
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @c9a15b9
... ... @@ -253,7 +253,7 @@
253 253 <!--'x' button is displaying inside the input box in IE browser.-->
254 254 <div style="width:80px;margin:10px 0 0 15px;display:inline-block;">
255 255 <div style="width: 58px; float: left;">
256   - <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;">
  256 + <input type="text" class="form-control item" id="txtlayerNumber" value="0" ng-model="layerNumber" ng-keyup="LayerValueChangeBasedOnKeyUp($event)" ng-keydown="LayerChangeBasedOnKeyPressed($event)" style="height:32px;border-radius:0;">
257 257 </div>
258 258 <div style="width: 22px; float: left;">
259 259 <div style="width: 100%; float: left; height: 16px;">
... ... @@ -427,7 +427,11 @@
427 427 && e.which != 8 // backspace
428 428 && e.which != 46 // delete
429 429 && (e.which < 37 // arrow keys
430   - || e.which > 40)) {
  430 + || e.which > 40)
  431 + && (e.keyCode < 96 // Dissectible Anatomy > Num Lock is not working for enter the layer.
  432 + || e.keyCode > 105))
  433 +
  434 + {
431 435 e.preventDefault();
432 436 return false;
433 437 }
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/MainMenu.html
  View file @c9a15b9
... ... @@ -9,8 +9,14 @@
9 9 <ul class="listgrid-view" role="tablist">
10 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 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 20 </ul>
15 21 </div>
16 22 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @c9a15b9
1 1 <!DOCTYPE html>
2 2 <html lang="en" ng-cloak ng-app="AIA">
3 3 <head>
4   - <!--<base href="/AIAHTML5/" />-->
  4 + <!--<base href="/AIAHTML5/" />-->
5 5 <!--<base href="/AIA/" />-->
6 6 <base href="/" />
7 7 <meta charset="utf-8">
... ... @@ -605,8 +605,9 @@
605 605 <textarea class="form-control" id="text_area" rows="3" style="font-family: 'Verdana, sans-serif';font-size:14px; font-weight: normal; font-style: normal; color: #000; text-align: left; text-decoration: none;"></textarea>
606 606 </div>
607 607 <div class="modal-footer">
608   - <button type="button" class="btn btn-default" ng-click="closeModal()" data-dismiss="modal">Close</button>
609   - <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
  608 + <!--<button type="button" class="btn btn-default" ng-click="closeModal()" data-dismiss="modal">Close</button>-->
  609 + <button type="button" class="btn btn-default" id="closeEditText" data-dismiss="modal">Close</button>
  610 + <button type="button" id="saveBtn" class="btn btn-primary" data-dismiss="modal" ng-click="saveText()">Save</button>
610 611 </div>
611 612 </div>
612 613 </div>
... ... @@ -734,7 +735,7 @@
734 735 <!--Edit Shape Modal-->
735 736  
736 737  
737   - <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:0;right:0;top:70px;margin: 0 auto;">
  738 + <div class="modeleditstyle" id="modeleditstyle" style="z-index: 1000000000; background: white; height: 433px; width: 302px;position:absolute;left:40%;right:0;top:70px;">
738 739 <div class="modal-content">
739 740 <div class="modal-header annotation-modal-header">
740 741 <h4 class="modal-title" id="myModalLabel33">Edit Shape Style</h4>
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @c9a15b9
... ... @@ -857,4 +857,10 @@ cursor:pointer;
857 857 display:none;
858 858 }
859 859 /*#7904*/
860   -.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}
861 860 \ No newline at end of file
  861 +.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}
  862 +
  863 +
  864 +.annotationtoolbartab
  865 + {
  866 + background:#626c34 !important;
  867 +}
862 868 \ No newline at end of file
... ...