diff --git a/gulpfile.js b/gulpfile.js index 882c027..39fe630 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -45,7 +45,7 @@ gulp.task('uglify', ['templates'], function() { ]), concat('foca-busqueda-productos.js'), replace('src/views/', ''), - replace("['ui.bootstrap', 'focaDirectivas']", '[]'), + replace("['ui.bootstrap', 'focaDirectivas', 'angular-ladda']", '[]'), gulp.dest(paths.tmp), rename('foca-busqueda-productos.min.js'), uglify(), diff --git a/index.html b/index.html index 02d828c..df994cd 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ + @@ -13,7 +14,10 @@ - + + + + diff --git a/package.json b/package.json index 5620981..b59a477 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 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas" + "install-dev": "npm install -D angular angular-ladda ladda@1.0.6 bootstrap font-awesome gulp gulp-angular-templatecache gulp-concat gulp-connect gulp-htmlmin gulp-jshint gulp-rename gulp-replace gulp-uglify gulp-clean jasmine-core jquery jshint pre-commit pump ui-bootstrap4 && npm i -D git+https://debo.suite.repo/modulos-npm/foca-directivas" }, "pre-commit": [ "gulp-pre-commit" @@ -37,6 +37,7 @@ }, "devDependencies": { "angular": "^1.7.5", + "angular-ladda": "^0.4.3", "bootstrap": "^4.1.3", "foca-directivas": "git+https://debo.suite.repo/modulos-npm/foca-directivas", "font-awesome": "^4.7.0", @@ -53,6 +54,7 @@ "jasmine-core": "^3.3.0", "jquery": "^3.3.1", "jshint": "^2.9.6", + "ladda": "1.0.6", "pre-commit": "^1.2.2", "pump": "^3.0.0", "ui-bootstrap4": "^3.0.5" diff --git a/src/js/app.js b/src/js/app.js index 95124b6..ec28f57 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1 @@ -angular.module('focaBusquedaProductos', ['ui.bootstrap', 'focaDirectivas']); +angular.module('focaBusquedaProductos', ['ui.bootstrap', 'focaDirectivas', 'angular-ladda']); diff --git a/src/js/controller.js b/src/js/controller.js index 6315483..42eb106 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -11,6 +11,7 @@ angular.module('focaBusquedaProductos') $scope.filters = ''; $scope.productos = []; $scope.primerBusqueda = false; + $scope.searchLoading = false; // pagination $scope.numPerPage = 10; $scope.currentPage = 1; @@ -21,11 +22,13 @@ angular.module('focaBusquedaProductos') //METODOS $scope.busquedaPress = function(key) { if (key === 13) { + $scope.searchLoading = true; if(idLista > 0) { focaBusquedaProductosService .getProductosByIdLista(idLista, $scope.filters) .then( function(res) { + $scope.searchLoading = false; $scope.primerBusqueda = true; $scope.productos = res.data; $scope.search(); @@ -35,10 +38,11 @@ angular.module('focaBusquedaProductos') } else if(idLista === -1) { focaBusquedaProductosService.getProductos().then( function(res) { + $scope.searchLoading = false; $scope.primerBusqueda = true; $scope.productos = res.data; $scope.search(); - primera(); + primera(); } ); } diff --git a/src/views/modal-busqueda-productos.html b/src/views/modal-busqueda-productos.html index 24e921a..a0de783 100644 --- a/src/views/modal-busqueda-productos.html +++ b/src/views/modal-busqueda-productos.html @@ -4,6 +4,7 @@