diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetBlockedUserByAccNoAndType.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetBlockedUserByAccNoAndType.sql new file mode 100644 index 0000000..a76c582 --- /dev/null +++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetBlockedUserByAccNoAndType.sql @@ -0,0 +1,39 @@ + +-- ============================================= +-- Author: Magic Software +-- Create date: 12-May-2009 +-- Description: To get the list of blocked user who have attempt 5 times wrong login +-- ============================================= +CREATE PROCEDURE [dbo].[GetBlockedUserByAccNoAndType] + -- Add the parameters for the stored procedure here + @iUserTypeId tinyint, @iLicenseId int +AS +BEGIN + -- returns the metadata + IF 1=0 BEGIN + SET FMTONLY OFF + END + SELECT DISTINCT + AIAUser.Id, + AIAUser.FirstName, + AIAUser.LastName, + AIAUser.LoginId, + AIAUser.Password, + AIAUser.EmailId, + ISNULL(License.AccountNumber,'') AccountNumber, + IncorrectLoginAttempts.LoginTime + FROM + IncorrectLoginAttempts + INNER JOIN AIAUser ON IncorrectLoginAttempts.UserId = AIAUser.Id + INNER JOIN UserType ON AIAUser.UserTypeId = UserType.Id + LEFT JOIN AIAUserToLicenseEdition ON AIAUser.Id = AIAUserToLicenseEdition.UserId + LEFT JOIN LicenseToEdition ON AIAUserToLicenseEdition.LicenseEditionId = LicenseToEdition.Id + LEFT JOIN License ON LicenseToEdition.LicenseId = License.Id + WHERE + IncorrectLoginAttempts.CntIncorrectLogins >= 5 + AND UserType.Priority >= (SELECT UserType.Priority FROM UserType WHERE UserType.Id=@iUserTypeId) + AND ((@iLicenseId =0) OR (License.Id = @iLicenseId)) + AND License.IsActive = 1 +END + + diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql index 0a8fc0a..c1acfbd 100644 --- a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql +++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.GetSearchUserList.sql diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_InsertAIAUser.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_InsertAIAUser.sql new file mode 100644 index 0000000..f06166c --- /dev/null +++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_InsertAIAUser.sql diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateAIAUser.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateAIAUser.sql new file mode 100644 index 0000000..52c1b70 --- /dev/null +++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateAIAUser.sql diff --git a/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateblockedUser.sql b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateblockedUser.sql new file mode 100644 index 0000000..2edab9f --- /dev/null +++ b/150-DOCUMENTATION/002-DBScripts/Admin/Store Procedure/dbo.usp_UpdateblockedUser.sql @@ -0,0 +1,53 @@ + +SET QUOTED_IDENTIFIER ON +GO +SET ANSI_NULLS ON +GO + +if exists (select * from dbo.sysobjects where id = object_id(N'[dbo].[usp_UpdateblockedUser]') and OBJECTPROPERTY(id, N'IsProcedure') = 1) +drop procedure [dbo].[usp_UpdateblockedUser] +GO + + +-- ============================================= +-- Author: +-- Create date: <3-Jan-2018> +-- Description: +-- ============================================= +CREATE PROCEDURE [dbo].[usp_UpdateblockedUser]--6,'aiaonline1','aiaonline',0 + -- Add the parameters for the stored procedure here + @Id int, + @Status int out +AS +BEGIN + -- SET NOCOUNT ON added to prevent extra result sets from + -- interfering with SELECT statements. + SET NOCOUNT ON; + + BEGIN TRY + + + + BEGIN TRANSACTION + DELETE from IncorrectLoginAttempts where UserId =@Id + set @Status = 1; + COMMIT TRANSACTION + --select '1' + + + + END TRY + BEGIN CATCH + IF @@TRANCOUNT > 0 + ROLLBACK TRANSACTION + END CATCH + +END + +GO +SET QUOTED_IDENTIFIER OFF +GO +SET ANSI_NULLS ON +GO + + diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index 1f0970c..e24c9ec 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -497,31 +497,31 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout //once you get id in scope push detail in jspanel content - var openViews; - if ($rootScope.openViews.length > 0) { - openViews = new jinqJs() - .from($rootScope.openViews) - .where("BodyViewId==" + $scope.voId) - .select(); - } + // var openViews; + //if ($rootScope.openViews.length > 0) { + // openViews = new jinqJs() + // .from($rootScope.openViews) + // .where("BodyViewId==" + $scope.voId) + // .select(); + //} var counter = 1; var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); + localStorage.setItem("currentViewTitle", tittle); + //if (openViews != null && openViews.length > 0) { + // angular.forEach(openViews, function (value, key) { - if (openViews != null && openViews.length > 0) { - angular.forEach(openViews, function (value, key) { + // if (value.body - views == tittle) { + // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; + // $rootScope.currentActiveViewTitle = tittle; + // localStorage.setItem("currentViewTitle", tittle); + // } - if (value.body - views == tittle) { - tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; - $rootScope.currentActiveViewTitle = tittle; - localStorage.setItem("currentViewTitle", tittle); - } - - }); - } - else { - localStorage.setItem("currentViewTitle", tittle); + // }); + //} + //else { + // localStorage.setItem("currentViewTitle", tittle); - } + //} //alert($rootScope.getLocalStorageValue("currentViewTitle")); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index 1a8e92f..a4be676 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -501,7 +501,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.openView = function ($event) { +<<<<<<< HEAD +======= + +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4 $rootScope.MenuModuleName = "CI"; $rootScope.disableAnnotationTB = false; $rootScope.CIAnotationIdentifyModeOff = true; @@ -523,7 +527,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout } +<<<<<<< HEAD +======= +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4 localStorage.setItem("currentViewTitleFromJson", $rootScope.ViewTitle); localStorage.setItem("currentBodyViewId", $event.currentTarget.id); @@ -539,7 +546,10 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $scope.openBodyView = function () { +<<<<<<< HEAD +======= +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4 if ($rootScope.refreshcheck == null) { $location.path('/'); } @@ -548,6 +558,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $('#spinner').css('visibility', 'visible'); $scope.voId = $rootScope.getLocalStorageValue("currentBodyViewId"); +<<<<<<< HEAD // alert($scope.voId); @@ -578,6 +589,50 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout localStorage.setItem("currentViewTitle", tittle); } +======= + + //once you get id in scope push detail in jspanel content + + // var openViews; + // console.log($rootScope.openViews); + // if ($rootScope.openViews.length > 0 && $rootScope.openViews != null && $rootScope.openViews != undefined) { + // alert("entered"); + //for (var i=0; i <= $rootScope.openViews.length - 1; i++) { + // if ($rootScope.openViews[i].BodyViewId == $scope.voId) { + // alert("success"); + // openViews = $rootScope.openViews; + // } + //} + // openViews = $rootScope.openViews; + + + //alert($rootScope.openViews); + //openViews = new jinqJs() + // .from($rootScope.openViews) + // .where("BodyViewId==" + $scope.voId) + // .select(); + //} + + var counter = 1; + var tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson"); + localStorage.setItem("currentViewTitle", tittle); + //if (openViews != null && openViews.length > 0 && openViews != undefined) { + // // alert("aaa"); + // console.log(openViews); + // angular.forEach(openViews, function (value, key) { + // if (value.body - views == tittle) { + // tittle = $rootScope.getLocalStorageValue("currentViewTitleFromJson") + counter++; + // $rootScope.currentActiveViewTitle = tittle; + // localStorage.setItem("currentViewTitle", tittle); + // } + + // }); + //} + //else { + // localStorage.setItem("currentViewTitle", tittle); + + //} +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4 //alert($rootScope.getLocalStorageValue("currentViewTitle")); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js index 0e7877a..005d5a9 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/LinkController.js @@ -29,22 +29,40 @@ function ($scope, $rootScope, log, $location, pages, $routeParams) { for (var i = 0; i < $scope.links.length; i++) { if ($scope.links[i].modname == $routeParams.modname) { $rootScope.currentActiveModuleTitle = $scope.links[i].title; - if ($rootScope.currentActiveModuleTitle == "IP 10" || $rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") + if ($rootScope.currentActiveModuleTitle == "IP 10" ) { // document.getElementById('externalLink').style.height = "1024px"; - if ($uaAOD.match(/(iPod|iPhone|iPad|android)/i)) { - document.getElementById('externalLink').style.height = 2048 + "px"; - } - else { - document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px"; - } + document.getElementById('externalLink').style.height = $(window).outerHeight() - 41 + "px"; } $scope.objdata = $scope.links[i].objurl; - $scope.myObj = $scope.links[i].objstyle; - } + $scope.myObj = $scope.links[i].objstyle; + if ($('#externalLink').css('display') === 'none') + { + document.getElementById('externalLink').style.display = "block"; + document.getElementById('externalLinkiframe').style.display = "none"; + + } + + if ($rootScope.currentActiveModuleTitle == "A.D.A.M OnDemand") { + if ($uaAOD.match(/(iPod|iPhone|iPad)/i)) + { + document.getElementById('externalLink').style.display = "none"; + document.getElementById('externalLinkiframe').style.display = "block"; + document.getElementById('externalLinkiframe').style.height = $(window).outerHeight() - 128 + "px"; + document.getElementById("externalLinkiframe").src = $scope.objdata; + + } + + else { + document.getElementById('externalLink').style.height = $(window).outerHeight() - 128 + "px"; + + } + + } + } } }); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 586018d..ca52501 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -1292,7 +1292,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou }); $rootScope.loadSearchData = function () { - + //$("#termList").find("option").css({ "background-color": "#ffffff", "color": "#000000" }); var imageId = $rootScope.imageId; var promise = ModuleService.getTermTextDataForAAImage(imageId) @@ -1361,6 +1361,8 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou console.log(' error: ' + error.statusText); } ) + + } @@ -1667,6 +1669,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $rootScope.isshowAllPinsBtnAfterHideClicked = true; $scope.showItemsForSearch = function () { + if($rootScope.isshowAllPinsBtnAfterHideClicked == true){ console.log('showItemsForSearch is called'); //this check is for log only because we are writing length so need to check if its not null or undefined @@ -1677,6 +1680,15 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou $scope.IsSearchVisible = true; document.getElementById("termlistfilter").style.display = "block"; + + $("#backdrop > #searchListDivAA > #termlistfilter > li").each(function (key, value) { + + if ($(this).find("a").html() == document.getElementById("selectedTermName").value) { + $("#termlistfilter li a").css({ "background-color": "#ffffff", "color": "#000000" }); + $(this).find("a").css({ "background-color": "#3399FF", "color": "#ffffff" }); + } + }); + } else { $rootScope.loadSearchData(); @@ -1711,6 +1723,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou } $scope.highlightPinBasedOnSerachItem = function (id) { + $scope.searchItemId = id; $scope.searchItemText = $("#" + id).text(); $rootScope.searchSelectedText = $("#" + id).text(); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html index 0329f61..0bf33d3 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/Link/Link-view.html @@ -4,6 +4,12 @@
+<<<<<<< HEAD +======= + + + +>>>>>>> ff2e54b01b493c73a29a72bdc4e069475d6e53c4
diff --git a/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css b/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css index df15b65..6c845de 100644 --- a/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css +++ b/400-SOURCECODE/Admin/dist/assets/styles/admin-custom.css @@ -130,12 +130,12 @@ background: #0095da; color: #fff; } -#tblDiscountCodes > tbody > tr.active > td { +#tblDiscountCodes, #fixed_hdr2 > tbody > tr.active > td { background: #000; color: #FDFBFB; } -#tblDiscountCodes > tbody > tr.inactive > td { +#tblDiscountCodes, #fixed_hdr2 > tbody > tr.inactive > td { background: #FDFBFB; color: #000; } diff --git a/400-SOURCECODE/Admin/dist/assets/styles/angular-custom.css b/400-SOURCECODE/Admin/dist/assets/styles/angular-custom.css index 475201d..f92c62c 100644 --- a/400-SOURCECODE/Admin/dist/assets/styles/angular-custom.css +++ b/400-SOURCECODE/Admin/dist/assets/styles/angular-custom.css @@ -1,4 +1,4 @@ -.form-control[required][disabled] { background: #eeeeee; border-color:#ccc ;} +.form-control[required][disabled] { background: #eeeeee; border-color:#ccc ;} .edisabled span{ background: #eeeeee; border-color: #ccc; @@ -75,7 +75,7 @@ cursor-pointer { } .alert-header-custom { - background-color: #5d8fc2 !important; + /* background-color: #5d8fc2 !important; */ padding: 8px !important; color: white; } @@ -102,7 +102,7 @@ cursor-pointer { button.alert-closebutton { padding: 0; cursor: pointer; - background: transparent; + background: #291b1b00; border: 0; -webkit-appearance: none; } @@ -297,3 +297,6 @@ ng-select ul li.highlighted span{ background-color:#2196F3; } + + +