ADAM / AIAHTML5

Commit 334ca5aa5456253453bd233cfc76c06f4122561a

Authored by Amrita Vishnoi
2 parents 7dd270c6 7f3f710c

Merge branch 'Develop' into QA

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