From 94dc34b5e1c9a9b6d8a63a5f5e48249e747bd718 Mon Sep 17 00:00:00 2001 From: efernandez Date: Fri, 4 Jan 2019 13:07:11 -0300 Subject: [PATCH] =?UTF-8?q?reemplazo=20modal=20veh=C3=ADculo=20por=20modal?= =?UTF-8?q?=20parametrizable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/controller.js | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/src/js/controller.js b/src/js/controller.js index 1210a8e..3bddc38 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -145,19 +145,13 @@ angular.module('focaLogisticaPedidoRuta') .controller('focaLogisticaPedidoRutaCo }; $scope.seleccionarVehiculo = function(idTransportista) { - var modalInstance = $uibModal.open( - { - ariaLabelledBy: 'Busqueda de Vehiculo', - templateUrl: 'modal-vehiculo.html', - controller: 'focaModalVehiculoController', - size: 'lg', - resolve: { - idTransportista: function() {return idTransportista;} - } - } - ); - - modalInstance.result.then( + var query = '/vehiculo/transportista/' + idTransportista; + var columnas = { + nombre: ['Código', 'tractor', 'Semi', 'Capacidad'], + propiedad: ['codigo', 'tractor', 'semi', 'capacidadTotalCisternas'] + }; + var titulo = 'Búsqueda de vehiculos'; + focaModalService.modal(columnas, query, titulo).then( function(vehiculo) { var existe = $filter('filter')($scope.vehiculos, {id: vehiculo.id}); if(existe.length) { @@ -171,8 +165,7 @@ angular.module('focaLogisticaPedidoRuta') .controller('focaLogisticaPedidoRutaCo $scope.vehiculos.push(vehiculo); }, function() { // funcion ejecutada cuando se cancela el modal - } - ); + }); }; function getSeguimiento() { -- 1.9.1