Commit a7c032b2219c69088a1131ecde26e32a628a124c
Exists in
master
Merge branch 'master' into 'master'
envia articulos a modal-punto-descarga See merge request !5
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -5,12 +5,13 @@ angular.module('focaModalDomicilio') |
| 5 | 5 | '$filter', |
| 6 | 6 | '$scope', |
| 7 | 7 | '$uibModalInstance', |
| 8 | - 'idCliente', | |
| 9 | - 'esNuevo', | |
| 10 | 8 | 'focaModalDomicilioService', |
| 11 | 9 | '$uibModal', |
| 12 | - function($timeout, $filter, $scope, $uibModalInstance, idCliente, esNuevo, | |
| 13 | - focaModalDomicilioService, $uibModal) { | |
| 10 | + 'idCliente', | |
| 11 | + 'esNuevo', | |
| 12 | + 'articulos', | |
| 13 | + function($timeout, $filter, $scope, $uibModalInstance, focaModalDomicilioService, | |
| 14 | + $uibModal, idCliente, esNuevo, articulos) { | |
| 14 | 15 | |
| 15 | 16 | $scope.buscar = function() { |
| 16 | 17 | focaModalDomicilioService |
| ... | ... | @@ -34,6 +35,7 @@ angular.module('focaModalDomicilio') |
| 34 | 35 | $scope.filteredDomicilios = []; |
| 35 | 36 | $scope.currentPageDomicilios = []; |
| 36 | 37 | $scope.selectedDomicilio = -1; |
| 38 | + var puntosDescarga = []; | |
| 37 | 39 | |
| 38 | 40 | //METODOS |
| 39 | 41 | $scope.search = function(pressed) { |
| ... | ... | @@ -156,22 +158,25 @@ angular.module('focaModalDomicilio') |
| 156 | 158 | }; |
| 157 | 159 | |
| 158 | 160 | $scope.verPuntosDescarga = function(key) { |
| 161 | + | |
| 159 | 162 | var modalInstance = $uibModal.open( |
| 160 | 163 | { |
| 161 | 164 | ariaLabelledBy: 'Busqueda de Puntos de descarga', |
| 162 | 165 | templateUrl: 'modal-punto-descarga.html', |
| 163 | 166 | controller: 'focaModalPuntoDescargaController', |
| 164 | - size: 'md', | |
| 167 | + size: 'lg', | |
| 165 | 168 | resolve: { |
| 166 | 169 | filters: { |
| 167 | 170 | idDomicilio: $scope.domicilios[key].id, |
| 168 | - idCliente: idCliente | |
| 171 | + idCliente: idCliente, | |
| 172 | + articulos: articulos | |
| 169 | 173 | } |
| 170 | 174 | } |
| 171 | 175 | } |
| 172 | 176 | ); |
| 173 | - modalInstance.result.then(function(puntoDescarga) { | |
| 174 | - console.log(puntoDescarga); | |
| 177 | + modalInstance.result.then(function(puntosDescarga) { | |
| 178 | + $scope.domicilios[key].puntosDescarga = puntosDescarga; | |
| 179 | + $scope.select($scope.domicilios[key]); | |
| 175 | 180 | }, function() { |
| 176 | 181 | //TODO: función llamada cuando cancela el modal |
| 177 | 182 | }); |