Commit bdbd138bff89dbbd9fc63d6d2dd3e4cbfa2770be

Authored by Utkarsh Singh
1 parent 74b4c993

Updated code

400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
... ... @@ -3808,11 +3808,14 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
3808 3808 }, 1000);
3809 3809 }
3810 3810 $("#optionsListManagerTab").addClass("active");
3811   - var viewNameAftrSplit = $("#viewName").val().split(" ");
3812   - if (viewNameAftrSplit[0] == "null") {
3813   - document.location.href = "/";
  3811 + var viewNameAftrSplit;
  3812 + if ($("#viewName").val() !== null) {
  3813 + viewNameAftrSplit = $("#viewName").val().split(" ");
  3814 +
  3815 + if (viewNameAftrSplit[0] == "null") {
  3816 + document.location.href = "/";
  3817 + }
3814 3818 }
3815   -
3816 3819 if ($location.url() == "/module-item-view") {
3817 3820 $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
3818 3821 }
... ...
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 = [];
... ... @@ -48,61 +49,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
48 49 }
49 50 else {
50 51  
51   -
52 52 $('#grid-view').css("display", "none");
53   - if ($scope.isListViewDataLoaded == true) {
54   - var promise = ModuleService.loadModuleDataBasedOnModuleName($scope.moduleName)
55   - .then(
56   - function (result) {
57   - // alert(JSON.stringify($scope.moduleLandingData));
58   - $scope.moduleLandingData = result;
59   - $scope.selectedAAListViewData = new jinqJs()
60   - .from($scope.moduleLandingData.data.root.Item)
61   - .orderBy([{ field: '_Title', sort: 'asc' }])
62   - .select();
63   - var htm = '';
64   - 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'>";
65   - angular.forEach($scope.selectedAAListViewData, function (value, key) {
66   - htm += "<tr id=" + value._Id + " onclick='openListViewModuleItem(event)' ondblclick='openModuleItemView(event)'>"
67   - 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>';
68   - htm += "</tr>"
69   - });
70   - htm += "</tbody></table>";
71   - $("#list-view").html(htm);
72   - $compile(htm)($scope);
73   - });
74   - $('#list-view').css("display", "block");
75   - $scope.isListViewDataLoaded = false;
76   - }
77   - else {
78   - $('#list-view').css("display", "block");
79   - }
80   -
81   - $timeout(function () {
82   - // if ($rootScope.isListViewRowClicked == true) {
83   - // $rootScope.isListViewRowClicked = false;
84   - $("#demoView").remove();
85   - $("#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>");
86   - var moduleItemDataToBeSavedID
87   - $("#list-view table tbody tr").removeClass("active");
88   - var moduleItemDataToBeSavedID = $rootScope.getLocalStorageValue("listViewSelectedID");
89   - $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active");
90   - $scope.isListViewButtonClicked = true;
91   - var curAAListViewScroll = $rootScope.getLocalStorageValue("AAListViewScroll");
92   -
93   - if (typeof (curAAListViewScroll) !== "undefined" && curAAListViewScroll !== null && curAAListViewScroll !== '') {
94   - if (typeof InstallTrigger !== 'undefined') {
95   -
96   - $('#list-view table tbody').animate({ scrollTop: $rootScope.getLocalStorageValue("AAListViewScroll") });
97   - }
98   - else {
99   -
100   - $('#list-view table tbody').scrollTop($rootScope.getLocalStorageValue("AAListViewScroll"));
101   - }
102   -
103   - }
104   - // }
105   - }, 2000);
  53 + $('#list-view').css("display", "block");
106 54 }
107 55 };
108 56  
... ... @@ -126,7 +74,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
126 74  
127 75 $scope.moduleLandingData = result;
128 76 // setTimeout(function () { $('#' + $rootScope.highlightid).find('.thumbnail').addClass('hightlightstate'); }, 100);
129   -
130 77 setTimeout(function () {
131 78 if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {
132 79 $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');
... ... @@ -135,7 +82,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
135 82 $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
136 83 }
137 84 }, 100);
138   -
139 85 //console.log(JSON.stringify(result, null, 4));
140 86 },
141 87 function (error) {
... ... @@ -143,7 +89,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
143 89 console.log(' error: ' + error.statusText);
144 90 }
145 91 )
146   -
  92 + $('#list-view').css('display', 'none');
147 93 }
148 94  
149 95 //$scope.$on('$viewContentLoaded', function (event) {
... ... @@ -153,20 +99,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
153 99 //});
154 100 $scope.isOpenBtnClicked = false;
155 101 $scope.openModuleItemView = function (event) {
156   -
157 102 $rootScope.MenuModuleName = "AA";
158 103 localStorage.setItem("activeTab", $scope.activeTab);
  104 + $scope.isListViewButtonClicked = true;
159 105 //0. Get selected Image Id
160 106 if ($scope.isListViewButtonClicked == true) {
161 107 if ($scope.isOpenBtnClicked == true) {
162 108  
163   - var moduleItemDataToBeSaved = $("#demoText").html();
  109 + var moduleItemDataToBeSaved = $("#demoText").text().trim();
164 110 $scope.isOpenBtnClicked = false;
165 111 }
166 112 else {
167 113 var moduleItemDataToBeSavedID = event.currentTarget.id;
168 114 localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID);
169   - var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text();
  115 + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
170 116 }
171 117 }
172 118 else {
... ... @@ -184,7 +130,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
184 130 $rootScope.bodySystemName = $rootScope.OpenedTileData[2];
185 131 $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
186 132 $scope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
187   - $rootScope.listArray = [];
  133 + //$rootScope.listArray = [];
188 134 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
189 135 //3. set opened module item ti
190 136 localStorage.setItem("currentViewTitle", $rootScope.OpenedTileData[6]);
... ... @@ -194,29 +140,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
194 140 //3. Navigate to the Module-item-view
195 141 var u = $location.url();
196 142 $location.url('/module-item-view');
197   -
198 143 }
199 144  
200 145  
201 146 $scope.openListViewModuleItem = function (event) {
202   -
  147 + $scope.isListViewButtonClicked = true;
203 148 $("#demoView").remove();
204 149 var moduleItemDataToBeSavedID = event.currentTarget.id;
205 150 $("#list-view table tbody tr").removeClass("active");
206 151 localStorage.setItem("listViewSelectedID", moduleItemDataToBeSavedID);
207 152 $("#list-view table tbody #" + moduleItemDataToBeSavedID).addClass("active");
208 153 localStorage.setItem("AAListViewScroll", $("#list-view table tbody").scrollTop());
209   - var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text();
  154 + var moduleItemDataToBeSaved = $("#list-view table tbody #" + moduleItemDataToBeSavedID).find('td:eq(0)').text().trim();
210 155 $rootScope.OpenedTileData = ModuleService.GetOpenedTileData(moduleItemDataToBeSaved, $scope.moduleLandingData);
211 156 $rootScope.OpenItemImagePath = "../../../content/images/aa/images/" + $rootScope.OpenedTileData[3];
212   - $rootScope.listArray = [];
  157 + //$rootScope.listArray = [];
213 158 $rootScope.listArray.push({ "imageName": $rootScope.OpenItemImagePath, "text": moduleItemDataToBeSaved });
214 159 $("#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.OpenItemImagePath + "></div><div class='col-xs-12' id='demoText' style='padding:0;'>" + moduleItemDataToBeSaved + "</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>");
215 160 }
216 161  
217 162  
218 163 $scope.openModuleItem = function () {
219   -
220 164 if ($rootScope.refreshcheck == null) {
221 165 $location.path('/');
222 166 }
... ... @@ -276,9 +220,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
276 220 $scope.imageWidth = this.width;
277 221 $scope.imageHeight = this.height;
278 222  
279   - //$('#aaBodyView').css("height", $(window).outerHeight());
280 223  
281   - //$('#aaBodyView').css("width", $(window).outerWidth());
282 224 $timeout(function () {
283 225 $compile(aaViewElement.contents())($scope);
284 226  
... ... @@ -315,10 +257,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
315 257 canvas.style.position = "absolute";
316 258 $("#canvasDiv").append(canvas);
317 259 $scope.context = canvas.getContext("2d")
318   -
319 260 //6. Show all pins on AA opened item
320 261 $scope.showAllPins();
321   -
322 262 //7. Highlight all system body list in left side
323 263 $scope.highlightBodySystemList();
324 264 }
... ... @@ -336,14 +276,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
336 276 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
337 277 var bodySystemListlength = bodySystemListObj.length;
338 278 for (var i = 0; i < bodySystemListlength; i++) {
339   -
340 279 //var boldTag = lis[i];
341 280 for (var j = 0; j < $rootScope.bodySystemNames.length; j++) {
342 281 if ((bodySystemListObj[i].innerHTML) == ($rootScope.bodySystemNames[j])) {
343 282 $("#" + i).parent().removeClass("disabledSelectedSystem");
344 283  
345 284 }
346   -
347 285 }
348 286  
349 287 }
... ... @@ -373,6 +311,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
373 311  
374 312 $scope.allPinDataArray = [];
375 313 var promise = ModuleService.getPinDataForImage($rootScope.imageName)
  314 +
376 315 .then(
377 316 function (result) {
378 317  
... ... @@ -395,6 +334,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
395 334 $scope.allPinDataArray.push(value._PinId);
396 335 $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
397 336 })
  337 +
  338 +
  339 +
398 340 //load search/vocab data
399 341 $rootScope.loadSearchData();
400 342 }
... ... @@ -415,10 +357,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
415 357  
416 358  
417 359 $scope.FilterByImage = function (moduleId, query) {
418   -
419 360 $scope.moduleId = moduleId;
  361 + $scope.filterstring = true;
  362 +
  363 + console.log('loadForModuleById is called');
420 364  
421   - console.log('loadForModuleById is called')
422 365 $rootScope.moduleName = Modules[moduleId].Name;
423 366 while ($scope.searchAAListViewData.length) {
424 367 $scope.searchAAListViewData.pop();
... ... @@ -527,12 +470,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
527 470  
528 471 if (selectimg === true && count >= filtercount) {
529 472  
530   -
531 473 $scope.imagePath = "../content/images/aa/thumbnails/" + value._TileImageName;
532 474  
533 475  
534   - var $el = $('<div id="' + value._id + '" class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openModuleItemView($event)">'
535   - + '<div class="thumbnail" >'
  476 + var $el = $('<div id="' + value._Title + '" class="col-sm-3 col-lg-2" title = "' + value._Title + '" data-ng-click="openModuleItemView($event)">'
  477 + + '<div class="thumbnail" ><a href="#">'
536 478 + '<img class="tinyImg" id="' + value._Title + '"ng-src="' + $scope.imagePath + '" alt="" title="" >'
537 479 + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
538 480  
... ... @@ -547,7 +489,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
547 489  
548 490 $scope.searchAAListViewData.push(
549 491 {
550   - "_id": value._id,
  492 + "_Id": value._Id,
551 493 "_ImageId": value._ImageId,
552 494 "_Title": value._Title,
553 495 "_ImageName": value._contentImage,
... ... @@ -559,29 +501,28 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
559 501 //"$$hashKey": value._Summary
560 502  
561 503 });
562   -
  504 + console.log($scope.searchAAListViewData);
  505 + if ($('#searchItem').length > 0)
  506 + $('#searchItem').remove();
563 507 }
564   -
565   -
566 508 });
567 509  
568   - //Show Error Message in case of gridview if no data is found
  510 + //Show Error Message in case of gridview/ ListView [if no data is found]
569 511 if ($scope.searchAAListViewData.length == 0) {
570   -
571 512 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');
572 513 $compile($el)($scope);
573 514 $('table > #ListViewDiv > #searchItem').remove();
574 515  
575 516 $('#ListViewDiv').append('<tr id="searchItem"><td colspan="6"><strong style="color:black;">No illustration found for the selected search criteria!</strong></td></tr>');
576 517 }
577   - console.log(JSON.stringify(result, null, 4));
  518 + //console.log(JSON.stringify(result, null, 4));
  519 + console.log('SearchAAListViewData--' + $scope.searchAAListViewData);
578 520 },
579 521 function (error) {
580 522 // handle errors here
581 523 console.log(' error: ' + error.statusText);
582 524 }
583 525 )
584   -
585 526 }
586 527  
587 528 $scope.Reset = function (moduleId, query) {
... ... @@ -605,6 +546,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
605 546  
606 547 $('#ListViewDiv').scrollTop(0);
607 548  
  549 + if ($('#demoView').length > 0)
  550 + $('#demoView').remove();
608 551 // $scope.HideListViewDiv();
609 552  
610 553 $scope.filterstring = false;
... ... @@ -618,7 +561,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
618 561  
619 562 $scope.showSelectedSystemPins = function (event) {
620 563  
621   -
622 564 var bodySystemListObj = document.getElementById("bodySystemList").getElementsByTagName("a");
623 565 var bodySystemListlength = bodySystemListObj.length;
624 566 for (var i = 0; i < bodySystemListlength; i++) {
... ... @@ -1251,7 +1193,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1251 1193 sortedTermTextArray.sort();
1252 1194 }
1253 1195  
1254   -
1255 1196 for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
1256 1197 for (var j = 0; j <= $scope.matchedLanguageTermData.length - 1; j++) {
1257 1198 if ($scope.matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) {
... ... @@ -1263,7 +1204,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1263 1204  
1264 1205  
1265 1206 $scope.$watch('$scope.pinTermData', function (newValue, oldValue, scope) {
  1207 +
1266 1208 if (($('#termlistfilter').html() != ""))
  1209 +
1267 1210 $('#termlistfilter').empty();
1268 1211 if ($scope.pinTermData.length > 0) {
1269 1212 $timeout(function () {
... ... @@ -1303,7 +1246,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1303 1246 $scope.$on('listManagerEvent', function (event, data) {
1304 1247  
1305 1248 $("#viewName").empty();
1306   - $("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
  1249 +
  1250 + var currentView = $rootScope.getLocalStorageValue("currentViewTitle");
  1251 + var viewNmeHtml = '<option>' + currentView + '</option>'
  1252 + $('#viewName').append(viewNmeHtml);
  1253 + //$("#viewName").append("<option>" + $rootScope.listArray[0].text + "</option>");
1307 1254 $rootScope.isLoading = false;
1308 1255 $('#spinner').css('visibility', 'hidden');
1309 1256  
... ... @@ -1324,7 +1271,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1324 1271  
1325 1272  
1326 1273 $rootScope.refreshTermListOnAASystemSelection = function (bodySystemId) {
1327   -
1328 1274 $rootScope.bodySystemSeletedId = bodySystemId;
1329 1275 $('#termList').empty();
1330 1276 var bodySystemName = $("#AABodySystems #" + bodySystemId).val();
... ... @@ -1333,7 +1279,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1333 1279 var $selectedOptions = $('<option title= "' + $scope.pinTermData[j].TermTxt + '" id= "' + $scope.pinTermData[j].TermNumber + '">' + $scope.pinTermData[j].TermTxt + '</option>').appendTo("#termList")
1334 1280  
1335 1281 $compile($selectedOptions)($scope);
1336   -
1337 1282 }
1338 1283 $("#totalTerms").empty();
1339 1284 $("#totalTerms").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
... ... @@ -1430,6 +1375,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1430 1375  
1431 1376 $scope.showAllPinsAfterHide = function (event) {
1432 1377  
  1378 +
1433 1379 $rootScope.isLoading = true;
1434 1380 $('#spinner').css('visibility', 'visible');
1435 1381  
... ... @@ -1459,7 +1405,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1459 1405  
1460 1406 $scope.showSelectedPins = function () {
1461 1407  
1462   -
1463 1408 $rootScope.isLoading = true;
1464 1409 $('#spinner').css('visibility', 'visible');
1465 1410  
... ... @@ -1495,6 +1440,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1495 1440 }
1496 1441  
1497 1442 }
  1443 +
1498 1444 };
1499 1445  
1500 1446  
... ... @@ -1515,7 +1461,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1515 1461 var pinName = 'Pin_' + value1.id;
1516 1462 var pinArcName = 'PinArc_' + value1.id;
1517 1463  
1518   -
1519 1464 $('#aaDetailViewCanvas').setLayer(pinName, {
1520 1465 visible: true // set to true instead to show the layer again
1521 1466 }).drawLayers();
... ... @@ -1523,8 +1468,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1523 1468 $('#aaDetailViewCanvas').setLayer(pinArcName, {
1524 1469 visible: true // set to true instead to show the layer again
1525 1470 }).drawLayers();
1526   -
1527   -
1528 1471 // }
1529 1472 })
1530 1473  
... ... @@ -1540,10 +1483,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1540 1483 $('#aaDetailViewCanvas').setLayer(pinArcName, {
1541 1484 visible: false // set to true instead to show the layer again
1542 1485 }).drawLayers();
1543   -
1544 1486 })
1545 1487  
1546   -
1547 1488 }
1548 1489  
1549 1490 else {
... ... @@ -1667,7 +1608,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1667 1608 $("#" + $rootScope.annotationArray[i].speechBuubleId).css("display", "none");
1668 1609 $("#" + $rootScope.annotationArray[i].speechBubbleLineId).css("display", "none");
1669 1610 }
1670   -
1671 1611 }
1672 1612 else {
1673 1613 $rootScope.isShowHideButtonClicked = true;
... ... @@ -1680,10 +1620,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1680 1620 $("#comment-box").addClass("btn-black");
1681 1621  
1682 1622 }
1683   -
1684 1623 }
1685 1624 $scope.activePinOnLayerChange = function () {
1686   -
1687 1625 for (var i = 0; i <= $scope.activePinArray.length - 1; i++) {
1688 1626 var radialAfterClick = $('#aaDetailViewCanvas').createGradient({
1689 1627 x1: 50, y1: 50,
... ... @@ -1700,7 +1638,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1700 1638 }
1701 1639 }
1702 1640  
1703   -
1704 1641 $scope.activePinOnSliderChange = function () {
1705 1642 if ($scope.activePinArray.length == 1) {
1706 1643 for (var i = 0; i <= $scope.allPinDataArray.length - 1; i++) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
1   -๏ปฟ<div class="bodyWrap row ">
  1 +๏ปฟ๏ปฟ<div class="bodyWrap row ">
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" ng-init="loadForModuleById(1)">
4 4 <!--<div class="main">-->
... ... @@ -55,8 +55,8 @@
55 55 <h6 class="text-center text-primary txt-white f11">Search</h6>
56 56  
57 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)">
  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 60 <i class="fa fa-search"></i>
61 61 </button>
62 62  
... ... @@ -96,31 +96,113 @@
96 96 </div>
97 97 </div>
98 98 </div>
99   - <div class="col-xs-12" id="list-view"></div>
  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)">
  171 + </div>
  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>
  177 + </div>
  178 +
  179 + </div>
  180 + </div>
100 181 </div>
101 182 </div>
  183 + </div>
  184 +</div>
  185 +<script>
  186 + $(function () {
102 187  
103   - <script>
104   - $(function () {
105   -
106   - $(function () {
107   - $('[data-toggle="tooltip"]').tooltip();
108   - })
109   - });
110   - </script>
111   - <script>
112   - (function ($) {
113   - $(window).load(function () {
114   - $(".sidebar").mCustomScrollbar({
115   - autoHideScrollbar: true,
116   - //theme:"rounded"
117   - });
118   - //alert("side bar DA page");
119   - });
120   - })(jQuery);
121   - </script>
122   - <script>
123   - $(function () {
124   - $(".modal").draggable();
  188 + $(function () {
  189 + $('[data-toggle="tooltip"]').tooltip();
  190 + })
  191 + });
  192 +</script>
  193 +<script>
  194 + (function ($) {
  195 + $(window).load(function () {
  196 + $(".sidebar").mCustomScrollbar({
  197 + autoHideScrollbar: true,
  198 + //theme:"rounded"
125 199 });
126   - </script>
  200 + //alert("side bar DA page");
  201 + });
  202 + })(jQuery);
  203 +</script>
  204 +<script>
  205 + $(function () {
  206 + $(".modal").draggable();
  207 + });
  208 +</script>
127 209 \ No newline at end of file
... ...