update more to open direct link

Birendra
1 parent 3c2a12a8
Showing 10 changed files with 191 additions and 57 deletions
400-SOURCECODE/AIAHTML5.API/Constants/DBConstants.cs
400-SOURCECODE/AIAHTML5.API/Controllers/AuthenticateController.cs
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
400-SOURCECODE/AIAHTML5.Web/app/services/AuthenticationService.js
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -40,5 +40,6 @@ namespace AIAHTML5.API.Constants
         public const string GET_MODESTY_FOR_THIS_LICENSE = "usp_GetModestyForThisLicense";
         public const string GET_COUNT_EXPORTED_IMAGE = "usp_GetCountExportedImage";
         public const string INSERT_EXPORTED_IMAGE = "usp_InsertExportedImage";
+        public const string GET_USER_DETAIL_BYLOGIN_AND_ACCOUNT = "usp_GetUserDetailsByLoginIdandAccount";
     }
 }
 \ No newline at end of file
@@ -471,6 +471,35 @@ namespace AIAHTML5.API.Controllers
                 return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
             }
         }
+
+        [HttpPost]
+        [Route("api/ByPassLoginToOpenModule")]
+        public HttpResponseMessage ByPassLoginToOpenModule([FromBody]JObject sitedetail)
+        {
+            dynamic responseData;
+           
+            try
+            {
+                string loginId = sitedetail.GetValue("userId").ToString();
+                string accountNumber = sitedetail.GetValue("accountNumber").ToString();
+
+                responseData = AIAHTML5.API.Models.Users.ByPassLoginDetail(loginId, accountNumber);
+            
+                if (responseData !=null)
+                {
+                    return new HttpResponseMessage { StatusCode = HttpStatusCode.OK, Content = new StringContent(responseData) };
+                }
+                else
+                {
+                    return new HttpResponseMessage { StatusCode = HttpStatusCode.BadRequest, Content = new StringContent(AIAConstants.USER_NOT_FOUND) };
+                }
+            }
+            catch (Exception ex)
+            {
+                // Log exception code goes here  
+                return Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.Message);
+            }
+        }
         // PUT api/authenticate/5
         public void Put(int id, [FromBody]string value)
         {
@@ -481,4 +510,6 @@ namespace AIAHTML5.API.Controllers
         {
         }
     }
+
+    
 }
 \ No newline at end of file
@@ -310,6 +310,44 @@ namespace AIAHTML5.API.Models
             return objUser;
         }
+        internal static User ByPassLoginDetail(string loginId, string accountNumber)
+        {
+            User objUser = null;
+            DBModel objModel = new DBModel();
+
+            SqlConnection conn = new SqlConnection(dbConnectionString);
+            SqlCommand cmd = new SqlCommand();
+            SqlDataAdapter adapter;
+            DataSet ds = new DataSet();
+
+            cmd.Connection = conn;
+            cmd.CommandText = DBConstants.GET_USER_DETAIL_BYLOGIN_AND_ACCOUNT;
+            cmd.CommandType = CommandType.StoredProcedure;
+            cmd.Parameters.AddWithValue("@LoginId", loginId);
+            cmd.Parameters.AddWithValue("@AccountNumber", accountNumber);
+            
+            adapter = new SqlDataAdapter(cmd);
+            adapter.Fill(ds);
+
+            if (ds != null && ds.Tables.Count > 0)
+            {
+                DataTable dt = ds.Tables[0];
+
+                if (dt.Rows.Count > 0)
+                {
+                    foreach (DataRow dr in dt.Rows)
+                    {
+                        objUser = new User();
+                        objUser.LoginId = dr["LoginId"].ToString();
+                        objUser.Password = dr["Password"].ToString();
+                       
+                    }
+                }
+            }
+
+            return objUser;
+        }
+
         internal  User GetSelectedSettings(int userId)
         {
             logger.Debug(" Inside GetSelectedSettings for userId = " + userId);
@@ -307,6 +307,12 @@ namespace AIAHTML5.API.Models
             return result;
         }
+        internal static dynamic ByPassLoginDetail(string loginId, string accountNumber)
+        {         
+            dynamic objUser = DBModel.ByPassLoginDetail(loginId, accountNumber);
+         
+            return objUser;          
+        }
         internal static int SaveUserSelectedSettings(User selectedSettings)
         {
@@ -323,10 +323,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
             var imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
-            var $el = $('<div id="' + value._id + '"  class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
-                + '<div class="thumbnail" >'
+            var $el = $('<div id="' + value._id + '"  class="col-sm-3 col-md-2" title = "'+ value._Title + '" data-ng-click="openView($event)">'
+                + '<div class="thumbnail" ><a href="#">'
                            + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + imagePath + '" alt="" title="" >'
-                           + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
+                           + '<div class="caption"><p>'+'('+ value._id+')</p><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
             $compile($el)($scope);
@@ -349,10 +349,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
         $timeout(function () { $scope.EnableUI();
             //open default animation
-            if($rootScope.siteUrlInfo.mtype!=null)
+            if($rootScope.siteUrlInfo.mtype!=null && $rootScope.siteUrlInfo.id!=null)
             {
-                if($rootScope.siteUrlInfo.mtype=='CA'&& $rootScope.siteUrlInfo.id!=null)
-                $('#'+$rootScope.siteUrlInfo.id).trigger('click');
+                if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca' && $rootScope.siteUrlInfo.id!="")
+                {
+                    $('#'+$rootScope.siteUrlInfo.id).trigger('click');
+                    //$('div[title="'+$rootScope.siteUrlInfo.title+'"]').trigger('click');
+                }
+                           
                 // clear detail
                 $rootScope.siteUrlInfo.mtype=null;
                 $rootScope.siteUrlInfo.id=null;
@@ -548,9 +552,9 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
                     $scope.imagePath = "~/../content/images/ca/thumbnails/" + value._ThumbnailImage;
                     var $el = $('<div id="' + value._id + '"  class="col-sm-3 col-md-2" title = "' + value._Title + '" data-ng-click="openView($event)">'
-                                + '<div class="thumbnail" >'
+                                + '<div class="thumbnail" ><a href="#">'
                                         + '<img id="' + value._Title + '" class="img-responsive" style="width:100%;height:100%;" ng-src="' + $scope.imagePath + '" alt="" title="" >'
-                                        + '<div class="caption"><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
+                                        + '<div class="caption"><p>'+'('+ value._id+')</p><p>' + value._Title + '</p></div></a></div></div>').appendTo('#grid-view');
                     $compile($el)($scope);
@@ -3062,8 +3062,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 //We substracted 135,  as the difference between flex and html coordinates for same organ is 135
-                var actulalX = mousePos.x + horizontlScrollPosition;
-                var actualY = mousePos.y + verticalScrollPosition;
+                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);
@@ -5001,7 +5001,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                                 for (var m = 0; m <=  $scope.speechbubbleList.length - 1; m++) {
                                     if ( $scope.speechbubbleList[m].ids == sub_id1) {
-                                        $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);
+                                        $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);
                                         break;
                                     }
                                 }
@@ -5090,7 +5090,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                             var verticalScrollPosition = canvasDiv.scrollTop;
                             var horizontlScrollPosition = canvasDiv.scrollLeft;
-                            $scope.angle(x-2, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, true,windid);
+                            $scope.angle(x-1, 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 +5173,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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,  $scope.speechbubbleList[m].yaxis, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, bor_id_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);
                                            break;
                                        }
                                    }
@@ -5270,7 +5270,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                         var canvasDiv = document.getElementById('canvasDivDA_' + windid);
                         var verticalScrollPosition = canvasDiv.scrollTop;
                         var horizontlScrollPosition = canvasDiv.scrollLeft;
-                        $scope.angle(x-2, y, evt.pageX + horizontlScrollPosition - $('#canvasDivDA_' + windid).offset().left, evt.pageY + verticalScrollPosition - $('#canvasDivDA_' + windid).offset().top, false,windid);
+                        $scope.angle(x-1, 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
@@ -5436,10 +5436,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             var isHighlightBodyWithCBTermData=$scope.GetwindowStoreData(windowviewid,'isHighlightBodyWithCBTermData');
             if (isHighlightBodyWithCBTermData == true) {
-                var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com_" + windowviewid+"'><div class='multiLineAnnotation' style='z-index:60000; left:" + (x - 6) + "px;top:" + (y + 11) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (tipx-4) + "px;top:" + tipy + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter+"_" + windowviewid+ "'></div></div>";
+                var sppechBubbleHTML = "<div id ='" + pointClicked + "' class='com_" + windowviewid+"'><div class='multiLineAnnotation' style='z-index:60000; left:" + (x - 5) + "px;top:" + (y + 10.5) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (tipx-4) + "px;top:" + tipy + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter+"_" + windowviewid+ "'></div></div>";
             }
             else {
-                var sppechBubbleHTML = "<div id ='" + pointClicked +"' class='com_" + windowviewid+"'><div class='multiLineAnnotation' style=' z-index:60000; left:" + (x - 6) + "px;top:" + (y + 11) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (x-4) + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter +"_" + windowviewid+ "'></div></div>";
+                var sppechBubbleHTML = "<div id ='" + pointClicked +"' class='com_" + windowviewid+"'><div class='multiLineAnnotation' style=' z-index:60000; left:" + (x - 5) + "px;top:" + (y + 10.5) + "px;'' id='bubble" + speechBubbleCounter +"_" + windowviewid+ "'></div><div data=" + speechBubbleCounter + " id=" + id + " class='appendDragg' style='z-index:60000;margin-left:25px;border:1px solid #000;padding:5px 10px;position:absolute;color:#fff;text-align:left;font-size: 12px;font-weight:bold;background-color:#19100e;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;-o-border-radius:5px;-ms-border-radius:5px;font-weight:bold;left:" + (x-4) + "px;top:" + y + "px;'><div style='z-index:7000;position:absolute;right:-3px;top:-4px;color:#ffffff;cursor:pointer;'><img id=" + speechBubbleCounter + " class='dynCross_" + windowviewid+"' style='width:18px' src=" + $rootScope.path + "></div></div><div style='position:absolute;border:1px solid #000;display:none;z-index:9000;' id='bord" + speechBubbleCounter +"_" + windowviewid+ "'></div></div>";
             }
             //Issue #7286 :Undefined annotation should not appear
@@ -5523,10 +5523,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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) - 6) + 'px';
-            document.getElementById('dot_'+windowviewid).style.top = ((Globe[0].currentY) + 10) + 'px';
+            document.getElementById('dot_'+windowviewid).style.left = ((Globe[0].currentX) - 5) + '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) - 2) + 'px';
+            document.getElementById('bord_'+windowviewid).style.left = ((Globe[0].currentX) - 1) + 'px';
             document.getElementById('bord_'+windowviewid).style.top = ((Globe[0].currentY) + 0) + 'px';
             document.getElementById('sppeachBubble_' + windowviewid + '-' + termNumber).style.display = 'block';
@@ -5639,10 +5639,10 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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) - 6) + 'px';
-            document.getElementById('dot_annotation_'+windowviewid).style.top = ((Globe[0].currentY) + 10) + 'px';
+            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) - 2) + 'px';
+            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';
@@ -6139,11 +6139,13 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
                 $scope.transparencyCanvasHeight = transparencyCanvas.height;
                 $scope.transparencyCanvasWidth = transparencyCanvas.width;
+                
                 //bind click listener
                 transparencyCanvas.addEventListener('click', TransparencyCanvasClickListener);
                 $(".ui-wrapper").css("z-index", $scope.GetwindowStoreData(windowviewid, 'UIWrapperZIndex'));
+                $(".ui-wrapper").css("left",TransparencyBoxStartX-2+ 'px');
             }
@@ -7632,8 +7634,8 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
             //We substracted 135,  as the difference between flex and html coordinates for same organ is 135
-            var actulalX = mousePos.x + horizontlScrollPosition;
-            var actualY = mousePos.y + verticalScrollPosition;
+            var actulalX = mousePos.x + Math.round(horizontlScrollPosition)-1;
+            var actualY = mousePos.y + Math.round(verticalScrollPosition)-1;
             var clickedBodyRegion;
             var x;
             var y;
@@ -639,6 +639,20 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
         $('#login').css('visibility', 'visible');
         $rootScope.checkRefreshButtonClick = 1;
+
+        $rootScope.siteUrlInfo = {
+            siteIP: null,
+            remoteIPAddress: null,
+            status: null,
+            accountNumber: null,
+            edition: null,
+            urlReferer: null,
+            calsCreds: null,
+            userId: null,
+            password: null,
+            mtype:null,
+            id:null
+        }
         if (params != null && params != undefined && params != "") {
@@ -906,8 +920,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                      $timeout(function () {
                                         if($rootScope.siteUrlInfo.mtype!=null)
                                         {
-                                            if($rootScope.siteUrlInfo.mtype=='CA')
-                                            $('#clinical-animations').trigger('click');
+                                           //currently open CA
+                                           $scope.RedirectToModule();
                                         }                                     
                                     }, 100);   
@@ -1006,11 +1020,9 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                                              else {
                                                  $location.path('/');
                                                  $timeout(function () {
-                                                    if($rootScope.siteUrlInfo.mtype!=null)
-                                                    {
-                                                        if($rootScope.siteUrlInfo.mtype=='CA')
-                                                        $('#clinical-animations').trigger('click');
-                                                    }                                     
+                                                     //currently open CA
+                                                     $scope.RedirectToModule();
+                                   
                                                 }, 100); 
                                              }
                                          }
@@ -1051,21 +1063,17 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
     }
+    $scope.RedirectToModule = function () {
+        
+        if($rootScope.siteUrlInfo.mtype!=null)
+        {
+            if($rootScope.siteUrlInfo.mtype.toLowerCase()=='ca')
+            $('#clinical-animations').trigger('click');
+        }  
+    }
     $scope.ValidateClientSiteUrl = function () {
-        $rootScope.siteUrlInfo = {
-            siteIP: null,
-            remoteIPAddress: null,
-            status: null,
-            accountNumber: null,
-            edition: null,
-            urlReferer: null,
-            calsCreds: null,
-            userId: null,
-            password: null,
-            mtype:null,
-            id:null
-        }
+        
         $rootScope.isCallFromSite = true;
         var siteInfo = params.split('&');
@@ -1091,13 +1099,13 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 }
                 else if (paramInfo[0].toLowerCase() == 'username') {
-                    $rootScope.siteUrlInfo.username = paramInfo[1];
-                    console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.username);
+                    $rootScope.siteUrlInfo.userId = paramInfo[1];
+                    console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.userId);
                 }
-                else if (paramInfo[0].toLowerCase() == 'password') {
+                else if (paramInfo[0].toLowerCase() == 'account') {
-                    $rootScope.siteUrlInfo.password = paramInfo[1];
-                   // console.log("$rootScope.siteUrlInfo.password" + $rootScope.siteUrlInfo.password);
+                    $rootScope.siteUrlInfo.accountNumber = paramInfo[1];
+                    console.log("$rootScope.siteUrlInfo.accountNumber" + $rootScope.siteUrlInfo.accountNumber);
                 }
@@ -1117,8 +1125,8 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                     //     console.log("$rootScope.siteUrlInfo.password " + $rootScope.siteUrlInfo.password);
                     // }
-                $rootScope.userInfo.username = $rootScope.siteUrlInfo.username;
-                $rootScope.userInfo.password = $rootScope.siteUrlInfo.password;
+                //$rootScope.userInfo.username = $rootScope.siteUrlInfo.userId;
+                //$rootScope.userInfo.password = $rootScope.siteUrlInfo.password;
             }
             else {
@@ -1141,7 +1149,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
                 else if (paramInfo[0] == 'urlReferer') {
                     $rootScope.siteUrlInfo.urlReferer = paramInfo[1];
-                    console.log("$rootScope.siteUrlInfo.siteIP" + $rootScope.siteUrlInfo.siteIP);
+                    console.log("$rootScope.siteUrlInfo.urlReferer" + $rootScope.siteUrlInfo.urlReferer);
                 }
                 else if (paramInfo[0] == 'remoteIPAddress') {
@@ -1153,11 +1161,36 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
             }
         }
         if (isCalsCredantialForSIte == "True") {
-            $rootScope.AuthenticateUser($rootScope.userInfo);
+            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 {
-
             console.log($rootScope.siteUrlInfo);
             AuthenticationService.validateClientSite($rootScope.siteUrlInfo)
@@ -42,7 +42,26 @@
             });
             return deferred.promise;
         },
+        ByPassLoginToOpenModule: function (urlDetail) {
+            var deferred = $q.defer();
+            $http.post('/API/api/ByPassLoginToOpenModule', JSON.stringify(urlDetail), {
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            })
+            .success(function (data, status, headers, config) {
+                console.log('success')
+                deferred.resolve(data);
+            }).error(function (data, status, headers, config) {
+                console.log('error')
+                deferred.reject(data);
+                $rootScope.errorMessage = data;
+                $("#messageModal").modal('show');
+
+            });
+            return deferred.promise;
+        },
         saveSetings: function (settings) {
             var deferred = $q.defer();
@@ -72,7 +72,7 @@
                         <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody">
                             <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData">
                                 <td width="25%">
-                                    {{item._Title}}
+                                    ({{item._id}}) {{item._Title}}
                                 </td>
                                 <td width="25%">
                                     {{item._BodyRegion}}
@@ -88,7 +88,7 @@
                         <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody">
                             <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData">
                                 <td width="25%">
-                                    {{item._Title}}
+                                    ({{item._id}}) {{item._Title}}
                                 </td>
                                 <td width="25%">
                                     {{item._BodyRegion}}
@@ -264,7 +264,7 @@
                             <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
                         </button>
-                        <div class="dropdown-menu" id="navigatorDiv" style="min-height: initial; min-width: initial; ">
+                        <div class="dropdown-menu" id="navigatorDiv" style="min-height: initial; min-width: initial;left:-12px; ">
                             <div id="navDiv" align="center" style="min-width: initial; height: 119px; ">
                                 <img id="navimg" alt="" />
                                 <div id="draggable" class="draggable ui-widget-content dragdivposition draggable_navigator" ng-mouseup="ScrollCanvasDiv($event)">