ADAM / AIAHTML5

Commit ca66441320db8cb5b1c4f963d2f35523ec5f96eb

Authored by Amrita Vishnoi
2 parents 7cd3de0b 2fa7777a

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

Inline Side-by-side
Showing 3 changed files with 58 additions and 41 deletions
400-SOURCECODE/AIAHTML5.API/Models/DBModel.cs
  View file @ca66441
... ... @@ -328,8 +328,8 @@ namespace AIAHTML5.API.Models
328 328 {
329 329 conn = new SqlConnection(dbConnectionString);
330 330 cmd = new SqlCommand();
331   - cmd.Connection = conn;
332 331 conn.Open();
  332 + cmd.Connection = conn;
333 333 cmd.CommandText = DBConstants.UPDATE_USER_PASSWORD;
334 334 cmd.CommandType = CommandType.StoredProcedure;
335 335 cmd.Parameters.AddWithValue("@sLoginId", loginId);
... ... @@ -483,8 +483,8 @@ namespace AIAHTML5.API.Models
483 483 {
484 484 conn = new SqlConnection(dbConnectionString);
485 485 cmd = new SqlCommand();
486   - cmd.Connection = conn;
487 486 conn.Open();
  487 + cmd.Connection = conn;
488 488 cmd.CommandText = DBConstants.UPDATE_LICENSE_TERM_STATUS;
489 489 cmd.CommandType = CommandType.StoredProcedure;
490 490 cmd.Parameters.AddWithValue("@sAccountNumber", accountNumber);
... ... @@ -543,8 +543,8 @@ namespace AIAHTML5.API.Models
543 543 {
544 544 conn = new SqlConnection(dbConnectionString);
545 545 cmd = new SqlCommand();
546   - cmd.Connection = conn;
547 546 conn.Open();
  547 + cmd.Connection = conn;
548 548 cmd.CommandText = DBConstants.INSERT_LOGIN_DETAIL;
549 549 cmd.CommandType = CommandType.StoredProcedure;
550 550 cmd.Parameters.AddWithValue("@iUserId", userId);
... ... @@ -572,8 +572,8 @@ namespace AIAHTML5.API.Models
572 572 {
573 573 conn = new SqlConnection(dbConnectionString);
574 574 cmd = new SqlCommand();
575   - cmd.Connection = conn;
576 575 conn.Open();
  576 + cmd.Connection = conn;
577 577 cmd.CommandText = DBConstants.INSERT_INCORRECT_LOGIN_ATTEMPTS;
578 578 cmd.CommandType = CommandType.StoredProcedure;
579 579 cmd.Parameters.AddWithValue("@iUserId", userId);
... ... @@ -637,8 +637,8 @@ namespace AIAHTML5.API.Models
637 637 {
638 638 conn = new SqlConnection(dbConnectionString);
639 639 cmd = new SqlCommand();
640   - cmd.Connection = conn;
641 640 conn.Open();
  641 + cmd.Connection = conn;
642 642 cmd.CommandText = DBConstants.UPDATE_INCORRECT_LOGIN_ATTEMPTS;
643 643 cmd.CommandType = CommandType.StoredProcedure;
644 644 cmd.Parameters.AddWithValue("@iUserId", userId);
... ... @@ -665,8 +665,8 @@ namespace AIAHTML5.API.Models
665 665 {
666 666 conn = new SqlConnection(dbConnectionString);
667 667 cmd = new SqlCommand();
668   - cmd.Connection = conn;
669 668 conn.Open();
  669 + cmd.Connection = conn;
670 670 cmd.CommandText = DBConstants.DELETE_INCORRECT_LOGIN_ATTEMPTS;
671 671 cmd.CommandType = CommandType.StoredProcedure;
672 672 cmd.Parameters.AddWithValue("@iUserId", userId);
... ... @@ -724,8 +724,8 @@ namespace AIAHTML5.API.Models
724 724 {
725 725 conn = new SqlConnection(dbConnectionString);
726 726 cmd = new SqlCommand();
727   - cmd.Connection = conn;
728 727 conn.Open();
  728 + cmd.Connection = conn;
729 729 cmd.CommandText = DBConstants.INSERT_LOGIN_ERROR_LOG;
730 730 cmd.CommandType = CommandType.StoredProcedure;
731 731 cmd.Parameters.AddWithValue("@nvAccountNumber", accountNumber);
... ...
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
  View file @ca66441
... ... @@ -290,6 +290,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
290 290 }
291 291 //to disbale layer change slider
292 292 $('.ui-slider').slider('disable');
  293 + document.getElementById('txtlayerNumber').style.pointerEvents = "none";
293 294  
294 295 $scope.isLoading = true;
295 296 $('#spinner').css('visibility', 'visible');
... ... @@ -304,6 +305,7 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
304 305 }
305 306 //to enable layer change slider
306 307 $('.ui-slider').slider('enable');
  308 + document.getElementById('txtlayerNumber').style.pointerEvents = "auto";
307 309  
308 310 $scope.isLoading = false;
309 311  
... ... @@ -9525,33 +9527,23 @@ AIA.controller("DAController", ["$scope", "$rootScope", "$compile", "$http", "$l
9525 9527 }
9526 9528  
9527 9529 $scope.LayerChangeBasedOnKeyPressed = function (e) {
9528   - // Dissectible Anatomy > Should not display blank page if no layer is selected.
9529   -
9530   -
9531   - if (e.keyCode == 13) {
9532   -
9533   - if ($("#txtlayerNumber").val() == '') {
9534   -
9535   - $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr);
9536   - }
9537   - else {
9538   - $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val();
9539   - $scope.LayerChange();
9540   - }
9541   -
9542   -
9543   - }
9544 9530  
9545 9531 // 'x' button is displaying inside the input box in IE browser.
9546 9532 if (e.keyCode == 38) {
9547 9533  
9548   -
9549 9534 var layerInputVal = $("#txtlayerNumber").val();
9550   - if (layerInputVal != $rootScope.totalLayers) {
  9535 +
  9536 + if (layerInputVal < $rootScope.totalLayers) {
  9537 +
9551 9538 var layerInputValInc = parseInt(layerInputVal) + 1;
9552 9539 $scope.layerNumber = parseInt(layerInputValInc);
9553 9540 $("#txtlayerNumber").val($scope.layerNumber);
9554 9541 $rootScope.PreviouslayerNumbr = $scope.layerNumber;
  9542 +
  9543 + }
  9544 + else {
  9545 +
  9546 + $("#txtlayerNumber").val($rootScope.totalLayers);
9555 9547 }
9556 9548  
9557 9549  
... ... @@ -9559,12 +9551,14 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9559 9551  
9560 9552 // 'x' button is displaying inside the input box in IE browser.
9561 9553 if (e.keyCode == 40) {
  9554 +
9562 9555 var layerInputVal = $("#txtlayerNumber").val();
9563 9556 if (layerInputVal > 0) {
9564 9557 var layerInputValDec = parseInt(layerInputVal) - 1;
9565 9558 $scope.layerNumber = parseInt(layerInputValDec);
9566 9559 $("#txtlayerNumber").val($scope.layerNumber);
9567 9560 $rootScope.PreviouslayerNumbr = $scope.layerNumber;
  9561 +
9568 9562 }
9569 9563 }
9570 9564  
... ... @@ -9573,31 +9567,54 @@ AIA.controller(&quot;DAController&quot;, [&quot;$scope&quot;, &quot;$rootScope&quot;, &quot;$compile&quot;, &quot;$http&quot;, &quot;$l
9573 9567  
9574 9568 $scope.LayerValueChangeBasedOnKeyUp = function (e) {
9575 9569  
9576   - var keyUplayerNumber = parseInt($("#txtlayerNumber").val());
9577   -
9578   - if (isNaN(keyUplayerNumber))
9579   - {
9580   - document.getElementById("txtlayerNumber").value = "";
9581   - }
9582   - else {
9583   -
9584   - if (keyUplayerNumber > $rootScope.totalLayers) {
  9570 +
  9571 + if (e.keyCode == 13) {
9585 9572  
9586   - $("#txtlayerNumber").val($rootScope.totalLayers);
9587   - $scope.layerNumber = parseInt($rootScope.totalLayers);
  9573 + if ($("#txtlayerNumber").val() == '') {
9588 9574  
  9575 + $("#txtlayerNumber").val($rootScope.PreviouslayerNumbr);
9589 9576 }
9590 9577 else {
9591 9578  
9592   - $("#txtlayerNumber").val(keyUplayerNumber);
9593   - $scope.layerNumber = parseInt(keyUplayerNumber);
  9579 + $rootScope.PreviouslayerNumbr = $("#txtlayerNumber").val();
9594 9580  
  9581 + var keyUplayerNumber = parseInt($("#txtlayerNumber").val());
9595 9582  
9596   - }
  9583 + if (isNaN(keyUplayerNumber)) {
  9584 + document.getElementById("txtlayerNumber").value = "";
  9585 + }
  9586 + else {
9597 9587  
9598   - }
  9588 + if (keyUplayerNumber > $rootScope.totalLayers) {
  9589 +
  9590 + $("#txtlayerNumber").val($rootScope.totalLayers);
  9591 + $scope.layerNumber = parseInt($rootScope.totalLayers);
9599 9592  
  9593 + }
  9594 + else {
9600 9595  
  9596 + $("#txtlayerNumber").val(keyUplayerNumber);
  9597 + $scope.layerNumber = parseInt(keyUplayerNumber);
  9598 +
  9599 +
  9600 + }
  9601 + $scope.LayerChange();
  9602 + }
  9603 + }
  9604 + }
  9605 + else {
  9606 + var layerInputVal = $("#txtlayerNumber").val();
  9607 +
  9608 + if (layerInputVal <= $rootScope.totalLayers) {
  9609 +
  9610 + $("#txtlayerNumber").val(layerInputVal);
  9611 +
  9612 + }
  9613 + else {
  9614 +
  9615 + $("#txtlayerNumber").val($rootScope.totalLayers);
  9616 + }
  9617 + }
9601 9618 }
9602 9619  
9603 9620  
... ...
400-SOURCECODE/AIAHTML5.Web/app/widget/TopMenu.html
  View file @ca66441
... ... @@ -55,7 +55,7 @@
55 55 <li class="visible-xs"><a href="" ng-click="LogoutUser()">Logout</a></li>
56 56 <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>
57 57 </ul>
58   - <div id="imaginary_container">
  58 + <div id="imaginary_container" style="visibility:hidden">
59 59 <div class="input-group stylish-input-group paddTop5 hidden-sm">
60 60 <input type="text" class="form-control width120" placeholder="Search">
61 61 <span class="input-group-addon">
... ...