diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index 6a4dbe8..89fac5f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -35,7 +35,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.transNumber = 100;
$rootScope.modestyCanvasZindex = 12100;
- $rootScope.isModestyCanvasVisible = false;
+ $rootScope.isTBoxModestyVisible = false;
//for transarency scale
$scope.TBDrawStartX;
$scope.TBDrawStartY;
@@ -3234,7 +3234,8 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (parseInt(termNumber) != parseInt(figLeafTermNo)) {
$scope.TermNumber = termNumber;
for (var j = 0; j <= $rootScope.lexiconLanguageArray.length - 1; j++) {
- if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined) {
+ if ($rootScope.TermNumberData != null || $rootScope.TermNumberData != undefined)
+ {
$scope.matchedTermNoData = new jinqJs()
.from($rootScope.TermNumberData.TermData.Term)
.where('_TermNumber == ' + termNumber)
@@ -3260,6 +3261,16 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// send term no to vocab json data to get the text
}
}
+ else {
+ var currentBodyViewId = $rootScope.voId;
+ var termJsonPath = '~/../content/data/json/da/body-views/' + currentBodyViewId + '/da_dat_tm_sg_' + currentBodyViewId + '.json';
+ DataService.getAnotherJson(termJsonPath)
+ .then(
+ function (result) {
+ $rootScope.TermNumberData = result;
+ $scope.GetAnnotationText(termNumber);
+ })
+ }
}
}
@@ -4607,7 +4618,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$("#annotationpaintbrushsize").removeClass("activebtncolor");
$("#annotationpainteraser").removeClass("activebtncolor");
if ($("#DrawMode").hasClass("annotationtoolbartab")) {
- if ($rootScope.isModestyCanvasVisible == true) {
+ if ($rootScope.isTBoxModestyVisible == true) {
$rootScope.switchCanvas();
@@ -4842,7 +4853,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
if (document.getElementById(modestyTransCanvasId) == null || document.getElementById(modestyTransCanvasId) == undefined) {
- $rootScope.isModestyCanvasVisible = true;
+ $rootScope.isTBoxModestyVisible = true;
var canvasModesty = document.createElement('canvas');
canvasModesty.id = modestyTransCanvasId;
canvasModesty.height = Height;
@@ -4851,7 +4862,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
canvasModesty.style.left = X + 'px';
canvasModesty.style.top = Y + 'px';
canvasModesty.style.visibility = 'visible';
- canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
+ if($rootScope.currentBodyViewId=="11"){
+
+ canvasModesty.style.zIndex = 11000;
+ }
+ else
+ canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
canvasModesty.addEventListener('click', OnClickModestyTransCanvas);
document.getElementById('canvasDiv').appendChild(canvasModesty);
@@ -5482,11 +5498,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var bodyRegionRight = parseInt(value.X) + parseInt(value.Width);
var bodyRegionBottom = parseInt(value.Y) + parseInt(value.Height);
if ($rootScope.Xaxis <= bodyRegionRight && $rootScope.Yaxis <= bodyRegionBottom && value.X <= $rootScope.Xaxis && value.Y <= $rootScope.Yaxis) {
- $rootScope.BRId = value.bodyRegionId;
- $rootScope.BodyRegionXAxis = value.X;
- $rootScope.BodyRegionYAxis = value.Y;
- $rootScope.isMirrorBodyRegion = value.IsMirror;
- return false;
+ if ($rootScope.currentBodyViewId == "11" || $rootScope.currentBodyViewId == "9") {
+ if (value.bodyRegionId == "6") {
+ $rootScope.BRId = value.bodyRegionId;
+ $rootScope.BodyRegionXAxis = value.X;
+ $rootScope.BodyRegionYAxis = value.Y;
+ $rootScope.isMirrorBodyRegion = value.IsMirror;
+ return false;
+ }
+ }
+ else {
+ $rootScope.BRId = value.bodyRegionId;
+ $rootScope.BodyRegionXAxis = value.X;
+ $rootScope.BodyRegionYAxis = value.Y;
+ $rootScope.isMirrorBodyRegion = value.IsMirror;
+ return false;
+ }
+
}
});
}
@@ -6258,7 +6286,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
$scope.CloseTransparencyBox = function () {
- $rootScope.isModestyCanvasVisible = false;
+ $rootScope.isTBoxModestyVisible = false;
//for enabling annoataions.
//Now everything si done on canavases uswed in annotation toolbar.
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 74dd3e7..cba3b58 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -966,7 +966,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$rootScope.switchToTransparencycanvas = function () {
- if ($rootScope.isModestyCanvasVisible == true) {
+ if ($rootScope.isTBoxModestyVisible == true) {
var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -975,14 +975,21 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
if (ctx.style.visibility == "visible") {
if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
-
+
var drawCanvasZindex = $("#canvas").css("z-index");
var paintCanvasZindex = $("#canvasPaint").css("z-index");
var TransCanvasZindex = ctx.style.zIndex;
var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
MaxZindexVal = MaxZindexVal + 1;
$("#canvas").css("z-index", MaxZindexVal);
- $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+ if ($rootScope.currentBodyViewId == "11") {
+ $(".ui-wrapper").css("z-index", MaxZindexVal + 1);
+ $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+
+ }
+ else
+ $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
+
}
else {
@@ -1265,7 +1272,7 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
}
$rootScope.switchCanvasToPaintCanvas = function (e) {
- if ($rootScope.isModestyCanvasVisible == true) {
+ if ($rootScope.isTBoxModestyVisible == true) {
var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
for (var j = 0; j < modestyTransCanvases.length; j++) {
@@ -1410,8 +1417,8 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic
$rootScope.switchCanvas = function () {
-
- if ($rootScope.isModestyCanvasVisible == true) {
+ debugger;
+ if ($rootScope.isTBoxModestyVisible == true) {
var modestyTransCanvases = $("canvas[id*='modestyTransCanavs']");
if (modestyTransCanvases != null || modestyTransCanvases != undefined && modestyTransCanvases.length > 0) {
for (var j = 0; j < modestyTransCanvases.length; j++) {