Commit 6dbcfd4910cca36a7d5cbb61037a1b59628dceda

Authored by Nicolás Guarnieri
Exists in master and in 2 other branches develop, lab

Merge remote-tracking branch 'origin/master'

src/views/foca-detalle-vehiculo.html
1 <div class="modal-header"> 1 <div class="modal-header">
2 <h4>Detalle de carga</h4> 2 <h4>Detalle de carga</h4>
3 Transportista 3 Transportista
4 <strong ng-bind="vehiculo.transportista.COD"></strong> 4 <strong ng-bind="vehiculo.transportista.COD"></strong>
5 <strong ng-bind="vehiculo.transportista.NOM"></strong> 5 <strong ng-bind="vehiculo.transportista.NOM"></strong>
6 Unidad <strong ng-bind="vehiculo.codigo"></strong> 6 Unidad <strong ng-bind="vehiculo.codigo"></strong>
7 Tractor <strong ng-bind="vehiculo.tractor"></strong> 7 Tractor <strong ng-bind="vehiculo.tractor"></strong>
8 <br> 8 <br>
9 <div ng-show="idRemito !== -1"> 9 <div ng-show="idRemito !== -1">
10 <span>Remito Nº</span> 10 <span>Remito Nº</span>
11 <strong ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></strong> 11 <strong ng-bind="[remito.sucursal, remito.numeroRemito] | comprobante"></strong>
12 <span>, Fecha</span> 12 <span>, Fecha</span>
13 <strong ng-bind="remito.fechaRemito | date: 'dd/MM/yyyy HH:mm'"></strong> 13 <strong ng-bind="remito.fechaRemito | date: 'dd/MM/yyyy HH:mm'"></strong>
14 <span>, Cliente</span> 14 <span>, Cliente</span>
15 <strong ng-bind="remito.nombreCliente"></strong> 15 <strong ng-bind="remito.nombreCliente"></strong>
16 <span>, Domicilio entrega</span> 16 <span>, Domicilio entrega</span>
17 <strong ng-bind="remito.domicilioStamp"></strong> 17 <strong ng-bind="remito.domicilioStamp"></strong>
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="modal-body"> 20 <div class="modal-body">
21 <div> 21 <div>
22 <table class="table table-sm" ng-show="idRemito !== -1"> 22 <table class="table table-sm" ng-show="idRemito !== -1">
23 <thead> 23 <thead>
24 <tr> 24 <tr>
25 <th></th> 25 <th></th>
26 <th>Articulo</th> 26 <th>Articulo</th>
27 <th>Cantidad</th> 27 <th>Cantidad</th>
28 <th>Cargado</th> 28 <th>Cargado</th>
29 <th>Resta asignar</th> 29 <th>Resta asignar</th>
30 </tr> 30 </tr>
31 </thead> 31 </thead>
32 <tbody> 32 <tbody>
33 <tr ng-repeat="(key, articulo) in articulos"> 33 <tr ng-repeat="(key, articulo) in articulos">
34 <td><input 34 <td><input
35 type="radio" 35 type="radio"
36 name="articuloRadio" 36 name="articuloRadio"
37 id="{{'articulo' + articulo.id}}" 37 id="{{'articulo' + articulo.id}}"
38 ng-checked="articuloSeleccionado.id === articulo.id" 38 ng-checked="articuloSeleccionado.id === articulo.id"
39 ng-disabled="articulo.cargado" 39 ng-disabled="articulo.cargado"
40 ng-click="seleccionarArticulo(articulo)" 40 ng-click="seleccionarArticulo(articulo)"
41 ></td> 41 ></td>
42 <td ng-bind="articulo.descripcion"></td> 42 <td ng-bind="articulo.descripcion"></td>
43 <td ng-bind="articulo.cantidad"></td> 43 <td ng-bind="articulo.cantidad"></td>
44 <td ng-bind="articulo.cantidadCargada || 0"></td> 44 <td ng-bind="articulo.cantidadCargada || 0"></td>
45 <td ng-bind="articulo.cantidad - articulo.cantidadCargada"></td> 45 <td ng-bind="articulo.cantidad - articulo.cantidadCargada"></td>
46 </tr> 46 </tr>
47 </tbody> 47 </tbody>
48 </table> 48 </table>
49 <table class="table table-sm" ladda="cargandoDatos" data-spinner-color="#FF0000"> 49 <table class="table table-sm" ladda="cargandoDatos" data-spinner-color="#FF0000">
50 <thead> 50 <thead>
51 <tr> 51 <tr>
52 <th width="10%">Cisterna</th> 52 <th width="10%">Cisterna</th>
53 <th>Capacidad</th> 53 <th>Capacidad</th>
54 <th>Articulo cargado</th> 54 <th>Articulo cargado</th>
55 <th width="20%">Asignado</th> 55 <th width="20%">A asignar</th>
56 <th>Cargado / Capacidad Disponible</th> 56 <th>Cargado / Capacidad Disponible</th>
57 </tr> 57 </tr>
58 </thead> 58 </thead>
59 <tbody> 59 <tbody>
60 <tr ng-repeat="(key, cisterna) in cisternas"> 60 <tr ng-repeat="(key, cisterna) in cisternas">
61 <td class="py-3" ng-bind="cisterna.codigo"></td> 61 <td class="py-3" ng-bind="cisterna.codigo"></td>
62 <td class="py-3" ng-bind="cisterna.capacidad"></td> 62 <td class="py-3" ng-bind="cisterna.capacidad"></td>
63 <td class="py-3" ng-bind="cisterna.cisternaCarga.articulo.DetArt || 'Sin asignar'"></td> 63 <td class="py-3" ng-bind="cisterna.cisternaCarga.articulo.DetArt || 'Sin asignar'"></td>
64 <td ng-if="idRemito != -1"> 64 <td ng-if="idRemito != -1">
65 <input 65 <input
66 class="form-control" 66 class="form-control"
67 foca-tipo-input 67 foca-tipo-input
68 foca-teclado 68 foca-teclado
69 placeholder="A cargar..." 69 placeholder="A cargar..."
70 ng-model="aCargar[key]" 70 ng-model="aCargar[key]"
71 ng-disabled="cisterna.disabled || !tieneArticulosPendientes()" 71 ng-disabled="cisterna.disabled || !tieneArticulosPendientes()"
72 ng-focus="aCargar[key] = rellenarInput(aCargar[key], cisterna); actualizarArticulo()" 72 ng-focus="aCargar[key] = rellenarInput(aCargar[key], cisterna); actualizarArticulo()"
73 ng-change="actualizarArticulo()" 73 ng-change="actualizarArticulo()"
74 > 74 >
75 </td> 75 </td>
76 <td ng-if="idRemito == -1"> 76 <td ng-if="idRemito == -1">
77 <input 77 <input
78 class="form-control" 78 class="form-control"
79 placeholder="A cargar..." 79 placeholder="A cargar..."
80 readonly> 80 readonly>
81 </td> 81 </td>
82 <td><div class="progress foca-alto-progress pl-0 pr-0 mt-1"> 82 <td><div class="progress foca-alto-progress pl-0 pr-0 mt-1">
83 <strong 83 <strong
84 class="mt-2 col-4 text-center position-absolute" 84 class="mt-2 col-4 text-center position-absolute"
85 ng-bind="(cisterna.cisternaCarga.cantidad || 0) + '/' + 85 ng-bind="(cisterna.cisternaCarga.cantidad || 0) + '/' +
86 (cisterna.capacidad - cisterna.cisternaCarga.cantidad)"> 86 (cisterna.capacidad - cisterna.cisternaCarga.cantidad)">
87 </strong> 87 </strong>
88 <div 88 <div
89 id="{{cisterna.id}}" 89 id="{{cisterna.id}}"
90 class="progress-bar" 90 class="progress-bar"
91 role="progressbar" 91 role="progressbar"
92 aria-valuemin="0" 92 aria-valuemin="0"
93 aria-valuemax="{{cisterna.capacidad}}" 93 aria-valuemax="{{cisterna.capacidad}}"
94 ng-style="{'width':'{{calcularPorcentaje(cisterna)}}'}"> 94 ng-style="{'width':'{{calcularPorcentaje(cisterna)}}'}">
95 </div> 95 </div>
96 </div> 96 </div>
97 </td> 97 </td>
98 </tr> 98 </tr>
99 </tbody> 99 </tbody>
100 </table> 100 </table>
101 <div class="col-12"> 101 <div class="col-12">
102 <button 102 <button
103 class="form-control btn btn-success" 103 class="form-control btn btn-success"
104 ladda="cargando" 104 ladda="cargando"
105 data-spinner-color="#FF0000" 105 data-spinner-color="#FF0000"
106 type="button" 106 type="button"
107 ng-disabled="!distribucionDisponible()" 107 ng-disabled="!distribucionDisponible()"
108 ng-class="{'btn-light': !distribucionDisponible()}" 108 ng-class="{'btn-light': !distribucionDisponible()}"
109 ng-click="cargarACisternas(vehiculo)" 109 ng-click="cargarACisternas(vehiculo)"
110 foca-focus="distribucionDisponible()"> 110 foca-focus="distribucionDisponible()">
111 Aplicar distribución de cargas 111 Aplicar distribución de cargas
112 </button> 112 </button>
113 </div> 113 </div>
114 </div> 114 </div>
115 </div> 115 </div>
116 <div class="modal-footer py-1"> 116 <div class="modal-footer py-1">
117 <button 117 <button
118 class="btn btn-sm btn-secondary" 118 class="btn btn-sm btn-secondary"
119 ladda="cargando" 119 ladda="cargando"
120 type="button" 120 type="button"
121 ng-click="cancelar()">Cancelar</button> 121 ng-click="cancelar()">Cancelar</button>
122 <button 122 <button
123 class="btn btn-sm btn-primary" 123 class="btn btn-sm btn-primary"
124 ladda="cargando" 124 ladda="cargando"
125 type="button" 125 type="button"
126 ng-click="aceptar()" 126 ng-click="aceptar()"
127 ng-disabled="tieneArticulosPendientes() || idRemito === -1" 127 ng-disabled="tieneArticulosPendientes() || idRemito === -1"
128 foca-focus="!tieneArticulosPendientes() && idRemito !== -1">Cargar</button> 128 foca-focus="!tieneArticulosPendientes() && idRemito !== -1">Cargar</button>
129 </div> 129 </div>
130 130