diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
index a826faf..cb3a362 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -455,6 +455,30 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$('#CBDetailPageDiv').css('pointer-events', 'auto');
$('#CBDetailPageDiv').css('opacity', '1');
}
+ //fixing for mac os now
+ $scope.getOS = function () {
+ var userAgent = window.navigator.userAgent,
+ platform = window.navigator.platform,
+ macosPlatforms = ['Macintosh', 'MacIntel', 'MacPPC', 'Mac68K'],
+ windowsPlatforms = ['Win32', 'Win64', 'Windows', 'WinCE'],
+ iosPlatforms = ['iPhone', 'iPad', 'iPod'],
+ os = null;
+
+ if (macosPlatforms.indexOf(platform) !== -1) {
+ os = 'MacOS';
+ } else if (iosPlatforms.indexOf(platform) !== -1) {
+ os = 'iOS';
+ } else if (windowsPlatforms.indexOf(platform) !== -1) {
+ os = 'Windows';
+ } else if (/Android/.test(userAgent)) {
+ os = 'Android';
+ } else if (!os && /Linux/.test(platform)) {
+ os = 'Linux';
+ }
+
+ return os;
+ }
+
$scope.openView = function ($event) {
// open module bu openresource
@@ -2530,8 +2554,19 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+
+ //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 distanceXOnMirrorImage = (parseInt(mirrorCanvasX) + parseInt(mirrorCanvasWidth)) - (parseInt(mousePos.x) + horizontlScrollPosition);// - 135);
@@ -3057,14 +3092,25 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
// alert(mousePos.x + ',' + mousePos.y);
var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
-
-
+ //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;
+ }
+
//We substracted 135, as the difference between flex and html coordinates for same organ is 135
- var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
- var actualY = mousePos.y + Math.round(verticalScrollPosition)-1;
- var RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y);
+
+ var actulalX = mousePos.x + horizontlScrollPosition;
+ var actualY = mousePos.y + verticalScrollPosition;
+
+ var RGBColor = $scope.GetRGBColor(maskCanvasContext, actulalX, actualY, x, y);
//Modesty ON
@@ -5001,7 +5047,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
for (var m = 0; m <= $scope.speechbubbleList.length - 1; m++) {
if ( $scope.speechbubbleList[m].ids == sub_id1) {
- $scope.angle1( $scope.speechbubbleList[m].xaxis-1, $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, bor_id);
+ $scope.angle1($scope.speechbubbleList[m].xaxis, $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, bor_id);
break;
}
}
@@ -5090,7 +5136,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
- $scope.angle(x-1, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
+ $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
},
//Update Annotation Cordianate in case of show single Annotation
stop: function (evt) {
@@ -5173,7 +5219,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
if ( $scope.speechbubbleList != null || $scope.speechbubbleList != undefined) {
for (var m = 0; m <= $scope.speechbubbleList.length - 1; m++) {
if ( $scope.speechbubbleList[m].ids == sub_id1_anno) {
- $scope.angle1( $scope.speechbubbleList[m].xaxis-1, $scope.speechbubbleList[m].yaxis-1, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, bor_id_anno);
+ $scope.angle1($scope.speechbubbleList[m].xaxis, $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, bor_id_anno);
break;
}
}
@@ -5270,7 +5316,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var canvasDiv = document.getElementById('canvasDivDA_' + windid);
var verticalScrollPosition = canvasDiv.scrollTop;
var horizontlScrollPosition = canvasDiv.scrollLeft;
- $scope.angle(x-1, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
+ $scope.angle(x, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
},
//Update Annotation Cordianate in case of show single Annotation
@@ -5434,13 +5480,29 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.createSpeechBubbleBasedOnAnnotationLength = function (pointClicked, x, y, id, tipx, tipy,windowviewid,speechBubbleCounter) {
var isHighlightBodyWithCBTermData=$scope.GetwindowStoreData(windowviewid,'isHighlightBodyWithCBTermData');
- if (isHighlightBodyWithCBTermData == true) {
-
- var sppechBubbleHTML = "";
- }
- else {
- var sppechBubbleHTML = "";
- }
+ var os=$scope.getOS();
+ if(os=='MacOS')
+ {
+ if (isHighlightBodyWithCBTermData == true) {
+ var sppechBubbleHTML = "";
+ }
+ else
+ {
+ var sppechBubbleHTML = "";
+ }
+ }
+ else
+ {
+ if (isHighlightBodyWithCBTermData == true) {
+ var sppechBubbleHTML = "";
+ }
+ else
+ {
+ var sppechBubbleHTML = "";
+ }
+ }
+
+
//Issue #7286 :Undefined annotation should not appear
for (var i = 0; i <= $scope.MultiLanguageAnnationArray.length - 1; i++) {
@@ -5522,22 +5584,51 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
var Globe = [];
Globe.push({ currentX: x, currentY: y });
- document.getElementById('dot_'+windowviewid).style.display = 'block';
- document.getElementById('dot_'+windowviewid).style.left = ((Globe[0].currentX) - 5) + 'px';
+
+ //changing for mac os now
+ var os=$scope.getOS();
+ if(os=='MacOS')
+ {
+ document.getElementById('dot_'+windowviewid).style.display = 'block';
+ document.getElementById('dot_'+windowviewid).style.left = ((Globe[0].currentX) - 4) + 'px';
document.getElementById('dot_'+windowviewid).style.top = ((Globe[0].currentY) + 10.5) + 'px';
document.getElementById('bord_'+windowviewid).style.display = 'block';
- document.getElementById('bord_'+windowviewid).style.left = ((Globe[0].currentX) - 1) + 'px';
+ document.getElementById('bord_'+windowviewid).style.left = ((Globe[0].currentX) + 0.5) + 'px';
document.getElementById('bord_'+windowviewid).style.top = ((Globe[0].currentY) + 0) + 'px';
document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.display = 'block';
- document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.left = ((Globe[0].currentX) - 2) + 'px';
- document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.top = (Globe[0].currentY) + 'px';
+ document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.left = ((Globe[0].currentX) - 1) + 'px';
+ document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.top = ((Globe[0].currentY)+0) + 'px';
+ }
+ else
+ {
+ document.getElementById('dot_'+windowviewid).style.display = 'block';
+ document.getElementById('dot_'+windowviewid).style.left = ((Globe[0].currentX) - 4) + 'px';
+ document.getElementById('dot_'+windowviewid).style.top = ((Globe[0].currentY) + 11.5) + 'px';
+ document.getElementById('bord_'+windowviewid).style.display = 'block';
+ document.getElementById('bord_'+windowviewid).style.left = ((Globe[0].currentX) + 0.5) + 'px';
+ document.getElementById('bord_'+windowviewid).style.top = ((Globe[0].currentY) + 1) + 'px';
+
+ document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.display = 'block';
+ document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.left = ((Globe[0].currentX) - 1) + 'px';
+ document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.top = ((Globe[0].currentY)-1) + 'px';
+
+ }
}
$scope.createSpeechBubbleBasedOnTransparencyWithCtrl = function (pointClicked_annotation, Exists_annotation, x, y, sub_id_annotation, windowviewid, TPspeechBubbleCounter) {
- var sppechBubbleHTML_annotation = "";
- if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
+ var os=$scope.getOS();
+ if(os=='MacOS')
+ {
+ var sppechBubbleHTML_annotation = "";
+ }
+ else
+ {
+ var sppechBubbleHTML_annotation = "";
+ }
+
+ if ($scope.longest_annotationT1.length > $scope.longest_annotationT2.length) {
if (Exists_annotation == 0) {
$('#canvasDivDA_' + windowviewid).append(sppechBubbleHTML_annotation);
for (var l = 0; l <= $scope.annotationTextArrayT1.length - 1; l++) {
@@ -5638,15 +5729,34 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
}
var Globe = [];
Globe.push({ currentX: x, currentY: y });
- document.getElementById('dot_annotation_'+windowviewid).style.display = 'block';
- document.getElementById('dot_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 5) + 'px';
- document.getElementById('dot_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 10.5) + 'px';
- document.getElementById('bord_annotation_'+windowviewid).style.display = 'block';
- document.getElementById('bord_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 1) + 'px';
- document.getElementById('bord_annotation_'+windowviewid).style.top = ((Globe[0].currentY)) + 'px';
- document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.display = 'block';
- document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.left = (Globe[0].currentX-2) + 'px';
- document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.top = (Globe[0].currentY) + 'px';
+ //changing for mac os now
+ var os=$scope.getOS();
+ if(os=='MacOS')
+ {
+ document.getElementById('dot_annotation_'+windowviewid).style.display = 'block';
+ document.getElementById('dot_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 4) + 'px';
+ document.getElementById('dot_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 10.5) + 'px';
+ document.getElementById('bord_annotation_'+windowviewid).style.display = 'block';
+ document.getElementById('bord_annotation_'+windowviewid).style.left = ((Globe[0].currentX) + 0.5) + 'px';
+ document.getElementById('bord_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 0) + 'px';
+ document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.display = 'block';
+ document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.left = (Globe[0].currentX - 1) + 'px';
+ document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.top = ((Globe[0].currentY) + 0) + 'px';
+
+ }
+ else
+ {
+ document.getElementById('dot_annotation_'+windowviewid).style.display = 'block';
+ document.getElementById('dot_annotation_'+windowviewid).style.left = ((Globe[0].currentX) - 4) + 'px';
+ document.getElementById('dot_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 11.5) + 'px';
+ document.getElementById('bord_annotation_'+windowviewid).style.display = 'block';
+ document.getElementById('bord_annotation_'+windowviewid).style.left = ((Globe[0].currentX) + 0.5) + 'px';
+ document.getElementById('bord_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 1) + 'px';
+ document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.display = 'block';
+ document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.left = (Globe[0].currentX - 1) + 'px';
+ document.getElementById('sppeachBubble_annotation_' + windowviewid + '-' + termNumber).style.top = ((Globe[0].currentY) - 1) + 'px';
+ }
+
}
@@ -6147,6 +6257,7 @@ 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');
@@ -6436,7 +6547,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
$(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid, 'UIWrapperZIndex'));
-
+ $(".ui-wrapper").css("left",$scope.startX-2+ 'px');
}
if ($scope.TransparencyBoxStartX <= bodyRegionRight && value.X <= transparencyBoxRight && $scope.TransparencyBoxStartY <= bodyRegionBottom && value.Y <= transparencyBoxBottom) {
@@ -7629,13 +7740,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var mousePos = $scope.getMousePos(evt.pageX,evt.pageY,windowviewid);
var canvasDiv = document.getElementById("canvasDivDA_" + windowviewid);
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+ //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;
+ }
//We substracted 135, as the difference between flex and html coordinates for same organ is 135
- var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
- var actualY = mousePos.y + Math.round(verticalScrollPosition)-1;
+ var actulalX = mousePos.x + horizontlScrollPosition;
+ var actualY = mousePos.y + verticalScrollPosition;
var clickedBodyRegion;
var x;
var y;
@@ -7811,8 +7932,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var tCanvasTotalHeight = parseInt(tCanvasTopAftrSplit[0]) + parseInt(tCanvasHeightAftrSplit[0]);
var mousePos = $scope.getMousePos(evt.pageX,evt.pageY,windowviewid);
var canvasDiv = document.getElementById('canvasDivDA_'+windowviewid);
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+ //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 actulalX = mousePos.x + horizontlScrollPosition;
var actualY = mousePos.y + verticalScrollPosition;
@@ -7891,8 +8022,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
var windowviewid = (evt.target.id).split("_")[len-1];
var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+ //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 distanceXOnMirrorImage = (parseInt(mirrorCanvasX) + parseInt(mirrorCanvasWidth)) - (parseInt(mousePos.x) + horizontlScrollPosition);// - 135);
@@ -7953,8 +8094,18 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
$scope.SetwindowStoreData(windowviewid, 'multiAnnotationIsON', false);
}
var canvasDiv = document.getElementById('canvasDivDA_' + windowviewid);
- var verticalScrollPosition = canvasDiv.scrollTop;
- var horizontlScrollPosition = canvasDiv.scrollLeft;
+ //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($scope.TBoxTermNumber),
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index f626657..1b05ec6 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -1089,7 +1089,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
//added by birendra direct open CA module
if(paramInfo[0].toLowerCase() == 'mtype')
{
- $rootScope.siteUrlInfo.mtype = paramInfo[1];
+ // $rootScope.siteUrlInfo.mtype = paramInfo[1];
console.log("$rootScope.siteUrlInfo.mtype" + $rootScope.siteUrlInfo.mtype);
}
else if (paramInfo[0].toLowerCase() == 'id') {
@@ -1161,32 +1161,32 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
}
}
if (isCalsCredantialForSIte == "True") {
- if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.userId!=null && $rootScope.siteUrlInfo.accountNumber!=null)
- {
- AuthenticationService.ByPassLoginToOpenModule($rootScope.siteUrlInfo)
- .then(
- function (result) {
- if(result!=null)
- {
- $rootScope.userInfo.username = result.userId;
- $rootScope.userInfo.password = result.password;
- $rootScope.AuthenticateUser($rootScope.userInfo);
- }
-
- }),
- function (error) {
- console.log(' Error in bypass login = ' + error.statusText);
- $rootScope.errorMessage = error;
- $("#messageModal").modal('show');
- }
-
- }
- else
- {
- console.log(' invalid detail in bypass login');
- $rootScope.errorMessage = "authentication is not allowed due to invalid details format .\nPlease pass the correct details again!";
- $("#messageModal").modal('show');
- }
+ // if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.userId!=null && $rootScope.siteUrlInfo.accountNumber!=null)
+ // {
+ // AuthenticationService.ByPassLoginToOpenModule($rootScope.siteUrlInfo)
+ // .then(
+ // function (result) {
+ // if(result!=null)
+ // {
+ // $rootScope.userInfo.username = result.userId;
+ // $rootScope.userInfo.password = result.password;
+ // $rootScope.AuthenticateUser($rootScope.userInfo);
+ // }
+
+ // }),
+ // function (error) {
+ // console.log(' Error in bypass login = ' + error.statusText);
+ // $rootScope.errorMessage = error;
+ // $("#messageModal").modal('show');
+ // }
+
+ // }
+ // else
+ // {
+ // console.log(' invalid detail in bypass login');
+ // $rootScope.errorMessage = "authentication is not allowed due to invalid details format .\nPlease pass the correct details again!";
+ // $("#messageModal").modal('show');
+ // }
}
else {