Commit 8b6bb977b08187edb52aaeeea78f09f462ff77e2
Exists in
master
Merge branch 'develop' into 'master'
Develop See merge request !26
Showing
1 changed file
Show diff stats
src/js/controller.js
| ... | ... | @@ -36,34 +36,49 @@ 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 | + focaModalService | |
| 40 | + .alert('Los artículos del remito exceden la capacidad disponible del ' + | |
| 41 | + 'vehiculo') | |
| 42 | + .then(function() { | |
| 43 | + $uibModalInstance.dismiss(); | |
| 44 | + }, function() { | |
| 45 | + $uibModalInstance.dismiss(); | |
| 46 | + }); | |
| 42 | 47 | return; |
| 43 | 48 | } |
| 49 | + | |
| 44 | 50 | $scope.cargandoDatos = false; |
| 45 | 51 | $scope.vehiculo = res[0].data; |
| 46 | 52 | $scope.cisternas = res[1].data; |
| 53 | + | |
| 47 | 54 | if(!$scope.cisternas.length) { |
| 48 | - focaModalService.alert('El vehículo no tiene cisternas'); | |
| 49 | - $uibModalInstance.dismiss(); | |
| 55 | + focaModalService.alert('El vehículo no tiene cisternas') | |
| 56 | + .then(function () { | |
| 57 | + $uibModalInstance.dismiss(); | |
| 58 | + }, function() { | |
| 59 | + $uibModalInstance.dismiss(); | |
| 60 | + }); | |
| 50 | 61 | return; |
| 51 | 62 | } |
| 63 | + | |
| 52 | 64 | if(!res[2]) { |
| 53 | 65 | $scope.$digest(); |
| 54 | 66 | return; |
| 55 | 67 | } |
| 68 | + | |
| 56 | 69 | $scope.remito = res[2].data; |
| 70 | + | |
| 57 | 71 | if($scope.remito.idUsuarioProceso) { |
| 58 | - focaModalService.alert('Remito ya asignado'); | |
| 59 | - $uibModalInstance.close(); | |
| 72 | + | |
| 73 | + $uibModalInstance.dismiss(focaModalService.alert('Remito ya asignado')); | |
| 60 | 74 | } |
| 75 | + | |
| 61 | 76 | $scope.articulos = $scope.remito.articulosRemito; |
| 62 | 77 | if(!$scope.articulos.length) { |
| 63 | 78 | $uibModalInstance.dismiss(focaModalService.alert('El remito no tiene articulos')); |
| 64 | 79 | return; |
| 65 | 80 | } |
| 66 | - | |
| 81 | + | |
| 67 | 82 | $scope.seleccionarArticulo($scope.articulos[0]); |
| 68 | 83 | var tieneUsuario = $scope.cisternas.filter(function(cisterna) { |
| 69 | 84 | if(cisterna.cisternaCarga && cisterna.cisternaCarga.idUsuarioProceso) { |