From 03513d79b520e8d1a20436f74594d190c01e21f8 Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Fri, 7 Dec 2018 16:11:50 -0300 Subject: [PATCH] buscador sin resultados hace focus --- package.json | 6 +++--- src/js/controller.js | 15 ++++++++++++--- src/views/modal-chofer.html | 5 +++-- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index cc8abea..1b19ba6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "gulp-pre-commit": "gulp pre-commit", "compile": "gulp uglify", "postinstall": "npm run compile && gulp clean-post-install", - "install-dev": "npm install -D angular angular-ladda bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jasmine-core jquery jshint ladda@1.0.6 pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git" + "install-dev": "npm install -D angular angular-ladda bootstrap font-awesome gulp gulp-angular-templatecache gulp-clean gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify jasmine-core jquery jshint ladda@1.0.6 pre-commit pump ui-bootstrap4 && npm i -D git+ssh://git@git.focasoftware.com:npm/foca-directivas.git" }, "pre-commit": [ "gulp-pre-commit" @@ -33,13 +33,13 @@ "gulp-uglify": "^3.0.1", "jquery": "^3.3.1", "pump": "^3.0.0", - "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas" + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git" }, "devDependencies": { "angular": "1.7.5", "angular-ladda": "0.4.3", "bootstrap": "4.1.3", - "foca-directivas": "git+ssh://git@debonline.dyndns.org:npm/foca-directivas.git", + "foca-directivas": "git+ssh://git@git.focasoftware.com:npm/foca-directivas.git", "font-awesome": "4.7.0", "gulp": "3.9.1", "gulp-angular-templatecache": "2.2.5", diff --git a/src/js/controller.js b/src/js/controller.js index 63daf65..4d9bb9b 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -1,11 +1,12 @@ angular.module('focaModalChofer') .controller('focaModalChoferController', [ + '$timeout', '$filter', '$scope', '$uibModalInstance', 'focaModalChoferService', - function($filter, $scope, $uibModalInstance, + function($timeout, $filter, $scope, $uibModalInstance, focaModalChoferService ) { @@ -31,21 +32,29 @@ angular.module('focaModalChofer') $scope.searchLoading = false; $scope.primerBusqueda = true; $scope.choferes = res.data; - $scope.search(); + $scope.search(true); primera(); } - $scope.search = function() { + $scope.search = function(pressed) { if($scope.choferes.length > 0) { $scope.filteredChoferes = $filter('filter')( $scope.choferes, {$: $scope.filters} ); + if(pressed && $scope.filteredChoferes.length === 0){ + $timeout(function() { + angular.element('#search')[0].focus(); + $scope.filters = ''; + }); + } + $scope.lastPage = Math.ceil( $scope.filteredChoferes.length / $scope.numPerPage ); $scope.resetPage(); + } }; diff --git a/src/views/modal-chofer.html b/src/views/modal-chofer.html index 4001196..782fcfc 100644 --- a/src/views/modal-chofer.html +++ b/src/views/modal-chofer.html @@ -1,14 +1,15 @@