ADAM / AIAHTML5

Commit 82152947412f340af19b7e6604fed5150bf34616

Authored by Nikita Kulshreshtha
1 parent b9d84339

merged FlexAnatomyTest+SiteUrlToFlex

Inline Side-by-side
Showing 2 changed files with 4 additions and 3 deletions
400-SOURCECODE/AIAHTML5.API/Models/Users.cs
  View file @8215294
@@ -535,9 +535,9 @@ namespace AIAHTML5.API.Models @@ -535,9 +535,9 @@ namespace AIAHTML5.API.Models
535 535
536 intLicenseId = Convert.ToInt32(licRow["Id"]); 536 intLicenseId = Convert.ToInt32(licRow["Id"]);
537 537
538 - User user = AIAHTML5.API.Models.DBModel.GetUserDetailsByEmailId(userInfo.EmailId);  
539 - userInfo.LoginId = user.LoginId;  
540 - userInfo.Password = user.Password; 538 + //User user = AIAHTML5.API.Models.DBModel.GetUserDetailsByEmailId(userInfo.EmailId);
  539 + //userInfo.LoginId = user.LoginId;
  540 + //userInfo.Password = user.Password;
541 541
542 DataTable dtblEditionForModesty = new DBModel().GetEditionsForModesty(userInfo.LicenseId, 0); 542 DataTable dtblEditionForModesty = new DBModel().GetEditionsForModesty(userInfo.LicenseId, 0);
543 //This table result set should return always have 0 or 1 record if modesty mode is present. 543 //This table result set should return always have 0 or 1 record if modesty mode is present.
400-SOURCECODE/AIAHTML5.Web/app/controllers/AnatTestController.js
  View file @8215294
@@ -11,6 +11,7 @@ function ($scope, $rootScope, pages, log, $location) { @@ -11,6 +11,7 @@ function ($scope, $rootScope, pages, log, $location) {
11 $("html,body").scrollTop(0); 11 $("html,body").scrollTop(0);
12 //alert("scroll"); 12 //alert("scroll");
13 } 13 }
  14 + //open flex
14 $scope.openAIAFlexAnatomyTest = function () { 15 $scope.openAIAFlexAnatomyTest = function () {
15 var userInfo; 16 var userInfo;
16 var encryptedUserName; 17 var encryptedUserName;