Commit 873bd67a11c695422fd1534e23217d786d181294
1 parent
2452de534d
Exists in
master
and in
2 other branches
espacios"
Showing
1 changed file
with
11 additions
and
4 deletions
Show diff stats
src/js/controller.js
| ... | ... | @@ -127,26 +127,31 @@ angular.module('focaModalDetalleCisternas') |
| 127 | 127 | }; |
| 128 | 128 | |
| 129 | 129 | $scope.cargarACisternas = function() { |
| 130 | + | |
| 130 | 131 | for(var i = 0; i < $scope.cisternas.length; i++) { |
| 131 | 132 | var cisterna = $scope.cisternas[i]; |
| 132 | 133 | var aCargar = parseFloat($scope.aCargar[i]); |
| 133 | 134 | var fechaReparto = focaModalDetalleCisternasService.fecha; |
| 135 | + | |
| 134 | 136 | //validaciones |
| 135 | - if(!aCargar || cisterna.disabled) { | |
| 137 | + if (!aCargar || cisterna.disabled) { | |
| 136 | 138 | continue; |
| 137 | 139 | } |
| 140 | + | |
| 138 | 141 | //cargar |
| 139 | - if(cisterna.cisternaCarga.cantidad) { | |
| 142 | + if (cisterna.cisternaCarga.cantidad) { | |
| 140 | 143 | cisterna.cisternaCarga.cantidad += aCargar; |
| 141 | - }else { | |
| 144 | + } else { | |
| 142 | 145 | cisterna.cisternaCarga.cantidad = aCargar; |
| 143 | 146 | cisterna.cisternaCarga.idProducto = $scope.articuloSeleccionado.idArticulo; |
| 144 | 147 | } |
| 148 | + | |
| 145 | 149 | cisterna.disponible = cisterna.capacidad - cisterna.cisternaCarga.cantidad; |
| 146 | - | |
| 150 | + | |
| 147 | 151 | cisterna.cisternaCarga.articulo = { |
| 148 | 152 | DetArt: $scope.articuloSeleccionado.descripcion |
| 149 | 153 | }; |
| 154 | + | |
| 150 | 155 | $filter('filter')($scope.articulos, {id: $scope.articuloSeleccionado.id})[0] |
| 151 | 156 | .cargado = true; |
| 152 | 157 | |
| ... | ... | @@ -165,11 +170,13 @@ angular.module('focaModalDetalleCisternas') |
| 165 | 170 | $scope.cisternasCarga.push(cisterna.cisternaCarga); |
| 166 | 171 | cisternaMovimientos.push(cisternaMovimiento); |
| 167 | 172 | } |
| 173 | + | |
| 168 | 174 | var articuloSiguiente = $scope.articulos.filter( |
| 169 | 175 | function(filter) { |
| 170 | 176 | return filter.cargado !== true; |
| 171 | 177 | } |
| 172 | 178 | ); |
| 179 | + | |
| 173 | 180 | if(articuloSiguiente.length > 0) { |
| 174 | 181 | $scope.seleccionarArticulo(articuloSiguiente[0]); |
| 175 | 182 | } |