From c33f4e727725897e5a22df8bb79df154e58a685e Mon Sep 17 00:00:00 2001 From: efernandez Date: Mon, 29 Oct 2018 18:05:06 -0300 Subject: [PATCH] =?UTF-8?q?Refactor=20b=C3=BAsqueda=20de=20=20modal=20prod?= =?UTF-8?q?uctos/articulos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 8 +- src/js/controller.js | 68 ++++++++-------- src/js/service.js | 5 +- src/views/modal-busqueda-productos.html | 136 +++++++++++++++++--------------- 4 files changed, 117 insertions(+), 100 deletions(-) diff --git a/package.json b/package.json index 4675b42..5620981 100644 --- a/package.json +++ b/package.json @@ -36,12 +36,12 @@ "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas" }, "devDependencies": { - "angular": "^1.7.4", + "angular": "^1.7.5", "bootstrap": "^4.1.3", "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", @@ -50,11 +50,11 @@ "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", "pump": "^3.0.0", - "ui-bootstrap4": "^3.0.4" + "ui-bootstrap4": "^3.0.5" } } diff --git a/src/js/controller.js b/src/js/controller.js index a2a662e..5756a59 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -7,42 +7,54 @@ angular.module('focaBusquedaProductos') 'idLista', 'focaBusquedaProductosService', function($filter, $scope, $uibModalInstance, idLista, focaBusquedaProductosService) { - if(idLista) { - focaBusquedaProductosService.getProductosByIdLista(idLista).then( - function(res) { - $scope.productos = res.data; - $scope.search(); - } - ); - } else { - focaBusquedaProductosService.getProductos().then( - function(res) { - $scope.productos = res.data; - $scope.search(); - } - ); - } - + $scope.filters = ''; + $scope.productos = []; + $scope.primerBusqueda = false; // pagination $scope.numPerPage = 10; $scope.currentPage = 1; $scope.filteredProductos = []; $scope.currentPageProductos = []; $scope.selectedProducto = -1; - + //METODOS + $scope.busquedaPress = function(key) { + if (key === 13) { + $scope.primerBusqueda = true; + if(idLista) { + focaBusquedaProductosService + .getProductosByIdLista(idLista, $scope.filters) + .then( + function(res) { + $scope.productos = res.data; + $scope.search(); + } + ); + } else { + focaBusquedaProductosService.getProductos().then( + function(res) { + $scope.productos = res.data; + $scope.search(); + } + ); + } + } + }; + $scope.search = function() { - $scope.filteredProductos = $filter('filter')( - $scope.productos, - {$: $scope.filters} - ); + if($scope.productos.length > 0) { + $scope.filteredProductos = $filter('filter')( + $scope.productos, + {$: $scope.filters} + ); - $scope.lastPage = Math.ceil( - $scope.filteredProductos.length / $scope.numPerPage - ); + $scope.lastPage = Math.ceil( + $scope.filteredProductos.length / $scope.numPerPage + ); - $scope.resetPage(); + $scope.resetPage(); + } }; $scope.resetPage = function() { @@ -73,12 +85,6 @@ angular.module('focaBusquedaProductos') } }; - $scope.busquedaPress = function(key) { - if (key === 13) { - primera(key); - } - }; - $scope.itemProducto = function(key) { if (key === 38) { anterior(key); diff --git a/src/js/service.js b/src/js/service.js index 1c344b2..785f9cc 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -7,8 +7,9 @@ angular.module('focaBusquedaProductos') getProductos: function() { return $http.get(API_ENDPOINT.URL + '/articulos'); }, - getProductosByIdLista: function(id) { - return $http.get(API_ENDPOINT.URL + '/articulos/lista/' + id); + getProductosByIdLista: function(id, filters) { + return $http.post(API_ENDPOINT.URL + '/articulos/lista', + {filters: filters, id: id}); } }; } diff --git a/src/views/modal-busqueda-productos.html b/src/views/modal-busqueda-productos.html index b95c749..a0b9157 100644 --- a/src/views/modal-busqueda-productos.html +++ b/src/views/modal-busqueda-productos.html @@ -14,70 +14,80 @@ foca-focus="selectedProducto == -1" ng-focus="selectedProducto = -1" > - - - - - - - - - - - - - - - - - - - -
Sec.Cod.DescripciónP. Base
- -
- +
+ +
+ + + + + + + + + + + + + + + + + + + + + + +
Sec.Cod.DescripciónP. Base
+ No se encontraron resultados. +
+ +
+
-- 1.9.1