From 059223077a11ffd4c893cf4c33fc18403e7e8256 Mon Sep 17 00:00:00 2001 From: efernandez Date: Tue, 5 Feb 2019 11:17:16 -0300 Subject: [PATCH] quito modal proveedor --- gulpfile.js | 1 - package.json | 12 ++++++------ src/js/app.js | 7 +------ src/js/controller.js | 31 ++++++++++++++++++------------- 4 files changed, 25 insertions(+), 26 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 3e96c5e..4e4d4f3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -40,7 +40,6 @@ gulp.task('uglify', ['templates'], function() { 'tmp/views.js' ]), concat('foca-abm-chofer.js'), - replace("['ngRoute', 'focaModal', 'ui.bootstrap']", '[]'), replace("src/views/", ''), gulp.dest(paths.tmp), rename('foca-abm-chofer.min.js'), diff --git a/package.json b/package.json index e9584b6..66df4a7 100644 --- a/package.json +++ b/package.json @@ -35,16 +35,16 @@ "pump": "^3.0.x" }, "devDependencies": { - "angular": "^1.7.5", + "angular": "^1.7.7", "angular-route": "^1.7.5", - "bootstrap": "^4.1.3", + "bootstrap": "^4.2.1", "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git", "font-awesome": "^4.7.0", "gulp": "^3.9.1", - "gulp-angular-templatecache": "^2.2.5", + "gulp-angular-templatecache": "^2.2.6", "gulp-clean": "^0.4.0", - "gulp-connect": "^5.6.1", + "gulp-connect": "^5.7.0", "gulp-htmlmin": "^5.0.1", "gulp-jshint": "^2.1.0", "gulp-rename": "^1.4.0", @@ -53,9 +53,9 @@ "gulp-uglify-es": "^1.0.4", "jasmine-core": "^3.3.0", "jquery": "^3.3.1", - "jshint": "^2.9.6", + "jshint": "^2.10.0", "pre-commit": "^1.2.2", "pump": "^3.0.0", - "ui-bootstrap4": "^3.0.5" + "ui-bootstrap4": "^3.0.6" } } diff --git a/src/js/app.js b/src/js/app.js index 8048e60..cc42d6e 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1,6 +1 @@ -angular.module('focaAbmChofer', [ - 'ngRoute', - 'focaModal', - 'ui.bootstrap', - 'focaBotoneraLateral' -]); +angular.module('focaAbmChofer', []); diff --git a/src/js/controller.js b/src/js/controller.js index 23af938..f837f91 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -41,20 +41,25 @@ angular.module('focaAbmChofer') }; $scope.seleccionarTransportista = function() { - var modalInstance = $uibModal.open( - { - ariaLabelledBy: 'Busqueda de Transportista', - templateUrl: 'modal-proveedor.html', - controller: 'focaModalProveedorCtrl', - size: 'lg', - resolve: { - transportista: function() { - return true; - } + var parametrosModal = { + titulo: 'Búsqueda de transportista', + query: '/transportista', + columnas: [ + { + nombre: 'Código', + propiedad: 'COD' + }, + { + nombre: 'Nombre', + propiedad: 'NOM' + }, + { + nombre: 'CUIT', + propiedad: 'CUIT' } - } - ); - modalInstance.result.then( + ] + } + focaModalService.modal(parametrosModal).then( function(transportista) { elegirTransportista(transportista); focaAbmChoferService.transportistaSeleccionado = transportista; -- 1.9.1