' +
- '
',
+ '
',
title: "",
position: {
top: 1,
@@ -328,8 +318,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
draggable: "disabled",
size: {
- width: newpanelWidth,
- height: newpanelHeight
+ width: innerWidth,
+ height: innerheight
+ },
+ resizable: {
+ minWidth: 770,
+ minHeight: 770,
+ start:function(event, ui)
+ {
+ $("#OpenModuleInCB").css("display", "block");
+ },
+ stop: function (event, ui) {
+ // var canvasDIvHeight = $("#CBTinyMCEPanel .jsPanel-content").height();
+
+ }
},
});
@@ -367,9 +369,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$(head).append(css);
// $(head).append(storefunc);
- var canvasDIvHeight = $("#dvOpenResourcePanel .jsPanel-content").height();
- $('#OpenModuleInCB').css('height', canvasDIvHeight);
-
$timeout(function () {
console.log('frame content loding delayed......');
$scope.loadopenresourceContent(head, iframe);
@@ -2567,6 +2566,24 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
}
}
+ $rootScope.openresourcePanelPosition=function()
+ {
+ if(document.getElementById("dvOpenResourcePanel") ) {
+ var innerWidth =$(window).innerWidth()-10;
+ var innerheight =$(window).innerHeight()-40;
+
+ $("#OpenModuleInCB").css('height',innerheight);
+ $("#dvOpenResourcePanel .jsPanel-hdr .jsPanel-title").css('width','300px');
+
+ $("#dvOpenResourcePanel").css('height',innerheight);
+ $("#dvOpenResourcePanel").css('width',innerWidth);
+
+ $("#dvOpenResourcePanel .jsPanel-content").css('height',innerheight);
+ $("#dvOpenResourcePanel .jsPanel-content").css('width',innerWidth);
+
+ }
+
+ }
$(document).ready(function () {
@@ -2581,6 +2598,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
clearTimeout(window.resizedFinished);
window.resizedFinished = setTimeout(function(){
console.log('Resized finished.');
+ $rootScope.openresourcePanelPosition();
if($location.url()!= "/curriculum-builder-detail") {
var moduleImagePanel = $("div[id*='ImagePanel']");
@@ -2606,6 +2624,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
if(($location.url()== "/tile-view-list") ||($location.url()== "/clinical-illustrations")||($location.url()== "/clinical-animations")||($location.url()== "/ADAM-images")||($location.url()== "/ADAM-on-demand")) {
$rootScope.ResetGridListLength();
}
+
+ if($location.url()== "/curriculum-builder")
+ {
+ $rootScope.ResetCBListHeight();
+ }
+ else if($location.url()== "/curriculum-builder-detail" )
+ {
+ $rootScope.ResetCBHeight();
+ }
}, 300);
}
@@ -2732,7 +2759,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
else if ($location.url() == "/module-item-view") {
$("#annotationButton").removeClass("disableMenuoption");
$("#Menuoptionid").removeClass("disableMenuoption");
- $("#optiontSetting").addClass("disableSubMenu");
+ // $("#optiontSetting").addClass("disableSubMenu");
$("#labExPdfOption").addClass("disableSubMenu");
$("#annotationToolBarOptions").removeClass("disableSubMenu");
$("#fileMenuAnchor").removeClass("disableFileMenu");
@@ -3463,6 +3490,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$("#annotationButton").removeClass("disableMenuoption");
$("#Menuoptionid").removeClass("disableMenuoption");
$("#annotationToolBarOptions").removeClass("disableSubMenu");
+ $("#optiontSetting").removeClass("disableSubMenu");
$("#listManagerBody *").prop('disabled',false);
@@ -4292,6 +4320,40 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
// Dissectible Anatomy > Settings should be disable if Annotation is Open.
$rootScope.ShowSettingWindow = function () {
+
+ $('#tabdissectible').removeAttr('disabled');
+ var modulePanel = $("#HomeContainerDiv").find("div[id*='ImagePanel']");
+ if (modulePanel != undefined && modulePanel.length>0) {
+ var isdapanel=false;
+ var isaapanel=false;
+ for (var index = 0 ; index < modulePanel.length; index++) {
+ var paneld = modulePanel[index].id;
+ if(paneld.match("daImagePanel"))
+ {
+ isdapanel=true;
+ }
+ else if(paneld.match("AAImagePanel"))
+ {
+ isaapanel=true;
+ }
+ }
+
+ if(isdapanel && isaapanel)
+ {
+ $rootScope.SettingsTab = 2;
+ }
+ else if(isdapanel)
+ {
+ $rootScope.SettingsTab = 3;
+ }
+ else if(isaapanel)
+ {
+ $('#tabdissectible').attr('disabled', 'disabled');
+ $rootScope.SettingsTab = 2;
+ }
+
+ }
+
if ($("#annotationTollbar").css("display") == "block") {
$('#modal-settings').css("display", "none");
$("#modelsettingsbackground").css("display", "none");
@@ -4302,7 +4364,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$('#modal-settings').css("display", "block");
$("#modelsettingsbackground").css("display", "block");
}
-
+
$rootScope.lexiconLanguageArrayLength = $rootScope.lexiconLanguageArray.length;
$rootScope.lexiconPrimaryLanguage = $("#primarylaxican").val();
$rootScope.primaryLangID = $('#primarylaxican').attr("name");
@@ -8802,7 +8864,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
else if(selectedPanel.match("AAImagePanel"))
{
- onSearchItemSelection($('#termList option[selected="selected"]').attr("id"));
+ onSearchItemSelection($('#termList option[selected="selected"]').attr("id"),true);
}
}
@@ -8863,7 +8925,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$("#langaugeDivLm").css("display", "none");
$rootScope.aalistManagerEvent(windowviewid);
- $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id)");
+ $("#termList").attr("onclick", "if (typeof(this.selectedIndex) != 'undefined') onSearchItemSelection(this.options[this.selectedIndex].id,true)");
}
var modulePanel = $("#HomeContainerDiv").find("div[id*='daImagePanel']");
if (modulePanel != undefined && modulePanel.length>0) {
@@ -8932,6 +8994,11 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
var windowviewid=selectedPanel.split('_')[1];
$rootScope.changeLanguageLmEvent(windowviewid);
+ }
+ else if(selectedPanel.match("AAImagePanel"))
+ {
+ var windowviewid=selectedPanel.split('_')[1];
+ $rootScope.changeLanguageLmEventAA(windowviewid);
}
}
@@ -8942,23 +9009,15 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
var windowviewid=selectedPanel.split('_')[1];
$rootScope.LoadMoreLmEvent(windowviewid);
- }
- }
-
-
- function fillListManagerTerms() {
-
- var len = $rootScope.openModules.length;
- var openViewLen = $rootScope.openViews.length;
-
- var currentOpenModuleId = $rootScope.openModules[len - 1].ModuleId;
- var currentOpenViewId = $rootScope.openViews[openViewLen - 1].BodyViewId;
- if (currentOpenModuleId == 1) {
-
}
-
+ else if(selectedPanel.match("AAImagePanel"))
+ {
+ var windowviewid=selectedPanel.split('_')[1];
+ $rootScope.LoadMoreLmEventAA(windowviewid);
+ }
}
+
//setrtings
$rootScope.SetSettingActiveTab = function (tabToSet) {
$rootScope.SettingsTab = tabToSet;
@@ -9011,6 +9070,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
//4.
$rootScope.setEthncitySettings($rootScope.globalSetting.ethnicity);
+ //disable appreance tab still no use of it
+ $('#tabappearance').attr('disabled', 'disabled');
+
};
@@ -9381,6 +9443,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var currentOpenViewId=$rootScope.GetDAwindowData(MultiWinId,"voId");
$rootScope.reloadDABodyViewEvent(currentOpenViewId,isLexiconChange,MultiWinId);
}
+ if(paneld.match("AAImagePanel"))
+ {
+ var len = (paneld).split("_").length;
+ var MultiWinId = (paneld).split("_")[len - 1];
+ $rootScope.reloadAABodyViewEvent(isLexiconChange,MultiWinId);
+ }
}
}
};
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 233d8ac..ea1b814 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -103,14 +103,15 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
}
}
- $scope.DisableUI = function () {
-
- var leImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < leImagePanelConetent.length; i++) {
- leImagePanelConetent[i].style.pointerEvents = "none";
- leImagePanelConetent[i].style.opacity = "0.7";
+ $scope.DisableLabUI = function (windowviewid) {
+ var modulePanel = $("#labImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="none";
+ modulePanel[0].style.opacity="0.7";
}
+
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
@@ -119,12 +120,12 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$('#HomeContainerDiv').css('opacity', '0.7');
}
- $scope.EnableUI = function () {
-
- var leImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < leImagePanelConetent.length; i++) {
- leImagePanelConetent[i].style.pointerEvents = "auto";
- leImagePanelConetent[i].style.opacity = "1";
+ $scope.EnableLabUI = function (windowviewid) {
+ var modulePanel = $("#labImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="auto";
+ modulePanel[0].style.opacity="1";
}
$rootScope.isLoading = false;
@@ -167,7 +168,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$scope.initializeLEWindowData($rootScope.MULTI_VIEW_ID, true, undefined);
- $scope.DisableUI();
+ $scope.DisableLabUI($rootScope.MULTI_VIEW_ID);
//get current path
var currentURL = $location.path();
@@ -204,10 +205,10 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
function (result) {
$scope.LabExerciseModulesList = result;
$scope.SetLEwindowStoreData(windowviewid, 'LabExerciseModulesList', result);
- $scope.EnableUI();
+ $scope.EnableLabUI(windowviewid);
},
function (error) {
- $scope.EnableUI();
+ $scope.EnableLabUI(windowviewid);
console.log(error.statusText)
}
)
@@ -255,7 +256,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
if ($rootScope.isCallFromOtherModule) {
$scope.LEModuleData = ModuleService.getModuleData("LAB_EXERCISE");
if($scope.LEModuleData.length<1) return;
- $scope.DisableUI();
+ $scope.DisableLabUI();
$scope.readyToLoad = true;
$rootScope.LEWindowLoadComplete = false;
$scope.wincount = 1;
@@ -293,7 +294,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
}
else {
- $scope.DisableUI();
+ $scope.DisableLabUI();
$scope.InitializeLabExercise(null);
}
}
@@ -547,14 +548,14 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
else {
$scope.GetQuizByTopic(windowviewid);
}
- $scope.DisableUI();
+ $scope.DisableLabUI(windowviewid);
},300)
},
function (error) {
console.log('error in getting save ddata');
- $scope.DisableUI();
+ $scope.DisableLabUI(windowviewid);
}
)
@@ -705,7 +706,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$scope.GetQuizByTopic = function (windowviewid) {
- $scope.DisableUI();
+ $scope.DisableLabUI(windowviewid);
$('.jsPanel-content').css('font-size', '14px');
@@ -850,7 +851,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$scope.SetLEwindowStoreData(windowviewid, 'isResetClicked', false);
}
}
- $scope.EnableUI();
+ $scope.EnableLabUI(windowviewid);
if ($rootScope.isCallFromOtherModule) {
$rootScope.LEWindowLoadComplete = true;
}
@@ -1577,7 +1578,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$rootScope.UnsaveCurriculum = true;
}
- $scope.DisableUI();
+ $scope.DisableLabUI(windowviewid);
var quiznumber = $scope.GetLEwindowStoreData(windowviewid, 'quiznumber');
$scope.CreateLabExerciseDataToSave(windowviewid, quiznumber);
@@ -1600,7 +1601,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
LabExerciseService.saveLabExerciseAttempt(labExerciseAttempt)
.then(
function (result) {
- $scope.EnableUI();
+ $scope.EnableLabUI(windowviewid);
$scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', false);
//saved successfully.variable name is not correct but errorMessage represnts message
if (!$rootScope.isCallFromOtherModule) {
@@ -1611,9 +1612,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
},
function (error) {
-
- $scope.EnableUI();
-
+ $scope.EnableLabUI(windowviewid);
console.log(' Error in saving lab exercise = ' + error.statusText);
$rootScope.isVisibleLogin = true;
$('#errorMessage').text(error);
@@ -2097,7 +2096,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
else {
$("#imgdiv_" + windowviewid).css("position", "relative");
}
- $scope.EnableUI();
+ $scope.EnableLabUI(windowviewid);
}, 500);
}
@@ -2120,7 +2119,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$("#quizSubmitBtn_" + windowviewid).css("display", "none");
}
- $scope.EnableUI();
+ $scope.EnableLabUI(windowviewid);
}
$scope.SendLabEXMailToUser = function ($event) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
index 787c4d5..9df39d6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
@@ -80,13 +80,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
}
- $scope.DisableUI = function () {
-
- var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < aniImagePanelConetent.length; i++) {
- aniImagePanelConetent[i].style.pointerEvents = "none";
- aniImagePanelConetent[i].style.opacity = "0.7";
-
+ $scope.DisableVideoUI = function (windowviewid) {
+ var modulePanel = $("#vidImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="none";
+ modulePanel[0].style.opacity="0.7";
}
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
@@ -96,12 +95,12 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('#HomeContainerDiv').css('opacity', '0.7');
}
- $scope.EnableUI = function () {
-
- var aniImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < aniImagePanelConetent.length; i++) {
- aniImagePanelConetent[i].style.pointerEvents = "auto";
- aniImagePanelConetent[i].style.opacity = "1";
+ $scope.EnableVideoUI = function (windowviewid) {
+ var modulePanel = $("#vidImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="auto";
+ modulePanel[0].style.opacity="1";
}
$rootScope.isLoading = false;
@@ -159,7 +158,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if ($rootScope.isCallFromOtherModule) {
$scope.VideoModuleData = ModuleService.getModuleData("MY_ANIMATIONS");
if($scope.VideoModuleData.length<1) return;
- $scope.DisableUI();
$scope.readyToLoad = true;
$rootScope.VideoLoadComplete = false;
$scope.wincount = 1;
@@ -203,6 +201,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.VidOpenInOtherModules = vidModuleData;
$rootScope.MULTI_VIEW_ID += 1;
var windowviewid = $rootScope.MULTI_VIEW_ID;
+ $scope.DisableVideoUI(windowviewid);
$scope.initializeVideoWindowData(windowviewid, false, $scope.VidOpenInOtherModules.currentWindowId);
@@ -244,7 +243,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
$scope.loadMyAnimation = function (windowviewid) {
- $scope.DisableUI();
$scope.jsPanelID = 'vidImagePanel' + '_' + windowviewid;
var tittle = $scope.GetVideowindowStoreData(windowviewid, 'currentViewTitle');
var animationSource = $scope.GetVideowindowStoreData(windowviewid, 'videoSource');
@@ -446,11 +444,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.MyvideoOnLoad = function (windowviewid)
{
- $scope.EnableUI();
- if ($rootScope.isCallFromOtherModule) {
- $rootScope.VideoLoadComplete = true;
- }
- $scope.JsPanelclick(windowviewid);
+
+ if ($rootScope.isCallFromOtherModule) {
+ $rootScope.VideoLoadComplete = true;
+ }
+ $scope.JsPanelclick(windowviewid);
+
+ $scope.EnableVideoUI(windowviewid);
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
index 2c81dcd..92faff6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
@@ -94,14 +94,15 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
}
- $scope.DisableUI = function () {
-
- var myImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < myImagePanelConetent.length; i++) {
- myImagePanelConetent[i].style.pointerEvents = "none";
- myImagePanelConetent[i].style.opacity = "0.7";
+ $scope.DisablePicUI = function (windowviewid) {
+ var modulePanel = $("#picImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="none";
+ modulePanel[0].style.opacity="0.7";
}
+
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
@@ -110,14 +111,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('#CBDetailPageDiv').css('opacity', '0.7');
}
- $scope.EnableUI = function () {
+ $scope.EnablePicUI = function (windowviewid) {
- var myImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < myImagePanelConetent.length; i++) {
- myImagePanelConetent[i].style.pointerEvents = "auto";
- myImagePanelConetent[i].style.opacity = "1";
+ var modulePanel = $("#picImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="auto";
+ modulePanel[0].style.opacity="1";
}
-
$rootScope.isLoading = false;
$('#spinner').css('visibility', 'hidden');
// CB module enable all
@@ -164,7 +165,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
if ($rootScope.isCallFromOtherModule) {
$scope.PicModuleData = ModuleService.getModuleData("MY_PICTURES");
if($scope.PicModuleData.length<1) return;
- $scope.DisableUI();
$scope.readyToLoad = true;
$rootScope.PicLoadComplete = false;
$scope.wincount = 1;
@@ -205,10 +205,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
}
$scope.OpenPictureView = function (picModuleData) {
-
$scope.picOpenInOtherModules = picModuleData;
$rootScope.MULTI_VIEW_ID += 1;
var windowviewid = $rootScope.MULTI_VIEW_ID;
+ $scope.DisablePicUI(windowviewid);
$scope.initializePICWindowData(windowviewid, false, $scope.picOpenInOtherModules.currentWindowId);
@@ -474,7 +474,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$rootScope.LoadCBSavedAnnotation(canvasDraw,canvasPaint,annotationData);
}
}
- $scope.EnableUI();
+ $scope.EnablePicUI(windowviewid);
$rootScope.PicLoadComplete = true;
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 86ba36c..1df8726 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -1,7 +1,7 @@
'use strict';
-AIA.controller("TileViewListController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService","$interval",
-function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService, $interval) {
+AIA.controller("TileViewListController", ["$scope", "$window", "$rootScope", "$compile", "$http", "$log", "$location", "$timeout", "DA", "Modules", "$routeParams", "BodyRegions", "BodySystems", "ViewOrientations", "ImageTypes", "DataService", "ModuleService","$interval","$filter",
+function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeout, DA, Modules, $routeParam, BodyRegions, BodySystems, ViewOrientations, ImageTypes, DataService, ModuleService, $interval, $filter) {
$scope.AllBodyRegion = [];
$scope.AllBodySystem = [];
@@ -105,6 +105,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
'navigatorImage':"",
'showHideAnnotations': 'showAnnotationText',
'annotationData':{shapeStates:[],paintCanvasState:[]},
+ 'totalstructure': 0,
+ 'totalstructureLm': 0,
+ 'intervalObject': null,
+ 'SearchTimeStampValue': 0,
+ 'keyctrl': false,
};
return windata;
@@ -182,30 +187,33 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
}
- $scope.DisableUI = function () {
-
- var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < daImagePanelConetent.length; i++) {
- daImagePanelConetent[i].style.pointerEvents = "none";
- daImagePanelConetent[i].style.opacity = "0.7";
+ $scope.DisableAAUI = function (windowviewid) {
+ var modulePanel = $("#AAImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="none";
+ modulePanel[0].style.opacity="0.7";
}
+
$rootScope.isLoading = true;
$('#spinner').css('visibility', 'visible');
// CB module disable all
$('#HomeContainerDiv').css('pointer-events', 'none');
$('#HomeContainerDiv').css('opacity', '0.7');
+
}
- $scope.EnableUI = function () {
+ $scope.EnableAAUI = function (windowviewid) {
- var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
- for (var i = 0; i < daImagePanelConetent.length; i++) {
- daImagePanelConetent[i].style.pointerEvents = "auto";
- daImagePanelConetent[i].style.opacity = "1";
+ var modulePanel = $("#AAImagePanel_"+windowviewid).find(" .jsPanel-content");
+ if(modulePanel.length>0)
+ {
+ modulePanel[0].style.pointerEvents="auto";
+ modulePanel[0].style.opacity="1";
}
-
+
$rootScope.isLoading = false;
$('#spinner').css('visibility', 'hidden');
// CB module enable all
@@ -213,11 +221,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$('#HomeContainerDiv').css('opacity', '1');
}
- $scope.loadForModuleById = function (moduleId) {
- $scope.DisableUI();
-
+ $scope.loadForModuleById = function (moduleId) {
$rootScope.isCallFromOtherModule = undefined;
$rootScope.MULTI_VIEW_ID += 1
+ $scope.DisableAAUI($rootScope.MULTI_VIEW_ID);
// store exist module in module service
var ExistData = ModuleService.getModuleData("ATLAS_ANATOMY");
@@ -422,7 +429,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
if ($rootScope.isCallFromOtherModule) {
$scope.AAModuleData = ModuleService.getModuleData("ATLAS_ANATOMY");
if($scope.AAModuleData.length<1) return;
- $scope.DisableUI();
+ $scope.DisableAAUI();
$scope.readyToLoad=true;
$rootScope.AAWindowLoadComplete = false;
$scope.wincount=1;
@@ -463,7 +470,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
else {
- $scope.DisableUI();
+ $scope.DisableAAUI();
$scope.openModuleItem(null);
}
}
@@ -577,7 +584,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.loadAAIllustration = function (windowviewid) {
//0.4 for Opening module item, load it into image
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
if ($rootScope.refreshcheck == null) {
$location.path('/');
@@ -670,7 +677,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'maximised',true);
$scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
- var extraheight=$('#aastickeyarea').height()+15;
+ var extraheight=$('#aastickeyarea').height()+5;
var extrawidth=$('.tools').width()+15;
var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
@@ -694,7 +701,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
$scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
- var extraheight=$('#aastickeyarea').height()+15;
+ var extraheight=$('#aastickeyarea').height()+5;
var extrawidth=$('.tools').width()+15;
var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
@@ -719,7 +726,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var len = (pnlName).split("_").length;
var windowviewid = (pnlName).split("_")[len - 1];
- var extraheight=$('#aastickeyarea').height()+15;
+ var extraheight=$('#aastickeyarea').height()+5;
var extrawidth=$('.tools').width()+15;
var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height();
var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
@@ -816,7 +823,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.loadAAModule = function (windowviewid) {
- var extraheight=$('#aastickeyarea').height()+15;
+ var extraheight=$('#aastickeyarea').height()+5;
var extrawidth=$('.tools').width()+15;
var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
@@ -858,8 +865,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var demoData= {shapeStates:[],paintCanvasState:[]};
$rootScope.setAADAPanelCordinate(windowviewid,0,pnlName,canvasDiv,canvasDraw,canvasPaint,canvasDIvHeight,canvasDIvWidth,demoData);
-
- $timeout(function () {
+ $scope.JsPanelclick(windowviewid);
+
+ $timeout(function () {
+
$scope.loadAllPinFirstTime(windowviewid);
//call time interval function until load pin data
//load search/vocab data
@@ -876,8 +885,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
//7. Highlight all system body list in left side
$scope.highlightBodySystemList(windowviewid);
$scope.loadbtnNavigator(windowviewid);
- $scope.JsPanelclick(windowviewid);
-
+
if ($rootScope.isCallFromOtherModule) {
$scope.loadAAonCBData(windowviewid);
@@ -1014,9 +1022,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$("#navigatorBtn").attr("id", "navigatorBtn_" + windowviewid);
$("#navigatorDiv").attr("id", "navigatorDiv_" + windowviewid);
$("#comment-box").attr("id", "comment-box_" + windowviewid);
+ $("#multiannotation").attr("id", "multiannotation_" + windowviewid);
$("#selectedTermName").attr("id", "selectedTermName_" + windowviewid);
+ $("#searchListDivAA").attr("id", "searchListDivAA_" + windowviewid);
+ $("#searchlangaugeDiv").attr("id", "searchlangaugeDiv_" + windowviewid);
$("#termlistfilter").attr("id", "termlistfilter_" + windowviewid);
$("#btnSearchAA").attr("id", "btnSearchAA_" + windowviewid);
+
$("#modItemImage").attr("id", "modItemImage_" + windowviewid);
}
@@ -1045,6 +1057,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
// $("#AAImagePanel_" + windowviewid).off("click");
$("#AAImagePanel_" + windowviewid).on('click', function (event) {
+ $timeout(function () {
+ $scope.IsSearchVisible=false;
+
+ }, 200);
+
var pnlName=event.currentTarget.id;
$rootScope.resetMenuOptionOnClick(pnlName);
@@ -1054,8 +1071,89 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$rootScope.StoreTitleName(currentViewTitle);
$rootScope.StoreOrgImageName(imageName);
});
+
+ //hide search data
+ $("#topMenuBar .dropdown-toggle").on('click', function (event) {
+
+ $timeout(function () {
+ $scope.IsSearchVisible=false;
+
+ }, 200);
+ });
+
+ //hide search data
+ $("#termlistfilter_"+windowviewid).scroll(function (event) {
+
+ $("#termlistfilter_"+windowviewid).focus();
+ $scope.IsSearchVisible=true;
+ });
+ // register event for search list manager
+ $(document).on("mouseover", "#termlistfilter_"+windowviewid+ " option", function (e) {
+ $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').removeAttr("style");
+ $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("selected", false);
+ $(this).css("background-color", "#3399FF");
+
+ $(this).attr("selected", true);
+ $scope.IsSearchVisible=true;
+
+ });
+
+ $('#termlistfilter_'+windowviewid).unbind('keyup');
+ $('#termlistfilter_'+windowviewid).on('keyup', function (event) {
+ $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').removeAttr("style");
+ $('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("selected", false);
+ $(this.selectedOptions[0]).attr("selected", true);
+ $scope.IsSearchVisible=true;
+ });
+
+ $('#termlistfilter_'+windowviewid).unbind('keypress');
+ $('#termlistfilter_'+windowviewid).on('keypress', function (e) {
+ if ($('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("id") == "undefined") {
+ return false;
+ }
+ else {
+ if ($('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("id")) {
+ if (e.keyCode == 13) {
+ onSearchItemSelection($('#termlistfilter_'+windowviewid+ ' option[selected="selected"]').attr("id"),false);
+ }
+ }
+ }
+ });
+
+ // set search for language input
+ $scope.langSearchLoad(windowviewid);
}
+
+ $scope.langSearchLoad= function(windowviewid)
+ {
+ $('#searchlangaugeDiv_'+windowviewid).empty();
+ $('#searchlangaugeDiv_'+windowviewid).css("display","none");
+ var languageArray = $rootScope.lexiconLanguageArray;
+
+ $("#btnSearchAA_"+windowviewid).parent().css("margin-right", "10px");
+
+ if(languageArray.length>1)
+ {
+ $("#btnSearchAA_"+windowviewid).parent().css("margin-right", "-10px");
+ $('#searchlangaugeDiv_'+windowviewid).css("display","block");
+ var option='';
+ for (var i = 0; i <= languageArray.length - 1; i++) {
+ option=option+'
';
+ }
+ var $all = $('#searchlangaugeDiv_'+windowviewid).append(
+ '
'+
+ ''+
+ '
'
+ )
+ $compile($all)($scope);
+
+ }
+
+ $scope.changeSearchText(windowviewid)
+ }
$scope.setPreClickBtnCss = function (windowviewid) {
if ($scope.aaOpenInOtherModules.showAllPins != undefined && $scope.aaOpenInOtherModules.showAllPins) {
@@ -1118,7 +1216,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$('#' + canvasDraw).removeLayers();//remove all old shape
$("#" + canvasPaint).sketch().actions = [];//remove old paint data
- var extraheight=$('#aastickeyarea').height()+15;
+ var extraheight=$('#aastickeyarea').height()+5;
var extrawidth=$('.tools').width()+15;
var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-extraheight;
var canvasDIvWidth = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").width()-extrawidth;
@@ -1169,6 +1267,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
scope.showAllPins(windowviewid,true);
break;
}
+
+ //redraw annotation
+ $scope.SetAAwindowStoreData(windowviewid,'isShowBodyWithCBPinData',true);
+ $scope.ShowCBAnnotation(windowviewid);
// }
});
}
@@ -1229,19 +1331,20 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
var pinid = $scope.aaOpenInOtherModules.selectedPins[i];
-
- selectedPins.push(pinid);
-
+
var pinvalue = 'PinArc_' + pinid;
var isFound = jQuery.inArray(pinvalue, activePinArray)
if (isFound == -1) {
activePinArray.push(pinvalue);
clickedPins.push({ 'id': pinid });
+
+ if (selectedPins != undefined) {
+ selectedPins.push(pinid);
+ $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
+ }
}
}
- if (selectedPins != undefined) {
- $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
- }
+
}
if ($scope.aaOpenInOtherModules.selectedCallouts != undefined) {
@@ -1400,7 +1503,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
-
$scope.SetAAwindowStoreData(windowviewid,'isShowBodyWithCBPinData',false);
$rootScope.AAWindowLoadComplete=true;
@@ -1522,7 +1624,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.activePinOnSliderChange(windowviewid);
}
- $scope.EnableUI();
+ $scope.EnableAAUI(windowviewid);
}
}
@@ -1545,13 +1647,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
},
function (error) {
- $scope.EnableUI();
+ $scope.EnableAAUI(windowviewid);
console.log(' error in showAllPins: ' + error.statusText);
})
}
$scope.FilterByImage = function (moduleId, query,windowviewid) {
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
if (windowviewid == undefined) {
windowviewid = $rootScope.MULTI_VIEW_ID;
}
@@ -1719,12 +1821,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
$timeout(function () {
- $scope.EnableUI();
+ $scope.EnableAAUI(windowviewid);
$rootScope.ResetGridListLength();
}, 500);
},
function (error) {
- $timeout(function () { $scope.EnableUI(); }, 500);
+ $timeout(function () { $scope.EnableAAUI(windowviewid); }, 500);
console.log(' error: ' + error.statusText);
}
)
@@ -1732,29 +1834,18 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$rootScope.ResetGridListLength=function()
{
- var $ua = navigator.userAgent;
-
- if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+ var innerheight =$(window).innerHeight();
- var srchHeight=$('.breadcrumb').height();
- var gridheight=screen.height-srchHeight-128;
- var listheight=screen.height-srchHeight-352;
- $('#grid-view').css({"height":gridheight,"overflow":"auto"});
- $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
- }
- else
- {
- var srchHeight=$('.breadcrumb').height();
- var gridheight=screen.height-srchHeight-276;
- var listheight=screen.height-srchHeight-500;
- $('#grid-view').css({"height":gridheight,"overflow":"auto"});
- $('#ListViewDiv').css({"height":listheight,"overflow":"auto"});
- }
-
+ var srchHeight=$('.breadcrumb').height();
+ var gridheight=innerheight-srchHeight-135;
+ var listheight=innerheight-srchHeight-358;
+ $('#grid-view').css({"height":gridheight,"overflow":"auto","min-height":"160px"});
+ $('#ListViewDiv').css({"height":listheight,"overflow":"auto","min-height":"100px"});
+
}
$scope.Reset = function (moduleId, query,windowviewid) {
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
if(windowviewid==undefined) // call from also home controller list manager
windowviewid= $rootScope.MULTI_VIEW_ID;
@@ -1791,6 +1882,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
if (typeof event == "object") {
var len= (event.target.parentElement.parentElement.id).split("_").length;
var windowviewid = (event.target.parentElement.parentElement.id).split("_")[len-1];
+
+ $('#selectedTermName_' + windowviewid).val('');
+ $("#selectedTermName_" + windowviewid).attr("name", '0');
if (event.currentTarget.title == $("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title")) {
}
@@ -1808,6 +1902,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
$scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', id);
+ $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
}
var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
@@ -1826,7 +1921,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$(bodySystemListObj[i].parentElement).addClass("activeAASystemSelect");
}
}
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
$scope.removeSpeechBubble(windowviewid);
if (SelectedSystemID == "0") {
@@ -1923,7 +2018,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var SelectedSystemTitle = $("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("title");
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
$scope.removeSpeechBubble(windowviewid);
@@ -1956,6 +2051,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
$scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', SelectedSystemID);
+ $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
}
var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
if(clickedPins.length>0)
@@ -2034,16 +2130,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
.select();
- var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
- for (var i = 0; i <= pinDataWithFirstTermNumber.length - 1; i++) {
- var pinvalue='PinArc_' + pinDataWithFirstTermNumber[i]._PinId;
- var isFound = jQuery.inArray(pinvalue, activePinArray)
- if (isFound == -1) {
- activePinArray.push('PinArc_' + pinDataWithFirstTermNumber[i]._PinId);
- }
-
- }
-
$scope.MultiLanguageAnnationArray = [];
$scope.GetAnnotationBasedOnActualTermNo(pinTermNumber,windowviewid);
@@ -2101,29 +2187,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
if (pinDataWithFirstTermNumber.length > 1) {
isSameTermWithMultiPin = true;
}
- var selectedPins=$scope.GetAAwindowStoreData(windowviewid,'selectedPins');
var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
+ var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+ var selectedPins=$scope.GetAAwindowStoreData(windowviewid,'selectedPins');
+
angular.forEach(pinDataWithFirstTermNumber, function (value, key) {
- if (isBodySystemSelected == true) {
-
- clickedPins.push({ 'id': value._PinId });
- //selectedPins.push(value._PinId);
+ if (isBodySystemSelected == true) {
$scope.SetAAwindowStoreData(windowviewid,'isBodySystemSelected',false);
}
var headX = (parseInt(value._HeadX));
var headY = (parseInt(value._HeadY));
- $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10,0,0, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin,windowviewid);
-
- // remove annotation/speechBubble while resize
- if(isResize)
- {
- $scope.removeSpeechBubble(windowviewid);
- }
-
- //Save Cordinate for show annotation as per Pin
-
- if ($rootScope.isCallFromOtherModule) {
-
+
+ var pinvalue='PinArc_' + value._PinId;
+ var isFound = jQuery.inArray(pinvalue, activePinArray)
+ if (isFound == -1) {
+ activePinArray.push(pinvalue);
+ clickedPins.push({ 'id': value._PinId });
+ selectedPins.push(value._PinId);
+
+ //Save Cordinate for show annotation as per Pin
var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
CBselectedpinCordinate.push(
{
@@ -2133,12 +2215,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
"lx": headX+30,
"pinId": value._PinId
});
+
}
+
+ // remove annotation/speechBubble while resize
+ if(isResize)
+ {
+ $scope.removeSpeechBubble(windowviewid);
+ }
+ else
+ {
+ $scope.createSpeechBubble(parseInt(headX) + 10, parseInt(headY) + 10,0,0, value._PinId, isCtrlPressed, isPinClicked, isSameTermWithMultiPin,windowviewid);
+
+ }
})
}
- $scope.EnableUI();
+ $scope.EnableAAUI(windowviewid);
}
@@ -2277,6 +2371,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
//
$scope.ShowHideAnnotationText(windowviewid);
+ if ($("#hidePinBtn_" + windowviewid).hasClass("btn-primary")) {
+
+ $scope.hideSpeechBubble(windowviewid);
+ }
+
}
$scope.createSpeechBubbleBasedOnAnnotationLength = function (x, y, lx, ly, PinId, windowviewid) {
@@ -2473,20 +2572,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var windowviewid = (clickedSpeechBubbleId).split("_")[len - 1];
var sppechBubbleId = $(this).attr("id").substring(12);
var PinId = sppechBubbleId.split("_")[0];
+ $rootScope.UnsaveCurriculum = true;
+ $timeout(function () {
+ var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
+ var BubleObj = document.getElementById(clickedSpeechBubbleId);
+ var CBselectedpinCordinate = new jinqJs()
+ .from(CBselectedpinCordinate)
+ .update(function (coll, index) { coll[index].lx = BubleObj.offsetLeft; coll[index].ly = BubleObj.offsetTop; })
+ .at("pinId == " + PinId);
- if ($rootScope.isCallFromOtherModule) {
- $rootScope.UnsaveCurriculum = true;
- $timeout(function () {
- var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
- var BubleObj = document.getElementById(clickedSpeechBubbleId);
- var CBselectedpinCordinate = new jinqJs()
- .from(CBselectedpinCordinate)
- .update(function (coll, index) { coll[index].lx = BubleObj.offsetLeft; coll[index].ly = BubleObj.offsetTop; })
- .at("pinId == " + PinId);
-
- }, 100);
+ }, 100);
- }
}
});
@@ -2502,17 +2598,29 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$('#speechBubble' + pinId+'_'+windowviewid).remove();
$("#speechBubbleDraggedLine" + pinId+'_'+windowviewid).remove();
$("#speechBubbleLine" + pinId + '_' + windowviewid).remove();
+ var CBselectedpinCordinate = [];
+ CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
+ CBselectedpinCordinate = new jinqJs()
+ .from(CBselectedpinCordinate)
+ .delete().at("pinId == " + pinId).select();
- if ($rootScope.isCallFromOtherModule) {
- var CBselectedpinCordinate = [];
- CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
- CBselectedpinCordinate = new jinqJs()
- .from(CBselectedpinCordinate)
- .delete().at("pinId == " + pinId).select();
+ $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', CBselectedpinCordinate);
+
+ var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
+ clickedPins = new jinqJs()
+ .from(clickedPins)
+ .delete().at("id == " + pinId).select();
- $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', CBselectedpinCordinate);
- $rootScope.UnsaveCurriculum = true;
+ $scope.SetAAwindowStoreData(windowviewid, 'clickedPins', clickedPins);
+
+ var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
+
+ const index = activePinArray.indexOf("PinArc_"+pinId);
+ if (index > -1) {
+ activePinArray.splice(index, 1);
}
+ $scope.GetAAwindowStoreData(windowviewid,'activePinArray',activePinArray);
+ $rootScope.UnsaveCurriculum = true;
});
@@ -2627,92 +2735,118 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
click: function (clickedPin) {
$rootScope.UnsaveCurriculum =true;
+ $('#selectedTermName_' + windowviewid).val('');
+ $("#selectedTermName_" + windowviewid).attr("name", '0');
//birendra
+ var iskeyctrlActive= $scope.GetAAwindowStoreData(windowviewid, 'keyctrl');//for iPad
// for mac os Command key use for multi selection
- if (clickedPin.event.ctrlKey == false && clickedPin.event.metaKey == false) {
+ if (clickedPin.event.ctrlKey == false && clickedPin.event.metaKey == false && !iskeyctrlActive) {
$scope.SetAAwindowStoreData(windowviewid, 'clickedPins', []);
$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
$scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
+ $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
}
- var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
- var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
- var pinData = new jinqJs()
- .from(aaPinData)
- .where("_PinId == " + pinID)
- .select();
-
-
- var pinTermNumber = pinData[0]._TermId;
-
- var pinWithSameTerm = new jinqJs()
-
- .from(aaPinData)
- .where("_TermId == " + pinTermNumber)
- .select();
- if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
- var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
- var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
- for (var i = 0; i < pinWithSameTerm.length; i++) {
- clickedPins.push({ 'id': pinWithSameTerm[i]._PinId });
- selectedPins.push(pinWithSameTerm[i]._PinId);
- }
- }
-
- $scope.SetAAwindowStoreData(windowviewid,'isSelectedPinBtnClickedAftrSliderCange',false);
- var selectedPinData = new jinqJs()
- .from(aaPinData)
- .where("_PinId == " + pinID)
- .select();
-
+
var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
- if (clickedPin.event.ctrlKey == true||clickedPin.event.metaKey == true) {
- var isFound = jQuery.inArray(clickedPin.name, activePinArray)
- if (isFound == -1) {
- activePinArray.push(clickedPin.name);
- }
- var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
- x1: 50, y1: 50,
- x2: 50, y2: 50,
- r1: 10, r2: 30,
- c1: 'rgba(100, 50, 0,0)',
- c2: 'rgb(126, 187, 83)'
- });
- clickedPin.fillStyle = radialAfterClick;
- $scope.showAnnotation(selectedPinData, true, true, false,false, windowviewid);
- }
- else {
- $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
- var activePin = [];
- activePin.push(clickedPin.name);
- $scope.SetAAwindowStoreData(windowviewid,'activePinArray',activePin);
-
- var radial = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
- x1: 50, y1: 50,
- x2: 50, y2: 50,
- r1: 10, r2: 30,
- c1: 'rgba(100, 50, 0,0)',
- c2: 'rgb(216, 216, 216)'
- });
-
-
- $('#aaDetailViewCanvas_' + windowviewid).setLayers({
- fillStyle: radial,
- }).drawLayers();
-
- //change the head color to green
- var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
- x1: 50, y1: 50,
- x2: 50, y2: 50,
- r1: 10, r2: 30,
- c1: 'rgba(100, 50, 0,0)',
- c2: 'rgb(126, 187, 83)'
- });
+ var isFound = jQuery.inArray(clickedPin.name, activePinArray)
+ if (isFound == -1) {
+ activePinArray.push(clickedPin.name);
+
+ var pinID = (clickedPin.name).substring(7, (clickedPin.name).length);
+ var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+ var pinData = new jinqJs()
+ .from(aaPinData)
+ .where("_PinId == " + pinID)
+ .select();
+
+
+ var pinTermNumber = pinData[0]._TermId;
+
+ var pinWithSameTerm = new jinqJs()
+
+ .from(aaPinData)
+ .where("_TermId == " + pinTermNumber)
+ .select();
+ if (pinWithSameTerm != undefined && pinWithSameTerm != null && pinWithSameTerm.length > 0) {
+ var selectedPins = $scope.GetAAwindowStoreData(windowviewid, 'selectedPins');
+ var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
+ for (var i = 0; i < pinWithSameTerm.length; i++) {
+ clickedPins.push({ 'id': pinWithSameTerm[i]._PinId });
+ selectedPins.push(pinWithSameTerm[i]._PinId);
+ //some time get multiple pinid on selected termid
+ var pinvalue='PinArc_' + pinWithSameTerm[i]._PinId;
+ var isFound = jQuery.inArray(pinvalue, activePinArray)
+ if (isFound == -1) {
+ activePinArray.push(pinvalue);
+ }
- clickedPin.fillStyle = radialAfterClick;
- $scope.showAnnotation(selectedPinData, false, true, false,false, windowviewid);
+ var headX = (parseInt(pinWithSameTerm[i]._HeadX));
+ var headY = (parseInt(pinWithSameTerm[i]._HeadY));
+ //Save Cordinate for show annotation as per Pin
+ var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
+ CBselectedpinCordinate.push(
+ {
+ "hy": headY,
+ "ly": headY+10,
+ "hx": headX,
+ "lx": headX+30,
+ "pinId": pinWithSameTerm[i]._PinId
+ });
- }
+ }
+ }
+
+ $scope.SetAAwindowStoreData(windowviewid,'isSelectedPinBtnClickedAftrSliderCange',false);
+ var selectedPinData = new jinqJs()
+ .from(aaPinData)
+ .where("_PinId == " + pinID)
+ .select();
+
+ if (clickedPin.event.ctrlKey == true||clickedPin.event.metaKey == true ||iskeyctrlActive) {
+
+ var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
+ x1: 50, y1: 50,
+ x2: 50, y2: 50,
+ r1: 10, r2: 30,
+ c1: 'rgba(100, 50, 0,0)',
+ c2: 'rgb(126, 187, 83)'
+ });
+ clickedPin.fillStyle = radialAfterClick;
+ $scope.showAnnotation(selectedPinData, true, true, false,false, windowviewid);
+ }
+ else
+ {
+ var radial = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
+ x1: 50, y1: 50,
+ x2: 50, y2: 50,
+ r1: 10, r2: 30,
+ c1: 'rgba(100, 50, 0,0)',
+ c2: 'rgb(216, 216, 216)'
+ });
+
+
+ $('#aaDetailViewCanvas_' + windowviewid).setLayers({
+ fillStyle: radial,
+ }).drawLayers();
+
+ //change the head color to green
+ var radialAfterClick = $('#aaDetailViewCanvas_' + windowviewid).createGradient({
+ x1: 50, y1: 50,
+ x2: 50, y2: 50,
+ r1: 10, r2: 30,
+ c1: 'rgba(100, 50, 0,0)',
+ c2: 'rgb(126, 187, 83)'
+ });
+
+ clickedPin.fillStyle = radialAfterClick;
+ $scope.showAnnotation(selectedPinData, false, true, false,false, windowviewid);
+
+ }
+
+
+ }
+
}
}).drawLayers();
@@ -2750,77 +2884,87 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
+ //Reload Body View after setting Change
+ $rootScope.reloadAABodyViewEvent = function (isLexiconChange, windowviewid) {
+
+ $scope.loadaaBodyViewChangedBySetting(windowviewid,isLexiconChange);
+ }
+
+ $scope.loadaaBodyViewChangedBySetting = function (windowviewid, isLexiconChange) {
+ $scope.DisableAAUI(windowviewid);
+
+ // store image for export while click on panel
+ var currentViewTitle = $scope.GetAAwindowStoreData(windowviewid, 'currentViewTitle');
+ var imageName = $scope.GetAAwindowStoreData(windowviewid, 'imageName');
+
+ $rootScope.StoreTitleName(currentViewTitle);
+ $rootScope.StoreOrgImageName(imageName);
+
+ var timeintval=$scope.SetAAwindowStoreData(windowviewid,'intervalObject');
+ if(isLexiconChange)
+ {
+ // remove first annotation text
+ $scope.removeSpeechBubble(windowviewid);
+
+ //load term data and also language data
+ $rootScope.loadPinSearchData(windowviewid);
+ timeintval = $interval(function(){loadaaBodyViewBySetting(windowviewid)},5);
+ $scope.SetAAwindowStoreData(windowviewid,'intervalObject',timeintval);
+ function loadaaBodyViewBySetting(panid) {
+ var pinTermData = $scope.GetAAwindowStoreData(panid, 'pinTermData');
+ if (pinTermData!=null) {
+ var intval=$scope.GetAAwindowStoreData(panid,'intervalObject');
+ $scope.stopVocab(intval);
+ $scope.langSearchLoad(panid);
+ $scope.SetAAwindowStoreData(panid,'isShowBodyWithCBPinData',true);
+ //loading annotation
+ $scope.ShowCBAnnotation(panid);
+
+ $timeout(function () {
+ if ($rootScope.isListManagerMenuSelected) {
+ var selectedPanel = $("#viewName option:selected").val();
+ var winid = (selectedPanel).split("_")[1];
+ if(winid==panid)
+ {
+ $scope.DisableAAUI(panid);
+ $rootScope.aalistManagerEvent(panid);
+ }
+ }
+
+ }, 200);
+
+ $scope.EnableAAUI(panid);
+ }
+ else
+ {
+ console.log("waiting for search term Data");
+ }
+ }
+
+ $scope.stopVocab = function (intvalobj) {
+ if (angular.isDefined(intvalobj)) {
+ $interval.cancel(intvalobj);
+ intvalobj = undefined;
+ }
+ };
+
+ }
+
+ }
+
$rootScope.aaloadSearchData = function (windowviewid) {
var imageId= $scope.GetAAwindowStoreData(windowviewid,'imageId');
+ $scope.SetAAwindowStoreData(windowviewid,'pinTermData',[]);
var promise = ModuleService.getTermTextDataForAAImage(imageId)
.then(
function (response) {
var AAPinTermData = response.data.PinTermData.TermData;
$scope.SetAAwindowStoreData(windowviewid,'AAPinTermData',AAPinTermData)
- $scope.EnableUI();
-
- $scope.SetAAwindowStoreData(windowviewid,'pinTermData',[]);
+ $scope.EnableAAUI(windowviewid);
+ $rootScope.loadPinSearchData(windowviewid);
- var primaryLexicon = $rootScope.lexiconLanguageArray[0].id;
- var matchedLanguageTermData = new jinqJs()
- .from(AAPinTermData)
- .where('_LanguageId == ' + primaryLexicon)
- .select();
- var sortedTermTextArray = [];
- for (var i = 0; i < matchedLanguageTermData.length; i++) {
- sortedTermTextArray.push(matchedLanguageTermData[i]._TermText);
- sortedTermTextArray.sort();
- }
-
- var pinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');
-
- for (var i = 0; i <= sortedTermTextArray.length - 1; i++) {
- for (var j = 0; j <= matchedLanguageTermData.length - 1; j++) {
- if (matchedLanguageTermData[j]._TermText == sortedTermTextArray[i]) {
- pinTermData.push({ "LanguageId": matchedLanguageTermData[j]._LanguageId, "TermNumber": matchedLanguageTermData[j]._TermNumber, "TermTxt": matchedLanguageTermData[j]._TermText });
- break;
- }
- }
- }
-
- $("#AABodySystems").empty();
- $("#bodySystems").css("display", "none");
- $("#langaugeDivLm").css("display", "none");
- $("#AABodySystems").css("display", "block");
- $("#bodySystemList_" + windowviewid + " li a").each(function (key, value) {
- var sysid= $(this).attr('id') + '_' +windowviewid;
-
- if ($(this).parent().hasClass("disabledSelectedSystem")) {
- var $systemOptions = $('
').appendTo("#AABodySystems")
- $compile($systemOptions)($scope);
- }
- else{
- var $systemOptions = $('
').appendTo("#AABodySystems")
- $compile($systemOptions)($scope);
- }
-
- });
-
- $scope.$watch('pinTermData', function (newValue, oldValue, scope) {
-
- $('#termlistfilter_' + windowviewid).empty();
- if (pinTermData.length > 0) {
- $timeout(function () {
- console.log('pinTermData= ' + pinTermData.length);
- $('#termList').empty();
- $('#termlistfilter_' + windowviewid).empty();
- for (var j = 0; j < pinTermData.length; j++) {
- var $el = $('
' + pinTermData[j].TermTxt + '').appendTo('#termlistfilter_' + windowviewid)
- $compile($el)($scope);
- var $selectedOptions = $('
').appendTo('#termList')
-
- $compile($selectedOptions)($scope);
- }
- }, 500);
- }
- })
},
function (error) {
// handle errors here
@@ -2830,118 +2974,349 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
+ $rootScope.loadPinSearchData = function (windowviewid) {
+ var AAPinTermData= $scope.GetAAwindowStoreData(windowviewid,'AAPinTermData')
+ for (var i = 0; i <= $rootScope.lexiconLanguageArray.length - 1; i++) {
+
+ var lexiconId = $rootScope.lexiconLanguageArray[i].id;
+ var matchedLanguageTermData = new jinqJs()
+ .from(AAPinTermData)
+ .where('_LanguageId == ' + lexiconId)
+ .select();
+
+ if(matchedLanguageTermData.length>0)
+ {
+ if(i==0)
+ {
+ $scope.SetAAwindowStoreData(windowviewid, 'pinTermData', matchedLanguageTermData);
+ }
+ else
+ {
+ var pinTermData = $scope.GetAAwindowStoreData(windowviewid, 'pinTermData');
+ var result=pinTermData.concat(matchedLanguageTermData);
+ $scope.SetAAwindowStoreData(windowviewid, 'pinTermData', result);
+
+ }
+ }
+
+ }
+
+ }
+
//event remove it fire multiple time
$rootScope.aalistManagerEvent=function(windowviewid){
- $scope.DisableUI();
- $rootScope.aaloadSearchData(windowviewid);
+ $scope.DisableAAUI(windowviewid);
+ $("#langaugeDivLm").css("display", "none");
+
+ $("#AABodySystems").empty();
+ $("#bodySystems").css("display", "none");
+ $("#langaugeDivLm").css("display", "none");
+ $("#AABodySystems").css("display", "block");
+ $('#termList').empty();
+
+ var totalstructure=0;
+ $rootScope.isListManagerMenuSelected = true;
+
+ $scope.SetAAwindowStoreData(windowviewid,'totalstructureLm',0);
+ var languageArray = $rootScope.lexiconLanguageArray;
+
+ if(languageArray.length>1)
+ {
+ $("#langaugeDivLm").css("display", "block");
+ $("#selectLanguageLm").empty();
+ for (var i = 0; i <= languageArray.length - 1; i++) {
+ $('#selectLanguageLm').append('
');
+ }
+ }
+
+ var $all = $('
').appendTo('#AABodySystems');
+ $compile($all)($scope);
+
+ $("#bodySystemList_" + windowviewid + " li a").each(function (key, value) {
+ if($(this).attr('id')!="0")
+ {
+ var sysid= $(this).attr('id') + '_' +windowviewid;
+
+ if ($(this).parent().hasClass("disabledSelectedSystem")) {
+ var $systemOptions = $('
').appendTo("#AABodySystems")
+ $compile($systemOptions)($scope);
+ }
+ else{
+ var $systemOptions = $('
').appendTo("#AABodySystems")
+ $compile($systemOptions)($scope);
+ }
+ }
+
+ });
+
+
+ // primary language
+ var langId=languageArray[0].id;
+ $scope.loadaaListManger(windowviewid,langId,totalstructure);
+
+ }
+
+ $rootScope.changeLanguageLmEventAA = function (windowviewid) {
+ $scope.DisableAAUI(windowviewid);
+ $('#termList').empty();
+ var totalstructure=0;
+ $scope.SetAAwindowStoreData(windowviewid,'totalstructure',0);
+
+ var langIdvalue = $("#selectLanguageLm option:selected").val();
+
+ setTimeout(function () {
+
+ if(langIdvalue!=undefined)
+ {
+ var selectedLanguage = new jinqJs()
+ .from( $rootScope.lexiconLanguageArray)
+ .where('id == ' + langIdvalue)
+ .select()[0];
+
+ var langId=selectedLanguage.id;
+
+ }
+ else
+ {
+ var langId=$rootScope.lexiconLanguageArray[0].id;
+ }
+
+ var sysid = $("#AABodySystems option:selected").attr("id");
+ var bodysystemId = (sysid).split("_")[0];
+ if(bodysystemId=="0")
+ {
+ $scope.loadaaListManger(windowviewid,langId,totalstructure);
+ }
+ else
+ {
+ $scope.aasystemMatchTermLoad(bodysystemId,windowviewid,langId,totalstructure);
+ }
+
+ },100)
+
+ }
+
+ $rootScope.LoadMoreLmEventAA = function (windowviewid) {
+ $scope.DisableAAUI(windowviewid);
+ var langIdvalue = $("#selectLanguageLm option:selected").val();
+ var totalstructure = $scope.GetAAwindowStoreData(windowviewid, 'totalstructureLm');
+
+ setTimeout(function () {
+
+ if(langIdvalue!=undefined)
+ {
+ var selectedLanguage = new jinqJs()
+ .from( $rootScope.lexiconLanguageArray)
+ .where('id == ' + langIdvalue)
+ .select()[0];
+
+ var langId=selectedLanguage.id;
+
+ }
+ else
+ {
+ var langId=$rootScope.lexiconLanguageArray[0].id;
+ }
+
+ var sysid = $("#AABodySystems option:selected").attr("id");
+ var bodysystemId = (sysid).split("_")[0];
+ if(bodysystemId=="0")
+ {
+ $scope.loadaaListManger(windowviewid,langId,totalstructure);
+ }
+ else
+ {
+ $scope.aasystemMatchTermLoad(bodysystemId,windowviewid,langId,totalstructure);
+ }
+
+ }, 100);
+
+ }
+
+ $scope.loadaaListManger = function (windowviewid,langId,totalstructure) {
- $timeout(function () {
- $("#totalTermsLm").empty();
- $("#totalTermsLm").html("
" + $("#termList option").length + " Structures");
- $scope.EnableUI();
- }, 1000);
+ var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
+
+ var languageTermDataArray = new jinqJs()
+ .from( selectedpinTermData)
+ .where('_LanguageId == ' + langId)
+ .select();
+
+ var afterskipdata = new jinqJs()
+ .from(languageTermDataArray)
+ .skip(totalstructure)
+ .select();
+
+ var limitTofilterdata = $filter('limitTo')(afterskipdata, 500);
+
+ var matchTermDataFilter = new jinqJs()
+ .from(limitTofilterdata)
+ .distinct('_TermText', '_TermNumber')
+ .orderBy([{ field: '_TermText', sort: 'asc' }])
+ .select('_TermNumber', '_TermText');
+
+ var option='';
+
+ angular.forEach(matchTermDataFilter, function (value2, key2) {
+ totalstructure=totalstructure+1;
+ option=option+'
';
+
+ })
+ var $el = $(option).appendTo('#termList')
+ $compile($el)($scope);
+
+ $scope.SetAAwindowStoreData(windowviewid,'totalstructureLm',totalstructure);
+ var termsTotal = '
' + totalstructure + ' Structures';
+
+ $("#totalTermsLm").empty();
+ $("#totalTermsLm").append(termsTotal);
+
+ if(totalstructure < languageTermDataArray.length)
+ {
+ $("#totalTermsLm").append('
');
+ }
+ else
+ {
+ $("#totalTermsLm").append('
');
+ $('#btlLoadMoreLm').attr('disabled', 'disabled');
+ }
+
+ $scope.EnableAAUI(windowviewid);
+
}
$rootScope.refreshTermListOnAASystemSelection = function (selectedBodysystemId) {
var windowviewid = (selectedBodysystemId).split("_")[1];
+ var bodysystemId = (selectedBodysystemId).split("_")[0];
$("#AABodySystems").find("option:not(:disabled)").css({ "background-color": "#ffffff", "color": "#000000" });
$("#AABodySystems").find("option[id=" + selectedBodysystemId + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
$('#termList').empty();
- var bodySystemName = $("#AABodySystems #" + selectedBodysystemId).val();
+ // var bodySystemName = $("#AABodySystems #" + selectedBodysystemId).val();
+
+ $scope.SetAAwindowStoreData(windowviewid, 'totalstructureLm',0);
+ var totalstructure = 0;
+ var langIdvalue = $("#selectLanguageLm option:selected").val();
+ if(langIdvalue!=undefined)
+ {
+ var selectedLanguage = new jinqJs()
+ .from( $rootScope.lexiconLanguageArray)
+ .where('id == ' + langIdvalue)
+ .select()[0];
- if (bodySystemName == "All") {
- var pinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');
- for (var j = 0; j <= pinTermData.length - 1; j++) {
- var $selectedOptions = $('
').appendTo("#termList")
+ var langId=selectedLanguage.id;
- $compile($selectedOptions)($scope);
}
- $("#totalTermsLm").empty();
- $("#totalTermsLm").html("
" + $("#termList option").length + " Structures");
- }
- else {
- var imageId = $scope.GetAAwindowStoreData(windowviewid,'imageId');
- var pinDataUrl = "aa_dat_pinterm_" + imageId;
- var bodySystemTermArray = [];
- var sortedListArray = [];
- var duplicateListArray = [];
- $.ajax({
- url: '~/../content/data/json/aa/aa_pinterm/' + pinDataUrl + '.json',
- type: 'GET',
- dataType: "json",
- async: false,
- success: function (result) {
- $(result.PinTermData.TermData).each(function (key, value) {
- bodySystemTermArray.push({ "termNumbr": result.PinTermData.TermData[key]._TermNumber, "text": result.PinTermData.TermData[key]._TermText, "language": result.PinTermData.TermData[key]._LanguageId });
- });
+ else
+ {
+ var langId=$rootScope.lexiconLanguageArray[0].id;
+ }
- var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
- for (var i = 0; i <= aaPinData.length - 1; i++) {
+ if(bodysystemId=="0")
+ {
+ setTimeout(function () {
+ $scope.loadaaListManger(windowviewid,langId,totalstructure);
+
+ }, 100);
+ }
+ else
+ {
+ $scope.aasystemMatchTermLoad(bodysystemId,windowviewid,langId,totalstructure);
+ }
- if (aaPinData[i]._BodySystemName.toLowerCase() == bodySystemName.toLowerCase()) {
+ }
- for (var j = 0 ; j <= bodySystemTermArray.length - 1; j++) {
- if (aaPinData[i]._TermId == bodySystemTermArray[j].termNumbr) {
- if (bodySystemTermArray[j].language == $rootScope.lexiconLanguageArray[0].id) {
- duplicateListArray.push({ "title": bodySystemTermArray[j].text, "id": bodySystemTermArray[j].termNumbr });
- }
- }
- }
- }
- }
- var temp = [];
- for (var i = 0; i <= duplicateListArray.length - 1; i++) {
- var termID = duplicateListArray[i].id;
- if ($.inArray(termID, temp) == -1) {
- temp.push(termID);
- sortedListArray.push({ "title": duplicateListArray[i].title, "id": termID });
+ $scope.aasystemMatchTermLoad=function(bodysystemId,windowviewid,langId,totalstructure)
+ {
+ var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+ var systemMatchedTermList = new jinqJs()
+ .from(aaPinData)
+ .where('_BodySystemId == ' + bodysystemId)
+ .select();
+ if (systemMatchedTermList != null || systemMatchedTermList != undefined) {
+ $scope.refreshTerms(systemMatchedTermList,windowviewid,langId,totalstructure);
+ }
- }
- }
+ }
- for (var i = 0; i <= sortedListArray.length - 1; i++) {
+
+ $scope.refreshTerms = function (termList,windowviewid,langId,totalstructure) {
+ var matchTermData = [];
+ var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');
- for (j = i + 1; j <= sortedListArray.length - 1; j++) {
+ var languageTermDataArray = new jinqJs()
+ .from( selectedpinTermData)
+ .where('_LanguageId == ' + langId)
+ .select();
- if (sortedListArray[i].title.substr(0, 1) > sortedListArray[j].title.substr(0, 1)) {
+
+ for (var i = 0; i < termList.length; i++) {
- var termText = sortedListArray[i].title;
- var termNumbr = sortedListArray[i].id;
- var termLanguage = sortedListArray[i].language;
+ var actulaTerm = new jinqJs()
+ .from(languageTermDataArray)
+ .where('_TermNumber == ' + termList[i]._TermId)
+ .select()[0];
+
+ if (actulaTerm != null || actulaTerm != undefined) {
+ matchTermData.push(
+ {
+ "_TermNumber": actulaTerm._TermNumber,
+ "_TermText": actulaTerm._TermText
+
+ });
+ }
- sortedListArray[i].title = sortedListArray[j].title;
- sortedListArray[i].id = sortedListArray[j].id;
- sortedListArray[i].language = sortedListArray[j].language;
+ }
- sortedListArray[j].title = termText;
- sortedListArray[j].id = termNumbr;
- sortedListArray[j].language = termLanguage;
- }
- }
- }
- for (var j = 0; j <= sortedListArray.length - 1; j++) {
- var $selectedOptions = $('
').appendTo("#termList");
+ var matchTermDataFilter = new jinqJs()
+ .from(matchTermData)
+ .distinct('_TermText', '_TermNumber')
+ .orderBy([{ field: '_TermText', sort: 'asc' }])
+ .select('_TermNumber', '_TermText');
+
+ var option='';
+ if (matchTermDataFilter != null || matchTermDataFilter != undefined) {
+
+ angular.forEach(matchTermDataFilter, function (value2, key2) {
+ totalstructure=totalstructure+1;
+ option=option+'
';
+
+ })
+ var $el = $(option).appendTo('#termList')
+ $compile($el)($scope);
+
+ $scope.SetAAwindowStoreData(windowviewid,'totalstructureLm',totalstructure);
+ var termsTotal = '
' + totalstructure + ' Structures';
- $compile($selectedOptions)($scope);
- }
- }
- });
$("#totalTermsLm").empty();
- $("#totalTermsLm").html("
" + $("#termList option").length + " Structures");
+ $("#totalTermsLm").append(termsTotal);
+
+ if(totalstructure < matchTermDataFilter.length)
+ {
+ $("#totalTermsLm").append('
');
+ }
+ else
+ {
+ $("#totalTermsLm").append('
');
+ $('#btlLoadMoreLm').attr('disabled', 'disabled');
+ }
+
}
- }
+ $scope.EnableAAUI(windowviewid);
+
+ }
+
$scope.GetAnnotationBasedOnActualTermNo = function (actualTermNo,windowviewid) {
- var languageArray = $rootScope.lexiconLanguageArray;
- var AAPinTermData= $scope.GetAAwindowStoreData(windowviewid,'AAPinTermData');
+ var languageArray = $rootScope.lexiconLanguageArray;
+ var pinTermData = $scope.GetAAwindowStoreData(windowviewid, 'pinTermData');
- if (AAPinTermData != null || AAPinTermData != undefined) {
+ if (pinTermData != null || pinTermData != undefined) {
var matchedTermNoData = new jinqJs()
- .from(AAPinTermData)
+ .from(pinTermData)
.where('_TermNumber == ' + actualTermNo)
.select();
@@ -2965,7 +3340,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
$rootScope.hidePins = function (windowviewid) {
$scope.ToolBoxStyle("HidePin",windowviewid);
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
$scope.hideSpeechBubble(windowviewid);
$scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
@@ -2985,7 +3360,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
visible: false // set to true instead to show the layer again
}).drawLayers();
})
- $scope.EnableUI();
+ $scope.EnableAAUI(windowviewid);
}
@@ -2997,7 +3372,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.ToolBoxStyle("ShowAllPin",windowviewid);
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
$scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
@@ -3038,17 +3413,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$("#listManager").css("display", "none");
$("#optionsListManagerTab").removeClass("active");
- $scope.DisableUI();
+ $scope.DisableAAUI(windowviewid);
- //if ($rootScope.isCallFromOtherModule) {
- var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
- if (isHidePinBtnClicked) {
- $scope.showAllPins(windowviewid);
- setTimeout(function () {
- $scope.activePinOnSliderChange(windowviewid);
- }, 200);
- }
- //}
+ var isHidePinBtnClicked = $scope.GetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked');
+ if (isHidePinBtnClicked) {
+ $scope.showAllPins(windowviewid);
+ setTimeout(function () {
+ $scope.activePinOnSliderChange(windowviewid);
+ }, 200);
+ }
+
$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', false);
$scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
$scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', true);
@@ -3151,84 +3525,267 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}).drawLayers();
})
}
- $scope.EnableUI();
+ $scope.EnableAAUI(windowviewid);
}
- $scope.showItemsForSearch = function (event) {
- var len= (event.currentTarget.id).split("_").length;
- var windowviewid = (event.currentTarget.id).split("_")[len-1];
+ $scope.showItemsForSearch = function (windowviewid, isbuttionclick) {
+
+ if ($('#searchListDivAA_' + windowviewid).html() != "")
+ $('#termlistfilter_'+windowviewid).empty();
+
+ $scope.IsSearchVisible = true;
+ // clear time stamp on text box click
+ $scope.SetAAwindowStoreData(windowviewid, 'SearchTimeStampValue', 0);
+
+ var langIdvalue = $("#searchLanguageLm_"+windowviewid+" option:selected").val();
+ if(langIdvalue!=undefined)
+ {
+ var selectedLanguage = new jinqJs()
+ .from( $rootScope.lexiconLanguageArray)
+ .where('id == ' + langIdvalue)
+ .select()[0];
+
+ var langId=selectedLanguage.id;
+ }
+ else
+ {
+ // get default language
+ var langId=$rootScope.lexiconLanguageArray[0].id
+ }
- console.log('showItemsForSearch is called');
- //this check is for log only because we are writing length so need to check if its not null or undefined
+ var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
+
+ var languageTermDataArray = new jinqJs()
+ .from( selectedpinTermData)
+ .where('_LanguageId == ' + langId)
+ .select();
- var AAPinTermData=$scope.GetAAwindowStoreData(windowviewid,'AAPinTermData');
- $timeout(function () {
- if ((AAPinTermData != null || AAPinTermData != undefined) && (AAPinTermData.length > 0)) {
+ var searchvalue = $("#selectedTermName_" + windowviewid).val();
+
+ var searchfilterdata = $filter('filter')(languageTermDataArray, searchvalue);
+ if(searchvalue.trim()!="")
+ {
+ searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText.length');
+ }
+ else
+ {
+ searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText');
+ }
- $scope.IsSearchVisible = true;
- $("#termlistfilter_" + windowviewid).css("display", "block");
+ $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 500);
- $("#backdrop > #searchListDivAA > #termlistfilter_" + windowviewid + " > li").each(function (key, value) {
+ $('#termlistfilter_'+windowviewid).css("display", "block");
- if ($(this).find("a").html() == document.getElementById("selectedTermName_"+windowviewid).value) {
- $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
- $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
- }
- });
+ angular.forEach($scope.limitTofilterdata, function (value2, key2) {
+ var $el = $('
').appendTo('#termlistfilter_' + windowviewid);
+ $compile($el)($scope);
+ })
+
+ var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
+ $compile($all)($scope);
+
+ if(isbuttionclick)
+ {
+ $timeout(function () {
+ $('#termlistfilter_'+windowviewid).focus();
+ }, 200);
+ }
- }
- else {
- $rootScope.aaloadSearchData(windowviewid);
- if (AAPinTermData.length > 0) {
- $scope.showItemsForSearch(event);
- }
- }
+ }
- }, 500);
+ $scope.resetSearchListView = function (event) {
+
+ var len = (event.target.id).split("_").length;
+ var windowviewid = (event.target.id).split("_")[len - 1];
+ var date = new Date();
+ var newtimestamp = date.getTime();
+
+ var oldtimestamp = $scope.GetAAwindowStoreData(windowviewid, 'SearchTimeStampValue');
+
+ if ((newtimestamp - oldtimestamp) > 500) {
+
+ $scope.SetAAwindowStoreData(windowviewid, 'SearchTimeStampValue', newtimestamp);
+ $scope.showFilteredTerms(windowviewid);
+ }
}
$scope.HideSearchList = function (event) {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
+
$timeout(function () {
+ if(!$scope.IsSearchVisible)
+ {
+ $("#termlistfilter_" + windowviewid).empty();
+ $("#termlistfilter_" + windowviewid).css("display", "none");
+ }
+
+ }, 600);
+
+ }
+
+ $scope.showFilteredTerms = function (windowviewid) {
+ var langIdvalue = $("#searchLanguageLm_"+windowviewid+" option:selected").val();
+ if(langIdvalue!=undefined)
+ {
+ var selectedLanguage = new jinqJs()
+ .from( $rootScope.lexiconLanguageArray)
+ .where('id == ' + langIdvalue)
+ .select()[0];
+
+ var langId=selectedLanguage.id;
+ }
+ else
+ {
+ // get default language
+ var langId=$rootScope.lexiconLanguageArray[0].id
+ }
+
+ var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
+
+ var languageTermDataArray = new jinqJs()
+ .from( selectedpinTermData)
+ .where('_LanguageId == ' + langId)
+ .select();
+
+ var searchvalue = $("#selectedTermName_" + windowviewid).val();
+
+ var searchfilterdata = $filter('filter')(languageTermDataArray, searchvalue);
+ if(searchvalue.trim()!="")
+ {
+ searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText.length');
+ }
+ else
+ {
+ searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText');
+ }
+
+ $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 20);
+
+ $('#termlistfilter_'+windowviewid).css("display", "block");
+ $('#termlistfilter_'+windowviewid).empty();
+
+ angular.forEach($scope.limitTofilterdata, function (value2, key2) {
+ var $el = $('
').appendTo('#termlistfilter_' + windowviewid);
+ $compile($el)($scope);
+ })
+
+ var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDivAA_' + windowviewid);
+ $compile($all)($scope);
+
+ $("#selectedTermName_" + windowviewid).attr("name", "0");
+
+ };
+
+ $scope.changeaaSearchLanguage = function (event) {
+
+ var len= (event.currentTarget.id).split("_").length;
+ var windowviewid = (event.currentTarget.id).split("_")[len-1];
- $("#termlistfilter_"+windowviewid).css("display", "none");
+ $scope.changeSearchText(windowviewid);
+
+ }
+ $scope.changeSearchText = function (windowviewid) {
+
+ setTimeout(function () {
+
+ var term_num = $("#selectedTermName_" + windowviewid).attr("name");
+ if(term_num!=undefined && term_num!="0")
+ {
+ var langIdvalue = $("#searchLanguageLm_"+windowviewid+" option:selected").val();
+ if(langIdvalue!=undefined)
+ {
+ var selectedLanguage = new jinqJs()
+ .from( $rootScope.lexiconLanguageArray)
+ .where('id == ' + langIdvalue)
+ .select()[0];
+
+ var langId=selectedLanguage.id;
+
+ }
+ else
+ {
+ var langId=$rootScope.lexiconLanguageArray[0].id;
+ }
+ var selectedpinTermData=$scope.GetAAwindowStoreData(windowviewid,'pinTermData');//term data for selected language
+
+ var languageTermDataArray = new jinqJs()
+ .from( selectedpinTermData)
+ .where('_LanguageId == ' + langId)
+ .select();
+
+
+ var selectedTerm = new jinqJs()
+ .from( languageTermDataArray)
+ .where('_TermNumber == '+term_num)
+ .select()[0];
- }, 500);
+
+ if(selectedTerm!=undefined)
+ {
+
+ $("#selectedTermName_" + windowviewid).attr("name", selectedTerm._TermNumber);
+ $("#selectedTermName_" + windowviewid).val(selectedTerm._TermText);
+
+ }
+ else
+ {
+ $("#selectedTermName_" + windowviewid).attr("name", "0");
+ $("#selectedTermName_" + windowviewid).val('');
+ }
+
+ }
+ else
+ {
+ $("#selectedTermName_" + windowviewid).attr("name", "0");
+ $("#selectedTermName_" + windowviewid).val('');
+ }
+
+ },100)
+
}
- $scope.highlightPinBasedOnSerachItemEvent = function (termid) {
+
+
+ $scope.highlightPinBasedOnSerachItemEvent = function (termid,isTermListOptionClicked) {
$rootScope.UnsaveCurriculum = true;
- $scope.highlightPinBasedOnSerachItem(termid);
+ $scope.highlightPinBasedOnSerachItem(termid,isTermListOptionClicked);
}
- $scope.highlightPinBasedOnSerachItem = function (termid) {
+ $scope.highlightPinBasedOnSerachItem = function (termid,isTermListOptionClicked) {
var windowviewid = (termid).split("_")[1];
- var id=(termid).split("_")[0];
+ var TermNumber= termid.split('_')[0];
var currenttermidTxt = $('#' + termid).text();
+ $scope.IsSearchVisible=false;
+
+
+ if (isTermListOptionClicked == true) {
+ $('#selectedTermName_' + windowviewid).val('');
+ $("#selectedTermName_" + windowviewid).attr("name", '0');
+ }
+ else
+ {
+ $('#selectedTermName_' + windowviewid).val(currenttermidTxt);
+ $("#selectedTermName_" + windowviewid).attr("name", TermNumber);
+ $("#termlistfilter_" + windowviewid).empty();
+ $("#termlistfilter_" + windowviewid).css("display", "none");
+ }
$scope.showAllPinsAfterHide(windowviewid);
- $('#termList option[selected="selected"]').prop("selected", false);
- $('#termList option[value="' + currenttermidTxt + '"]').attr("selected", true);
$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
- $('#termList option[value="' + currenttermidTxt + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-
- $("#termlistfilter_" + windowviewid + " li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
- $("#termlistfilter_" + windowviewid + " li").find("a[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
-
- $('#selectedTermName_' + windowviewid).val(currenttermidTxt);
-
+ $("#termList").find("option[id=" + termid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
+
//get data from pindata for this trem
var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
var pinDataForTerm = new jinqJs()
.from(aaPinData)
- .where("_TermId == " + id)
+ .where("_TermId == " + TermNumber)
.select();
// birendra
@@ -3249,23 +3806,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$('#aaDetailViewCanvas_'+windowviewid).setLayers({
fillStyle: radial,
}).drawLayers();
- console.log(pinDataForTerm[0]._PinId);
- var pinID = "PinArc_" + pinDataForTerm[0]._PinId;
-
+
$scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
- var clickpin = [];
- clickpin.push({ 'id': pinDataForTerm[0]._PinId });
- $scope.SetAAwindowStoreData(windowviewid, 'clickedPins', clickpin);
-
$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
- var selectedPins = [];
- selectedPins.push(pinDataForTerm[0]._PinId);
- $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', selectedPins);
-
- $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
- var activePin = [];
- activePin.push(pinID);
- $scope.SetAAwindowStoreData(windowviewid,'activePinArray',activePin);
+ $scope.SetAAwindowStoreData(windowviewid,'activePinArray',[]);
+ //clear all cb data
+ $scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
$scope.showAnnotation(pinDataForTerm, false, false, true,false,windowviewid);
// maintaing scroll position on selection of options in list manager.
@@ -3277,6 +3823,25 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
+ $scope.MultipleAnnotation = function (event) {
+ var len= (event.currentTarget.id).split("_").length;
+ var windowviewid = (event.currentTarget.id).split("_")[len-1];
+
+ //set true to false or vice versa
+ var iskeyctrlActive= $scope.GetAAwindowStoreData(windowviewid, 'keyctrl');
+
+ if(iskeyctrlActive)
+ {
+ $("#multiannotation_"+windowviewid).addClass("disableMultiAnnotationText");
+ }
+ else
+ {
+ $("#multiannotation_"+windowviewid).removeClass("disableMultiAnnotationText");
+ }
+
+ $scope.SetAAwindowStoreData(windowviewid, 'keyctrl', !iskeyctrlActive);
+ }
+
$scope.ShowHideAnnotation = function (event) {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
@@ -3502,10 +4067,28 @@ function onSearchAA(event) {
console.log('AA search is called')
var scope = angular.element(document.getElementById("aaBodyView")).scope();
scope.$apply(function () {
- scope.showItemsForSearch(event);
+ var len= (event.currentTarget.id).split("_").length;
+ var windowviewid = (event.currentTarget.id).split("_")[len-1];
+
+ if((event.currentTarget.id).match('btnSearchAA'))
+ scope.showItemsForSearch(windowviewid,true);
+ else
+ {
+ scope.showItemsForSearch(windowviewid,false);
+ }
+
+ });
+}
+
+function changeaaSearchLanguage(event) {
+ event.stopPropagation();
+ var scope = angular.element(document.getElementsByClassName("aaBodyView")).scope();
+ scope.$apply(function () {
+ scope.changeaaSearchLanguage(event);
});
}
+
function hideSearchList(event) {
console.log('AA hide search is called')
var scope = angular.element(document.getElementById("aaBodyView")).scope();
@@ -3514,12 +4097,12 @@ function hideSearchList(event) {
});
}
-function onSearchItemSelection(termid) {
+function onSearchItemSelection(termid, isTermListOptionClicked) {
console.log('AA hide search is called');
var scope = angular.element(document.getElementById("aaBodyView")).scope();
scope.$apply(function () {
- scope.highlightPinBasedOnSerachItemEvent(termid);
+ scope.highlightPinBasedOnSerachItemEvent(termid,isTermListOptionClicked);
});
}
@@ -3532,6 +4115,14 @@ function showHideAnnotation(event) {
});
}
+function keyControlAAActive(event) {
+
+ var scope = angular.element(document.getElementById("aaBodyView")).scope();
+ scope.$apply(function () {
+ scope.MultipleAnnotation(event);
+ });
+}
+
function showSelectedPins(event) {
console.log('showSelectedPins is called')
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
index 65742b7..eede1d5 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/AOD/AOD-view.html
@@ -1,7 +1,7 @@
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
index f00d63f..f1c04b8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/CBuild/CBuild-view.html
@@ -2,7 +2,7 @@
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
index 6c077f1..1d1a676 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -62,6 +62,12 @@
background: #4b4b4b;
border-color: #3f3f3f !important;
}
+ .disableMultiAnnotationText {
+ background: #4b4b4b;
+ border-color: #3f3f3f !important;
+ }
+
+
-
-
+
+
+
+
+
+
-
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
index 16172d5..ea919d6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -121,6 +121,11 @@
left: 0;
right: 0;
}
+
+ .disableMultiAnnotationText {
+ background: #4b4b4b;
+ border-color: #3f3f3f !important;
+ }
+
+
+
+
@@ -231,7 +240,7 @@
-
+
diff --git a/400-SOURCECODE/AIAHTML5.Web/content/images/mult-annotation.png b/400-SOURCECODE/AIAHTML5.Web/content/images/mult-annotation.png
index 7477b72..d7572a8 100644
--- a/400-SOURCECODE/AIAHTML5.Web/content/images/mult-annotation.png
+++ b/400-SOURCECODE/AIAHTML5.Web/content/images/mult-annotation.png
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx b/400-SOURCECODE/AIAHTML5.Web/index.aspx
index 6218000..55f27f4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx
@@ -1,4 +1,5 @@
<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="index.aspx.cs" Inherits="ADAM.AIA.index" %>
+<%@ OutputCache NoStore="True" Duration="1" VaryByParam='*' Location="None" %>
@@ -16,9 +17,9 @@
A.D.A.M. Interactive Anatomy
-
+
-
+
@@ -36,12 +37,12 @@
-
+
-
+