Commit 0da87b4f34d5f13af3b71a11cb9c66a901483605

Authored by Amrita Vishnoi
2 parents 78a8690b 26743028

Merge branch 'Bug-21269-2' into Develop

400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
... ... @@ -10,6 +10,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
10 10 var CLINICAL_ILLUSTRATION = 'Clinical Illustrations';
11 11 var CLINICAL_ANIMATION = 'Clinical Animations';
12 12 $rootScope.closeBtnImgPath = "~/../content/images/speeachBubbleClose.png";
  13 + $rootScope.listArray = [];
13 14 //variables to bind Filter by Controls
14 15 $scope.searchAAListViewData = [];
15 16 $scope.SelectedAAthumbImage = [];
... ... @@ -36,80 +37,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
36 37 $scope.activePinArray = [];
37 38 $scope.showTabButton = true;
38 39 $scope.isListViewDataLoaded = true;
39   -
  40 +
40 41 $scope.setActiveTab = function (tabToSet) {
41   -
  42 +
42 43 $scope.activeTab = tabToSet;
43 44 localStorage.setItem("activeTab", $scope.activeTab);
44 45 if ($scope.activeTab == 1) {
45   - $('#grid-view').css("display","block");
  46 + $('#grid-view').css("display", "block");
46 47 $('#list-view').css("display", "none");
47 48 $("#demoView").remove();
48 49 }
49   - else
50   - {
51   -
  50 + else {
52 51  
53 52 $('#grid-view').css("display", "none");
54   - if ($scope.isListViewDataLoaded == true) {
55   - var promise = ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName)
56   - .then(
57   - function (result) {
58   - // alert(JSON.stringify($scope.moduleLandingData));
59   - $scope.moduleLandingData = result;
60   - $scope.selectedAAListViewData = new jinqJs()
61   - .from($scope.moduleLandingData.data.root.Item)
62   - .orderBy([{ field: '_Title', sort: 'asc' }])
63   - .select();
64   - var htm = '';
65   - htm += "<table class='table table-hover table-fixed bg-white table-txt12'> <thead class='clsthead'><tr class='active'><th width='25%'>Title</th> <th width='15%'>Region</th> <th width='30%'>System</th><th width='15%'>View</th> <th width='15%'>Type</th></tr></thead><tbody class='clstbody'>";
66   - angular.forEach($scope.selectedAAListViewData, function (value, key) {
67   - htm += "<tr id=" + value._Id + " onclick='openListViewModuleItem(event)' ondblclick='openModuleItemView(event)'>"
68   - htm += '<td width="25%">' + value._Title + '</td><td width="15%">' + value._BodyRegion + '</td><td width="30%">' + value._BodySystem + '</td><td width="15%">' + value._ViewOrientation + '</td><td width="15%">' + value._ImageType + '</td>';
69   - htm += "</tr>"
70   - });
71   - htm += "</tbody></table>";
72   - $("#list-view").html(htm);
73   - $compile(htm)($scope);
74   - });
75   - $('#list-view').css("display", "block");
76   - $scope.isListViewDataLoaded = false;
77   - }
78   - else
79   - {
80   - $('#list-view').css("display", "block");
81   - }
82   -
83   - $timeout(function () {
84   - // if ($rootScope.isListViewRowClicked == true) {
85   - // $rootScope.isListViewRowClicked = false;
86   - $("#demoView").remove();
87   - $("#viewList").append("<div class='col-xs-12 text-center' style='padding-top:15px;padding-bottom:15px;' id='demoView'><div class='col-xs-12' style='padding:15px;background-color:#fff;'><div class='col-xs-2' style='border:1px solid #000;padding:5px;color:#000;font-size:12px;'><div class='thumbnail' style='margin-bottom:10px;'><img style='width:auto;height:95px!important;' src=" + $rootScope.listArray[0].imageName + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + $rootScope.listArray[0].text + "</div></div></div><a style='position:absolute;right:30px;bottom:34px;' onclick='openCurrentView(event)' href='javascript:void(0)' class='pull-right btn btn-primary'>Open</a></div>");
88   - var moduleItemDataToBeSavedID
89   - $("#list-view table tbody tr").removeClass("active");
90   - var moduleItemDataToBeSavedID = $rootScope.getLocalStorageValue("listViewSelectedID");
91   - $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active");
92   - $scope.isListViewButtonClicked = true;
93   - var curAAListViewScroll = $rootScope.getLocalStorageValue("AAListViewScroll");
94   -
95   - if (typeof (curAAListViewScroll) !== "undefined" && curAAListViewScroll !== null && curAAListViewScroll !== '') {
96   - if (typeof InstallTrigger !== 'undefined') {
97   -
98   - $('#list-view table tbody').animate({ scrollTop: $rootScope.getLocalStorageValue("AAListViewScroll") });
99   - }
100   - else {
101   -
102   - $('#list-view table tbody').scrollTop($rootScope.getLocalStorageValue("AAListViewScroll"));
103   - }
104   -
105   - }
106   - // }
107   - }, 2000);
  53 + $('#list-view').css("display", "block");
108 54 }
109 55 };
110   -
111   - $scope.loadForModuleById = function (moduleId) {
112 56  
  57 + $scope.loadForModuleById = function (moduleId) {
113 58 if ($rootScope.refreshcheck == null) {
114 59 $location.path('/');
115 60 }
... ... @@ -127,18 +72,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
127 72 function (result) {
128 73  
129 74 $scope.moduleLandingData = result;
130   - // setTimeout(function () { $('#' + $rootScope.highlightid).find('.thumbnail').addClass('hightlightstate'); }, 100);
131   -
132   - setTimeout(function ()
133   - {
134   - if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {
135   - $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');
136   - }
137   - if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null) {
138   - $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
139   - }
140   - }, 100);
141   -
  75 + // setTimeout(function () { $('#' + $rootScope.highlightid).find('.thumbnail').addClass('hightlightstate'); }, 100);
  76 + setTimeout(function () {
  77 + if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {
  78 + $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');
  79 + }
  80 + if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null) {
  81 + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
  82 + }
  83 + }, 100);
142 84 //console.log(JSON.stringify(result, null, 4));
143 85 },
144 86 function (error) {
... ... @@ -146,7 +88,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
146 88 console.log(' error: ' + error.statusText);
147 89 }
148 90 )
149   -
  91 + $('#list-view').css('display', 'none');
150 92 }
151 93  
152 94 //$scope.$on('$viewContentLoaded', function (event) {
... ... @@ -156,29 +98,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
156 98 //});
157 99 $scope.isOpenBtnClicked = false;
158 100 $scope.openModuleItemView = function (event) {
159   -
160 101 $rootScope.MenuModuleName = "AA";
161   - localStorage.setItem("activeTab", $scope.activeTab);
  102 + localStorage.setItem("activeTab", $scope.activeTab);
162 103 //0. Get selected Image Id
163 104 if ($scope.isListViewButtonClicked == true) {
164 105 if ($scope.isOpenBtnClicked == true) {
165   -
166   - var moduleItemDataToBeSaved = $("#demoText").html();
  106 +
  107 + var moduleItemDataToBeSaved = $("#demoText").text().trim();
167 108 $scope.isOpenBtnClicked = false;
168 109 }
169 110 else {
170 111 var moduleItemDataToBeSavedID = event.currentTarget.id;
171 112 localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID);
172   - var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text();
  113 + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
173 114 }
174 115 }
175   - else
176   - {
  116 + else {
177 117 var moduleItemDataToBeSaved = event.target.id;
178 118 localStorage.setItem("listViewSelectedID", event.currentTarget.id);
179 119 $scope.isListViewButtonClicked = false;
180 120 }
181   -
  121 +
182 122 //1.Filter selected module ietem data and get the pushed opened moduile array object
183 123 $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
184 124  
... ... @@ -188,29 +128,28 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
188 128 $rootScope.bodySystemName = $rootScope.OpenedTileData[2];
189 129 $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
190 130 $scope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
191   - $rootScope.listArray = [];
  131 + //$rootScope.listArray = [];
192 132 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
193 133 //3. set opened module item ti
194 134 localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]);
195 135 localStorage.setItem("AAGridViewScroll", $($window).scrollTop());
196 136 localStorage.setItem("AAGridViewHighlightThumbnail", $(event.target).parent().parent().parent().attr('id'));
197   -
  137 +
198 138 //3. Navigate to the Module-item-view
199 139 var u = $location.url();
200 140 $location.url('/module-item-view');
201   -
202 141 }
203 142  
204 143  
205 144 $scope.openListViewModuleItem = function (event) {
206   -
  145 +
207 146 $("#demoView").remove();
208 147 var moduleItemDataToBeSavedID = event.currentTarget.id;
209 148 $("#list-view table tbody tr").removeClass("active");
210 149 localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID);
211 150 $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active");
212 151 localStorage.setItem("AAListViewScroll", $("#list-view table tbody").scrollTop());
213   - var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text();
  152 + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
214 153 $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
215 154 $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
216 155 $rootScope.listArray = [];
... ... @@ -220,7 +159,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
220 159  
221 160  
222 161 $scope.openModuleItem = function () {
223   -
224 162 if ($rootScope.refreshcheck == null) {
225 163 $location.path('/');
226 164 }
... ... @@ -275,14 +213,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
275 213 var openedImage = new Image();
276 214 openedImage.id = 'modItemImage';
277 215 openedImage.name = $rootScope.OpenItemImagePath;
278   -
  216 +
279 217 openedImage.onload = function () {
280 218 $scope.imageWidth = this.width;
281 219 $scope.imageHeight = this.height;
282 220  
283   - //$('#aaBodyView').css("height", $(window).outerHeight());
284 221  
285   - //$('#aaBodyView').css("width", $(window).outerWidth());
286 222 $timeout(function () {
287 223 $compile(aaViewElement.contents())($scope);
288 224  
... ... @@ -290,10 +226,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
290 226 if (document.getElementById('aaBodyView') != null) {
291 227  
292 228 //0.4 added some stylesheets
293   - $('#aaBodyView').css("height", $(window).outerHeight()-65);
294   -
295   - $('#aaBodyView').css("width", $(window).outerWidth()-15);
296   -
  229 + $('#aaBodyView').css("height", $(window).outerHeight() - 65);
  230 +
  231 + $('#aaBodyView').css("width", $(window).outerWidth() - 15);
  232 +
297 233 $rootScope.canvasDivHeight = $('.jsPanel-content').height() - $('.main2 .stickey-area').height();
298 234  
299 235 $('.canvasDivClass').css("height", $rootScope.canvasDivHeight);
... ... @@ -319,10 +255,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
319 255 canvas.style.position = "absolute";
320 256 $("#canvasDiv").append(canvas);
321 257 $scope.context = canvas.getContext("2d")
322   -
323 258 //6. Show all pins on AA opened item
324 259 $scope.showAllPins();
325   -
326 260 //7. Highlight all system body list in left side
327 261 $scope.highlightBodySystemList();
328 262 }
... ... @@ -332,7 +266,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
332 266 openedImage.onerror = loadFailure;
333 267 openedImage.src = $rootScope.OpenItemImagePath;
334 268 }
335   -
  269 +
336 270 }
337 271  
338 272 $scope.highlightBodySystemList = function () {
... ... @@ -340,14 +274,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
340 274 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
341 275 var bodySystemListlength = bodySystemListObj.length;
342 276 for (var i = 0; i < bodySystemListlength; i++) {
343   -
344 277 //var boldTag = lis[i];
345 278 for (var j = 0; j < $rootScope.bodySystemNames.length; j++) {
346 279 if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) {
347 280 $("#" + i).parent().removeClass("disabledSelectedSystem");
348   -
  281 +
349 282 }
350   -
351 283 }
352 284  
353 285 }
... ... @@ -357,7 +289,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
357 289 return true;
358 290 }
359 291  
360   -
  292 +
361 293 angular.element(document).ready(function (e) {
362 294 $("#ImagePanel").resize(function () {
363 295 $("#canvasDiv").scrollLeft($rootScope.CanvasDivLeftPosition);
... ... @@ -369,14 +301,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
369 301 $rootScope.selectedBodySystemName = 'All';
370 302 $rootScope.selectedBodySystemId = 0;
371 303 $rootScope.searchSelectedText = '';
372   -
  304 +
373 305 });
374 306 })
375 307 $rootScope.aaPinDataArray = [];
376 308 $scope.showAllPins = function () {
377   -
  309 +
378 310 $scope.allPinDataArray = [];
379 311 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
  312 +
380 313 .then(
381 314 function (result) {
382 315  
... ... @@ -399,6 +332,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
399 332 $scope.allPinDataArray.push(value._PinId);
400 333 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
401 334 })
  335 +
  336 +
  337 +
402 338 //load search/vocab data
403 339 $rootScope.loadSearchData();
404 340 }
... ... @@ -412,17 +348,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
412 348 $timeout(function () {
413 349 $scope.activePinOnLayerChange();
414 350 }, 1000);
415   -
  351 +
416 352 }
417 353  
418 354 }
419 355  
420 356  
421 357 $scope.FilterByImage = function (moduleId, query) {
422   -
423 358 $scope.moduleId = moduleId;
  359 + $scope.filterstring = true;
  360 +
  361 + console.log('loadForModuleById is called');
424 362  
425   - console.log('loadForModuleById is called')
426 363 $rootScope.moduleName = Modules[moduleId].Name;
427 364 while ($scope.searchAAListViewData.length) {
428 365 $scope.searchAAListViewData.pop();
... ... @@ -531,16 +468,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
531 468  
532 469 if (selectimg === true && count >= filtercount) {
533 470  
534   -
535 471 $scope.imagePath = "../content/images/aa/thumbnails/" + value._TileImageName;
536 472  
537   -
538   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openModuleItemView($event)">'
539   - + '<div class="thumbnail" >'
540   - + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
541   - + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
542 473  
543   -
  474 + var $el = $('<div id="' + value._Title + '" class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openModuleItemView($event)">'
  475 + + '<div class="thumbnail" ><a href="#">'
  476 + + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
  477 + + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
  478 +
  479 +
544 480 $compile($el)($scope);
545 481  
546 482 $(".sidebar").mCustomScrollbar({
... ... @@ -551,7 +487,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
551 487  
552 488 $scope.searchAAListViewData.push(
553 489 {
554   - "_id": value._id,
  490 + "_Id": value._Id,
555 491 "_ImageId": value._ImageId,
556 492 "_Title": value._Title,
557 493 "_ImageName": value._contentImage,
... ... @@ -563,29 +499,28 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
563 499 //"$$hashKey": value._Summary
564 500  
565 501 });
566   -
  502 + console.log($scope.searchAAListViewData);
  503 + if ($('#searchItem').length > 0)
  504 + $('#searchItem').remove();
567 505 }
568   -
569   -
570 506 });
571 507  
572   - //Show Error Message in case of gridview if no data is found
  508 + //Show Error Message in case of gridview/ ListView [if no data is found]
573 509 if ($scope.searchAAListViewData.length == 0) {
574   -
575 510 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');
576 511 $compile($el)($scope);
577 512 $('table > #ListViewDiv > #searchItem').remove();
578 513  
579 514 $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>');
580 515 }
581   - console.log(JSON.stringify(result, null, 4));
  516 + //console.log(JSON.stringify(result, null, 4));
  517 + console.log('SearchAAListViewData--' + $scope.searchAAListViewData);
582 518 },
583 519 function (error) {
584 520 // handle errors here
585 521 console.log(' error: ' + error.statusText);
586 522 }
587 523 )
588   -
589 524 }
590 525  
591 526 $scope.Reset = function (moduleId, query) {
... ... @@ -609,6 +544,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
609 544  
610 545 $('#ListViewDiv').scrollTop(0);
611 546  
  547 + if ($('#demoView').length > 0)
  548 + $('#demoView').remove();
612 549 // $scope.HideListViewDiv();
613 550  
614 551 $scope.filterstring = false;
... ... @@ -621,23 +558,21 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
621 558 }
622 559  
623 560 $scope.showSelectedSystemPins = function (event) {
624   -
625 561  
626 562 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
627 563 var bodySystemListlength = bodySystemListObj.length;
628   - for (var i = 0; i < bodySystemListlength; i++)
629   - {
630   -
  564 + for (var i = 0; i < bodySystemListlength; i++) {
  565 +
631 566 $("#" + i).parent().removeClass("activeAASystemSelect");
632 567 }
633 568 $("#" + event.currentTarget.id).parent().addClass("activeAASystemSelect");
634   -
  569 +
635 570 $rootScope.isLoading = true;
636 571 $('#spinner').css('visibility', 'visible');
637 572  
638 573 $scope.removeSpeechBubble();
639 574 if (event.currentTarget.id == "0") {
640   -
  575 +
641 576 $scope.selectedSystemName = null;
642 577 if ($scope.isHidePinBtnClicked) {
643 578  
... ... @@ -647,9 +582,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
647 582 else {
648 583 $scope.showAllPins();
649 584 }
650   - }
  585 + }
651 586 else {
652   -
  587 +
653 588 $scope.selectedSystemName = event.currentTarget.title;
654 589 // get termText info
655 590 var promise = ModuleService.getTermTextDataForPin($scope.moduleName)
... ... @@ -682,7 +617,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
682 617  
683 618 angular.forEach($scope.selectedSystemPinData, function (value, key) {
684 619  
685   -
  620 +
686 621 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
687 622  
688 623 })
... ... @@ -966,8 +901,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
966 901 if ($scope.sliderVal == 25) {
967 902 document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY + 5)) + 'px';
968 903 }
969   - else
970   - {
  904 + else {
971 905 document.getElementById('speechBubbleLine' + PinId + '').style.top = ((speechBubbleDims[0].currentY)) + 'px';
972 906 }
973 907 document.getElementById('speechBubble' + PinId + '').style.display = 'block';
... ... @@ -1070,7 +1004,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1070 1004 else {
1071 1005 $("#speechBubbleDraggedLine" + id).css({ 'display': 'block', 'width': d + 'px', 'top': (e - 10) + 'px', 'left': (f - 5) + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' });
1072 1006 }
1073   -
  1007 +
1074 1008 }
1075 1009 else {
1076 1010 $("#bord_annotation").css({ 'display': 'block', 'width': d + 'px', 'top': e + 'px', 'left': f + 'px', 'transform': 'rotate(' + theta + 'deg)', '-moz-transform': 'rotate(' + theta + 'deg)', '-webkit-transform': 'rotate(' + theta + 'deg)', 'transform-origin': '0% 0%' });
... ... @@ -1083,118 +1017,118 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1083 1017  
1084 1018 $scope.drawStaticPinsOnImage = function (canvasId, PinId, offsetX1, offsetY1, x, y) {
1085 1019 $scope.clickedPins = [];
1086   - // if ($scope.isSliderChange == true) {
1087   - console.log('isSliderrChange')
1088   - var radial = $('#' + canvasId).createGradient({
1089   - x1: 50, y1: 50,
1090   - x2: 50, y2: 50,
1091   - r1: 10, r2: 30,
1092   - c1: 'rgba(100, 50, 0,0)',
1093   - c2: 'rgb(216, 216, 216)'
1094   - });
1095   - $('#' + canvasId).drawLine({
1096   - layer: true,
1097   - name: "Pin_" + PinId,
1098   - groups: ["Pin_" + PinId],
1099   - strokeStyle: '#565656',
1100   - strokeWidth: 2,
1101   - visible: true,
1102   - x1: offsetX1 * $scope.sliderPercentValue, y1: offsetY1 * $scope.sliderPercentValue,
1103   - x2: x * $scope.sliderPercentValue, y2: y * $scope.sliderPercentValue,
1104   -
1105   -
1106   - }).drawArc({
1107   - name: "PinArc_" + PinId,
1108   - layer: true,
1109   - groups: ["Pin_" + PinId],
1110   - strokeStyle: 'grey',
1111   - strokeWidth: 2,
1112   - visible: true,
1113   - fillStyle: radial,
1114   - x: x * $scope.sliderPercentValue, y: y * $scope.sliderPercentValue,
1115   - radius: 5 * $scope.sliderPercentValue,
  1020 + // if ($scope.isSliderChange == true) {
  1021 + console.log('isSliderrChange')
  1022 + var radial = $('#' + canvasId).createGradient({
  1023 + x1: 50, y1: 50,
  1024 + x2: 50, y2: 50,
  1025 + r1: 10, r2: 30,
  1026 + c1: 'rgba(100, 50, 0,0)',
  1027 + c2: 'rgb(216, 216, 216)'
  1028 + });
  1029 + $('#' + canvasId).drawLine({
  1030 + layer: true,
  1031 + name: "Pin_" + PinId,
  1032 + groups: ["Pin_" + PinId],
  1033 + strokeStyle: '#565656',
  1034 + strokeWidth: 2,
  1035 + visible: true,
  1036 + x1: offsetX1 * $scope.sliderPercentValue, y1: offsetY1 * $scope.sliderPercentValue,
  1037 + x2: x * $scope.sliderPercentValue, y2: y * $scope.sliderPercentValue,
  1038 +
  1039 +
  1040 + }).drawArc({
  1041 + name: "PinArc_" + PinId,
  1042 + layer: true,
  1043 + groups: ["Pin_" + PinId],
  1044 + strokeStyle: 'grey',
  1045 + strokeWidth: 2,
  1046 + visible: true,
  1047 + fillStyle: radial,
  1048 + x: x * $scope.sliderPercentValue, y: y * $scope.sliderPercentValue,
  1049 + radius: 5 * $scope.sliderPercentValue,
  1050 +
  1051 + click: function (clickedPin) {
  1052 + if (clickedPin.event.ctrlKey == false) {
  1053 + $scope.clickedPins = [];
  1054 + }
  1055 + var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
  1056 + var pinData = new jinqJs()
  1057 + .from($scope.aaPinData)
  1058 + .where("_PinId == " + pinID)
  1059 + .select();
1116 1060  
1117   - click: function (clickedPin) {
1118   - if (clickedPin.event.ctrlKey == false) {
1119   - $scope.clickedPins = [];
1120   - }
1121   - var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
1122   - var pinData = new jinqJs()
1123   - .from($scope.aaPinData)
1124   - .where("_PinId == " + pinID)
1125   - .select();
1126 1061  
  1062 + var pinTermNumber = pinData[0]._TermId;
1127 1063  
1128   - var pinTermNumber = pinData[0]._TermId;
  1064 + var pinWithSameTerm = new jinqJs()
1129 1065  
1130   - var pinWithSameTerm = new jinqJs()
  1066 + .from($scope.aaPinData)
  1067 + .where("_TermId == " + pinTermNumber)
  1068 + .select();
1131 1069  
1132   - .from($scope.aaPinData)
1133   - .where("_TermId == " + pinTermNumber)
1134   - .select();
1135 1070  
  1071 + if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
1136 1072  
1137   - if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
  1073 + for (var i = 0; i < pinWithSameTerm.length; i++) {
1138 1074  
1139   - for (var i = 0; i < pinWithSameTerm.length; i++) {
  1075 + $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
  1076 + }
1140 1077  
1141   - $scope.clickedPins.push({ 'id': pinWithSameTerm[i]._PinId })
1142   - }
  1078 + }
  1079 + $scope.isSelectedPinBtnClickedAftrSliderCange = false;
  1080 + var selectedPinData = new jinqJs()
  1081 + .from($scope.aaPinData)
  1082 + .where("_PinId == " + pinID)
  1083 + .select();
  1084 + if (clickedPin.event.ctrlKey == true) {
  1085 +
  1086 + $scope.activePinArray.push(clickedPin.name);
  1087 + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
  1088 + x1: 50, y1: 50,
  1089 + x2: 50, y2: 50,
  1090 + r1: 10, r2: 30,
  1091 + c1: 'rgba(100, 50, 0,0)',
  1092 + c2: 'rgb(126, 187, 83)'
  1093 + });
  1094 + clickedPin.fillStyle = radialAfterClick;
  1095 + $scope.showAnnotation(selectedPinData, true, true, false);
  1096 + }
  1097 + else {
  1098 + $scope.activePinArray = [];
  1099 + $scope.activePinArray.push(clickedPin.name);
  1100 + var radial = $('#aaDetailViewCanvas').createGradient({
  1101 + x1: 50, y1: 50,
  1102 + x2: 50, y2: 50,
  1103 + r1: 10, r2: 30,
  1104 + c1: 'rgba(100, 50, 0,0)',
  1105 + c2: 'rgb(216, 216, 216)'
  1106 + });
1143 1107  
1144   - }
1145   - $scope.isSelectedPinBtnClickedAftrSliderCange = false;
1146   - var selectedPinData = new jinqJs()
1147   - .from($scope.aaPinData)
1148   - .where("_PinId == " + pinID)
1149   - .select();
1150   - if (clickedPin.event.ctrlKey == true) {
1151   -
1152   - $scope.activePinArray.push(clickedPin.name);
1153   - var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
1154   - x1: 50, y1: 50,
1155   - x2: 50, y2: 50,
1156   - r1: 10, r2: 30,
1157   - c1: 'rgba(100, 50, 0,0)',
1158   - c2: 'rgb(126, 187, 83)'
1159   - });
1160   - clickedPin.fillStyle = radialAfterClick;
1161   - $scope.showAnnotation(selectedPinData, true, true, false);
1162   - }
1163   - else {
1164   - $scope.activePinArray = [];
1165   - $scope.activePinArray.push(clickedPin.name);
1166   - var radial = $('#aaDetailViewCanvas').createGradient({
1167   - x1: 50, y1: 50,
1168   - x2: 50, y2: 50,
1169   - r1: 10, r2: 30,
1170   - c1: 'rgba(100, 50, 0,0)',
1171   - c2: 'rgb(216, 216, 216)'
1172   - });
1173 1108  
  1109 + $('#aaDetailViewCanvas').setLayers({
  1110 + fillStyle: radial,
  1111 + }).drawLayers();
1174 1112  
1175   - $('#aaDetailViewCanvas').setLayers({
1176   - fillStyle: radial,
1177   - }).drawLayers();
  1113 + //change the head color to green
  1114 + var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
  1115 + x1: 50, y1: 50,
  1116 + x2: 50, y2: 50,
  1117 + r1: 10, r2: 30,
  1118 + c1: 'rgba(100, 50, 0,0)',
  1119 + c2: 'rgb(126, 187, 83)'
  1120 + });
1178 1121  
1179   - //change the head color to green
1180   - var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
1181   - x1: 50, y1: 50,
1182   - x2: 50, y2: 50,
1183   - r1: 10, r2: 30,
1184   - c1: 'rgba(100, 50, 0,0)',
1185   - c2: 'rgb(126, 187, 83)'
1186   - });
  1122 + clickedPin.fillStyle = radialAfterClick;
  1123 + $scope.showAnnotation(selectedPinData, false, true, false);
1187 1124  
1188   - clickedPin.fillStyle = radialAfterClick;
1189   - $scope.showAnnotation(selectedPinData, false, true, false);
  1125 + }
1190 1126  
1191   - }
1192 1127  
  1128 + }
1193 1129  
1194   - }
  1130 + }).drawLayers();
1195 1131  
1196   - }).drawLayers();
1197   -
1198 1132  
1199 1133 }
1200 1134  
... ... @@ -1209,12 +1143,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1209 1143  
1210 1144 $scope.removePin = function (canvasId, pinId) {
1211 1145  
1212   - var pinName = 'Pin_' + pinId;
1213   - var pinArcName = 'PinArc_' + pinId;
1214   - $('#' + canvasId).removeLayer(pinName).drawLayers();
1215   - $('#' + canvasId).removeLayer(pinArcName).drawLayers();
  1146 + var pinName = 'Pin_' + pinId;
  1147 + var pinArcName = 'PinArc_' + pinId;
  1148 + $('#' + canvasId).removeLayer(pinName).drawLayers();
  1149 + $('#' + canvasId).removeLayer(pinArcName).drawLayers();
1216 1150  
1217   - $scope.removeSpeechBubble();
  1151 + $scope.removeSpeechBubble();
1218 1152  
1219 1153 //$rootScope.isSliderChanged = true;
1220 1154 //$('#aaDetailViewCanvas').removeLayers();
... ... @@ -1231,9 +1165,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1231 1165 $rootScope.onDrawingCanvasClick();
1232 1166 $rootScope.FreeStylePaint();
1233 1167 });
1234   -
  1168 +
1235 1169 $rootScope.loadSearchData = function () {
1236   -
  1170 +
1237 1171 //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
1238 1172 var imageId = $rootScope.imageId;
1239 1173 var promise = ModuleService.getTermTextDataForAAImage(imageId)
... ... @@ -1241,23 +1175,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1241 1175 function (response) {
1242 1176  
1243 1177 $scope.AAPinTermData = response.data.PinTermData.TermData;
1244   -
  1178 +
1245 1179 $rootScope.isLoading = false;
1246 1180 $('#setting-spinner').css('visibility', 'hidden');
1247   -
  1181 +
1248 1182 $scope.pinTermData = [];
1249 1183 var primaryLexicon = $rootScope.lexiconLanguageArray[0].id;
1250 1184 $scope.matchedLanguageTermData = new jinqJs()
1251 1185 .from($scope.AAPinTermData)
1252 1186 .where('_LanguageId == ' + primaryLexicon)
1253 1187 .select();
1254   - var sortedTermTextArray = [];
  1188 + var sortedTermTextArray = [];
1255 1189 for (var i = 0; i < $scope.matchedLanguageTermData.length; i++) {
1256 1190 sortedTermTextArray.push($scope.matchedLanguageTermData[i]._TermText);
1257 1191 sortedTermTextArray.sort();
1258 1192 }
1259   -
1260   -
  1193 +
1261 1194 for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
1262 1195 for (var j = 0; j <= $scope.matchedLanguageTermData.length - 1; j++) {
1263 1196 if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) {
... ... @@ -1267,10 +1200,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1267 1200 }
1268 1201 }
1269 1202  
1270   -
  1203 +
1271 1204 $scope.$watch('$scope.pinTermData', function (newValue, oldValue, scope) {
  1205 +
1272 1206 if (($('#termlistfilter').html() != ""))
1273   - $('#termlistfilter').empty();
  1207 +
  1208 + $('#termlistfilter').empty();
1274 1209 if ($scope.pinTermData.length > 0) {
1275 1210 $timeout(function () {
1276 1211 console.log('pinTermData= ' + $scope.pinTermData.length);
... ... @@ -1281,12 +1216,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1281 1216 //var $el = $('<li><a id= "' + $scope.pinTermData[j].TermNumber + '" href="" >' + $scope.pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter')
1282 1217 $compile($el)($scope);
1283 1218 var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '" >' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1284   -
  1219 +
1285 1220 $compile($selectedOptions)($scope);
1286   -
  1221 +
1287 1222 $("#AABodySystems").empty();
1288   - $("#bodySystems").css("display","none");
1289   - $("#AABodySystems").css("display","block");
  1223 + $("#bodySystems").css("display", "none");
  1224 + $("#AABodySystems").css("display", "block");
1290 1225 $("#bodySystemList li a").each(function (key, value) {
1291 1226 var $systemOptions = $('<option id=' + $(this).attr('id') + ' >' + $(this).text() + '</option>').appendTo("#AABodySystems")
1292 1227 $compile($systemOptions)($scope);
... ... @@ -1307,19 +1242,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1307 1242  
1308 1243  
1309 1244 $scope.$on('listManagerEvent', function (event, data) {
1310   -
  1245 +
1311 1246 $("#viewName").empty();
1312 1247 $("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
1313 1248 $rootScope.isLoading = false;
1314 1249 $('#spinner').css('visibility', 'hidden');
1315   -
  1250 +
1316 1251 if ($rootScope.bodySystemSeletedId == null) {
1317   -
  1252 +
1318 1253 $rootScope.loadSearchData();
1319 1254 }
1320   - else
1321   - {
1322   -
  1255 + else {
  1256 +
1323 1257 $rootScope.refreshTermListOnAASystemSelection($rootScope.bodySystemSeletedId);
1324 1258 }
1325 1259 $timeout(function () {
... ... @@ -1331,7 +1265,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1331 1265  
1332 1266  
1333 1267 $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
1334   -
1335 1268 $rootScope.bodySystemSeletedId = bodySystemId;
1336 1269 $('#termList').empty();
1337 1270 var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
... ... @@ -1340,7 +1273,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1340 1273 var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '">' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1341 1274  
1342 1275 $compile($selectedOptions)($scope);
1343   -
1344 1276 }
1345 1277 $("#totalTerms").empty();
1346 1278 $("#totalTerms").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
... ... @@ -1349,7 +1281,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1349 1281 var imageId = $rootScope.imageId;
1350 1282 $scope.pinDataUrl = "aa_dat_pinterm_" + imageId;
1351 1283 $rootScope.bodySystemTermArray = [];
1352   -
  1284 +
1353 1285 $.ajax({
1354 1286 url: '~/../content/data/json/aa/aa_pinterm/' + $scope.pinDataUrl + '.json',
1355 1287 type: 'GET',
... ... @@ -1379,7 +1311,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1379 1311 }
1380 1312 }
1381 1313 $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo) {
1382   -
  1314 +
1383 1315  
1384 1316 var languageArray = $rootScope.lexiconLanguageArray;
1385 1317  
... ... @@ -1389,11 +1321,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1389 1321 .from($scope.AAPinTermData)
1390 1322 .where('_TermNumber == ' + actualTermNo)
1391 1323 .select();
1392   -
  1324 +
1393 1325 if ($scope.matchedTermNoData != null || $scope.matchedTermNoData != undefined) {
1394   -
  1326 +
1395 1327 for (var j = 0; j <= languageArray.length - 1; j++) {
1396   -
  1328 +
1397 1329 $scope.matchedLanguageTermNoData = new jinqJs()
1398 1330 .from($scope.matchedTermNoData)
1399 1331 .where('_LanguageId == ' + languageArray[j].id)
... ... @@ -1406,7 +1338,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1406 1338 }
1407 1339  
1408 1340 $scope.hidePins = function () {
1409   -
  1341 +
1410 1342 $rootScope.isLoading = true;
1411 1343 $('#spinner').css('visibility', 'visible');
1412 1344  
... ... @@ -1436,7 +1368,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1436 1368 }
1437 1369  
1438 1370 $scope.showAllPinsAfterHide = function (event) {
1439   -
  1371 +
  1372 +
1440 1373 $rootScope.isLoading = true;
1441 1374 $('#spinner').css('visibility', 'visible');
1442 1375  
... ... @@ -1463,13 +1396,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1463 1396 }
1464 1397 };
1465 1398  
1466   -
  1399 +
1467 1400 $scope.showSelectedPins = function () {
1468   -
1469   -
  1401 +
1470 1402 $rootScope.isLoading = true;
1471 1403 $('#spinner').css('visibility', 'visible');
1472   -
  1404 +
1473 1405 $scope.isHidePinBtnClicked = false;
1474 1406  
1475 1407 if ($scope.selectedSystemName != null && $scope.selectedSystemName != undefined) {
... ... @@ -1486,9 +1418,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1486 1418 $(".tooltip-custom").addClass("btn-black");
1487 1419 $("#selectedPin").addClass("btn-primary");
1488 1420 $("#selectedPin").removeClass("btn-black");
1489   -
  1421 +
1490 1422 if ($scope.isSelectedPinBtnClickedAftrSliderCange == true) {
1491   -
  1423 +
1492 1424 for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
1493 1425 var pinName = $scope.activePinArray[i].split("_");
1494 1426 var activePinName = 'Pin_' + pinName[1];
... ... @@ -1502,11 +1434,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1502 1434 }
1503 1435  
1504 1436 }
  1437 +
1505 1438 };
1506 1439  
1507 1440  
1508 1441 $scope.showSystemPins = function (seletedSystemPinData, isShowSelectedPins) {
1509   -
  1442 +
1510 1443 if (isShowSelectedPins) {
1511 1444  
1512 1445 angular.forEach($scope.clickedPins, function (value, key) {
... ... @@ -1521,25 +1454,22 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1521 1454 // if (aaPinDataValue._PinId != value.id) {
1522 1455 var pinName = 'Pin_' + value1.id;
1523 1456 var pinArcName = 'PinArc_' + value1.id;
1524   -
1525   -
1526   - $('#aaDetailViewCanvas').setLayer(pinName, {
1527   - visible: true // set to true instead to show the layer again
1528   - }).drawLayers();
1529 1457  
1530   - $('#aaDetailViewCanvas').setLayer(pinArcName, {
1531   - visible: true // set to true instead to show the layer again
1532   - }).drawLayers();
1533   -
1534   -
  1458 + $('#aaDetailViewCanvas').setLayer(pinName, {
  1459 + visible: true // set to true instead to show the layer again
  1460 + }).drawLayers();
  1461 +
  1462 + $('#aaDetailViewCanvas').setLayer(pinArcName, {
  1463 + visible: true // set to true instead to show the layer again
  1464 + }).drawLayers();
1535 1465 // }
1536 1466 })
1537   -
  1467 +
1538 1468 angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
1539 1469  
1540 1470 var pinName = 'Pin_' + aaPinDataValue._PinId;
1541 1471 var pinArcName = 'PinArc_' + aaPinDataValue._PinId;
1542   -
  1472 +
1543 1473 $('#aaDetailViewCanvas').setLayer(pinName, {
1544 1474 visible: false // set to true instead to show the layer again
1545 1475 }).drawLayers();
... ... @@ -1547,10 +1477,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1547 1477 $('#aaDetailViewCanvas').setLayer(pinArcName, {
1548 1478 visible: false // set to true instead to show the layer again
1549 1479 }).drawLayers();
1550   -
1551 1480 })
1552 1481  
1553   -
1554 1482 }
1555 1483  
1556 1484 else {
... ... @@ -1619,18 +1547,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1619 1547 }
1620 1548  
1621 1549 $scope.highlightPinBasedOnSerachItem = function (id) {
1622   - $scope.searchItemId = id;
1623   - $scope.searchItemText = $("#" + id).text();
1624   - $rootScope.searchSelectedText = $("#"+id).text();
1625   - $('#termList option[selected="selected"]').prop("selected", false);
1626   - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
1627   - $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
1628   - $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
  1550 + $scope.searchItemId = id;
  1551 + $scope.searchItemText = $("#" + id).text();
  1552 + $rootScope.searchSelectedText = $("#" + id).text();
  1553 + $('#termList option[selected="selected"]').prop("selected", false);
  1554 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').prop("selected", true);
  1555 + $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
  1556 + $('#termList option[value="' + $rootScope.searchSelectedText + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
1629 1557  
1630   - $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
1631   - $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" });
1632   - $scope.searchFilter = $("#"+id).text();
1633   - selectedTermName.placeholder = $("#"+id).text();
  1558 + $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" });
  1559 + $("#termlistfilter li #" + $scope.searchItemId).css({ "background-color": "#3399FF", "color": "#ffffff" });
  1560 + $scope.searchFilter = $("#" + id).text();
  1561 + selectedTermName.placeholder = $("#" + id).text();
1634 1562  
1635 1563  
1636 1564 //get data from pindata for this trem
... ... @@ -1644,7 +1572,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1644 1572 // maintaing scroll position on selection of options in list manager.
1645 1573 var annotationTopPos = $(".common-drag").css("top").split("p");
1646 1574 $("#canvasDiv").scrollTop(annotationTopPos[0]);
1647   -
  1575 +
1648 1576 $scope.IsSearchVisible = false;
1649 1577 }
1650 1578  
... ... @@ -1674,7 +1602,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1674 1602 $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "none");
1675 1603 $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "none");
1676 1604 }
1677   -
1678 1605 }
1679 1606 else {
1680 1607 $rootScope.isShowHideButtonClicked = true;
... ... @@ -1685,43 +1612,39 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1685 1612  
1686 1613 $("#comment-box").removeClass("btn-primary");
1687 1614 $("#comment-box").addClass("btn-black");
1688   -
  1615 +
1689 1616 }
1690   -
1691 1617 }
1692 1618 $scope.activePinOnLayerChange = function () {
1693   -
1694 1619 for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
1695 1620 var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
1696 1621 x1: 50, y1: 50,
1697 1622 x2: 50, y2: 50,
1698 1623 r1: 10, r2: 30,
1699   - c1: 'rgba(100, 50, 0,0)',
1700   - c2: 'rgb(126, 187, 83)'
  1624 + c1: 'rgba(100, 50, 0,0)',
  1625 + c2: 'rgb(126, 187, 83)'
1701 1626 });
1702 1627 var clickedPin = $scope.activePinArray[i];
1703 1628 $('#aaDetailViewCanvas').setLayer(clickedPin, {
1704 1629 fillStyle: radialAfterClick
1705 1630 }).drawLayers();
1706   -
  1631 +
1707 1632 }
1708 1633 }
1709 1634  
1710   -
1711 1635 $scope.activePinOnSliderChange = function () {
1712   - if ($scope.activePinArray.length == 1)
1713   - {
1714   - for (var i = 0; i <= $scope.allPinDataArray.length - 1; i++) {
  1636 + if ($scope.activePinArray.length == 1) {
  1637 + for (var i = 0; i <= $scope.allPinDataArray.length - 1; i++) {
1715 1638 var activeArc = $scope.activePinArray[0].split("_");
1716 1639 if ($scope.allPinDataArray[i] == activeArc[1]) {
1717 1640 var pinName = 'Pin_' + $scope.allPinDataArray[i];
1718 1641 var pinArcName = 'PinArc_' + $scope.allPinDataArray[i];
1719   - $('#aaDetailViewCanvas').setLayer(pinName, {
1720   - visible: true // set to true instead to show the layer again
1721   - }).drawLayers();
1722   - $('#aaDetailViewCanvas').setLayer(pinArcName, {
1723   - visible: true // set to true instead to show the layer again
1724   - }).drawLayers();
  1642 + $('#aaDetailViewCanvas').setLayer(pinName, {
  1643 + visible: true // set to true instead to show the layer again
  1644 + }).drawLayers();
  1645 + $('#aaDetailViewCanvas').setLayer(pinArcName, {
  1646 + visible: true // set to true instead to show the layer again
  1647 + }).drawLayers();
1725 1648 }
1726 1649 else {
1727 1650 var pinName = 'Pin_' + $scope.allPinDataArray[i];
... ... @@ -1733,44 +1656,44 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1733 1656 visible: false // set to true instead to show the layer again
1734 1657 }).drawLayers();
1735 1658 }
1736   - }
1737   - }
1738   - else {
1739   - var seletedSystemPinData;
1740   - angular.forEach($scope.activePinArray, function (value, key) {
1741   - var pinID = value.split("_");
1742   - seletedSystemPinData = new jinqJs()
1743   - .from($scope.allPinDataArray)
1744   - .where('_PinId != ' + pinID[1])
1745   - .select();
1746   - })
  1659 + }
  1660 + }
  1661 + else {
  1662 + var seletedSystemPinData;
  1663 + angular.forEach($scope.activePinArray, function (value, key) {
  1664 + var pinID = value.split("_");
  1665 + seletedSystemPinData = new jinqJs()
  1666 + .from($scope.allPinDataArray)
  1667 + .where('_PinId != ' + pinID[1])
  1668 + .select();
  1669 + })
1747 1670  
1748   - angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
1749   -
1750   - var pinName = 'Pin_' + aaPinDataValue;
1751   - var pinArcName = 'PinArc_' + aaPinDataValue;
  1671 + angular.forEach(seletedSystemPinData, function (aaPinDataValue, aaPinDataKey) {
1752 1672  
1753   - $('#aaDetailViewCanvas').setLayer(pinName, {
1754   - visible: false // set to true instead to show the layer again
1755   - }).drawLayers();
  1673 + var pinName = 'Pin_' + aaPinDataValue;
  1674 + var pinArcName = 'PinArc_' + aaPinDataValue;
1756 1675  
1757   - $('#aaDetailViewCanvas').setLayer(pinArcName, {
1758   - visible: false // set to true instead to show the layer again
1759   - }).drawLayers();
1760   -
1761   - })
1762   - for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
1763   - var pinName = $scope.activePinArray[i].split("_");
1764   - var activePinName = 'Pin_' + pinName[1];
1765   - var pinArcName = 'PinArc_' + pinName[1];
1766   - $('#aaDetailViewCanvas').setLayer(activePinName, {
1767   - visible: true // set to true instead to show the layer again
1768   - }).drawLayers();
1769   - $('#aaDetailViewCanvas').setLayer(pinArcName, {
1770   - visible: true // set to true instead to show the layer again
1771   - }).drawLayers();
1772   - }
1773   - }
  1676 + $('#aaDetailViewCanvas').setLayer(pinName, {
  1677 + visible: false // set to true instead to show the layer again
  1678 + }).drawLayers();
  1679 +
  1680 + $('#aaDetailViewCanvas').setLayer(pinArcName, {
  1681 + visible: false // set to true instead to show the layer again
  1682 + }).drawLayers();
  1683 +
  1684 + })
  1685 + for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
  1686 + var pinName = $scope.activePinArray[i].split("_");
  1687 + var activePinName = 'Pin_' + pinName[1];
  1688 + var pinArcName = 'PinArc_' + pinName[1];
  1689 + $('#aaDetailViewCanvas').setLayer(activePinName, {
  1690 + visible: true // set to true instead to show the layer again
  1691 + }).drawLayers();
  1692 + $('#aaDetailViewCanvas').setLayer(pinArcName, {
  1693 + visible: true // set to true instead to show the layer again
  1694 + }).drawLayers();
  1695 + }
  1696 + }
1774 1697 }
1775 1698 }]);
1776 1699  
... ... @@ -1824,7 +1747,7 @@ function hideSearchList(event) {
1824 1747 }
1825 1748  
1826 1749 function onSearchItemSelection(id) {
1827   -
  1750 +
1828 1751 console.log('AA hide search is called');
1829 1752 var scope = angular.element(document.getElementById("aaDetailPageDiv")).scope();
1830 1753 scope.$apply(function () {
... ... @@ -1869,7 +1792,7 @@ function openModuleItemView(event) {
1869 1792 }
1870 1793  
1871 1794 function openListViewModuleItem(event) {
1872   -
  1795 +
1873 1796 var scope = angular.element(document.getElementById("list-view")).scope();
1874 1797 scope.isListViewButtonClicked = true;
1875 1798 scope.$apply(function () {
... ... @@ -1880,6 +1803,7 @@ function openListViewModuleItem(event) {
1880 1803 function openCurrentView(event) {
1881 1804  
1882 1805 var scope = angular.element(document.getElementById("list-view")).scope();
  1806 + scope.isListViewButtonClicked = true;
1883 1807 scope.isOpenBtnClicked = true;
1884 1808 scope.$apply(function () {
1885 1809 scope.openModuleItemView(event);
... ... @@ -1888,7 +1812,7 @@ function openCurrentView(event) {
1888 1812 }
1889 1813  
1890 1814 function onZoom(scope) {
1891   -
  1815 +
1892 1816 //$(".common-drag").remove();
1893 1817 //$(".commonDot").remove();
1894 1818 //$(".commonDraggedLine").remove();
... ... @@ -1904,14 +1828,14 @@ function onZoom(scope) {
1904 1828 //}).drawLayers();
1905 1829 // scope.removePin();
1906 1830 // scope.showAllPins();
1907   -
  1831 +
1908 1832  
1909 1833 //6. Show all pins on AA opened item
1910 1834 }
1911 1835  
1912 1836  
1913 1837 $(document).ready(function () {
1914   -
  1838 +
1915 1839 $(".slider").slider({
1916 1840 min: 25,
1917 1841 max: 100,
... ... @@ -1926,40 +1850,40 @@ $(document).ready(function () {
1926 1850 var relativeWidth = 0;
1927 1851 var relativeHeight = 0;
1928 1852 if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
1929   - if (ui.value == 100) {
1930   - relativeWidth = scope.ViewImageWidth;
1931   - relativeHeight = scope.ViewImageHeight
1932   - scope.sliderPercentValue = 1.0;
1933   - }
1934   - else if (ui.value == 85) {
1935   - relativeWidth = scope.ViewImageWidth * 0.85;
1936   - relativeHeight = scope.ViewImageHeight * 0.85;
1937   - scope.sliderPercentValue = 0.85;
  1853 + if (ui.value == 100) {
  1854 + relativeWidth = scope.ViewImageWidth;
  1855 + relativeHeight = scope.ViewImageHeight
  1856 + scope.sliderPercentValue = 1.0;
  1857 + }
  1858 + else if (ui.value == 85) {
  1859 + relativeWidth = scope.ViewImageWidth * 0.85;
  1860 + relativeHeight = scope.ViewImageHeight * 0.85;
  1861 + scope.sliderPercentValue = 0.85;
1938 1862  
1939   - } else if (ui.value == 70) {
1940   - relativeWidth = scope.ViewImageWidth * 0.70;
1941   - relativeHeight = scope.ViewImageHeight * 0.70;
1942   - scope.sliderPercentValue = 0.70;
1943   - } else if (ui.value == 55) {
  1863 + } else if (ui.value == 70) {
  1864 + relativeWidth = scope.ViewImageWidth * 0.70;
  1865 + relativeHeight = scope.ViewImageHeight * 0.70;
  1866 + scope.sliderPercentValue = 0.70;
  1867 + } else if (ui.value == 55) {
1944 1868  
1945   - relativeWidth = scope.ViewImageWidth * 0.55;
1946   - relativeHeight = scope.ViewImageHeight * 0.55;
1947   - scope.sliderPercentValue = 0.55;
  1869 + relativeWidth = scope.ViewImageWidth * 0.55;
  1870 + relativeHeight = scope.ViewImageHeight * 0.55;
  1871 + scope.sliderPercentValue = 0.55;
1948 1872  
1949   - } else if (ui.value == 40) {
  1873 + } else if (ui.value == 40) {
1950 1874  
1951   - relativeWidth = scope.ViewImageWidth * 0.40;
1952   - relativeHeight = scope.ViewImageHeight * 0.40;
1953   - scope.sliderPercentValue = 0.40;
  1875 + relativeWidth = scope.ViewImageWidth * 0.40;
  1876 + relativeHeight = scope.ViewImageHeight * 0.40;
  1877 + scope.sliderPercentValue = 0.40;
1954 1878  
1955   - } else if (ui.value == 25) {
  1879 + } else if (ui.value == 25) {
1956 1880  
1957   - relativeWidth = scope.ViewImageWidth * 0.25;
1958   - relativeHeight = scope.ViewImageHeight * 0.25;
1959   - scope.sliderPercentValue = 0.25;
  1881 + relativeWidth = scope.ViewImageWidth * 0.25;
  1882 + relativeHeight = scope.ViewImageHeight * 0.25;
  1883 + scope.sliderPercentValue = 0.25;
1960 1884  
  1885 + }
1961 1886 }
1962   - }
1963 1887  
1964 1888 if (ui.value == 25 || ui.value == 40 || ui.value == 55 || ui.value == 70 || ui.value == 85 || ui.value == 100) {
1965 1889 $("#modItemImage").css("width", relativeWidth + "px");
... ... @@ -1969,7 +1893,7 @@ $(document).ready(function () {
1969 1893  
1970 1894 $("#modItemImage").attr('src', '');
1971 1895  
1972   -
  1896 +
1973 1897 $("#aaDetailViewCanvas").remove();
1974 1898 //0.5 create canvas on the top of image so that I can draw a line over the canvas.
1975 1899 var canvas = document.createElement('canvas');
... ... @@ -1980,7 +1904,7 @@ $(document).ready(function () {
1980 1904 canvas.style.left = '0px';
1981 1905 canvas.style.top = '0px';
1982 1906 canvas.style.position = "absolute";
1983   -
  1907 +
1984 1908 $("#canvasDiv").append(canvas);
1985 1909 scope.context = canvas.getContext("2d")
1986 1910 $("#modItemImage").attr('src', scope.OpenItemImagePath);
... ... @@ -1988,18 +1912,18 @@ $(document).ready(function () {
1988 1912 var btnID = '';
1989 1913 $("div.tools div:eq(1) div").each(function () {
1990 1914 if ($(this).find("button").hasClass("btn-primary")) {
1991   - btnID = $(this).find("button").attr("id");
  1915 + btnID = $(this).find("button").attr("id");
1992 1916 $('#' + btnID).removeClass("btn-black");
1993 1917 $('#' + btnID).addClass("btn-primary");
1994 1918 }
1995 1919 });
1996 1920 scope.isSelectedPinBtnClickedAftrSliderCange = true;
1997 1921 switch (btnID) {
1998   -
  1922 +
1999 1923 case "hidePinBtn":
2000 1924 break;
2001 1925 case "allPinBtn":
2002   - scope.showAllPins();
  1926 + scope.showAllPins();
2003 1927 break;
2004 1928 case "selectedPin":
2005 1929 scope.showAllPins();
... ... @@ -2010,7 +1934,7 @@ $(document).ready(function () {
2010 1934 break;
2011 1935 }
2012 1936 }
2013   -
  1937 +
2014 1938 });
2015 1939 }
2016 1940 })
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
... ... @@ -3,103 +3,185 @@
3 3 <div class="main" ng-init="loadForModuleById(1)">
4 4 <!--<div class="main">-->
5 5 <div class="col-sm-12" style="padding-left:25px; width:99%">
6   -
7   - <!--Filter section-->
8   - <!--<div class="col-sm-12 stickey-area clsstickydiv">-->
9   - <div class="breadcrumb">
10   - <div class="row center-block">
11   - <h5 class="text-center text-primary txt-white f15">Display Image By</h5>
12   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
13   - <div class="form-group">
14   - <h6 class="text-center text-primary txt-white f11">Body Region</h6>
15   - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in AllBodyRegion track by item">
16   - <option value="">All</option>
17   - </select>
18   - </div>
  6 +
  7 + <!--Filter section-->
  8 + <!--<div class="col-sm-12 stickey-area clsstickydiv">-->
  9 + <div class="breadcrumb">
  10 + <div class="row center-block">
  11 + <h5 class="text-center text-primary txt-white f15">Display Image By</h5>
  12 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  13 + <div class="form-group">
  14 + <h6 class="text-center text-primary txt-white f11">Body Region</h6>
  15 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodyregion" ng-options="item for item in AllBodyRegion track by item">
  16 + <option value="">All</option>
  17 + </select>
19 18 </div>
20   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
21   - <div class="form-group">
22   - <h6 class="text-center text-primary txt-white f11">Body System</h6>
23   - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in AllBodySystem track by item">
24   - <option value="">All</option>
25   - </select>
26   - </div>
  19 + </div>
  20 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  21 + <div class="form-group">
  22 + <h6 class="text-center text-primary txt-white f11">Body System</h6>
  23 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedbodysystem" ng-options="item for item in AllBodySystem track by item">
  24 + <option value="">All</option>
  25 + </select>
27 26 </div>
  27 + </div>
28 28  
29   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
30   - <div class="form-group">
31   - <h6 class="text-center text-primary txt-white f11">View Orientation</h6>
32   - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in AllOrientation track by item">
33   - <option value="">All</option>
34   - </select>
35   - </div>
  29 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  30 + <div class="form-group">
  31 + <h6 class="text-center text-primary txt-white f11">View Orientation</h6>
  32 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedorientation" ng-options="item for item in AllOrientation track by item">
  33 + <option value="">All</option>
  34 + </select>
36 35 </div>
37   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
38   - <div class="form-group">
39   - <h6 class="text-center text-primary txt-white f11">Image Type</h6>
40   - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in AllImageType track by item">
41   - <option value="">All</option>
42   - </select>
43   - </div>
  36 + </div>
  37 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  38 + <div class="form-group">
  39 + <h6 class="text-center text-primary txt-white f11">Image Type</h6>
  40 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedimagetype" ng-options="item for item in AllImageType track by item">
  41 + <option value="">All</option>
  42 + </select>
44 43 </div>
45   - <!--<div class="col-md-2 col-sm-4 pad-lftrgt3">
46   - <div class="form-group">
47   - <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6>
48   - <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item">
49   - <option value="">All</option>
50   - </select>
51 44 </div>
52   - </div>-->
53   - <div class="col-md-2 col-sm-4 pad-lftrgt3">
54   - <div class="form-group">
55   - <h6 class="text-center text-primary txt-white f11">Search</h6>
  45 + <!--<div class="col-md-2 col-sm-4 pad-lftrgt3">
  46 + <div class="form-group">
  47 + <h6 class="text-center text-primary txt-white f11">Medical Speciality</h6>
  48 + <select ng-change="hideListViewDiv()" class="form-control input-sm" ng-model="query.selectedspecialty" ng-options="item for item in CIAllSpeciality track by item">
  49 + <option value="">All</option>
  50 + </select>
  51 + </div>
  52 + </div>-->
  53 + <div class="col-md-2 col-sm-4 pad-lftrgt3">
  54 + <div class="form-group">
  55 + <h6 class="text-center text-primary txt-white f11">Search</h6>
56 56  
57   - <div class="btn-group col-xs-12" style="padding:0;">
58   - <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(1,query)"><i class="fa fa-eye"></i> Show All</button>
59   - <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="FilterByImage(1,query)">
60   - <i class="fa fa-search"></i>
61   - </button>
  57 + <div class="btn-group col-xs-12" style="padding:0;">
  58 + <button type="button" class="btn btn-primary btn-sm col-xs-9" ng-click="Reset(1, query)"><i class="fa fa-eye"></i> Show All</button>
  59 + <button type="button" class="btn btn-primary btn-sm col-xs-3" ng-click="FilterByImage(1, query)">
  60 + <i class="fa fa-search"></i>
  61 + </button>
62 62  
63   - </div>
  63 + </div>
64 64  
65 65  
66 66  
67   - <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
  67 + <!--<button class="btn btn-primary btn-sm" ng-click="ApplySearch(query)"><i class="fa fa-search"></i></button>&nbsp;<button class="btn btn-primary btn-sm col-md-9" ng-click="Reset(query)"><i class="fa fa-eye"></i> Show All</button>-->
  68 + </div>
  69 + </div>
  70 + </div>
  71 + </div>
  72 + <!--</div>-->
  73 + <!--End Filter Section-->
  74 + <!--<!-- Nav tabs -->
  75 + <!--<ul class="nav nav-tabs" role="tablist">
  76 + <li role="presentation" id="Male" class="active" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
  77 + <li role="presentation" id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
  78 + </ul>-->
  79 + <!--<!-- Nav tabs -->
  80 + <!--<ul class="nav nav-tabs" role="tablist">
  81 + <li role="presentation" id="Male" class="active" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
  82 + <li role="presentation" id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
  83 + </ul>-->
  84 + <!-- Tab panes -->
  85 + <div class="row tab-content" id="viewList">
  86 + <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
  87 + <div role="tabpanel" class="tab-pane active" id="grid-view">
  88 + <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' ">
  89 + <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" data-ng-click="openModuleItemView($event)">
  90 + <div class="thumbnail">
  91 + <a href="#">
  92 + <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" data-ng-click="openModuleItemView($event)" alt="" title="">
  93 + <div class="caption"><p>{{val._Title}}</p></div>
  94 + </a>
68 95 </div>
69 96 </div>
70 97 </div>
71 98 </div>
72   - <!--</div>-->
73   - <!--End Filter Section-->
74   - <!--<!-- Nav tabs -->
75   - <!--<ul class="nav nav-tabs" role="tablist">
76   - <li role="presentation" id="Male" class="active" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
77   - <li role="presentation" id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
78   - </ul>-->
79   - <!--<!-- Nav tabs -->
80   - <!--<ul class="nav nav-tabs" role="tablist">
81   - <li role="presentation" id="Male" class="active" ng-click="getDAViewList($event)"><a><i class="fa fa-mars-stroke "></i> Male</a></li>
82   - <li role="presentation" id="Female" ng-click="getDAViewList($event)"><a><i class="fa fa-venus"></i> Female</a></li>
83   - </ul>-->
84   - <!-- Tab panes -->
85   - <div class="row tab-content" id="viewList">
86   - <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
87   - <div role="tabpanel" class="tab-pane active" id="grid-view">
88   - <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' ">
89   - <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)">
90   - <div class="thumbnail">
91   - <a href="#">
92   - <img class="tinyImg" id="{{val._Title}}" ng-src="../content/images/aa/thumbnails/{{val._TileImageName}}" data-ng-click="openModuleItemView($event)" alt="" title="">
93   - <div class="caption"><p>{{val._Title}}</p></div>
94   - </a>
  99 + <!--<div class="col-xs-12" id="list-view"></div>-->
  100 + <div role="tabpanel" id="list-view" class="col-xs-12">
  101 + <!--ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }"-->
  102 + <!--<div class="col-sm-12 table-responsive">-->
  103 + <!--<div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">-->
  104 + <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">-->
  105 + <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;">
  106 + <thead class="clsthead">
  107 + <tr class="active">
  108 + <th width="25%">Title</th>
  109 + <th width="15%">Region</th>
  110 + <th width="30%">System</th>
  111 + <th width="15%">View</th>
  112 + <th width="25%">Type</th>
  113 + <!--<th width="25%">Specialty</th>-->
  114 + </tr>
  115 + </thead>
  116 + <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody">
  117 + <tr id="{{val._Id}}" ng-class="{selected: val._Id === idSelected}" data-ng-click="openListViewModuleItem($event)" data-ng-dblclick=" openModuleItemView($event)" ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title'">
  118 + <td width="25%">
  119 + {{val._Title}}
  120 + </td>
  121 + <td width="15%">
  122 + {{val._BodyRegion}}
  123 + </td>
  124 + <td width="30%">
  125 + {{val._BodySystem}}
  126 + </td>
  127 + <td width="15%">
  128 + {{val._ViewOrientation}}
  129 + </td>
  130 + <td width="25%">
  131 + {{val._ImageType}}
  132 + </td>
  133 + <!--<td width="25%">
  134 + {{item._MedicalSpecialty}}
  135 + </td>-->
  136 + </tr>
  137 + </tbody>
  138 + <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody">
  139 + <tr id="{{item._Id}}" ng-class="{selected: item._Id === idSelected}" data-ng-click="openListViewModuleItem($event)" data-ng-dblclick="openModuleItemView($event)" ng-repeat="item in searchAAListViewData">
  140 + <td width="25%">
  141 + {{item._Title}}
  142 + </td>
  143 + <td width="15%">
  144 + {{item._BodyRegion}}
  145 + </td>
  146 + <td width="30%">
  147 + {{item._BodySystem}}
  148 + </td>
  149 + <td width="15%">
  150 + {{item._ViewOrientation}}
  151 + </td>
  152 + <td width="25%">
  153 + {{item._ImageType}}
  154 + </td>
  155 + <!--<td width="25%">
  156 + {{item._MedicalSpecialty}}
  157 + </td>-->
  158 + </tr>
  159 + <!--<tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''">
  160 + <td colspan="6"><strong id="searchItem" style="color:black;">No illustration found for the selected search criteria!</strong></td>
  161 + </tr>-->
  162 +
  163 + </tbody>
  164 + </table>
  165 + <!--</div>-->
  166 + <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;">
  167 + <div class="row well">
  168 + <div title="{{SelectedAATitle}}" class="col-sm-3 col-lg-2 no-padding">
  169 + <div class="thumbnail no-margin">
  170 + <img id="{{SelectedAAId}}" src="{{SelectedAAthumbImage}}" alt="" title="{{SelectedAATitle}}" data-ng-click="openCurrentView($event)">
95 171 </div>
96 172 </div>
  173 + <div class="col-sm-9 col-lg-9" style="padding-left:10px;">
  174 + <p class="f11" ng-bind-html="SelectedAASummary"></p>
  175 + <button id="{{SelectedAAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openCurrentView($event)">Open</button>
  176 + </div>
97 177 </div>
  178 +
98 179 </div>
99   - <div class="col-xs-12" id="list-view"></div>
100   - </div>
  180 + </div>
101 181 </div>
102   -
  182 + </div>
  183 + </div>
  184 +</div>
103 185 <script>
104 186 $(function () {
105 187  
... ... @@ -123,4 +205,4 @@
123 205 $(function () {
124 206 $(".modal").draggable();
125 207 });
126   -</script>
  208 +</script>
127 209 \ No newline at end of file
... ...