ADAM / AIAHTML5

Commit 3705d19ff2d4604c1c42cd673fc5a6a7f5955170

Authored by Birendra
1 parent 3888327e

fix lexicon in AA module

Inline Side-by-side
Showing 30 changed files with 1640 additions and 903 deletions
400-SOURCECODE/AIAHTML5.ADMIN.API/Controllers/ReportController.cs
  View file @3705d19
... ... @@ -88,12 +88,12 @@ namespace AIAHTML5.ADMIN.API.Controllers
88 88  
89 89 [Route("GetSiteLicenseUsageReport")]
90 90 [HttpGet]
91   - public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition, int pageNo, int pageLength)
  91 + public IHttpActionResult GetSiteLicenseUsageReport(string sFromDate, string sToDate, string sAccountNumber, int iEdition, int iloginTypeId, int pageNo, int pageLength)
92 92 {
93 93 try
94 94 {
95 95 var spRecordCount = new System.Data.Objects.ObjectParameter("recordCount", 0);
96   - var lstSiteLicenseUsageReport = dbContext.usp_GetSiteLicenseUsageReports(sFromDate, sToDate, sAccountNumber, (byte)iEdition, pageNo, pageLength, spRecordCount).ToList();
  96 + var lstSiteLicenseUsageReport = dbContext.usp_GetSiteLicenseUsageReports(sFromDate, sToDate, sAccountNumber, (byte)iEdition, (byte)iloginTypeId, pageNo, pageLength, spRecordCount).ToList();
97 97 return Ok(new { SiteLicenseUsageList = lstSiteLicenseUsageReport, RecordCount = spRecordCount.Value });
98 98 }
99 99 catch (Exception ex)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.Context.cs
  View file @3705d19
... ... @@ -4259,7 +4259,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4259 4259 return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteLicenseUsageReport_Result>("usp_GetSiteLicenseUsageReport", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter, pageNoParameter, pageLengthParameter, recordCount);
4260 4260 }
4261 4261  
4262   - public virtual ObjectResult<usp_GetSiteLicenseUsageReports_Result> usp_GetSiteLicenseUsageReports(string sFromDate, string sToDate, string sAccoutNumber, Nullable<byte> iEditionId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
  4262 + public virtual ObjectResult<usp_GetSiteLicenseUsageReports_Result> usp_GetSiteLicenseUsageReports(string sFromDate, string sToDate, string sAccoutNumber, Nullable<byte> iEditionId, Nullable<byte> iloginTypeId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
4263 4263 {
4264 4264 var sFromDateParameter = sFromDate != null ?
4265 4265 new ObjectParameter("sFromDate", sFromDate) :
... ... @@ -4277,6 +4277,10 @@ namespace AIAHTML5.ADMIN.API.Entity
4277 4277 new ObjectParameter("iEditionId", iEditionId) :
4278 4278 new ObjectParameter("iEditionId", typeof(byte));
4279 4279  
  4280 + var iloginTypeIdParameter = iloginTypeId.HasValue ?
  4281 + new ObjectParameter("iloginTypeId", iloginTypeId) :
  4282 + new ObjectParameter("iloginTypeId", typeof(byte));
  4283 +
4280 4284 var pageNoParameter = pageNo.HasValue ?
4281 4285 new ObjectParameter("pageNo", pageNo) :
4282 4286 new ObjectParameter("pageNo", typeof(int));
... ... @@ -4285,7 +4289,7 @@ namespace AIAHTML5.ADMIN.API.Entity
4285 4289 new ObjectParameter("pageLength", pageLength) :
4286 4290 new ObjectParameter("pageLength", typeof(int));
4287 4291  
4288   - return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteLicenseUsageReports_Result>("usp_GetSiteLicenseUsageReports", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter, pageNoParameter, pageLengthParameter, recordCount);
  4292 + return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<usp_GetSiteLicenseUsageReports_Result>("usp_GetSiteLicenseUsageReports", sFromDateParameter, sToDateParameter, sAccoutNumberParameter, iEditionIdParameter, iloginTypeIdParameter, pageNoParameter, pageLengthParameter, recordCount);
4289 4293 }
4290 4294  
4291 4295 public virtual ObjectResult<usp_GetSubscribedLicenses_Result> usp_GetSubscribedLicenses(string sFromDate, string sToDate, Nullable<decimal> iStartPrice, Nullable<decimal> iEndPrice, Nullable<byte> iLicenseTypeId, Nullable<byte> iAccountTypeId, string sZip, Nullable<int> iStateId, Nullable<int> iCountryId, Nullable<int> pageNo, Nullable<int> pageLength, ObjectParameter recordCount)
... ...
400-SOURCECODE/AIAHTML5.ADMIN.API/Entity/AIADBEntity.edmx
  View file @3705d19
... ... @@ -1177,6 +1177,7 @@
1177 1177 <Parameter Name="sToDate" Type="varchar" Mode="In" />
1178 1178 <Parameter Name="sAccoutNumber" Type="varchar" Mode="In" />
1179 1179 <Parameter Name="iEditionId" Type="tinyint" Mode="In" />
  1180 + <Parameter Name="iloginTypeId" Type="tinyint" Mode="In" />
1180 1181 <Parameter Name="pageNo" Type="int" Mode="In" />
1181 1182 <Parameter Name="pageLength" Type="int" Mode="In" />
1182 1183 <Parameter Name="recordCount" Type="int" Mode="InOut" />
... ... @@ -2813,6 +2814,7 @@
2813 2814 <Parameter Name="sToDate" Mode="In" Type="String" />
2814 2815 <Parameter Name="sAccoutNumber" Mode="In" Type="String" />
2815 2816 <Parameter Name="iEditionId" Mode="In" Type="Byte" />
  2817 + <Parameter Name="iloginTypeId" Mode="In" Type="Byte" />
2816 2818 <Parameter Name="pageNo" Mode="In" Type="Int32" />
2817 2819 <Parameter Name="pageLength" Mode="In" Type="Int32" />
2818 2820 <Parameter Name="recordCount" Mode="InOut" Type="Int32" />
... ...
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
  View file @3705d19
... ... @@ -494,7 +494,7 @@ namespace AIAHTML5.API.Controllers
494 494 }
495 495  
496 496 [HttpPost]
497   - [Route("api/ByPassLoginToOpenModule")]
  497 + [Route("api/ByPassLoginToOpenModule")]//now using UrlLoginController
498 498 public HttpResponseMessage ByPassLoginToOpenModule([FromBody]JObject sitedetail)
499 499 {
500 500 // note:created new UrlLoginController for bypass login
... ...
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
  View file @3705d19
... ... @@ -1427,7 +1427,7 @@ namespace AIAHTML5.API.Models
1427 1427 return dt;
1428 1428  
1429 1429 }
1430   - internal int InsertSiteLoginDetails(String strAcccountNumber, String strUrlReferer, string strEdition)
  1430 + internal int InsertSiteLoginDetails(String strAcccountNumber, String strUrlReferer, string strEdition,int loginTypeId)
1431 1431 {
1432 1432 int result = 0;
1433 1433 SqlConnection conn = null;
... ... @@ -1443,6 +1443,7 @@ namespace AIAHTML5.API.Models
1443 1443 cmd.Parameters.AddWithValue("@nvReferalUrl", strUrlReferer);
1444 1444 cmd.Parameters.AddWithValue("@nvEdition", strEdition);
1445 1445 cmd.Parameters.AddWithValue("@nvHttpReferer", null);
  1446 + cmd.Parameters.AddWithValue("@nvLoginTypeId", loginTypeId);
1446 1447 result = cmd.ExecuteNonQuery();
1447 1448 }
1448 1449 catch (SqlException ex)
... ...
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
  View file @3705d19
... ... @@ -691,8 +691,9 @@ namespace AIAHTML5.API.Models
691 691 // get exported image detail
692 692 userInfo.UserExportImageDetail = getExportedImageDetail(userInfo.LicenseId);
693 693  
694   - // insert login details
695   - objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition);
  694 + // insert login details
  695 + //pass 1 for Site login
  696 + objDBModel.InsertSiteLoginDetails(strAcccountNumber, strSiteIP, strEdition,1);
696 697 }
697 698  
698 699  
... ... @@ -749,6 +750,8 @@ namespace AIAHTML5.API.Models
749 750 string expirationDate = null;
750 751 bool isLicenseExpired = false;
751 752  
  753 + DBModel objDBModel = new DBModel();
  754 +
752 755 // validate license start date
753 756 string startDate = null;
754 757 bool isSubscriptionNotStart = false;
... ... @@ -822,10 +825,14 @@ namespace AIAHTML5.API.Models
822 825 userInfo.userSelectedSkintone = null;
823 826 userInfo.userLexicon = null;
824 827  
825   - // get only CA module
  828 + // get only CA module
826 829  
827   - userInfo.Modules = getModuleListBySlug(licId,slug);
828   -
  830 + userInfo.Modules = getModuleListBySlug(licId,slug);
  831 +
  832 + // insert site url login details in sitelicense table UserLoginLog
  833 + //pass 2 for CA login
  834 + objDBModel.InsertSiteLoginDetails(strAcccountNumber, "", intEditionId.ToString(),2);
  835 +
829 836 }
830 837  
831 838  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/3dAController.js
  View file @3705d19
... ... @@ -79,14 +79,15 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
79 79 }
80 80 }
81 81  
82   - $scope.DisableUI = function () {
83   -
84   - var caImagePanelConetent = document.getElementsByClassName("jsPanel-content");
85   - for (var i = 0; i < caImagePanelConetent.length; i++) {
86   - caImagePanelConetent[i].style.pointerEvents = "none";
87   - caImagePanelConetent[i].style.opacity = "0.7";
  82 + $scope.Disable3DUI = function (windowviewid) {
88 83  
  84 + var modulePanel = $("#ThreeDImagePanel_"+windowviewid).find(" .jsPanel-content");
  85 + if(modulePanel.length>0)
  86 + {
  87 + modulePanel[0].style.pointerEvents="none";
  88 + modulePanel[0].style.opacity="0.7";
89 89 }
  90 +
90 91 $rootScope.isLoading = true;
91 92 $('#spinner').css('visibility', 'visible');
92 93  
... ... @@ -95,14 +96,14 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
95 96 $('#HomeContainerDiv').css('opacity', '0.7');
96 97 }
97 98  
98   - $scope.EnableUI = function () {
  99 + $scope.Enable3DUI = function (windowviewid) {
99 100  
100   - var caImagePanelConetent = document.getElementsByClassName("jsPanel-content");
101   - for (var i = 0; i < caImagePanelConetent.length; i++) {
102   - caImagePanelConetent[i].style.pointerEvents = "auto";
103   - caImagePanelConetent[i].style.opacity = "1";
  101 + var modulePanel = $("#ThreeDImagePanel_"+windowviewid).find(" .jsPanel-content");
  102 + if(modulePanel.length>0)
  103 + {
  104 + modulePanel[0].style.pointerEvents="auto";
  105 + modulePanel[0].style.opacity="1";
104 106 }
105   -
106 107 $rootScope.isLoading = false;
107 108 $('#spinner').css('visibility', 'hidden');
108 109 // CB module enable all
... ... @@ -145,7 +146,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
145 146  
146 147 $scope.initialize3DWindowData($rootScope.MULTI_VIEW_ID, true, undefined);
147 148  
148   - $scope.DisableUI();
  149 + $scope.Disable3DUI($rootScope.MULTI_VIEW_ID);
149 150  
150 151 if ($rootScope.refreshcheck == null) {
151 152 $location.path('/');
... ... @@ -207,10 +208,10 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
207 208  
208 209 });
209 210  
210   - $timeout(function () { $scope.EnableUI(); }, 200);
  211 + $timeout(function () { $scope.Enable3DUI(windowviewid); }, 200);
211 212 },
212 213 function (error) {
213   - $scope.EnableUI();
  214 + $scope.Enable3DUI(windowviewid);
214 215 // handle errors here
215 216 console.log(' $scope.threeDAnatomyData = ' + error.statusText);
216 217 }
... ... @@ -275,7 +276,7 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
275 276 if ($rootScope.isCallFromOtherModule) {
276 277 $scope.ThreeDModuleData = ModuleService.getModuleData("THREE_D_ANATOMY");
277 278 if($scope.ThreeDModuleData.length<1) return;
278   - $scope.DisableUI();
  279 + $scope.Disable3DUI();
279 280 $scope.readyToLoad = true;
280 281 $rootScope.ThreeDWindowLoadComplete = false;
281 282 $scope.wincount = 1;
... ... @@ -313,20 +314,19 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
313 314  
314 315 }
315 316 else {
316   - $scope.DisableUI();
317 317 $scope.Open3DModelBody(null);
318 318 }
319 319 }
320 320  
321 321 $scope.Open3DModelBody = function (ThreeDModuleData) {
322 322  
323   - $scope.DisableUI();
324   -
325 323 if ($rootScope.isCallFromOtherModule == true) {
326 324 $scope.ThreeDOpenInOtherModules = ThreeDModuleData;
327 325 $rootScope.MULTI_VIEW_ID += 1;
328 326 var windowviewid = $rootScope.MULTI_VIEW_ID;
329 327  
  328 + $scope.Disable3DUI(windowviewid);
  329 +
330 330 $scope.initialize3DWindowData(windowviewid, false, $scope.ThreeDOpenInOtherModules.currentWindowId);
331 331  
332 332 var moduleName = $scope.ThreeDOpenInOtherModules.mType;
... ... @@ -381,7 +381,9 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
381 381  
382 382 );
383 383 }
384   - else {
  384 + else
  385 + {
  386 + $scope.Disable3DUI($rootScope.MULTI_VIEW_ID);
385 387 $scope.Set3DwindowStoreData($rootScope.MULTI_VIEW_ID, 'parentSlugName', '3d-anatomy-list');
386 388 $scope.load3DAnimation($rootScope.MULTI_VIEW_ID);
387 389 }
... ... @@ -578,14 +580,14 @@ function ($scope, $rootScope, pages, log, $http, DataService, $filter, $location
578 580 }
579 581  
580 582 $scope.AnimationOnLoad = function (windowviewid) {
581   - $scope.EnableUI();
582   -
  583 +
583 584 if ($rootScope.isCallFromOtherModule) {
584 585  
585 586 $rootScope.ThreeDWindowLoadComplete = true;
586 587 }
587 588  
588 589 $scope.JsPanelMouseEnter(windowviewid);
  590 + $scope.Enable3DUI(windowviewid);
589 591  
590 592 }
591 593  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AIController.js
  View file @3705d19
... ... @@ -152,14 +152,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
152 152 }
153 153 }
154 154  
155   - $scope.DisableUI = function () {
156   -
157   - var aiImagePanelConetent = document.getElementsByClassName("jsPanel-content");
158   - for (var i = 0; i < aiImagePanelConetent.length; i++) {
159   - aiImagePanelConetent[i].style.pointerEvents = "none";
160   - aiImagePanelConetent[i].style.opacity = "0.7";
  155 + $scope.DisableAIUI = function (windowviewid) {
161 156  
  157 + var modulePanel = $("#aiImagePanel_"+windowviewid).find(" .jsPanel-content");
  158 + if(modulePanel.length>0)
  159 + {
  160 + modulePanel[0].style.pointerEvents="none";
  161 + modulePanel[0].style.opacity="0.7";
162 162 }
  163 +
163 164 $rootScope.isLoading = true;
164 165 $('#spinner').css('visibility', 'visible');
165 166  
... ... @@ -169,12 +170,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
169 170  
170 171 }
171 172  
172   - $scope.EnableUI = function () {
  173 + $scope.EnableAIUI = function (windowviewid) {
173 174  
174   - var aiImagePanelConetent = document.getElementsByClassName("jsPanel-content");
175   - for (var i = 0; i < aiImagePanelConetent.length; i++) {
176   - aiImagePanelConetent[i].style.pointerEvents = "auto";
177   - aiImagePanelConetent[i].style.opacity = "1";
  175 + var modulePanel = $("#aiImagePanel_"+windowviewid).find(" .jsPanel-content");
  176 + if(modulePanel.length>0)
  177 + {
  178 + modulePanel[0].style.pointerEvents="auto";
  179 + modulePanel[0].style.opacity="1";
178 180 }
179 181  
180 182 $rootScope.isLoading = false;
... ... @@ -223,7 +225,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
223 225 $scope.setActiveTab = function (tabToSet, inderectCall, windowviewid) {
224 226 if (windowviewid == undefined)
225 227 windowviewid = $rootScope.MULTI_VIEW_ID;
226   - $scope.DisableUI();
  228 + $scope.DisableAIUI(windowviewid);
227 229  
228 230 if(tabToSet=="" ||tabToSet==undefined)
229 231 {
... ... @@ -334,7 +336,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
334 336 $rootScope.isCallFromOtherModule = undefined;
335 337 $rootScope.MULTI_VIEW_ID += 1;
336 338  
337   - $scope.DisableUI();
  339 + $scope.DisableAIUI($rootScope.MULTI_VIEW_ID);
338 340  
339 341 // store exist module in module service
340 342 var ExistData = ModuleService.getModuleData("ADAM_IMAGES");
... ... @@ -477,7 +479,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
477 479  
478 480 },
479 481 function (error) {
480   - $scope.EnableUI();
  482 + $scope.EnableAIUI(windowviewid);
481 483 // handle errors here
482 484 console.log(' $scope.IllustrationData = ' + error.statusText);
483 485 }
... ... @@ -518,7 +520,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
518 520 }, 100);
519 521  
520 522 $timeout(function () {
521   - $scope.EnableUI();
  523 + $scope.EnableAIUI(windowviewid);
522 524 $rootScope.ResetGridListLength();
523 525 }, 500);
524 526  
... ... @@ -526,25 +528,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
526 528  
527 529  
528 530 $rootScope.ResetGridListLength=function()
529   - {
530   - var $ua = navigator.userAgent;
531   -
532   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
533   -
534   - var srchHeight=$('.breadcrumb').height();
535   - var gridheight=screen.height-srchHeight-132;
536   - var listheight=screen.height-srchHeight-356;
537   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
538   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
539   - }
540   - else
541   - {
542   - var srchHeight=$('.breadcrumb').height();
543   - var gridheight=screen.height-srchHeight-281;
544   - var listheight=screen.height-srchHeight-504;
545   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
546   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
547   - }
  531 + {
  532 + var innerheight =$(window).innerHeight();
  533 +
  534 + var srchHeight=$('.breadcrumb').height();
  535 + var gridheight=innerheight-srchHeight-140;
  536 + var listheight=innerheight-srchHeight-365;
  537 + $('#grid-view').css({"height":gridheight,"overflow":"auto","min-height":"160px"});
  538 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto","min-height":"100px"});
548 539 }
549 540 $scope.IsVisible = function () {
550 541 $scope.scroll();
... ... @@ -656,7 +647,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
656 647 $scope.filterstring = false;
657 648 $scope.currentPage = 1;
658 649  
659   - $scope.DisableUI();
  650 + $scope.DisableAIUI(windowviewid);
660 651 $scope.loadAllAI(ImageCount, windowviewid);
661 652 }
662 653  
... ... @@ -666,7 +657,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
666 657 $scope.currentPage = 1;
667 658 windowviewid = $rootScope.MULTI_VIEW_ID;
668 659 }
669   - $scope.DisableUI();
  660 + $scope.DisableAIUI(windowviewid);
670 661  
671 662 var currentSearchtext = $rootScope.getLocalStorageValue("SearchText");
672 663 //localStorage.setItem("SearchText", '');
... ... @@ -685,7 +676,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
685 676 if ($scope.query.SearchText == "undefined" || ($scope.query.SearchText == null || $scope.query.SearchText == "")) {
686 677 $('#errorMessage').text(AIAConstants.PLEASE_ENTER_SEARCH_TEXT);
687 678 $("#messageModal").modal('show');
688   - $scope.EnableUI();
  679 + $scope.EnableAIUI(windowviewid);
689 680 return false;
690 681 }
691 682 }
... ... @@ -782,7 +773,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
782 773 }
783 774  
784 775 $timeout(function () {
785   - $scope.EnableUI();
  776 + $scope.EnableAIUI(windowviewid);
786 777 $rootScope.ResetGridListLength();
787 778 }, 500);
788 779  
... ... @@ -834,7 +825,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
834 825 $('#txtSerachInput').val("");
835 826 $scope.idSelected = '';
836 827 $scope.hiderow = false;
837   - $scope.DisableUI();
  828 + $scope.DisableAIUI(windowviewid);
838 829 $('ul li span').removeAttr("style");
839 830 $('#' + $rootScope.SearchTextByAlphabet).css({ "color": "white", "background-color": "#1B92D0" });
840 831 $scope.filterstring = true;
... ... @@ -926,7 +917,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
926 917 }
927 918  
928 919 $timeout(function () {
929   - $scope.EnableUI();
  920 + $scope.EnableAIUI(windowviewid);
930 921 $rootScope.ResetGridListLength();
931 922 }, 500);
932 923 }
... ... @@ -1015,7 +1006,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1015 1006 if ($rootScope.isCallFromOtherModule) {
1016 1007 $scope.AIModuleData = ModuleService.getModuleData("ADAM_IMAGES");
1017 1008 if($scope.AIModuleData.length<1) return;
1018   - $scope.DisableUI();
  1009 + $scope.DisableAIUI();
1019 1010 $scope.readyToLoad = true;
1020 1011 $rootScope.AIWindowLoadComplete = false;
1021 1012 $scope.wincount = 1;
... ... @@ -1054,7 +1045,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1054 1045  
1055 1046 }
1056 1047 else {
1057   - $scope.DisableUI();
  1048 + $scope.DisableAIUI();
1058 1049 $scope.OpenAdamImageView(null);
1059 1050 }
1060 1051 }
... ... @@ -1377,7 +1368,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1377 1368  
1378 1369 }
1379 1370  
1380   - $scope.EnableUI();
  1371 + $scope.EnableAIUI(windowviewid);
1381 1372 $rootScope.AIWindowLoadComplete = true;
1382 1373 };
1383 1374  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/AODController.js
  View file @3705d19
... ... @@ -64,14 +64,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
64 64 }
65 65 }
66 66  
67   - $scope.DisableUI = function () {
68   -
69   - var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
70   - for (var i = 0; i < aniImagePanelConetent.length; i++) {
71   - aniImagePanelConetent[i].style.pointerEvents = "none";
72   - aniImagePanelConetent[i].style.opacity = "0.7";
  67 + $scope.DisableAODUI = function (windowviewid) {
73 68  
  69 + var modulePanel = $("#aodImagePanel_"+windowviewid).find(" .jsPanel-content");
  70 + if(modulePanel.length>0)
  71 + {
  72 + modulePanel[0].style.pointerEvents="none";
  73 + modulePanel[0].style.opacity="0.7";
74 74 }
  75 +
75 76 $rootScope.isLoading = true;
76 77 $('#spinner').css('visibility', 'visible');
77 78  
... ... @@ -80,12 +81,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
80 81 $('#HomeContainerDiv').css('opacity', '0.7');
81 82 }
82 83  
83   - $scope.EnableUI = function () {
  84 + $scope.EnableAODUI = function (windowviewid) {
84 85  
85   - var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
86   - for (var i = 0; i < aniImagePanelConetent.length; i++) {
87   - aniImagePanelConetent[i].style.pointerEvents = "auto";
88   - aniImagePanelConetent[i].style.opacity = "1";
  86 + var modulePanel = $("#aodImagePanel_"+windowviewid).find(" .jsPanel-content");
  87 + if(modulePanel.length>0)
  88 + {
  89 + modulePanel[0].style.pointerEvents="auto";
  90 + modulePanel[0].style.opacity="1";
89 91 }
90 92  
91 93 $rootScope.isLoading = false;
... ... @@ -150,7 +152,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
150 152  
151 153 $scope.initializeAODWindowData($rootScope.MULTI_VIEW_ID, true, undefined);
152 154  
153   - $scope.DisableUI();
  155 + $scope.DisableAODUI($rootScope.MULTI_VIEW_ID);
154 156  
155 157 if ($rootScope.refreshcheck == null) {
156 158 $location.path('/');
... ... @@ -187,12 +189,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
187 189 {
188 190 $('#errorMessage').text(AIAConstants.NO_COURSE_FOUND_MESSAGE);
189 191 $("#messageModal").modal('show');
190   - $scope.EnableUI();
  192 + $scope.EnableAODUI(windowviewid);
191 193  
192 194 }
193 195 },
194 196 function (error) {
195   - $scope.EnableUI();
  197 + $scope.EnableAODUI(windowviewid);
196 198 })
197 199  
198 200 };
... ... @@ -232,28 +234,17 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
232 234  
233 235  
234 236 $timeout(function () {
235   - $scope.EnableUI();
  237 + $scope.EnableAODUI(windowviewid);
236 238 $rootScope.ResetGridListLength();
237 239 }, 400);
238 240  
239 241 }
240 242 $rootScope.ResetGridListLength=function()
241 243 {
242   - var $ua = navigator.userAgent;
243   -
244   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
245   -
246   - var gridheight=screen.height-107;
247   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
248   -
249   - }
250   - else
251   - {
252   - var gridheight=screen.height-252;
253   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
254   -
255   - }
  244 + var innerheight =$(window).innerHeight();
256 245  
  246 + var gridheight=innerheight-115;
  247 + $('#grid-view').css({"height":gridheight,"overflow":"auto","min-height":"200px"});
257 248 }
258 249  
259 250 $scope.openView = function ($event) {
... ... @@ -295,7 +286,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
295 286 }
296 287  
297 288 $scope.loadAdamVideo = function (windowviewid) {
298   - $scope.DisableUI();
  289 + $scope.DisableAODUI(windowviewid);
299 290 $scope.jsPanelID = 'aodImagePanel' + '_' + windowviewid;
300 291 var tittle = $scope.GetAODwindowStoreData(windowviewid, 'currentViewTitle');
301 292  
... ... @@ -393,8 +384,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
393 384  
394 385 $scope.MyAODvideoOnLoad = function (windowviewid)
395 386 {
396   - $scope.EnableUI();
397   - $scope.JsPanelMouseEnter(windowviewid);
  387 + $scope.JsPanelMouseEnter(windowviewid);
  388 + $scope.EnableAODUI(windowviewid);
398 389 }
399 390  
400 391 $scope.JsPanelMouseEnter = function (windowviewid) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
  View file @3705d19
... ... @@ -126,14 +126,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
126 126 }
127 127 }
128 128  
129   - $scope.DisableUI = function () {
130   -
131   - var caImagePanelConetent = document.getElementsByClassName("jsPanel-content");
132   - for (var i = 0; i < caImagePanelConetent.length; i++) {
133   - caImagePanelConetent[i].style.pointerEvents = "none";
134   - caImagePanelConetent[i].style.opacity = "0.7";
  129 + $scope.DisableCAUI = function (windowviewid) {
135 130  
  131 + var modulePanel = $("#caImagePanel_"+windowviewid).find(" .jsPanel-content");
  132 + if(modulePanel.length>0)
  133 + {
  134 + modulePanel[0].style.pointerEvents="none";
  135 + modulePanel[0].style.opacity="0.7";
136 136 }
  137 +
137 138 $rootScope.isLoading = true;
138 139 $('#spinner').css('visibility', 'visible');
139 140  
... ... @@ -142,12 +143,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
142 143 $('#HomeContainerDiv').css('opacity', '0.7');
143 144 }
144 145  
145   - $scope.EnableUI = function () {
  146 + $scope.EnableCAUI = function (windowviewid) {
146 147  
147   - var caImagePanelConetent = document.getElementsByClassName("jsPanel-content");
148   - for (var i = 0; i < caImagePanelConetent.length; i++) {
149   - caImagePanelConetent[i].style.pointerEvents = "auto";
150   - caImagePanelConetent[i].style.opacity = "1";
  148 + var modulePanel = $("#caImagePanel_"+windowviewid).find(" .jsPanel-content");
  149 + if(modulePanel.length>0)
  150 + {
  151 + modulePanel[0].style.pointerEvents="auto";
  152 + modulePanel[0].style.opacity="1";
151 153 }
152 154  
153 155 $rootScope.isLoading = false;
... ... @@ -227,7 +229,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
227 229 }
228 230 },
229 231 function (error) {
230   - $scope.EnableUI();
  232 + $scope.EnableCAUI();
231 233 // handle errors here
232 234 console.log(' $scope.AnimationData = ' + error.statusText);
233 235 });
... ... @@ -277,7 +279,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
277 279  
278 280 $scope.initializeCAWindowData($rootScope.MULTI_VIEW_ID, true, undefined);
279 281  
280   - $scope.DisableUI();
  282 + $scope.DisableCAUI($rootScope.MULTI_VIEW_ID);
281 283  
282 284 if ($rootScope.refreshcheck == null) {
283 285 $location.path('/');
... ... @@ -419,7 +421,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
419 421  
420 422 },
421 423 function (error) {
422   - $scope.EnableUI();
  424 + $scope.EnableCAUI(windowviewid);
423 425 // handle errors here
424 426 console.log(' $scope.AnimationData = ' + error.statusText);
425 427 });
... ... @@ -485,7 +487,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
485 487  
486 488  
487 489 $timeout(function () {
488   - $scope.EnableUI();
  490 + $scope.EnableCAUI(windowviewid);
489 491 $rootScope.ResetGridListLength();
490 492 }, 400);
491 493  
... ... @@ -549,7 +551,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
549 551 if (windowviewid == undefined) // call from also home controller list manager
550 552 windowviewid = $rootScope.MULTI_VIEW_ID;
551 553  
552   - $scope.DisableUI();
  554 + $scope.DisableCAUI(windowviewid);
553 555  
554 556 query.selectedbodyregion = "";
555 557 query.selectedbodysystem = "";
... ... @@ -583,11 +585,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
583 585  
584 586 }
585 587  
586   - $scope.ApplySearch = function (query, windowviewid) {
587   - $scope.DisableUI();
  588 + $scope.ApplySearch = function (query, windowviewid) {
588 589 if (windowviewid == undefined) {
589 590 windowviewid = $rootScope.MULTI_VIEW_ID;
590 591 }
  592 + $scope.DisableCAUI(windowviewid);
591 593  
592 594 setTimeout(function(){
593 595 $scope.FilterSearch(query, windowviewid)
... ... @@ -743,31 +745,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
743 745 }
744 746  
745 747 $timeout(function () {
746   - $scope.EnableUI();
  748 + $scope.EnableCAUI(windowviewid);
747 749 $rootScope.ResetGridListLength();
748 750 }, 500);
749 751 }
750 752  
751 753 $rootScope.ResetGridListLength=function()
752 754 {
753   - var $ua = navigator.userAgent;
754   -
755   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  755 + var innerheight =$(window).innerHeight();
756 756  
757   - var srchHeight=$('.breadcrumb').height();
758   - var gridheight=screen.height-srchHeight-128;
759   - var listheight=screen.height-srchHeight-352;
760   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
761   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
762   - }
763   - else
764   - {
765   - var srchHeight=$('.breadcrumb').height();
766   - var gridheight=screen.height-srchHeight-276;
767   - var listheight=screen.height-srchHeight-500;
768   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
769   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
770   - }
  757 + var srchHeight=$('.breadcrumb').height();
  758 + var gridheight=innerheight-srchHeight-135;
  759 + var listheight=innerheight-srchHeight-358;
  760 + $('#grid-view').css({"height":gridheight,"overflow":"auto","min-height":"160px"});
  761 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto","min-height":"100px"});
771 762 }
772 763 $scope.scroll = function () {
773 764 $("html,body").scrollTop(0);
... ... @@ -857,7 +848,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
857 848 if ($rootScope.isCallFromOtherModule) {
858 849 $scope.CAModuleData = ModuleService.getModuleData("CLINICAL_ANIMATIONS");
859 850 if($scope.CAModuleData.length<1) return;
860   - $scope.DisableUI();
  851 + $scope.DisableCAUI();
861 852 $scope.readyToLoad = true;
862 853 $rootScope.CAWindowLoadComplete = false;
863 854 $scope.wincount = 1;
... ... @@ -895,7 +886,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
895 886  
896 887 }
897 888 else {
898   - $scope.DisableUI();
  889 + $scope.DisableCAUI();
899 890 $scope.openBodyView(null);
900 891 }
901 892 }
... ... @@ -990,7 +981,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
990 981 $location.path('/');
991 982 }
992 983  
993   - $scope.DisableUI();
  984 + $scope.DisableCAUI(windowviewid);
994 985  
995 986 // $scope.jsPanelID = 'caVideoPanel' + '_' + windowviewid;
996 987 //changes to find the id by partail match
... ... @@ -1294,7 +1285,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1294 1285  
1295 1286 $scope.videoOnLoad = function (windowviewid)
1296 1287 {
1297   - $scope.EnableUI();
  1288 + $scope.EnableCAUI(windowviewid);
1298 1289  
1299 1290 if ($rootScope.isCallFromOtherModule) {
1300 1291 //$scope.JsPanelclick(windowviewid);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
  View file @3705d19
... ... @@ -149,14 +149,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
149 149 }
150 150 }
151 151  
152   - $scope.DisableUI = function () {
153   -
154   - var ciImagePanelConetent = document.getElementsByClassName("jsPanel-content");
155   - for (var i = 0; i < ciImagePanelConetent.length; i++) {
156   - ciImagePanelConetent[i].style.pointerEvents = "none";
157   - ciImagePanelConetent[i].style.opacity = "0.7";
  152 + $scope.DisableCIUI = function (windowviewid) {
158 153  
  154 + var modulePanel = $("#ciImagePanel_"+windowviewid).find(" .jsPanel-content");
  155 + if(modulePanel.length>0)
  156 + {
  157 + modulePanel[0].style.pointerEvents="none";
  158 + modulePanel[0].style.opacity="0.7";
159 159 }
  160 +
160 161 $rootScope.isLoading = true;
161 162 $('#spinner').css('visibility', 'visible');
162 163  
... ... @@ -165,12 +166,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
165 166 $('#HomeContainerDiv').css('opacity', '0.7');
166 167 }
167 168  
168   - $scope.EnableUI = function () {
  169 + $scope.EnableCIUI = function (windowviewid) {
169 170  
170   - var ciImagePanelConetent = document.getElementsByClassName("jsPanel-content");
171   - for (var i = 0; i < ciImagePanelConetent.length; i++) {
172   - ciImagePanelConetent[i].style.pointerEvents = "auto";
173   - ciImagePanelConetent[i].style.opacity = "1";
  171 + var modulePanel = $("#ciImagePanel_"+windowviewid).find(" .jsPanel-content");
  172 + if(modulePanel.length>0)
  173 + {
  174 + modulePanel[0].style.pointerEvents="auto";
  175 + modulePanel[0].style.opacity="1";
174 176 }
175 177  
176 178 $rootScope.isLoading = false;
... ... @@ -215,7 +217,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
215 217  
216 218 $scope.initializeCIWindowData($rootScope.MULTI_VIEW_ID, true, undefined);
217 219  
218   - $scope.DisableUI();
  220 + $scope.DisableCIUI($rootScope.MULTI_VIEW_ID);
219 221  
220 222 if ($rootScope.refreshcheck == null) {
221 223 $location.path('/');
... ... @@ -360,7 +362,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
360 362  
361 363 },
362 364 function (error) {
363   - $scope.EnableUI();
  365 + $scope.EnableCIUI(windowviewid);
364 366 // handle errors here
365 367 console.log(' $scope.IllustrationData = ' + error.statusText);
366 368 }
... ... @@ -396,7 +398,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
396 398  
397 399  
398 400 $timeout(function () {
399   - $scope.EnableUI();
  401 + $scope.EnableCIUI(windowviewid);
400 402 $rootScope.ResetGridListLength();
401 403 }, 400);
402 404  
... ... @@ -460,7 +462,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
460 462 if (windowviewid == undefined) // call from also home controller list manager
461 463 windowviewid = $rootScope.MULTI_VIEW_ID;
462 464  
463   - $scope.DisableUI();
  465 + $scope.DisableCIUI(windowviewid);
464 466  
465 467 query.selectedbodyregion = "";
466 468 query.selectedbodysystem = "";
... ... @@ -494,10 +496,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
494 496  
495 497 }
496 498 $scope.ApplySearch = function (query, windowviewid) {
497   - $scope.DisableUI();
  499 +
498 500 if (windowviewid == undefined) {
499 501 windowviewid = $rootScope.MULTI_VIEW_ID;
500 502 }
  503 + $scope.DisableCIUI(windowviewid);
501 504  
502 505 setTimeout(function(){
503 506 $scope.FilterSearch(query, windowviewid)
... ... @@ -687,31 +690,20 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
687 690 }
688 691  
689 692 $timeout(function () {
690   - $scope.EnableUI();
  693 + $scope.EnableCIUI(windowviewid);
691 694 $rootScope.ResetGridListLength();
692 695 }, 400);
693 696 }
694 697  
695 698 $rootScope.ResetGridListLength=function()
696 699 {
697   - var $ua = navigator.userAgent;
  700 + var innerheight =$(window).innerHeight();
698 701  
699   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
700   -
701   - var srchHeight=$('.breadcrumb').height();
702   - var gridheight=screen.height-srchHeight-128;
703   - var listheight=screen.height-srchHeight-352;
704   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
705   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
706   - }
707   - else
708   - {
709   - var srchHeight=$('.breadcrumb').height();
710   - var gridheight=screen.height-srchHeight-276;
711   - var listheight=screen.height-srchHeight-500;
712   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
713   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
714   - }
  702 + var srchHeight=$('.breadcrumb').height();
  703 + var gridheight=innerheight-srchHeight-135;
  704 + var listheight=innerheight-srchHeight-358;
  705 + $('#grid-view').css({"height":gridheight,"overflow":"auto","min-height":"160px"});
  706 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto","min-height":"100px"});
715 707 }
716 708  
717 709 $scope.scroll = function () {
... ... @@ -793,7 +785,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
793 785 if ($rootScope.isCallFromOtherModule) {
794 786 $scope.CIModuleData = ModuleService.getModuleData("CLINICAL_ILLUSTRATIONS");
795 787 if($scope.CIModuleData.length<1) return;
796   - $scope.DisableUI();
  788 + $scope.DisableCIUI();
797 789 $scope.readyToLoad = true;
798 790 $rootScope.CIWindowLoadComplete = false;
799 791 $scope.wincount = 1;
... ... @@ -831,7 +823,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
831 823  
832 824 }
833 825 else {
834   - $scope.DisableUI();
  826 + $scope.DisableCIUI();
835 827 $scope.openBodyView(null);
836 828 }
837 829 }
... ... @@ -1186,7 +1178,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
1186 1178 }
1187 1179  
1188 1180 }
1189   - $scope.EnableUI();
  1181 + $scope.EnableCIUI(windowviewid);
1190 1182 $rootScope.CIWindowLoadComplete = true;
1191 1183  
1192 1184 };
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
  View file @3705d19
... ... @@ -16,6 +16,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
16 16 $rootScope.closeAfterSaveCurriculum = false;
17 17 $rootScope.UnsaveCurriculum = $rootScope.isnewcurriculum == true? true:false;
18 18 $scope.SectionContentForExportCB=[];
  19 + $rootScope.firstSelectedNodeId = null;
19 20 $scope.IsVisible = function () {
20 21 $scope.scroll();
21 22 }
... ... @@ -29,18 +30,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
29 30 }
30 31  
31 32 angular.element(document).ready(function (e) {
32   -
33   - var $ua = navigator.userAgent;
34   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
35   - $("#treecontent").css('height',screen.height-130);
36   - $("#cbdivarea").css('height',screen.height-60);
37   - }
38   - else
39   - {
40   - $("#treecontent").css('height',screen.height-270);
41   - $("#cbdivarea").css('height',screen.height-200);
42   - }
43   -
44 33 $('#sidebar-wrapper').unbind('click');
45 34 $("#sidebar-wrapper").on('click', function (event) {
46 35  
... ... @@ -79,6 +68,18 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
79 68  
80 69 });
81 70  
  71 + $rootScope.ResetCBHeight=function()
  72 + {
  73 + var innerheight =$(window).innerHeight();
  74 + $("#treecontent").css('height',innerheight-125);
  75 + $("#cbdivarea").css('height',innerheight-57);
  76 +
  77 + }
  78 + $rootScope.ResetCBListHeight=function()
  79 + {
  80 + var innerheight =$(window).innerHeight();
  81 + $("#cblist").css('height',innerheight-110);
  82 + }
82 83 $scope.CBDisableUI = function () {
83 84  
84 85 $rootScope.isLoading = true;
... ... @@ -155,13 +156,14 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
155 156  
156 157 }
157 158  
158   - $rootScope.firstSelectedNodeId = null;
  159 +
159 160 //load json data
160 161 $scope.loadCurriculumBuiderData = function () {
161 162  
162 163 if ($rootScope.refreshcheck == null) {
163 164 $location.path('/');
164   - }
  165 + }
  166 + $rootScope.ResetCBListHeight();
165 167 //get current path
166 168 var currentURL = $location.path();
167 169 var selectedModuleName = '';
... ... @@ -700,7 +702,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
700 702 $scope.openCBJsPanel = function () {
701 703 $scope.CBDisableUI();
702 704 $rootScope.isnewcurriculum = false;
703   -
  705 + $rootScope.ResetCBHeight();
704 706 $('#jstree').empty();
705 707 var $e1 = $('<ul><li>'
706 708 + '<span id="{{cbTreeFirstID}}">{{cbTreeFirstLabel}}</span>'
... ... @@ -720,7 +722,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
720 722 $scope.openCBEditorPanel = function () {
721 723  
722 724 var jsContentURL = 'app/views/CBuild/curriculum-builder-TinyMCEjspanel.html';
723   - $.jsPanel({
  725 + $scope.jsPanelCB = $.jsPanel({
724 726 id: 'CBTinyMCEPanel',
725 727 selector: '.CBBodyView',
726 728 theme: 'success',
... ... @@ -738,20 +740,34 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
738 740 draggable: "disabled",
739 741 controls: { buttons: 'closeonly' },
740 742 size: { width: 820, height: 450 },
  743 + onnormalized:function (panel) {
  744 + var canvasDIvHeight = $("#CBTinyMCEPanel .jsPanel-content").height();
  745 + $("#cbEditorRightSideBar").css('height',canvasDIvHeight-35);
  746 + $(".tox-tinymce").css('height',canvasDIvHeight-52);
  747 + },
  748 + resizable: {
  749 + minWidth: 610,
  750 + minHeight: 400,
  751 + start:function(event, ui)
  752 + {
  753 + $("#CBTextArea_ifr").css("display", "block");
  754 + },
  755 + stop: function (event, ui) {
  756 + var canvasDIvHeight = $("#CBTinyMCEPanel .jsPanel-content").height();
  757 + $("#cbEditorRightSideBar").css('height',canvasDIvHeight-35);
  758 + $(".tox-tinymce").css('height',canvasDIvHeight-52);
  759 +
  760 + }
  761 + },
741 762  
742 763 });
743 764  
  765 +
744 766 $timeout(function () {
745   - $rootScope.resetMenuOptionOnClick("CBTinyMCEPanel");
746   - $("#CBTinyMCEPanel").resize(function(){
747   - $("#CBTextArea_ifr").css("display", "block");
748   - });
749   -
750   - // $('#CBTinyMCEPanel').draggable({ containment: '#cbdivarea', scroll: false });
751   -
  767 + $scope.jsPanelCB.normalize();
  768 + $rootScope.resetMenuOptionOnClick("CBTinyMCEPanel");
752 769 }, 200);
753 770  
754   -
755 771 }
756 772  
757 773 $scope.myeditorclick = function () {
... ... @@ -783,7 +799,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
783 799  
784 800 }
785 801  
786   - $scope.openTinyMCE = function (nodeid) {
  802 + $scope.openTinyMCE = function (nodeid) {
787 803 if ($scope.Currentselectednodeid == undefined || $scope.Currentselectednodeid != nodeid) {
788 804 $scope.CBDisableUI();
789 805 console.log("instance create for id : " + nodeid);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @3705d19
... ... @@ -151,7 +151,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
151 151 'totalstructureLm': 0,
152 152 'intervalObject': null,
153 153 'isannotationReload': false,
154   - 'isCanvasReset': false
  154 + 'isCanvasReset': false,
  155 + 'keyctrl': false,
155 156  
156 157 };
157 158 return windata;
... ... @@ -409,20 +410,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
409 410  
410 411 };
411 412  
412   - $scope.DisableUI = function () {
  413 + $scope.DisableDAUI = function (windowviewid) {
413 414  
414 415 //enable daBodyViewDiv which was disabled on thumbnail click so need not bother where to enable
415 416 //as jspanel disable/enable is working for all features
416 417 document.getElementById('daBodyview').style.pointerEvents = "auto";
417 418 document.getElementById('daBodyview').style.opacity = "1";
418 419  
419   -
420   -
421   - var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
422   - for (var i = 0; i < daImagePanelConetent.length; i++) {
423   - daImagePanelConetent[i].style.pointerEvents = "none";
424   - daImagePanelConetent[i].style.opacity = "0.7";
425   -
  420 + var modulePanel = $("#daImagePanel_"+windowviewid).find(" .jsPanel-content");
  421 + if(modulePanel.length>0)
  422 + {
  423 + modulePanel[0].style.pointerEvents="none";
  424 + modulePanel[0].style.opacity="0.7";
426 425 }
427 426 $rootScope.isLoading = true;
428 427 $('#spinner').css('visibility', 'visible');
... ... @@ -432,25 +431,26 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
432 431 $('#HomeContainerDiv').css('opacity', '0.7');
433 432 }
434 433  
435   - $scope.EnableUI = function () {
  434 + $scope.EnableDAUI = function (windowviewid) {
436 435  
437 436 document.getElementById('index').style.pointerEvents = "auto";
438 437 document.getElementById('index').style.opacity = "1";
439 438  
440   - var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
441   - for (var i = 0; i < daImagePanelConetent.length; i++) {
442   - var dapanal=daImagePanelConetent[i].parentElement;
443   - var panelpointevent = $("#"+ dapanal.id).css('pointer-events');
  439 + var modulePanel = $("#daImagePanel_"+windowviewid).find(" .jsPanel-content");
  440 + if(modulePanel.length>0)
  441 + {
  442 + var panelpointevent = $("#daImagePanel_"+windowviewid).css('pointer-events');
444 443 if(panelpointevent=="none")
445 444 {
446 445 //using for slide lock in cb
447   - daImagePanelConetent[i].style.pointerEvents = "none";
  446 + modulePanel[0].style.pointerEvents="none";
448 447 }
449 448 else
450 449 {
451   - daImagePanelConetent[i].style.pointerEvents = "auto";
  450 + modulePanel[0].style.pointerEvents="auto";
452 451 }
453   - daImagePanelConetent[i].style.opacity = "1";
  452 +
  453 + modulePanel[0].style.opacity="1";
454 454 }
455 455  
456 456 $rootScope.isLoading = false;
... ... @@ -531,7 +531,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
531 531 }
532 532 else
533 533 {
534   - $scope.EnableUI();
  534 + $scope.EnableDAUI($rootScope.MULTI_VIEW_ID);
535 535 $rootScope.disableAnnotationTB = false;
536 536 $rootScope.MenuModuleName = "DA";
537 537 $scope.SetwindowStoreData($rootScope.MULTI_VIEW_ID,'currentViewTitle',$event.currentTarget.textContent);
... ... @@ -659,7 +659,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
659 659 }
660 660 )
661 661  
662   - $scope.EnableUI();
  662 + $scope.EnableDAUI(windowviewid);
663 663 //push the details of open module in array $rootScope.openModules
664 664 $rootScope.openModules.push({ "ModuleId": 1 });
665 665 }
... ... @@ -671,7 +671,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
671 671 $scope.DAModuleData = ModuleService.getModuleData("DISSECTIBLE_ANATOMY");
672 672 if($scope.DAModuleData.length<1) return;
673 673 $scope.ScopeVariablesDeclare();
674   - $scope.DisableUI();
  674 + $scope.DisableDAUI();
675 675 $scope.readyToLoad=true;
676 676 $rootScope.DAWindowLoadComplete = false;
677 677 $scope.wincount=1;
... ... @@ -715,7 +715,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
715 715 }
716 716 else {
717 717 $scope.ScopeVariablesDeclare();
718   - $scope.DisableUI();
  718 + $scope.DisableDAUI();
719 719 $scope.openBodyView(null);
720 720 }
721 721  
... ... @@ -996,7 +996,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
996 996  
997 997 $scope.SetwindowStoreData(windowviewid, 'maximised',true);
998 998 $scope.SetwindowStoreData(windowviewid, 'minimised',false);
999   - var extraheight=$('#dastickeyarea').height()+10;
  999 + var extraheight=$('#dastickeyarea').height()+5;
1000 1000 var extrawidth=$('.tools').width()+15;
1001 1001 var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
1002 1002 var canvasDIvWidth = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -1030,7 +1030,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1030 1030  
1031 1031 $scope.SetwindowStoreData(windowviewid, 'minimised',false);
1032 1032 $scope.SetwindowStoreData(windowviewid, 'maximised',false);
1033   - var extraheight=$('#dastickeyarea').height()+10;
  1033 + var extraheight=$('#dastickeyarea').height()+5;
1034 1034 var extrawidth=$('.tools').width()+15;
1035 1035 var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
1036 1036 var canvasDIvWidth = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -1056,7 +1056,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1056 1056 var pnlName=event.currentTarget.id;
1057 1057 var len = (pnlName).split("_").length;
1058 1058 var windowviewid = (pnlName).split("_")[len - 1];
1059   - var extraheight=$('#dastickeyarea').height()+10;
  1059 + var extraheight=$('#dastickeyarea').height()+5;
1060 1060 var extrawidth=$('.tools').width()+15;
1061 1061 var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height();
1062 1062 var canvasDIvWidth = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -1237,7 +1237,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1237 1237 }
1238 1238 // we are loading most of alll data used in DA by this function so that at the time of any functionality delay in data laod will not happened.
1239 1239 $scope.loadView = function (windowviewid) {
1240   - $scope.DisableUI();
  1240 + $scope.DisableDAUI(windowviewid);
1241 1241 var bodyViewId=$scope.GetwindowStoreData(windowviewid,'voId');
1242 1242 if (document.getElementById('daViewDA_'+windowviewid) != null) {
1243 1243 $scope.loadDAView(bodyViewId, windowviewid);
... ... @@ -1481,13 +1481,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1481 1481 var la;
1482 1482 var rootScope = angular.element(document.getElementById("bo")).scope();
1483 1483 rootScope.$apply(function () {
1484   - $scope.DisableUI();
  1484 + $scope.DisableDAUI(windviewid);
1485 1485 })
1486 1486 var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
1487 1487 scope.$apply(function () {
1488 1488  
1489 1489 if ($scope.GetwindowStoreData(windviewid,'isTransparencyActivated')) {
1490   - $scope.EnableUI();
  1490 + $scope.EnableDAUI(windviewid);
1491 1491 }
1492 1492 la =$scope.GetwindowStoreData(windviewid,'totalLayers');
1493 1493 var slideVal = la - ui.value;
... ... @@ -1619,6 +1619,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1619 1619 $("#btnStrutureBox").attr("id", "btnStrutureBox_" + windowviewid);
1620 1620 $scope.btnStrutureBoxID = "btnStrutureBox_" + windowviewid;
1621 1621  
  1622 + $("#multiannotation").attr("id", "multiannotation_" + windowviewid);
  1623 +
1622 1624 $("#typedTermName").attr("id", "typedTermName_" + windowviewid);
1623 1625 $scope.typedTermNameID = "typedTermName_" + windowviewid;
1624 1626  
... ... @@ -1798,7 +1800,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
1798 1800 }
1799 1801 }
1800 1802  
1801   - $scope.EnableUI();
  1803 + $scope.EnableDAUI(e.data.winId);
1802 1804  
1803 1805 }
1804 1806  
... ... @@ -2012,7 +2014,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2012 2014 // Function to call CB term data
2013 2015  
2014 2016 $scope.loadDAonCBSlideChange = function (windowviewid) {
2015   - $scope.DisableUI();
  2017 + $scope.DisableDAUI(windowviewid);
2016 2018  
2017 2019 $scope.SetwindowStoreData(windowviewid,'isHighlightBodyByBodySystem',false);
2018 2020 $scope.SetwindowStoreData(windowviewid,'isbodySystemHighlight',false);
... ... @@ -2173,7 +2175,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2173 2175 //DA > Annotation's Line should not displayed.
2174 2176 $('#bord_'+windowviewid).css("display", "none");
2175 2177  
2176   - $scope.DisableUI();
  2178 + $scope.DisableDAUI(windowviewid);
2177 2179  
2178 2180 //redraw body of respective layer
2179 2181 var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
... ... @@ -2216,7 +2218,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2216 2218 //calculate coordinates for body region images
2217 2219 $scope.CalculateImageCordinates = function (viewOrientationId,windowviewid) {
2218 2220  
2219   - $scope.DisableUI();
  2221 + $scope.DisableDAUI(windowviewid);
2220 2222  
2221 2223 // $scope.layerInfoForModesty = [];
2222 2224 $scope.SetwindowStoreData(windowviewid,'layerInfoForModesty',[]);
... ... @@ -2239,7 +2241,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2239 2241 $scope.BodyRegionCordinatesData = []; // create an empty array
2240 2242 $scope.SetwindowStoreData(windowviewid,'BodyRegionCordinatesData',[]);
2241 2243  
2242   - var extraheight=$('#dastickeyarea').height()+10;
  2244 + var extraheight=$('#dastickeyarea').height()+5;
2243 2245 var extrawidth=$('.tools').width()+15;
2244 2246 var canvasDIvHeight = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
2245 2247 var canvasDIvWidth = $('#daImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -2500,7 +2502,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2500 2502  
2501 2503 $('#canvasDivDA_' + windowviewid).scrollTop(50);
2502 2504  
2503   - $scope.EnableUI();
  2505 + $scope.EnableDAUI(windowviewid);
2504 2506 //Dated:16-07-2016 Issue #4957 :While selecting the Zoom-in\Zoom-out button scroll should be go on top.
2505 2507 // #4976 :While changing gender male to female scroll bar is going on top.
2506 2508 var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
... ... @@ -2801,7 +2803,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2801 2803 var touchdragging = false;
2802 2804 $scope.DrawMirroredImage = function (h, w, x, y, src, bodyRegionId, isMaskImage, windowviewid) {
2803 2805  
2804   - $scope.DisableUI();
  2806 + $scope.DisableDAUI(windowviewid);
2805 2807  
2806 2808 var FlipedImgCanvas = document.createElement('canvas');
2807 2809 FlipedImgCanvas.height = h;
... ... @@ -2985,7 +2987,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
2985 2987  
2986 2988 }
2987 2989  
2988   - $scope.DisableUI();
  2990 + $scope.DisableDAUI(windowviewid);
2989 2991  
2990 2992 var isHighLight=$scope.GetwindowStoreData(windowviewid,'isHighLight');
2991 2993 var isGenderChnage = $scope.GetwindowStoreData(windowviewid,'isGenderChnage');
... ... @@ -3000,14 +3002,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3000 3002  
3001 3003 }
3002 3004 else if ($scope.GetwindowStoreData(windowviewid, 'isExtract') == true) {
3003   - $scope.DisableUI();
  3005 + $scope.DisableDAUI(windowviewid);
3004 3006 $scope.highLightBody(windowviewid);
3005 3007 }
3006 3008 else if (isHighLight == true || (isListManagerSelected == true) || ((isGenderChnage == true) && (isHighLight == true))
3007 3009 || ((isViewChange == true) && (isHighLight == true)) || isHighlightBodyByBodySystem == true) {
3008 3010  
3009 3011 $scope.SetwindowStoreData(windowviewid, 'isHighLight', true);
3010   - $scope.DisableUI();
  3012 + $scope.DisableDAUI(windowviewid);
3011 3013 $scope.highLightBody(windowviewid);
3012 3014 if ($scope.GetwindowStoreData(windowviewid, 'isTransparent') == true && isLexiconReload==false) {
3013 3015 $scope.CalculateDimensionsAndDrawTBox(windowviewid);
... ... @@ -3023,7 +3025,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3023 3025 }
3024 3026 //This block is executed when normal body is created and no further process like highlight,extract, etc
3025 3027  
3026   - $scope.EnableUI();
  3028 + $scope.EnableDAUI(windowviewid);
3027 3029  
3028 3030 }
3029 3031 }
... ... @@ -3069,8 +3071,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3069 3071 $('#typedTermName_' + windowviewid).val('');
3070 3072 $("#typedTermName_" + windowviewid).attr("name", '0');
3071 3073 //birendra
  3074 + var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');//for iPad
3072 3075 // for mac os Command key use for multi selection
3073   - if (evt.ctrlKey || evt.metaKey) {
  3076 + if (evt.ctrlKey || evt.metaKey || iskeyctrlActive) {
3074 3077 $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
3075 3078 }
3076 3079 else
... ... @@ -3271,7 +3274,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3271 3274 }
3272 3275  
3273 3276 $scope.DrawImage = function (h, w, x, y, src, bodyRegionId, isMaskImage, windowviewid) {
3274   - $scope.DisableUI();
  3277 + $scope.DisableDAUI(windowviewid);
3275 3278  
3276 3279 var imgCanvas = document.createElement('canvas');
3277 3280  
... ... @@ -3483,7 +3486,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3483 3486  
3484 3487 }
3485 3488  
3486   - $scope.DisableUI();
  3489 + $scope.DisableDAUI(windowviewid);
3487 3490  
3488 3491 var isHighLight=$scope.GetwindowStoreData(windowviewid,'isHighLight');
3489 3492 var isGenderChnage = $scope.GetwindowStoreData(windowviewid,'isGenderChnage');
... ... @@ -3498,7 +3501,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3498 3501  
3499 3502 }
3500 3503 else if (isExtract == true) {
3501   - $scope.DisableUI();
  3504 + $scope.DisableDAUI(windowviewid);
3502 3505 $scope.highLightBody(windowviewid);
3503 3506  
3504 3507 }
... ... @@ -3507,7 +3510,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3507 3510  
3508 3511 $scope.SetwindowStoreData(windowviewid,'isHighLight',true);
3509 3512  
3510   - $scope.DisableUI();
  3513 + $scope.DisableDAUI(windowviewid);
3511 3514 $scope.highLightBody(windowviewid);
3512 3515  
3513 3516 if ($scope.GetwindowStoreData(windowviewid, 'isTransparent') == true && isLexiconReload==false) {
... ... @@ -3524,7 +3527,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3524 3527 $scope.ShowCBDataBodyView(windowviewid);
3525 3528 }
3526 3529 //This block is executed when normal body is created and no further process like highlight,extract, etc
3527   - $scope.EnableUI();
  3530 + $scope.EnableDAUI(windowviewid);
3528 3531 }
3529 3532  
3530 3533 }
... ... @@ -3568,8 +3571,9 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
3568 3571 $('#typedTermName_' + windowviewid).val('');
3569 3572 $("#typedTermName_" + windowviewid).attr("name", '0');
3570 3573 //birendra
  3574 + var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');//for iPad
3571 3575 // for mac os Command key use for multi selection
3572   - if (evt.ctrlKey || evt.metaKey) {
  3576 + if (evt.ctrlKey || evt.metaKey ||iskeyctrlActive) {
3573 3577 $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
3574 3578  
3575 3579 console.log('CTRL ON')
... ... @@ -4116,7 +4120,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4116 4120 $scope.SetwindowStoreData(windowviewid, 'CanvasDivLeftPosition', $("#canvasDivDA_" + windowviewid).scrollLeft());
4117 4121 }
4118 4122  
4119   - $scope.EnableUI();
  4123 + $scope.EnableDAUI(windowviewid);
4120 4124 ReturnMasData=[];
4121 4125 ExtractMasData=[];
4122 4126  
... ... @@ -4284,7 +4288,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4284 4288 });
4285 4289 }
4286 4290 else {
4287   - $scope.EnableUI();
  4291 + $scope.EnableDAUI(windowviewid);
4288 4292 }
4289 4293  
4290 4294 worker.onmessage = function (e) {
... ... @@ -4365,11 +4369,11 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4365 4369 $('#canvasDivDA_' + windowviewid).scrollLeft($scope.imageHorizontlScrollPosition);
4366 4370  
4367 4371 }
4368   - $scope.EnableUI();
  4372 + $scope.EnableDAUI(windowviewid);
4369 4373 }
4370 4374 else if (isHighlightBodyByBodySystem == true || isListManagerSelected == true) {
4371 4375  
4372   - $scope.EnableUI();
  4376 + $scope.EnableDAUI(windowviewid);
4373 4377 }
4374 4378 else
4375 4379 {
... ... @@ -4393,7 +4397,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4393 4397 }
4394 4398 }
4395 4399  
4396   - $scope.EnableUI();
  4400 + $scope.EnableDAUI(windowviewid);
4397 4401  
4398 4402 // terminate extract and term-number worker instances
4399 4403 if ($scope.runningWorkers != null || $scope.runningWorkers != undefined) {
... ... @@ -4424,7 +4428,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4424 4428 termSelectedName = "Skin";
4425 4429 }
4426 4430 if (document.getElementById('txtLayerNumberDA_'+windowviewid).value == "Skin" || termSelectedName == "Skin") {
4427   - $scope.EnableUI();
  4431 + $scope.EnableDAUI(windowviewid);
4428 4432 }
4429 4433 }, 100);
4430 4434  
... ... @@ -4436,7 +4440,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4436 4440  
4437 4441 $scope.isScrolledToHighlightedBR = false;
4438 4442 //disable the background till the system gets highlighted.
4439   - $scope.DisableUI();
  4443 + $scope.DisableDAUI(windowviewid);
4440 4444  
4441 4445 $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('disable');
4442 4446  
... ... @@ -4472,7 +4476,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4472 4476 $scope.removeCurrentHighlightedBodySystem(windowviewid);
4473 4477  
4474 4478 $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
4475   - $scope.EnableUI();
  4479 + $scope.EnableDAUI(windowviewid);
4476 4480  
4477 4481 $rootScope.message = AIAConstants.NO_BODY_SYSTEM_AVAILABLE;
4478 4482  
... ... @@ -4678,13 +4682,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4678 4682 }
4679 4683 }
4680 4684 else {
4681   - $scope.EnableUI();
  4685 + $scope.EnableDAUI(windowviewid);
4682 4686 $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
4683 4687 }
4684 4688  
4685 4689 });
4686 4690 $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
4687   - $scope.EnableUI();
  4691 + $scope.EnableDAUI(windowviewid);
4688 4692 }
4689 4693  
4690 4694 }
... ... @@ -4692,7 +4696,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4692 4696 function (error) {
4693 4697 console.log(' Error in getting term data = ' + error);
4694 4698 $("#layerChangeSliderDA_" + windowviewid + '.vert_slider').slider('enable');
4695   - $scope.EnableUI();
  4699 + $scope.EnableDAUI(windowviewid);
4696 4700 //remove existing data and draw fresh data
4697 4701 $scope.removeCurrentHighlightedBodySystem(windowviewid);
4698 4702  
... ... @@ -4750,7 +4754,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4750 4754 $timeout(function () { $scope.HighlightBodyByTermList(multiTermList,windowviewid); }, 50);
4751 4755 }
4752 4756 else {
4753   - $scope.EnableUI();
  4757 + $scope.EnableDAUI(windowviewid);
4754 4758 }
4755 4759 }
4756 4760  
... ... @@ -4869,7 +4873,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
4869 4873  
4870 4874 //layer change function
4871 4875 $scope.LayerChange = function (windowviewid) {
4872   - $scope.DisableUI();
  4876 + $scope.DisableDAUI(windowviewid);
4873 4877 $rootScope.CloseListManager();
4874 4878 $scope.isLayerChange = true;
4875 4879  
... ... @@ -5007,7 +5011,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5007 5011 }
5008 5012  
5009 5013 else {
5010   - $scope.EnableUI();
  5014 + $scope.EnableDAUI(windowviewid);
5011 5015 }
5012 5016 })
5013 5017  
... ... @@ -5026,7 +5030,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5026 5030 $scope.SetwindowStoreData(windowviewid,'currentLayerNumber',parseInt($('#txtLayerNumberDA_' + windowviewid).val()));
5027 5031 }
5028 5032  
5029   - $scope.DisableUI();
  5033 + $scope.DisableDAUI(windowviewid);
5030 5034 var canDiv = document.getElementById('canvasDivDA_' + windowviewid);
5031 5035 if($rootScope.globalSetting.onLayerChange)
5032 5036 {
... ... @@ -5143,7 +5147,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5143 5147  
5144 5148 }
5145 5149  
5146   - $scope.EnableUI();
  5150 + $scope.EnableDAUI(windowviewid);
5147 5151 }
5148 5152  
5149 5153 $('layerChangeSlider').slider().on('slideStop', function (ev) {
... ... @@ -5165,6 +5169,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5165 5169 $scope.createDynamicSpeechBubble = function (event, x, y, isAnnotationNotForTBox, tipx, tipy,windowviewid, termNumber) {
5166 5170  
5167 5171 var termNumber=parseInt(termNumber);
  5172 + var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');//for iPad
5168 5173 if (isAnnotationNotForTBox == true) {
5169 5174 if ($scope.MultiLanguageAnnationArray.length > 1) {
5170 5175 $scope.longestAnnotation = $scope.MultiLanguageAnnationArray.reduce(function (firstAnnotation, seconAnnotation) { return firstAnnotation.length > seconAnnotation.length ? firstAnnotation : seconAnnotation; });
... ... @@ -5176,8 +5181,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5176 5181 //1. In transparency box we shows two annotation at a time, so we need to decide the max length of annotation in btween two annotation because based on that
5177 5182 // we decide the size of speech bubble
5178 5183 //2.
5179   -
5180   - if (event.ctrlKey || event.metaKey || event == "CBAnnotation") {
  5184 +
  5185 + if (event.ctrlKey || event.metaKey || event == "CBAnnotation" || iskeyctrlActive) {
5181 5186 console.log('ctrl pressed');
5182 5187 $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',true);
5183 5188 //2.1 create unique speech bubbles
... ... @@ -5454,7 +5459,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
5454 5459 else {
5455 5460 $scope.longest_annotationT1 = $scope.annotationTextArrayT1.reduce(function (a, b) { return a.length > b.length ? a : b; });
5456 5461 $scope.longest_annotationT2 = $scope.annotationTextArrayT2.reduce(function (a, b) { return a.length > b.length ? a : b; });
5457   - if (event.ctrlKey || event.metaKey || event == "CBAnnotation") {
  5462 + if (event.ctrlKey || event.metaKey || event == "CBAnnotation" ||iskeyctrlActive) {
5458 5463  
5459 5464 $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', true);
5460 5465  
... ... @@ -6410,7 +6415,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6410 6415 }
6411 6416 else {
6412 6417  
6413   - $scope.DisableUI();
  6418 + $scope.DisableDAUI(windowviewid);
6414 6419  
6415 6420 $('#btnTranparency_' + windowviewid).removeClass('btn-black');
6416 6421 $('#btnTranparency_' + windowviewid).addClass('tButtonActive');
... ... @@ -6742,7 +6747,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
6742 6747 else {
6743 6748 //when user draw TB outside body than no bodyRegion
6744 6749 //is covred and nothing is drawn so the function is not called in which we are enabling UI
6745   - $scope.EnableUI();
  6750 + $scope.EnableDAUI(windowviewid);
6746 6751 }
6747 6752 })
6748 6753  
... ... @@ -7019,7 +7024,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7019 7024 else {
7020 7025 //when user draw TB outside body than no bodyRegion
7021 7026 //is covred and nothing is drawn so the function is not called in which we are enabling UI
7022   - $scope.EnableUI();
  7027 + $scope.EnableDAUI(windowviewid);
7023 7028 }
7024 7029  
7025 7030 })
... ... @@ -7833,7 +7838,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
7833 7838 }
7834 7839  
7835 7840 $scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', true);
7836   - $scope.EnableUI();
  7841 + $scope.EnableDAUI(windowviewid);
7837 7842  
7838 7843 $scope.SetwindowStoreData(windowviewid, 'isZoomed',false);
7839 7844 }
... ... @@ -8153,8 +8158,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8153 8158 var windowviewid = (evt.currentTarget.id).split("_")[len-1];
8154 8159 var pixelData;
8155 8160 var pixelDataTrans;
8156   -
8157   - if (evt.ctrlKey || evt.metaKey) {
  8161 + var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');//for iPad
  8162 + if (evt.ctrlKey || evt.metaKey || iskeyctrlActive) {
8158 8163 $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', true);
8159 8164 }
8160 8165 else
... ... @@ -8375,7 +8380,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
8375 8380 $rootScope.UnsaveCurriculum = true;
8376 8381 var len= (evt.target.id).split("_").length;
8377 8382 var windowviewid = (evt.target.id).split("_")[len-1];
8378   - if (evt.ctrlKey || evt.metaKey) {
  8383 + var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');//for iPad
  8384 + if (evt.ctrlKey || evt.metaKey ||iskeyctrlActive) {
8379 8385 $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', true);
8380 8386 }
8381 8387 else
... ... @@ -9207,10 +9213,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9207 9213 }
9208 9214  
9209 9215 $scope.enableZoom = function (event) {
9210   - $scope.DisableUI();
9211 9216 $rootScope.UnsaveCurriculum = true;
9212 9217 var len = (event.currentTarget.id).split("_").length;
9213   - var windowviewid = (event.currentTarget.id).split("_")[len-1];
  9218 + var windowviewid = (event.currentTarget.id).split("_")[len-1];
  9219 + $scope.DisableDAUI(windowviewid);
9214 9220 $("#OnIdentify").removeClass("annotationtoolbartab");
9215 9221 $("#DrawMode").removeClass("annotationtoolbartab");
9216 9222 $('.btnCursor').removeClass('activebtncolor');
... ... @@ -9259,12 +9265,16 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9259 9265 $scope.SetwindowStoreData(windowviewid,'zoomInOut',25);
9260 9266 $('#zoomValueDA_' + windowviewid).attr('value', $scope.GetwindowStoreData(windowviewid,'zoomInOut'));
9261 9267 }
  9268 + $('#canvasDA_' + windowviewid).removeLayers();//remove all old shape
  9269 + //var sktch = $("#canvasPaintDA_" + windowviewid).sketch();
  9270 + $("#canvasPaintDA_" + windowviewid).sketch().actions = [];//remove old paint data
9262 9271  
9263 9272 var canDiv = document.getElementById('canvasDivDA_' + windowviewid);
9264 9273 var canDivChildCount = canDiv.childElementCount;
9265 9274 if (canDivChildCount > 0) {
9266 9275 canDiv.innerHTML = '';
9267 9276 }
  9277 +
9268 9278 $scope.SetwindowStoreData(windowviewid, 'isCanvasReset',true);
9269 9279 $scope.SetwindowStoreData(windowviewid, 'isCBAnnotationActive',false);
9270 9280 $scope.SetwindowStoreData(windowviewid, 'annotationData', {shapeStates:[],paintCanvasState:[]});
... ... @@ -9285,7 +9295,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9285 9295 }
9286 9296  
9287 9297 $scope.flushCanvas = function (windowviewid) {
9288   - $scope.DisableUI();
  9298 + $scope.DisableDAUI(windowviewid);
9289 9299 var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
9290 9300 var endIndex = 0;
9291 9301 var startIndex = 0;
... ... @@ -9362,7 +9372,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9362 9372 $scope.SetwindowStoreData(windowviewid, 'mode', "HIGHLIGHT");
9363 9373 $scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', true);
9364 9374  
9365   - $scope.DisableUI();
  9375 + $scope.DisableDAUI(windowviewid);
9366 9376  
9367 9377 $('#btnTranparency_' + windowviewid).removeAttr('disabled', 'disabled');
9368 9378  
... ... @@ -9426,7 +9436,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9426 9436 $('#canvasDivDA_' + windowviewid).scrollTop(CanvasDivTopPosition);
9427 9437 $('#canvasDivDA_' + windowviewid).scrollLeft(CanvasDivLeftPosition);
9428 9438  
9429   - $scope.EnableUI();
  9439 + $scope.EnableDAUI(windowviewid);
9430 9440 }
9431 9441  
9432 9442 $scope.enableNormalMode = function (windowviewid) {
... ... @@ -9520,9 +9530,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9520 9530 $scope.enableExtract = function (isCalledFromButton,windowviewid) {
9521 9531 $scope.SetwindowStoreData(windowviewid, 'mode', "EXTRACT");
9522 9532  
9523   - $scope.DisableUI();
9524   -
9525   - console.log('isCalledFromButton= ' + isCalledFromButton);
  9533 + $scope.DisableDAUI(windowviewid);
9526 9534  
9527 9535 var CanvasDivLeftPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivLeftPosition');
9528 9536 var CanvasDivTopPosition = $scope.GetwindowStoreData(windowviewid, 'CanvasDivTopPosition');
... ... @@ -9605,7 +9613,26 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9605 9613 }
9606 9614 }
9607 9615  
9608   - $scope.EnableUI();
  9616 + $scope.EnableDAUI(windowviewid);
  9617 + }
  9618 +
  9619 + $scope.MultipleAnnotation = function (event) {
  9620 + var len= (event.currentTarget.id).split("_").length;
  9621 + var windowviewid = (event.currentTarget.id).split("_")[len-1];
  9622 +
  9623 + //set true to false or vice versa
  9624 + var iskeyctrlActive= $scope.GetwindowStoreData(windowviewid, 'keyctrl');
  9625 +
  9626 + if(iskeyctrlActive)
  9627 + {
  9628 + $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText");
  9629 + }
  9630 + else
  9631 + {
  9632 + $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText");
  9633 + }
  9634 +
  9635 + $scope.SetwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive);
9609 9636 }
9610 9637  
9611 9638 $scope.enableShowHideStructureBox = function (event) {
... ... @@ -9767,7 +9794,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9767 9794  
9768 9795  
9769 9796 if (colorMode != undefined || colorMode != null) {
9770   - $scope.DisableUI();
  9797 + $scope.DisableDAUI(windowviewid);
9771 9798 var zeroPoint = new Point();
9772 9799  
9773 9800 DAData.applyFilter(DAData, DAData.rect, zeroPoint, colorMode);
... ... @@ -9873,13 +9900,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9873 9900 var isListManagerAlreadySelected = $scope.GetwindowStoreData(windowviewid, 'isListManagerAlreadySelected');
9874 9901 var isLexiconReload= $scope.GetwindowStoreData(windowviewid, 'isannotationReload');
9875 9902 if (((isHighlightBodyByBodySystem == true)) || (isbodySystemHighlight == true && isHighLight == true)) {
9876   - $scope.DisableUI();
  9903 + $scope.DisableDAUI(windowviewid);
9877 9904 $timeout(function () { $scope.HighlightBodyByTermListForBodySystem(null, windowviewid) }, 100);
9878 9905 }
9879 9906 else if (($rootScope.isCallFromOtherModule == true)||isLexiconReload==true || (isListManagerSelected == true) || (previousHighlightList != null && previousHighlightList.length > 0) && (isGenderChnage == true || isViewChange == true) || isListManagerAlreadySelected == true) {
9880 9907  
9881 9908 $timeout(function () {
9882   - $scope.DisableUI();
  9909 + $scope.DisableDAUI(windowviewid);
9883 9910 if (AllTerms != undefined && AllTerms.length > 0) {
9884 9911 $scope.HighlightBodyByTermList(AllTerms, windowviewid);
9885 9912 }
... ... @@ -9897,7 +9924,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9897 9924 $scope.createTermListByPreviousTermsAndHighlight(windowviewid);
9898 9925 }
9899 9926  
9900   - $scope.EnableUI();
  9927 + $scope.EnableDAUI(windowviewid);
9901 9928 }
9902 9929 }, 500);
9903 9930  
... ... @@ -9909,7 +9936,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9909 9936 //for highlight when highlight button is clicked the ui got disabled,
9910 9937 //now highlight is completed so enalbe UI
9911 9938  
9912   - $scope.EnableUI();
  9939 + $scope.EnableDAUI(windowviewid);
9913 9940  
9914 9941 }
9915 9942  
... ... @@ -9928,7 +9955,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9928 9955 console.log('1. $rootScope.isExtract=true and previousHighlightList != null')
9929 9956  
9930 9957 $timeout(function () {
9931   - $scope.DisableUI();
  9958 + $scope.DisableDAUI(windowviewid);
9932 9959 $scope.HighlightBodyOnExtract(windowviewid)
9933 9960 }, 50);
9934 9961 }
... ... @@ -9936,7 +9963,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9936 9963 console.log('1. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
9937 9964  
9938 9965 $timeout(function () {
9939   - $scope.DisableUI();
  9966 + $scope.DisableDAUI(windowviewid);
9940 9967 $scope.HighlightBodyOnExtract(windowviewid)
9941 9968 }, 50);
9942 9969  
... ... @@ -9945,7 +9972,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9945 9972 $scope.HighlightBodyByTermListForBodySystem(null, windowviewid);
9946 9973 }
9947 9974 else {
9948   - $scope.EnableUI();
  9975 + $scope.EnableDAUI(windowviewid);
9949 9976 }
9950 9977 }
9951 9978 }
... ... @@ -10021,7 +10048,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10021 10048  
10022 10049 console.log('colorMode inside else = ' + colorMode);
10023 10050 if (colorMode != undefined || colorMode != null) {
10024   - $scope.DisableUI();
  10051 + $scope.DisableDAUI(windowviewid);
10025 10052 var zeroPoint = new Point();
10026 10053  
10027 10054 DAData.applyFilter(DAData, DAData.rect, zeroPoint, colorMode);
... ... @@ -10089,7 +10116,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10089 10116 console.log('2. $rootScope.isExtract=true and previousHighlightList != null, previousHighlightList.length= ' + previousHighlightList.length)
10090 10117  
10091 10118 $timeout(function () {
10092   - $scope.DisableUI();
  10119 + $scope.DisableDAUI(windowviewid);
10093 10120 $scope.HighlightBodyOnExtract(windowviewid)
10094 10121 }, 50);
10095 10122  
... ... @@ -10097,7 +10124,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10097 10124 else if (isListManagerSelected == true) {
10098 10125 console.log('2. $rootScope.isExtract=true and $rootScope.isListManagerSelected == true')
10099 10126 $timeout(function () {
10100   - $scope.DisableUI();
  10127 + $scope.DisableDAUI(windowviewid);
10101 10128 $scope.HighlightBodyOnExtract(windowviewid)
10102 10129 }, 50);
10103 10130  
... ... @@ -10107,12 +10134,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10107 10134 }
10108 10135 else if ($rootScope.isCallFromOtherModule && AllTerms.length > 0) {
10109 10136 $timeout(function () {
10110   - $scope.DisableUI();
  10137 + $scope.DisableDAUI(windowviewid);
10111 10138 $scope.HighlightBodyOnExtract(windowviewid)
10112 10139 }, 50);
10113 10140 }
10114 10141 else {
10115   - $scope.EnableUI();
  10142 + $scope.EnableDAUI(windowviewid);
10116 10143  
10117 10144 }
10118 10145 }
... ... @@ -10223,7 +10250,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10223 10250 return;
10224 10251 }
10225 10252  
10226   - $scope.DisableUI();
  10253 + $scope.DisableDAUI(windowviewid);
10227 10254 $rootScope.UnsaveCurriculum = true;
10228 10255 var canvasDiv = document.getElementById("canvasDivDA_" + windowviewid);
10229 10256 $scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
... ... @@ -10253,12 +10280,16 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10253 10280  
10254 10281 $rootScope.CloseListManager();
10255 10282  
  10283 + $('#canvasDA_' + windowviewid).removeLayers();//remove all old shape
  10284 + //var sktch = $("#canvasPaintDA_" + windowviewid).sketch();
  10285 + $("#canvasPaintDA_" + windowviewid).sketch().actions = [];//remove old paint data
  10286 +
10256 10287 var canDiv = document.getElementById('canvasDivDA_' + windowviewid);
10257 10288 var canDivChildCount = canDiv.childElementCount;
10258 10289 if (canDivChildCount > 0) {
10259 10290 canDiv.innerHTML = '';
10260 10291 }
10261   -
  10292 +
10262 10293 $scope.SetwindowStoreData(windowviewid, 'isCanvasReset',true);
10263 10294 //canvas is clear in search term,layer change,viewchange here. so annotationData should also clear
10264 10295 $scope.SetwindowStoreData(windowviewid, 'isCBAnnotationActive',false);
... ... @@ -10292,7 +10323,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10292 10323  
10293 10324 //2 first update the currentbodyviewid in local storage
10294 10325 localStorage.setItem("currentBodyViewId", currentBodyViewId);
10295   - $scope.DisableUI();
  10326 + $scope.DisableDAUI(windowviewid);
10296 10327 //3. update gender local storage
10297 10328 if (!$rootScope.isCallFromOtherModule) {
10298 10329 localStorage.setItem("currentGenderValue", 'Male');
... ... @@ -10329,7 +10360,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10329 10360 //2. first update the currentbodyviewid in local storage
10330 10361 localStorage.setItem("currentBodyViewId", currentBodyViewId);
10331 10362  
10332   - $scope.DisableUI();
  10363 + $scope.DisableDAUI(windowviewid);
10333 10364  
10334 10365 //3. update gender local storage
10335 10366 if (!$rootScope.isCallFromOtherModule) {
... ... @@ -10376,7 +10407,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10376 10407 }
10377 10408  
10378 10409 $scope.loadBodyViewChangedBySetting = function (windowviewid, isLexiconChange) {
10379   - $scope.DisableUI();
  10410 + $scope.DisableDAUI(windowviewid);
10380 10411 $scope.LoadImageToExport(windowviewid);
10381 10412 var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
10382 10413 var timeintval=$scope.GetwindowStoreData(windowviewid,'intervalObject');
... ... @@ -10394,7 +10425,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10394 10425 if (vocabTermDataArray!=null) {
10395 10426 var intval=$scope.GetwindowStoreData(panid,'intervalObject');
10396 10427 $scope.stopVocab(intval);
10397   - $scope.langSearchLoad(windowviewid);
  10428 + $scope.langSearchLoad(panid);
10398 10429 //loading da for selected panel
10399 10430 $scope.CalculateImageCordinates(viewOrientationId, panid);
10400 10431  
... ... @@ -10404,13 +10435,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10404 10435 var winid = (selectedPanel).split("_")[1];
10405 10436 if(winid==panid)
10406 10437 {
10407   - $scope.DisableUI();
  10438 + $scope.DisableDAUI(panid);
10408 10439 $rootScope.dalistManagerEvent(panid);
10409 10440 }
10410 10441 }
10411 10442  
10412 10443 if ($scope.GetwindowStoreData(panid,'isSearchClicked')) {
10413   - $scope.DisableUI();
  10444 + $scope.DisableDAUI(panid);
10414 10445 if ($('#searchTermListUl_' + panid).html() != "") {
10415 10446 $('#searchTermListUl_' + panid).empty();
10416 10447 }
... ... @@ -10452,12 +10483,12 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10452 10483 $scope.loadSelectedBodyView(currentBodyViewId,windowviewid);
10453 10484 $timeout(function () {
10454 10485 if ($rootScope.isListManagerMenuSelected) {
10455   - $scope.DisableUI();
  10486 + $scope.DisableDAUI(windowviewid);
10456 10487 $rootScope.dalistManagerEvent(windowviewid)
10457 10488 }
10458 10489  
10459 10490 if ($scope.GetwindowStoreData(windowviewid,'isSearchClicked')) {
10460   - $scope.DisableUI();
  10491 + $scope.DisableDAUI(windowviewid);
10461 10492 if ($('#searchTermListUl_' + windowviewid).html() != "") {
10462 10493 $('#searchTermListUl_' + windowviewid).empty();
10463 10494 }
... ... @@ -10568,7 +10599,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10568 10599 $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]);
10569 10600 }
10570 10601 $rootScope.UnsaveCurriculum = true;
10571   - $scope.DisableUI();
  10602 + $scope.DisableDAUI(windowviewid);
10572 10603 $scope.SetwindowStoreData(windowviewid,'isViewChange',true);
10573 10604  
10574 10605 var canvasDiv = document.getElementById("canvasDivDA_" + windowviewid);
... ... @@ -10618,12 +10649,17 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10618 10649 $("#btnHighLight_" + windowviewid).addClass("btn-primary");
10619 10650 }
10620 10651  
  10652 + $('#canvasDA_' + windowviewid).removeLayers();//remove all old shape
  10653 + //var sktch = $("#canvasPaintDA_" + windowviewid).sketch();
  10654 + $("#canvasPaintDA_" + windowviewid).sketch().actions = [];//remove old paint data
  10655 +
10621 10656 //remove existing body view
10622 10657 var canDiv = document.getElementById("canvasDivDA_" + windowviewid);
10623 10658 var canDivChildCount = canDiv.childElementCount;
10624 10659 if (canDivChildCount > 0) {
10625 10660 canDiv.innerHTML = '';
10626 10661 }
  10662 +
10627 10663 $scope.SetwindowStoreData(windowviewid, 'isCanvasReset',true);
10628 10664 //canvas is clear in search term,layer change,viewchange here. so annotationData should also clear
10629 10665 $scope.SetwindowStoreData(windowviewid, 'isCBAnnotationActive',false);
... ... @@ -10641,7 +10677,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10641 10677 }
10642 10678 else
10643 10679 $scope.SetwindowStoreData(windowviewid,'voId',selectedViewId);
10644   - $scope.DisableUI();
  10680 + $scope.DisableDAUI(windowviewid);
10645 10681  
10646 10682 var bodyVid= $scope.GetwindowStoreData(windowviewid,'voId')
10647 10683  
... ... @@ -10672,7 +10708,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10672 10708 selectedViewId = $scope.correspondingBodyViewIds[selectedViewId];
10673 10709 if ($scope.GetwindowStoreData(windowviewid,'voId') != selectedViewId) {
10674 10710 $scope.SetwindowStoreData(windowviewid,'voId',selectedViewId);
10675   - $scope.DisableUI();
  10711 + $scope.DisableDAUI(windowviewid);
10676 10712  
10677 10713 var bodyVid=$scope.GetwindowStoreData(windowviewid,'voId');
10678 10714 //1.
... ... @@ -10722,7 +10758,6 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10722 10758  
10723 10759 //Reload DA controller Body View after setting Change
10724 10760 $rootScope.reloadDABodyViewEvent = function (bodyViewId,isLexiconChange, windowviewid) {
10725   - //console.log('reloadDABodyViewEvent');
10726 10761 $scope.SetwindowStoreData(windowviewid,'isGlobalSettingChanged',true);
10727 10762 if ($rootScope.isSettingEventAlredayDispachted == true) {
10728 10763 $rootScope.isSettingEventAlredayDispachted = false; // define at home controller
... ... @@ -10854,7 +10889,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10854 10889 var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
10855 10890 $scope.SetwindowStoreData(windowviewid,'isExtract',false);
10856 10891 $("#structureDropdownDA_" + windowviewid).toggle();
10857   - $scope.DisableUI();
  10892 + $scope.DisableDAUI(windowviewid);
10858 10893  
10859 10894 $scope.SetwindowStoreData(windowviewid,'isListManagerSelected',false);
10860 10895 $rootScope.CloseListManager();
... ... @@ -10868,7 +10903,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10868 10903 $scope.removeCurrentHighlightedBodySystem(windowviewid);
10869 10904 $scope.SetwindowStoreData(windowviewid,'isHighlightBodyByBodySystem',false);
10870 10905 $scope.SetwindowStoreData(windowviewid,'isbodySystemHighlight',false);
10871   - $scope.EnableUI();
  10906 + $scope.EnableDAUI(windowviewid);
10872 10907 }
10873 10908  
10874 10909 else {
... ... @@ -10906,7 +10941,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
10906 10941 }
10907 10942 var isHighlightBodyByBodySystem=$scope.GetwindowStoreData(windowviewid,'isHighlightBodyByBodySystem');
10908 10943 if (($scope.isAlreadyHighlighted == true && isHighlightBodyByBodySystem == true)) {
10909   - $scope.DisableUI();
  10944 + $scope.DisableDAUI(windowviewid);
10910 10945 $timeout(function () { $scope.HighlightBodyByTermListForBodySystem(null, windowviewid) }, 100);
10911 10946 }
10912 10947 }
... ... @@ -11153,7 +11188,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11153 11188 //event remove it fire multiple time
11154 11189 $rootScope.dalistManagerEvent = function (windowviewid) {
11155 11190  
11156   - $scope.DisableUI();
  11191 + $scope.DisableDAUI(windowviewid);
11157 11192 $('#bodySystems').empty();
11158 11193 $("#bodySystems").css("display", "block");
11159 11194 $("#AABodySystems").css("display", "none");
... ... @@ -11199,14 +11234,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11199 11234 // primar language
11200 11235 var lanName=languageArray[0].language;
11201 11236 $scope.loadListManger(windowviewid,lanName,totalstructure);
11202   -
11203   - $rootScope.islistManagerEventAlredayDispachted = false;
11204   - $scope.EnableUI();
11205   -
11206 11237 }
11207 11238  
11208 11239 $rootScope.changeLanguageLmEvent = function (windowviewid) {
11209   - $scope.DisableUI();
  11240 + $scope.DisableDAUI(windowviewid);
11210 11241 $('#termList').empty();
11211 11242 var totalstructure=0;
11212 11243 $scope.SetwindowStoreData(windowviewid,'totalstructure',0);
... ... @@ -11246,7 +11277,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11246 11277 }
11247 11278  
11248 11279 $rootScope.LoadMoreLmEvent = function (windowviewid) {
11249   - $scope.DisableUI();
  11280 + $scope.DisableDAUI(windowviewid);
11250 11281 var langId = $("#selectLanguageLm option:selected").val();
11251 11282 var totalstructure = $scope.GetwindowStoreData(windowviewid, 'totalstructureLm');
11252 11283  
... ... @@ -11326,15 +11357,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11326 11357 $('#btlLoadMoreLm').attr('disabled', 'disabled');
11327 11358 }
11328 11359  
11329   - $scope.EnableUI();
11330   -
  11360 + $scope.EnableDAUI(windowviewid);
11331 11361  
11332 11362 }
11333 11363  
11334 11364 $rootScope.refreshTermListOnSystemSelection = function (selectedBodysystemId) {
11335 11365 var windowviewid = (selectedBodysystemId).split("_")[1];
11336 11366 var bodysystemId = (selectedBodysystemId).split("_")[0];
11337   - $scope.DisableUI();
  11367 + $scope.DisableDAUI(windowviewid);
11338 11368 $("#bodySystems").find("option:not(:disabled)").css({ "background-color": "#ffffff", "color": "#000000" });
11339 11369 $("#bodySystems").find("option[id=" + selectedBodysystemId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
11340 11370  
... ... @@ -11462,7 +11492,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11462 11492 }
11463 11493  
11464 11494 }
11465   - $scope.EnableUI();
  11495 + $scope.EnableDAUI(windowviewid);
11466 11496  
11467 11497 }
11468 11498  
... ... @@ -11490,10 +11520,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11490 11520 // Terms search in the Search list should be disable in the List Manager and Vice-Versa.
11491 11521 var prevId=$scope.GetwindowStoreData(windowviewid,'prevId');
11492 11522 if (prevId == actualTermNumber) {
11493   - $scope.EnableUI();
  11523 + $scope.EnableDAUI(windowviewid);
11494 11524 }
11495 11525 else {
11496   - $scope.DisableUI();
  11526 + $scope.DisableDAUI(windowviewid);
11497 11527  
11498 11528 // clear previousHighlightList and Terms and false multiAnnotation
11499 11529 $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
... ... @@ -11633,13 +11663,18 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11633 11663  
11634 11664 $('#layerChangeSliderDA_' + windowviewid).slider("option", "value", sliderVal);
11635 11665  
  11666 + $('#canvasDA_' + windowviewid).removeLayers();//remove all old shape
  11667 + //var sktch = $("#canvasPaintDA_" + windowviewid).sketch();
  11668 + $("#canvasPaintDA_" + windowviewid).sketch().actions = [];//remove old paint data
  11669 +
11636 11670 //remove existing body view
11637 11671 var canDiv = document.getElementById('canvasDivDA_' + windowviewid);
11638 11672 var canDivChildCount = canDiv.childElementCount;
11639 11673 if (canDivChildCount > 0) {
11640 11674 canDiv.innerHTML = '';
11641 11675 }
11642   -
  11676 +
  11677 + $scope.SetwindowStoreData(windowviewid, 'isCanvasReset',true);
11643 11678 //9.
11644 11679 //canvas is clear in search term,layer change,viewchange here. so annotationData should also clear
11645 11680 $scope.SetwindowStoreData(windowviewid, 'isCBAnnotationActive',false);
... ... @@ -11656,7 +11691,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11656 11691 $('#dot_'+windowviewid).css("display", "none");
11657 11692 //DA > Annotation's Line should not displayed.
11658 11693 $('#bord_'+windowviewid).css("display", "none");
11659   - $scope.EnableUI();
  11694 + $scope.EnableDAUI(windowviewid);
11660 11695 //redraw body of respective layer
11661 11696 var viewOrientationId = $scope.GetwindowStoreData(windowviewid, 'viewOrientationId');
11662 11697  
... ... @@ -11789,7 +11824,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
11789 11824 $scope.SetwindowStoreData(windowviewid,'CanvasDivLeftPosition',$('#canvasDivDA_' + windowviewid).scrollLeft());
11790 11825 $scope.SetwindowStoreData(windowviewid,'CanvasDivTopPosition',$('#canvasDivDA_' + windowviewid).scrollTop());
11791 11826  
11792   - $scope.EnableUI();
  11827 + $scope.EnableDAUI(windowviewid);
11793 11828 }
11794 11829  
11795 11830 $scope.scaleValue = function (nValue, nNewZoom, nExistingZoom) {
... ... @@ -12047,7 +12082,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
12047 12082 var len= (event.currentTarget.id).split("_").length;
12048 12083 var windowviewid = (event.currentTarget.id).split("_")[len-1];
12049 12084  
12050   - $scope.DisableUI();
  12085 + $scope.DisableDAUI(windowviewid);
12051 12086 $('#searchedTermListPopUp_' + windowviewid).css({
12052 12087 'background': '#fff',
12053 12088 'border-radius': '3px',
... ... @@ -12131,9 +12166,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
12131 12166 }
12132 12167  
12133 12168 $scope.changeLanguageList = function (event) {
12134   - $scope.DisableUI();
12135 12169 var len= (event.currentTarget.id).split("_").length;
12136 12170 var windowviewid = (event.currentTarget.id).split("_")[len-1];
  12171 +
  12172 + $scope.DisableDAUI(windowviewid);
12137 12173 if ($('#searchTermListUl_' + windowviewid).html() != "") {
12138 12174 $('#searchTermListUl_' + windowviewid).empty();
12139 12175 }
... ... @@ -12168,9 +12204,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
12168 12204 }
12169 12205  
12170 12206 $scope.LoadMore = function (event) {
12171   - $scope.DisableUI();
12172 12207 var len= (event.currentTarget.id).split("_").length;
12173 12208 var windowviewid = (event.currentTarget.id).split("_")[len-1];
  12209 +
  12210 + $scope.DisableDAUI(windowviewid);
12174 12211 var totalstructure = $scope.GetwindowStoreData(windowviewid, 'totalstructure');
12175 12212  
12176 12213 setTimeout(function () {
... ... @@ -12250,7 +12287,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
12250 12287 });
12251 12288 }
12252 12289  
12253   - $scope.EnableUI();
  12290 + $scope.EnableDAUI(windowviewid);
12254 12291  
12255 12292 }
12256 12293  
... ... @@ -12346,6 +12383,14 @@ function enableShowHideStructureBox(event) {
12346 12383 });
12347 12384 }
12348 12385  
  12386 +function keyControlDAActive(event) {
  12387 + console.log('OnBodySystem chnaged is called outside ');
  12388 + var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
  12389 + scope.$apply(function () {
  12390 + scope.MultipleAnnotation(event);
  12391 + });
  12392 +}
  12393 +
12349 12394 function OnSearch(event) {
12350 12395  
12351 12396 console.log('Show Search is called outside ');
... ... @@ -12445,9 +12490,9 @@ function onDrawingCanvasTouchMove(event) {
12445 12490  
12446 12491 function OnZoom(event) {
12447 12492 var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
12448   - scope.DisableUI();
12449 12493 var len= (event.currentTarget.id).split("_").length;
12450 12494 var windowviewid = (event.currentTarget.id).split("_")[len-1];
  12495 + scope.DisableDAUI(windowviewid);
12451 12496  
12452 12497 if ($(".btn-annotation").hasClass("activebtncolor")) //Bug #14928
12453 12498 $(".btn-annotation").removeClass("activebtncolor");
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @3705d19
... ... @@ -41,7 +41,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
41 41  
42 42 $rootScope.isModestyOn;
43 43 $rootScope.isModestyOff;
44   - $rootScope.SetSettingActiveTab;
45 44 $("#annotationButton").addClass("disableMenuoption");
46 45 $("#Menuoptionid").addClass("disableMenuoption");
47 46 $rootScope.menuLabExer;
... ... @@ -299,18 +298,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
299 298 parentslag = "lab-exercise-view";
300 299 openNewlink = "lab-exercises";
301 300 }
302   - var newpanelWidth=0;
303   - var newpanelHeight=0;
304   - var newpanelLeft=0;
305   - var $ua = navigator.userAgent;
306   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
307   - newpanelWidth=screen.width;
308   - newpanelHeight=screen.height;
309   - }
310   - else{
311   - newpanelWidth=screen.width-10;
312   - newpanelHeight=screen.height-185;
313   - }
  301 + var innerWidth =$(window).innerWidth()-10;
  302 + var innerheight =$(window).innerHeight()-40;
  303 +
314 304 $.jsPanel({
315 305 id: 'dvOpenResourcePanel',
316 306 selector: '#dvOpenResoucePanel',
... ... @@ -318,7 +308,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
318 308 currentController: 'HomeController',
319 309 parentSlug: parentslag,
320 310 content: '<div>' +
321   - '<iframe src="' + homepath + '" width="100%" height="10px" frameBorder="0" name="' + openNewlink + '" id="OpenModuleInCB" onload="OpenResourcePanel(this)"></iframe>',
  311 + '<iframe src="' + homepath + '" width="100%" height="'+innerheight+'px" frameBorder="0" name="' + openNewlink + '" id="OpenModuleInCB" onload="OpenResourcePanel(this)"></iframe>',
322 312 title: "",
323 313 position: {
324 314 top: 1,
... ... @@ -328,8 +318,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
328 318 draggable: "disabled",
329 319  
330 320 size: {
331   - width: newpanelWidth,
332   - height: newpanelHeight
  321 + width: innerWidth,
  322 + height: innerheight
  323 + },
  324 + resizable: {
  325 + minWidth: 770,
  326 + minHeight: 770,
  327 + start:function(event, ui)
  328 + {
  329 + $("#OpenModuleInCB").css("display", "block");
  330 + },
  331 + stop: function (event, ui) {
  332 + // var canvasDIvHeight = $("#CBTinyMCEPanel .jsPanel-content").height();
  333 +
  334 + }
333 335 },
334 336  
335 337 });
... ... @@ -367,9 +369,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
367 369 $(head).append(css);
368 370 // $(head).append(storefunc);
369 371  
370   - var canvasDIvHeight = $("#dvOpenResourcePanel .jsPanel-content").height();
371   - $('#OpenModuleInCB').css('height', canvasDIvHeight);
372   -
373 372 $timeout(function () {
374 373 console.log('frame content loding delayed......');
375 374 $scope.loadopenresourceContent(head, iframe);
... ... @@ -2567,6 +2566,24 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2567 2566 }
2568 2567 }
2569 2568 }
  2569 + $rootScope.openresourcePanelPosition=function()
  2570 + {
  2571 + if(document.getElementById("dvOpenResourcePanel") ) {
  2572 + var innerWidth =$(window).innerWidth()-10;
  2573 + var innerheight =$(window).innerHeight()-40;
  2574 +
  2575 + $("#OpenModuleInCB").css('height',innerheight);
  2576 + $("#dvOpenResourcePanel .jsPanel-hdr .jsPanel-title").css('width','300px');
  2577 +
  2578 + $("#dvOpenResourcePanel").css('height',innerheight);
  2579 + $("#dvOpenResourcePanel").css('width',innerWidth);
  2580 +
  2581 + $("#dvOpenResourcePanel .jsPanel-content").css('height',innerheight);
  2582 + $("#dvOpenResourcePanel .jsPanel-content").css('width',innerWidth);
  2583 +
  2584 + }
  2585 +
  2586 + }
2570 2587  
2571 2588 $(document).ready(function () {
2572 2589  
... ... @@ -2581,6 +2598,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2581 2598 clearTimeout(window.resizedFinished);
2582 2599 window.resizedFinished = setTimeout(function(){
2583 2600 console.log('Resized finished.');
  2601 + $rootScope.openresourcePanelPosition();
2584 2602 if($location.url()!= "/curriculum-builder-detail") {
2585 2603 var moduleImagePanel = $("div[id*='ImagePanel']");
2586 2604  
... ... @@ -2606,6 +2624,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2606 2624 if(($location.url()== "/tile-view-list") ||($location.url()== "/clinical-illustrations")||($location.url()== "/clinical-animations")||($location.url()== "/ADAM-images")||($location.url()== "/ADAM-on-demand")) {
2607 2625 $rootScope.ResetGridListLength();
2608 2626 }
  2627 +
  2628 + if($location.url()== "/curriculum-builder")
  2629 + {
  2630 + $rootScope.ResetCBListHeight();
  2631 + }
  2632 + else if($location.url()== "/curriculum-builder-detail" )
  2633 + {
  2634 + $rootScope.ResetCBHeight();
  2635 + }
2609 2636  
2610 2637 }, 300);
2611 2638 }
... ... @@ -2732,7 +2759,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
2732 2759 else if ($location.url() == "/module-item-view") {
2733 2760 $("#annotationButton").removeClass("disableMenuoption");
2734 2761 $("#Menuoptionid").removeClass("disableMenuoption");
2735   - $("#optiontSetting").addClass("disableSubMenu");
  2762 + // $("#optiontSetting").addClass("disableSubMenu");
2736 2763 $("#labExPdfOption").addClass("disableSubMenu");
2737 2764 $("#annotationToolBarOptions").removeClass("disableSubMenu");
2738 2765 $("#fileMenuAnchor").removeClass("disableFileMenu");
... ... @@ -3463,6 +3490,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
3463 3490 $("#annotationButton").removeClass("disableMenuoption");
3464 3491 $("#Menuoptionid").removeClass("disableMenuoption");
3465 3492 $("#annotationToolBarOptions").removeClass("disableSubMenu");
  3493 + $("#optiontSetting").removeClass("disableSubMenu");
3466 3494  
3467 3495 $("#listManagerBody *").prop('disabled',false);
3468 3496  
... ... @@ -4292,6 +4320,40 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
4292 4320  
4293 4321 // Dissectible Anatomy > Settings should be disable if Annotation is Open.
4294 4322 $rootScope.ShowSettingWindow = function () {
  4323 +
  4324 + $('#tabdissectible').removeAttr('disabled');
  4325 + var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
  4326 + if (modulePanel != undefined && modulePanel.length>0) {
  4327 + var isdapanel=false;
  4328 + var isaapanel=false;
  4329 + for (var index = 0 ; index < modulePanel.length; index++) {
  4330 + var paneld = modulePanel[index].id;
  4331 + if(paneld.match("daImagePanel"))
  4332 + {
  4333 + isdapanel=true;
  4334 + }
  4335 + else if(paneld.match("AAImagePanel"))
  4336 + {
  4337 + isaapanel=true;
  4338 + }
  4339 + }
  4340 +
  4341 + if(isdapanel && isaapanel)
  4342 + {
  4343 + $rootScope.SettingsTab = 2;
  4344 + }
  4345 + else if(isdapanel)
  4346 + {
  4347 + $rootScope.SettingsTab = 3;
  4348 + }
  4349 + else if(isaapanel)
  4350 + {
  4351 + $('#tabdissectible').attr('disabled', 'disabled');
  4352 + $rootScope.SettingsTab = 2;
  4353 + }
  4354 +
  4355 + }
  4356 +
4295 4357 if ($("#annotationTollbar").css("display") == "block") {
4296 4358 $('#modal-settings').css("display", "none");
4297 4359 $("#modelsettingsbackground").css("display", "none");
... ... @@ -4302,7 +4364,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
4302 4364 $('#modal-settings').css("display", "block");
4303 4365 $("#modelsettingsbackground").css("display", "block");
4304 4366 }
4305   -
  4367 +
4306 4368 $rootScope.lexiconLanguageArrayLength = $rootScope.lexiconLanguageArray.length;
4307 4369 $rootScope.lexiconPrimaryLanguage = $("#primarylaxican").val();
4308 4370 $rootScope.primaryLangID = $('#primarylaxican').attr("name");
... ... @@ -8802,7 +8864,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8802 8864 }
8803 8865 else if(selectedPanel.match("AAImagePanel"))
8804 8866 {
8805   - onSearchItemSelection($('#termList option[selected="selected"]').attr("id"));
  8867 + onSearchItemSelection($('#termList option[selected="selected"]').attr("id"),true);
8806 8868 }
8807 8869  
8808 8870 }
... ... @@ -8863,7 +8925,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8863 8925 $("#langaugeDivLm").css("display", "none");
8864 8926 $rootScope.aalistManagerEvent(windowviewid);
8865 8927  
8866   - $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
  8928 + $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id,true)");
8867 8929 }
8868 8930 var modulePanel = $("#HomeContainerDiv").find("div[id*='daImagePanel']");
8869 8931 if (modulePanel != undefined && modulePanel.length>0) {
... ... @@ -8932,6 +8994,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8932 8994 {
8933 8995 var windowviewid=selectedPanel.split('_')[1];
8934 8996 $rootScope.changeLanguageLmEvent(windowviewid);
  8997 + }
  8998 + else if(selectedPanel.match("AAImagePanel"))
  8999 + {
  9000 + var windowviewid=selectedPanel.split('_')[1];
  9001 + $rootScope.changeLanguageLmEventAA(windowviewid);
8935 9002 }
8936 9003 }
8937 9004  
... ... @@ -8942,23 +9009,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
8942 9009 {
8943 9010 var windowviewid=selectedPanel.split('_')[1];
8944 9011 $rootScope.LoadMoreLmEvent(windowviewid);
8945   - }
8946   - }
8947   -
8948   -
8949   - function fillListManagerTerms() {
8950   -
8951   - var len = $rootScope.openModules.length;
8952   - var openViewLen = $rootScope.openViews.length;
8953   -
8954   - var currentOpenModuleId = $rootScope.openModules[len - 1].ModuleId;
8955   - var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
8956   - if (currentOpenModuleId == 1) {
8957   -
8958 9012 }
8959   -
  9013 + else if(selectedPanel.match("AAImagePanel"))
  9014 + {
  9015 + var windowviewid=selectedPanel.split('_')[1];
  9016 + $rootScope.LoadMoreLmEventAA(windowviewid);
  9017 + }
8960 9018 }
8961 9019  
  9020 +
8962 9021 //setrtings
8963 9022 $rootScope.SetSettingActiveTab = function (tabToSet) {
8964 9023 $rootScope.SettingsTab = tabToSet;
... ... @@ -9011,6 +9070,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9011 9070 //4.
9012 9071 $rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
9013 9072  
  9073 + //disable appreance tab still no use of it
  9074 + $('#tabappearance').attr('disabled', 'disabled');
  9075 +
9014 9076  
9015 9077 };
9016 9078  
... ... @@ -9381,6 +9443,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
9381 9443 var currentOpenViewId=$rootScope.GetDAwindowData(MultiWinId,"voId");
9382 9444 $rootScope.reloadDABodyViewEvent(currentOpenViewId,isLexiconChange,MultiWinId);
9383 9445 }
  9446 + if(paneld.match("AAImagePanel"))
  9447 + {
  9448 + var len = (paneld).split("_").length;
  9449 + var MultiWinId = (paneld).split("_")[len - 1];
  9450 + $rootScope.reloadAABodyViewEvent(isLexiconChange,MultiWinId);
  9451 + }
9384 9452 }
9385 9453 }
9386 9454 };
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
  View file @3705d19
... ... @@ -103,14 +103,15 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
103 103 }
104 104 }
105 105  
106   - $scope.DisableUI = function () {
107   -
108   - var leImagePanelConetent = document.getElementsByClassName("jsPanel-content");
109   - for (var i = 0; i < leImagePanelConetent.length; i++) {
110   - leImagePanelConetent[i].style.pointerEvents = "none";
111   - leImagePanelConetent[i].style.opacity = "0.7";
  106 + $scope.DisableLabUI = function (windowviewid) {
112 107  
  108 + var modulePanel = $("#labImagePanel_"+windowviewid).find(" .jsPanel-content");
  109 + if(modulePanel.length>0)
  110 + {
  111 + modulePanel[0].style.pointerEvents="none";
  112 + modulePanel[0].style.opacity="0.7";
113 113 }
  114 +
114 115 $rootScope.isLoading = true;
115 116 $('#spinner').css('visibility', 'visible');
116 117  
... ... @@ -119,12 +120,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
119 120 $('#HomeContainerDiv').css('opacity', '0.7');
120 121 }
121 122  
122   - $scope.EnableUI = function () {
123   -
124   - var leImagePanelConetent = document.getElementsByClassName("jsPanel-content");
125   - for (var i = 0; i < leImagePanelConetent.length; i++) {
126   - leImagePanelConetent[i].style.pointerEvents = "auto";
127   - leImagePanelConetent[i].style.opacity = "1";
  123 + $scope.EnableLabUI = function (windowviewid) {
  124 + var modulePanel = $("#labImagePanel_"+windowviewid).find(" .jsPanel-content");
  125 + if(modulePanel.length>0)
  126 + {
  127 + modulePanel[0].style.pointerEvents="auto";
  128 + modulePanel[0].style.opacity="1";
128 129 }
129 130  
130 131 $rootScope.isLoading = false;
... ... @@ -167,7 +168,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
167 168  
168 169 $scope.initializeLEWindowData($rootScope.MULTI_VIEW_ID, true, undefined);
169 170  
170   - $scope.DisableUI();
  171 + $scope.DisableLabUI($rootScope.MULTI_VIEW_ID);
171 172  
172 173 //get current path
173 174 var currentURL = $location.path();
... ... @@ -204,10 +205,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
204 205 function (result) {
205 206 $scope.LabExerciseModulesList = result;
206 207 $scope.SetLEwindowStoreData(windowviewid, 'LabExerciseModulesList', result);
207   - $scope.EnableUI();
  208 + $scope.EnableLabUI(windowviewid);
208 209 },
209 210 function (error) {
210   - $scope.EnableUI();
  211 + $scope.EnableLabUI(windowviewid);
211 212 console.log(error.statusText)
212 213 }
213 214 )
... ... @@ -255,7 +256,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
255 256 if ($rootScope.isCallFromOtherModule) {
256 257 $scope.LEModuleData = ModuleService.getModuleData("LAB_EXERCISE");
257 258 if($scope.LEModuleData.length<1) return;
258   - $scope.DisableUI();
  259 + $scope.DisableLabUI();
259 260 $scope.readyToLoad = true;
260 261 $rootScope.LEWindowLoadComplete = false;
261 262 $scope.wincount = 1;
... ... @@ -293,7 +294,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
293 294  
294 295 }
295 296 else {
296   - $scope.DisableUI();
  297 + $scope.DisableLabUI();
297 298 $scope.InitializeLabExercise(null);
298 299 }
299 300 }
... ... @@ -547,14 +548,14 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
547 548 else {
548 549 $scope.GetQuizByTopic(windowviewid);
549 550 }
550   - $scope.DisableUI();
  551 + $scope.DisableLabUI(windowviewid);
551 552  
552 553 },300)
553 554  
554 555 },
555 556 function (error) {
556 557 console.log('error in getting save ddata');
557   - $scope.DisableUI();
  558 + $scope.DisableLabUI(windowviewid);
558 559 }
559 560 )
560 561  
... ... @@ -705,7 +706,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
705 706  
706 707 $scope.GetQuizByTopic = function (windowviewid) {
707 708  
708   - $scope.DisableUI();
  709 + $scope.DisableLabUI(windowviewid);
709 710  
710 711 $('.jsPanel-content').css('font-size', '14px');
711 712  
... ... @@ -850,7 +851,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
850 851 $scope.SetLEwindowStoreData(windowviewid, 'isResetClicked', false);
851 852 }
852 853 }
853   - $scope.EnableUI();
  854 + $scope.EnableLabUI(windowviewid);
854 855 if ($rootScope.isCallFromOtherModule) {
855 856 $rootScope.LEWindowLoadComplete = true;
856 857 }
... ... @@ -1577,7 +1578,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1577 1578 $rootScope.UnsaveCurriculum = true;
1578 1579 }
1579 1580  
1580   - $scope.DisableUI();
  1581 + $scope.DisableLabUI(windowviewid);
1581 1582 var quiznumber = $scope.GetLEwindowStoreData(windowviewid, 'quiznumber');
1582 1583 $scope.CreateLabExerciseDataToSave(windowviewid, quiznumber);
1583 1584  
... ... @@ -1600,7 +1601,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1600 1601 LabExerciseService.saveLabExerciseAttempt(labExerciseAttempt)
1601 1602 .then(
1602 1603 function (result) {
1603   - $scope.EnableUI();
  1604 + $scope.EnableLabUI(windowviewid);
1604 1605 $scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', false);
1605 1606 //saved successfully.variable name is not correct but errorMessage represnts message
1606 1607 if (!$rootScope.isCallFromOtherModule) {
... ... @@ -1611,9 +1612,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
1611 1612  
1612 1613 },
1613 1614 function (error) {
1614   -
1615   - $scope.EnableUI();
1616   -
  1615 + $scope.EnableLabUI(windowviewid);
1617 1616 console.log(' Error in saving lab exercise = ' + error.statusText);
1618 1617 $rootScope.isVisibleLogin = true;
1619 1618 $('#errorMessage').text(error);
... ... @@ -2097,7 +2096,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
2097 2096 else {
2098 2097 $("#imgdiv_" + windowviewid).css("position", "relative");
2099 2098 }
2100   - $scope.EnableUI();
  2099 + $scope.EnableLabUI(windowviewid);
2101 2100 }, 500);
2102 2101 }
2103 2102  
... ... @@ -2120,7 +2119,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
2120 2119 $("#quizSubmitBtn_" + windowviewid).css("display", "none");
2121 2120 }
2122 2121  
2123   - $scope.EnableUI();
  2122 + $scope.EnableLabUI(windowviewid);
2124 2123 }
2125 2124  
2126 2125 $scope.SendLabEXMailToUser = function ($event) {
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
  View file @3705d19
... ... @@ -80,13 +80,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
80 80 }
81 81 }
82 82  
83   - $scope.DisableUI = function () {
84   -
85   - var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
86   - for (var i = 0; i < aniImagePanelConetent.length; i++) {
87   - aniImagePanelConetent[i].style.pointerEvents = "none";
88   - aniImagePanelConetent[i].style.opacity = "0.7";
89   -
  83 + $scope.DisableVideoUI = function (windowviewid) {
  84 + var modulePanel = $("#vidImagePanel_"+windowviewid).find(" .jsPanel-content");
  85 + if(modulePanel.length>0)
  86 + {
  87 + modulePanel[0].style.pointerEvents="none";
  88 + modulePanel[0].style.opacity="0.7";
90 89 }
91 90 $rootScope.isLoading = true;
92 91 $('#spinner').css('visibility', 'visible');
... ... @@ -96,12 +95,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
96 95 $('#HomeContainerDiv').css('opacity', '0.7');
97 96 }
98 97  
99   - $scope.EnableUI = function () {
100   -
101   - var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
102   - for (var i = 0; i < aniImagePanelConetent.length; i++) {
103   - aniImagePanelConetent[i].style.pointerEvents = "auto";
104   - aniImagePanelConetent[i].style.opacity = "1";
  98 + $scope.EnableVideoUI = function (windowviewid) {
  99 + var modulePanel = $("#vidImagePanel_"+windowviewid).find(" .jsPanel-content");
  100 + if(modulePanel.length>0)
  101 + {
  102 + modulePanel[0].style.pointerEvents="auto";
  103 + modulePanel[0].style.opacity="1";
105 104 }
106 105  
107 106 $rootScope.isLoading = false;
... ... @@ -159,7 +158,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
159 158 if ($rootScope.isCallFromOtherModule) {
160 159 $scope.VideoModuleData = ModuleService.getModuleData("MY_ANIMATIONS");
161 160 if($scope.VideoModuleData.length<1) return;
162   - $scope.DisableUI();
163 161 $scope.readyToLoad = true;
164 162 $rootScope.VideoLoadComplete = false;
165 163 $scope.wincount = 1;
... ... @@ -203,6 +201,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
203 201 $scope.VidOpenInOtherModules = vidModuleData;
204 202 $rootScope.MULTI_VIEW_ID += 1;
205 203 var windowviewid = $rootScope.MULTI_VIEW_ID;
  204 + $scope.DisableVideoUI(windowviewid);
206 205  
207 206 $scope.initializeVideoWindowData(windowviewid, false, $scope.VidOpenInOtherModules.currentWindowId);
208 207  
... ... @@ -244,7 +243,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
244 243 }
245 244  
246 245 $scope.loadMyAnimation = function (windowviewid) {
247   - $scope.DisableUI();
248 246 $scope.jsPanelID = 'vidImagePanel' + '_' + windowviewid;
249 247 var tittle = $scope.GetVideowindowStoreData(windowviewid, 'currentViewTitle');
250 248 var animationSource = $scope.GetVideowindowStoreData(windowviewid, 'videoSource');
... ... @@ -446,11 +444,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
446 444  
447 445 $scope.MyvideoOnLoad = function (windowviewid)
448 446 {
449   - $scope.EnableUI();
450   - if ($rootScope.isCallFromOtherModule) {
451   - $rootScope.VideoLoadComplete = true;
452   - }
453   - $scope.JsPanelclick(windowviewid);
  447 +
  448 + if ($rootScope.isCallFromOtherModule) {
  449 + $rootScope.VideoLoadComplete = true;
  450 + }
  451 + $scope.JsPanelclick(windowviewid);
  452 +
  453 + $scope.EnableVideoUI(windowviewid);
454 454  
455 455 }
456 456  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
  View file @3705d19
... ... @@ -94,14 +94,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
94 94 }
95 95 }
96 96  
97   - $scope.DisableUI = function () {
98   -
99   - var myImagePanelConetent = document.getElementsByClassName("jsPanel-content");
100   - for (var i = 0; i < myImagePanelConetent.length; i++) {
101   - myImagePanelConetent[i].style.pointerEvents = "none";
102   - myImagePanelConetent[i].style.opacity = "0.7";
  97 + $scope.DisablePicUI = function (windowviewid) {
103 98  
  99 + var modulePanel = $("#picImagePanel_"+windowviewid).find(" .jsPanel-content");
  100 + if(modulePanel.length>0)
  101 + {
  102 + modulePanel[0].style.pointerEvents="none";
  103 + modulePanel[0].style.opacity="0.7";
104 104 }
  105 +
105 106 $rootScope.isLoading = true;
106 107 $('#spinner').css('visibility', 'visible');
107 108  
... ... @@ -110,14 +111,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
110 111 $('#CBDetailPageDiv').css('opacity', '0.7');
111 112 }
112 113  
113   - $scope.EnableUI = function () {
  114 + $scope.EnablePicUI = function (windowviewid) {
114 115  
115   - var myImagePanelConetent = document.getElementsByClassName("jsPanel-content");
116   - for (var i = 0; i < myImagePanelConetent.length; i++) {
117   - myImagePanelConetent[i].style.pointerEvents = "auto";
118   - myImagePanelConetent[i].style.opacity = "1";
  116 + var modulePanel = $("#picImagePanel_"+windowviewid).find(" .jsPanel-content");
  117 + if(modulePanel.length>0)
  118 + {
  119 + modulePanel[0].style.pointerEvents="auto";
  120 + modulePanel[0].style.opacity="1";
119 121 }
120   -
121 122 $rootScope.isLoading = false;
122 123 $('#spinner').css('visibility', 'hidden');
123 124 // CB module enable all
... ... @@ -164,7 +165,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
164 165 if ($rootScope.isCallFromOtherModule) {
165 166 $scope.PicModuleData = ModuleService.getModuleData("MY_PICTURES");
166 167 if($scope.PicModuleData.length<1) return;
167   - $scope.DisableUI();
168 168 $scope.readyToLoad = true;
169 169 $rootScope.PicLoadComplete = false;
170 170 $scope.wincount = 1;
... ... @@ -205,10 +205,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
205 205 }
206 206  
207 207 $scope.OpenPictureView = function (picModuleData) {
208   -
209 208 $scope.picOpenInOtherModules = picModuleData;
210 209 $rootScope.MULTI_VIEW_ID += 1;
211 210 var windowviewid = $rootScope.MULTI_VIEW_ID;
  211 + $scope.DisablePicUI(windowviewid);
212 212  
213 213 $scope.initializePICWindowData(windowviewid, false, $scope.picOpenInOtherModules.currentWindowId);
214 214  
... ... @@ -474,7 +474,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
474 474 $rootScope.LoadCBSavedAnnotation(canvasDraw,canvasPaint,annotationData);
475 475 }
476 476 }
477   - $scope.EnableUI();
  477 + $scope.EnablePicUI(windowviewid);
478 478 $rootScope.PicLoadComplete = true;
479 479 }
480 480  
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
  View file @3705d19
1 1 ๏ปฟ'use strict';
2 2  
3   -AIA.controller("TileViewListController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService","$interval",
4   -function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService, $interval) {
  3 +AIA.controller("TileViewListController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService","$interval","$filter",
  4 +function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService, $interval, $filter) {
5 5  
6 6 $scope.AllBodyRegion = [];
7 7 $scope.AllBodySystem = [];
... ... @@ -105,6 +105,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
105 105 'navigatorImage':"",
106 106 'showHideAnnotations': 'showAnnotationText',
107 107 'annotationData':{shapeStates:[],paintCanvasState:[]},
  108 + 'totalstructure': 0,
  109 + 'totalstructureLm': 0,
  110 + 'intervalObject': null,
  111 + 'SearchTimeStampValue': 0,
  112 + 'keyctrl': false,
108 113  
109 114 };
110 115 return windata;
... ... @@ -182,30 +187,33 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
182 187 }
183 188 }
184 189  
185   - $scope.DisableUI = function () {
186   -
187   - var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
188   - for (var i = 0; i < daImagePanelConetent.length; i++) {
189   - daImagePanelConetent[i].style.pointerEvents = "none";
190   - daImagePanelConetent[i].style.opacity = "0.7";
  190 + $scope.DisableAAUI = function (windowviewid) {
191 191  
  192 + var modulePanel = $("#AAImagePanel_"+windowviewid).find(" .jsPanel-content");
  193 + if(modulePanel.length>0)
  194 + {
  195 + modulePanel[0].style.pointerEvents="none";
  196 + modulePanel[0].style.opacity="0.7";
192 197 }
  198 +
193 199 $rootScope.isLoading = true;
194 200 $('#spinner').css('visibility', 'visible');
195 201  
196 202 // CB module disable all
197 203 $('#HomeContainerDiv').css('pointer-events', 'none');
198 204 $('#HomeContainerDiv').css('opacity', '0.7');
  205 +
199 206 }
200 207  
201   - $scope.EnableUI = function () {
  208 + $scope.EnableAAUI = function (windowviewid) {
202 209  
203   - var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
204   - for (var i = 0; i < daImagePanelConetent.length; i++) {
205   - daImagePanelConetent[i].style.pointerEvents = "auto";
206   - daImagePanelConetent[i].style.opacity = "1";
  210 + var modulePanel = $("#AAImagePanel_"+windowviewid).find(" .jsPanel-content");
  211 + if(modulePanel.length>0)
  212 + {
  213 + modulePanel[0].style.pointerEvents="auto";
  214 + modulePanel[0].style.opacity="1";
207 215 }
208   -
  216 +
209 217 $rootScope.isLoading = false;
210 218 $('#spinner').css('visibility', 'hidden');
211 219 // CB module enable all
... ... @@ -213,11 +221,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
213 221 $('#HomeContainerDiv').css('opacity', '1');
214 222 }
215 223  
216   - $scope.loadForModuleById = function (moduleId) {
217   - $scope.DisableUI();
218   -
  224 + $scope.loadForModuleById = function (moduleId) {
219 225 $rootScope.isCallFromOtherModule = undefined;
220 226 $rootScope.MULTI_VIEW_ID += 1
  227 + $scope.DisableAAUI($rootScope.MULTI_VIEW_ID);
221 228  
222 229 // store exist module in module service
223 230 var ExistData = ModuleService.getModuleData("ATLAS_ANATOMY");
... ... @@ -422,7 +429,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
422 429 if ($rootScope.isCallFromOtherModule) {
423 430 $scope.AAModuleData = ModuleService.getModuleData("ATLAS_ANATOMY");
424 431 if($scope.AAModuleData.length<1) return;
425   - $scope.DisableUI();
  432 + $scope.DisableAAUI();
426 433 $scope.readyToLoad=true;
427 434 $rootScope.AAWindowLoadComplete = false;
428 435 $scope.wincount=1;
... ... @@ -463,7 +470,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
463 470  
464 471 }
465 472 else {
466   - $scope.DisableUI();
  473 + $scope.DisableAAUI();
467 474 $scope.openModuleItem(null);
468 475 }
469 476 }
... ... @@ -577,7 +584,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
577 584  
578 585 $scope.loadAAIllustration = function (windowviewid) {
579 586 //0.4 for Opening module item, load it into image
580   - $scope.DisableUI();
  587 + $scope.DisableAAUI(windowviewid);
581 588  
582 589 if ($rootScope.refreshcheck == null) {
583 590 $location.path('/');
... ... @@ -670,7 +677,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
670 677 $scope.SetAAwindowStoreData(windowviewid, 'maximised',true);
671 678 $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
672 679  
673   - var extraheight=$('#aastickeyarea').height()+15;
  680 + var extraheight=$('#aastickeyarea').height()+5;
674 681 var extrawidth=$('.tools').width()+15;
675 682 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
676 683 var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -694,7 +701,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
694 701 $scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
695 702 $scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
696 703  
697   - var extraheight=$('#aastickeyarea').height()+15;
  704 + var extraheight=$('#aastickeyarea').height()+5;
698 705 var extrawidth=$('.tools').width()+15;
699 706 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
700 707 var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -719,7 +726,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
719 726 var len = (pnlName).split("_").length;
720 727 var windowviewid = (pnlName).split("_")[len - 1];
721 728  
722   - var extraheight=$('#aastickeyarea').height()+15;
  729 + var extraheight=$('#aastickeyarea').height()+5;
723 730 var extrawidth=$('.tools').width()+15;
724 731 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height();
725 732 var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -816,7 +823,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
816 823  
817 824 $scope.loadAAModule = function (windowviewid) {
818 825  
819   - var extraheight=$('#aastickeyarea').height()+15;
  826 + var extraheight=$('#aastickeyarea').height()+5;
820 827 var extrawidth=$('.tools').width()+15;
821 828 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
822 829 var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -858,8 +865,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
858 865  
859 866 var demoData= {shapeStates:[],paintCanvasState:[]};
860 867 $rootScope.setAADAPanelCordinate(windowviewid,0,pnlName,canvasDiv,canvasDraw,canvasPaint,canvasDIvHeight,canvasDIvWidth,demoData);
861   -
862   - $timeout(function () {
  868 + $scope.JsPanelclick(windowviewid);
  869 +
  870 + $timeout(function () {
  871 +
863 872 $scope.loadAllPinFirstTime(windowviewid);
864 873 //call time interval function until load pin data
865 874 //load search/vocab data
... ... @@ -876,8 +885,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
876 885 //7. Highlight all system body list in left side
877 886 $scope.highlightBodySystemList(windowviewid);
878 887 $scope.loadbtnNavigator(windowviewid);
879   - $scope.JsPanelclick(windowviewid);
880   -
  888 +
881 889 if ($rootScope.isCallFromOtherModule) {
882 890 $scope.loadAAonCBData(windowviewid);
883 891  
... ... @@ -1014,9 +1022,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1014 1022 $("#navigatorBtn").attr("id", "navigatorBtn_" + windowviewid);
1015 1023 $("#navigatorDiv").attr("id", "navigatorDiv_" + windowviewid);
1016 1024 $("#comment-box").attr("id", "comment-box_" + windowviewid);
  1025 + $("#multiannotation").attr("id", "multiannotation_" + windowviewid);
1017 1026 $("#selectedTermName").attr("id", "selectedTermName_" + windowviewid);
  1027 + $("#searchListDivAA").attr("id", "searchListDivAA_" + windowviewid);
  1028 + $("#searchlangaugeDiv").attr("id", "searchlangaugeDiv_" + windowviewid);
1018 1029 $("#termlistfilter").attr("id", "termlistfilter_" + windowviewid);
1019 1030 $("#btnSearchAA").attr("id", "btnSearchAA_" + windowviewid);
  1031 +
1020 1032 $("#modItemImage").attr("id", "modItemImage_" + windowviewid);
1021 1033  
1022 1034 }
... ... @@ -1045,6 +1057,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1045 1057 // $("#AAImagePanel_" + windowviewid).off("click");
1046 1058  
1047 1059 $("#AAImagePanel_" + windowviewid).on('click', function (event) {
  1060 + $timeout(function () {
  1061 + $scope.IsSearchVisible=false;
  1062 +
  1063 + }, 200);
  1064 +
1048 1065 var pnlName=event.currentTarget.id;
1049 1066 $rootScope.resetMenuOptionOnClick(pnlName);
1050 1067  
... ... @@ -1054,8 +1071,89 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1054 1071 $rootScope.StoreTitleName(currentViewTitle);
1055 1072 $rootScope.StoreOrgImageName(imageName);
1056 1073 });
  1074 +
  1075 + //hide search data
  1076 + $("#topMenuBar .dropdown-toggle").on('click', function (event) {
  1077 +
  1078 + $timeout(function () {
  1079 + $scope.IsSearchVisible=false;
  1080 +
  1081 + }, 200);
  1082 + });
  1083 +
  1084 + //hide search data
  1085 + $("#termlistfilter_"+windowviewid).scroll(function (event) {
  1086 +
  1087 + $("#termlistfilter_"+windowviewid).focus();
  1088 + $scope.IsSearchVisible=true;
  1089 + });
  1090 + // register event for search list manager
  1091 + $(document).on("mouseover", "#termlistfilter_"+windowviewid+ " option", function (e) {
  1092 + $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').removeAttr("style");
  1093 + $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("selected", false);
  1094 + $(this).css("background-color", "#3399FF");
  1095 +
  1096 + $(this).attr("selected", true);
  1097 + $scope.IsSearchVisible=true;
  1098 +
  1099 + });
  1100 +
  1101 + $('#termlistfilter_'+windowviewid).unbind('keyup');
  1102 + $('#termlistfilter_'+windowviewid).on('keyup', function (event) {
  1103 + $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').removeAttr("style");
  1104 + $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("selected", false);
  1105 + $(this.selectedOptions[0]).attr("selected", true);
  1106 + $scope.IsSearchVisible=true;
  1107 + });
  1108 +
  1109 + $('#termlistfilter_'+windowviewid).unbind('keypress');
  1110 + $('#termlistfilter_'+windowviewid).on('keypress', function (e) {
  1111 + if ($('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("id") == "undefined") {
  1112 + return false;
  1113 + }
  1114 + else {
  1115 + if ($('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("id")) {
  1116 + if (e.keyCode == 13) {
  1117 + onSearchItemSelection($('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("id"),false);
  1118 + }
  1119 + }
  1120 + }
  1121 + });
  1122 +
  1123 + // set search for language input
  1124 + $scope.langSearchLoad(windowviewid);
1057 1125  
1058 1126 }
  1127 +
  1128 + $scope.langSearchLoad= function(windowviewid)
  1129 + {
  1130 + $('#searchlangaugeDiv_'+windowviewid).empty();
  1131 + $('#searchlangaugeDiv_'+windowviewid).css("display","none");
  1132 + var languageArray = $rootScope.lexiconLanguageArray;
  1133 +
  1134 + $("#btnSearchAA_"+windowviewid).parent().css("margin-right", "10px");
  1135 +
  1136 + if(languageArray.length>1)
  1137 + {
  1138 + $("#btnSearchAA_"+windowviewid).parent().css("margin-right", "-10px");
  1139 + $('#searchlangaugeDiv_'+windowviewid).css("display","block");
  1140 + var option='';
  1141 + for (var i = 0; i <= languageArray.length - 1; i++) {
  1142 + option=option+'<option value="' + languageArray[i].id + '">' + languageArray[i].language + '</option>';
  1143 + }
  1144 + var $all = $('#searchlangaugeDiv_'+windowviewid).append(
  1145 + '<div class="btn-group col-sm-3 col-xs-3 col-md-2" style="margin-right:-10px">'+
  1146 + '<select class="form-control" id="searchLanguageLm_'+windowviewid+'" onblur="hideSearchList(event)" onchange="changeaaSearchLanguage(event)" style="height:30px;padding:4px 12px">'+
  1147 + option+
  1148 + '</select>'+
  1149 + '</div>'
  1150 + )
  1151 + $compile($all)($scope);
  1152 +
  1153 + }
  1154 +
  1155 + $scope.changeSearchText(windowviewid)
  1156 + }
1059 1157  
1060 1158 $scope.setPreClickBtnCss = function (windowviewid) {
1061 1159 if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins) {
... ... @@ -1118,7 +1216,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1118 1216 $('#' + canvasDraw).removeLayers();//remove all old shape
1119 1217 $("#" + canvasPaint).sketch().actions = [];//remove old paint data
1120 1218  
1121   - var extraheight=$('#aastickeyarea').height()+15;
  1219 + var extraheight=$('#aastickeyarea').height()+5;
1122 1220 var extrawidth=$('.tools').width()+15;
1123 1221 var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
1124 1222 var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
... ... @@ -1169,6 +1267,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1169 1267 scope.showAllPins(windowviewid,true);
1170 1268 break;
1171 1269 }
  1270 +
  1271 + //redraw annotation
  1272 + $scope.SetAAwindowStoreData(windowviewid,'isShowBodyWithCBPinData',true);
  1273 + $scope.ShowCBAnnotation(windowviewid);
1172 1274 // }
1173 1275 });
1174 1276 }
... ... @@ -1229,19 +1331,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1229 1331 selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
1230 1332  
1231 1333 var pinid = $scope.aaOpenInOtherModules.selectedPins[i];
1232   -
1233   - selectedPins.push(pinid);
1234   -
  1334 +
1235 1335 var pinvalue = 'PinArc_' + pinid;
1236 1336 var isFound = jQuery.inArray(pinvalue, activePinArray)
1237 1337 if (isFound == -1) {
1238 1338 activePinArray.push(pinvalue);
1239 1339 clickedPins.push({ 'id': pinid });
  1340 +
  1341 + if (selectedPins != undefined) {
  1342 + selectedPins.push(pinid);
  1343 + $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
  1344 + }
1240 1345 }
1241 1346 }
1242   - if (selectedPins != undefined) {
1243   - $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
1244   - }
  1347 +
1245 1348 }
1246 1349  
1247 1350 if ($scope.aaOpenInOtherModules.selectedCallouts != undefined) {
... ... @@ -1400,7 +1503,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1400 1503  
1401 1504 }
1402 1505  
1403   -
1404 1506 $scope.SetAAwindowStoreData(windowviewid,'isShowBodyWithCBPinData',false);
1405 1507 $rootScope.AAWindowLoadComplete=true;
1406 1508  
... ... @@ -1522,7 +1624,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1522 1624 $scope.activePinOnSliderChange(windowviewid);
1523 1625 }
1524 1626  
1525   - $scope.EnableUI();
  1627 + $scope.EnableAAUI(windowviewid);
1526 1628 }
1527 1629  
1528 1630 }
... ... @@ -1545,13 +1647,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1545 1647 }
1546 1648 },
1547 1649 function (error) {
1548   - $scope.EnableUI();
  1650 + $scope.EnableAAUI(windowviewid);
1549 1651 console.log(' error in showAllPins: ' + error.statusText);
1550 1652 })
1551 1653 }
1552 1654  
1553 1655 $scope.FilterByImage = function (moduleId, query,windowviewid) {
1554   - $scope.DisableUI();
  1656 + $scope.DisableAAUI(windowviewid);
1555 1657 if (windowviewid == undefined) {
1556 1658 windowviewid = $rootScope.MULTI_VIEW_ID;
1557 1659 }
... ... @@ -1719,12 +1821,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1719 1821 }
1720 1822  
1721 1823 $timeout(function () {
1722   - $scope.EnableUI();
  1824 + $scope.EnableAAUI(windowviewid);
1723 1825 $rootScope.ResetGridListLength();
1724 1826 }, 500);
1725 1827 },
1726 1828 function (error) {
1727   - $timeout(function () { $scope.EnableUI(); }, 500);
  1829 + $timeout(function () { $scope.EnableAAUI(windowviewid); }, 500);
1728 1830 console.log(' error: ' + error.statusText);
1729 1831 }
1730 1832 )
... ... @@ -1732,29 +1834,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1732 1834  
1733 1835 $rootScope.ResetGridListLength=function()
1734 1836 {
1735   - var $ua = navigator.userAgent;
1736   -
1737   - if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
  1837 + var innerheight =$(window).innerHeight();
1738 1838  
1739   - var srchHeight=$('.breadcrumb').height();
1740   - var gridheight=screen.height-srchHeight-128;
1741   - var listheight=screen.height-srchHeight-352;
1742   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
1743   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
1744   - }
1745   - else
1746   - {
1747   - var srchHeight=$('.breadcrumb').height();
1748   - var gridheight=screen.height-srchHeight-276;
1749   - var listheight=screen.height-srchHeight-500;
1750   - $('#grid-view').css({"height":gridheight,"overflow":"auto"});
1751   - $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
1752   - }
1753   -
  1839 + var srchHeight=$('.breadcrumb').height();
  1840 + var gridheight=innerheight-srchHeight-135;
  1841 + var listheight=innerheight-srchHeight-358;
  1842 + $('#grid-view').css({"height":gridheight,"overflow":"auto","min-height":"160px"});
  1843 + $('#ListViewDiv').css({"height":listheight,"overflow":"auto","min-height":"100px"});
  1844 +
1754 1845 }
1755 1846  
1756 1847 $scope.Reset = function (moduleId, query,windowviewid) {
1757   - $scope.DisableUI();
  1848 + $scope.DisableAAUI(windowviewid);
1758 1849 if(windowviewid==undefined) // call from also home controller list manager
1759 1850 windowviewid= $rootScope.MULTI_VIEW_ID;
1760 1851  
... ... @@ -1791,6 +1882,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1791 1882 if (typeof event == "object") {
1792 1883 var len= (event.target.parentElement.parentElement.id).split("_").length;
1793 1884 var windowviewid = (event.target.parentElement.parentElement.id).split("_")[len-1];
  1885 +
  1886 + $('#selectedTermName_' + windowviewid).val('');
  1887 + $("#selectedTermName_" + windowviewid).attr("name", '0');
1794 1888 if (event.currentTarget.title == $("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title")) {
1795 1889  
1796 1890 }
... ... @@ -1808,6 +1902,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1808 1902 $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
1809 1903 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
1810 1904 $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', id);
  1905 + $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
1811 1906 }
1812 1907  
1813 1908 var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
... ... @@ -1826,7 +1921,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1826 1921 $(bodySystemListObj[i].parentElement).addClass("activeAASystemSelect");
1827 1922 }
1828 1923 }
1829   - $scope.DisableUI();
  1924 + $scope.DisableAAUI(windowviewid);
1830 1925  
1831 1926 $scope.removeSpeechBubble(windowviewid);
1832 1927 if (SelectedSystemID == "0") {
... ... @@ -1923,7 +2018,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1923 2018  
1924 2019 var SelectedSystemTitle = $("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title");
1925 2020  
1926   - $scope.DisableUI();
  2021 + $scope.DisableAAUI(windowviewid);
1927 2022  
1928 2023 var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
1929 2024 $scope.removeSpeechBubble(windowviewid);
... ... @@ -1956,6 +2051,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
1956 2051 $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
1957 2052 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
1958 2053 $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', SelectedSystemID);
  2054 + $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
1959 2055 }
1960 2056 var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
1961 2057 if(clickedPins.length>0)
... ... @@ -2034,16 +2130,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2034 2130 .select();
2035 2131  
2036 2132  
2037   - var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
2038   - for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) {
2039   - var pinvalue='PinArc_' + pinDataWithFirstTermNumber[i]._PinId;
2040   - var isFound = jQuery.inArray(pinvalue, activePinArray)
2041   - if (isFound == -1) {
2042   - activePinArray.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId);
2043   - }
2044   -
2045   - }
2046   -
2047 2133 $scope.MultiLanguageAnnationArray = [];
2048 2134  
2049 2135 $scope.GetAnnotationBasedOnActualTermNo(pinTermNumber,windowviewid);
... ... @@ -2101,29 +2187,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2101 2187 if (pinDataWithFirstTermNumber.length > 1) {
2102 2188 isSameTermWithMultiPin = true;
2103 2189 }
2104   - var selectedPins=$scope.GetAAwindowStoreData(windowviewid,'selectedPins');
2105 2190 var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
  2191 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  2192 + var selectedPins=$scope.GetAAwindowStoreData(windowviewid,'selectedPins');
  2193 +
2106 2194 angular.forEach(pinDataWithFirstTermNumber, function (value, key) {
2107   - if (isBodySystemSelected == true) {
2108   -
2109   - clickedPins.push({ 'id': value._PinId });
2110   - //selectedPins.push(value._PinId);
  2195 + if (isBodySystemSelected == true) {
2111 2196 $scope.SetAAwindowStoreData(windowviewid,'isBodySystemSelected',false);
2112 2197 }
2113 2198 var headX = (parseInt(value._HeadX));
2114 2199 var headY = (parseInt(value._HeadY));
2115   - $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10,0,0, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin,windowviewid);
2116   -
2117   - // remove annotation/speechBubble while resize
2118   - if(isResize)
2119   - {
2120   - $scope.removeSpeechBubble(windowviewid);
2121   - }
2122   -
2123   - //Save Cordinate for show annotation as per Pin
2124   -
2125   - if ($rootScope.isCallFromOtherModule) {
2126   -
  2200 +
  2201 + var pinvalue='PinArc_' + value._PinId;
  2202 + var isFound = jQuery.inArray(pinvalue, activePinArray)
  2203 + if (isFound == -1) {
  2204 + activePinArray.push(pinvalue);
  2205 + clickedPins.push({ 'id': value._PinId });
  2206 + selectedPins.push(value._PinId);
  2207 +
  2208 + //Save Cordinate for show annotation as per Pin
2127 2209 var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
2128 2210 CBselectedpinCordinate.push(
2129 2211 {
... ... @@ -2133,12 +2215,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2133 2215 "lx": headX+30,
2134 2216 "pinId": value._PinId
2135 2217 });
  2218 +
2136 2219 }
  2220 +
  2221 + // remove annotation/speechBubble while resize
  2222 + if(isResize)
  2223 + {
  2224 + $scope.removeSpeechBubble(windowviewid);
  2225 + }
  2226 + else
  2227 + {
  2228 + $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10,0,0, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin,windowviewid);
  2229 +
  2230 + }
2137 2231  
2138 2232 })
2139 2233  
2140 2234 }
2141   - $scope.EnableUI();
  2235 + $scope.EnableAAUI(windowviewid);
2142 2236  
2143 2237 }
2144 2238  
... ... @@ -2277,6 +2371,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2277 2371 //
2278 2372 $scope.ShowHideAnnotationText(windowviewid);
2279 2373  
  2374 + if ($("#hidePinBtn_" + windowviewid).hasClass("btn-primary")) {
  2375 +
  2376 + $scope.hideSpeechBubble(windowviewid);
  2377 + }
  2378 +
2280 2379 }
2281 2380  
2282 2381 $scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, lx, ly, PinId, windowviewid) {
... ... @@ -2473,20 +2572,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2473 2572 var windowviewid = (clickedSpeechBubbleId).split("_")[len - 1];
2474 2573 var sppechBubbleId = $(this).attr("id").substring(12);
2475 2574 var PinId = sppechBubbleId.split("_")[0];
  2575 + $rootScope.UnsaveCurriculum = true;
  2576 + $timeout(function () {
  2577 + var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
  2578 + var BubleObj = document.getElementById(clickedSpeechBubbleId);
  2579 + var CBselectedpinCordinate = new jinqJs()
  2580 + .from(CBselectedpinCordinate)
  2581 + .update(function (coll, index) { coll[index].lx = BubleObj.offsetLeft; coll[index].ly = BubleObj.offsetTop; })
  2582 + .at("pinId == " + PinId);
2476 2583  
2477   - if ($rootScope.isCallFromOtherModule) {
2478   - $rootScope.UnsaveCurriculum = true;
2479   - $timeout(function () {
2480   - var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
2481   - var BubleObj = document.getElementById(clickedSpeechBubbleId);
2482   - var CBselectedpinCordinate = new jinqJs()
2483   - .from(CBselectedpinCordinate)
2484   - .update(function (coll, index) { coll[index].lx = BubleObj.offsetLeft; coll[index].ly = BubleObj.offsetTop; })
2485   - .at("pinId == " + PinId);
2486   -
2487   - }, 100);
  2584 + }, 100);
2488 2585  
2489   - }
2490 2586 }
2491 2587  
2492 2588 });
... ... @@ -2502,17 +2598,29 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2502 2598 $('#speechBubble' + pinId+'_'+windowviewid).remove();
2503 2599 $("#speechBubbleDraggedLine" + pinId+'_'+windowviewid).remove();
2504 2600 $("#speechBubbleLine" + pinId + '_' + windowviewid).remove();
  2601 + var CBselectedpinCordinate = [];
  2602 + CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
  2603 + CBselectedpinCordinate = new jinqJs()
  2604 + .from(CBselectedpinCordinate)
  2605 + .delete().at("pinId == " + pinId).select();
2505 2606  
2506   - if ($rootScope.isCallFromOtherModule) {
2507   - var CBselectedpinCordinate = [];
2508   - CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
2509   - CBselectedpinCordinate = new jinqJs()
2510   - .from(CBselectedpinCordinate)
2511   - .delete().at("pinId == " + pinId).select();
  2607 + $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', CBselectedpinCordinate);
  2608 +
  2609 + var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
  2610 + clickedPins = new jinqJs()
  2611 + .from(clickedPins)
  2612 + .delete().at("id == " + pinId).select();
2512 2613  
2513   - $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', CBselectedpinCordinate);
2514   - $rootScope.UnsaveCurriculum = true;
  2614 + $scope.SetAAwindowStoreData(windowviewid, 'clickedPins', clickedPins);
  2615 +
  2616 + var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
  2617 +
  2618 + const index = activePinArray.indexOf("PinArc_"+pinId);
  2619 + if (index > -1) {
  2620 + activePinArray.splice(index, 1);
2515 2621 }
  2622 + $scope.GetAAwindowStoreData(windowviewid,'activePinArray',activePinArray);
  2623 + $rootScope.UnsaveCurriculum = true;
2516 2624  
2517 2625 });
2518 2626  
... ... @@ -2627,92 +2735,118 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2627 2735 click: function (clickedPin) {
2628 2736  
2629 2737 $rootScope.UnsaveCurriculum =true;
  2738 + $('#selectedTermName_' + windowviewid).val('');
  2739 + $("#selectedTermName_" + windowviewid).attr("name", '0');
2630 2740 //birendra
  2741 + var iskeyctrlActive= $scope.GetAAwindowStoreData(windowviewid, 'keyctrl');//for iPad
2631 2742 // for mac os Command key use for multi selection
2632   - if (clickedPin.event.ctrlKey == false && clickedPin.event.metaKey == false) {
  2743 + if (clickedPin.event.ctrlKey == false && clickedPin.event.metaKey == false && !iskeyctrlActive) {
2633 2744 $scope.SetAAwindowStoreData(windowviewid, 'clickedPins', []);
2634 2745 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
2635 2746 $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
  2747 + $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
2636 2748 }
2637   - var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
2638   - var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
2639   - var pinData = new jinqJs()
2640   - .from(aaPinData)
2641   - .where("_PinId == " + pinID)
2642   - .select();
2643   -
2644   -
2645   - var pinTermNumber = pinData[0]._TermId;
2646   -
2647   - var pinWithSameTerm = new jinqJs()
2648   -
2649   - .from(aaPinData)
2650   - .where("_TermId == " + pinTermNumber)
2651   - .select();
2652   - if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
2653   - var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
2654   - var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
2655   - for (var i = 0; i < pinWithSameTerm.length; i++) {
2656   - clickedPins.push({ 'id': pinWithSameTerm[i]._PinId });
2657   - selectedPins.push(pinWithSameTerm[i]._PinId);
2658   - }
2659   - }
2660   -
2661   - $scope.SetAAwindowStoreData(windowviewid,'isSelectedPinBtnClickedAftrSliderCange',false);
2662   - var selectedPinData = new jinqJs()
2663   - .from(aaPinData)
2664   - .where("_PinId == " + pinID)
2665   - .select();
2666   -
  2749 +
2667 2750 var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
2668   - if (clickedPin.event.ctrlKey == true||clickedPin.event.metaKey == true) {
2669   - var isFound = jQuery.inArray(clickedPin.name, activePinArray)
2670   - if (isFound == -1) {
2671   - activePinArray.push(clickedPin.name);
2672   - }
2673   - var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
2674   - x1: 50, y1: 50,
2675   - x2: 50, y2: 50,
2676   - r1: 10, r2: 30,
2677   - c1: 'rgba(100, 50, 0,0)',
2678   - c2: 'rgb(126, 187, 83)'
2679   - });
2680   - clickedPin.fillStyle = radialAfterClick;
2681   - $scope.showAnnotation(selectedPinData, true, true, false,false, windowviewid);
2682   - }
2683   - else {
2684   - $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
2685   - var activePin = [];
2686   - activePin.push(clickedPin.name);
2687   - $scope.SetAAwindowStoreData(windowviewid,'activePinArray',activePin);
2688   -
2689   - var radial = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
2690   - x1: 50, y1: 50,
2691   - x2: 50, y2: 50,
2692   - r1: 10, r2: 30,
2693   - c1: 'rgba(100, 50, 0,0)',
2694   - c2: 'rgb(216, 216, 216)'
2695   - });
2696   -
2697   -
2698   - $('#aaDetailViewCanvas_' + windowviewid).setLayers({
2699   - fillStyle: radial,
2700   - }).drawLayers();
2701   -
2702   - //change the head color to green
2703   - var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
2704   - x1: 50, y1: 50,
2705   - x2: 50, y2: 50,
2706   - r1: 10, r2: 30,
2707   - c1: 'rgba(100, 50, 0,0)',
2708   - c2: 'rgb(126, 187, 83)'
2709   - });
  2751 + var isFound = jQuery.inArray(clickedPin.name, activePinArray)
  2752 + if (isFound == -1) {
  2753 + activePinArray.push(clickedPin.name);
  2754 +
  2755 + var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
  2756 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  2757 + var pinData = new jinqJs()
  2758 + .from(aaPinData)
  2759 + .where("_PinId == " + pinID)
  2760 + .select();
  2761 +
  2762 +
  2763 + var pinTermNumber = pinData[0]._TermId;
  2764 +
  2765 + var pinWithSameTerm = new jinqJs()
  2766 +
  2767 + .from(aaPinData)
  2768 + .where("_TermId == " + pinTermNumber)
  2769 + .select();
  2770 + if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
  2771 + var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
  2772 + var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
  2773 + for (var i = 0; i < pinWithSameTerm.length; i++) {
  2774 + clickedPins.push({ 'id': pinWithSameTerm[i]._PinId });
  2775 + selectedPins.push(pinWithSameTerm[i]._PinId);
  2776 + //some time get multiple pinid on selected termid
  2777 + var pinvalue='PinArc_' + pinWithSameTerm[i]._PinId;
  2778 + var isFound = jQuery.inArray(pinvalue, activePinArray)
  2779 + if (isFound == -1) {
  2780 + activePinArray.push(pinvalue);
  2781 + }
2710 2782  
2711   - clickedPin.fillStyle = radialAfterClick;
2712   - $scope.showAnnotation(selectedPinData, false, true, false,false, windowviewid);
  2783 + var headX = (parseInt(pinWithSameTerm[i]._HeadX));
  2784 + var headY = (parseInt(pinWithSameTerm[i]._HeadY));
  2785 + //Save Cordinate for show annotation as per Pin
  2786 + var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
  2787 + CBselectedpinCordinate.push(
  2788 + {
  2789 + "hy": headY,
  2790 + "ly": headY+10,
  2791 + "hx": headX,
  2792 + "lx": headX+30,
  2793 + "pinId": pinWithSameTerm[i]._PinId
  2794 + });
2713 2795  
2714   - }
  2796 + }
  2797 + }
  2798 +
  2799 + $scope.SetAAwindowStoreData(windowviewid,'isSelectedPinBtnClickedAftrSliderCange',false);
  2800 + var selectedPinData = new jinqJs()
  2801 + .from(aaPinData)
  2802 + .where("_PinId == " + pinID)
  2803 + .select();
  2804 +
  2805 + if (clickedPin.event.ctrlKey == true||clickedPin.event.metaKey == true ||iskeyctrlActive) {
  2806 +
  2807 + var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
  2808 + x1: 50, y1: 50,
  2809 + x2: 50, y2: 50,
  2810 + r1: 10, r2: 30,
  2811 + c1: 'rgba(100, 50, 0,0)',
  2812 + c2: 'rgb(126, 187, 83)'
  2813 + });
  2814 + clickedPin.fillStyle = radialAfterClick;
  2815 + $scope.showAnnotation(selectedPinData, true, true, false,false, windowviewid);
  2816 + }
  2817 + else
  2818 + {
  2819 + var radial = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
  2820 + x1: 50, y1: 50,
  2821 + x2: 50, y2: 50,
  2822 + r1: 10, r2: 30,
  2823 + c1: 'rgba(100, 50, 0,0)',
  2824 + c2: 'rgb(216, 216, 216)'
  2825 + });
  2826 +
  2827 +
  2828 + $('#aaDetailViewCanvas_' + windowviewid).setLayers({
  2829 + fillStyle: radial,
  2830 + }).drawLayers();
  2831 +
  2832 + //change the head color to green
  2833 + var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
  2834 + x1: 50, y1: 50,
  2835 + x2: 50, y2: 50,
  2836 + r1: 10, r2: 30,
  2837 + c1: 'rgba(100, 50, 0,0)',
  2838 + c2: 'rgb(126, 187, 83)'
  2839 + });
  2840 +
  2841 + clickedPin.fillStyle = radialAfterClick;
  2842 + $scope.showAnnotation(selectedPinData, false, true, false,false, windowviewid);
  2843 +
  2844 + }
  2845 +
  2846 +
  2847 + }
2715 2848  
  2849 +
2716 2850 }
2717 2851  
2718 2852 }).drawLayers();
... ... @@ -2750,77 +2884,87 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2750 2884  
2751 2885 }
2752 2886  
  2887 + //Reload Body View after setting Change
  2888 + $rootScope.reloadAABodyViewEvent = function (isLexiconChange, windowviewid) {
  2889 +
  2890 + $scope.loadaaBodyViewChangedBySetting(windowviewid,isLexiconChange);
  2891 + }
  2892 +
  2893 + $scope.loadaaBodyViewChangedBySetting = function (windowviewid, isLexiconChange) {
  2894 + $scope.DisableAAUI(windowviewid);
  2895 +
  2896 + // store image for export while click on panel
  2897 + var currentViewTitle = $scope.GetAAwindowStoreData(windowviewid, 'currentViewTitle');
  2898 + var imageName = $scope.GetAAwindowStoreData(windowviewid, 'imageName');
  2899 +
  2900 + $rootScope.StoreTitleName(currentViewTitle);
  2901 + $rootScope.StoreOrgImageName(imageName);
  2902 +
  2903 + var timeintval=$scope.SetAAwindowStoreData(windowviewid,'intervalObject');
  2904 + if(isLexiconChange)
  2905 + {
  2906 + // remove first annotation text
  2907 + $scope.removeSpeechBubble(windowviewid);
  2908 +
  2909 + //load term data and also language data
  2910 + $rootScope.loadPinSearchData(windowviewid);
  2911 + timeintval = $interval(function(){loadaaBodyViewBySetting(windowviewid)},5);
  2912 + $scope.SetAAwindowStoreData(windowviewid,'intervalObject',timeintval);
  2913 + function loadaaBodyViewBySetting(panid) {
  2914 + var pinTermData = $scope.GetAAwindowStoreData(panid, 'pinTermData');
  2915 + if (pinTermData!=null) {
  2916 + var intval=$scope.GetAAwindowStoreData(panid,'intervalObject');
  2917 + $scope.stopVocab(intval);
  2918 + $scope.langSearchLoad(panid);
  2919 + $scope.SetAAwindowStoreData(panid,'isShowBodyWithCBPinData',true);
  2920 + //loading annotation
  2921 + $scope.ShowCBAnnotation(panid);
  2922 +
  2923 + $timeout(function () {
  2924 + if ($rootScope.isListManagerMenuSelected) {
  2925 + var selectedPanel = $("#viewName option:selected").val();
  2926 + var winid = (selectedPanel).split("_")[1];
  2927 + if(winid==panid)
  2928 + {
  2929 + $scope.DisableAAUI(panid);
  2930 + $rootScope.aalistManagerEvent(panid);
  2931 + }
  2932 + }
  2933 +
  2934 + }, 200);
  2935 +
  2936 + $scope.EnableAAUI(panid);
  2937 + }
  2938 + else
  2939 + {
  2940 + console.log("waiting for search term Data");
  2941 + }
  2942 + }
  2943 +
  2944 + $scope.stopVocab = function (intvalobj) {
  2945 + if (angular.isDefined(intvalobj)) {
  2946 + $interval.cancel(intvalobj);
  2947 + intvalobj = undefined;
  2948 + }
  2949 + };
  2950 +
  2951 + }
  2952 +
  2953 + }
  2954 +
2753 2955 $rootScope.aaloadSearchData = function (windowviewid) {
2754 2956  
2755 2957 var imageId= $scope.GetAAwindowStoreData(windowviewid,'imageId');
  2958 + $scope.SetAAwindowStoreData(windowviewid,'pinTermData',[]);
2756 2959 var promise = ModuleService.getTermTextDataForAAImage(imageId)
2757 2960 .then(
2758 2961 function (response) {
2759 2962 var AAPinTermData = response.data.PinTermData.TermData;
2760 2963 $scope.SetAAwindowStoreData(windowviewid,'AAPinTermData',AAPinTermData)
2761 2964  
2762   - $scope.EnableUI();
2763   -
2764   - $scope.SetAAwindowStoreData(windowviewid,'pinTermData',[]);
  2965 + $scope.EnableAAUI(windowviewid);
  2966 + $rootScope.loadPinSearchData(windowviewid);
2765 2967  
2766   - var primaryLexicon = $rootScope.lexiconLanguageArray[0].id;
2767   - var matchedLanguageTermData = new jinqJs()
2768   - .from(AAPinTermData)
2769   - .where('_LanguageId == ' + primaryLexicon)
2770   - .select();
2771   - var sortedTermTextArray = [];
2772   - for (var i = 0; i < matchedLanguageTermData.length; i++) {
2773   - sortedTermTextArray.push(matchedLanguageTermData[i]._TermText);
2774   - sortedTermTextArray.sort();
2775   - }
2776   -
2777   - var pinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');
2778   -
2779   - for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
2780   - for (var j = 0; j <= matchedLanguageTermData.length - 1; j++) {
2781   - if (matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) {
2782   - pinTermData.push({ "LanguageId": matchedLanguageTermData[j]._LanguageId, "TermNumber": matchedLanguageTermData[j]._TermNumber, "TermTxt": matchedLanguageTermData[j]._TermText });
2783   - break;
2784   - }
2785   - }
2786   - }
2787   -
2788   - $("#AABodySystems").empty();
2789   - $("#bodySystems").css("display", "none");
2790   - $("#langaugeDivLm").css("display", "none");
2791   - $("#AABodySystems").css("display", "block");
2792   - $("#bodySystemList_" + windowviewid + " li a").each(function (key, value) {
2793   - var sysid= $(this).attr('id') + '_' +windowviewid;
2794   -
2795   - if ($(this).parent().hasClass("disabledSelectedSystem")) {
2796   - var $systemOptions = $('<option id=' + sysid+' disabled style="color:#d0c9c9" >' + $(this).text() + '</option>').appendTo("#AABodySystems")
2797   - $compile($systemOptions)($scope);
2798   - }
2799   - else{
2800   - var $systemOptions = $('<option id=' + sysid+' >' + $(this).text() + '</option>').appendTo("#AABodySystems")
2801   - $compile($systemOptions)($scope);
2802   - }
2803   -
2804   - });
2805   -
2806   - $scope.$watch('pinTermData', function (newValue, oldValue, scope) {
2807   -
2808   - $('#termlistfilter_' + windowviewid).empty();
2809   - if (pinTermData.length > 0) {
2810   - $timeout(function () {
2811   - console.log('pinTermData= ' + pinTermData.length);
2812   - $('#termList').empty();
2813   - $('#termlistfilter_' + windowviewid).empty();
2814   - for (var j = 0; j < pinTermData.length; j++) {
2815   - var $el = $('<li><a id= "' + pinTermData[j].TermNumber +'_' +windowviewid+ '" href="" onclick="onSearchItemSelection(this.id)" >' + pinTermData[j].TermTxt + '</a></li>').appendTo('#termlistfilter_' + windowviewid)
2816   - $compile($el)($scope);
2817   - var $selectedOptions = $('<option title= "' + pinTermData[j].TermTxt + '" id= "' + pinTermData[j].TermNumber +'_' +windowviewid+ '" >' + pinTermData[j].TermTxt + '</option>').appendTo('#termList')
2818   -
2819   - $compile($selectedOptions)($scope);
2820   - }
2821   - }, 500);
2822   - }
2823   - })
2824 2968 },
2825 2969 function (error) {
2826 2970 // handle errors here
... ... @@ -2830,118 +2974,349 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2830 2974  
2831 2975  
2832 2976 }
  2977 + $rootScope.loadPinSearchData = function (windowviewid) {
  2978 + var AAPinTermData= $scope.GetAAwindowStoreData(windowviewid,'AAPinTermData')
  2979 + for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
  2980 +
  2981 + var lexiconId = $rootScope.lexiconLanguageArray[i].id;
  2982 + var matchedLanguageTermData = new jinqJs()
  2983 + .from(AAPinTermData)
  2984 + .where('_LanguageId == ' + lexiconId)
  2985 + .select();
  2986 +
  2987 + if(matchedLanguageTermData.length>0)
  2988 + {
  2989 + if(i==0)
  2990 + {
  2991 + $scope.SetAAwindowStoreData(windowviewid, 'pinTermData', matchedLanguageTermData);
  2992 + }
  2993 + else
  2994 + {
  2995 + var pinTermData = $scope.GetAAwindowStoreData(windowviewid, 'pinTermData');
  2996 + var result=pinTermData.concat(matchedLanguageTermData);
  2997 + $scope.SetAAwindowStoreData(windowviewid, 'pinTermData', result);
  2998 +
  2999 + }
  3000 + }
  3001 +
  3002 + }
  3003 +
  3004 + }
  3005 +
2833 3006 //event remove it fire multiple time
2834 3007 $rootScope.aalistManagerEvent=function(windowviewid){
2835   - $scope.DisableUI();
2836 3008  
2837   - $rootScope.aaloadSearchData(windowviewid);
  3009 + $scope.DisableAAUI(windowviewid);
  3010 + $("#langaugeDivLm").css("display", "none");
  3011 +
  3012 + $("#AABodySystems").empty();
  3013 + $("#bodySystems").css("display", "none");
  3014 + $("#langaugeDivLm").css("display", "none");
  3015 + $("#AABodySystems").css("display", "block");
  3016 + $('#termList').empty();
  3017 +
  3018 + var totalstructure=0;
  3019 + $rootScope.isListManagerMenuSelected = true;
  3020 +
  3021 + $scope.SetAAwindowStoreData(windowviewid,'totalstructureLm',0);
  3022 + var languageArray = $rootScope.lexiconLanguageArray;
  3023 +
  3024 + if(languageArray.length>1)
  3025 + {
  3026 + $("#langaugeDivLm").css("display", "block");
  3027 + $("#selectLanguageLm").empty();
  3028 + for (var i = 0; i <= languageArray.length - 1; i++) {
  3029 + $('#selectLanguageLm').append('<option value="' + languageArray[i].id + '">' + languageArray[i].language + '</option>');
  3030 + }
  3031 + }
  3032 +
  3033 + var $all = $('<option id="0_'+windowviewid+'" selected="">All</option>').appendTo('#AABodySystems');
  3034 + $compile($all)($scope);
  3035 +
  3036 + $("#bodySystemList_" + windowviewid + " li a").each(function (key, value) {
  3037 + if($(this).attr('id')!="0")
  3038 + {
  3039 + var sysid= $(this).attr('id') + '_' +windowviewid;
  3040 +
  3041 + if ($(this).parent().hasClass("disabledSelectedSystem")) {
  3042 + var $systemOptions = $('<option id=' + sysid+' disabled style="color:#d0c9c9" >' + $(this).text() + '</option>').appendTo("#AABodySystems")
  3043 + $compile($systemOptions)($scope);
  3044 + }
  3045 + else{
  3046 + var $systemOptions = $('<option id=' + sysid+' >' + $(this).text() + '</option>').appendTo("#AABodySystems")
  3047 + $compile($systemOptions)($scope);
  3048 + }
  3049 + }
  3050 +
  3051 + });
  3052 +
  3053 +
  3054 + // primary language
  3055 + var langId=languageArray[0].id;
  3056 + $scope.loadaaListManger(windowviewid,langId,totalstructure);
  3057 +
  3058 + }
  3059 +
  3060 + $rootScope.changeLanguageLmEventAA = function (windowviewid) {
  3061 + $scope.DisableAAUI(windowviewid);
  3062 + $('#termList').empty();
  3063 + var totalstructure=0;
  3064 + $scope.SetAAwindowStoreData(windowviewid,'totalstructure',0);
  3065 +
  3066 + var langIdvalue = $("#selectLanguageLm option:selected").val();
  3067 +
  3068 + setTimeout(function () {
  3069 +
  3070 + if(langIdvalue!=undefined)
  3071 + {
  3072 + var selectedLanguage = new jinqJs()
  3073 + .from( $rootScope.lexiconLanguageArray)
  3074 + .where('id == ' + langIdvalue)
  3075 + .select()[0];
  3076 +
  3077 + var langId=selectedLanguage.id;
  3078 +
  3079 + }
  3080 + else
  3081 + {
  3082 + var langId=$rootScope.lexiconLanguageArray[0].id;
  3083 + }
  3084 +
  3085 + var sysid = $("#AABodySystems option:selected").attr("id");
  3086 + var bodysystemId = (sysid).split("_")[0];
  3087 + if(bodysystemId=="0")
  3088 + {
  3089 + $scope.loadaaListManger(windowviewid,langId,totalstructure);
  3090 + }
  3091 + else
  3092 + {
  3093 + $scope.aasystemMatchTermLoad(bodysystemId,windowviewid,langId,totalstructure);
  3094 + }
  3095 +
  3096 + },100)
  3097 +
  3098 + }
  3099 +
  3100 + $rootScope.LoadMoreLmEventAA = function (windowviewid) {
  3101 + $scope.DisableAAUI(windowviewid);
  3102 + var langIdvalue = $("#selectLanguageLm option:selected").val();
  3103 + var totalstructure = $scope.GetAAwindowStoreData(windowviewid, 'totalstructureLm');
  3104 +
  3105 + setTimeout(function () {
  3106 +
  3107 + if(langIdvalue!=undefined)
  3108 + {
  3109 + var selectedLanguage = new jinqJs()
  3110 + .from( $rootScope.lexiconLanguageArray)
  3111 + .where('id == ' + langIdvalue)
  3112 + .select()[0];
  3113 +
  3114 + var langId=selectedLanguage.id;
  3115 +
  3116 + }
  3117 + else
  3118 + {
  3119 + var langId=$rootScope.lexiconLanguageArray[0].id;
  3120 + }
  3121 +
  3122 + var sysid = $("#AABodySystems option:selected").attr("id");
  3123 + var bodysystemId = (sysid).split("_")[0];
  3124 + if(bodysystemId=="0")
  3125 + {
  3126 + $scope.loadaaListManger(windowviewid,langId,totalstructure);
  3127 + }
  3128 + else
  3129 + {
  3130 + $scope.aasystemMatchTermLoad(bodysystemId,windowviewid,langId,totalstructure);
  3131 + }
  3132 +
  3133 + }, 100);
  3134 +
  3135 + }
  3136 +
  3137 + $scope.loadaaListManger = function (windowviewid,langId,totalstructure) {
2838 3138  
2839   - $timeout(function () {
2840   - $("#totalTermsLm").empty();
2841   - $("#totalTermsLm").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
2842   - $scope.EnableUI();
2843   - }, 1000);
  3139 + var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
  3140 +
  3141 + var languageTermDataArray = new jinqJs()
  3142 + .from( selectedpinTermData)
  3143 + .where('_LanguageId == ' + langId)
  3144 + .select();
2844 3145  
  3146 +
  3147 + var afterskipdata = new jinqJs()
  3148 + .from(languageTermDataArray)
  3149 + .skip(totalstructure)
  3150 + .select();
  3151 +
  3152 + var limitTofilterdata = $filter('limitTo')(afterskipdata, 500);
  3153 +
  3154 + var matchTermDataFilter = new jinqJs()
  3155 + .from(limitTofilterdata)
  3156 + .distinct('_TermText', '_TermNumber')
  3157 + .orderBy([{ field: '_TermText', sort: 'asc' }])
  3158 + .select('_TermNumber', '_TermText');
  3159 +
  3160 + var option='';
  3161 +
  3162 + angular.forEach(matchTermDataFilter, function (value2, key2) {
  3163 + totalstructure=totalstructure+1;
  3164 + option=option+'<option id=' + value2._TermNumber +'_' +windowviewid+ ' style="margin-right:-12px">' + value2._TermText + '</option>';
  3165 +
  3166 + })
  3167 + var $el = $(option).appendTo('#termList')
  3168 + $compile($el)($scope);
  3169 +
  3170 + $scope.SetAAwindowStoreData(windowviewid,'totalstructureLm',totalstructure);
  3171 + var termsTotal = '<span class="pull-left marginTop5">' + totalstructure + ' Structures</span>';
  3172 +
  3173 + $("#totalTermsLm").empty();
  3174 + $("#totalTermsLm").append(termsTotal);
  3175 +
  3176 + if(totalstructure < languageTermDataArray.length)
  3177 + {
  3178 + $("#totalTermsLm").append('<button type="button" id="btlLoadMoreLm" class="btn btn-primary btn-block" onclick="LoadMoreLm(event)" style="width:65%;float:right">Load More Structures..</button>');
  3179 + }
  3180 + else
  3181 + {
  3182 + $("#totalTermsLm").append('<button type="button" id="btlLoadMoreLm" class="btn btn-primary btn-block" onclick="LoadMoreLm(event)" style="width:65%;float:right">Load More Structures..</button>');
  3183 + $('#btlLoadMoreLm').attr('disabled', 'disabled');
  3184 + }
  3185 +
  3186 + $scope.EnableAAUI(windowviewid);
  3187 +
2845 3188 }
2846 3189  
2847 3190 $rootScope.refreshTermListOnAASystemSelection = function (selectedBodysystemId) {
2848 3191 var windowviewid = (selectedBodysystemId).split("_")[1];
  3192 + var bodysystemId = (selectedBodysystemId).split("_")[0];
2849 3193 $("#AABodySystems").find("option:not(:disabled)").css({ "background-color": "#ffffff", "color": "#000000" });
2850 3194 $("#AABodySystems").find("option[id=" + selectedBodysystemId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
2851 3195 $('#termList').empty();
2852   - var bodySystemName = $("#AABodySystems #" + selectedBodysystemId).val();
  3196 + // var bodySystemName = $("#AABodySystems #" + selectedBodysystemId).val();
  3197 +
  3198 + $scope.SetAAwindowStoreData(windowviewid, 'totalstructureLm',0);
  3199 + var totalstructure = 0;
  3200 + var langIdvalue = $("#selectLanguageLm option:selected").val();
  3201 + if(langIdvalue!=undefined)
  3202 + {
  3203 + var selectedLanguage = new jinqJs()
  3204 + .from( $rootScope.lexiconLanguageArray)
  3205 + .where('id == ' + langIdvalue)
  3206 + .select()[0];
2853 3207  
2854   - if (bodySystemName == "All") {
2855   - var pinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');
2856   - for (var j = 0; j <= pinTermData.length - 1; j++) {
2857   - var $selectedOptions = $('<option title= "' + pinTermData[j].TermTxt + '" id= "' + pinTermData[j].TermNumber +'_'+windowviewid+ '">' + pinTermData[j].TermTxt + '</option>').appendTo("#termList")
  3208 + var langId=selectedLanguage.id;
2858 3209  
2859   - $compile($selectedOptions)($scope);
2860 3210 }
2861   - $("#totalTermsLm").empty();
2862   - $("#totalTermsLm").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
2863   - }
2864   - else {
2865   - var imageId = $scope.GetAAwindowStoreData(windowviewid,'imageId');
2866   - var pinDataUrl = "aa_dat_pinterm_" + imageId;
2867   - var bodySystemTermArray = [];
2868   - var sortedListArray = [];
2869   - var duplicateListArray = [];
2870   - $.ajax({
2871   - url: '~/../content/data/json/aa/aa_pinterm/' + pinDataUrl + '.json',
2872   - type: 'GET',
2873   - dataType: "json",
2874   - async: false,
2875   - success: function (result) {
2876   - $(result.PinTermData.TermData).each(function (key, value) {
2877   - bodySystemTermArray.push({ "termNumbr": result.PinTermData.TermData[key]._TermNumber, "text": result.PinTermData.TermData[key]._TermText, "language": result.PinTermData.TermData[key]._LanguageId });
2878   - });
  3211 + else
  3212 + {
  3213 + var langId=$rootScope.lexiconLanguageArray[0].id;
  3214 + }
2879 3215  
2880   - var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
2881   - for (var i = 0; i <= aaPinData.length - 1; i++) {
  3216 + if(bodysystemId=="0")
  3217 + {
  3218 + setTimeout(function () {
  3219 + $scope.loadaaListManger(windowviewid,langId,totalstructure);
  3220 +
  3221 + }, 100);
  3222 + }
  3223 + else
  3224 + {
  3225 + $scope.aasystemMatchTermLoad(bodysystemId,windowviewid,langId,totalstructure);
  3226 + }
2882 3227  
2883   - if (aaPinData[i]._BodySystemName.toLowerCase() == bodySystemName.toLowerCase()) {
  3228 + }
2884 3229  
2885   - for (var j = 0 ; j <= bodySystemTermArray.length - 1; j++) {
2886   - if (aaPinData[i]._TermId == bodySystemTermArray[j].termNumbr) {
2887   - if (bodySystemTermArray[j].language == $rootScope.lexiconLanguageArray[0].id) {
2888   - duplicateListArray.push({ "title": bodySystemTermArray[j].text, "id": bodySystemTermArray[j].termNumbr });
2889   - }
2890   - }
2891   - }
2892   - }
2893   - }
2894   - var temp = [];
2895   - for (var i = 0; i <= duplicateListArray.length - 1; i++) {
2896   - var termID = duplicateListArray[i].id;
2897   - if ($.inArray(termID, temp) == -1) {
2898   - temp.push(termID);
2899   - sortedListArray.push({ "title": duplicateListArray[i].title, "id": termID });
  3230 + $scope.aasystemMatchTermLoad=function(bodysystemId,windowviewid,langId,totalstructure)
  3231 + {
  3232 + var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
  3233 + var systemMatchedTermList = new jinqJs()
  3234 + .from(aaPinData)
  3235 + .where('_BodySystemId == ' + bodysystemId)
  3236 + .select();
  3237 + if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
  3238 + $scope.refreshTerms(systemMatchedTermList,windowviewid,langId,totalstructure);
  3239 + }
2900 3240  
2901   - }
2902   - }
  3241 + }
2903 3242  
2904   - for (var i = 0; i <= sortedListArray.length - 1; i++) {
  3243 +
  3244 + $scope.refreshTerms = function (termList,windowviewid,langId,totalstructure) {
  3245 + var matchTermData = [];
  3246 + var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');
2905 3247  
2906   - for (j = i + 1; j <= sortedListArray.length - 1; j++) {
  3248 + var languageTermDataArray = new jinqJs()
  3249 + .from( selectedpinTermData)
  3250 + .where('_LanguageId == ' + langId)
  3251 + .select();
2907 3252  
2908   - if (sortedListArray[i].title.substr(0, 1) > sortedListArray[j].title.substr(0, 1)) {
  3253 +
  3254 + for (var i = 0; i < termList.length; i++) {
2909 3255  
2910   - var termText = sortedListArray[i].title;
2911   - var termNumbr = sortedListArray[i].id;
2912   - var termLanguage = sortedListArray[i].language;
  3256 + var actulaTerm = new jinqJs()
  3257 + .from(languageTermDataArray)
  3258 + .where('_TermNumber == ' + termList[i]._TermId)
  3259 + .select()[0];
  3260 +
  3261 + if (actulaTerm != null || actulaTerm != undefined) {
  3262 + matchTermData.push(
  3263 + {
  3264 + "_TermNumber": actulaTerm._TermNumber,
  3265 + "_TermText": actulaTerm._TermText
  3266 +
  3267 + });
  3268 + }
2913 3269  
2914   - sortedListArray[i].title = sortedListArray[j].title;
2915   - sortedListArray[i].id = sortedListArray[j].id;
2916   - sortedListArray[i].language = sortedListArray[j].language;
  3270 + }
2917 3271  
2918   - sortedListArray[j].title = termText;
2919   - sortedListArray[j].id = termNumbr;
2920   - sortedListArray[j].language = termLanguage;
2921   - }
2922   - }
2923   - }
2924 3272  
2925   - for (var j = 0; j <= sortedListArray.length - 1; j++) {
2926   - var $selectedOptions = $('<option title= "' + sortedListArray[j].title + '" id= "' + sortedListArray[j].id +'_'+windowviewid+ '" >' + sortedListArray[j].title + '</option>').appendTo("#termList");
  3273 + var matchTermDataFilter = new jinqJs()
  3274 + .from(matchTermData)
  3275 + .distinct('_TermText', '_TermNumber')
  3276 + .orderBy([{ field: '_TermText', sort: 'asc' }])
  3277 + .select('_TermNumber', '_TermText');
  3278 +
  3279 + var option='';
  3280 + if (matchTermDataFilter != null || matchTermDataFilter != undefined) {
  3281 +
  3282 + angular.forEach(matchTermDataFilter, function (value2, key2) {
  3283 + totalstructure=totalstructure+1;
  3284 + option=option+'<option id=' + value2._TermNumber +'_' +windowviewid+ ' style="margin-right:-12px">' + value2._TermText + '</option>';
  3285 +
  3286 + })
  3287 + var $el = $(option).appendTo('#termList')
  3288 + $compile($el)($scope);
  3289 +
  3290 + $scope.SetAAwindowStoreData(windowviewid,'totalstructureLm',totalstructure);
  3291 + var termsTotal = '<span class="pull-left marginTop5">' + totalstructure + ' Structures</span>';
2927 3292  
2928   - $compile($selectedOptions)($scope);
2929   - }
2930   - }
2931   - });
2932 3293 $("#totalTermsLm").empty();
2933   - $("#totalTermsLm").html("<span class='pull-left marginTop5'>" + $("#termList option").length + " Structures</span>");
  3294 + $("#totalTermsLm").append(termsTotal);
  3295 +
  3296 + if(totalstructure < matchTermDataFilter.length)
  3297 + {
  3298 + $("#totalTermsLm").append('<button type="button" id="btlLoadMoreLm" class="btn btn-primary btn-block" onclick="LoadMoreLm(event)" style="width:65%;float:right">Load More Structures..</button>');
  3299 + }
  3300 + else
  3301 + {
  3302 + $("#totalTermsLm").append('<button type="button" id="btlLoadMoreLm" class="btn btn-primary btn-block" onclick="LoadMoreLm(event)" style="width:65%;float:right">Load More Structures..</button>');
  3303 + $('#btlLoadMoreLm').attr('disabled', 'disabled');
  3304 + }
  3305 +
2934 3306 }
2935   - }
  3307 + $scope.EnableAAUI(windowviewid);
  3308 +
  3309 + }
  3310 +
2936 3311 $scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo,windowviewid) {
2937 3312  
2938   - var languageArray = $rootScope.lexiconLanguageArray;
2939   - var AAPinTermData= $scope.GetAAwindowStoreData(windowviewid,'AAPinTermData');
  3313 + var languageArray = $rootScope.lexiconLanguageArray;
  3314 + var pinTermData = $scope.GetAAwindowStoreData(windowviewid, 'pinTermData');
2940 3315  
2941   - if (AAPinTermData != null || AAPinTermData != undefined) {
  3316 + if (pinTermData != null || pinTermData != undefined) {
2942 3317  
2943 3318 var matchedTermNoData = new jinqJs()
2944   - .from(AAPinTermData)
  3319 + .from(pinTermData)
2945 3320 .where('_TermNumber == ' + actualTermNo)
2946 3321 .select();
2947 3322  
... ... @@ -2965,7 +3340,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2965 3340 }
2966 3341 $rootScope.hidePins = function (windowviewid) {
2967 3342 $scope.ToolBoxStyle("HidePin",windowviewid);
2968   - $scope.DisableUI();
  3343 + $scope.DisableAAUI(windowviewid);
2969 3344 $scope.hideSpeechBubble(windowviewid);
2970 3345 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
2971 3346 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
... ... @@ -2985,7 +3360,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2985 3360 visible: false // set to true instead to show the layer again
2986 3361 }).drawLayers();
2987 3362 })
2988   - $scope.EnableUI();
  3363 + $scope.EnableAAUI(windowviewid);
2989 3364  
2990 3365 }
2991 3366  
... ... @@ -2997,7 +3372,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
2997 3372  
2998 3373 $scope.ToolBoxStyle("ShowAllPin",windowviewid);
2999 3374  
3000   - $scope.DisableUI();
  3375 + $scope.DisableAAUI(windowviewid);
3001 3376  
3002 3377 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
3003 3378 $scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
... ... @@ -3038,17 +3413,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3038 3413 $("#listManager").css("display", "none");
3039 3414 $("#optionsListManagerTab").removeClass("active");
3040 3415  
3041   - $scope.DisableUI();
  3416 + $scope.DisableAAUI(windowviewid);
3042 3417  
3043   - //if ($rootScope.isCallFromOtherModule) {
3044   - var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
3045   - if (isHidePinBtnClicked) {
3046   - $scope.showAllPins(windowviewid);
3047   - setTimeout(function () {
3048   - $scope.activePinOnSliderChange(windowviewid);
3049   - }, 200);
3050   - }
3051   - //}
  3418 + var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
  3419 + if (isHidePinBtnClicked) {
  3420 + $scope.showAllPins(windowviewid);
  3421 + setTimeout(function () {
  3422 + $scope.activePinOnSliderChange(windowviewid);
  3423 + }, 200);
  3424 + }
  3425 +
3052 3426 $scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
3053 3427 $scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
3054 3428 $scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);
... ... @@ -3151,84 +3525,267 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3151 3525 }).drawLayers();
3152 3526 })
3153 3527 }
3154   - $scope.EnableUI();
  3528 + $scope.EnableAAUI(windowviewid);
3155 3529  
3156 3530 }
3157 3531  
3158   - $scope.showItemsForSearch = function (event) {
3159   - var len= (event.currentTarget.id).split("_").length;
3160   - var windowviewid = (event.currentTarget.id).split("_")[len-1];
  3532 + $scope.showItemsForSearch = function (windowviewid, isbuttionclick) {
  3533 +
  3534 + if ($('#searchListDivAA_' + windowviewid).html() != "")
  3535 + $('#termlistfilter_'+windowviewid).empty();
  3536 +
  3537 + $scope.IsSearchVisible = true;
  3538 + // clear time stamp on text box click
  3539 + $scope.SetAAwindowStoreData(windowviewid, 'SearchTimeStampValue', 0);
  3540 +
  3541 + var langIdvalue = $("#searchLanguageLm_"+windowviewid+" option:selected").val();
  3542 + if(langIdvalue!=undefined)
  3543 + {
  3544 + var selectedLanguage = new jinqJs()
  3545 + .from( $rootScope.lexiconLanguageArray)
  3546 + .where('id == ' + langIdvalue)
  3547 + .select()[0];
  3548 +
  3549 + var langId=selectedLanguage.id;
  3550 + }
  3551 + else
  3552 + {
  3553 + // get default language
  3554 + var langId=$rootScope.lexiconLanguageArray[0].id
  3555 + }
3161 3556  
3162   - console.log('showItemsForSearch is called');
3163   - //this check is for log only because we are writing length so need to check if its not null or undefined
  3557 + var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
  3558 +
  3559 + var languageTermDataArray = new jinqJs()
  3560 + .from( selectedpinTermData)
  3561 + .where('_LanguageId == ' + langId)
  3562 + .select();
3164 3563  
3165   - var AAPinTermData=$scope.GetAAwindowStoreData(windowviewid,'AAPinTermData');
3166   - $timeout(function () {
3167   - if ((AAPinTermData != null || AAPinTermData != undefined) && (AAPinTermData.length > 0)) {
  3564 + var searchvalue = $("#selectedTermName_" + windowviewid).val();
  3565 +
  3566 + var searchfilterdata = $filter('filter')(languageTermDataArray, searchvalue);
  3567 + if(searchvalue.trim()!="")
  3568 + {
  3569 + searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText.length');
  3570 + }
  3571 + else
  3572 + {
  3573 + searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText');
  3574 + }
3168 3575  
3169   - $scope.IsSearchVisible = true;
3170   - $("#termlistfilter_" + windowviewid).css("display", "block");
  3576 + $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 500);
3171 3577  
3172   - $("#backdrop > #searchListDivAA > #termlistfilter_" + windowviewid + " > li").each(function (key, value) {
  3578 + $('#termlistfilter_'+windowviewid).css("display", "block");
3173 3579  
3174   - if ($(this).find("a").html() == document.getElementById("selectedTermName_"+windowviewid).value) {
3175   - $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
3176   - $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
3177   - }
3178   - });
  3580 + angular.forEach($scope.limitTofilterdata, function (value2, key2) {
  3581 + var $el = $('<option id=' + value2._TermNumber +'_' +windowviewid+ '>' + value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
  3582 + $compile($el)($scope);
  3583 + })
  3584 +
  3585 + var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
  3586 + $compile($all)($scope);
  3587 +
  3588 + if(isbuttionclick)
  3589 + {
  3590 + $timeout(function () {
  3591 + $('#termlistfilter_'+windowviewid).focus();
  3592 + }, 200);
  3593 + }
3179 3594  
3180   - }
3181   - else {
3182   - $rootScope.aaloadSearchData(windowviewid);
3183   - if (AAPinTermData.length > 0) {
3184   - $scope.showItemsForSearch(event);
3185   - }
3186   - }
  3595 + }
3187 3596  
3188   - }, 500);
  3597 + $scope.resetSearchListView = function (event) {
  3598 +
  3599 + var len = (event.target.id).split("_").length;
  3600 + var windowviewid = (event.target.id).split("_")[len - 1];
  3601 + var date = new Date();
  3602 + var newtimestamp = date.getTime();
  3603 +
  3604 + var oldtimestamp = $scope.GetAAwindowStoreData(windowviewid, 'SearchTimeStampValue');
  3605 +
  3606 + if ((newtimestamp - oldtimestamp) > 500) {
  3607 +
  3608 + $scope.SetAAwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp);
  3609 + $scope.showFilteredTerms(windowviewid);
  3610 + }
3189 3611  
3190 3612 }
3191 3613  
3192 3614 $scope.HideSearchList = function (event) {
3193 3615 var len= (event.currentTarget.id).split("_").length;
3194 3616 var windowviewid = (event.currentTarget.id).split("_")[len-1];
  3617 +
3195 3618 $timeout(function () {
  3619 + if(!$scope.IsSearchVisible)
  3620 + {
  3621 + $("#termlistfilter_" + windowviewid).empty();
  3622 + $("#termlistfilter_" + windowviewid).css("display", "none");
  3623 + }
  3624 +
  3625 + }, 600);
  3626 +
  3627 + }
  3628 +
  3629 + $scope.showFilteredTerms = function (windowviewid) {
  3630 + var langIdvalue = $("#searchLanguageLm_"+windowviewid+" option:selected").val();
  3631 + if(langIdvalue!=undefined)
  3632 + {
  3633 + var selectedLanguage = new jinqJs()
  3634 + .from( $rootScope.lexiconLanguageArray)
  3635 + .where('id == ' + langIdvalue)
  3636 + .select()[0];
  3637 +
  3638 + var langId=selectedLanguage.id;
  3639 + }
  3640 + else
  3641 + {
  3642 + // get default language
  3643 + var langId=$rootScope.lexiconLanguageArray[0].id
  3644 + }
  3645 +
  3646 + var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
  3647 +
  3648 + var languageTermDataArray = new jinqJs()
  3649 + .from( selectedpinTermData)
  3650 + .where('_LanguageId == ' + langId)
  3651 + .select();
  3652 +
  3653 + var searchvalue = $("#selectedTermName_" + windowviewid).val();
  3654 +
  3655 + var searchfilterdata = $filter('filter')(languageTermDataArray, searchvalue);
  3656 + if(searchvalue.trim()!="")
  3657 + {
  3658 + searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText.length');
  3659 + }
  3660 + else
  3661 + {
  3662 + searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText');
  3663 + }
  3664 +
  3665 + $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 20);
  3666 +
  3667 + $('#termlistfilter_'+windowviewid).css("display", "block");
  3668 + $('#termlistfilter_'+windowviewid).empty();
  3669 +
  3670 + angular.forEach($scope.limitTofilterdata, function (value2, key2) {
  3671 + var $el = $('<option id=' + value2._TermNumber +'_' +windowviewid+ '>' + value2._TermText + '</option>').appendTo('#termlistfilter_' + windowviewid);
  3672 + $compile($el)($scope);
  3673 + })
  3674 +
  3675 + var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
  3676 + $compile($all)($scope);
  3677 +
  3678 + $("#selectedTermName_" + windowviewid).attr("name", "0");
  3679 +
  3680 + };
  3681 +
  3682 + $scope.changeaaSearchLanguage = function (event) {
  3683 +
  3684 + var len= (event.currentTarget.id).split("_").length;
  3685 + var windowviewid = (event.currentTarget.id).split("_")[len-1];
3196 3686  
3197   - $("#termlistfilter_"+windowviewid).css("display", "none");
  3687 + $scope.changeSearchText(windowviewid);
  3688 +
  3689 + }
3198 3690  
  3691 + $scope.changeSearchText = function (windowviewid) {
  3692 +
  3693 + setTimeout(function () {
  3694 +
  3695 + var term_num = $("#selectedTermName_" + windowviewid).attr("name");
  3696 + if(term_num!=undefined && term_num!="0")
  3697 + {
  3698 + var langIdvalue = $("#searchLanguageLm_"+windowviewid+" option:selected").val();
  3699 + if(langIdvalue!=undefined)
  3700 + {
  3701 + var selectedLanguage = new jinqJs()
  3702 + .from( $rootScope.lexiconLanguageArray)
  3703 + .where('id == ' + langIdvalue)
  3704 + .select()[0];
  3705 +
  3706 + var langId=selectedLanguage.id;
  3707 +
  3708 + }
  3709 + else
  3710 + {
  3711 + var langId=$rootScope.lexiconLanguageArray[0].id;
  3712 + }
  3713 + var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
  3714 +
  3715 + var languageTermDataArray = new jinqJs()
  3716 + .from( selectedpinTermData)
  3717 + .where('_LanguageId == ' + langId)
  3718 + .select();
  3719 +
  3720 +
  3721 + var selectedTerm = new jinqJs()
  3722 + .from( languageTermDataArray)
  3723 + .where('_TermNumber == '+term_num)
  3724 + .select()[0];
3199 3725  
3200   - }, 500);
  3726 +
  3727 + if(selectedTerm!=undefined)
  3728 + {
  3729 +
  3730 + $("#selectedTermName_" + windowviewid).attr("name", selectedTerm._TermNumber);
  3731 + $("#selectedTermName_" + windowviewid).val(selectedTerm._TermText);
  3732 +
  3733 + }
  3734 + else
  3735 + {
  3736 + $("#selectedTermName_" + windowviewid).attr("name", "0");
  3737 + $("#selectedTermName_" + windowviewid).val('');
  3738 + }
  3739 +
  3740 + }
  3741 + else
  3742 + {
  3743 + $("#selectedTermName_" + windowviewid).attr("name", "0");
  3744 + $("#selectedTermName_" + windowviewid).val('');
  3745 + }
  3746 +
  3747 + },100)
  3748 +
3201 3749  
3202 3750 }
3203   - $scope.highlightPinBasedOnSerachItemEvent = function (termid) {
  3751 +
  3752 +
  3753 + $scope.highlightPinBasedOnSerachItemEvent = function (termid,isTermListOptionClicked) {
3204 3754 $rootScope.UnsaveCurriculum = true;
3205   - $scope.highlightPinBasedOnSerachItem(termid);
  3755 + $scope.highlightPinBasedOnSerachItem(termid,isTermListOptionClicked);
3206 3756 }
3207 3757  
3208   - $scope.highlightPinBasedOnSerachItem = function (termid) {
  3758 + $scope.highlightPinBasedOnSerachItem = function (termid,isTermListOptionClicked) {
3209 3759  
3210 3760 var windowviewid = (termid).split("_")[1];
3211   - var id=(termid).split("_")[0];
  3761 + var TermNumber= termid.split('_')[0];
3212 3762 var currenttermidTxt = $('#' + termid).text();
  3763 + $scope.IsSearchVisible=false;
  3764 +
  3765 +
  3766 + if (isTermListOptionClicked == true) {
  3767 + $('#selectedTermName_' + windowviewid).val('');
  3768 + $("#selectedTermName_" + windowviewid).attr("name", '0');
  3769 + }
  3770 + else
  3771 + {
  3772 + $('#selectedTermName_' + windowviewid).val(currenttermidTxt);
  3773 + $("#selectedTermName_" + windowviewid).attr("name", TermNumber);
  3774 + $("#termlistfilter_" + windowviewid).empty();
  3775 + $("#termlistfilter_" + windowviewid).css("display", "none");
  3776 + }
3213 3777  
3214 3778 $scope.showAllPinsAfterHide(windowviewid);
3215 3779  
3216   - $('#termList option[selected="selected"]').prop("selected", false);
3217   - $('#termList option[value="' + currenttermidTxt + '"]').attr("selected", true);
3218 3780 $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
3219   - $('#termList option[value="' + currenttermidTxt + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
3220   -
3221   - $("#termlistfilter_" + windowviewid + " li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
3222   - $("#termlistfilter_" + windowviewid + " li").find("a[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
3223   -
3224   - $('#selectedTermName_' + windowviewid).val(currenttermidTxt);
3225   -
  3781 + $("#termList").find("option[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
  3782 +
3226 3783 //get data from pindata for this trem
3227 3784  
3228 3785 var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
3229 3786 var pinDataForTerm = new jinqJs()
3230 3787 .from(aaPinData)
3231   - .where("_TermId == " + id)
  3788 + .where("_TermId == " + TermNumber)
3232 3789 .select();
3233 3790  
3234 3791 // birendra
... ... @@ -3249,23 +3806,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3249 3806 $('#aaDetailViewCanvas_'+windowviewid).setLayers({
3250 3807 fillStyle: radial,
3251 3808 }).drawLayers();
3252   - console.log(pinDataForTerm[0]._PinId);
3253   - var pinID = "PinArc_" + pinDataForTerm[0]._PinId;
3254   -
  3809 +
3255 3810 $scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
3256   - var clickpin = [];
3257   - clickpin.push({ 'id': pinDataForTerm[0]._PinId });
3258   - $scope.SetAAwindowStoreData(windowviewid, 'clickedPins', clickpin);
3259   -
3260 3811 $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
3261   - var selectedPins = [];
3262   - selectedPins.push(pinDataForTerm[0]._PinId);
3263   - $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
3264   -
3265   - $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
3266   - var activePin = [];
3267   - activePin.push(pinID);
3268   - $scope.SetAAwindowStoreData(windowviewid,'activePinArray',activePin);
  3812 + $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
  3813 + //clear all cb data
  3814 + $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
3269 3815  
3270 3816 $scope.showAnnotation(pinDataForTerm, false, false, true,false,windowviewid);
3271 3817 // maintaing scroll position on selection of options in list manager.
... ... @@ -3277,6 +3823,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
3277 3823  
3278 3824 }
3279 3825  
  3826 + $scope.MultipleAnnotation = function (event) {
  3827 + var len= (event.currentTarget.id).split("_").length;
  3828 + var windowviewid = (event.currentTarget.id).split("_")[len-1];
  3829 +
  3830 + //set true to false or vice versa
  3831 + var iskeyctrlActive= $scope.GetAAwindowStoreData(windowviewid, 'keyctrl');
  3832 +
  3833 + if(iskeyctrlActive)
  3834 + {
  3835 + $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText");
  3836 + }
  3837 + else
  3838 + {
  3839 + $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText");
  3840 + }
  3841 +
  3842 + $scope.SetAAwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive);
  3843 + }
  3844 +
3280 3845 $scope.ShowHideAnnotation = function (event) {
3281 3846 var len= (event.currentTarget.id).split("_").length;
3282 3847 var windowviewid = (event.currentTarget.id).split("_")[len-1];
... ... @@ -3502,10 +4067,28 @@ function onSearchAA(event) {
3502 4067 console.log('AA search is called')
3503 4068 var scope = angular.element(document.getElementById("aaBodyView")).scope();
3504 4069 scope.$apply(function () {
3505   - scope.showItemsForSearch(event);
  4070 + var len= (event.currentTarget.id).split("_").length;
  4071 + var windowviewid = (event.currentTarget.id).split("_")[len-1];
  4072 +
  4073 + if((event.currentTarget.id).match('btnSearchAA'))
  4074 + scope.showItemsForSearch(windowviewid,true);
  4075 + else
  4076 + {
  4077 + scope.showItemsForSearch(windowviewid,false);
  4078 + }
  4079 +
  4080 + });
  4081 +}
  4082 +
  4083 +function changeaaSearchLanguage(event) {
  4084 + event.stopPropagation();
  4085 + var scope = angular.element(document.getElementsByClassName("aaBodyView")).scope();
  4086 + scope.$apply(function () {
  4087 + scope.changeaaSearchLanguage(event);
3506 4088 });
3507 4089 }
3508 4090  
  4091 +
3509 4092 function hideSearchList(event) {
3510 4093 console.log('AA hide search is called')
3511 4094 var scope = angular.element(document.getElementById("aaBodyView")).scope();
... ... @@ -3514,12 +4097,12 @@ function hideSearchList(event) {
3514 4097 });
3515 4098 }
3516 4099  
3517   -function onSearchItemSelection(termid) {
  4100 +function onSearchItemSelection(termid, isTermListOptionClicked) {
3518 4101  
3519 4102 console.log('AA hide search is called');
3520 4103 var scope = angular.element(document.getElementById("aaBodyView")).scope();
3521 4104 scope.$apply(function () {
3522   - scope.highlightPinBasedOnSerachItemEvent(termid);
  4105 + scope.highlightPinBasedOnSerachItemEvent(termid,isTermListOptionClicked);
3523 4106 });
3524 4107 }
3525 4108  
... ... @@ -3532,6 +4115,14 @@ function showHideAnnotation(event) {
3532 4115 });
3533 4116 }
3534 4117  
  4118 +function keyControlAAActive(event) {
  4119 +
  4120 + var scope = angular.element(document.getElementById("aaBodyView")).scope();
  4121 + scope.$apply(function () {
  4122 + scope.MultipleAnnotation(event);
  4123 + });
  4124 +}
  4125 +
3535 4126 function showSelectedPins(event) {
3536 4127  
3537 4128 console.log('showSelectedPins is called')
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
  View file @3705d19
1 1 ๏ปฟ<div class="bodyWrap row ">
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" ng-init="loadAIModuleById(13)">
4   - <div id="grid-view" class="col-sm-12" style="padding-left:25px; width:99%">
  4 + <div id="grid-view" class="col-sm-12" style="padding-left:25px;">
5 5 </div>
6 6 </div>
7 7 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
  View file @3705d19
... ... @@ -2,7 +2,7 @@
2 2 <div ng-include="'app/widget/MainMenu.html'" />
3 3 <div class="main" ng-init="loadCurriculumBuiderData()">
4 4 <div class="col-sm-12">
5   - <div class="well" style=" height:90vh">
  5 + <div class="well" style="min-height: 360px;margin-bottom: 0px;" id="cblist">
6 6 <div class="col-sm-6">
7 7 <ul class="list-group" id="leftBodyViewList"></ul>
8 8 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
  View file @3705d19
... ... @@ -62,6 +62,12 @@
62 62 background: #4b4b4b;
63 63 border-color: #3f3f3f !important;
64 64 }
  65 + .disableMultiAnnotationText {
  66 + background: #4b4b4b;
  67 + border-color: #3f3f3f !important;
  68 + }
  69 +
  70 +
65 71 </style>
66 72 <div id="aaDetailPageDiv" class="ng-scope" ng-controller="TileViewListController">
67 73 <div class="tools pull-left">
... ... @@ -89,38 +95,45 @@
89 95 <li class="disabledSelectedSystem"><a id="11" href="#" title="Skeletal" onclick="showSelectedSystemPins(event)">Skeletal</a></li>
90 96 <li class="disabledSelectedSystem"><a id="12" href="#" title="Urinary" onclick="showSelectedSystemPins(event)">Urinary</a></li>
91 97 </ul>
92   - </div>
93   - <div class="col-sm-12" style="width:50%;float:left" >
94   - <button onclick="showHideAnnotation(event)" class="btn btn-primary btn-sm marginTop5 btn-block" id="comment-box" name="showAnnotationText" style="background-position: 28px -73px;width:80px;" title="Show/Hide Structure Name Boxes"></button>
  98 + </div>
  99 + <div class="col-sm-12" style="float:left" >
  100 + <button onclick="showHideAnnotation(event)" class="btn btn-primary btn-sm marginTop5 tooltip-custom btn-block" data-toggle="tooltip" id="comment-box" name="showAnnotationText" style="background-position: 28px -73px;width:80px;" title="Show/Hide Structure Name Boxes"></button>
  101 + </div>
  102 + <div class="col-sm-12" style="float:left" title="Active Multiple Annotations">
  103 + <button onclick="keyControlAAActive(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom disableMultiAnnotationText" data-toggle="tooltip" id="multiannotation" style="background-position: 0px 40px;width:80px;" title="Active Multiple Annotations">
  104 + <img src="content/images/mult-annotation.png" alt="" style="height:26px;margin-top:-2px"></button>
95 105 </div>
96 106 </div>
97   - <div class="pips-slider" style="margin-top:125px">
  107 + <div class="pips-slider" style="margin-top:155px">
98 108 <h3>Zoom <i class="fa fa-search-plus"></i></h3>
99 109 <div class="slider" id="Vslider" style="margin:40px 0 30px 20px;height:150px"></div>
100 110 </div>
101 111 </div>
102 112  
103 113 <div class="main2">
104   - <div class="stickey-area" id="aastickeyarea" style="margin-left:7px">
  114 + <div class="stickey-area" id="aastickeyarea" style="margin-left:7px;height:44px">
105 115 <div class="breadcrumb">
106 116 <div class="">
107   - <div class="input-group col-sm-8 col-xs-7 col-md-8 pull-left">
108   - <input type="text" class="form-control input-sm pull-left" id="selectedTermName" onclick="onSearchAA(event)" ondblclick="onSearchAA(event)" onblur="hideSearchList(event)" ng-model="searchFilter" placeholder=" search...">
  117 + <div class="input-group col-sm-6 col-xs-7 col-md-7 pull-left"">
  118 + <input type="text" class="form-control input-sm pull-left" id="selectedTermName" onclick="onSearchAA(event)" ondblclick="onSearchAA(event)" ng-keyup="resetSearchListView($event)" onblur="hideSearchList(event)" ng-model="searchFilter" placeholder=" search..." autocomplete="off">
109 119  
110   - <div id="backdrop" ng-show="IsSearchVisible">
  120 + <div id="backdrop">
111 121 <div id="searchListDivAA" class="col-sm-12 col-xs-12 col-md-12 col-lg-12 pull-left">
112   - <ul id="termlistfilter" class="form-control dropdown-menu" style="height:90px;width:100%;overflow-y:scroll;position:absolute;display:none;z-index:60001;"></ul>
  122 + <select id="termlistfilter" class="form-control" style="height:130px;width:100%;overflow-y:scroll;position:absolute;z-index:60001;display:none;padding:0px;left:0px;" size="10" onclick="if (typeof (this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id, false)" onblur="hideSearchList(event)"></select>
113 123 </div>
114 124 </div>
115 125 </div>
116   - &nbsp;
  126 +
117 127 <!-- Single button -->
118   - <div class="btn-group pull-left" style="vertical-align:top;">
  128 + <div class="btn-group pull-left" style="vertical-align:top; float:left;margin-right: -10px;">
119 129  
120   - <button type="button" style="padding: 5px 10px 4px 10px !important;border: none;" class="btn btn-success btn-sm" id=btnSearchAA onclick="onSearchAA(event)" onblur="hideSearchList(event)">
  130 + <button type="button" style="padding: 5px 10px 4px 10px !important;border: none;" class="btn btn-success btn-sm" id=btnSearchAA onclick="onSearchAA(event)">
121 131 <i class="fa fa-caret-down" style="font-size:20px;"></i>
122 132 </button>
123   - </div>
  133 + </div>
  134 + <div id="searchlangaugeDiv">
  135 +
  136 + </div>
124 137 <div class="btn-group open" id="da-body-nav" style="float: right; margin-left: 2px;right: 100px;">
125 138 <button id="navigatorBtn" type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none; right: -80px;" class="btn btn-primary dropdown-toggle btn-sm">
126 139 <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
... ... @@ -136,7 +149,6 @@
136 149 </div>
137 150 </div>
138 151  
139   -
140 152 </div>
141 153 </div>
142 154 </div>
... ...
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @3705d19
... ... @@ -121,6 +121,11 @@
121 121 left: 0;
122 122 right: 0;
123 123 }
  124 +
  125 + .disableMultiAnnotationText {
  126 + background: #4b4b4b;
  127 + border-color: #3f3f3f !important;
  128 + }
124 129 </style>
125 130 <div class=" " id="daView" ng-controller="DAController">
126 131 <div class="pos-relative leftToolBar tools pull-left">
... ... @@ -215,6 +220,10 @@
215 220 <button id="btnStrutureBox" onclick="enableShowHideStructureBox(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom" data-toggle="tooltip" data-placement="bottom" name="showAnnotationStructure" title="Show/Hide Structure Name Boxes"> <img src="content/images/comment-box.png" alt=""></button>
216 221 </div>
217 222  
  223 + <div class="col-xs-12" title="Active Multiple Annotations">
  224 + <button id="multiannotation" onclick="keyControlDAActive(event)" class="btn btn-primary btn-sm marginTop5 btn-block tooltip-custom disableMultiAnnotationText" data-toggle="tooltip" data-placement="bottom" title="Active Multiple Annotations" style="height:30px"><img src="content/images/mult-annotation.png" alt="" style="height:23px;margin-top:-1px"></button>
  225 + </div>
  226 +
218 227 </div>
219 228 <div class="">
220 229  
... ... @@ -231,7 +240,7 @@
231 240 </div>
232 241  
233 242 <div class="main2">
234   - <div class="stickey-area" id="dastickeyarea" style="margin-left:7px">
  243 + <div class="stickey-area" id="dastickeyarea" style="margin-left:7px;height:44px">
235 244 <div class="breadcrumb " style="margin-bottom:0px">
236 245 <div class="">
237 246 <div class="input-group col-sm-6 col-xs-7 col-md-7 pull-left" id="da-input">
... ...
400-SOURCECODE/AIAHTML5.Web/content/images/mult-annotation.png
View file @3705d19

566 Bytes | W: | H:

1023 Bytes | W: | H:

  • 2-up
  • Swipe
  • Onion skin
400-SOURCECODE/AIAHTML5.Web/index.aspx
  View file @3705d19
1 1 ๏ปฟ<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="ADAM.AIA.index" %>
  2 +<%@ OutputCache NoStore="True" Duration="1" VaryByParam='*' Location="None" %>
2 3  
3 4 <!DOCTYPE html>
4 5 <html lang="en" ng-cloak ng-app="AIA">
... ... @@ -16,9 +17,9 @@
16 17 <title>A.D.A.M. Interactive Anatomy</title>
17 18 <link rel="icon" type="image/x-icon" href="/content/images/favicon.ico">
18 19  
19   - <link href="themes/default/css/bootstrap/3.3.6/bootstrap.css?v=1.0.0" rel="stylesheet" />
  20 + <link href="themes/default/css/bootstrap/3.3.6/bootstrap.css?v=<%= version %>" rel="stylesheet" />
20 21  
21   - <link href="themes/default/css/bootstrap/3.3.6/main.css?v=1.0.0" rel="stylesheet" />
  22 + <link href="themes/default/css/bootstrap/3.3.6/main.css?v=<%= version %>" rel="stylesheet" />
22 23  
23 24 <link href="themes/default/css/bootstrap/3.3.6/secondeffect.css" rel="stylesheet" />
24 25  
... ... @@ -36,12 +37,12 @@
36 37  
37 38 <link href="themes/default/css/bootstrap/3.3.6/jquery-ui.css" rel="stylesheet" />
38 39 <link href="themes/default/css/bootstrap/3.3.6/jstreestyle.min.css" rel="stylesheet" />
39   - <link href="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css?v=1.0.0" rel="stylesheet" />
  40 + <link href="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.css?v=<%= version %>" rel="stylesheet" />
40 41 <link href="libs/video_4_12_11/css/video-js_4_12_11.css" rel="stylesheet" />
41 42 <link href="libs/jquery/jquery_plugin/SpeechBubble/css/bubble.css" rel="stylesheet" />
42 43 <link href="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.css" rel="stylesheet" />
43 44 <link href="themes/default/css/bootstrap/3.3.6/jquery.minicolors.css" rel="stylesheet" />
44   - <link href="content/css/print-main.css?v=1.0.0" rel="stylesheet" />
  45 + <link href="content/css/print-main.css?v=<%= version %>" rel="stylesheet" />
45 46  
46 47 <!--Annotation Toolbar: Jcanvas-->
47 48 <style>
... ... @@ -494,9 +495,9 @@
494 495 <div class="paddTop15">
495 496 <!-- Nav tabs -->
496 497 <ul class="nav nav-tabs" role="tablist">
497   - <li role="presentation" ng-class="{'active':SettingsTab==1}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(1)" style="cursor: pointer;">Appearance</a></li>
498   - <li role="presentation" ng-class="{'active':SettingsTab==2}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(2)" style="cursor: pointer;">Lexicons</a></li>
499   - <li role="presentation" ng-class="{'active':SettingsTab==3}"><a role="tab" class="padd5" ng-click="SetSettingActiveTab(3)" style="cursor: pointer;">Dissectible</a></li>
  498 + <li role="presentation" ng-class="{'active':SettingsTab==1}"><a id="tabappearance" role="tab" class="padd5" ng-click="SetSettingActiveTab(1)" style="cursor: pointer;">Appearance</a></li>
  499 + <li role="presentation" ng-class="{'active':SettingsTab==2}"><a id="tablexicons" role="tab" class="padd5" ng-click="SetSettingActiveTab(2)" style="cursor: pointer;">Lexicons</a></li>
  500 + <li role="presentation" ng-class="{'active':SettingsTab==3}"><a id="tabdissectible" role="tab" class="padd5" ng-click="SetSettingActiveTab(3)" style="cursor: pointer;">Dissectible</a></li>
500 501  
501 502 </ul>
502 503 <!-- Tab panes -->
... ... @@ -1556,15 +1557,14 @@
1556 1557  
1557 1558 }
1558 1559 </script>
1559   -
1560   -
  1560 +
1561 1561 <!--<script src="libs/jquery/1.11.3/jquery.min.js"></script>-->
1562 1562 <script src="libs/jquery/2.1.3/jquery.min.js"></script>
1563 1563 <script src="libs/jquery/1.11.4/jquery-ui.js"></script>
1564 1564 <script src="libs/xml2json.js"></script>
1565 1565  
1566 1566 <script src="libs/jquery/jquery_plugin/jquery.mCustomScrollbar.concat.min.js"></script>
1567   - <script src="themes/default/scripts/bootstrap/3.3.5/bootstrap.js?v=1.0.0"></script>
  1567 + <script src="themes/default/scripts/bootstrap/3.3.5/bootstrap.js?v=<%= version %>"></script>
1568 1568 <script src="libs/angular/1.4.9/angular.min.js"></script>
1569 1569 <script src="libs/angular/1.4.9/angular-route.min.js"></script>
1570 1570 <script src="libs/angular/1.4.9/angular-sanitize.min.js"></script>
... ... @@ -1579,12 +1579,11 @@
1579 1579  
1580 1580 <script src="libs/jinqJs.js"></script>
1581 1581  
1582   - <script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js?v=1.0.0"></script>
  1582 + <script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.js?v=<%= version %>"></script>
1583 1583 <script src="libs/video_4_12_11/video_4_12_11.js"></script>
1584 1584 <script src="libs/jquery/jquery_plugin/SpeechBubble/bubble.js"></script>
1585   - <!--<script src="libs/jquery/jquery_plugin/jsPanel/jspanel/jquery.jspanel.min.js"></script>-->
1586   - <script src="app/main/AIA.js?v=1.0.0"></script>
1587   - <script src="app/main/Link.js?v=1.0.0"></script>
  1585 + <script src="app/main/AIA.js?v=<%= version %>"></script>
  1586 + <script src="app/main/Link.js?v=<%= version %>"></script>
1588 1587 <script src="content/scripts/js/custom/custom.js"></script>
1589 1588 <script src="app/filters/ColorMatrixFilter.js"></script>
1590 1589 <script src="app/utility/Matrix.js"></script>
... ... @@ -1592,48 +1591,43 @@
1592 1591 <script src="app/utility/Rectangle.js"></script>
1593 1592 <script src="app/utility/BitmapData.js"></script>
1594 1593 <script src="app/utility/Paint.js"></script>
1595   - <script src="app/controllers/DAController.js?v=1.0.0"></script>
1596   - <script src="app/controllers/CIController.js?v=1.0.0"></script>
1597   - <script src="app/controllers/AIController.js?v=1.0.0"></script>
1598   - <script src="app/controllers/CAController.js?v=1.0.0"></script>
1599   - <script src="app/controllers/3dAController.js?v=1.0.0"></script>
1600   - <script src="app/controllers/CurrBuildController.js?v=1.0.0"></script>
1601   - <script src="app/controllers/AnatTestController.js?v=1.0.0"></script>
1602   - <script src="app/controllers/LabExercController.js?v=1.0.0"></script>
1603   - <script src="app/controllers/ADAMImgController.js?v=1.0.0"></script>
1604   - <script src="app/controllers/AODController.js?v=1.0.0"></script>
1605   - <script src="app/controllers/HomeController.js?v=1.0.0"></script>
1606   - <script src="app/controllers/LinkController.js?v=1.0.0"></script>
1607   - <script src="app/services/AuthenticationService.js?v=1.0.0"></script>
1608   - <script src="app/services/ConfigurationService.js?v=1.0.0"></script>
1609   - <script src="app/services/AdminService.js?v=1.0.0"></script>
1610   - <script src="app/controllers/TileViewListController.js?v=1.0.0"></script>
1611   - <script src="app/controllers/MyPictureController.js?v=1.0.0"></script>
1612   - <script src="app/controllers/MyAnimationController.js?v=1.0.0"></script>
1613   - <script src="app/services/ModuleService.js?v=1.0.0"></script>
1614   - <script src="../app/filters/AIAFilter.js?v=1.0.0"></script>
1615   - <script src="app/services/DataService.js?v=1.0.0"></script>
1616   - <script src="app/services/TermService.js?v=1.0.0"></script>
1617   - <script src="app/directives/AIADirectives.js?v=1.0.0"></script>
  1594 + <script src="app/controllers/DAController.js?v=<%= version %>"></script>
  1595 + <script src="app/controllers/CIController.js?v=<%= version %>"></script>
  1596 + <script src="app/controllers/AIController.js?v=<%= version %>"></script>
  1597 + <script src="app/controllers/CAController.js?v=<%= version %>"></script>
  1598 + <script src="app/controllers/3dAController.js?v=<%= version %>"></script>
  1599 + <script src="app/controllers/CurrBuildController.js?v=<%= version %>"></script>
  1600 + <script src="app/controllers/AnatTestController.js?v=<%= version %>"></script>
  1601 + <script src="app/controllers/LabExercController.js?v=<%= version %>"></script>
  1602 + <script src="app/controllers/ADAMImgController.js?v=<%= version %>"></script>
  1603 + <script src="app/controllers/AODController.js?v=<%= version %>"></script>
  1604 + <script src="app/controllers/HomeController.js?v=<%= version %>"></script>
  1605 + <script src="app/controllers/LinkController.js?v=<%= version %>"></script>
  1606 + <script src="app/services/AuthenticationService.js?v=<%= version %>"></script>
  1607 + <script src="app/services/ConfigurationService.js?v=<%= version %>"></script>
  1608 + <script src="app/services/AdminService.js?v=<%= version %>"></script>
  1609 + <script src="app/controllers/TileViewListController.js?v=<%= version %>"></script>
  1610 + <script src="app/controllers/MyPictureController.js?v=<%= version %>"></script>
  1611 + <script src="app/controllers/MyAnimationController.js?v=<%= version %>"></script>
  1612 + <script src="app/services/ModuleService.js?v=<%= version %>"></script>
  1613 + <script src="app/filters/AIAFilter.js?v=<%= version %>"></script>
  1614 + <script src="app/services/DataService.js?v=<%= version %>"></script>
  1615 + <script src="app/services/TermService.js?v=<%= version %>"></script>
  1616 + <script src="app/directives/AIADirectives.js?v=<%= version %>"></script>
1618 1617 <script src="libs/jquery/jquery_plugin/jqueryui.js"></script>
1619 1618 <script src="libs/jquery/jquery_plugin/slider-pips/jquery-ui-slider-pips.js"></script>
1620 1619 <script src="libs/jstree.min.js"></script>
1621   - <script src="../app/services/LabExerciseService.js?v=1.0.0"></script>
  1620 + <script src="app/services/LabExerciseService.js?v=<%= version %>"></script>
1622 1621 <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui-touch-punch/0.2.3/jquery.ui.touch-punch.min.js"></script>
1623 1622  
1624 1623 <script src="libs/jquery/jquery_plugin/color-picker/jquery.minicolors.min.js"></script>
1625   - <!--<script src="libs/colorpicker/jquery.minicolors.min.js"></script>-->
1626   - <!--<script src="libs/color-picker/jquery.minicolors.min.js"></script>-->
1627   -
1628   - <script src="libs/sketch.js"></script>
  1624 +
  1625 + <script src="libs/sketch.js?v=<%= version %>"></script>
1629 1626 <script src="libs/tinymce/tinymce.min.js"></script>
1630 1627 <script src="libs/tinymce/jquery.tinymce.min.js"></script>
1631   - <!-- <script src="libs/tinymce/tinymce.min.js"></script> -->
1632   - <!--<script src="https://cdnjs.cloudflare.com/ajax/libs/html2canvas/0.4.1/html2canvas.js"></script>-->
1633 1628 <script src="https://cdnjs.cloudflare.com/ajax/libs/crypto-js/3.1.2/rollups/aes.js"></script>
1634   - <script src="libs/html2canvas.js?v=1.0.0"></script>
  1629 + <script src="libs/html2canvas.js?v=<%= version %>"></script>
1635 1630 <script src="libs/FileSaverNew.js"></script>
1636   - <script src="app/services/LabExerciseService.js?v=1.0.0"></script>
1637 1631 <script src="libs/clipboard.min.js"></script>
1638 1632  
1639 1633 <script>
... ...
400-SOURCECODE/AIAHTML5.Web/index.aspx.cs
  View file @3705d19
... ... @@ -19,6 +19,8 @@ namespace ADAM.AIA
19 19 public string test = "";
20 20 public bool isCalsCredantial = false;
21 21  
  22 + public string version = "1.0." + DateTime.Now.Hour.ToString();//refresh script and css by adding version every hour
  23 +
22 24 protected void Page_Load(object sender, EventArgs e)
23 25 {
24 26  
... ...
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @3705d19
... ... @@ -1262,7 +1262,7 @@ a[disabled] {
1262 1262  
1263 1263  
1264 1264 /*06-12-2017*/
1265   -.customTable .table-responsive{padding-left:0; padding-right:0;width: 99%; margin-left: 11px;}
  1265 +.customTable .table-responsive{padding-left:0; padding-right:0;width: 99%; margin-left: 8px;}
1266 1266 .customTable .table-fixed .table {
1267 1267 max-width:980px;
1268 1268 table-layout:fixed;
... ...
400-SOURCECODE/Admin/src/app/components/Reports/report.service.ts
  View file @3705d19
... ... @@ -225,10 +225,12 @@ export class ReportService {
225 225 obj.sToDate = this.datePipe.transform(obj.sToDate, 'MM/dd/yyyy');
226 226 if (obj.sAccountNumber == null)
227 227 obj.sAccountNumber = '';
  228 +
228 229 return this.http.get(this.commonService.resourceBaseUrl + "Report/GetSiteLicenseUsageReport?sFromDate=" + obj.sFromDate +
229 230 "&sToDate=" + obj.sToDate +
230 231 "&sAccountNumber=" + obj.sAccountNumber +
231 232 "&iEdition=" + obj.iEdition +
  233 + "&iLoginTypeId=" + obj.iLoginTypeId +
232 234 "&pageNo=" + pageNo +
233 235 "&pageLength=" + pageLength)
234 236 .map(this.extractData)
... ...
400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.html
  View file @3705d19
... ... @@ -68,6 +68,20 @@
68 68 </select>
69 69 </div>
70 70 </div>
  71 +
  72 + <div class="col-sm-12">
  73 + <div class="form-group marginTop5">
  74 + <label for="AccountNumber" class="col-sm-12 col-lg-6 control-label text-right-lg paddTop7 padd-left0">Site Usage :</label>
  75 + </div>
  76 + <div class="col-sm-12 col-lg-6 padd-left0 padd-right0">
  77 + <select class="form-control input-sm" id="LoginTypeId" formControlName="iLoginTypeId">
  78 + <option selected="selected" value="0">All</option>
  79 + <option value="1">Site License Usage</option>
  80 + <option value="2">CA Link Usage</option>
  81 + </select>
  82 + </div>
  83 + </div>
  84 +
71 85 </div>
72 86 </div>
73 87  
... ...
400-SOURCECODE/Admin/src/app/components/Reports/sitelicenseusagereport.component.ts
  View file @3705d19
... ... @@ -84,7 +84,8 @@ export class SiteLicenseUsageReport implements OnInit {
84 84 sFromDate: [this.previousdate],
85 85 sToDate: [this.date],
86 86 sAccountNumber:[],
87   - iEdition:[0]
  87 + iEdition:[0],
  88 + iLoginTypeId:[0]
88 89 });
89 90 if (this.global.UserTypeName == "Client Admin" || this.global.UserTypeName == "District Admin") {
90 91 this.SiteLicenseUsageReportForm.controls['sAccountNumber'].setValue(this.global.AccountNumber)
... ...
400-SOURCECODE/Admin/src/index.html
  View file @3705d19
... ... @@ -5,6 +5,9 @@
5 5 <base href=""/>
6 6 <meta charset="utf-8">
7 7 <meta http-equiv="X-UA-Compatible" content="IE=edge">
  8 + <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
  9 + <meta http-equiv="Pragma" content="no-cache" />
  10 + <meta http-equiv="Expires" content="0" />
8 11 <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
9 12 <title>A.D.A.M. Interactive Anatomy</title>
10 13 <link href="assets/styles/bootstrap.css" rel="stylesheet">
... ...