diff --git a/gulpfile.js b/gulpfile.js index 932b79a..2338c27 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,10 +82,14 @@ gulp.task('clean-post-install', function(){ gulp.task('default', ['webserver']); gulp.task('watch', function() { - gulp.watch([paths.srcJS, paths.srcViews], ['copy']) + gulp.watch([paths.srcJS, paths.srcViews], ['uglify']) }); gulp.task('copy', ['uglify'], function(){ gulp.src('dist/*.js') .pipe(gulp.dest('../../wrapper-demo/node_modules/foca-modal-remito/dist')); }); + +gulp.task('watchAndCopy', function() { + gulp.watch([paths.srcJS, paths.srcViews], ['copy']) +}); diff --git a/package.json b/package.json index aad1c5e..7d4dde3 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.3", + "gulp-angular-templatecache": "^2.2.5", "gulp-clean": "^0.4.0", "gulp-concat": "^2.6.1", "gulp-connect": "^5.6.1", diff --git a/src/js/controller.js b/src/js/controller.js index f293f2d..8eb4f52 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -26,14 +26,7 @@ angular.module('focaModalRemito') $scope.busquedaPress = function(key) { if (key === 13) { $scope.searchLoading = true; - if(parametroRemito.idLista > 0) { - focaModalRemitoService - .getRemitosByIdLista(parametroRemito.idLista, $scope.filters) - .then(llenarDatos); - } else if(parametroRemito.idLista === -1) { - focaModalRemitoService.getRemitos() - .then(llenarDatos); - } + focaModalRemitoService.getRemitos().then(llenarDatos); } }; function llenarDatos(res) { diff --git a/src/js/service.js b/src/js/service.js index 9059593..519dc8c 100644 --- a/src/js/service.js +++ b/src/js/service.js @@ -5,11 +5,7 @@ angular.module('focaModalRemito') function($http, API_ENDPOINT) { return { getRemitos: function() { - return $http.get(API_ENDPOINT.URL + '/articulos'); - }, - getRemitosByIdLista: function(id, filters) { - return $http.post(API_ENDPOINT.URL + '/articulos/lista', - {filters: filters, id: id}); + return $http.get(API_ENDPOINT.URL + '/remito'); } }; } diff --git a/src/views/foca-modal-remito.html b/src/views/foca-modal-remito.html index 3d4b235..93b2fe2 100644 --- a/src/views/foca-modal-remito.html +++ b/src/views/foca-modal-remito.html @@ -29,10 +29,9 @@
Sec. | -Cod. | -Descripción | -P. Base | +Fecha | +Cliente | +Comprobante | |
---|---|---|---|---|---|---|---|
- | - | - | + | + | + |