Merge remote-tracking branch 'upstream/master'

Jose Pinto
2 parents 47e1ae0862 c064dda814
Showing 2 changed files Show diff stats
src/js/controller.js
src/views/foca-busqueda-cliente-modal.html
 angular.module('focaBusquedaCliente')
     .controller('focaBusquedaClienteModalController', [
-        '$uibModalInstance', 'focaBusquedaClienteService', '$scope', '$filter',
-        function($uibModalInstance, focaBusquedaClienteService, $scope, $filter) {
+        '$uibModalInstance', 'focaBusquedaClienteService', '$scope', '$filter', '$timeout',
+        function($uibModalInstance, focaBusquedaClienteService, $scope, $filter, $timeout) {
  
             $scope.filters = '';
             $scope.primerBusqueda = false;
@@ -19,19 +19,26 @@ angular.module(&#39;focaBusquedaCliente&#39;)
                         function(res) {
                             $scope.primerBusqueda = true;
                             $scope.clientes = res.data;
-                            $scope.search();
+                            $scope.search(true);
                             primera();
                             $scope.searchLoading = false;
                         });
                 }
             };
  
-            $scope.search = function () {
+            $scope.search = function (pressed) {
                 if($scope.primerBusqueda) {
                     $scope.filteredClientes = $filter('filter')(
                         $scope.clientes, {$: $scope.filters}
                     );
  
+                    if(pressed && $scope.filteredClientes.length === 0){
+                        $timeout(function() {
+                            angular.element('#search')[0].focus();
+                            $scope.filters = '';
+                        });
+                    }
+
                     $scope.lastPage = Math.ceil(
                         $scope.filteredClientes.length / $scope.numPerPage
                     );
@@ -8,6 +8,7 @@
                 ladda="searchLoading"
                 type="text"
                 class="form-control form-control-sm"
+                id="search"
                 placeholder="Busqueda"
                 ng-model="filters"
                 ng-change="search()"
@@ -20,6 +21,7 @@
             <div class="input-group-append">
                 <button
                     ladda="searchLoading"
+                    data-spinner-color="#FF0000"
                     class="btn btn-outline-secondary"
                     type="button"
                     ng-click="busquedaPress(13)">
1	1	angular.module('focaBusquedaCliente')
2	2	.controller('focaBusquedaClienteModalController', [
3		- '$uibModalInstance', 'focaBusquedaClienteService', '$scope', '$filter',
4		- function($uibModalInstance, focaBusquedaClienteService, $scope, $filter) {
	3	+ '$uibModalInstance', 'focaBusquedaClienteService', '$scope', '$filter', '$timeout',
	4	+ function($uibModalInstance, focaBusquedaClienteService, $scope, $filter, $timeout) {
5	5
6	6	$scope.filters = '';
7	7	$scope.primerBusqueda = false;
...	...	@@ -19,19 +19,26 @@ angular.module('focaBusquedaCliente')
19	19	function(res) {
20	20	$scope.primerBusqueda = true;
21	21	$scope.clientes = res.data;
22		- $scope.search();
	22	+ $scope.search(true);
23	23	primera();
24	24	$scope.searchLoading = false;
25	25	});
26	26	}
27	27	};
28	28
29		- $scope.search = function () {
	29	+ $scope.search = function (pressed) {
30	30	if($scope.primerBusqueda) {
31	31	$scope.filteredClientes = $filter('filter')(
32	32	$scope.clientes, {$: $scope.filters}
33	33	);
34	34
	35	+ if(pressed && $scope.filteredClientes.length === 0){
	36	+ $timeout(function() {
	37	+ angular.element('#search')[0].focus();
	38	+ $scope.filters = '';
	39	+ });
	40	+ }
	41	+
35	42	$scope.lastPage = Math.ceil(
36	43	$scope.filteredClientes.length / $scope.numPerPage
37	44	);
...	...	@@ -8,6 +8,7 @@
8	8	ladda="searchLoading"
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()"
...	...	@@ -20,6 +21,7 @@
20	21	<div class="input-group-append">
21	22	<button
22	23	ladda="searchLoading"
	24	+ data-spinner-color="#FF0000"
23	25	class="btn btn-outline-secondary"
24	26	type="button"
25	27	ng-click="busquedaPress(13)">