diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
index 9d5ad30..23cd867 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -329,13 +329,14 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
+ '').appendTo('#grid-view');
$compile($el)($scope);
-
+
$(".sidebar").mCustomScrollbar({
autoHideScrollbar: true,
//theme:"rounded"
});
- });
+ });
+
$('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail');
$timeout(function () {
if ($rootScope.getLocalStorageValue('CAGridViewScroll') !== null && $location.url() == "/clinical-animations") {
@@ -346,7 +347,18 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout
200);
- $timeout(function () { $scope.EnableUI(); }, 400);
+ $timeout(function () { $scope.EnableUI();
+ //open default animation
+ if($rootScope.siteUrlInfo.mtype!=null)
+ {
+ if($rootScope.siteUrlInfo.mtype=='CA'&& $rootScope.siteUrlInfo.id!=null)
+ $('#'+$rootScope.siteUrlInfo.id).trigger('click');
+ // clear detail
+ $rootScope.siteUrlInfo.mtype=null;
+ $rootScope.siteUrlInfo.id=null;
+ }
+
+ }, 400);
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index f36c56c..6e7da03 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -89,17 +89,6 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
licenseeAccountNumber: null
};
- $rootScope.siteUrlInfo = {
- siteIP: null,
- remoteIPAddress: null,
- status: null,
- accountNumber: null,
- edition: null,
- urlReferer: null,
- calsCreds: null,
- userId: null,
- password: null
- }
$rootScope.userData;
$rootScope.userModules;
$rootScope.passwordMismatchMessage;
@@ -913,6 +902,14 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$location.path('/');
+
+ $timeout(function () {
+ if($rootScope.siteUrlInfo.mtype!=null)
+ {
+ if($rootScope.siteUrlInfo.mtype=='CA')
+ $('#clinical-animations').trigger('click');
+ }
+ }, 100);
}
else
@@ -1008,6 +1005,13 @@ 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');
+ }
+ }, 100);
}
}
else {
@@ -1049,9 +1053,21 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
$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('&');
for (var i = 0; i < siteInfo.length; i++) {
@@ -1062,27 +1078,48 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
if (isCalsCredantialForSIte == "True") {
var paramInfo = siteInfo[i].split('=');
- if (paramInfo[0] == 'calsCredantial') {
-
- $rootScope.siteUrlInfo.calsCreds = paramInfo[1];
- console.log("$rootScope.siteUrlInfo.calsCreds" + $rootScope.siteUrlInfo.calsCreds);
+ //added by birendra direct open CA module
+ if(paramInfo[0].toLowerCase() == 'mtype')
+ {
+ $rootScope.siteUrlInfo.mtype = paramInfo[1];
+ console.log("$rootScope.siteUrlInfo.mtype" + $rootScope.siteUrlInfo.mtype);
}
- else if (paramInfo[0] == 'username') {
-
+ else if (paramInfo[0].toLowerCase() == 'id') {
+
+ $rootScope.siteUrlInfo.id = paramInfo[1];
+ console.log("$rootScope.siteUrlInfo.id" + $rootScope.siteUrlInfo.id);
+ }
+ else if (paramInfo[0].toLowerCase() == 'username') {
+
$rootScope.siteUrlInfo.username = paramInfo[1];
console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.username);
}
- else if (paramInfo[0] == 'password') {
-
+ else if (paramInfo[0].toLowerCase() == 'password') {
+
$rootScope.siteUrlInfo.password = paramInfo[1];
- console.log("$rootScope.siteUrlInfo.password " + $rootScope.siteUrlInfo.password);
+ // console.log("$rootScope.siteUrlInfo.password" + $rootScope.siteUrlInfo.password);
}
+
+
+ // if (paramInfo[0] == 'calsCredantial') {
+ // $rootScope.siteUrlInfo.calsCreds = paramInfo[1];
+ // console.log("$rootScope.siteUrlInfo.calsCreds" + $rootScope.siteUrlInfo.calsCreds);
+ // }
+ // else if (paramInfo[0] == 'username') {
+
+ // $rootScope.siteUrlInfo.username = paramInfo[1];
+ // console.log("$rootScope.siteUrlInfo.username" + $rootScope.siteUrlInfo.username);
+ // }
+ // else if (paramInfo[0] == 'password') {
+
+ // $rootScope.siteUrlInfo.password = paramInfo[1];
+ // console.log("$rootScope.siteUrlInfo.password " + $rootScope.siteUrlInfo.password);
+ // }
+
$rootScope.userInfo.username = $rootScope.siteUrlInfo.username;
$rootScope.userInfo.password = $rootScope.siteUrlInfo.password;
- console.log("$rootScope.userInfo.username" + $rootScope.userInfo.username + " $rootScope.userInfo.password" + $rootScope.userInfo.password);
-
-
+
}
else {
var paramInfo = siteInfo[i].split('=');
@@ -1320,12 +1357,7 @@ function ($rootScope, $scope, Modules, $log, $location, $compile, $timeout, Data
)
}
- //$rootScope.siteUrlInfo.siteIP = siteInfo[0];
- //$rootScope.siteUrlInfo.remoteIPAddress = siteInfo[1];
- //$rootScope.siteUrlInfo.accountNumber = siteInfo[2];
- //$rootScope.siteUrlInfo.edition = siteInfo[3];
- //$rootScope.siteUrlInfo.urlReferer = siteInfo[4];
-
+
}
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.aspx.cs b/400-SOURCECODE/AIAHTML5.Web/index.aspx.cs
index 4edd84d..bc098cb 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.aspx.cs
+++ b/400-SOURCECODE/AIAHTML5.Web/index.aspx.cs
@@ -36,8 +36,23 @@ namespace ADAM.AIA
}
}
- string c = "nm";
- if (Request.QueryString["account"] != null)
+ if (Request.QueryString["mtype"] != null)
+ {
+ //birendra
+ //open default CA module by query string
+ isCalsCredantial = true;
+
+ string[] allQueryData = new string[Request.QueryString.AllKeys.Length];
+
+ for(int i=0;i< Request.QueryString.AllKeys.Length; i++)
+ {
+ allQueryData[i] = Request.QueryString.AllKeys[i] + "=" + Request.QueryString[Request.QueryString.AllKeys[i]].ToString();
+ }
+ urlParams = string.Join("&", allQueryData);
+
+ //urlParams = "mtype=" + Request.QueryString[allQueryData[].ToString() + "&id=" + Request.QueryString["id"].ToString() + "&username=" + Request.QueryString["username"].ToString() + "&password=" + Request.QueryString["password"].ToString();
+ }
+ else if (Request.QueryString["account"] != null)
{
// http://stackoverflow.com/questions/9032005/request-servervariableshttp-referer-is-not-working-in-ie
// http://stackoverflow.com/questions/5643773/http-referrer-not-always-being-passed?rq=1