Merge branch 'master' into 'master'

focus input si no hay resultados See merge request !2

Merge branch 'master' into 'master'
focus input si no hay resultados See merge request !2
Eric Fernandez
2 parents 4a3ff5358a 9132c32d71
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/modal-precio-condicion.html
 angular.module('focaModalPrecioCondicion')
     .controller('focaModalPrecioCondicionController', 
         [
+            '$timeout',
             '$filter',
             '$scope',
             '$uibModalInstance',
             'focaModalService',
             'focaModalPrecioCondicionService',
             function(
-                $filter, $scope, $uibModalInstance,
+                $timeout, $filter, $scope, $uibModalInstance,
                 focaModalService, focaModalPrecioCondicionService
             ) {
  
@@ -24,6 +25,7 @@ angular.module(&#39;focaModalPrecioCondicion&#39;)
                         $scope.search();
                     }
                 );
+                $scope.filters = '';
                 $scope.ingreso = false;
                 $scope.plazosNuevos = [];
                 $scope.plazoACargar =
@@ -77,12 +79,23 @@ angular.module(&#39;focaModalPrecioCondicion&#39;)
                     };
                 };
  
-                $scope.search = function() {
+                $scope.search = function(pressed) {
                     $scope.filteredPrecioCondicion = $filter('filter')(
                         $scope.precioCondicion, 
                         {$: $scope.filters}
                     );
  
+                    if(pressed) {
+                        if($scope.filteredPrecioCondicion.length === 0) {
+                            $timeout(function() {
+                                angular.element('#search')[0].focus();
+                                $scope.filters = '';
+                            });
+                        }else {
+                            primera();
+                        }
+                    }
+
                     $scope.lastPage = Math.ceil(
                         $scope.filteredPrecioCondicion.length / $scope.numPerPage
                     );
@@ -121,7 +134,7 @@ angular.module(&#39;focaModalPrecioCondicion&#39;)
  
                 $scope.busquedaPress = function(key) {
                     if (key === 13) {
-                        primera(key);
+                        $scope.search(true);
                     }
                 };
  
@@ -8,6 +8,7 @@
             <input
                 type="text"
                 class="form-control form-control-sm"
+                id="search"
                 placeholder="Busqueda"
                 ng-model="filters"
                 ng-change="search()"
1	1	angular.module('focaModalPrecioCondicion')
2	2	.controller('focaModalPrecioCondicionController',
3	3	[
	4	+ '$timeout',
4	5	'$filter',
5	6	'$scope',
6	7	'$uibModalInstance',
7	8	'focaModalService',
8	9	'focaModalPrecioCondicionService',
9	10	function(
10		- $filter, $scope, $uibModalInstance,
	11	+ $timeout, $filter, $scope, $uibModalInstance,
11	12	focaModalService, focaModalPrecioCondicionService
12	13	) {
13	14
...	...	@@ -24,6 +25,7 @@ angular.module('focaModalPrecioCondicion')
24	25	$scope.search();
25	26	}
26	27	);
	28	+ $scope.filters = '';
27	29	$scope.ingreso = false;
28	30	$scope.plazosNuevos = [];
29	31	$scope.plazoACargar =
...	...	@@ -77,12 +79,23 @@ angular.module('focaModalPrecioCondicion')
77	79	};
78	80	};
79	81
80		- $scope.search = function() {
	82	+ $scope.search = function(pressed) {
81	83	$scope.filteredPrecioCondicion = $filter('filter')(
82	84	$scope.precioCondicion,
83	85	{$: $scope.filters}
84	86	);
85	87
	88	+ if(pressed) {
	89	+ if($scope.filteredPrecioCondicion.length === 0) {
	90	+ $timeout(function() {
	91	+ angular.element('#search')[0].focus();
	92	+ $scope.filters = '';
	93	+ });
	94	+ }else {
	95	+ primera();
	96	+ }
	97	+ }
	98	+
86	99	$scope.lastPage = Math.ceil(
87	100	$scope.filteredPrecioCondicion.length / $scope.numPerPage
88	101	);
...	...	@@ -121,7 +134,7 @@ angular.module('focaModalPrecioCondicion')
121	134
122	135	$scope.busquedaPress = function(key) {
123	136	if (key === 13) {
124		- primera(key);
	137	+ $scope.search(true);
125	138	}
126	139	};
127	140
...	...	@@ -8,6 +8,7 @@
8	8	<input
9	9	type="text"
10	10	class="form-control form-control-sm"
	11	+ id="search"
11	12	placeholder="Busqueda"
12	13	ng-model="filters"
13	14	ng-change="search()"