diff --git a/index.html b/index.html index a93547b..d1953cd 100644 --- a/index.html +++ b/index.html @@ -1,4 +1,4 @@ - + diff --git a/package.json b/package.json index 32ac242..a7e2a1e 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 angular bootstrap jquery font-awesome gulp gulp-concat gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean jshint pump gulp-connect gulp-uglify jasmine-core pre-commit gulp-angular-templatecache ui-bootstrap4 git+https://debo.suite.repo/modulos-npm/foca-directivas" + "install-dev": "npm install angular bootstrap jquery font-awesome gulp gulp-concat gulp-jshint gulp-rename gulp-replace gulp-uglify-es gulp-clean jshint pump gulp-connect gulp-uglify jasmine-core pre-commit gulp-angular-templatecache ui-bootstrap4 gulp-htmlmin git+https://debo.suite.repo/modulos-npm/foca-directivas" }, "pre-commit": [ "gulp-pre-commit" @@ -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,11 +51,14 @@ "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.5" + }, + "dependencies": { + "gulp-uglify-es": "^1.0.4" } } diff --git a/src/js/controller.js b/src/js/controller.js index 9cf378e..fb3a965 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -5,20 +5,9 @@ angular.module('focaModalProveedor') '$uibModalInstance', 'focaModalProveedorService', function ($filter, $scope, $uibModalInstance, focaModalProveedorService) { - var json = {razonCuitCod: ''}; - - focaModalProveedorService.getProveedores(json).then( - function (res) { - for (var i = res.data.length - 1; i >= 0; i--) { - if (res.data[i].COD === 0) { - delete res.data[i]; - } - } - - $scope.proveedores = res.data; - $scope.search(); - }); + $scope.filters = ''; + $scope.primerBusqueda = false; // pagination $scope.numPerPage = 10; $scope.currentPage = 1; @@ -26,6 +15,26 @@ angular.module('focaModalProveedor') $scope.currentPageProveedores = []; $scope.selectedProveedores = -1; + $scope.busquedaPress = function(key) { + if (key === 13) { + var json = { + razonCuitCod: $scope.filters + }; + focaModalProveedorService.getProveedores(json).then( + function (res) { + for (var i = res.data.length - 1; i >= 0; i--) { + if (res.data[i].COD === 0) { + delete res.data[i]; + } + } + $scope.primerBusqueda = true; + $scope.proveedores = res.data; + $scope.search(); + primera(); + }); + } + }; + $scope.search = function () { $scope.filteredProveedores = $filter('filter')( $scope.proveedores, {$: $scope.filters} @@ -67,12 +76,6 @@ angular.module('focaModalProveedor') } }; - $scope.busquedaPress = function(key) { - if (key === 13) { - primera(key); - } - }; - $scope.itemProveedor = function(key) { if (key === 38) { anterior(key); diff --git a/src/views/modal-proveedor.html b/src/views/modal-proveedor.html index a03ca12..9b834a6 100644 --- a/src/views/modal-proveedor.html +++ b/src/views/modal-proveedor.html @@ -3,82 +3,92 @@