' +
- '
' +
+ content:'
'+
+ '
'+
+ '
'+
+ '
' +
+ //'
' +
+ '
![]()
' +
+ '
' +
'
' + selectedImageCISummary + '
' +
'
' +
- '
',
+ '
'+
+ '
',
title: tittle,
position: {
top: $scope.jsPanelTop,
@@ -954,6 +959,19 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.SetCIwindowStoreData(windowviewid, 'width', ui.size.width);
$scope.SetCIwindowStoreData(windowviewid, 'height', ui.size.height);
$rootScope.UnsaveCurriculum = true;
+ var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
+ //annotation lost after resize paint canvas
+ // var canvasDIvWidth = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").width()-50;
+ // var canvas = document.getElementById("canvasCI_" + windowviewid);
+ // var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
+ //canvas.height = canvasDIvHeight-200;
+ // canvasPaint.height = canvasDIvHeight-200;
+ // canvas.width = canvasDIvWidth;
+ // canvasPaint.width = canvasDIvWidth;
+
+ $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
+
+
}
},
@@ -989,72 +1007,79 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.SetCIwindowStoreData(windowviewid, 'currentSlug', 'clinical-illustrations-detail');
+ $timeout(function () {
- $rootScope.openViews.push(
- {
- "module": $rootScope.currentActiveModuleTitle, "bodyView": tittle, "state": 'max', "BodyViewId": imageId,
- "slug": $scope.GetCIwindowStoreData(windowviewid, 'currentSlug')
- });
-
-
- $("#" + $scope.jsPanelID + " .img-thumbnail").css("height", $("#" + $scope.jsPanelID + " .jsPanel-content").height());
+ var canvasDIvHeight = $('#ciImagePanel_' + windowviewid+ " .jsPanel-content").height();
+
+ $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
+
+ if (!$rootScope.isCallFromOtherModule) {
+ $('#CIView').css("height", $(window).outerHeight() - 65);
+ $('#CIView').css("width", $(window).outerWidth() - 15);
+
+ var canvas = document.getElementById("canvasCI_" + windowviewid);
+ var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
+ canvas.height = canvasDIvHeight-200;
+ canvasPaint.height = canvasDIvHeight-200;
+ canvas.width = screen.width-70;
+ canvasPaint.width = screen.width-70;
- if (!$rootScope.isCallFromOtherModule) {
- $('#CIView').css("height", $(window).outerHeight() - 65);
-
- $('#CIView').css("width", $(window).outerWidth() - 46);
-
-
- }
-
- if ($rootScope.isCallFromOtherModule) {
- var canvasDIvHeight = parseInt($("#" + $scope.jsPanelID).outerHeight()) - 40;
- }
- else {
- var canvasDIvHeight = parseInt($("#" + $scope.jsPanelID).outerHeight()) - 90;
- }
-
- $('#canvasDivCI_' + windowviewid).css('height', canvasDIvHeight);
-
-
- $('#canvasDivCI_' + windowviewid + ' img').load(function () {
- $scope.EnableUI();
- var imgheight= $("#" + $scope.jsPanelID + " .img-thumbnail img").height();
- var canvas = document.getElementById("canvasCI_" + windowviewid);
- var canvasPaint = document.getElementById("canvasPaintCI_" + windowviewid);
- canvas.height = imgheight;
- canvasPaint.height = imgheight;
-
- $scope.JsPanelclick(windowviewid);
-
- var isTextVisible = $scope.GetCIwindowStoreData(windowviewid, 'isTextVisible');
-
- if (isTextVisible) {
- $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
- }
- else {
- $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
}
- if ($rootScope.isCallFromOtherModule) {
- var annotationData= $scope.ciOpenInOtherModules.annotationData;
- // load annotation
- if(annotationData!="" && annotationData!=undefined)
- {
- if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
- {
- //first draw shape and then store in object
- $rootScope.LoadCBSavedAnnotation("canvasCI_"+windowviewid,"canvasPaintCI_"+windowviewid,annotationData);
- }
- }
+
+ var openedImage = document.getElementById('ciimage_' + windowviewid );
+ openedImage.src = selectedCIImage;
+ openedImage.onload = function () {
+ if (!$rootScope.isCallFromOtherModule) {
+ $("#ciimage_"+windowviewid).css("left", (screen.width-this.width-70)/2 + "px");
+ }
+ $("#ciimage_"+windowviewid).css("visibility","visible");
+ // $("#ciimage_"+windowviewid).css("width", this.width + "px");
+ // $("#ciimage_"+windowviewid).css("height", this.height + "px");
+
+ var canvasZIndex = $("#canvasCI_" + windowviewid).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + windowviewid).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + windowviewid).css("z-index", canvasPaintZIndex);
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + windowviewid).css("z-index", canvasZIndex);
+ }
+
+ $scope.JsPanelclick(windowviewid);
+
+ var isTextVisible = $scope.GetCIwindowStoreData(windowviewid, 'isTextVisible');
- }
-
- $rootScope.CIWindowLoadComplete = true;
-
- });
+ if (isTextVisible) {
+ $("#btnTxtOnOff_" + windowviewid).text("Text Off"); $("#sid_" + windowviewid).css("visibility", "visible");
+ }
+ else {
+ $("#btnTxtOnOff_" + windowviewid).text("Text On"); $("#sid_" + windowviewid).css("visibility", "hidden");
+ }
+ if ($rootScope.isCallFromOtherModule) {
+ var annotationData= $scope.ciOpenInOtherModules.annotationData;
+ // load annotation
+ if(annotationData!="" && annotationData!=undefined)
+ {
+ if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
+ {
+ //first draw shape and then store in object
+ $rootScope.LoadCBSavedAnnotation("canvasCI_"+windowviewid,"canvasPaintCI_"+windowviewid,annotationData);
+ }
+ }
+
+ }
+ $scope.EnableUI();
+ $rootScope.CIWindowLoadComplete = true;
+
+ };
+
+ $scope.PanelActivity();
+
+ },300)
- //Calling methode for save Js Panel Activity for SaveCB
- $scope.PanelActivity();
}
$rootScope.ciAnnotationToolEvent = function (windowviewid) {
@@ -1142,7 +1167,6 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
isVisible = true;
$scope.SetCIwindowStoreData(windowviewid, 'isTextVisible', isVisible);
}
- //$rootScope.saveCIWindowActivity("textVisible", isVisible);
}
$scope.RemoveJSPanel = function (panelid) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
index 5675091..3c2ba13 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CurrBuildController.js
@@ -308,8 +308,10 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
objFileRead.onload = receivedFile;
objFileRead.readAsText(file);
}, 300);
- } else {
- alert("Please select exported\saved Curriculum Builder Json file!");
+ }
+ else
+ {
+ alert("This Curriculum is not supported format!.Please try again");
}
}
@@ -1331,7 +1333,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
objFileRead.readAsText(file);
}, 300);
} else {
- alert("Please select exported\saved Curriculum Builder Json file!");
+ alert("This Curriculum not in supported format");
}
}
@@ -1613,15 +1615,15 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
window.navigator.msSaveOrOpenBlob(blob, filename);
}
else {
- document.execCommand("SaveAs", true, filename);
+ document.execCommand("SaveAs", true, filename);
- var event = document.createEvent('MouseEvents'),
- saveElement = document.createElement('a');
- saveElement.download = filename;
- saveElement.href = window.URL.createObjectURL(blob);
- saveElement.dataset.downloadurl = ['text/json', saveElement.download, saveElement.href].join(':');
- event.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
- saveElement.dispatchEvent(event);
+ var event = document.createEvent('MouseEvents'),
+ saveElement = document.createElement('a');
+ saveElement.download = filename;
+ saveElement.href = window.URL.createObjectURL(blob);
+ saveElement.dataset.downloadurl = ['text/json', saveElement.download, saveElement.href].join(':');
+ event.initEvent('click', true, false, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
+ saveElement.dispatchEvent(event);
}
$scope.SectionContentForExportCB=[];
@@ -2268,7 +2270,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
var paintCanvasState = 'paintCanvasState';
if (!annotation.hasOwnProperty(shapeStates) || !annotation.hasOwnProperty(paintCanvasState))
{
- alert('This slide has old annotations on view.Please use Annotation Tool to draw annotations again.')
+ alert('This slide has old annotations.Please use Annotation Tool to draw annotations again.')
windowData.annotationData="";
}
@@ -2681,7 +2683,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
var isLabExChanged= $rootScope.LEWindowData[i].isLabExChanged;
if(isLabExChanged)
{
- if (confirm("Do you want to save Exercise changes?")) {
+ if (confirm("Do you want to save Lab Exercise changes?")) {
//save to database
var windowid= $rootScope.LEWindowData[i].multiwinid;
$rootScope.SaveAnswer(undefined,windowid);
@@ -2975,16 +2977,16 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
bodySystemId: $rootScope.AAWindowData[i].SelectedSystemID,
windowListId: "0",//N
imageId: $rootScope.AAWindowData[i].imageId,
- //position: { x: 840, y: 263 },
position: {
y: $rootScope.AAWindowData[i].y,
x: $rootScope.AAWindowData[i].x,
},
mType: $rootScope.AAWindowData[i].moduleName,
containsCapturedContent: true,
+ showHideAnnotations: $rootScope.AAWindowData[i].showHideAnnotations,
contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
//activePinArray: $rootScope.AAWindowData[i].activePinArray,
- selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId
+ //selectedSearchId: $rootScope.AAWindowData[i].selectedSearchId
//typeOfEvent: $rootScope.AAWindowData[i].typeOfEvent
@@ -3018,11 +3020,6 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
minimised: $rootScope.DaWindowData[i].minimised,
windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
- //scrollPosition: {
- // vertical: $rootScope.DaWindowData[i].verticalScroll,
- // horizontal: $rootScope.DaWindowData[i].horizontalScroll
- //},
-
maximised: $rootScope.DaWindowData[i].maximised,
size: {
width: $rootScope.DaWindowData[i].width,
@@ -3036,10 +3033,7 @@ function ($scope, $rootScope, pages, log, Modules, $http, $compile, $location, $
x: $rootScope.DaWindowData[i].x,
},
mType: $rootScope.DaWindowData[i].moduleName,
- containsCapturedContent: true,
- //contextMenu: { hideLeftBar: false, hideTitleBar: false, hideTopToolBar: false, lockResize: false },
- //activePinArray: $rootScope.DaWindowData[i].activePinArray, // Selected PINID on Body
- //sliderVal: $rootScope.DaWindowData[i].sliderVal,
+ containsCapturedContent: true,
zoom: $rootScope.DaWindowData[i].zoomInOut,
skinId: $rootScope.DaWindowData[i].curentEthnicity,
isResizeLock: false , //N
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 0e0426d..f509e31 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -147,7 +147,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
'transparencyX': 0,
'transparencyY': 0,
'isTransparent': false,
- 'showHideAnnotations': ''
+ 'showHideAnnotations': 'showAnnotationStructure'
};
return windata;
@@ -436,7 +436,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var daImagePanelConetent = document.getElementsByClassName("jsPanel-content");
for (var i = 0; i < daImagePanelConetent.length; i++) {
- var panelpointevent = $("#"+ $scope.jsPanelID).css('pointer-events');
+ var dapanal=daImagePanelConetent[i].parentElement;
+ var panelpointevent = $("#"+ dapanal.id).css('pointer-events');
if(panelpointevent=="none")
{
//using for slide lock in cb
@@ -779,8 +780,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
if ($scope.daOpenInOtherModules.layerNumberTransparency == 1 && $scope.GetwindowStoreData(windowviewid, 'layerNumber') != 0) {
$scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', $scope.daOpenInOtherModules.layerNumber);
- }
- $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', $scope.daOpenInOtherModules.showHideAnnotations);
+ }
+
+ if ($scope.daOpenInOtherModules.showHideAnnotations != undefined && $scope.daOpenInOtherModules.showHideAnnotations != "") {
+ $scope.SetwindowStoreData(windowviewid, 'showHideAnnotations', $scope.daOpenInOtherModules.showHideAnnotations);
+ }
+
//store annotation data due long execution of DA moduel
var annotationData=$scope.daOpenInOtherModules.annotationData
@@ -944,7 +949,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.jsPanelTop = 70;
}
- $scope.jsPanelDA = $.jsPanel({
+ $scope.jsPanelDA = $.jsPanel({
id: $scope.jsPanelID,
selector: '.daBodyView',
theme: 'success',
@@ -997,7 +1002,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var windowviewid = (event.currentTarget.id).split("_")[len - 1];
$scope.SetwindowStoreData(windowviewid, 'width', ui.size.width);
$scope.SetwindowStoreData(windowviewid, 'height', ui.size.height);
- $rootScope.UnsaveCurriculum = true;
+ $rootScope.UnsaveCurriculum = true;
+ var canvasDIvHeight = parseInt($('#daImagePanel_' + windowviewid).outerHeight()) - 130;
+ $('#canvasDivDA_' + windowviewid).css('height', canvasDIvHeight);
}
},
@@ -1047,9 +1054,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$timeout(function () {
$compile(daBodyviewElement.contents())($scope);
-
//set ids
-
$scope.daViewID = "daView";
$scope.btnIdentifyID = "btnIdentify";
$scope.btnZoomID = "btnZoom";
@@ -1091,25 +1096,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.IdMale = "IdMale";
$scope.IdFemale = "IdFemale";
+ $scope.setControlIDs(windowviewid);
+
+ var timeintval = null;
+ timeintval = $interval(function () {
+ var bodySystemListObj = document.getElementById("structureDropdownDA_" + windowviewid);
+ var len = bodySystemListObj!=null?(bodySystemListObj.id).split("_").length:0;
+ if (len>1) {
+ $scope.stopIntervalLoader();
+ //wait until DOM element load of DA
+ $scope.daViewLoader(windowviewid);
+ }
+ else
+ {
+ $scope.setControlIDs(windowviewid);
+ console.log("waiting for loading module");
+ }
+ }, 200);
+ $scope.stopIntervalLoader = function () {
+ if (angular.isDefined(timeintval)) {
+ $interval.cancel(timeintval);
+ timeintval = undefined;
+ }
+ };
- $scope.setControlIDs();
-
- $scope.JsPanelclick(windowviewid);
-
- $scope.NavigatorDraggable(windowviewid)
- $scope.loadbtnNavigator(windowviewid);
- // set slider control
- $scope.Setslider(windowviewid);
-
- $scope.TbSelSlider(windowviewid);
-
- $scope.loadView(windowviewid);
- var viewtitlename=$scope.GetwindowStoreData(windowviewid,'currentViewTitle');
- $scope.switchGender(windowviewid,viewtitlename);
-
- $scope.setActiveview(windowviewid,viewtitlename);
- }, 350);
+
+
+ }, 500);
}
}
else {
@@ -1118,10 +1132,27 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$location.path('/');
}
- //Calling methode for save Js Panel Activity for SaveCB
- $scope.PanelActivity();
+
}
+ $scope.daViewLoader = function (windowviewid) {
+ $scope.PanelActivity(windowviewid);
+ $scope.JsPanelclick(windowviewid);
+
+ $scope.NavigatorDraggable(windowviewid)
+ $scope.loadbtnNavigator(windowviewid);
+ // set slider control
+ $scope.Setslider(windowviewid);
+
+ $scope.TbSelSlider(windowviewid);
+ var viewtitlename=$scope.GetwindowStoreData(windowviewid,'currentViewTitle');
+ $scope.switchGender(windowviewid,viewtitlename);
+
+ $scope.setActiveview(windowviewid,viewtitlename);
+
+ $scope.loadView(windowviewid);
+
+ }
// 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.
$scope.loadView = function (windowviewid) {
$scope.DisableUI();
@@ -1134,7 +1165,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// view, now we are programmatically closing the hung view and when user will reopen the DA view from tile then it will
// open without any issue.
- var jsPanelCloseBtnID = $scope.jsPanelID + " " + ".jsglyph-remove"
+ var jsPanelCloseBtnID = 'daImagePanel_' + windowviewid; + " " + ".jsglyph-remove"
$("#" + jsPanelCloseBtnID).click();
}
@@ -1271,6 +1302,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ($scope.GetwindowStoreData(windviewid, 'isTransparent')) {
$scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', slideVal);
}
+ $rootScope.UnsaveCurriculum = true;
$scope.SetwindowStoreData(windviewid,'layerNumber',slideVal);
scope.LayerChange(windviewid);
$("#annotationpaintbrushsize").removeClass("activebtncolor");
@@ -1323,143 +1355,137 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
});
}
- $scope.setControlIDs = function () {
-
- $("#daView").attr("id", "daViewDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.daViewID = "daViewDA_" + $rootScope.MULTI_VIEW_ID;
-
- $("#navigatorDiv").attr("id", "navigatorDiv_" + $rootScope.MULTI_VIEW_ID);
- $scope.navigatorDivID = "navigatorDiv_" + $rootScope.MULTI_VIEW_ID;
+ $scope.setControlIDs = function (windowviewid) {
- $("#navDiv").attr("id", "navDiv_" + $rootScope.MULTI_VIEW_ID);
- $scope.navDivID = "navDiv_" + $rootScope.MULTI_VIEW_ID;
+ $("#daView").attr("id", "daViewDA_" + windowviewid);
+ $scope.daViewID = "daViewDA_" + windowviewid;
- $("#navimg").attr("id", "navimg_" + $rootScope.MULTI_VIEW_ID);
- $scope.navimgID = "navimg_" + $rootScope.MULTI_VIEW_ID;
+ $("#navigatorDiv").attr("id", "navigatorDiv_" + windowviewid);
+ $scope.navigatorDivID = "navigatorDiv_" + windowviewid;
- $("#txtlayerNumber").attr("id", "txtLayerNumberDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.txtLayerNumberID = "txtLayerNumberDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#navDiv").attr("id", "navDiv_" + windowviewid);
+ $scope.navDivID = "navDiv_" + windowviewid;
- $("#layerChangeSlider").attr("id", "layerChangeSliderDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.layerChangeSliderID = "layerChangeSliderDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#navimg").attr("id", "navimg_" + windowviewid);
+ $scope.navimgID = "navimg_" + windowviewid;
- $("#canvasDiv").attr("id", "canvasDivDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.canvasDivID = "canvasDivDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#txtlayerNumber").attr("id", "txtLayerNumberDA_" + windowviewid);
+ $scope.txtLayerNumberID = "txtLayerNumberDA_" + windowviewid;
- //$("#canvas").attr("id", "canvasDA_" + $rootScope.MULTI_VIEW_ID);
- // $scope.canvasID = "canvasDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#layerChangeSlider").attr("id", "layerChangeSliderDA_" +windowviewid);
+ $scope.layerChangeSliderID = "layerChangeSliderDA_" + windowviewid;
- // $("#canvasPaint").attr("id", "canvasPaintDA_" + $rootScope.MULTI_VIEW_ID);
- // $scope.canvasPaintID = "canvasPaintDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#canvasDiv").attr("id", "canvasDivDA_" + windowviewid);
+ $scope.canvasDivID = "canvasDivDA_" + windowviewid;
- $("#btnIdentify").attr("id", "btnIdentify_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnIdentifyID = "btnIdentify_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnIdentify").attr("id", "btnIdentify_" + windowviewid);
+ $scope.btnIdentifyID = "btnIdentify_" + windowviewid;
- $("#btnZoom").attr("id", "btnZoom_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnZoomID = "btnZoom_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnZoom").attr("id", "btnZoom_" + windowviewid);
+ $scope.btnZoomID = "btnZoom_" + windowviewid;
- $("#zoomValue").attr("id", "zoomValueDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.zoomValueID = "zoomValueDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#zoomValue").attr("id", "zoomValueDA_" + windowviewid);
+ $scope.zoomValueID = "zoomValueDA_" + windowviewid;
- $("#btnTranparency").attr("id", "btnTranparency_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnTranparencyID = "btnTranparency_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnTranparency").attr("id", "btnTranparency_" + windowviewid);
+ $scope.btnTranparencyID = "btnTranparency_" + windowviewid;
- $("#btnNormalMode").attr("id", "btnNormalMode_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnNormalModeID = "btnNormalMode_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnNormalMode").attr("id", "btnNormalMode_" + windowviewid);
+ $scope.btnNormalModeID = "btnNormalMode_" + windowviewid;
- $("#btnExtract").attr("id", "btnExtract_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnExtractID = "btnExtract_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnExtract").attr("id", "btnExtract_" + windowviewid);
+ $scope.btnExtractID = "btnExtract_" + windowviewid;
- $("#btnHighLight").attr("id", "btnHighLight_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnHighLightID = "btnHighLight_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnHighLight").attr("id", "btnHighLight_" + windowviewid);
+ $scope.btnHighLightID = "btnHighLight_" + windowviewid;
- $("#genderChangeId").attr("id", "genderChangeIdDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.genderChangeID = "genderChangeIdDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#genderChangeId").attr("id", "genderChangeIdDA_" + windowviewid);
+ $scope.genderChangeID = "genderChangeIdDA_" + windowviewid;
- $("#dropdownMenu4").attr("id", "dropdownMenu4_" + $rootScope.MULTI_VIEW_ID);
- //$scope.dropdownMenu4ID = "dropdownMenu4_" + $rootScope.MULTI_VIEW_ID;
+ $("#dropdownMenu4").attr("id", "dropdownMenu4_" + windowviewid);
+ //$scope.dropdownMenu4ID = "dropdownMenu4_" + windowviewid;
- $("#structureDropdown").attr("id", "structureDropdownDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.structureDropdownID = "structureDropdownDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#structureDropdown").attr("id", "structureDropdownDA_" + windowviewid);
+ $scope.structureDropdownID = "structureDropdownDA_" + windowviewid;
- $("#viewChangeID").attr("id", "viewChangeIDDA_" + $rootScope.MULTI_VIEW_ID);
- $scope.viewChangeID = "viewChangeIDDA_" + $rootScope.MULTI_VIEW_ID;
+ $("#viewChangeID").attr("id", "viewChangeIDDA_" + windowviewid);
+ $scope.viewChangeID = "viewChangeIDDA_" + windowviewid;
- $("#btnStrutureBox").attr("id", "btnStrutureBox_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnStrutureBoxID = "btnStrutureBox_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnStrutureBox").attr("id", "btnStrutureBox_" + windowviewid);
+ $scope.btnStrutureBoxID = "btnStrutureBox_" + windowviewid;
- $("#typedTermName").attr("id", "typedTermName_" + $rootScope.MULTI_VIEW_ID);
- $scope.typedTermNameID = "typedTermName_" + $rootScope.MULTI_VIEW_ID;
+ $("#typedTermName").attr("id", "typedTermName_" + windowviewid);
+ $scope.typedTermNameID = "typedTermName_" + windowviewid;
- $("#da-input").attr("id", "da-input_" + $rootScope.MULTI_VIEW_ID);
+ $("#da-input").attr("id", "da-input_" + windowviewid);
- $("#searchListDiv").attr("id", "searchListDiv_" + $rootScope.MULTI_VIEW_ID);
- $scope.searchListDivID = "searchListDiv_" + $rootScope.MULTI_VIEW_ID;
+ $("#searchListDiv").attr("id", "searchListDiv_" + windowviewid);
+ $scope.searchListDivID = "searchListDiv_" + windowviewid;
- $("#btnDATermSearch").attr("id", "btnDATermSearch_" + $rootScope.MULTI_VIEW_ID);
- $("#navigatorBtn").attr("id", "navigatorBtn_" + $rootScope.MULTI_VIEW_ID);
- $scope.navigatorBtnID = "navigatorBtn_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnDATermSearch").attr("id", "btnDATermSearch_" + windowviewid);
+ $("#navigatorBtn").attr("id", "navigatorBtn_" + windowviewid);
+ $scope.navigatorBtnID = "navigatorBtn_" + windowviewid;
- $("#transparencyScale").attr("id", "transparencyScale_" + $rootScope.MULTI_VIEW_ID);
- $scope.transparencyScaleID = "transparencyScale_" + $rootScope.MULTI_VIEW_ID;
+ $("#transparencyScale").attr("id", "transparencyScale_" + windowviewid);
+ $scope.transparencyScaleID = "transparencyScale_" + windowviewid;
- $("#btnTBoxClose").attr("id", "btnTBoxClose_" + $rootScope.MULTI_VIEW_ID);
- $scope.btnTBoxCloseID = "btnTBoxClose_" + $rootScope.MULTI_VIEW_ID;
+ $("#btnTBoxClose").attr("id", "btnTBoxClose_" + windowviewid);
+ $scope.btnTBoxCloseID = "btnTBoxClose_" + windowviewid;
- $('body').find('#daBodyview').find("#canvasDiv").attr("id", "canvasDivDA_" + $rootScope.MULTI_VIEW_ID);
+ $('body').find('#daBodyview').find("#canvasDiv").attr("id", "canvasDivDA_" + windowviewid);
- $("#dropdownMenu3").attr("id", "dropdownMenu3_" + $rootScope.MULTI_VIEW_ID);
- $("#dropdownMenu2").attr("id", "dropdownMenu2_" + $rootScope.MULTI_VIEW_ID);
+ $("#dropdownMenu3").attr("id", "dropdownMenu3_" + windowviewid);
+ $("#dropdownMenu2").attr("id", "dropdownMenu2_" + windowviewid);
- $("#draggable").attr("id", "draggable_" + $rootScope.MULTI_VIEW_ID);
- $scope.draggableID = "draggable_" + $rootScope.MULTI_VIEW_ID;
+ $("#draggable").attr("id", "draggable_" + windowviewid);
+ $scope.draggableID = "draggable_" + windowviewid;
- $("#leftToolBar").attr("id", "leftToolBarDA_" + $rootScope.MULTI_VIEW_ID);
+ $("#leftToolBar").attr("id", "leftToolBarDA_" + windowviewid);
- $("#searchedTermListPopUp").attr("id", "searchedTermListPopUp_" + $rootScope.MULTI_VIEW_ID);
- $scope.searchedTermListPopUpID = "searchedTermListPopUp_" + $rootScope.MULTI_VIEW_ID;
+ $("#searchedTermListPopUp").attr("id", "searchedTermListPopUp_" + windowviewid);
+ $scope.searchedTermListPopUpID = "searchedTermListPopUp_" + windowviewid;
- $("#searchTermListUl").attr("id", "searchTermListUl_" + $rootScope.MULTI_VIEW_ID);
- $scope.searchTermListUlId = "searchTermListUl_" + $rootScope.MULTI_VIEW_ID;
+ $("#searchTermListUl").attr("id", "searchTermListUl_" + windowviewid);
+ $scope.searchTermListUlId = "searchTermListUl_" + windowviewid;
- $("#btnSearchList").attr("id", "btnSearchList_" + $rootScope.MULTI_VIEW_ID);
+ $("#btnSearchList").attr("id", "btnSearchList_" + windowviewid);
- $("#tbSlider").attr("id", "tbSlider_" + $rootScope.MULTI_VIEW_ID);
+ $("#tbSlider").attr("id", "tbSlider_" + windowviewid);
- $("#IdMale").attr("id", "IdMale_" + $rootScope.MULTI_VIEW_ID);
+ $("#IdMale").attr("id", "IdMale_" + windowviewid);
- $("#IdFemale").attr("id", "IdFemale_" + $rootScope.MULTI_VIEW_ID);
+ $("#IdFemale").attr("id", "IdFemale_" + windowviewid);
// side bar toggle
- $("#sidebarId").attr("id", "sidebarId_" + $rootScope.MULTI_VIEW_ID);
+ $("#sidebarId").attr("id", "sidebarId_" + windowviewid);
// bodyview id
- $("#Anterior").attr("id", "Anterior_" + $rootScope.MULTI_VIEW_ID);
- $("#Lateral").attr("id", "Lateral_" + $rootScope.MULTI_VIEW_ID);
- $("#Medial").attr("id", "Medial_" + $rootScope.MULTI_VIEW_ID);
- $("#Posterior").attr("id", "Posterior_" + $rootScope.MULTI_VIEW_ID);
- $("#LateralArm").attr("id", "LateralArm_" + $rootScope.MULTI_VIEW_ID);
- $("#MedialArm").attr("id", "MedialArm_" + $rootScope.MULTI_VIEW_ID);
+ $("#Anterior").attr("id", "Anterior_" + windowviewid);
+ $("#Lateral").attr("id", "Lateral_" + windowviewid);
+ $("#Medial").attr("id", "Medial_" + windowviewid);
+ $("#Posterior").attr("id", "Posterior_" + windowviewid);
+ $("#LateralArm").attr("id", "LateralArm_" + windowviewid);
+ $("#MedialArm").attr("id", "MedialArm_" + windowviewid);
// bodyview id
- $("#CurrentStructure").attr("id", "CurrentStructure_" + $rootScope.MULTI_VIEW_ID);
- $("#Cardiovascular").attr("id", "Cardiovascular_" + $rootScope.MULTI_VIEW_ID);
- $("#Digestive").attr("id", "Digestive_" + $rootScope.MULTI_VIEW_ID);
- $("#Endocrine").attr("id", "Endocrine_" + $rootScope.MULTI_VIEW_ID);
- $("#Immune").attr("id", "Immune_" + $rootScope.MULTI_VIEW_ID);
- $("#Integumentary").attr("id", "Integumentary_" + $rootScope.MULTI_VIEW_ID);
- $("#Lymphatic").attr("id", "Lymphatic_" + $rootScope.MULTI_VIEW_ID);
- $("#Muscular").attr("id", "Muscular_" + $rootScope.MULTI_VIEW_ID);
- $("#Nervous").attr("id", "Nervous_" + $rootScope.MULTI_VIEW_ID);
- $("#Reproductive").attr("id", "Reproductive_" + $rootScope.MULTI_VIEW_ID);
- $("#Respiratory").attr("id", "Respiratory_" + $rootScope.MULTI_VIEW_ID);
- $("#Skeletal").attr("id", "Skeletal_" + $rootScope.MULTI_VIEW_ID);
- $("#Urinary").attr("id", "Urinary_" + $rootScope.MULTI_VIEW_ID);
-
- var $all = $("#da-input_" + $rootScope.MULTI_VIEW_ID).prepend('
')
+ $("#CurrentStructure").attr("id", "CurrentStructure_" + windowviewid);
+ $("#Cardiovascular").attr("id", "Cardiovascular_" + windowviewid);
+ $("#Digestive").attr("id", "Digestive_" + windowviewid);
+ $("#Endocrine").attr("id", "Endocrine_" + windowviewid);
+ $("#Immune").attr("id", "Immune_" + windowviewid);
+ $("#Integumentary").attr("id", "Integumentary_" + windowviewid);
+ $("#Lymphatic").attr("id", "Lymphatic_" + windowviewid);
+ $("#Muscular").attr("id", "Muscular_" + windowviewid);
+ $("#Nervous").attr("id", "Nervous_" + windowviewid);
+ $("#Reproductive").attr("id", "Reproductive_" + windowviewid);
+ $("#Respiratory").attr("id", "Respiratory_" + windowviewid);
+ $("#Skeletal").attr("id", "Skeletal_" + windowviewid);
+ $("#Urinary").attr("id", "Urinary_" + windowviewid);
+
+ var $all = $("#da-input_" +windowviewid).prepend('
')
$compile($all)($scope);
}
@@ -2063,7 +2089,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#daBodyview').css('width', '100%');
if ($rootScope.isCallFromOtherModule) {
- var canvasDIvHeight = parseInt($('#daImagePanel_' + windowviewid).outerHeight()) - 124;
+ var canvasDIvHeight = parseInt($('#daImagePanel_' + windowviewid).outerHeight()) - 130;
}
else
{
@@ -2609,6 +2635,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
FlipedImgCanvas.addEventListener('click', function (evt) {
+ $rootScope.UnsaveCurriculum = true;
var preTermData = [];
var len= (evt.currentTarget.id).split("_").length;
var windowviewid = (evt.currentTarget.id).split("_")[len-1];
@@ -3131,7 +3158,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
imgCanvas.addEventListener('click', function (evt) {
-
+ $rootScope.UnsaveCurriculum = true;
var preTermData; //Use for Remove SpeechBUbble With TermNumber
var len= (evt.currentTarget.id).split("_").length;
var windowviewid = (evt.currentTarget.id).split("_")[len-1];
@@ -3623,6 +3650,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var showHideAnnotations = $scope.GetwindowStoreData(windowviewid, 'showHideAnnotations');
if (showHideAnnotations != undefined && showHideAnnotations != "") {
document.getElementById("btnStrutureBox_" + windowviewid).name = showHideAnnotations;
+ if(showHideAnnotations=='hideAnnotationStructure')
+ {
+ $("#btnStrutureBox_" + windowviewid).addClass("disableHideShowStructure");
+ }
+
}
var CurriculumTermData = $scope.GetwindowStoreData(windowviewid,'CurriculumTermData');
@@ -4291,7 +4323,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$("#btnTranparency_" + windowviewid).attr('disabled', 'disabled');
if ($scope.GetwindowStoreData(windowviewid,'isHighLight') == true) {
- $scope.CloseTransparencyBox(windowviewid);
+ $scope.CloseTransparencyBox(false,windowviewid);
}
console.log('HighlightBodyByTermListForBodySystem is called');
@@ -5113,6 +5145,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var termNumber = (clickedSpeechBubbleId).split("-")[1];
if ($rootScope.isCallFromOtherModule) {
+ $rootScope.UnsaveCurriculum = true;
$timeout(function () {
var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
var BubleObj = document.getElementById(clickedSpeechBubbleId);
@@ -5149,6 +5182,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
.delete().at("termNumber == " + termNumber).select();
$scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
+ $rootScope.UnsaveCurriculum = true;
}
$(this).parent().parent().parent().remove();
});
@@ -5197,6 +5231,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var termNumber = (clickedSpeechBubbleId).split("-")[1];
if ($rootScope.isCallFromOtherModule) {
+ $rootScope.UnsaveCurriculum = true;
$timeout(function () {
var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
var BubleObj = document.getElementById(clickedSpeechBubbleId);
@@ -5228,6 +5263,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
.delete().at("termNumber == " + termNumber).select();
$scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
+ $rootScope.UnsaveCurriculum = true;
}
$('#' + removeid).remove();
});
@@ -5285,6 +5321,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var termNumber = (clickedSpeechBubbleId).split("-")[1];
if ($rootScope.isCallFromOtherModule) {
+ $rootScope.UnsaveCurriculum = true;
$timeout(function () {
var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
var BubleObj = document.getElementById(clickedSpeechBubbleId);
@@ -5319,6 +5356,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
.delete().at("transparentTermNumber == " + termNumber).select();
$scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
+ $rootScope.UnsaveCurriculum = true;
}
$(this).parent().parent().parent().remove();
@@ -5378,6 +5416,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var termNumber = (clickedSpeechBubbleId).split("-")[1];
if ($rootScope.isCallFromOtherModule) {
+ $rootScope.UnsaveCurriculum = true;
$timeout(function () {
var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
var BubleObj = document.getElementById(clickedSpeechBubbleId);
@@ -5410,6 +5449,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
.delete().at("transparentTermNumber == " + termNumber).select();
$scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
+ $rootScope.UnsaveCurriculum = true;
}
$('#' + removeid).remove();
});
@@ -6045,7 +6085,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var len = (e.currentTarget.id).split("_").length;
var windowviewid = (e.currentTarget.id).split("_")[len - 1];
//to prevent screen scroll on ipad while drawing TB
- e.preventDefault();
+ e.preventDefault();
+ $rootScope.UnsaveCurriculum = true;
$scope.SetwindowStoreData(windowviewid, 'isTBDrawnOnBodyRegion', false);
$scope.SetwindowStoreData(windowviewid, 'isTransparencyActivated', true);
$scope.SetwindowStoreData(windowviewid, 'IsNormalModeBeforeTBDraw', $scope.GetwindowStoreData(windowviewid, 'isNormalMode'));
@@ -7782,6 +7823,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
function TransparencyCanvasClickListener(evt) {
+ $rootScope.UnsaveCurriculum = true;
var len= (evt.currentTarget.id).split("_").length;
var windowviewid = (evt.currentTarget.id).split("_")[len-1];
var pixelData;
@@ -7965,6 +8007,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
function OnClickModestyTransCanvas(evt) {
+ $rootScope.UnsaveCurriculum = true;
var len= (evt.target.id).split("_").length;
var windowviewid = (evt.target.id).split("_")[len-1];
@@ -8451,11 +8494,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}, 10)
}
- $scope.CloseTransparencyBox = function (windowviewid) {
+ $scope.CloseTransparencyBox = function (ClickByButton,windowviewid) {
$scope.SetwindowStoreData(windowviewid,'isTBoxModestyVisible',false);
//for enabling annoataions.
//Now everything si done on canavases uswed in annotation toolbar.
+ if(ClickByButton)
+ {
+ $rootScope.UnsaveCurriculum = true;
+ }
+
$rootScope.switchCanvas("daImagePanel_"+windowviewid);
if ($rootScope.isAnnotaionToolBarDrawingModeActive == true) {
$("#OnIdentify").removeClass('annotationtoolbartab');
@@ -8651,7 +8699,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.enableZoom = function (event) {
- $scope.DisableUI();
+ $scope.DisableUI();
+ $rootScope.UnsaveCurriculum = true;
var len = (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
$("#OnIdentify").removeClass("annotationtoolbartab");
@@ -8807,6 +8856,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.enableHighlight = function (windowviewid) {
+ $rootScope.UnsaveCurriculum = true;
$scope.SetwindowStoreData(windowviewid, 'mode', "HIGHLIGHT");
$scope.SetwindowStoreData(windowviewid, 'isHighlightlBtnClicked', true);
@@ -8878,6 +8928,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.enableNormalMode = function (windowviewid) {
+ $rootScope.UnsaveCurriculum = true;
$scope.SetwindowStoreData(windowviewid, 'mode', "NORMAL");
$scope.SetwindowStoreData(windowviewid, 'isNormalBtnClicked', true);
$scope.SetwindowStoreData(windowviewid, 'previousHighlightList', []);
@@ -9033,6 +9084,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
else
{
+ $rootScope.UnsaveCurriculum = true;
if ($scope.GetwindowStoreData(windowviewid,'isExtract') == true) {
}
@@ -9083,6 +9135,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.enableShowHideStructureBox = function (event) {
//if listanager is visisble then close it
+ $rootScope.UnsaveCurriculum = true;
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
@@ -9706,7 +9759,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.DisableUI();
-
+ $rootScope.UnsaveCurriculum = true;
var canvasDiv = document.getElementById("canvasDivDA_" + windowviewid);
$scope.imageVerticalScrollPosition = canvasDiv.scrollTop;
$scope.imageHorizontlScrollPosition = canvasDiv.scrollLeft;
@@ -9718,7 +9771,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$("#btnTranparency_" + windowviewid).css("pointer-events", "auto");
if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
- $scope.CloseTransparencyBox(windowviewid);
+ $scope.CloseTransparencyBox(false,windowviewid);
}
$rootScope.isTransparencyBoxActivated = false;
@@ -9982,7 +10035,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]);
}
-
+ $rootScope.UnsaveCurriculum = true;
$scope.DisableUI();
$scope.SetwindowStoreData(windowviewid,'isViewChange',true);
@@ -10002,7 +10055,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//close transparency box
if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
- $scope.CloseTransparencyBox(windowviewid);
+ $scope.CloseTransparencyBox(false,windowviewid);
}
@@ -10280,7 +10333,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.HighlightBodyByBodySystem = function (event) {
var len= (event.target.parentElement.parentElement.id).split("_").length;
var windowviewid = (event.target.parentElement.parentElement.id).split("_")[len-1];
-
+ $rootScope.UnsaveCurriculum = true;
var viewOrientationId=$scope.GetwindowStoreData(windowviewid,'viewOrientationId');
$scope.SetwindowStoreData(windowviewid,'isExtract',false);
$("#structureDropdownDA_" + windowviewid).toggle();
@@ -10580,7 +10633,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var serachedTermId=event.target.id;
var len= (serachedTermId).split("_").length;
var windowviewid = (serachedTermId).split("_")[len-1];
-
+ $rootScope.UnsaveCurriculum = true;
$rootScope.isTermClicked = true;
var currenttermidTxt=$('#' + serachedTermId).text();
@@ -10755,6 +10808,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.HighlightBodyOnListManagerSelection = function (selectedtermid, isTermListOptionClicked, windowviewid) {
+ $rootScope.UnsaveCurriculum = true;
var currenttermidTxt=$("#" + selectedtermid).text();
$scope.SetwindowStoreData(windowviewid,'searchSelectedText',currenttermidTxt);
@@ -10764,7 +10818,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
- $scope.CloseTransparencyBox(windowviewid);
+ $scope.CloseTransparencyBox(false,windowviewid);
}
console.log('inside HighlightBodyOnListManagerSelection actualTermNumber= ' + actualTermNumber)
// Terms search in the Search list should be disable in the List Manager and Vice-Versa.
@@ -11240,19 +11294,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}
- $scope.LayerValueChangeBasedOnKeyUp = function (e) {
+ $scope.LayerValueChangeBasedOnKeyUp = function (event) {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
var totalayer=$scope.GetwindowStoreData(windowviewid,'totalLayers');
- if (e.keyCode == 13) {
+ if (event.keyCode == 13) {
if ($('#txtLayerNumberDA_' + windowviewid).val() == '') {
$('#txtLayerNumberDA_' + windowviewid).val($scope.GetwindowStoreData(windowviewid,'PreviouslayerNumbr'));
}
- else {
+ else {
$scope.SetwindowStoreData(windowviewid,'PreviouslayerNumbr',$('#txtLayerNumberDA_' + windowviewid).val());
var keyUplayerNumber = parseInt($('#txtLayerNumberDA_' + windowviewid).val());
@@ -11260,8 +11314,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (isNaN(keyUplayerNumber)) {
document.getElementById('txtLayerNumberDA_' + windowviewid).value = "";
}
- else {
-
+ else
+ {
+ $rootScope.UnsaveCurriculum = true;
if (keyUplayerNumber > totalayer) {
$('#txtLayerNumberDA_' + windowviewid).val(totalayer);
@@ -11423,9 +11478,9 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
//Created method by Sandeep for Save JSPanel Activity on the CB module
- $scope.PanelActivity = function () {
+ $scope.PanelActivity = function (windowviewid) {
- $(document).on("click", "#" + $scope.jsPanelID + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
+ $(document).on("click", "#" + 'daImagePanel_' + windowviewid + " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function (event) {
//$(document).on("click", " .jsPanel-hdr .jsPanel-hdr-r .jsPanel-btn-close .jsglyph-remove", function () {
var panelid = $(event.target).parent().parent().parent().parent().attr('id');
@@ -11517,13 +11572,6 @@ function selectTerm(event) {
});
}
-// function HighlightBodyOnListManager(event) {
-// console.log('HighlightBodyOnListManager is called outside ');
-// var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
-// scope.$apply(function () {
-// scope.HighlightBodyOnListManagerSelection(event);
-// });
-// }
function refreshTermListOnSystem(bodysystemId) {
console.log('refreshTermListOnSystem is called outside ');
@@ -11544,8 +11592,6 @@ function OnEnableExtract() {
}
function onTboxCreation() {
-
- console.log('OnEnableExtract is called outside ');
var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
scope.$apply(function () {
var len= (event.currentTarget.id).split("_").length;
@@ -11560,7 +11606,7 @@ function onTboxClose() {
scope.$apply(function () {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
- scope.CloseTransparencyBox(windowviewid);
+ scope.CloseTransparencyBox(true,windowviewid);
});
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index bfe923b..7fb7742 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -218,12 +218,12 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
else
{
- alert("File size not allow more than 10MB.Please try again");
+ alert("This Animation video size not allow more than 10MB.Please try again");
}
}
else
{
- alert("Please select a file in mp4 format.Please try again");
+ alert("This Animation video is not in supported format mp4.Please try again");
}
}
@@ -2793,6 +2793,18 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
else if(paneld.match("ciImagePanel"))
{
$rootScope.ciAnnotationToolEvent(MultiWinId);
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
}
else if(paneld.match("aiImagePanel"))
@@ -2857,6 +2869,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
var len = (paneld).split("_").length;
var MultiWinId = (paneld).split("_")[len - 1];
+
+ // remove event listener
+
+ var PanelElement= $scope.GetPanelElement(paneld);
+ var canvasElement = PanelElement.canvasElement;
+ $scope.removeOnDrawingCanvas(canvasElement);
+
if (paneld.match("daImagePanel")) {
if ($("#transparencyScale_" + MultiWinId).css("display") == "block") {
@@ -2913,6 +2932,24 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
}
}
+
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
+
}
}
}
@@ -2998,6 +3035,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
}
+
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
}
@@ -3152,6 +3206,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
}
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
}
@@ -3216,6 +3286,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
@@ -3281,7 +3367,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
- }
+ }
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
}
@@ -3312,6 +3414,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var MultiWinId = (paneld).split("_")[len - 1];
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
}
@@ -3354,6 +3472,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
@@ -3435,6 +3570,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$scope.PaintEraseEvent();
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
}
@@ -3463,6 +3614,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$rootScope.isAnnotaionToolBarDrawingModeActive = true;
$rootScope.switchCanvasToPaintCanvas(paneld);
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
$('#' + canvasPaintId).sketch();
@@ -3664,6 +3831,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
@@ -3707,6 +3890,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
@@ -3749,6 +3948,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
@@ -3790,6 +4005,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.switchToAnnotationCanvas(paneld,MultiWinId);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
@@ -3940,6 +4171,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$rootScope.switchCanvas(paneld);
}
+ if(paneld.match("ciImagePanel"))
+ {
+ var canvasZIndex = $("#canvasCI_" + MultiWinId).css("z-index");
+ var canvasPaintZIndex = $("#canvasPaintCI_" + MultiWinId).css("z-index");
+
+ if (parseInt(canvasZIndex) < parseInt(canvasPaintZIndex)) {
+ canvasPaintZIndex = parseInt(canvasPaintZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasPaintZIndex);
+
+ }
+ else {
+ canvasZIndex = parseInt(canvasZIndex) + 1;
+ $('#summary_' + MultiWinId).css("z-index", canvasZIndex);
+ }
+
+ }
}
}
}
@@ -5826,6 +6073,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var storeLine = '';
//----
let isDrawing = false;
+ let currentCanvasId = '';
$scope.onDrawingCanvasOnModule = function (annotationCanvas) {
//remove old event listener
@@ -5846,6 +6094,19 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
}
+ $scope.removeOnDrawingCanvas = function (annotationCanvas) {
+
+ //remove old event listener
+ //event code modified .work of only DA,AA,CI,AI,PIC
+ annotationCanvas.removeEventListener("mousedown", $rootScope.OnPaintCanvasMouseDown);
+ annotationCanvas.removeEventListener("touchstart", $rootScope.OnPaintCanvasMouseDown);
+ annotationCanvas.removeEventListener("mouseup", $rootScope.OnPaintCanvasMouseUp);
+ annotationCanvas.removeEventListener("touchend", $rootScope.OnPaintCanvasMouseUp);
+ window.removeEventListener('mouseup', $rootScope.OnPaintCanvasMouseUp);
+ window.removeEventListener("touchend", $rootScope.OnPaintCanvasMouseUp);
+
+
+ }
//Birendra updated due to some issue
$rootScope.OnPaintCanvasMouseDown = function (event) {
@@ -5917,11 +6178,18 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
if (canvasElement != null ||canvasElement != undefined)
{
var canvasId = canvasElement.id;
+ if(canvasId=="")
+ {
+ canvasElement=document.getElementById(currentCanvasId);
+ canvasId= currentCanvasId;
+ }
+
if (canvasId != null ||canvasId != undefined)
{
+
if(canvasId.match("canvasDA")||canvasId.match("canvasAA")||canvasId.match("canvasCI")||canvasId.match("canvasAI")||canvasId.match("canvasPIC"))
{
- var canvasDiv = (event.target.parentElement);
+ var canvasDiv = (canvasElement.parentElement);
var canvasDivId = canvasDiv.id;
// var canvasPaintElement = event.target.previousElementSibling;
@@ -6026,6 +6294,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
//Birendra updated due to some issue
$rootScope.OnPaintCanvasMouseMove = function (event) {
event.preventDefault();
+ isDrawing = false;
+ currentCanvasId='';
if(!$rootScope.clicked) return;
if ($rootScope.isAnnotatiomToolBarPopupClosed == false) {
if ($rootScope.shapeType==undefined || $rootScope.shapeType=='cursor'||$rootScope.shapeType=="") {
@@ -6043,6 +6313,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var canvasDiv = (event.target.parentElement);
var canvasDivId = canvasDiv.id;
isDrawing = true;
+ currentCanvasId=canvasId;
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
$rootScope.MouseMoveXAxis = event.pageX + horizontlScrollPosition - $('#' + canvasDivId).offset().left;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 0d53b63..afbde24 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -424,6 +424,8 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$scope.SetLEwindowStoreData(windowviewid, 'width', ui.size.width);
$scope.SetLEwindowStoreData(windowviewid, 'height', ui.size.height);
$rootScope.UnsaveCurriculum = true;
+ var canvasDIvHeight = parseInt($('#labImagePanel_' + windowviewid).outerHeight()) - 15;
+ $('#LabView_' + windowviewid).css('height', canvasDIvHeight);
}
},
@@ -434,6 +436,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$scope.SetLEwindowStoreData(windowviewid, 'y', ui.position.top);
$scope.SetLEwindowStoreData(windowviewid, 'x', ui.position.left);
$rootScope.UnsaveCurriculum = true;
+
}
},
@@ -821,7 +824,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
}
$scope.nextQuiz = function ($event) {
-
+ $rootScope.UnsaveCurriculum = true;
var len = ($event.target.id).split("_").length;
var windowviewid = ($event.target.id).split("_")[len - 1];
@@ -869,7 +872,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
}
$scope.prevQuiz = function ($event) {
-
+ $rootScope.UnsaveCurriculum = true;
var len = ($event.target.id).split("_").length;
var windowviewid = ($event.target.id).split("_")[len - 1];
@@ -1173,6 +1176,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
var DraggedAttr = $scope[dynamicDragList][inx1].DraggedAttr;
console.log("drag box id:" + DraggedAttr);
if (DraggedAttr == draggableAttribute) {
+ $rootScope.UnsaveCurriculum = true;
$scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', true);
$scope[dynamicDragList].splice(inx1, 1);
$('#' + draggableAttribute).css({ "display": "block", "color": "#000000!important" });
@@ -1216,6 +1220,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$.each(Options, function (inx, value2) {
if (Options[inx].BoxName == BlockBoxName.split("_")[0]) {
+ $rootScope.UnsaveCurriculum = true;
$scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', true);
if ($scope[dynamicDragList] != null) {
for (var i = 0; i <= $scope[dynamicDragList].length - 1; i++) {
@@ -1297,6 +1302,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$.each(Options, function (inx, value2) {
if (Options[inx].BoxName == BlockBoxName.split("_")[0]) {
+ $rootScope.UnsaveCurriculum = true;
$scope.SetLEwindowStoreData(windowviewid, 'isLabExChanged', true);
if ($scope[dynamicDragList] != null) {
for (var i = 0; i <= $scope[dynamicDragList].length - 1; i++) {
@@ -1423,7 +1429,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
};
$scope.OnResetClick = function ($event) {
-
+ $rootScope.UnsaveCurriculum = true;
var len = ($event.target.id).split("_").length;
var windowviewid = ($event.target.id).split("_")[len - 1];
$scope.SetLEwindowStoreData(windowviewid, 'isResetClicked', true);
@@ -1524,6 +1530,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
{
var len = ($event.target.id).split("_").length;
var windowviewid = ($event.target.id).split("_")[len - 1];
+ $rootScope.UnsaveCurriculum = true;
}
$scope.DisableUI();
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
index 556d1a7..0ca5000 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
@@ -350,6 +350,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.SetVideowindowStoreData(windowviewid, 'width', ui.size.width);
$scope.SetVideowindowStoreData(windowviewid, 'height', ui.size.height);
$rootScope.UnsaveCurriculum = true;
+ var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
+ $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
}
},
@@ -393,13 +395,16 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
});
- var jspContentHeight = $('.jsPanel-content').height();
+ // var jspContentHeight = $('.jsPanel-content').height();
+ var canvasDIvHeight = $('#vidImagePanel_' + windowviewid+ " .jsPanel-content").height();
+ $('#playerinlineVideo_'+ windowviewid ).css("height",canvasDIvHeight-20 );
+
var videoHeight = $('#divplayerinlineVideo_'+ windowviewid +' div').height();
if (videoHeight <= 0)
videoHeight = 360;
var textH = $('.video-subtitle').height();
textH = textH + 40;
- var blackBorderHeight = jspContentHeight - (videoHeight + textH);
+ var blackBorderHeight = canvasDIvHeight - (videoHeight + textH);
if ($('.jsPanel-content').length > 0) {
$('.video-subtitle').css('margin-bottom', blackBorderHeight);
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
index f5886c1..b29e59d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
@@ -278,12 +278,13 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
theme: 'success',
currentController: 'MyPictureController',
parentSlug: $scope.GetPICwindowStoreData(windowviewid, 'parentSlugName'),
- content: '
' +
- '
' +
- '
' +
-
- '
',
-
+ content: '
'+
+ '
'+
+ '
'+
+ '
' +
+ '
![]()
' +
+ '
'+
+ '
',
title: tittle,
position: {
top: $scope.jsPanelTop,
@@ -328,6 +329,8 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$scope.SetPICwindowStoreData(windowviewid, 'width', ui.size.width);
$scope.SetPICwindowStoreData(windowviewid, 'height', ui.size.height);
$rootScope.UnsaveCurriculum = true;
+ var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
+ $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight);
}
},
@@ -353,25 +356,36 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
else {
$scope.jsPanelPIC.normalize();
}
-
- $('#canvasDivPIC_' + windowviewid + ' img').load(function () {
-
- // set false after initial call of min,max or normal
- $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
- $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
- $scope.SetPICwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
- $scope.SetPICwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
- $scope.SetPICwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
-
-
- $scope.JsPanelclick(windowviewid);
+
+ // set false after initial call of min,max or normal
+ $scope.SetPICwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
+ $scope.SetPICwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
+ $scope.SetPICwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
+ $scope.SetPICwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
+ $scope.SetPICwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
+
+ $timeout(function () {
+
+ $scope.SetPICwindowStoreData(windowviewid, 'currentSlug', 'my-picture');
+
+ $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
- var canvas = document.getElementById("canvasPIC_" + windowviewid);
- var canvasPaint = document.getElementById("canvasPaintPIC_" + windowviewid);
-
- canvas.height = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
- canvasPaint.height = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
+ $('#PicView').css("height", $(window).outerHeight() - 65);
+
+ $('#PicView').css("width", $(window).outerWidth() - 15);
+
+ var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
+
+ $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight);
+ var openedImage = document.getElementById('mypic_' + windowviewid );
+ openedImage.src = selectedpicture;
+ openedImage.onload = function () {
+ //$("#mypic_"+windowviewid).css("width", this.width + "px");
+ // $("#mypic_"+windowviewid).css("height", this.height + "px");
+
+ $scope.JsPanelclick(windowviewid);
+
var annotationData= $scope.picOpenInOtherModules.annotationData;
// load annotation
if(annotationData!="" && annotationData!=undefined)
@@ -381,25 +395,16 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
//first draw shape and then store in object
$rootScope.LoadCBSavedAnnotation("canvasPIC_"+windowviewid,"canvasPaintPIC_"+windowviewid,annotationData);
}
- }
- $scope.EnableUI();
- $rootScope.PicLoadComplete = true;
- });
-
- $scope.SetPICwindowStoreData(windowviewid, 'currentSlug', 'my-picture');
-
- $("#" + $scope.jsPanelID + " .img-thumbnail").css("min-height", $("#" + $scope.jsPanelID + " .jsPanel-content").height());
- $('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
+ }
+ $scope.EnableUI();
+ $rootScope.PicLoadComplete = true;
+ }
+
+ $scope.PanelActivity();
+
+ },300)
- $('#PicView').css("height", $(window).outerHeight() - 65);
-
- $('#PicView').css("width", $(window).outerWidth() - 15);
-
- var canvasDIvHeight = $("#" + $scope.jsPanelID + " .jsPanel-content").height();
-
- $('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight);
- $scope.PanelActivity();
}
$rootScope.picAnnotationToolEvent = function (windowviewid) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index 77f527a..b20c152 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -98,6 +98,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
'canvasImageWidth': 0,
'canvasImageHeight': 0,
'navigatorImage':"",
+ 'showHideAnnotations': 'showAnnotationText',
'annotationData':{shapeStates:[],paintCanvasState:[]},
};
@@ -502,11 +503,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', $scope.aaOpenInOtherModules.showAllPins);
$scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', $scope.aaOpenInOtherModules.hideAllPins);
$scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
- if ($scope.aaOpenInOtherModules.selectedSearchId != undefined) {
- $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', $scope.aaOpenInOtherModules.selectedSearchId);
- } else {
- $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
- }
+ if ($scope.aaOpenInOtherModules.showHideAnnotations != undefined && $scope.aaOpenInOtherModules.showHideAnnotations != "") {
+ $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', $scope.aaOpenInOtherModules.showHideAnnotations);
+ }
+
var isMaximize = $scope.aaOpenInOtherModules.maximised;
var isMinimize = $scope.aaOpenInOtherModules.minimised;
$scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize);
@@ -565,12 +565,14 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
else {
$scope.SetAAwindowStoreData($rootScope.MULTI_VIEW_ID,'parentSlugName','tile-view-list');
- $scope.loadAAIllustration($rootScope.MULTI_VIEW_ID);
+ $scope.loadAAIllustration($rootScope.MULTI_VIEW_ID);
}
}
- $scope.loadAAIllustration = function (windowviewid) {
-
+ $scope.loadAAIllustration = function (windowviewid) {
+ //0.4 for Opening module item, load it into image
+ $scope.DisableUI();
+
if ($rootScope.refreshcheck == null) {
$location.path('/');
}
@@ -675,6 +677,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'width', ui.size.width);
$scope.SetAAwindowStoreData(windowviewid, 'height', ui.size.height);
$rootScope.UnsaveCurriculum = true;
+ var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
+ $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
}
},
@@ -693,146 +697,159 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
//0.3
var aaViewElement = angular.element(document.getElementById("aaBodyView"));
- //0.4 for Opening module item, load it into image
- $scope.DisableUI();
-
//Perform Activity as per SaveCb JSPanel
+ var isMaximize = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
+ var isMinimize = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
+ if (isMaximize) {
+ $scope.jsPanelAA.maximize('auto');
+ }
+ else if (isMinimize) {
+ $scope.jsPanelAA.minimize('auto');
+ }
+ else {
+ $scope.jsPanelAA.normalize('auto');
+ }
- $compile(aaViewElement.contents())($scope);
-
+ // set false after initial call of min,max or normal
+ $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
+ $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
+ $scope.SetAAwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
+ $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
+ $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
+
$timeout(function () {
if (document.getElementById('aaBodyView') != null) {
-
- $scope.setControlsIDs(windowviewid);
- var isMaximize = $scope.GetAAwindowStoreData(windowviewid, 'maximised');
- var isMinimize = $scope.GetAAwindowStoreData(windowviewid, 'minimised');
- if (isMaximize) {
- $scope.jsPanelAA.maximize('auto');
+ $compile(aaViewElement.contents())($scope);
+ $scope.setControlsIDs(windowviewid);
+
+ var timeintval = null;
+ timeintval = $interval(function () {
+ var bodySystemListObj = document.getElementById("bodySystemList_" + windowviewid);
+ var len = bodySystemListObj!=null?(bodySystemListObj.id).split("_").length:0;
+ if (len>1) {
+ $scope.stopIntervalLoader();
+ //wait until DOM element load of AA
+ $scope.loadAAModule(windowviewid);
}
- else if (isMinimize) {
- $scope.jsPanelAA.minimize('auto');
+ else
+ {
+ $scope.setControlsIDs(windowviewid);
+ console.log("waiting for loading module");
}
- else {
- $scope.jsPanelAA.normalize('auto');
+ }, 200);
+ $scope.stopIntervalLoader = function () {
+ if (angular.isDefined(timeintval)) {
+ $interval.cancel(timeintval);
+ timeintval = undefined;
}
+ };
+
+ }
+
+ }, 500);
+
+ }
- // set false after initial call of min,max or normal
- $scope.SetAAwindowStoreData(windowviewid, 'minmaxAutoEvent', false);
- $scope.SetAAwindowStoreData(windowviewid, 'y', $scope.jsPanelTop);
- $scope.SetAAwindowStoreData(windowviewid, 'x', $scope.jsPanelLeft);
- $scope.SetAAwindowStoreData(windowviewid, 'width', $scope.jsPanelWidth);
- $scope.SetAAwindowStoreData(windowviewid, 'height', $scope.jsPanelHeight);
-
- $timeout(function () {
+ }
- if ($rootScope.isCallFromOtherModule) {
- var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 110;
- }
- else
- {
- var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
- $('#aaBodyView').css("height", $(window).outerHeight() - 65);
- $('#aaBodyView').css("width", $(window).outerWidth() - 15);
- }
+ $scope.loadAAModule = function (windowviewid) {
- $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
- $('.canvasDivClass').css("height", canvasDIvHeight);
+ if ($rootScope.isCallFromOtherModule) {
+ var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 100;
+ }
+ else
+ {
+ var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
+ $('#aaBodyView').css("height", $(window).outerHeight() - 65);
+ $('#aaBodyView').css("width", $(window).outerWidth() - 15);
+ }
- $scope.convertToZoomValue(windowviewid);
+ $('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
+ $('.canvasDivClass').css("height", canvasDIvHeight);
- var OpenItemImagePath= $scope.GetAAwindowStoreData(windowviewid,'OpenItemImagePath');
- var openedImage = new Image();
- openedImage.id = 'modItemImage_'+windowviewid;
- //openedImage.name = OpenItemImagePath;
- openedImage.onload = function () {
- var zoomValue = $scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
- var relativeWidth = ( this.width)*(zoomValue/100);
- var relativeHeight = (this.height)*(zoomValue/100);
+ $scope.convertToZoomValue(windowviewid);
- $scope.SetAAwindowStoreData(windowviewid, 'canvasImageWidth', relativeWidth);
- $scope.SetAAwindowStoreData(windowviewid, 'canvasImageHeight', relativeHeight);
+ var OpenItemImagePath= $scope.GetAAwindowStoreData(windowviewid,'OpenItemImagePath');
+ var openedImage = document.getElementById("modItemImage_"+windowviewid);
+ openedImage.src = OpenItemImagePath;
+ openedImage.onload = function () {
+ $scope.SetAAwindowStoreData(windowviewid, 'canvasImageWidth', this.width);
+ $scope.SetAAwindowStoreData(windowviewid, 'canvasImageHeight', this.height);
- $scope.SetAAwindowStoreData(windowviewid,'sliderPercentValue',(zoomValue/100));
+ var zoomValue = $scope.GetAAwindowStoreData(windowviewid, 'sliderVal');
+ var relativeWidth = ( this.width)*(zoomValue/100);
+ var relativeHeight = (this.height)*(zoomValue/100);
+
+ $scope.SetAAwindowStoreData(windowviewid,'sliderPercentValue',(zoomValue/100));
- $("#modItemImage_"+windowviewid).css("width", relativeWidth + "px");
- $("#modItemImage_"+windowviewid).css("height", relativeHeight + "px");
-
- $("#modItemImage_"+windowviewid).attr('src', OpenItemImagePath);
-
- //0.5 create canvas on the top of image.
- var canvas = document.createElement('canvas');
- canvas.id = 'aaDetailViewCanvas_'+windowviewid;
- canvas.className = '.aaCanvas'
- canvas.height = parseInt(relativeHeight + 10);
- canvas.width = parseInt(relativeWidth + 10);
- canvas.style.left = '0px';
- canvas.style.top = '0px';
- canvas.style.position = "absolute";
- canvas.style.zIndex = 12002;
- $("#canvasAADiv_" + windowviewid).append(canvas);
+ $("#modItemImage_"+windowviewid).css("width", relativeWidth + "px");
+ $("#modItemImage_"+windowviewid).css("height", relativeHeight + "px");
+
+ //0.5 create canvas on the top of image.
+ var canvas = document.createElement('canvas');
+ canvas.id = 'aaDetailViewCanvas_'+windowviewid;
+ canvas.className = '.aaCanvas'
+ canvas.height = parseInt(relativeHeight + 10);
+ canvas.width = parseInt(relativeWidth + 10);
+ canvas.style.left = '0px';
+ canvas.style.top = '0px';
+ canvas.style.position = "absolute";
+ canvas.style.zIndex = 12002;
+ $("#canvasAADiv_" + windowviewid).append(canvas);
+
+ $timeout(function () {
+ $scope.loadAllPinFirstTime(windowviewid);
+ //call time interval function until load pin data
+ var timeintval = null;
+ timeintval = $interval(function () {
+ var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
+ if (aaPinData.length>0) {
+ $scope.stopIntervalAA();
+ $scope.showAllPins(windowviewid);
+ $scope.Setslider(windowviewid);
+ //7. Highlight all system body list in left side
+ $scope.highlightBodySystemList(windowviewid);
+ $scope.loadbtnNavigator(windowviewid);
+ $scope.JsPanelclick(windowviewid);
+
+ if ($rootScope.isCallFromOtherModule) {
+ $scope.loadAAonCBData(windowviewid);
- $timeout(function () {
- $scope.loadAllPinFirstTime(windowviewid);
- //call time interval function until load pin data
- var timeintval = null;
- timeintval = $interval(function () {
- var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
- if (aaPinData.length>0) {
- $scope.showAllPins(windowviewid);
- $scope.stopIntervalAA();
- $scope.Setslider(windowviewid);
- //7. Highlight all system body list in left side
- $timeout(function () {
- $scope.highlightBodySystemList(windowviewid);
- $scope.loadbtnNavigator(windowviewid);
- },2000);
- $scope.JsPanelclick(windowviewid);
-
- if ($rootScope.isCallFromOtherModule) {
- $scope.loadAAonCBData(windowviewid);
-
- //$rootScope.ShowAnnotationWindow(); //show tool if need
- var annotationData= $scope.aaOpenInOtherModules.annotationData;
- // load annotation
- if(annotationData!="" && annotationData!=undefined)
- {
- if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
- {
- //first draw shape and then store in object
- $rootScope.LoadCBSavedAnnotation("canvasAA_"+windowviewid,"canvasPaintAA_"+windowviewid,annotationData);
- }
- }
- }
-
- }
- else
+ //$rootScope.ShowAnnotationWindow(); //show tool if need
+ var annotationData= $scope.aaOpenInOtherModules.annotationData;
+ // load annotation
+ if(annotationData!="" && annotationData!=undefined)
+ {
+ if(annotationData.shapeStates.length>0||annotationData.paintCanvasState.length>0)
{
- console.log("waiting for pin Data");
- }
- }, 100);
-
- $scope.stopIntervalAA = function () {
- if (angular.isDefined(timeintval)) {
- $interval.cancel(timeintval);
- timeintval = undefined;
- }
- };
-
- },500);
- }
- openedImage.onerror = loadFailure;
- openedImage.src = OpenItemImagePath;
-
- },500);
-
- //Calling methode for save Js Panel Activity for SaveCB
- $scope.PanelActivity();
- }
-
- }, 500);
-
- }
+ //first draw shape and then store in object
+ $rootScope.LoadCBSavedAnnotation("canvasAA_"+windowviewid,"canvasPaintAA_"+windowviewid,annotationData);
+ }
+ }
+ }
+
+ }
+ else
+ {
+ console.log("waiting for pin Data");
+ }
+ }, 100);
+ $scope.stopIntervalAA = function () {
+ if (angular.isDefined(timeintval)) {
+ $interval.cancel(timeintval);
+ timeintval = undefined;
+ }
+ };
+
+ },500);
+ }
+ openedImage.onerror = loadFailure;
+ // openedImage.src = OpenItemImagePath;
+
+ //Calling methode for save Js Panel Activity for SaveCB
+ $scope.PanelActivity();
+
}
$scope.convertToZoomValue = function (windowviewid) {
@@ -992,6 +1009,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
// if (value == 25 || value == 40 || value == 55 || value == 70 || value == 85 || value == 100) {
$("#listManager").css("display", "none");
$("#optionsListManagerTab").removeClass("active");
+ $rootScope.UnsaveCurriculum = true;
var ViewImageWidth = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageWidth');
var ViewImageHeight = $scope.GetAAwindowStoreData(windowviewid, 'canvasImageHeight');
@@ -1041,9 +1059,9 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
case "allPinBtn_"+windowviewid:
if ($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id") != undefined) {
if ($rootScope.isCallFromOtherModule != undefined && $rootScope.isCallFromOtherModule == true) {
- var selectedSearchId = $scope.GetAAwindowStoreData(windowviewid, 'selectedSearchId');
- if (selectedSearchId != undefined) {
- scope.showSelectedSystemPins(selectedSearchId, windowviewid);
+ var SelectedSystemID = $scope.GetAAwindowStoreData(windowviewid, 'SelectedSystemID');
+ if (SelectedSystemID != undefined) {
+ scope.showSelectedSystemPins(SelectedSystemID, windowviewid);
}
else {
scope.showSelectedSystemPins($("#bodySystemList_" + windowviewid + " li.activeAASystemSelect a").attr("id"), windowviewid);
@@ -1387,10 +1405,24 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var aaPinData = $scope.GetAAwindowStoreData(windowviewid,'aaPinData');
if (aaPinData != null && aaPinData.length > 0) {
- var allPinDataArray=$scope.GetAAwindowStoreData(windowviewid,'allPinDataArray');
+ var allPinDataArray=$scope.GetAAwindowStoreData(windowviewid,'allPinDataArray');
+ var selectedSystemName=$scope.GetAAwindowStoreData(windowviewid,'selectedSystemName');
+ var SelectedSystemID= $scope.GetAAwindowStoreData(windowviewid,'SelectedSystemID');
angular.forEach(aaPinData, function (value, key) {
- allPinDataArray.push(value._PinId);
- $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
+ if(SelectedSystemID=="0")
+ {
+ allPinDataArray.push(value._PinId);
+ $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
+ }
+ else
+ {
+ if (value._BodySystemId == SelectedSystemID) {
+ allPinDataArray.push(value._PinId);
+ $scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
+ }
+ }
+
+
})
var isShowSelectedSystemPinsClicked=$scope.GetAAwindowStoreData(windowviewid,'isShowSelectedSystemPinsClicked');
if (isShowSelectedSystemPinsClicked == false) {
@@ -1650,18 +1682,19 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
else {
+ $rootScope.UnsaveCurriculum =true;
var id = event.currentTarget.id;
$scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event);
var SelectedSystemID = event.currentTarget.id;
var SelectedSystemTitle = event.currentTarget.title;
if (event.currentTarget.title == "Current Structure") {
- $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
+ $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', 0);
}
else {
$scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
$scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
- $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
+ $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', id);
}
var isHidePinBtnClicked=$scope.GetAAwindowStoreData(windowviewid,'isHidePinBtnClicked');
@@ -1761,9 +1794,6 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
else {
-
- $scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', event);
-
var SelectedSystemID = event;
$scope.SetAAwindowStoreData(windowviewid,'typeOfEvent',typeof event);
$scope.SetAAwindowStoreData(windowviewid,'isShowSelectedSystemPinsClicked',true);
@@ -1804,10 +1834,32 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
if (aaPinData != null && aaPinData.length > 0) {
var selectedSystemPinData = new jinqJs()
- .from(aaPinData)
- .where("_BodySystemName == " + selectedSystemName)
- .select();
-
+ .from(aaPinData)
+ .where("_BodySystemName == " + selectedSystemName)
+ .select();
+
+ var oldSelectedSystemId = $scope.GetAAwindowStoreData(windowviewid, 'SelectedSystemID');
+ if(oldSelectedSystemId!=SelectedSystemID)
+ {
+ $scope.SetAAwindowStoreData(windowviewid,'clickedPins',[]);
+ $scope.SetAAwindowStoreData(windowviewid, 'activePinArray', []);
+ $scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
+ $scope.SetAAwindowStoreData(windowviewid, 'SelectedSystemID', SelectedSystemID);
+ }
+ var clickedPins=$scope.GetAAwindowStoreData(windowviewid,'clickedPins');
+ if(clickedPins.length>0)
+ {
+
+ var pintToshowSelected = new jinqJs()
+ .from(selectedSystemPinData)
+ .where("_PinId == " + clickedPins[0].id)
+ .select();
+ }
+ else{
+ var pintToshowSelected=selectedSystemPinData;
+ }
+
+
$scope.SetAAwindowStoreData(windowviewid,'selectedSystemPinData',selectedSystemPinData);
if (isHidePinBtnClicked) {
@@ -1827,8 +1879,21 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
angular.forEach(selectedSystemPinData, function (value, key) {
$scope.drawStaticPinsOnImage('aaDetailViewCanvas_'+windowviewid, value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY,windowviewid)
});
+ // make all pin heads grey
+ 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();
//show annotation on first pin of the sysyem
- $scope.showAnnotation(selectedSystemPinData, false, false, false,true,windowviewid);
+ $scope.showAnnotation(pintToshowSelected, false, false, false,true,windowviewid);
}
}
}
@@ -2291,6 +2356,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var PinId = sppechBubbleId.split("_")[0];
if ($rootScope.isCallFromOtherModule) {
+ $rootScope.UnsaveCurriculum = true;
$timeout(function () {
var CBselectedpinCordinate = $scope.GetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate');
var BubleObj = document.getElementById(clickedSpeechBubbleId);
@@ -2326,6 +2392,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
.delete().at("pinId == " + pinId).select();
$scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', CBselectedpinCordinate);
+ $rootScope.UnsaveCurriculum = true;
}
});
@@ -2440,7 +2507,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
click: function (clickedPin) {
- if (clickedPin.event.ctrlKey == false) {
+ $rootScope.UnsaveCurriculum =true;
+ //birendra
+ // for mac os Command key use for multi selection
+ if (clickedPin.event.ctrlKey == false && clickedPin.event.metaKey == false) {
$scope.SetAAwindowStoreData(windowviewid, 'clickedPins', []);
$scope.SetAAwindowStoreData(windowviewid, 'selectedPins', []);
$scope.SetAAwindowStoreData(windowviewid, 'CBselectedpinCordinate', []);
@@ -2476,7 +2546,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
.select();
var activePinArray=$scope.GetAAwindowStoreData(windowviewid,'activePinArray');
- if (clickedPin.event.ctrlKey == true) {
+ if (clickedPin.event.ctrlKey == true||clickedPin.event.metaKey == true) {
var isFound = jQuery.inArray(clickedPin.name, activePinArray)
if (isFound == -1) {
activePinArray.push(clickedPin.name);
@@ -2799,13 +2869,16 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
+ $scope.showAllPinEvent = function (windowviewid) {
+ $rootScope.UnsaveCurriculum = true;
+ $scope.showAllPinsAfterHide(windowviewid);
+ }
$scope.showAllPinsAfterHide = function (windowviewid) {
$scope.ToolBoxStyle("ShowAllPin",windowviewid);
$scope.DisableUI();
- //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', 0);
$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
$scope.SetAAwindowStoreData(windowviewid,'isHidePinBtnClicked',false);
$scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', false);
@@ -2834,6 +2907,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
};
+ $scope.showSelectedPinEvent = function (windowviewid) {
+ $rootScope.UnsaveCurriculum = true;
+ $scope.showSelectedPins(windowviewid);
+ }
$scope.showSelectedPins = function (windowviewid) {
@@ -2992,7 +3069,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
- $scope.HideSearchList = function () {
+ $scope.HideSearchList = function (event) {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
$timeout(function () {
@@ -3000,9 +3077,13 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$("#termlistfilter_"+windowviewid).css("display", "none");
- }, 1000);
+ }, 500);
}
+ $scope.highlightPinBasedOnSerachItemEvent = function (termid) {
+ $rootScope.UnsaveCurriculum = true;
+ $scope.highlightPinBasedOnSerachItem(termid);
+ }
$scope.highlightPinBasedOnSerachItem = function (termid) {
@@ -3029,14 +3110,17 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
.from(aaPinData)
.where("_TermId == " + id)
.select();
- if ($("#bodySystemList_" + windowviewid +" li.activeAASystemSelect a").attr("id") == 0) {
- }
- else
- {
- // birendra
+ // if ($("#bodySystemList_" + windowviewid +" li.activeAASystemSelect a").attr("id") == 0) {
+ // }
+ // else
+ // {
+ // // birendra
+ // //change body system by searched term
+ // $scope.showSelectedSystemPins(pinDataForTerm[0]._BodySystemId,windowviewid);
+ // }
+ // birendra
//change body system by searched term
- $scope.showSelectedSystemPins(pinDataForTerm[0]._BodySystemId,windowviewid);
- }
+ $scope.showSelectedSystemPins(pinDataForTerm[0]._BodySystemId,windowviewid);
$timeout(function () {
//make all pin heads grey
@@ -3078,45 +3162,43 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.IsSearchVisible = false;
- //$scope.SetAAwindowStoreData(windowviewid, 'selectedSearchId', id);
- //$scope.SetAAwindowStoreData(windowviewid, 'isShowAllPins', true);
- //$scope.SetAAwindowStoreData(windowviewid, 'isHidePinBtnClicked', false);
- //$scope.SetAAwindowStoreData(windowviewid, 'showSelectedPins', false);
- //$rootScope.AAWindowLoadComplete = true;
}
$scope.ShowHideAnnotation = function (event) {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
+ $rootScope.UnsaveCurriculum = true;
var btnStrutureBoxname = document.getElementById("comment-box_"+windowviewid).name;
- if (btnStrutureBoxname == "showAnnotationText") {
- $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
- document.getElementById("comment-box_"+windowviewid).name = "hideAnnotationText";
- }
- else
- {
- $("#comment-box_"+windowviewid).removeClass("disableAnnotationText");
- document.getElementById("comment-box_"+windowviewid).name = "showAnnotationText";
- }
-
- $scope.ShowHideAnnotationText(windowviewid);
+ if (btnStrutureBoxname == "showAnnotationText") {
+ $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
+ document.getElementById("comment-box_"+windowviewid).name = "hideAnnotationText";
+ $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'hideAnnotationText');
+ }
+ else
+ {
+ $("#comment-box_"+windowviewid).removeClass("disableAnnotationText");
+ document.getElementById("comment-box_"+windowviewid).name = "showAnnotationText";
+ $scope.SetAAwindowStoreData(windowviewid, 'showHideAnnotations', 'showAnnotationText');
+ }
+
+ $scope.ShowHideAnnotationText(windowviewid);
}
$scope.ShowHideAnnotationText = function(windowviewid) {
- var btnStrutureBoxname = document.getElementById("comment-box_"+windowviewid).name;
+ var showHideAnnotations = $scope.GetAAwindowStoreData(windowviewid, 'showHideAnnotations');
+ document.getElementById("comment-box_"+windowviewid).name = showHideAnnotations;
var speechBubbleDimaensions=$scope.GetAAwindowStoreData(windowviewid,'speechBubbleDimaensions');
- if (btnStrutureBoxname == "showAnnotationText") {
-
+ if (showHideAnnotations == "showAnnotationText") {
for (var i = 0; i <= speechBubbleDimaensions.length - 1; i++) {
$("#" + speechBubbleDimaensions[i].speechBuubleId).css("display", "block");
$("#" + speechBubbleDimaensions[i].speechBubbleLineId).css("display", "block");
}
-
}
else {
+ $("#comment-box_"+windowviewid).addClass("disableAnnotationText");
for (var i = 0; i <= speechBubbleDimaensions.length - 1; i++) {
$("#" + speechBubbleDimaensions[i].speechBuubleId).css("display", "none");
@@ -3320,6 +3402,7 @@ function showSelectedSystemPins(event) {
console.log('OnBodySystem chnaged is called outside ');
var scope = angular.element(document.getElementById("aaBodyView")).scope();
scope.$apply(function () {
+ //select system and its related pins
scope.showSelectedSystemPins(event);
});
}
@@ -3343,7 +3426,7 @@ function showAllPins(event) {
var windowviewid = (event.target.id).split("_")[len-1];
var scope = angular.element(document.getElementById("aaBodyView")).scope();
scope.$apply(function () {
- scope.showAllPinsAfterHide(windowviewid);
+ scope.showAllPinEvent(windowviewid);
});
}
@@ -3368,7 +3451,7 @@ function onSearchItemSelection(termid) {
console.log('AA hide search is called');
var scope = angular.element(document.getElementById("aaBodyView")).scope();
scope.$apply(function () {
- scope.highlightPinBasedOnSerachItem(termid);
+ scope.highlightPinBasedOnSerachItemEvent(termid);
});
}
@@ -3389,7 +3472,7 @@ function showSelectedPins(event) {
var windowviewid = (event.target.id).split("_")[len-1];
scope.$apply(function () {
- scope.showSelectedPins(windowviewid);
+ scope.showSelectedPinEvent(windowviewid);
});
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
index 45d537c..fd734c6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
@@ -80,8 +80,8 @@
}).error(function (data, status, headers, config) {
console.log('error')
deferred.reject(data);
- $rootScope.errorMessage = data;
- $("#messageModal").modal('show');
+ // $rootScope.errorMessage = data;
+ // $("#messageModal").modal('show');
});
return deferred.promise;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
index f4e82a4..a28d357 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/services/ModuleService.js
@@ -304,7 +304,8 @@ AIA.service('ModuleService', function ($http, DataService) {
position: windowData.position,
size: windowData.size,
contextMenu: windowData.contextMenu,
- selectedSearchId: windowData.selectedSearchId
+ showHideAnnotations: windowData.showHideAnnotations
+ // selectedSearchId: windowData.selectedSearchId
});
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
index a7b6f42..830e974 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-body-view-list.html
@@ -7,8 +7,8 @@
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 f878d3e..6ea42ed 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -254,7 +254,7 @@
-