Commit 04ea74b52468511082d84d93f2cd1d1757b060d5
1 parent
874c06a2ac
Exists in
master
fix alert
Showing
1 changed file
with
12 additions
and
8 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -36,34 +36,38 @@ angular.module('focaModalDetalleCisternas') |
| 36 | 36 | |
| 37 | 37 | Promise.all([promesaVehiculo, promesaCisternas, promesaRemito]).then(function(res) { |
| 38 | 38 | if (idRemito !== -1 && !validarCargas(res[1].data, res[2].data)) { |
| 39 | - var error = 'Los artículos del remito exceden la cantidad disponible del ' + | |
| 40 | - 'vehiculo'; | |
| 41 | - $uibModalInstance.dismiss(error); | |
| 39 | + var alerta = focaModalService.alert('Los artículos del remito exceden la cantidad disponible del ' + | |
| 40 | + 'vehiculo'); | |
| 41 | + $uibModalInstance.dismiss(alerta); | |
| 42 | 42 | return; |
| 43 | 43 | } |
| 44 | 44 | $scope.cargandoDatos = false; |
| 45 | 45 | $scope.vehiculo = res[0].data; |
| 46 | 46 | $scope.cisternas = res[1].data; |
| 47 | + | |
| 47 | 48 | if(!$scope.cisternas.length) { |
| 48 | - focaModalService.alert('El vehículo no tiene cisternas'); | |
| 49 | - $uibModalInstance.dismiss(); | |
| 49 | + $uibModalInstance.dismiss(focaModalService.alert('El vehículo no tiene cisternas')); | |
| 50 | 50 | return; |
| 51 | 51 | } |
| 52 | + | |
| 52 | 53 | if(!res[2]) { |
| 53 | 54 | $scope.$digest(); |
| 54 | 55 | return; |
| 55 | 56 | } |
| 57 | + | |
| 56 | 58 | $scope.remito = res[2].data; |
| 59 | + | |
| 57 | 60 | if($scope.remito.idUsuarioProceso) { |
| 58 | - focaModalService.alert('Remito ya asignado'); | |
| 59 | - $uibModalInstance.close(); | |
| 61 | + | |
| 62 | + $uibModalInstance.dismiss(focaModalService.alert('Remito ya asignado')); | |
| 60 | 63 | } |
| 64 | + | |
| 61 | 65 | $scope.articulos = $scope.remito.articulosRemito; |
| 62 | 66 | if(!$scope.articulos.length) { |
| 63 | 67 | $uibModalInstance.dismiss(focaModalService.alert('El remito no tiene articulos')); |
| 64 | 68 | return; |
| 65 | 69 | } |
| 66 | - | |
| 70 | + | |
| 67 | 71 | $scope.seleccionarArticulo($scope.articulos[0]); |
| 68 | 72 | var tieneUsuario = $scope.cisternas.filter(function(cisterna) { |
| 69 | 73 | if(cisterna.cisternaCarga && cisterna.cisternaCarga.idUsuarioProceso) { |