Commit 856b0e1a28a884c19a2de7cf3c7ce32fd1d287c5
Exists in
master
Merge branch 'master' into 'master'
Master(efernandez) See merge request !10
Showing
4 changed files
Show diff stats
gulpfile.js
| ... | ... | @@ -40,7 +40,6 @@ gulp.task('uglify', ['templates'], function() { |
| 40 | 40 | 'tmp/views.js' |
| 41 | 41 | ]), |
| 42 | 42 | concat('foca-abm-chofer.js'), |
| 43 | - replace("['ngRoute', 'focaModal', 'ui.bootstrap']", '[]'), | |
| 44 | 43 | replace("src/views/", ''), |
| 45 | 44 | gulp.dest(paths.tmp), |
| 46 | 45 | rename('foca-abm-chofer.min.js'), |
package.json
| ... | ... | @@ -35,16 +35,16 @@ |
| 35 | 35 | "pump": "^3.0.x" |
| 36 | 36 | }, |
| 37 | 37 | "devDependencies": { |
| 38 | - "angular": "^1.7.5", | |
| 38 | + "angular": "^1.7.7", | |
| 39 | 39 | "angular-route": "^1.7.5", |
| 40 | - "bootstrap": "^4.1.3", | |
| 40 | + "bootstrap": "^4.2.1", | |
| 41 | 41 | "foca-directivas": "git+http://git.focasoftware.com/npm/foca-directivas.git", |
| 42 | 42 | "foca-modal": "git+http://git.focasoftware.com/npm/foca-modal.git", |
| 43 | 43 | "font-awesome": "^4.7.0", |
| 44 | 44 | "gulp": "^3.9.1", |
| 45 | - "gulp-angular-templatecache": "^2.2.5", | |
| 45 | + "gulp-angular-templatecache": "^2.2.6", | |
| 46 | 46 | "gulp-clean": "^0.4.0", |
| 47 | - "gulp-connect": "^5.6.1", | |
| 47 | + "gulp-connect": "^5.7.0", | |
| 48 | 48 | "gulp-htmlmin": "^5.0.1", |
| 49 | 49 | "gulp-jshint": "^2.1.0", |
| 50 | 50 | "gulp-rename": "^1.4.0", |
| ... | ... | @@ -53,9 +53,9 @@ |
| 53 | 53 | "gulp-uglify-es": "^1.0.4", |
| 54 | 54 | "jasmine-core": "^3.3.0", |
| 55 | 55 | "jquery": "^3.3.1", |
| 56 | - "jshint": "^2.9.6", | |
| 56 | + "jshint": "^2.10.0", | |
| 57 | 57 | "pre-commit": "^1.2.2", |
| 58 | 58 | "pump": "^3.0.0", |
| 59 | - "ui-bootstrap4": "^3.0.5" | |
| 59 | + "ui-bootstrap4": "^3.0.6" | |
| 60 | 60 | } |
| 61 | 61 | } |
src/js/app.js
src/js/controller.js
| ... | ... | @@ -41,20 +41,25 @@ angular.module('focaAbmChofer') |
| 41 | 41 | }; |
| 42 | 42 | |
| 43 | 43 | $scope.seleccionarTransportista = function() { |
| 44 | - var modalInstance = $uibModal.open( | |
| 45 | - { | |
| 46 | - ariaLabelledBy: 'Busqueda de Transportista', | |
| 47 | - templateUrl: 'modal-proveedor.html', | |
| 48 | - controller: 'focaModalProveedorCtrl', | |
| 49 | - size: 'lg', | |
| 50 | - resolve: { | |
| 51 | - transportista: function() { | |
| 52 | - return true; | |
| 53 | - } | |
| 44 | + var parametrosModal = { | |
| 45 | + titulo: 'Búsqueda de Transportista', | |
| 46 | + query: '/transportista', | |
| 47 | + columnas: [ | |
| 48 | + { | |
| 49 | + nombre: 'Código', | |
| 50 | + propiedad: 'COD' | |
| 51 | + }, | |
| 52 | + { | |
| 53 | + nombre: 'Nombre', | |
| 54 | + propiedad: 'NOM' | |
| 55 | + }, | |
| 56 | + { | |
| 57 | + nombre: 'CUIT', | |
| 58 | + propiedad: 'CUIT' | |
| 54 | 59 | } |
| 55 | - } | |
| 56 | - ); | |
| 57 | - modalInstance.result.then( | |
| 60 | + ] | |
| 61 | + }; | |
| 62 | + focaModalService.modal(parametrosModal).then( | |
| 58 | 63 | function(transportista) { |
| 59 | 64 | elegirTransportista(transportista); |
| 60 | 65 | focaAbmChoferService.transportistaSeleccionado = transportista; |