Marcelo Puebla / foca-modal-descarga

Download as
Browse Code »

Commit dc667eace5cc258b6afd865e75c3e30df60e2789

Authored by Eric Fernandez
2 parents 15a95082a5 80fd50e52a
Exists in master

Merge branch 'master' into 'master' 

Master(mpuebla)

See merge request !12
Showing 3 changed files   Show diff stats
src/js/controller.js
Diff comments   View file @ dc667ea
... ... @@ -231,7 +231,7 @@ angular.module('focaModalDescarga')
231 231 $scope.hasErrorSucursalRemito = false;
232 232 return;
233 233 }
234   -
  234 +
235 235 focaModalDescargasService.validarSucursalRemito(sucursal, remito)
236 236 .then(function (res) {
237 237 if (res.data.data === 1) {
... ... @@ -15,8 +15,10 @@ angular.module('focaModalDescarga')
15 15 for (var i = 0; i < articulosRemito.length; i++) {
16 16  
17 17 var articuloReferencia = articulosBase.filter(function (articulo) {
18   - return articulosRemito[i].idArticulo == articulo.id;
  18 + return articulosRemito[i].idArticulo == articulo.id &&
  19 + parseInt(articulo.cantidad) > 0
19 20 })[0];
  21 + if (articuloReferencia === undefined) continue;
20 22  
21 23 delete articulosRemito[i].id
22 24 delete articulosRemito[i].editCantidad;
src/views/foca-modal-descarga.html
Diff comments   View file @ dc667ea
... ... @@ -81,7 +81,14 @@
81 81 cisterna.cisternaCarga.cantidad"
82 82 ng-model="cisterna.cisternaCarga.descargar"
83 83 ng-focus="$event.target.select();"
84   - class="text-center form-control col-12">
  84 + class="text-center form-control col-12"
  85 + ng-show="cisterna.cisternaCarga.cantidad > 0">
  86 + <div
  87 + class="text-center alert-danger p-1"
  88 + role="alert"
  89 + ng-hide="cisterna.cisternaCarga.cantidad > 0">
  90 + Cisterna vacía.
  91 + </div>
85 92 </td>
86 93 </tr>
87 94 </tbody>
... ... @@ -109,7 +116,8 @@
109 116 ladda="cargando"
110 117 type="button"
111 118 ng-click="crearRemito()"
112   - ng-disabled="tieneArticulosPendientes() ||
113   - idRemito === -1 || hasErrorSucursalRemito || !nroSucursal || !nroRemito"
114   - foca-focus="!tieneArticulosPendientes() && idRemito !== -1">Descargar</button>
  119 + ng-disabled="idRemito === -1 || hasErrorSucursalRemito || !nroSucursal || !nroRemito"
  120 + foca-focus="idRemito !== -1">
  121 + Descargar
  122 + </button>
115 123 </div>