Commit 3d8cb710bf08ecdb81922f186d8761111d3cae0f
Exists in
master
and in
1 other branch
Merge branch 'master' into 'master'
focus input cuando no hay resultados See merge request !2
Showing
2 changed files
Show diff stats
src/js/controller.js
| 1 | 1 | angular.module('focaModalDomicilio') |
| 2 | 2 | .controller('focaModalDomicilioController', |
| 3 | 3 | [ |
| 4 | + '$timeout', | |
| 4 | 5 | '$filter', |
| 5 | 6 | '$scope', |
| 6 | 7 | '$uibModalInstance', |
| 7 | 8 | 'idCliente', |
| 8 | 9 | 'focaModalDomicilioService', |
| 9 | - function($filter, $scope, $uibModalInstance, idCliente, focaModalDomicilioService) { | |
| 10 | + function($timeout, $filter, $scope, $uibModalInstance, idCliente, | |
| 11 | + focaModalDomicilioService) { | |
| 10 | 12 | |
| 11 | 13 | $scope.buscar = function() { |
| 12 | 14 | focaModalDomicilioService |
| ... | ... | @@ -18,6 +20,7 @@ angular.module('focaModalDomicilio') |
| 18 | 20 | } |
| 19 | 21 | ); |
| 20 | 22 | }; |
| 23 | + $scope.filters = ''; | |
| 21 | 24 | $scope.idCliente = idCliente; |
| 22 | 25 | $scope.buscar(); |
| 23 | 26 | $scope.ingreso = false; |
| ... | ... | @@ -31,12 +34,23 @@ angular.module('focaModalDomicilio') |
| 31 | 34 | $scope.selectedDomicilio = -1; |
| 32 | 35 | |
| 33 | 36 | //METODOS |
| 34 | - $scope.search = function() { | |
| 37 | + $scope.search = function(pressed) { | |
| 35 | 38 | $scope.filteredDomicilios = $filter('filter')( |
| 36 | 39 | $scope.domicilios, |
| 37 | 40 | {$: $scope.filters} |
| 38 | 41 | ); |
| 39 | 42 | |
| 43 | + if(pressed) { | |
| 44 | + if($scope.filteredDomicilios.length === 0) { | |
| 45 | + $timeout(function() { | |
| 46 | + angular.element('#search')[0].focus(); | |
| 47 | + $scope.filters = ''; | |
| 48 | + }); | |
| 49 | + }else { | |
| 50 | + primera(); | |
| 51 | + } | |
| 52 | + } | |
| 53 | + | |
| 40 | 54 | $scope.lastPage = Math.ceil( |
| 41 | 55 | $scope.filteredDomicilios.length / $scope.numPerPage |
| 42 | 56 | ); |
| ... | ... | @@ -74,7 +88,7 @@ angular.module('focaModalDomicilio') |
| 74 | 88 | |
| 75 | 89 | $scope.busquedaPress = function(key) { |
| 76 | 90 | if (key === 13) { |
| 77 | - primera(key); | |
| 91 | + $scope.search(true); | |
| 78 | 92 | } |
| 79 | 93 | }; |
| 80 | 94 |
src/views/modal-domicilio.html
| ... | ... | @@ -6,7 +6,8 @@ |
| 6 | 6 | <div class="input-group col-lg-6 pr-0 my-2"> |
| 7 | 7 | <input |
| 8 | 8 | type="text" |
| 9 | - class="form-control form-control-sm" | |
| 9 | + class="form-control form-control-sm" | |
| 10 | + id="search" | |
| 10 | 11 | placeholder="Búsqueda" |
| 11 | 12 | ng-model="filters" |
| 12 | 13 | ng-change="search()" |
| ... | ... | @@ -21,6 +22,7 @@ |
| 21 | 22 | ladda="searchLoading" |
| 22 | 23 | class="btn btn-outline-secondary" |
| 23 | 24 | type="button" |
| 25 | + ng-click="busquedaPress(13)" | |
| 24 | 26 | > |
| 25 | 27 | <i class="fa fa-search" aria-hidden="true"></i> |
| 26 | 28 | </button> |