diff --git a/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs b/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs index 7128c81..1219f29 100644 --- a/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs +++ b/400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs @@ -328,8 +328,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.UPDATE_USER_PASSWORD; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@sLoginId", loginId); @@ -483,8 +483,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.UPDATE_LICENSE_TERM_STATUS; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@sAccountNumber", accountNumber); @@ -543,8 +543,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.INSERT_LOGIN_DETAIL; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@iUserId", userId); @@ -572,8 +572,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.INSERT_INCORRECT_LOGIN_ATTEMPTS; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@iUserId", userId); @@ -637,8 +637,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.UPDATE_INCORRECT_LOGIN_ATTEMPTS; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@iUserId", userId); @@ -665,8 +665,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.DELETE_INCORRECT_LOGIN_ATTEMPTS; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@iUserId", userId); @@ -724,8 +724,8 @@ namespace AIAHTML5.API.Models { conn = new SqlConnection(dbConnectionString); cmd = new SqlCommand(); - cmd.Connection = conn; conn.Open(); + cmd.Connection = conn; cmd.CommandText = DBConstants.INSERT_LOGIN_ERROR_LOG; cmd.CommandType = CommandType.StoredProcedure; cmd.Parameters.AddWithValue("@nvAccountNumber", accountNumber); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index eb1e6ac..57f2da5 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -290,6 +290,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } //to disbale layer change slider $('.ui-slider').slider('disable'); + document.getElementById('txtlayerNumber').style.pointerEvents = "none"; $scope.isLoading = true; $('#spinner').css('visibility', 'visible'); @@ -304,6 +305,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } //to enable layer change slider $('.ui-slider').slider('enable'); + document.getElementById('txtlayerNumber').style.pointerEvents = "auto"; $scope.isLoading = false; @@ -9525,33 +9527,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l } $scope.LayerChangeBasedOnKeyPressed = function (e) { - // Dissectible Anatomy > Should not display blank page if no layer is selected. - - - if (e.keyCode == 13) { - - if ($("#txtlayerNumber").val() == '') { - - $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr); - } - else { - $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val(); - $scope.LayerChange(); - } - - - } // 'x' button is displaying inside the input box in IE browser. if (e.keyCode == 38) { - var layerInputVal = $("#txtlayerNumber").val(); - if (layerInputVal != $rootScope.totalLayers) { + + if (layerInputVal < $rootScope.totalLayers) { + var layerInputValInc = parseInt(layerInputVal) + 1; $scope.layerNumber = parseInt(layerInputValInc); $("#txtlayerNumber").val($scope.layerNumber); $rootScope.PreviouslayerNumbr = $scope.layerNumber; + + } + else { + + $("#txtlayerNumber").val($rootScope.totalLayers); } @@ -9559,12 +9551,14 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l // 'x' button is displaying inside the input box in IE browser. if (e.keyCode == 40) { + var layerInputVal = $("#txtlayerNumber").val(); if (layerInputVal > 0) { var layerInputValDec = parseInt(layerInputVal) - 1; $scope.layerNumber = parseInt(layerInputValDec); $("#txtlayerNumber").val($scope.layerNumber); $rootScope.PreviouslayerNumbr = $scope.layerNumber; + } } @@ -9573,31 +9567,54 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l $scope.LayerValueChangeBasedOnKeyUp = function (e) { - var keyUplayerNumber = parseInt($("#txtlayerNumber").val()); - - if (isNaN(keyUplayerNumber)) - { - document.getElementById("txtlayerNumber").value = ""; - } - else { - - if (keyUplayerNumber > $rootScope.totalLayers) { + + if (e.keyCode == 13) { - $("#txtlayerNumber").val($rootScope.totalLayers); - $scope.layerNumber = parseInt($rootScope.totalLayers); + if ($("#txtlayerNumber").val() == '') { + $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr); } else { - $("#txtlayerNumber").val(keyUplayerNumber); - $scope.layerNumber = parseInt(keyUplayerNumber); + $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val(); + var keyUplayerNumber = parseInt($("#txtlayerNumber").val()); - } + if (isNaN(keyUplayerNumber)) { + document.getElementById("txtlayerNumber").value = ""; + } + else { - } + if (keyUplayerNumber > $rootScope.totalLayers) { + + $("#txtlayerNumber").val($rootScope.totalLayers); + $scope.layerNumber = parseInt($rootScope.totalLayers); + } + else { + $("#txtlayerNumber").val(keyUplayerNumber); + $scope.layerNumber = parseInt(keyUplayerNumber); + + + } + $scope.LayerChange(); + } + } + } + else { + var layerInputVal = $("#txtlayerNumber").val(); + + if (layerInputVal <= $rootScope.totalLayers) { + + $("#txtlayerNumber").val(layerInputVal); + + } + else { + + $("#txtlayerNumber").val($rootScope.totalLayers); + } + } } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html index 3ae4227..a869b1b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html @@ -55,7 +55,7 @@
  • Logout
  • -
    +