From b7ba24419696051230c7785d0423326c2b1f09da Mon Sep 17 00:00:00 2001
From: efernandez <efernandez@focasoftware.com>
Date: Mon, 21 Jan 2019 12:49:13 -0300
Subject: [PATCH] vista

---
 src/views/modal-detalle-hoja-ruta.html | 239 +++++++++++++++++++--------------
 1 file changed, 135 insertions(+), 104 deletions(-)

diff --git a/src/views/modal-detalle-hoja-ruta.html b/src/views/modal-detalle-hoja-ruta.html
index 67fb5c9..a77b123 100644
--- a/src/views/modal-detalle-hoja-ruta.html
+++ b/src/views/modal-detalle-hoja-ruta.html
@@ -1,106 +1,143 @@
 <div class="modal-header py-1">
     <h5 class="modal-title">Detalle de descarga</h5>
 </div>
-<div class="modal-body" id="modal-body">
+<div class="modal-body" id="modal-body" ladda="cargando" data-spinner-color="#FF0000" data-spinner-size="5">
     <form name="formDetalleHojaRuta">
-        <div class="form-group row">
+        <div class="form-group row" ng-show="!cargando">
             <div class="col-12 px-0">
-                <label class="form-control-sm">
-                    <b>Remito Nº</b>
-                    <span ng-bind="[remito.numeroRemito, remito.sucursal] | comprobante"/>
-                </label>
-            </div>
-            <div class="col-12 px-0">
-                <label class="form-control-sm">
-                    <b>Cliente</b>
-                </label>
-                <span ng-bind="remito.nombreCliente"/>
-            </div>
-            <div class="col-12 px-0">
-                <label class="form-control-sm">
-                    <b>Domicilio</b>
-                    <span ng-bind="remito.domicilioStamp"/>
-                </label>
-            </div>
-            <div class="col-12 px-0">
-                <strong>Articulo a descargar</strong>
-                <table class="table table-sm">
-                    <thead>
-                        <tr>
-                            <th></th>
-                            <th>Articulo</th>
-                            <th>Total</th>
-                            <th>Descargado</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr ng-repeat="(key, articulo) in remito.articulosRemito">
-                            <td class="pt-2"><input
-                                type="radio"
-                                name="articuloRadio"
-                                id="{{'articulo' + articulo.id}}"
-                                ng-click="cambio(articulo)"
-                                ng-disabled="articulo.cargado"
-                            ></td>
-                            <td ng-bind="articulo.descripcion"></td>
-                            <td ng-bind="articulo.cantidad"></td>
-                            <td ng-bind="articulo.descargado || articulo.cantidad"></td>
-                    </tbody>
-                </table>
-                <strong>Cisterna</strong>
-                <table class="table table-sm">
-                    <thead>
-                        <tr>
-                            <th>Código</th>
-                            <th>Articulo</th>
-                            <th>Total</th>
-                            <th>A descargar</th>
-                        </tr>
-                    </thead>
-                    <tbody>
-                        <tr ng-repeat="(key, cisterna) in cisternas">
-                            <td ng-bind="cisterna.codigo"></td>
-                            <td ng-bind="cisterna.cisternaCarga.articulo.DetArt"></td>
-                            <td ng-bind="cisterna.cisternaCarga.cantidad"></td>
-                            <td><input
-                                class="form-control form-control-sm"
-                                type="number"
-                                ng-model="cisterna.aDescargar"
-                                foca-focus=""
-                                ng-disabled="articuloSeleccionado.idArticulo != cisterna.cisternaCarga.idProducto"/></td>
-                        </tr>
-                    </tbody>
-                </table>
-            </div>
-            <div class="col-12 px-0">
-                <label class="form-control-sm px-0">
-                    <b>Observaciones</b>
-                </label>
-            </div>
-            <div class="col-12">
-                <textarea
-                    ng-model="remito.observaciones"
-                    class="form-control form-control-sm"
-                    rows="1"
-                ></textarea>
-            </div>
-            <div class="col-12 row mt-2">
-                <label class="form-control-sm px-0 col-3"><b>Nº Recibo</b></label>
-                <input
-                    class="form-control form-control-sm col-4"
-                    type="number"
-                    ng-model="numeroRecibo">
+                <strong>Información Remito</strong>
                 <button
-                    class="ml-4 form-control-sm btn btn-success col-4"
-                    ladda="cargando"
-                    data-spinner-color="#FF0000"
-                    type="button"
-                    ng-disabled="!distribucionDisponible()"
-                    ng-click="cargarACisternas(vehiculo)"
-                    foca-focus="distribucionDisponible()">
-                    Descargar
+                    class="btn btn-sm btn-outline-light selectable"
+                    ng-click="verInformacion = !verInformacion"
+                    ><i
+                        class="fa fa-chevron-down"
+                        ng-show="verInformacion"></i>
+                    <i
+                        class="fa fa-chevron-up"
+                        ng-hide="verInformacion">
+                    </i>
                 </button>
             </div>
+            <div class="row" ng-show="verInformacion">
+                <div class="col-12">
+                    <label class="form-control-sm">
+                        <b>Remito Nº</b>
+                        <span ng-bind="[remito.numeroRemito, remito.sucursal] | comprobante"/>
+                    </label>
+                </div>
+                <div class="col-12">
+                    <label class="form-control-sm">
+                        <b>Cliente</b>
+                    </label>
+                    <span ng-bind="remito.nombreCliente"/>
+                </div>
+                <div class="col-12">
+                    <label class="form-control-sm">
+                        <b>Domicilio</b>
+                        <span ng-bind="remito.domicilioStamp"/>
+                    </label>
+                </div>
+                <div ng-show="remito.notaPedido.notaPedidoPuntoDescarga.length" class="px-3">
+                    <label class="form-control-sm">
+                        <b>Puntos de descarga</b>
+                    </label>
+                    <table class="table table-sm">
+                        <thead>
+                            <tr>
+                                <th>Nombre</th>
+                                <th>Articulo</th>
+                                <th>Cantidad</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <tr ng-repeat="(key, puntoDescarga) in remito.notaPedido.notaPedidoPuntoDescarga">
+                                <td ng-bind="puntoDescarga.puntoDescarga.descripcion"></td>
+                                <td ng-bind="puntoDescarga.producto.DetArt"></td>
+                                <td ng-bind="puntoDescarga.cantidad"></td>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+            <strong>Articulo a descargar</strong>
+            <table class="table table-sm">
+                <thead>
+                    <tr>
+                        <th></th>
+                <th>Articulo</th>
+                <th>Total</th>
+                <th>Descargado</th>
+            </tr>
+            </thead>
+            <tbody>
+                <tr ng-repeat="(key, articulo) in remito.articulosRemito">
+                    <td class="pt-2">
+                        <input
+                            type="radio"
+                            name="articuloRadio"
+                            id="{{'articulo' + articulo.id}}"
+                            ng-click="cambio(articulo)"
+                            ng-disabled="articulo.cargado"
+                            ng-checked="articuloSeleccionado.id === articulo.id"
+                    ></td>
+                    <td ng-bind="articulo.descripcion"></td>
+                    <td ng-bind="articulo.cantidad"></td>
+                    <td ng-bind="articulo.cantidad - articulo.cantidadDescargada"></td>
+            </tbody>
+            </table>
+        <strong>Cisterna</strong>
+        <table class="table table-sm">
+            <thead>
+                <tr>
+                    <th>Código</th>
+                    <th>Articulo</th>
+                    <th>Total</th>
+                    <th>A descargar</th>
+                </tr>
+            </thead>
+            <tbody>
+                <tr ng-repeat="(key, cisterna) in cisternas">
+                    <td ng-bind="cisterna.codigo"></td>
+                    <td ng-bind="cisterna.cisternaCarga.articulo.DetArt"></td>
+                    <td ng-bind="cisterna.cisternaCarga.cantidad"></td>
+                    <td><input
+                        class="form-control form-control-sm"
+                        type="number"
+                        ng-model="aDescargar[key]"
+                        ng-change="actualizarArticulo()"
+                        foca-focus="articuloSeleccionado.idArticulo == cisterna.cisternaCarga.idProducto"
+                        ng-disabled="articuloSeleccionado.idArticulo != cisterna.cisternaCarga.idProducto"/></td>
+                </tr>
+            </tbody>
+        </table>
+        <div class="col-12 px-0">
+            <label class="form-control-sm px-0">
+                <b>Observaciones</b>
+            </label>
+        </div>
+        <div class="col-12">
+            <textarea
+                ng-model="remito.observaciones"
+                class="form-control form-control-sm"
+                rows="1"
+            ></textarea>
+        </div>
+        <div class="col-12 row mt-2">
+            <label class="form-control-sm px-0 col-3"><b>Nº Recibo</b></label>
+            <input
+                class="form-control form-control-sm col-4"
+                type="number"
+                ng-model="numeroRecibo"
+                ng-keypress="descargar($event.keyCode)"
+                foca-focus="distribucionDisponible()">
+            <button
+                class="ml-4 form-control-sm btn btn-success col-4"
+                ladda="cargando"
+                data-spinner-color="#FF0000"
+                type="button"
+                ng-disabled="!distribucionDisponible() || !numeroRecibo"
+                ng-click="descargar(13)">
+                Descargar
+            </button>
         </div>
     </form>
 </div>
@@ -108,18 +145,12 @@
     <button
         class="btn btn-danger btn-sm"
         type="button"
-        ng-click=""
+        ng-click="rechazar()"
         ng-disabled=""
-    >Anular</button>
+    >Rechazar</button>
     <button
         class="btn btn-secondary btn-sm"
         type="button"
         ng-click="cancel()"
-    >Cancelar</button>
-    <button
-        class="btn btn-primary btn-sm"
-        type="button"
-        ng-click="aceptar()"
-        ng-disabled="validar()"
-    >Aceptar</button>
+    >Salir</button>
 </div>
-- 
1.9.1