'
+ + '
'
+ '
';
//Issue #7286 :Undefined annotation should not appear
@@ -5593,11 +5661,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var os=$scope.getOS();
if(os=='MacOS')
{
- var sppechBubbleHTML_annotation = "
";
+ var sppechBubbleHTML_annotation = "
";
}
else
{
- var sppechBubbleHTML_annotation = "
";
+ var sppechBubbleHTML_annotation = "
";
}
if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
@@ -6047,6 +6115,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#btnTranparency_' + windowviewid).removeClass('tButtonActive');
$('#btnTranparency_' + windowviewid).removeClass(' btn-primary');
$('#btnTranparency_' + windowviewid).addClass('btn-black');
+ document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("mousedown", mouseDownListener);
+ document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("mousemove", mouseMoveListener);
+ document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("mouseup", mouseUpListener);
+
+ document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchstart", mouseDownListener);
+
+ document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchmove", mouseMoveListener);
+
+ document.getElementById("canvasDivDA_" + windowviewid).removeEventListener("touchend", mouseUpListener);
}
else
@@ -6099,6 +6176,10 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.TBHeight = height;
$scope.TBWidth = width;
+ //get problem on resize box on touch device
+ //also touch problem on Tbox area
+ $scope.touchResizeEnable=false;
+
$scope.DrawTransparencyBox(windowviewid);
}
@@ -6122,12 +6203,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// clear canvas before drawing transparency box
if ($rootScope.isAnnotationWindowOpen == true) {
- $('#canvasDA_' + windowviewid).removeLayers();
+ // $('#canvasDA_' + windowviewid).removeLayers();
var paintCanvasObj = document.getElementById("canvasPaintDA_" + windowviewid);
if (paintCanvasObj != null) {
var ctx = paintCanvasObj.getContext("2d");
ctx.clearRect(0, 0, 2277, 3248);
}
+ var CanvasObj = document.getElementById("canvasDA_" + windowviewid);
+ if (CanvasObj != null) {
+ var ctx1 = CanvasObj.getContext("2d");
+ ctx1.clearRect(0, 0, 2277, 3248);
+ }
+ $scope.SetwindowStoreData(windowviewid, 'isCBAnnotationActive',false);
+ $scope.SetwindowStoreData(windowviewid, 'annotationData', {shapeStates:[],paintCanvasState:[]});
+
var sktch = $("#canvasPaintDA_" + windowviewid).sketch();
$("#canvasPaintDA_" + windowviewid).sketch().actions = [];
$("#annotationpaintbrushsize").removeClass("activebtncolor");
@@ -6143,35 +6232,82 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else {
var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
- drawCanvasZindex = parseInt(drawCanvasZindex) - 1;
- paintCanvasZindex = parseInt(paintCanvasZindex) - 1;
+ drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
if (drawCanvasZindex > paintCanvasZindex) {
$(".ui-wrapper").css("z-index", drawCanvasZindex);
$scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', drawCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", drawCanvasZindex+2);
}
else {
$(".ui-wrapper").css("z-index", paintCanvasZindex);
$scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', paintCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", paintCanvasZindex+2);
}
}
}
- else {
- $rootScope.switchToTransparencycanvas("daImagePanel_"+windowviewid);
+ else
+ {
//for touch device
$rootScope.SetPaintZindexforDA(windowviewid);
- }
- }
- else {
-
- $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', 12000);
-
- $(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid, 'UIWrapperZIndex'));
-
- }
- //hide the speechbubble
+ var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
+ var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
+ drawCanvasZindex = parseInt(drawCanvasZindex) +1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) +1;
+ if (drawCanvasZindex > paintCanvasZindex) {
+ $(".ui-wrapper").css("z-index", drawCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', drawCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", drawCanvasZindex+2);
+ }
+ else
+ {
+ $(".ui-wrapper").css("z-index", paintCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', paintCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", paintCanvasZindex+2);
+ }
+
+ }
+ }
+ else
+ {
+ var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
+ var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
+ drawCanvasZindex = parseInt(drawCanvasZindex) +1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) +1;
+ if (drawCanvasZindex > paintCanvasZindex) {
+ $(".ui-wrapper").css("z-index", drawCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', drawCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", drawCanvasZindex+2);
+ }
+ else {
+ $(".ui-wrapper").css("z-index", paintCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', paintCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", paintCanvasZindex+2);
+
+ }
+ }
+ //hide the speechbubble
+ //enable touch on modesty part
+ if ($scope.touchResizeEnable) {
+ var $ua = navigator.userAgent;
+ if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+ $('#canvasDA_'+windowviewid).css("display", "block");
+ $('#canvasPaintDA_'+windowviewid).css("display", "block");
+ }
+
+ }
+ else
+ {
+ var $ua = navigator.userAgent;
+ if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+ $('#canvasDA_'+windowviewid).css("display", "none");
+ $('#canvasPaintDA_'+windowviewid).css("display", "none");
+ }
+ }
+
if ($rootScope.isAnnotationWindowOpen == true)
$rootScope.isTBCompleted = true;
}
@@ -6248,7 +6384,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid, 'UIWrapperZIndex'));
$(".ui-wrapper").css("left",TransparencyBoxStartX-2+ 'px');
-
}
var BodyRegionDictionary = $scope.GetwindowStoreData(windowviewid, 'BodyRegionCordinatesData');
@@ -6277,7 +6412,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
-
}
var bodyVid = $scope.GetwindowStoreData(windowviewid, 'voId');
if (bodyVid == "9" || bodyVid == "11" || bodyVid == "2" || bodyVid == "3" || bodyVid == "6" || bodyVid == "7") {
@@ -6363,6 +6497,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (TransparencyBoxStartX <= bodyRegionRight && value.x <= transparencyBoxRight && TransparencyBoxStartY <= bodyRegionBottom && value.y <= transparencyBoxBottom) {
+ $scope.touchResizeEnable=true;
$scope.loadTransparencyImage(value.bodyRegionId, value.Height, value.Width, value.x, value.y, value.IsMirror, TransparencyBoxStartX, TransparencyEndX, TransparencyBoxStartY, TransparencyBoxEndY, $scope, false, false, false, windowviewid);
}
@@ -6372,17 +6507,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ($('#transparencyScale_' + windowviewid).css("visibility") != 'visible') {
$('#transparencyScale_' + windowviewid).css('position', 'absolute');
$('#transparencyScale_' + windowviewid).draggable({ containment: '#daViewDA_' + windowviewid, scroll: false });
- if ($rootScope.isCallFromOtherModule) {
+ // if ($rootScope.isCallFromOtherModule) {
$scope.SetwindowStoreData(windowviewid, 'transparencyBounds', []);
var transparencyBounds = $scope.GetwindowStoreData(windowviewid, 'transparencyBounds');
transparencyBounds.push({
- 'h': $scope.TBoxEndX, 'x': $scope.TransparencyBoxStartX,
- 'w': $scope.TBoxEndY, 'y': $scope.TransparencyBoxStartY
+ 'w': $scope.TBoxEndX, 'x': $scope.TransparencyBoxStartX,
+ 'h': $scope.TBoxEndY, 'y': $scope.TransparencyBoxStartY
});
$scope.SetwindowStoreData(windowviewid, 'transparencyX', $scope.TBDrawStartX);
$scope.SetwindowStoreData(windowviewid, 'transparencyY', $scope.TBDrawStartY );
- }
+ // }
$('#transparencyScale_' + windowviewid).css('top', $scope.TBDrawStartY - 90);
$('#transparencyScale_' + windowviewid).css('left', $scope.TBDrawStartX + 130)
$('#transparencyScale_' + windowviewid).css('visibility', 'visible')
@@ -6449,11 +6584,11 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.startY = value.y
$scope.TransparencyBoxStartX = value.x;
$scope.TransparencyBoxStartY = value.y;
- $scope.TransparencyEndX = value.h;
- $scope.TransparencyBoxEndY = value.w;
+ $scope.TransparencyEndX = value.w;
+ $scope.TransparencyBoxEndY = value.h;
- $scope.TBoxEndX = value.h;
- $scope.TBoxEndY = value.w;
+ $scope.TBoxEndX = value.w;
+ $scope.TBoxEndY = value.h;
})
@@ -6671,8 +6806,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#btnTranparency_' + windowviewid).removeClass('btn-black');
- $('#btnTranparency_' + windowviewid).addClass('tButtonActive');
-
//Dated:18-07-2016 Issue#4975: Transparency box should not be clickable if it is already selected.
$('#btnTranparency_' + windowviewid).removeClass('tButtonActive');
$('#btnTranparency_' + windowviewid).addClass('btn-black');
@@ -6681,14 +6814,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// clear canvas before drawing transparency box
if ($rootScope.isAnnotationWindowOpen == true) {
- $('#canvasDA_' + windowviewid).removeLayers();
+ //$('#canvasDA_' + windowviewid).removeLayers();
var paintCanvasObj = document.getElementById("canvasPaintDA_" + windowviewid);
if (paintCanvasObj != null) {
var ctx = paintCanvasObj.getContext("2d");
ctx.clearRect(0, 0, 2277, 3248);
}
- var sktch = $("#canvasPaintDA_" + windowviewid).sketch();
- $("#canvasPaintDA_" + windowviewid).sketch().actions = [];
+ var CanvasObj = document.getElementById("canvasDA_" + windowviewid);
+ if (CanvasObj != null) {
+ var ctx1 = CanvasObj.getContext("2d");
+ ctx1.clearRect(0, 0, 2277, 3248);
+ }
$("#annotationpaintbrushsize").removeClass("activebtncolor");
$("#annotationpainteraser").removeClass("activebtncolor");
if ($("#DrawMode").hasClass("annotationtoolbartab")) {
@@ -6700,28 +6836,57 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else {
var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
- drawCanvasZindex = parseInt(drawCanvasZindex) - 1;
- paintCanvasZindex = parseInt(paintCanvasZindex) - 1;
+ drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
if (drawCanvasZindex > paintCanvasZindex) {
$(".ui-wrapper").css("z-index", drawCanvasZindex);
$scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', drawCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", drawCanvasZindex+2);
}
else {
$(".ui-wrapper").css("z-index", paintCanvasZindex);
$scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', paintCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", paintCanvasZindex+2);
}
}
}
- else {
- $rootScope.switchToTransparencycanvas("daImagePanel_"+windowviewid);
+ else
+ {
//for touch device
$rootScope.SetPaintZindexforDA(windowviewid);
+ var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
+ var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
+ drawCanvasZindex = parseInt(drawCanvasZindex) +1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) +1;
+ if (drawCanvasZindex > paintCanvasZindex) {
+ $(".ui-wrapper").css("z-index", drawCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', drawCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", drawCanvasZindex+2);
+ }
+ else {
+ $(".ui-wrapper").css("z-index", paintCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', paintCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", paintCanvasZindex+2);
+ }
+ //$rootScope.switchToTransparencycanvas("daImagePanel_"+windowviewid);
}
}
- else {
-
- $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', 12000);
- $(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid, 'UIWrapperZIndex'));
+ else
+ {
+ var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
+ var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
+ drawCanvasZindex = parseInt(drawCanvasZindex) +1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) +1;
+ if (drawCanvasZindex > paintCanvasZindex) {
+ $(".ui-wrapper").css("z-index", drawCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', drawCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", drawCanvasZindex+2);
+ }
+ else {
+ $(".ui-wrapper").css("z-index", paintCanvasZindex);
+ $scope.SetwindowStoreData(windowviewid, 'UIWrapperZIndex', paintCanvasZindex);
+ $('#canvasPaintDA_' + windowviewid).css("z-index", paintCanvasZindex+2);
+ }
}
@@ -6947,13 +7112,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
else
canvasModesty.style.visibility = 'hidden';
-
- if ($scope.GetwindowStoreData(windowviewid,'voId') == "11") {
-
- canvasModesty.style.zIndex = 11000;
- }
- else
- canvasModesty.style.zIndex = $rootScope.modestyCanvasZindex;
+
+ var drawCanvasZindex = $('#canvasDA_' + windowviewid).css("z-index");
+ var paintCanvasZindex = $("#canvasPaintDA_" + windowviewid).css("z-index");
+ drawCanvasZindex = parseInt(drawCanvasZindex) +1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) +1;
+ if (drawCanvasZindex > paintCanvasZindex) {
+ canvasModesty.style.zIndex = drawCanvasZindex+1;
+ }
+ else
+ {
+ canvasModesty.style.zIndex = paintCanvasZindex+1;
+ }
canvasModesty.addEventListener('click', OnClickModestyTransCanvas);
canvasModesty.addEventListener('touchstart', OnClickModestyTransCanvas);
@@ -7551,6 +7721,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var windowviewid = (event.target.id).split("_")[len-1];
$rootScope.isMirrorBodyRegion=undefined;
+ $rootScope.isclickOnTBox=false;
var canvasDiv = document.getElementById("canvasDivDA_" + windowviewid);
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
@@ -7577,46 +7748,61 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.Yaxis = event.pageY - $('#canvasDivDA_' + windowviewid).offset().top + verticalScrollPosition;
}
- $rootScope.setSelectedBodyRegionData(windowviewid);
-
- var gender= $scope.GetwindowStoreData(windowviewid,'genderId');
- var currentBodyViewId =$scope.GetwindowStoreData(windowviewid,'voId');
-
-
- if($rootScope.isMirrorBodyRegion==undefined) return;
-
- if ($rootScope.isMirrorBodyRegion == "No") {
+ var tpBoxDimesion= $scope.GetwindowStoreData(windowviewid, 'transparencyBounds');
+ if(tpBoxDimesion.length>0 && $scope.GetwindowStoreData(windowviewid,'isTransparencyActivated'))
+ {
+ if ($rootScope.Xaxis >= tpBoxDimesion[0].x && $rootScope.Xaxis <=tpBoxDimesion[0].w && $rootScope.Yaxis >= tpBoxDimesion[0].y && $rootScope.Yaxis <= tpBoxDimesion[0].h) {
- var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci" + "_" + windowviewid;
+ $rootScope.isclickOnTBox=true;
+ }
+ }
- if($rootScope.BRId=="2" || $rootScope.BRId=="3")
+ if($rootScope.isclickOnTBox)
{
- if(gender=="Female" && (currentBodyViewId=="5"))
- {
- var maskCanvasId = "imageCanvasmodestyImg" + $rootScope.BRId + "_" + windowviewid;
- }
- else if(gender=="Female" && $rootScope.BRId=="2" && (currentBodyViewId=="6"|| currentBodyViewId=="7"|| currentBodyViewId=="11"))
- {
- var maskCanvasId = "imageCanvasmodestyImg" + $rootScope.BRId + "_" + windowviewid;
+ TransparencyCanvasClickListener(event);
+ }
+ else
+ {
+ $rootScope.setSelectedBodyRegionData(windowviewid);
+
+ var gender= $scope.GetwindowStoreData(windowviewid,'genderId');
+ var currentBodyViewId =$scope.GetwindowStoreData(windowviewid,'voId');
+
+ if($rootScope.isMirrorBodyRegion==undefined) return;
+ if ($rootScope.isMirrorBodyRegion == "No") {
+
+ var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_mci" + "_" + windowviewid;
+
+ if($rootScope.BRId=="2" || $rootScope.BRId=="3")
+ {
+ if(gender=="Female" && (currentBodyViewId=="5"))
+ {
+ var maskCanvasId = "imageCanvasmodestyImg" + $rootScope.BRId + "_" + windowviewid;
+ }
+ else if(gender=="Female" && $rootScope.BRId=="2" && (currentBodyViewId=="6"|| currentBodyViewId=="7"|| currentBodyViewId=="11"))
+ {
+ var maskCanvasId = "imageCanvasmodestyImg" + $rootScope.BRId + "_" + windowviewid;
+ }
+ else if(gender=="Male" && $rootScope.BRId=="3" && currentBodyViewId=="1")
+ {
+ var maskCanvasId = "imageCanvasmodestyImg" + $rootScope.BRId + "_" + windowviewid;
+ }
+
+ }
+
+ var maskCanvas = document.getElementById(maskCanvasId);
+
+ $scope.imageCanvasClickAnnotation(maskCanvas,$rootScope.BodyRegionXAxis,$rootScope.BodyRegionYAxis,event);
+
}
- else if(gender=="Male" && $rootScope.BRId=="3" && currentBodyViewId=="1")
+ else
{
- var maskCanvasId = "imageCanvasmodestyImg" + $rootScope.BRId + "_" + windowviewid;
+ var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_MR"+ "_" + windowviewid;
+ var mirrorImageCanvas = document.getElementById(maskCanvasId);
+ $scope.FlipedImgCanvasClickAnnotation(mirrorImageCanvas,$rootScope.BodyRegionXAxis,$rootScope.BodyRegionYAxis,event);
}
-
- }
- var maskCanvas = document.getElementById(maskCanvasId);
-
- $scope.imageCanvasClickAnnotation(maskCanvas,$rootScope.BodyRegionXAxis,$rootScope.BodyRegionYAxis,event);
-
- }
- else
- {
- var maskCanvasId = "imageCanvas" + $rootScope.BRId + "_MR"+ "_" + windowviewid;
- var mirrorImageCanvas = document.getElementById(maskCanvasId);
- $scope.FlipedImgCanvasClickAnnotation(mirrorImageCanvas,$rootScope.BodyRegionXAxis,$rootScope.BodyRegionYAxis,event);
- }
+ }
}
@@ -7627,6 +7813,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$.each(BodyRegionDictionary, function (index, value) {
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) {
if (bodyVid == "11" || bodyVid == "9") {
if (value.bodyRegionId == "6") {
@@ -7646,6 +7833,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}
+
});
}
@@ -7711,6 +7899,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var windowviewid = (evt.currentTarget.id).split("_")[len-1];
var pixelData;
var pixelDataTrans;
+
+ if (evt.ctrlKey || evt.metaKey) {
+ $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', true);
+ }
+ else
+ {
+ $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', false);
+ }
var MousePositionX=0;
var MousePositionY=0;
@@ -7903,7 +8099,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var TBoxTermNumber=annotations.TBoxTermNumber;
var NormalTermNumber=annotations.NormalTermNumber;
- $scope.saveTBoxTermNumberForSaveCB(evt, windowviewid,TBoxTermNumber,NormalTermNumber,MousePositionX,MousePositionY);//Calling Method for Tbox termnumber SaveCB
+ var tips_x= parseInt( MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left) + 30;
+ var tips_y= parseInt( MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top) + 10;
+ var posx= MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left;
+ var posy= MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top;
+
+ if ($scope.GetwindowStoreData(windowviewid,'multiAnnotationIsON') == true) {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,true,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
+ else
+ {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,false,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
var TermAnnotationText=$scope.GetwindowStoreData(windowviewid,'TermAnnotationText');
if (TermAnnotationText.length > 0) {
@@ -7918,6 +8125,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.UnsaveCurriculum = true;
var len= (evt.target.id).split("_").length;
var windowviewid = (evt.target.id).split("_")[len-1];
+ if (evt.ctrlKey || evt.metaKey) {
+ $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', true);
+ }
+ else
+ {
+ $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', false);
+ }
var tCanvasLeft = $(".ui-wrapper").css("left");
var tCanvasLeftAftrSplit = tCanvasLeft.split("p");
@@ -7969,6 +8183,12 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var canavsX = evt.currentTarget.offsetLeft;
var canvasY = evt.currentTarget.offsetTop;
+ var tips_x= parseInt( MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left) + 30;
+ var tips_y= parseInt( MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top) + 10;
+ var posx= MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left;
+ var posy= MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top;
+
+
if ((tCanvasLeftAftrSplit[0] <= actulalX && (actulalX <= tCanvasTotalWidth)) && (tCanvasTopAftrSplit[0] <= actualY && actualY <= tCanvasTotalHeight)) {
var canvasId = evt.currentTarget.id;
var canavsContext = document.getElementById(canvasId).getContext('2d');
@@ -7984,13 +8204,20 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.annotationTextArrayT2 = [];
$scope.annotationTextArrayT1.push(annotationText);
$scope.annotationTextArrayT2.push(annotationText);
- $scope.saveTBoxTermNumberForSaveCB(evt, windowviewid,0,RGBColor,MousePositionX,MousePositionY)//Calling Method for Tbox termnumber SaveCB
- }
+
+ if ($scope.GetwindowStoreData(windowviewid,'multiAnnotationIsON') == true) {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,true,0,RGBColor,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
+ else
+ {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,false,0,RGBColor,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
+ }
+ else if (canvasId.match('modestyImg') && RGBColor == '000000')
+ {
//Modesty On but clicked somewhre else, we did modesty check because the modesty image covers whole body region so if user will click to
//see the annotation apart from leaf then the actual click will be on modesty canvas, but for annotation er
//
- else if (canvasId.match('modestyImg') && RGBColor == '000000') {
-
var bodyRegionId = canvasId.split("_")[1].slice(-1);
var maskCanvasId = 'imageCanvas' + bodyRegionId + '_mci' + "_" + windowviewid;
@@ -8020,9 +8247,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var TBoxTermNumber=annotations.TBoxTermNumber;
var NormalTermNumber=annotations.NormalTermNumber;
-
- $scope.saveTBoxTermNumberForSaveCB(evt, windowviewid,TBoxTermNumber,NormalTermNumber,MousePositionX,MousePositionY);//Calling Method for Tbox termnumber SaveCB
-
+
+ if ($scope.GetwindowStoreData(windowviewid,'multiAnnotationIsON') == true) {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,true,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
+ else
+ {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,false,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
+
}
var tCanvasTopPos = $(".ui-wrapper").css("top");
@@ -8044,6 +8277,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var len= (evt.target.id).split("_").length;
var windowviewid = (evt.target.id).split("_")[len-1];
+
var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
//changing for mac os now
var os=$scope.getOS();
@@ -8089,7 +8323,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var TBoxTermNumber=annotations.TBoxTermNumber;
var NormalTermNumber=annotations.NormalTermNumber;
- $scope.saveTBoxTermNumberForSaveCB(evt, windowviewid,TBoxTermNumber,NormalTermNumber,MousePositionX,MousePositionY);//Calling Method for Tbox termnumber SaveCB
+ var tips_x= parseInt( MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left) + 30;
+ var tips_y= parseInt( MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top) + 10;
+ var posx= MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left;
+ var posy= MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top;
+
+ if ($scope.GetwindowStoreData(windowviewid,'multiAnnotationIsON') == true) {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,true,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
+ else
+ {
+ $scope.saveTBoxTermNumberForSaveCB(windowviewid,false,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy);//Calling Method for Tbox termnumber SaveCB
+ }
var TermAnnotationText=$scope.GetwindowStoreData(windowviewid,'TermAnnotationText');
if (TermAnnotationText.length > 0) {
@@ -8098,64 +8343,37 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
//Added Method to Save TransparencyBox TermNumbers for SaveCB
- $scope.saveTBoxTermNumberForSaveCB = function (evt, windowviewid,TBoxTermNumber,NormalTermNumber,MousePositionX,MousePositionY) {
- if (evt.ctrlKey || evt.metaKey) {
- $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', true);
- }
- else {
- //Remove previous SpeechBubble with termnumber
-
- var preTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
- if (preTermData != undefined && preTermData.length > 0) {
- for (var i = 0; i < preTermData.length; i++) {
- if (preTermData[i].transparentTermNumber != parseInt(TBoxTermNumber)) {
-
- var CurriculumTermData = [];
- CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
- CurriculumTermData = new jinqJs()
- .from(CurriculumTermData)
- .delete().at("transparentTermNumber == " + preTermData[i].transparentTermNumber,'istpboxTerm == ' + 1).select();
-
- $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
- }
-
- }
- }
-
- // remove all in multi annotation
- $('.com_anno_' + windowviewid).remove();
+ $scope.saveTBoxTermNumberForSaveCB = function (windowviewid,isMultiAnnotation,TBoxTermNumber,NormalTermNumber,tips_x,tips_y,posx,posy) {
+
+ var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
+
+ if(!isMultiAnnotation)
+ {
+ // remove all in multi annotation
+ $('.com_anno_' + windowviewid).remove();
// $('.dynCross_anno_' + windowviewid).parent().parent().parent().remove();
// remove all in single annotation
$('.crossDiv_annotation_' + windowviewid).parent().parent().remove();
$('#bord_annotation_' + windowviewid).remove();
$('#dot_annotation_' + windowviewid).remove();
-
- $scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', false);
+
+ CurriculumTermData = new jinqJs()
+ .from(CurriculumTermData)
+ .delete().at('istpboxTerm == ' + 1).select();
}
- var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
- //changing for mac os now
- var os=$scope.getOS();
- if(os=='MacOS')
- {
- var verticalScrollPosition = Math.round(canvasDiv.scrollTop)-2;
- var horizontlScrollPosition = Math.round(canvasDiv.scrollLeft)-2;
- }
- else
- {
- var verticalScrollPosition = Math.round(canvasDiv.scrollTop)-1;
- var horizontlScrollPosition = Math.round(canvasDiv.scrollLeft)-1;
- }
- var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
+
CurriculumTermData.push({
- "transparentTermNumber": parseInt(TBoxTermNumber),
- "termNumber": parseInt(NormalTermNumber),
- "istpboxTerm":1,
- "tips_x": parseInt(MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left) + 30,
- "tips_y": parseInt(MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top) + 10,
- "x": MousePositionX + horizontlScrollPosition - $('#canvasDivDA_' + windowviewid).offset().left,
- "y": MousePositionY + verticalScrollPosition - $('#canvasDivDA_' + windowviewid).offset().top
- });
+ "transparentTermNumber": parseInt(TBoxTermNumber),
+ "termNumber": parseInt(NormalTermNumber),
+ "istpboxTerm":1,
+ "tips_x": tips_x,
+ "tips_y": tips_y,
+ "x": posx,
+ "y": posy
+ });
+
+
$scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
}
@@ -8215,33 +8433,36 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
//Added Method to Save TransparencyBox TermNumbers for SaveCB
- $scope.saveTermNumberForSaveCB = function (windowviewid,NormalTermNumber) {
- //Remove previous SpeechBubble with termnumber
+ $scope.saveTermNumberForSaveCB = function (windowviewid,isMultiAnnotation,NormalTermNumber,tips_x,tips_y,posx,posy) {
- var preTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
- if (preTermData != undefined && preTermData.length > 0) {
- for (var i = 0; i < preTermData.length; i++) {
- if (preTermData[i].termNumber != parseInt(NormalTermNumber)) {
-
- var CurriculumTermData = [];
- CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
- CurriculumTermData = new jinqJs()
- .from(CurriculumTermData)
- .delete().at("termNumber == " + preTermData[i].termNumber,'istpboxTerm == ' + 0).select();
-
- $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
- }
-
- }
- }
+ var CurriculumTermData = $scope.GetwindowStoreData(windowviewid, 'CurriculumTermData');
+
+ if(!isMultiAnnotation)
+ {
+ // remove all in multi annotation
+ $('.com_' + windowviewid).remove();
- // remove all in multi annotation
- $('.com_' + windowviewid).remove();
-
- // remove all in single annotation
- $('#dot_' + windowviewid).remove();
- $('#bord_' + windowviewid).remove();
- $('#crossDiv_' + windowviewid).parent().parent().remove();
+ // remove all in single annotation
+ $('#dot_' + windowviewid).remove();
+ $('#bord_' + windowviewid).remove();
+ $('#crossDiv_' + windowviewid).parent().parent().remove();
+
+ CurriculumTermData = new jinqJs()
+ .from(CurriculumTermData)
+ .delete().at('istpboxTerm == ' + 0).select();
+ }
+
+ CurriculumTermData.push({
+ "transparentTermNumber": 0,
+ "termNumber": parseInt(NormalTermNumber),
+ "istpboxTerm":0,
+ "tips_x": tips_x,
+ "tips_y": tips_y,
+ "x": posx,
+ "y": posy
+ });
+
+ $scope.SetwindowStoreData(windowviewid, 'CurriculumTermData', CurriculumTermData);
}
@@ -8509,6 +8730,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//To enable extract button
$scope.SetwindowStoreData(windowviewid, 'layerNumberTransparency', 0);
$scope.SetwindowStoreData(windowviewid,'isTransparencyActivated',false);
+ $scope.SetwindowStoreData(windowviewid, 'transparencyBounds', []);
$("#btnExtract_" + windowviewid).removeClass("disabled");
$("#btnExtract_" + windowviewid).css("pointer-events", "auto");
@@ -8522,6 +8744,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var ctx = paintCanvasObj.getContext("2d");
ctx.clearRect(0, 0, 2277, 3248);
+ var CanvasObj = document.getElementById("canvasDA_" + windowviewid);
+ if (CanvasObj != null) {
+ var ctx1 = CanvasObj.getContext("2d");
+ ctx1.clearRect(0, 0, 2277, 3248);
+ }
+ $scope.SetwindowStoreData(windowviewid, 'isCBAnnotationActive',false);
+ $scope.SetwindowStoreData(windowviewid, 'annotationData', {shapeStates:[],paintCanvasState:[]});
+
var sktch = $('#canvasPaintDA_'+windowviewid).sketch();
$('#canvasPaintDA_'+windowviewid).sketch().actions = [];
}
@@ -9138,7 +9368,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
doHighlightOrExtract = true;
}
- else if (((viewOrientationId == '5')) && (ColoredImageSRC.length == 4)) {
+ else if (((viewOrientationId == '5')) && (ColoredImageSRC.length == 1)) {
doHighlightOrExtract = true;
}
else if (((viewOrientationId == '6')) && (ColoredImageSRC.length == 1)) {
@@ -9274,7 +9504,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
else if ((viewOrientationId == '5')) {
- totalCanvas = 4;
+ totalCanvas = 1;
}
else if ((viewOrientationId == '6')) {
@@ -9320,7 +9550,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && ($scope.grayedBR.length == 5)) {
isEligibleForHighlightBodyByTermList = true;
}
- else if (((viewOrientationId == '5')) && ($scope.grayedBR.length == 4)) {
+ else if (((viewOrientationId == '5')) && ($scope.grayedBR.length == 1)) {
isEligibleForHighlightBodyByTermList = true;
}
else if (((viewOrientationId == '6')) && ($scope.grayedBR.length == 1)) {
@@ -9733,9 +9963,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$rootScope.CloseListManager();
- //Remove the Search list and then Repopulate it on change of Gender
- $('#searchListDiv_' + windowviewid).empty();
-
var canDiv = document.getElementById('canvasDivDA_' + windowviewid);
var canDivChildCount = canDiv.childElementCount;
if (canDivChildCount > 0) {
@@ -10024,8 +10251,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//to get the body system highlighted on view change. commented the below line
// $rootScope.isHighlightBodyByBodySystem = false;
- //Remove the search list and then Repopulate it on change of View
- $('#searchListDiv_' + windowviewid).empty()
if ($rootScope.openViews.length > 0) {
$rootScope.openViews.splice($rootScope.openViews.length - 1);
}
@@ -10330,7 +10555,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (grayedBR.length == 5)) {
$scope.isAlreadyHighlighted = true;
}
- else if (((viewOrientationId == '5')) && (grayedBR.length == 4)) {
+ else if (((viewOrientationId == '5')) && (grayedBR.length == 1)) {
$scope.isAlreadyHighlighted = true;
}
else if (((viewOrientationId == '6')) && (grayedBR.length == 1)) {
@@ -10480,7 +10705,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}
- $scope.ShowSearch = function (windowviewid) {
+ $scope.ShowSearch = function (windowviewid, isbuttionclick) {
$scope.SetwindowStoreData(windowviewid,'isSearchClicked',true);
console.log('ShowSearch is called');
@@ -10500,7 +10725,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
//This is added as the $scope.VocabTermTxt can change while changing view also the li elements need to be removed
//Remove the list and then Repopulate
if ($('#searchListDiv_' + windowviewid).html() != "")
- $('#searchListDiv_' + windowviewid).empty();
+ $('#termlistfilter_'+windowviewid).empty();
//Delay compile of ul li so that the remove of li is completed.
$timeout(function () {
@@ -10514,7 +10739,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else if (((viewOrientationId == '2') || (viewOrientationId == '3')) && (ColoredImageSRC.length == 5)) {
$scope.EnableUI();
}
- else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 4)) {
+ else if ((viewOrientationId == '5') && (ColoredImageSRC.length == 1)) {
$scope.EnableUI();
}
else if ((viewOrientationId == '6') && (ColoredImageSRC.length == 1)) {
@@ -10523,40 +10748,39 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
}, 500);
- console.log("primary language: " + vocabTermDataArray[primaryLexiconIndx].language);
+ var vocabTermDataArray =vocabTermDataArray[primaryLexiconIndx].vocabTermTxt;
- $rootScope.a = primaryLexiconIndx;
-
- $scope.vocabArray = vocabTermDataArray;
-
- $scope.sFilter = $("#typedTermName_" + windowviewid).val();
- var $e2 = $('').appendTo('#searchListDiv_' + windowviewid);
- $compile($e2)($scope);
-
- console.log('termlistfilter is created and complied');
- $(".daSearch").css("display", "none");
-
- $("#termlistfilter_" + windowviewid).css("display", "block");
-
- $timeout(function () {
-
- $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
-
- if ($(this).find("a").html() == document.getElementById('typedTermName_'+windowviewid).value) {
- $("#termlistfilter_" + windowviewid + " li a").css({ "background-color": "#ffffff", "color": "#000000" });
- $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" });
- }
- });
+ var searchvalue = $("#typedTermName_" + windowviewid).val();
+
+ var searchfilterdata = $filter('filter')(vocabTermDataArray, searchvalue);
+ if(searchvalue.trim()!="")
+ {
+ $scope.AllSearchData = $filter('orderBy')(searchfilterdata, '_TermText.length');
+ }
+ else
+ {
+ $scope.AllSearchData = $filter('orderBy')(searchfilterdata, '_TermText');
+ }
- $rootScope.searchListArray = [];
+ $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 500);
- $("#termlistfilter_" + windowviewid + " > li").each(function (key, value) {
- $rootScope.searchListArray.push({ "name": $(this).find("a").html(), "id": $(this).find("a").attr("id") });
- });
- }, 100);
+ $('#termlistfilter_'+windowviewid).css("display", "block");
+ angular.forEach($scope.limitTofilterdata, function (value2, key2) {
+ var $el = $('
').appendTo('#termlistfilter_' + windowviewid);
+ $compile($el)($scope);
+ })
+
+ var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDiv_' + windowviewid);
+ $compile($all)($scope);
+
+ if(isbuttionclick)
+ {
+ $timeout(function () {
+ $('#termlistfilter_'+windowviewid).focus();
+ }, 200);
+ }
+
}
else {
$rootScope.daloadSearchData(windowviewid);
@@ -10567,67 +10791,15 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.HideSearch = function () {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
-
+
$timeout(function () {
- $("#termlistfilter_" + windowviewid).css("display", "none");
- if ($('#searchListDiv_' + windowviewid).html() != "") {
- $('#searchListDiv_' + windowviewid).empty();
- }
- }, 500);
-
- }
-
- $scope.jumpToTerm = function (event) {
- 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();
-
- $scope.SetwindowStoreData(windowviewid,'searchSelectedText',currenttermidTxt);
- $('#termList option[selected="selected"]').attr("selected", false);
- $('#termList option[value="' + currenttermidTxt + '"]').attr("selected", true);
- $("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
- $('#termList option[value="' + currenttermidTxt + '"]').css({ "background-color": "#3399FF", "color": "#ffffff" });
-
- $scope.DisableUI();
-
- // clear previousHighlightList and Terms and false multiAnnotation
- $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
- $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
- $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]);
- $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',false);
-
- $("#typedTermName_" + windowviewid).val(event.target.innerHTML);
-
- $scope.HighlightBodyOnListManagerSelection(serachedTermId, false, windowviewid);
-
- // $scope.SetwindowStoreData(windowviewid,'IsSearchVisible',false);
- $scope.IsSearchVisible = false;
- console.log("$scope.IsSearchVisible = false INSIDE $scope.jumpToTerm ")
- $scope.SetwindowStoreData(windowviewid,'isNormalMode',false);
-
- //Highlight only Highlight button
-
- $("#btnHighLight_" + windowviewid).addClass("btn-primary");
- $("#btnHighLight_" + windowviewid).removeClass("btn-black");
-
- if (!$("#btnNormalMode_" + windowviewid).hasClass("btn-black")) {
- $("#btnNormalMode_" + windowviewid).addClass("btn-black");
- }
-
- if (!$("#btnExtract_" + windowviewid).hasClass("btn-black")) {
- $("#btnExtract_" + windowviewid).addClass("btn-black");
- }
-
- if ($("#btnExtract_" + windowviewid).hasClass("btn-primary")) {
- $("#btnExtract_" + windowviewid).removeClass("btn-primary");
- }
-
- if ($("#btnNormalMode_" + windowviewid).hasClass("btn-primary")) {
- $("#btnNormalMode_" + windowviewid).removeClass("btn-primary");
- }
+ if(!$scope.IsSearchVisible)
+ {
+ $("#termlistfilter_" + windowviewid).empty();
+ $("#termlistfilter_" + windowviewid).css("display", "none");
+ }
+
+ }, 600);
}
@@ -10731,7 +10903,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (VocabTermTxtfilter != null || VocabTermTxtfilter != undefined) {
for (var j = 0; j < VocabTermTxtfilter.length; j++) {
- var $el = $('
').appendTo('#termList')
+ var $el = $('
').appendTo('#termList')
$compile($el)($scope);
}
@@ -10764,11 +10936,13 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if (isTermListOptionClicked == true) {
$('#typedTermName_' + windowviewid).val('');
}
-
+ else
+ {
+ $('#typedTermName_' + windowviewid).val(currenttermidTxt);
+ }
if ($scope.GetwindowStoreData(windowviewid,'isTransparencyActivated')) {
$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.
var prevId=$scope.GetwindowStoreData(windowviewid,'prevId');
if (prevId == actualTermNumber) {
@@ -10777,13 +10951,17 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
else {
$scope.DisableUI();
+ // clear previousHighlightList and Terms and false multiAnnotation
+ $scope.SetwindowStoreData(windowviewid, 'fullTermlist', []);
+ $scope.SetwindowStoreData(windowviewid, 'AllTerms', []);
+ $scope.SetwindowStoreData(windowviewid,'previousHighlightList',[]);
+ $scope.SetwindowStoreData(windowviewid,'multiAnnotationIsON',false);
+ $scope.SetwindowStoreData(windowviewid,'isNormalMode',false);
$scope.SetwindowStoreData(windowviewid,'prevId',actualTermNumber);
$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" });
$("#termList").find("option[id=" + selectedtermid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
- $("div#backdrop #termlistfilter li").find("a").css({ "background-color": "#ffffff", "color": "#000000" });
- $("div#backdrop #termlistfilter li").find("a[id=" + selectedtermid + "]").css({ "background-color": "#3399FF", "color": "#ffffff" });
-
+
var isListManagerSelected=true;
$scope.SetwindowStoreData(windowviewid,'isListManagerSelected',isListManagerSelected);
//---
@@ -10805,7 +10983,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.removeBodySyetemSelectionClass(windowviewid,"");
//1.
$scope.SetwindowStoreData(windowviewid,'actualTermNumber',actualTermNumber);
- console.log(' $scope.actualTermNumber insde HighlightBodyOnListManagerSelection= ' + actualTermNumber)
$scope.setLayerNumberAndHighlightByTermList(windowviewid);
}
}
@@ -11183,7 +11360,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
for (var j = 0; j < VocabTermTxtfilter.length; j++) {
- var $el = $('
').appendTo('#termList')
+ var $el = $('
').appendTo('#termList')
$compile($el)($scope);
}
@@ -11303,7 +11480,6 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var len = (event.target.id).split("_").length;
var windowviewid = (event.target.id).split("_")[len - 1];
-
var date = new Date();
var newtimestamp = date.getTime();
@@ -11319,27 +11495,38 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.showFilteredTerms = function (windowviewid) {
- // console.log('showFilteredTerms is called' );
-
- $('#searchListDiv_' + windowviewid).empty();
-
var lexiconInd = $scope.GetwindowStoreData(windowviewid, 'primaryLexiconInd');
var vocabTermDataArray = $scope.GetwindowStoreData(windowviewid, 'vocabTermDataArray')[lexiconInd].vocabTermTxt;
var searchvalue = $("#typedTermName_" + windowviewid).val();
+
var searchfilterdata = $filter('filter')(vocabTermDataArray, searchvalue);
- $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 10);
-
- var $e2 = $('').appendTo('#searchListDiv_' + windowviewid);
- $compile($e2)($scope);
+ if(searchvalue.trim()!="")
+ {
+ searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText.length');
+ }
+ else
+ {
+ searchfilterdata = $filter('orderBy')(searchfilterdata, '_TermText');
+ }
+
+ $scope.limitTofilterdata = $filter('limitTo')(searchfilterdata, 20);
- $("#termlistfilter_" + windowviewid).css("display", "block");
-
+ $('#termlistfilter_'+windowviewid).css("display", "block");
+ $('#termlistfilter_'+windowviewid).empty();
+
+ angular.forEach($scope.limitTofilterdata, function (value2, key2) {
+ var $el = $('
').appendTo('#termlistfilter_' + windowviewid);
+ $compile($el)($scope);
+ })
+
+ var $all = $('#termlistfilter_'+windowviewid).appendTo('#searchListDiv_' + windowviewid);
+ $compile($all)($scope);
+
};
+
$scope.ApplySearch = function (event) {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
@@ -11410,7 +11597,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var totalstructures=0;
angular.forEach(searchfilterdata[primaryLexiconIndex].VocabTermData.VocabTerms.Term, function (value2, key2) {
totalstructures=totalstructures+1;
- var $el = $('
').appendTo('#searchTermListUl_' + windowviewid);
+ var $el = $('
').appendTo('#searchTermListUl_' + windowviewid);
$compile($el)($scope);
})
var termsTotal = '
' + totalstructures + ' Structures';
@@ -11529,19 +11716,16 @@ function OnSearch(event) {
scope.$apply(function () {
var len= (event.currentTarget.id).split("_").length;
var windowviewid = (event.currentTarget.id).split("_")[len-1];
- scope.ShowSearch(windowviewid);
- });
-}
-function selectTerm(event) {
- console.log('selectTerm is called outside ');
- var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
- scope.$apply(function () {
- scope.jumpToTerm(event);
+ if((event.currentTarget.id).match('btnDATermSearch'))
+ scope.ShowSearch(windowviewid,true);
+ else
+ {
+ scope.ShowSearch(windowviewid,false);
+ }
});
}
-
function refreshTermListOnSystem(bodysystemId) {
console.log('refreshTermListOnSystem is called outside ');
var scope = angular.element(document.getElementsByClassName("daBodyView")).scope();
@@ -11697,6 +11881,7 @@ function viewChange(event) {
}
+
//sidebar toggle
function SideBarToggleDA(event) {
var len = (event.currentTarget.id).split("_").length;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 1c20ed0..7bea324 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -995,6 +995,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
$("#messageModal").modal('show');
}
+ else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (result.LicenseInfo.IsActive) && (result.IsSubscriptionNotStart)) {
+ // validation for new license which license start date is future date .
+ $rootScope.isVisibleLogin = true;
+ $rootScope.LoginEnableUI();
+ $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
+ $("#messageModal").modal('show');
+ }
else if ((result.LicenseInfo != null) && (result.LicenseInfo != undefined) && (!result.LicenseInfo.IsActive) && (!result.IsSubscriptionExpired)) {
$rootScope.isVisibleLogin = true;
$rootScope.LoginEnableUI();
@@ -1376,7 +1383,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
.then(
function (result) {
console.log(result);
- if (result != null) {
+ if (result != null)
+ {
console.log(result);
if (result == LoginConstants.INVALID_CLIENT) {
$rootScope.isVisibleLogin = true;
@@ -1390,7 +1398,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$rootScope.errorMessage = LoginConstants.MSG_NOT_AUTHORIZE_SITE_USER;
$("#messageModal").modal('show');
}
-
else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.E_ACCOUNT_NUMBER_NOT_NULL) {
$rootScope.isVisibleLogin = true;
$rootScope.LoginEnableUI();
@@ -1415,159 +1422,169 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$rootScope.errorMessage = LoginMessageConstants.LICENSE_INACTIVE_MESSAGE;
$("#messageModal").modal('show');
}
+ else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_EXPIRED) {
+ $rootScope.isVisibleLogin = true;
+ $rootScope.LoginEnableUI();
+ $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_EXPIRATION_MESSAGE + result.SubscriptionExpirationDate + '.';
+ $("#messageModal").modal('show');
+ }
+ else if (result.LoginFailureCauseId != undefined && result.LoginFailureCauseId.toString() == LoginConstants.SITELICENSE_NOTSTARTED) {
+ $rootScope.isVisibleLogin = true;
+ $rootScope.LoginEnableUI();
+ $rootScope.errorMessage = LoginMessageConstants.SUBSCRIPTION_NOT_START_MESSAGE + result.SubscriptionStartDate + '.';
+ $("#messageModal").modal('show');
+ }
+ else
+ {
+ // update result with session detail
+ result.aiaIdleTime=$rootScope.aiaIdleTime;
+ result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
+ result.aiaPingInterval=$rootScope.aiaPingInterval;
+ result.SessionId=siteInfo.SessionId;
+ //display user name
+ $rootScope.userName=result.FirstName+" "+result.LastName;
+ if (typeof result.FirstName != undefined || result.FirstName != "" || result.FirstName != null) {
+ //code for modesty setting
+ if (result.LicenseInfo != null) {
+ if (result.Modesty) {
+ $rootScope.isModestyOn = true;
+ $rootScope.isModestyOff = false;
+ localStorage.setItem("globalModesty", "Y");
+ $rootScope.formsetting = {
+ ethnicity: null,
+ modesty: "Y"
+ }
+ $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+ }
+ else {
+ $rootScope.isModestyOn = false;
+ $rootScope.isModestyOff = true;
+ localStorage.setItem("globalModesty", "N");
+ $rootScope.formsetting = {
+ ethnicity: null,
+ modesty: "N"
+ }
+ $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+ }
+ }
+ else {
+ $rootScope.isModestyOn = true;
+ $rootScope.isModestyOff = false;
+ localStorage.setItem("globalModesty", "Y");
+ $rootScope.formsetting = {
+ ethnicity: null,
+ modesty: "Y"
+ }
+ $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
+ }
+ //code for modesty setting
+ $rootScope.aiaModesty = $rootScope.formsetting.modesty;
+ $rootScope.siteId = result.siteId;
- else {
- // update result with session detail
- result.aiaIdleTime=$rootScope.aiaIdleTime;
- result.aiaIdleTimeOut=$rootScope.aiaIdleTimeOut;
- result.aiaPingInterval=$rootScope.aiaPingInterval;
- result.SessionId=siteInfo.SessionId;
- //display user name
- $rootScope.userName=result.FirstName+" "+result.LastName;
- if (typeof result.FirstName != undefined || result.FirstName != "" || result.FirstName != null) {
- //code for modesty setting
- if (result.LicenseInfo != null) {
- if (result.Modesty) {
- $rootScope.isModestyOn = true;
- $rootScope.isModestyOff = false;
- localStorage.setItem("globalModesty", "Y");
- $rootScope.formsetting = {
- ethnicity: null,
- modesty: "Y"
- }
- $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
- }
- else {
- $rootScope.isModestyOn = false;
- $rootScope.isModestyOff = true;
- localStorage.setItem("globalModesty", "N");
- $rootScope.formsetting = {
- ethnicity: null,
- modesty: "N"
- }
- $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
- }
- }
- else {
- $rootScope.isModestyOn = true;
- $rootScope.isModestyOff = false;
- localStorage.setItem("globalModesty", "Y");
- $rootScope.formsetting = {
- ethnicity: null,
- modesty: "Y"
- }
- $rootScope.UpdateAndCloseSetting($rootScope.formsetting)
- }
- //code for modesty setting
- $rootScope.aiaModesty = $rootScope.formsetting.modesty;
+ // birendra// initialize exp img detail object
+ $rootScope.initializeUserForExportImage(result.Id);
- $rootScope.siteId = result.siteId;
+ //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true
+ if (result.LicenseId == 0) {
+ $rootScope.haveRoleAdmin = true;
- // birendra// initialize exp img detail object
- $rootScope.initializeUserForExportImage(result.Id);
+ // set license id -1 for admin
+ $scope.UpdateUserExportImageData(result.Id,'LicenseId',-1)
- //LicenseId would be zero for admin that is why we set the haveRoleAdmin = true
- if (result.LicenseId == 0) {
- $rootScope.haveRoleAdmin = true;
+ // set enable export image for admin
+ $scope.UpdateUserExportImageData(result.Id,'isExportImage',true);
- // set license id -1 for admin
- $scope.UpdateUserExportImageData(result.Id,'LicenseId',-1)
+ $rootScope.userData = result;
+ $rootScope.userModules = result.Modules;
- // set enable export image for admin
- $scope.UpdateUserExportImageData(result.Id,'isExportImage',true);
-
- $rootScope.userData = result;
- $rootScope.userModules = result.Modules;
-
- localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
-
- if (isCommingSoonModel == true) {
-
- ShowAssignedModulesPopup(result.Modules);
+ localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+
+ if (isCommingSoonModel == true) {
+ ShowAssignedModulesPopup(result.Modules);
- sessionStorage.setItem("loginSession", "true");
- localStorage.setItem('isCommingSoonModel', false);
- $rootScope.isVisibleLogin = false;
- }
+ sessionStorage.setItem("loginSession", "true");
+ localStorage.setItem('isCommingSoonModel', false);
+ $rootScope.isVisibleLogin = false;
+ }
- $location.path('/');
- }
- else {
- if (result.LicenseInfo != null ) {
+ $location.path('/');
- //only site instructor allowed to change modesty
- if(result.EditionId!=1 && result.EditionId!=2)
- {
- $("#modestyDiv").css("pointer-events", "none");
- $("#modestyDiv").css("opacity", 0.5);
- $("#modestyDiv").find("*").prop('disabled', true);
- }
+ }
+ else {
+ if (result.LicenseInfo != null ) {
- // set license id
- $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
+ //only site instructor allowed to change modesty
+ if(result.EditionId!=1 && result.EditionId!=2)
+ {
+ $("#modestyDiv").css("pointer-events", "none");
+ $("#modestyDiv").css("opacity", 0.5);
+ $("#modestyDiv").find("*").prop('disabled', true);
+ }
- // set license type :note 5 for demo/test license
- $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
+ // set license id
+ $scope.UpdateUserExportImageData(result.Id, 'LicenseId', result.LicenseId)
- if(result.UserExportImageDetail!=null)
- {
- // set already export image count
- $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
+ // set license type :note 5 for demo/test license
+ $scope.UpdateUserExportImageData(result.Id, 'LicenseTypeId', result.LicenseInfo.LicenseTypeId);
- // set Image limit
- $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
+ if(result.UserExportImageDetail!=null)
+ {
+ // set already export image count
+ $scope.UpdateUserExportImageData(result.Id,'CountExportImage',result.UserExportImageDetail.CountExportedImage);
- // set is enable for export image
- $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
- }
+ // set Image limit
+ $scope.UpdateUserExportImageData(result.Id,'ExptImageLimit',result.UserExportImageDetail.ExptImageLimit);
+ // set is enable for export image
+ $scope.UpdateUserExportImageData(result.Id,'isExportImage',result.UserExportImageDetail.isExportImage);
+ }
- $rootScope.userData = result;
- $rootScope.userModules = result.Modules;
- //1. set haveRoleAdmin = false because LicenseInfo is not null
- $rootScope.haveRoleAdmin = false;
+ $rootScope.userData = result;
+ $rootScope.userModules = result.Modules;
- //2.
- localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+ //1. set haveRoleAdmin = false because LicenseInfo is not null
+ $rootScope.haveRoleAdmin = false;
- //5.
- sessionStorage.setItem("loginSession", "true");
- $rootScope.isVisibleLogin = false;
+ //2.
+ localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
- //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
- // localStorage.setItem('isCommingSoonModel', false);
+ //5.
+ sessionStorage.setItem("loginSession", "true");
+ $rootScope.isVisibleLogin = false;
- $location.path('/');
+ //6. reset the isCommingSoonModel to false in local storage so that upcomming module pop up would not show again to the user after firts time
+ // localStorage.setItem('isCommingSoonModel', false);
- }
- else {
- if ($('#dvTerms').length > 0) {
- $('#dvTerms').html(result.TermsAndConditionsText);
- }
- $rootScope.isVisibleLogin = true;
- $rootScope.LoginEnableUI();
- $('#dvTermCondition').fadeIn();
- $rootScope.userData = result;
- $rootScope.haveRoleAdmin = false;
- localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
- $location.path('/');
- }
- }
- $rootScope.LoginEnableUI();
- // set user session time
- $rootScope.loadUserSession();
+ $location.path('/');
- }
+ }
+ else {
+ if ($('#dvTerms').length > 0) {
+ $('#dvTerms').html(result.TermsAndConditionsText);
+ }
+ $rootScope.isVisibleLogin = true;
+ $rootScope.LoginEnableUI();
+ $('#dvTermCondition').fadeIn();
+ $rootScope.userData = result;
+ $rootScope.haveRoleAdmin = false;
+ localStorage.setItem('loggedInUserDetails', JSON.stringify(result));
+ $location.path('/');
+ }
+ }
+ $rootScope.LoginEnableUI();
+ // set user session time
+ $rootScope.loadUserSession();
+ }
- }
}
+ }
},
@@ -2427,7 +2444,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$("#Menuoptionid").addClass("disableMenuoption");
$("#optionsListManagerTab").addClass("disableSubMenu");
$("#annotationToolBarOptions").addClass("disableSubMenu");
- $("#optionsCurriculum").addClass("disableSubMenu");
+ // $("#optionsCurriculum").addClass("disableSubMenu");
$("#optiontSetting").addClass("disableSubMenu");
$("#labExPdfOption").addClass("disableSubMenu");
@@ -2877,7 +2894,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$("#canvasPaintDA_" + MultiWinId).css("z-index", paintCanvasZindex);
if ($("#transparencyScale_" + MultiWinId).css("display") == "block") {
- $(".ui-wrapper").css("z-index", paintCanvasZindex);
+ //$(".ui-wrapper").css("z-index", paintCanvasZindex);
}
}
@@ -3110,7 +3127,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
$rootScope.switchToTransparencycanvas = function (paneld) {
-
var PanelElement= $scope.GetPanelElement(paneld);
var canvasElement = PanelElement.canvasElement;
@@ -3120,84 +3136,22 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var canvasId = canvasElement.id;
var canvasPaintId = canvasPaintElement.id;
- 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++) {
- var ctx = document.getElementById(modestyTransCanvases[j].id);
-
- if (ctx.style.visibility == "visible") {
-
- if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
-
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- var TransCanvasZindex = ctx.style.zIndex;
- var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
- MaxZindexVal = MaxZindexVal + 1;
- $("#" + canvasId).css("z-index", MaxZindexVal);
- $(".ui-wrapper").css("z-index", MaxZindexVal + 1);
- $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
-
- }
- else {
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- var TransCanvasZindex = ctx.style.zIndex;
- var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
- MaxZindexVal = parseInt(MaxZindexVal + 1);
-
- if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
- $("#" + canvasPaintId).css("z-index", MaxZindexVal);
- }
- else {
-
- $("#" + canvasId).css("z-index", MaxZindexVal);
- $(".ui-wrapper").css("z-index", MaxZindexVal);
- $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
-
-
- }
-
- }
- }
- else {
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
- paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
- if (drawCanvasZindex > paintCanvasZindex) {
- $(".ui-wrapper").css("z-index", drawCanvasZindex);
- $("#" + canvasId).css("z-index", drawCanvasZindex);
- $rootScope.UIWrapperZIndex = drawCanvasZindex;
- }
- else {
- $(".ui-wrapper").css("z-index", paintCanvasZindex);
- $("#" + canvasId).css("z-index", paintCanvasZindex);
- $rootScope.UIWrapperZIndex = paintCanvasZindex;
- }
-
- }
- }
- }
-
+ var drawCanvasZindex = $("#" + canvasId).css("z-index");
+ var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
+ drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
+ paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
+ if (drawCanvasZindex > paintCanvasZindex) {
+ //$(".ui-wrapper").css("z-index", drawCanvasZindex);
+ $("#" + canvasId).css("z-index", drawCanvasZindex);
+ $rootScope.UIWrapperZIndex = drawCanvasZindex;
}
- else {
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- drawCanvasZindex = parseInt(drawCanvasZindex) + 1;
- paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
- if (drawCanvasZindex > paintCanvasZindex) {
- $(".ui-wrapper").css("z-index", drawCanvasZindex);
- $("#" + canvasId).css("z-index", drawCanvasZindex);
- $rootScope.UIWrapperZIndex = drawCanvasZindex;
- }
- else {
- $(".ui-wrapper").css("z-index", paintCanvasZindex);
- $("#" + canvasId).css("z-index", paintCanvasZindex);
- $rootScope.UIWrapperZIndex = paintCanvasZindex;
- }
+ else
+ {
+ //$(".ui-wrapper").css("z-index", paintCanvasZindex);
+ $("#" + canvasId).css("z-index", paintCanvasZindex);
+ $rootScope.UIWrapperZIndex = paintCanvasZindex;
}
+
}
$rootScope.DrawingMode = function () {
@@ -3814,65 +3768,17 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var canvasId = canvasElement.id;
var canvasPaintId = canvasPaintElement.id;
- 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++) {
- var ctx = document.getElementById(modestyTransCanvases[j].id);
- if (ctx.style.visibility == "visible") {
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- var TransCanvasZindex = ctx.style.zIndex;
- var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
- MaxZindexVal = MaxZindexVal + 1;
- if (($("#" + canvasPaintId).css("display") == "block") && ($("#" + canvasId).css("display") == "block")) {
- if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
- $("#" + canvasId).css("z-index", MaxZindexVal);
- $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
- }
- else {
-
- if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
- $("#" + canvasPaintId).css("z-index", MaxZindexVal);
- }
- else {
- $("#" + canvasId).css("z-index", MaxZindexVal);
- }
- }
- }
- }
- else {
-
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex);
- MaxZindexVal = parseInt(MaxZindexVal + 1);
-
- if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
- $("#" + canvasPaintId).css("z-index", MaxZindexVal);
- }
-
- else {
- $("#" + canvasId).css("z-index", MaxZindexVal);
- }
-
- }
- }
- }
+ var canvasPaint_zIndex = $("#" + canvasPaintId).css("z-index");
+ var canvas_zIndex = $("#" + canvasId).css("z-index");
+ if (canvas_zIndex > canvasPaint_zIndex) {
+ canvasPaint_zIndex = parseInt(canvas_zIndex) + 2;
}
else {
- var canvasPaint_zIndex = $("#" + canvasPaintId).css("z-index");
- var canvas_zIndex = $("#" + canvasId).css("z-index");
- if (canvas_zIndex > canvasPaint_zIndex) {
- canvasPaint_zIndex = parseInt(canvas_zIndex) + 2;
-
- }
- else {
- canvasPaint_zIndex = parseInt(canvasPaint_zIndex) + 2;
- }
- $("#" + canvasPaintId).css("z-index", canvasPaint_zIndex);
+ canvasPaint_zIndex = parseInt(canvasPaint_zIndex) + 2;
}
+ $("#" + canvasPaintId).css("z-index", canvasPaint_zIndex);
+
}
$rootScope.DrawCircle = function (e) {
@@ -4131,72 +4037,19 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var canvasId = canvasElement.id;
var canvasPaintId = canvasPaintElement.id;
- 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++) {
- var ctx = document.getElementById(modestyTransCanvases[j].id);
-
- if (ctx.style.visibility == "visible") {
-
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- var TransCanvasZindex = ctx.style.zIndex;
- var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex, TransCanvasZindex);
- MaxZindexVal = MaxZindexVal + 1;
-
-
- if ($("#OnIdentify").hasClass("annotationtoolbartab")) {
+ var drawCanvasZindex = $("#" + canvasId).css("z-index");
+ var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
- $("#" + canvasId).css("z-index", MaxZindexVal);
- $('#' + ctx.getAttribute("id")).css("z-index", MaxZindexVal);
-
- }
- else {
-
- if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
- $("#" + canvasPaintId).css("z-index", MaxZindexVal + 1);
- }
- else
- {
- $("#" + canvasId).css("z-index", MaxZindexVal + 1);
- }
- }
- }
- else {
-
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
-
- var MaxZindexVal = Math.max(drawCanvasZindex, paintCanvasZindex);
- MaxZindexVal = parseInt(MaxZindexVal + 1);
-
- if ($("#annotationpaintbrushsize").hasClass("activebtncolor") || $("#annotationpainteraser").hasClass("activebtncolor")) {
-
- $("#" + canvasPaintId).css("z-index", MaxZindexVal);
- }
-
- else {
- $("#" + canvasId).css("z-index", MaxZindexVal);
- }
- }
- }
- }
+ if (drawCanvasZindex > paintCanvasZindex) {
+ paintCanvasZindex = parseInt(drawCanvasZindex) + 1;
+ }
+ else
+ {
+ paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
}
- else {
-
- var drawCanvasZindex = $("#" + canvasId).css("z-index");
- var paintCanvasZindex = $("#" + canvasPaintId).css("z-index");
-
- if (drawCanvasZindex > paintCanvasZindex) {
- paintCanvasZindex = parseInt(drawCanvasZindex) + 1;
- } else {
- paintCanvasZindex = parseInt(paintCanvasZindex) + 1;
- }
- $("#" + canvasId).css("z-index", paintCanvasZindex);
- }
+ $("#" + canvasId).css("z-index", paintCanvasZindex);
}
//birendra
@@ -4509,9 +4362,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
{
$rootScope.picAnnotationToolEvent(MultiWinId);
}
- //for paint brush
- $rootScope.switchCanvasToPaintCanvas(paneld);
-
+
}
}
}
@@ -4524,9 +4375,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
var shapeData=shapeStates[shapeindx];
$rootScope.AutoDrawShapeByData(canvasId,shapeData);
}
-
+
if(paintCanvasState!=undefined && paintCanvasState.length>0)
{
+ if (modulePanel != undefined && modulePanel.length>0) {
+ for (var index = 0 ; index < modulePanel.length; index++) {
+ var paneld = modulePanel[index].id;
+ if(paneld.match("daImagePanel")||paneld.match("AAImagePanel")||paneld.match("ciImagePanel")||paneld.match("aiImagePanel")||paneld.match("picImagePanel"))
+ {
+ //for paint brush
+ $rootScope.switchCanvasToPaintCanvas(paneld);
+
+ }
+ }
+ }
var drawingPoints=paintCanvasState
//auto save last cb paint
$scope.PaintEraseEvent();
@@ -7516,7 +7378,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
isDrawing = true;
currentCanvasId=canvasId;
var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+ var horizontlScrollPosition = canvasDiv.scrollLeft;
+ var MaxZindexVal=12001;
+ if(canvasId.match("canvasDA"))
+ {
+ var drawCanvasZindex = $("#" + canvasId).css("z-index");
+ var dpaintCanvasZindex = $("#" + canvasId).css("z-index");
+ var tpboxZindex = $(".ui-wrapper").css("z-index");
+ MaxZindexVal = Math.max(drawCanvasZindex, dpaintCanvasZindex);
+ if(tpboxZindex!=undefined)
+ MaxZindexVal = Math.max(MaxZindexVal, tpboxZindex);
+
+ MaxZindexVal = parseInt(MaxZindexVal + 1);
+
+ }
+
var $ua = navigator.userAgent;
if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
if(event.type == 'touchstart' || event.type == 'touchmove' || event.type == 'touchend' || event.type == 'touchcancel'){
@@ -7542,39 +7418,39 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
case "Line":
$(".line").remove();
$rootScope.isLinePreviewCompleted = true;
- $("#" + canvasDivId).append("
");
+ $("#" + canvasDivId).append("
");
$rootScope.Annotationangle();
break;
case "Arrow":
$(".arrow").remove();
$rootScope.isArrowPreviewCompleted = true;
- $("#" + canvasDivId).append("
");
+ $("#" + canvasDivId).append("
");
$rootScope.Annotationangle();
break;
case "Pin":
$(".pin").remove();
$rootScope.isPinPreviewCompleted = true;
- $("#" + canvasDivId).append("
");
+ $("#" + canvasDivId).append("
");
$rootScope.Annotationangle();
break;
case "Circle":
$(".circle").remove();
$rootScope.isCirclePreviewCompleted = true;
- $("#" + canvasDivId).append("
");
+ $("#" + canvasDivId).append("
");
//updated in reverse direction
$rootScope.Annotationangle();
break;
case "Rectangle":
$(".rectangle").remove();
$rootScope.isRectanglePreviewCompleted = true;
- $("#" + canvasDivId).append("
");
+ $("#" + canvasDivId).append("
");
//updated in reverse direction
$rootScope.Annotationangle();
break;
case "TextArea":
$(".textarea").remove();
$rootScope.isTextAreaPreviewCompleted = true;
- $("#" + canvasDivId).append("
");
+ $("#" + canvasDivId).append("
");
//updated in reverse direction
$rootScope.Annotationangle();
break;
@@ -9174,18 +9050,26 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
+ $rootScope.CloseExportModal = function () {
+
+ $(".modal-backdrop").css("opacity", "0");
+ $(".modal-backdrop").css("z-index", "0");
+ $("#exportfilename").val("");
+ $("#filename_open").val("");
+ $(".export-image").modal("hide");
+ $(".export-image-ipad").modal("hide");
+ }
$rootScope.SaveImagefile = function () {
// select one module from multiple
var PanelElement= $scope.GetPanelElement($rootScope.panelNameWithCb);
-
var canvasDiv = PanelElement.canvasDivElement;
if (canvasDiv == null || canvasDiv == undefined) return;
var canvasDivId = canvasDiv.id;
+ var fileName = $("#exportfilename").val() + '.jpg';
$("#" + canvasDivId).append("
");
html2canvas($("#" + canvasDivId), {
- onrendered: function (canvas) {
- var fileName = document.getElementById("filename").value + '.jpg';
+ onrendered: function (canvas) {
if (typeof (fileName) == "undefined" || fileName == ".jpg")
fileName = "Untitled.jpg"
@@ -9199,7 +9083,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
console.log(blob);
saveAs(blob, fileName);
$("#exportlogo").remove();
- $("#filename").val("");
+ $("#exportfilename").val("");
var imageInfo=$rootScope.UserImageExportData[0];
@@ -9207,70 +9091,70 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
.then(
function (result) {
- if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
- for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
- $scope.updatedWindowListForSaveCB={
+ // if ($rootScope.DaWindowData != undefined && $rootScope.DaWindowData.length > 0) {
+ // for (var i = 0; i < $rootScope.DaWindowData.length; i++) {
+ // $scope.updatedWindowListForSaveCB={
- // bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
- isTitleBarVisible: false,
- highlightOptionsSelectedId: 0,
- selectedStructureID: 0,//N
- contentDescriptorId: 0,
- callOuts: $rootScope.DaWindowData[i].CurriculumTermData,
-
- layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
- isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
+ // // bodySystemTermList: $rootScope.DaWindowData[i].BodySystemData,
+ // isTitleBarVisible: false,
+ // highlightOptionsSelectedId: 0,
+ // selectedStructureID: 0,//N
+ // contentDescriptorId: 0,
+ // callOuts: $rootScope.DaWindowData[i].CurriculumTermData,
+
+ // layerNumber: parseInt($rootScope.DaWindowData[i].layerNumber) + 1,
+ // isModestyOn: $rootScope.DaWindowData[i].ModestyValue,
- isTopToolBarVisible: false,
- clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
- minimised: $rootScope.DaWindowData[i].minimised,
- windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
+ // isTopToolBarVisible: false,
+ // clickedTermList: $rootScope.DaWindowData[i].fullTermlist,
+ // minimised: $rootScope.DaWindowData[i].minimised,
+ // windowTitle: $rootScope.DaWindowData[i].currentViewTitle,
- maximised: $rootScope.DaWindowData[i].maximised,
- size: {
- width: $rootScope.DaWindowData[i].width,
- height: $rootScope.DaWindowData[i].height
- },
- id: $rootScope.DaWindowData[i].voId,
+ // maximised: $rootScope.DaWindowData[i].maximised,
+ // size: {
+ // width: $rootScope.DaWindowData[i].width,
+ // height: $rootScope.DaWindowData[i].height
+ // },
+ // id: $rootScope.DaWindowData[i].voId,
- imageId: $rootScope.DaWindowData[i].imageId,
- position: {
- top: $rootScope.DaWindowData[i].top,
- left: $rootScope.DaWindowData[i].left,
- },
- mType: $rootScope.DaWindowData[i].moduleName,
- containsCapturedContent: true,
+ // imageId: $rootScope.DaWindowData[i].imageId,
+ // position: {
+ // top: $rootScope.DaWindowData[i].top,
+ // left: $rootScope.DaWindowData[i].left,
+ // },
+ // mType: $rootScope.DaWindowData[i].moduleName,
+ // containsCapturedContent: true,
- zoom: $rootScope.DaWindowData[i].zoomInOut,
- skinId: $rootScope.DaWindowData[i].curentEthnicity,
- isResizeLock: false , //N
- mode: $rootScope.DaWindowData[i].mode,
- windowListId: 0,//N
- canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
- canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,
- isCallOutVisible: false,
- annotationData:$rootScope.DaWindowData[i].annotationData,
- isLeftToolBarVisible: false,
- isModuleLoaded: false,
- searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
- prevId: $rootScope.DaWindowData[i].prevId,
+ // zoom: $rootScope.DaWindowData[i].zoomInOut,
+ // skinId: $rootScope.DaWindowData[i].curentEthnicity,
+ // isResizeLock: false , //N
+ // mode: $rootScope.DaWindowData[i].mode,
+ // windowListId: 0,//N
+ // canvasVScrollX: $rootScope.DaWindowData[i].CanvasDivTopPosition,
+ // canvasHScrollX: $rootScope.DaWindowData[i].CanvasDivLeftPosition,
+ // isCallOutVisible: false,
+ // annotationData:$rootScope.DaWindowData[i].annotationData,
+ // isLeftToolBarVisible: false,
+ // isModuleLoaded: false,
+ // searchSelectedText: $rootScope.DaWindowData[i].searchSelectedText,
+ // prevId: $rootScope.DaWindowData[i].prevId,
- isTransparent: $rootScope.DaWindowData[i].isTransparent,
- transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
- transparencyValue: $rootScope.DaWindowData[i].transNumber,
- layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
- transparencyX: $rootScope.DaWindowData[i].transparencyX,
- transparencyY: $rootScope.DaWindowData[i].transparencyY,
- layerNumberBeforeTBDraw: $rootScope.DaWindowData[i].layerNumberBeforeTBDraw,
- showHideAnnotations: $rootScope.DaWindowData[i].showHideAnnotations
+ // isTransparent: $rootScope.DaWindowData[i].isTransparent,
+ // transparencyBounds: $rootScope.DaWindowData[i].transparencyBounds,
+ // transparencyValue: $rootScope.DaWindowData[i].transNumber,
+ // layerNumberTransparency: $rootScope.DaWindowData[i].layerNumberTransparency,
+ // transparencyX: $rootScope.DaWindowData[i].transparencyX,
+ // transparencyY: $rootScope.DaWindowData[i].transparencyY,
+ // layerNumberBeforeTBDraw: $rootScope.DaWindowData[i].layerNumberBeforeTBDraw,
+ // showHideAnnotations: $rootScope.DaWindowData[i].showHideAnnotations
- }
- }
+ // }
+ // }
- }
+ // }
- localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
+ //localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
if(result!=null && result!="ADMIN" )
{
var userid= $rootScope.userData.Id;
@@ -9297,21 +9181,23 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
});
- $(".export-image").css("display", "none");
+ $(".modal-backdrop").css("opacity", "0");
+ $(".modal-backdrop").css("z-index", "0");
+ $(".export-image").modal("hide")
};
$rootScope.SaveOpenImagefile = function () {
// select one module from multiple
var PanelElement= $scope.GetPanelElement($rootScope.panelNameWithCb);
-
+ var fileName = $("#filename_open").val() + '.jpg';
var canvasDiv = PanelElement.canvasDivElement;
if (canvasDiv == null || canvasDiv == undefined) return;
var canvasDivId = canvasDiv.id;
$("#" + canvasDivId).append("
");
html2canvas($("#" + canvasDivId), {
onrendered: function (canvas) {
- var fileName = document.getElementById("filename_open").value + '.jpg';
+
if (typeof (fileName) == "undefined" || fileName == ".jpg")
fileName = "Untitled.jpg"
@@ -9340,7 +9226,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
.then(
function (result) {
- localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
+ //localStorage.setItem("daDataObject",JSON.stringify($scope.updatedWindowListForSaveCB) );
if(result!=null && result!="ADMIN" )
{
var userid= $rootScope.userData.Id;
@@ -9367,8 +9253,10 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
});
- $(".export-image-ipad").css("display", "none");
-
+ $(".modal-backdrop").css("opacity", "0");
+ $(".modal-backdrop").css("z-index", "0");
+ $(".export-image-ipad").modal("hide");
+
};
}]
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
index 7c39c6f..0f0e0a2 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LabExercController.js
@@ -40,7 +40,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
'width': 0,
'height': 0,
'minimised': false,
- 'maximised': false,
+ 'maximised': true,
'minmaxAutoEvent':true,
'isLabExChanged':false
@@ -311,8 +311,9 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
var keywords = $scope.leOpenInOtherModules.id;
$scope.SetLEwindowStoreData(windowviewid, 'keywords', keywords);
- var isMaximize = $scope.leOpenInOtherModules.maximised;
- var isMinimize = $scope.leOpenInOtherModules.minimised;
+ var isMaximize = $scope.leOpenInOtherModules.maximised!=undefined?$scope.leOpenInOtherModules.maximised:false;
+ var isMinimize = $scope.leOpenInOtherModules.minimised!=undefined?$scope.leOpenInOtherModules.minimised:false;
+ ;
$scope.SetLEwindowStoreData(windowviewid, 'maximised', isMaximize);
$scope.SetLEwindowStoreData(windowviewid, 'minimised', isMinimize);
@@ -537,7 +538,7 @@ function ($scope, $rootScope, pages, log, $http, $timeout, DataService, $filter,
$rootScope.resetMenuOption();
//remove pre event
- $("#labImagePanel_" + windowviewid).off("click");
+ // $("#labImagePanel_" + windowviewid).off("click");
$("#labImagePanel_" + windowviewid).on('click', function (event) {
var pnlName = event.currentTarget.id;
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
index 77296c3..1c072de 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyAnimationController.js
@@ -213,8 +213,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
var aiTitle = $scope.VidOpenInOtherModules.anatomyTitle;
$scope.SetVideowindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
localStorage.setItem("currentViewTitle", aiTitle);
- var isMaximize = $scope.VidOpenInOtherModules.maximised;
- var isMinimize = $scope.VidOpenInOtherModules.minimised;
+ var isMaximize = $scope.VidOpenInOtherModules.maximised!=undefined?$scope.VidOpenInOtherModules.maximised:false;
+ var isMinimize = $scope.VidOpenInOtherModules.minimised!=undefined?$scope.VidOpenInOtherModules.minimised:false;
+
$scope.SetVideowindowStoreData(windowviewid, 'maximised', isMaximize);
$scope.SetVideowindowStoreData(windowviewid, 'minimised', isMinimize);
@@ -447,7 +448,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$rootScope.resetMenuOption();
// call from while open module in CB
//remove pre event
- $("#vidImagePanel_" + windowviewid).off("click");
+ // $("#vidImagePanel_" + windowviewid).off("click");
$("#vidImagePanel_" + windowviewid).on('click', function (event) {
//after drawing annotation click not work on iPad/Android device
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
index 3c480f3..5e3f48d 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/MyPictureController.js
@@ -224,8 +224,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
var aiTitle = $scope.picOpenInOtherModules.anatomyTitle;
$scope.SetPICwindowStoreData(windowviewid, 'currentViewTitle', aiTitle);
localStorage.setItem("currentViewTitle", aiTitle);
- var isMaximize = $scope.picOpenInOtherModules.maximised;
- var isMinimize = $scope.picOpenInOtherModules.minimised;
+ var isMaximize = $scope.picOpenInOtherModules.maximised!=undefined?$scope.picOpenInOtherModules.maximised:false;
+ var isMinimize = $scope.picOpenInOtherModules.minimised!=undefined?$scope.picOpenInOtherModules.minimised:false;
+
$scope.SetPICwindowStoreData(windowviewid, 'maximised', isMaximize);
$scope.SetPICwindowStoreData(windowviewid, 'minimised', isMinimize);
@@ -281,7 +282,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
content: '
'+
'
'+
'
'+
- '
' +
+ '
' +
'
![]()
' +
'
'+
'
',
@@ -374,10 +375,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$('.jsPanel-content .jsPanel-theme-success').css('overflow-y', 'auto !important')
- $('#PicView').css("height", $(window).outerHeight() - 65);
-
- $('#PicView').css("width", $(window).outerWidth() - 15);
-
+ if (!$rootScope.isCallFromOtherModule) {
+ $('#PicView').css("height", $(window).outerHeight() - 65);
+ $('#PicView').css("width", $(window).outerWidth() - 15);
+ }
+
var canvasDIvHeight = $('#picImagePanel_' + windowviewid+ " .jsPanel-content").height();
$('#canvasDivPIC_' + windowviewid).css('height', canvasDIvHeight-5);
@@ -433,7 +435,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
$rootScope.resetMenuOption();
//remove pre event
- $("#picImagePanel_" + windowviewid).off("click");
+ // $("#picImagePanel_" + windowviewid).off("click");
$("#picImagePanel_" + windowviewid).on('click', function (event) {
//after drawing annotation click not work on iPad/Android device
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
index d9bdd97..6505579 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -34,21 +34,27 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.isListViewDataLoaded = true;
$scope.setActiveTab = function (tabToSet) {
+ if(tabToSet=="" ||tabToSet==undefined)
+ {
+ $scope.activeTab=1;
+ }
+ else
+ {
+ $scope.activeTab = tabToSet;
+ }
+ localStorage.setItem("activeTab", $scope.activeTab);
+
+ if ($scope.activeTab == 1) {
+ $('#grid-view').css("display", "block");
+ $('#list-view').css("display", "none");
+ $("#demoView").remove();
+ }
+ else {
- $scope.activeTab = tabToSet==undefined?1:tabToSet;
- localStorage.setItem("activeTab", $scope.activeTab);
-
- if ($scope.activeTab == 1) {
- $('#grid-view').css("display", "block");
- $('#list-view').css("display", "none");
- $("#demoView").remove();
- }
- else {
-
- $('#grid-view').css("display", "none");
- $('#list-view').css("display", "block");
- }
- };
+ $('#grid-view').css("display", "none");
+ $('#list-view').css("display", "block");
+ }
+ };
$scope.ObjectAttribute=function(windowviewid)
{
@@ -87,7 +93,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
'width': 0,
'height': 0,
'minimised': false,
- 'maximised': false,
+ 'maximised': true,
'minmaxAutoEvent':true,
'id': 0,
'selectedPins': [],
@@ -240,7 +246,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
}
- $scope.initializeAAWindowData($rootScope.MULTI_VIEW_ID,true,undefined);
+ $scope.initializeAAWindowData($rootScope.MULTI_VIEW_ID,true,undefined);
$rootScope.openModules.push({ "ModuleId": 2 });
if ($rootScope.refreshcheck == null) {
@@ -253,62 +259,60 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData($rootScope.MULTI_VIEW_ID,'moduleName',"ATLAS_ANATOMY");
$rootScope.currentActiveModuleTitle = "ATLAS_ANATOMY";
- $scope.AllBodyRegion = BodyRegions;
- $scope.AllBodySystem = BodySystems;
- $scope.AllOrientation = ViewOrientations;
- $scope.AllImageType = ImageTypes;
+ $scope.AllBodyRegion = BodyRegions;
+ $scope.AllBodySystem = BodySystems;
+ $scope.AllOrientation = ViewOrientations;
+ $scope.AllImageType = ImageTypes;
- if (localStorage.getItem("CurrentBodyRegion") != '') {
- $("#region option[value='" + localStorage.getItem('CurrentBodyRegion') + "']").prop('selected', true);
- }
- if (localStorage.getItem("CurrentBodySystem") != '') {
- $("#system option[value='" + localStorage.getItem('CurrentBodySystem') + "']").prop('selected', true);
- }
- if (localStorage.getItem("CurrentOrientation") != '') {
- $("#orientation option[value='" + localStorage.getItem('CurrentOrientation') + "']").prop('selected', true);
- }
- if (localStorage.getItem("CurrentImageType") != '') {
- $("#Type option[value='" + localStorage.getItem('CurrentImageType') + "']").prop('selected', true);
- }
- $scope.query.selectedbodyregion = localStorage.getItem('CurrentBodyRegion');
- $scope.query.selectedbodysystem = localStorage.getItem('CurrentBodySystem');
- $scope.query.selectedorientation = localStorage.getItem('CurrentOrientation');
- $scope.query.selectedimagetype = localStorage.getItem('CurrentImageType');
-
- $scope.FilterByImage(1, $scope.query,$rootScope.MULTI_VIEW_ID);
- setTimeout(function () {
- if ($('#grid-view').css("display") == "block") {
- if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {
- $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');
- }
- if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") {
-
- $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
- }
- }
- if ($('#list-view').css("display") == "block") {
+ if (localStorage.getItem("CurrentBodyRegion") != '') {
+ $("#region option[value='" + localStorage.getItem('CurrentBodyRegion') + "']").prop('selected', true);
+ }
+ if (localStorage.getItem("CurrentBodySystem") != '') {
+ $("#system option[value='" + localStorage.getItem('CurrentBodySystem') + "']").prop('selected', true);
+ }
+ if (localStorage.getItem("CurrentOrientation") != '') {
+ $("#orientation option[value='" + localStorage.getItem('CurrentOrientation') + "']").prop('selected', true);
+ }
+ if (localStorage.getItem("CurrentImageType") != '') {
+ $("#Type option[value='" + localStorage.getItem('CurrentImageType') + "']").prop('selected', true);
+ }
+ $scope.query.selectedbodyregion = localStorage.getItem('CurrentBodyRegion');
+ $scope.query.selectedbodysystem = localStorage.getItem('CurrentBodySystem');
+ $scope.query.selectedorientation = localStorage.getItem('CurrentOrientation');
+ $scope.query.selectedimagetype = localStorage.getItem('CurrentImageType');
- var AAListViewScroll = $rootScope.getLocalStorageValue("AAListViewScroll");
- if (typeof (AAListViewScroll) !== "undefined" && AAListViewScroll !== null && AAListViewScroll !== '' && $location.url() == "/tile-view-list") {
- if (typeof InstallTrigger !== 'undefined') {
+ $scope.FilterByImage(1, $scope.query,$rootScope.MULTI_VIEW_ID);
+
+ setTimeout(function () {
+
+ if ($('#grid-view').css("display") == "block") {
+ if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) {
+ $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail');
+ }
+ if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") {
- $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AAListViewScroll') }, 'slow');
- }
- else {
+ $("#grid-view").animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow');
+ }
+ }
+ if ($('#list-view').css("display") == "block") {
+ var AAListViewScroll = $rootScope.getLocalStorageValue("AAListViewScroll");
+ if (typeof (AAListViewScroll) !== "undefined" && AAListViewScroll !== null && AAListViewScroll !== '' && $location.url() == "/tile-view-list") {
+ if (typeof InstallTrigger !== 'undefined') {
- $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AAListViewScroll') }, 'slow');
- }
- $("#list-view table tbody tr").removeClass("active");
- $("#list-view table tbody #" + $rootScope.getLocalStorageValue("listViewSelectedID")).addClass("active");
- }
+ $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AAListViewScroll') }, 'slow');
+ }
+ else {
- }
+ $('#ListViewDiv').animate({ scrollTop: $rootScope.getLocalStorageValue('AAListViewScroll') }, 'slow');
+ }
+ $("#list-view table tbody tr").removeClass("active");
+ $("#list-view table tbody #" + $rootScope.getLocalStorageValue("listViewSelectedID")).addClass("active");
+ }
- $scope.EnableUI();
-
- }, 100);
+ }
- // $('#list-view').css('display', 'none');
+ }, 100);
+
}
$scope.openModuleItemView = function ($event) {
@@ -379,7 +383,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
//3. set opened module item ti
localStorage.setItem("currentViewTitle", OpenedTileData[6]);
if ($('#grid-view').css("display") == "block") {
- localStorage.setItem("AAGridViewScroll", $($window).scrollTop());
+ localStorage.setItem("AAGridViewScroll", $("#grid-view").scrollTop());
localStorage.setItem("AAGridViewHighlightThumbnail", $(event.target).parent().parent().parent().attr('id'));
}
@@ -411,7 +415,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
var OpenItemImagePath = "../../../content/images/aa/images/" +OpenedTileData[3];
$scope.SetAAwindowStoreData(windowviewid,'OpenItemImagePath',OpenItemImagePath);
$rootScope.listArray.push({ "imageName": OpenItemImagePath, "text": moduleItemDataToBeSaved });
- $("#viewList").append("
" + moduleItemDataToBeSaved + "
");
+ $("#viewList").append("
" + moduleItemDataToBeSaved + "
");
}
$rootScope.openAAModuleItemMain = function () {
@@ -504,10 +508,11 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.SetAAwindowStoreData(windowviewid, 'isShowSelectedPins', $scope.aaOpenInOtherModules.showSelectedPins);
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;
+ }
+
+ var isMaximize = $scope.aaOpenInOtherModules.maximised!=undefined?$scope.aaOpenInOtherModules.maximised:false;
+ var isMinimize = $scope.aaOpenInOtherModules.minimised!=undefined?$scope.aaOpenInOtherModules.minimised:false;
+
$scope.SetAAwindowStoreData(windowviewid, 'maximised', isMaximize);
$scope.SetAAwindowStoreData(windowviewid, 'minimised', isMinimize);
@@ -615,7 +620,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
else {
$scope.jsPanelWidth = $(window).outerWidth() - 20;
- $scope.jsPanelHeight = $(window).outerHeight() - 150;
+ $scope.jsPanelHeight = $(window).outerHeight() - 140;
$scope.jsPanelLeft = 1;
$scope.jsPanelTop = 70;
}
@@ -659,7 +664,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
$scope.SetAAwindowStoreData(windowviewid, 'maximised',true);
$scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
- var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
+ var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
$('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
},
onnormalized:function (panel) {
@@ -670,7 +675,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
}
$scope.SetAAwindowStoreData(windowviewid, 'minimised',false);
$scope.SetAAwindowStoreData(windowviewid, 'maximised',false);
- var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-70;
+ var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
$('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
},
resizable: {
@@ -680,7 +685,7 @@ 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;
+ var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
$('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
}
@@ -757,16 +762,12 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.loadAAModule = function (windowviewid) {
- if ($rootScope.isCallFromOtherModule) {
- var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 100;
- }
- else
- {
- var canvasDIvHeight = parseInt($('#AAImagePanel_' + windowviewid).outerHeight()) - 90;
+ if (!$rootScope.isCallFromOtherModule) {
$('#aaBodyView').css("height", $(window).outerHeight() - 65);
$('#aaBodyView').css("width", $(window).outerWidth() - 15);
}
-
+
+ var canvasDIvHeight = $('#AAImagePanel_' + windowviewid+ " .jsPanel-content").height()-50;
$('#canvasAADiv_' + windowviewid).css('height', canvasDIvHeight);
$('.canvasDivClass').css("height", canvasDIvHeight);
@@ -984,7 +985,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
//call when module loaded
$rootScope.resetMenuOption();
//remove pre event
- $("#AAImagePanel_" + windowviewid).off("click");
+ // $("#AAImagePanel_" + windowviewid).off("click");
$("#AAImagePanel_" + windowviewid).on('click', function (event) {
var pnlName=event.currentTarget.id;
@@ -1474,19 +1475,21 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
})
}
- $scope.FilterByImage = function (moduleId, query,windowviewid) {
+ $scope.FilterByImage = function (moduleId, query,windowviewid) {
$scope.DisableUI();
- if(windowviewid==undefined)
- {
- windowviewid= $rootScope.MULTI_VIEW_ID;
+ if (windowviewid == undefined) {
+ windowviewid = $rootScope.MULTI_VIEW_ID;
}
- console.log(query);
- //$scope.moduleId = moduleId;
- $scope.filterstring = true;
- console.log('loadForModuleById is called');
+ setTimeout(function(){
+ $scope.FilterSearch(moduleId, query,windowviewid);
+ },200)
+
+ }
+
+ $scope.FilterSearch = function (moduleId, query,windowviewid) {
+ $scope.filterstring = true;
- // $rootScope.moduleName = Modules[moduleId].Name;
$scope.SetAAwindowStoreData(windowviewid,'moduleName',"ATLAS_ANATOMY");
while ($scope.searchAAListViewData.length) {
$scope.searchAAListViewData.pop();
@@ -1524,7 +1527,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
else {
localStorage.setItem("CurrentImageType", '');
}
-
+
+
var promise = ModuleService.loadModuleDataBasedOnModuleName(Modules[moduleId].Name)
.then(
function (result) {
@@ -1535,6 +1539,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
.select();
$('#grid-view').empty();
+
angular.forEach($scope.selectedAAListViewData, function (value, key) {
var selectimg = true;
@@ -1638,7 +1643,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$('#ListViewDiv').append('
| No illustration found for the selected search criteria! |
');
}
- $timeout(function () { $scope.EnableUI(); }, 500);
+ $timeout(function () {
+ $scope.EnableUI();
+ $scope.ResetGridListLength();
+ }, 500);
},
function (error) {
$timeout(function () { $scope.EnableUI(); }, 500);
@@ -1647,8 +1655,39 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
)
}
- $scope.Reset = function (moduleId, query,windowviewid) {
+ $scope.ResetGridListLength=function()
+ {
+ var $ua = navigator.userAgent;
+
+ if (($ua.match(/(iPod|iPhone|iPad|android)/i))) {
+
+ if(screen.height<=768)
+ {
+ $('#ListViewDiv').css({"height":"300","overflow":"scroll"});
+ $('#grid-view').css({"height":"535","overflow":"scroll"});
+ }
+ else if(screen.height<=1024)
+ {
+ $('#ListViewDiv').css({"height":"460","overflow":"scroll"});
+ $('#grid-view').css({"height":"720","overflow":"scroll"});
+ }
+ else
+ {
+ $('#ListViewDiv').css({"height":"880","overflow":"scroll"});
+ $('#grid-view').css({"height":"950","overflow":"scroll"});
+ }
+
+ }
+ else
+ {
+ $('#ListViewDiv').css({"height":"490","overflow":"scroll"});
+ $('#grid-view').css({"height":"720","overflow":"scroll"});
+ }
+
+ }
+ $scope.Reset = function (moduleId, query,windowviewid) {
+ $scope.DisableUI();
if(windowviewid==undefined) // call from also home controller list manager
windowviewid= $rootScope.MULTI_VIEW_ID;
@@ -1674,8 +1713,10 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou
$scope.filterstring = false;
- $scope.FilterByImage(1, query,windowviewid);
-
+ setTimeout(function(){
+ $scope.FilterSearch(1, query,windowviewid)
+ },200)
+
}
$scope.showSelectedSystemPins = function (event,windowviewid) {
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
index cec15b9..973ea15 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/main/AIA.js
@@ -397,7 +397,9 @@ AIA.constant("LoginConstants", {
"ACCOUNT_NUMBER_NOT_EXIST": "1",
"EDITION_NOT_EXIST": "3",
"MASTER_SITEIP_NOT_EXIST": "2",
- "LICENSE_INACTIVE": "6",
+ "LICENSE_INACTIVE": "6",
+ "SITELICENSE_EXPIRED": "7",
+ "SITELICENSE_NOTSTARTED": "8",
"INVALID_CLIENT": "Clinet is not valid",
"MSG_NOT_AUTHORIZE_SITE_USER": "User is not authorized.",
});
@@ -422,6 +424,7 @@ AIA.constant("LoginMessageConstants", {
"PASSWORD_UPDATE_SUCCESS": "Password updated successfully",
"PASSWORD_UPDATE_FAILED": "Password update failed",
"SUBSCRIPTION_EXPIRATION_MESSAGE": "Your license is expired since ",
+ "SUBSCRIPTION_NOT_START_MESSAGE": "Your license Subscription is not started yet. It will continue on ",
"LICENSE_INACTIVE_MESSAGE": "Your license is inactive.",
"INVALID_USER": "Invalid UserID",
"USER_INACTIVE_MESSAGE": "User ID is inactive.",
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
index 6fd08b7..e11d7b4 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
+++ b/400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
@@ -65,7 +65,7 @@