Merge branch 'Develop-IPAD-MAC' into QA-IPAD-MAC

Amrita Vishnoi
2 parents 7cd3de0b 2fa7777a
Showing 3 changed files with 58 additions and 41 deletions
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
@@ -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);
@@ -290,6 +290,7 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$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);
+                }
+            }
         }
@@ -55,7 +55,7 @@
         <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
         <li class="hidden-xs marginR5 logOut" data-toggle="tooltip" data-placement="top" title="Logout"><a href="" ng-click="LogoutUser()"><i class="fa fa-power-off"></i></a></li>
     </ul>
-    <div id="imaginary_container">
+    <div id="imaginary_container" style="visibility:hidden">
         <div class="input-group stylish-input-group paddTop5 hidden-sm">
             <input type="text" class="form-control width120" placeholder="Search">
             <span class="input-group-addon">