diff --git a/package.json b/package.json index 9c6328e..ef39e06 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas", "font-awesome": "^4.7.0", "gulp": "^3.9.1", - "gulp-angular-templatecache": "^2.2.1", + "gulp-angular-templatecache": "^2.2.3", "gulp-clean": "^0.4.0", "gulp-concat": "^2.6.1", "gulp-connect": "^5.6.1", @@ -51,7 +51,7 @@ "gulp-rename": "^1.4.0", "gulp-replace": "^1.0.0", "gulp-uglify": "^3.0.1", - "jasmine-core": "^3.2.1", + "jasmine-core": "^3.3.0", "jquery": "^3.3.1", "jshint": "^2.9.6", "pre-commit": "^1.2.2", diff --git a/src/js/controller.js b/src/js/controller.js index 901f9ac..ddbf8d6 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -5,30 +5,51 @@ angular.module('focaModalVendedores') '$uibModalInstance', 'focaVendedoresService', function($filter, $scope, $uibModalInstance, focaVendedoresService) { - focaVendedoresService.getVendedores().then( - function(res) { - $scope.vendedores = res.data; - $scope.search(); - } - ); - // pagination + $scope.filters = ''; $scope.numPerPage = 10; $scope.currentPage = 1; $scope.filteredVendedores = []; $scope.currentPageVendedores = []; $scope.selectedVendedor = -1; + $scope.busquedaPress = function(key) { + if (key === 13) { + focaVendedoresService.getVendedores($scope.filters).then( + function(res) { + $scope.vendedores = res.data; + if(res.data.length === 0) { + $scope.conResultados = false; + $scope.sinResultados = true; + } else { + $scope.conResultados = true; + $scope.sinResultados = false; + $scope.search(); + primera(); + } + } + ); + } + }; + $scope.search = function() { - $scope.filteredVendedores = $filter('filter')( - $scope.vendedores, { $: $scope.filters } - ); - - $scope.lastPage = Math.ceil( - $scope.filteredVendedores.length / $scope.numPerPage - ); - - $scope.resetPage(); + if($scope.vendedores) { + $scope.filteredVendedores = $filter('filter')( + $scope.vendedores, { $: $scope.filters } + ); + if($scope.filteredVendedores.length === 0) { + $scope.sinResultados = true; + $scope.conResultados = false; + } else { + $scope.sinResultados = false; + $scope.conResultados = true; + } + $scope.lastPage = Math.ceil( + $scope.filteredVendedores.length / $scope.numPerPage + ); + + $scope.resetPage(); + } }; $scope.resetPage = function() { @@ -59,12 +80,6 @@ angular.module('focaModalVendedores') } }; - $scope.busquedaPress = function(key) { - if (key === 13) { - primera(key); - } - }; - $scope.itemVendedor = function(key) { if (key === 38) { anterior(key); diff --git a/src/js/service.js b/src/js/service.js index 790f1ad..71db064 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -1,9 +1,9 @@ angular.module('focaModalVendedores') .service('focaVendedoresService', ['$http', 'API_ENDPOINT', function($http, API_ENDPOINT) { return { - getVendedores: function() { + getVendedores: function(filters) { // TODO ACOMODAR PARA TURNOS AHORA 1 HARDCODEO - return $http.get(API_ENDPOINT.URL + '/vendedores/1'); + return $http.post(API_ENDPOINT.URL + '/vendedores', {nombre: filters}); } }; }]); diff --git a/src/views/modal-vendedores.html b/src/views/modal-vendedores.html index 04ac867..b069c60 100644 --- a/src/views/modal-vendedores.html +++ b/src/views/modal-vendedores.html @@ -4,17 +4,22 @@