From c65a4394808cc44425f823f93377525a9fd6c01c Mon Sep 17 00:00:00 2001 From: Jose Pinto Date: Fri, 28 Dec 2018 18:25:00 -0300 Subject: [PATCH] agrego modal punto descarga --- src/js/app.js | 6 +++++- src/js/controller.js | 29 +++++++++++++++++++++++++++-- src/views/modal-domicilio.html | 17 ++++++++++++++--- 3 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/js/app.js b/src/js/app.js index 9e1b4e5..92637e3 100644 --- a/src/js/app.js +++ b/src/js/app.js @@ -1 +1,5 @@ -angular.module('focaModalDomicilio', ['ui.bootstrap', 'focaDirectivas']); +angular.module('focaModalDomicilio', [ + 'ui.bootstrap', + 'focaDirectivas', + 'focaModal' +]); diff --git a/src/js/controller.js b/src/js/controller.js index 4a7c41a..6dee01f 100644 --- a/src/js/controller.js +++ b/src/js/controller.js @@ -5,8 +5,11 @@ angular.module('focaModalDomicilio') '$scope', '$uibModalInstance', 'idCliente', + 'esNuevo', 'focaModalDomicilioService', - function($filter, $scope, $uibModalInstance, idCliente, focaModalDomicilioService) { + '$uibModal', + function($filter, $scope, $uibModalInstance, idCliente, esNuevo, + focaModalDomicilioService, $uibModal) { $scope.buscar = function() { focaModalDomicilioService @@ -20,7 +23,7 @@ angular.module('focaModalDomicilio') }; $scope.idCliente = idCliente; $scope.buscar(); - $scope.ingreso = false; + $scope.ingreso = esNuevo; $scope.primerBusqueda = false; $scope.contactos = [{}]; // pagination @@ -139,6 +142,28 @@ angular.module('focaModalDomicilio') }); }; + $scope.verPuntosDescarga = function(key) { + var modalInstance = $uibModal.open( + { + ariaLabelledBy: 'Busqueda de Puntos de descarga', + templateUrl: 'modal-punto-descarga.html', + controller: 'focaModalPuntoDescargaController', + size: 'md', + resolve: { + filters: { + idDomicilio: $scope.domicilios[key].id, + idCliente: idCliente + } + } + } + ); + modalInstance.result.then(function(puntoDescarga) { + console.log(puntoDescarga); + }, function() { + //TODO: función llamada cuando cancela el modal + }); + }; + function calcularPages(paginaActual) { var paginas = []; paginas.push(paginaActual); diff --git a/src/views/modal-domicilio.html b/src/views/modal-domicilio.html index dc3e655..56d05e5 100644 --- a/src/views/modal-domicilio.html +++ b/src/views/modal-domicilio.html @@ -1,7 +1,8 @@